@@ -19,17 +19,17 @@
 (declare (uses common))
 (declare (uses mtargs))
 (declare (uses mtargs.import))
 (declare (uses debugprint))
 (declare (uses debugprint.import))
+(declare (uses configfmod))
+(declare (uses configfmod.import))
 (declare (uses configf))
 ;; (declare (uses rmt))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
 
-(import debugprint)
-					; (include "common.scm")
 (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
@@ -37,11 +37,13 @@
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      (prefix sqlite3 sqlite3:)
      nanomsg)
 
-(import commonmod
+(import debugprint
+	commonmod
+	configfmod
 	(prefix mtargs args:))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")