@@ -27,26 +27,24 @@
 ;; (declare (uses margs))
 (declare (uses mtargs))
 (declare (uses mtargs.import))
 (declare (uses debugprint))
 (declare (uses debugprint.import))
+(declare (uses cookie))
+(declare (uses cookie.import))
+(declare (uses stml2))
+(declare (uses stml2.import))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 (declare (uses processmod))
 (declare (uses processmod.import))
 (declare (uses configfmod))
 (declare (uses configfmod.import))
-
-(declare (uses runs))
-(declare (uses launch))
-(declare (uses server))
-(declare (uses tests))
-(declare (uses genexample))
-;; (declare (uses daemon))
-
-(declare (uses db))
-;; (declare (uses dcommon))
+(declare (uses mtmod))
+(declare (uses mtmod.import))
+(declare (uses servermod))
+(declare (uses servermod.import))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
@@ -59,22 +57,30 @@
 (declare (uses dbmod.import))
 (declare (uses portlogger))
 (declare (uses portlogger.import))
 (declare (uses tcp-transportmod))
 (declare (uses tcp-transportmod.import))
+(declare (uses megatestmod))
+(declare (uses megatestmod.import))
 (declare (uses apimod))
 (declare (uses apimod.import))
 (declare (uses rmtmod))
 (declare (uses rmtmod.import))
 (declare (uses fsmod))
 (declare (uses fsmod.import))
 (declare (uses cpumod))
 (declare (uses cpumod.import))
-(declare (uses mtmod))
-(declare (uses mtmod.import))
-(declare (uses megatestmod))
-(declare (uses megatestmod.import))
+
+(declare (uses runs))
+(declare (uses launch))
+(declare (uses server))
+(declare (uses tests))
+(declare (uses genexample))
+;; (declare (uses daemon))
+
+(declare (uses db))
+;; (declare (uses dcommon))
 
 ;; (declare (uses debugprint))
 ;; (declare (uses debugprint.import))
 
 ;; (declare (uses ftail))
@@ -89,10 +95,14 @@
 	dbfile
 	portlogger
 	tcp-transportmod
 	rmtmod
 	apimod
+	stml2
+	mtmod
+	megatestmod
+	servermod
         )
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
@@ -108,10 +118,13 @@
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
 (require-library mutils)
+
+;; remove when configf fully modularized
+(read-config-set! configf:read-file)
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
 ;; set some parameters here - these need to be put in something that can be loaded from other