@@ -41,13 +41,10 @@
 (cond-expand
  (chicken-4
   
   (import chicken
 	  ports
-	  (prefix base64 base64:)
-
-	  (prefix sqlite3 sqlite3:)
 	  data-structures
 	  extras
 	  files
 	  matchable
 	  md5
@@ -62,21 +59,14 @@
 	  srfi-18
 	  srfi-69
 	  typed-records
 	  z3
 	  
-	  debugprint
-	  (prefix mtargs args:)
 	  )
   (use srfi-69))
  (chicken-5
   (import (prefix sqlite3 sqlite3:)
-	  ;; data-structures
-	  ;; extras
-	  ;; files
-	  ;; posix
-	  ;; posix-extras
 	  chicken.base
 	  chicken.condition
 	  chicken.file
 	  chicken.file.posix
 	  chicken.io
@@ -92,20 +82,31 @@
 	  
 	  matchable
 	  md5
 	  message-digest
 	  pathname-expand
-	  regex
-	  regex-case
-	  srfi-1
-	  srfi-18
-	  srfi-69
-	  typed-records
 	  system-information
 
 	  debugprint
   )))
+
+(import regex
+	regex-case
+	srfi-1
+	srfi-18
+	srfi-69
+	typed-records
+	debugprint
+	(prefix mtargs args:)
+	(prefix base64 base64:)
+	(prefix sqlite3 sqlite3:)
+
+	dbmod
+	dbfile
+	commonmod
+	mtmod
+	)
 
 ;;======================================================================
 ;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
 (define (common:get-disks #!key (configf #f))
   (hash-table-ref/default