@@ -20,22 +20,10 @@
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
-     readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format)
-
-;; Added for csv stuff - will be removed
-;;
-(use sparse-vectors)
-
-(import mutils ducttape-lib)
-
-;; (use zmq)
-
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
@@ -44,10 +32,12 @@
 (declare (uses tests))
 (declare (uses genexample))
 ;; (declare (uses daemon))
 (declare (uses db))
 ;; (declare (uses dcommon))
+(declare (uses stml2))
+(declare (uses pkts))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
@@ -54,17 +44,38 @@
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses ftail))
 (import ftail)
 
+(import stml2)
+
+;; invoke the imports
+;; (declare (uses mtargs.import))
+;; (declare (uses mtconfigf.import))
+(declare (uses cookie.import))
+(declare (uses stml2.import))
+(declare (uses pkts.import))
+
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
+     readline apropos json http-client directory-utils typed-records
+     http-client srfi-18 extras format)
+
+;; Added for csv stuff - will be removed
+;;
+(use sparse-vectors)
+
+(import mutils ducttape-lib stml2)
+
+;; (use zmq)
 
 (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
 
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file