@@ -25,12 +25,10 @@
 (declare (uses common))
 ;; (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
-(declare (uses server))
-(declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 ;; (declare (uses daemon))
 
 (declare (uses db))
@@ -43,10 +41,13 @@
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses db))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
+(declare (uses rmtmod))
+(declare (uses clientmod))
+(declare (uses servermod))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (declare (uses dbfile))
 (declare (uses dbfile.import))
 ;; (declare (uses debugprint))