@@ -22,10 +22,16 @@
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (declare (uses common))
 ;; (declare (uses megatest-version))
+(declare (uses commonmod))
+(declare (uses commonmod.import))
+(declare (uses debugprint))
+(declare (uses debugprint.import))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses tests))
 (declare (uses genexample))
@@ -44,27 +50,22 @@
 (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))
-(declare (uses debugprint.import))
 ;; (declare (uses mtargs))
 ;; (declare (uses mtargs.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import dbmod
-	commonmod
+(import commonmod
+	debugprint
 	dbfile
+	dbmod
 	servermod
-	debugprint
+	
 	)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")