@@ -20,16 +20,22 @@
 (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
+;; notes:
+;;    1. the uses of .import are needed
+;;    2. the order is important
+;;    
 (declare (uses common))
 ;; (declare (uses megatest-version))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (declare (uses debugprint))
 (declare (uses debugprint.import))
+(declare (uses artifacts))
+(declare (uses artifacts.import))
 (declare (uses dbfile))
 (declare (uses dbfile.import))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
@@ -49,11 +55,13 @@
 (declare (uses db))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
 (declare (uses rmtmod))
 (declare (uses clientmod))
+(declare (uses clientmod.import))
 (declare (uses servermod))
+(declare (uses servermod.import))
 ;; (declare (uses mtargs))
 ;; (declare (uses mtargs.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
@@ -63,10 +71,16 @@
 	dbfile
 	dbmod
 	servermod
 	
 	)
+
+(include "commonmod.import.scm")
+(include "artifacts.import.scm")
+(include "rmtmod.import.scm")
+(include "clientmod.import.scm")
+(include "servermod.import.scm")
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -2415,10 +2429,13 @@
 	      (set! *db* dbstructs)
 	      (import extras) ;; might not be needed
 	      ;; (import csi)
 	      (import readline)
 	      (import apropos)
+	      (import commonmod)
+	      (import rmtmod)
+	      (import apimod)
 	      (import dbfile)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 
 	      (if *use-new-readline*
 		  (begin