@@ -25,10 +25,12 @@
 (declare (uses common))
 ;; (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
+(declare (uses debugprint))
+(declare (uses debugprint.import))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))
@@ -43,27 +45,28 @@
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses db))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
-(declare (uses dbfile))
-(declare (uses dbfile.import))
-(declare (uses tcp-transport))
+(declare (uses tcp-transportmod))
 ;; (declare (uses debugprint))
 ;; (declare (uses debugprint.import))
 ;; (declare (uses mtargs))
 ;; (declare (uses mtargs.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import dbmod
+(import debugprint
+	dbmod
 	commonmod
 	dbfile
-	tcp-transport)
+	tcp-transportmod)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")