@@ -43,10 +43,14 @@
 (declare (uses diff-report))
 ;; (declare (uses ftail))
 ;; (import ftail)
 
 ;; Needed for repl even if not used here in megatest.scm
+(declare (uses commonmod))
+(import commonmod)
+(declare (uses commonmod.import))
+
 (declare (uses dbmod))
 (import dbmod)
 (declare (uses dbmod.import))
 
 (declare (uses servermod))
@@ -55,14 +59,10 @@
 
 (declare (uses apimod))
 (import apimod)
 (declare (uses apimod.import))
 
-;; (declare (uses commonmod))
-;; (import commonmod)
-;; (declare (uses commonmod.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")