@@ -29,21 +29,26 @@
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit tree))
 (declare (uses mtargs))
 (declare (uses mtver))
-(declare (uses launch))
+(declare (uses launchmod))
 ;; (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses dbmod))
 (declare (uses servermod))
 ;; (declare (uses synchash))
 (declare (uses dcommon))
 
-(import mtver)
+(import mtver
+	launchmod
+	dbmod
+	servermod
+	)
+
 ;; (include "megatest-version.scm")
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 
 ;;======================================================================
 ;; T R E E   S T U F F