@@ -41,15 +41,18 @@
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses dbmod))
 (declare (uses dbmod.import))
+(declare (uses dbfile))
+(declare (uses dbfile.import))
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import dbmod)
+(import dbmod
+	dbfile)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -2295,22 +2298,22 @@
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close patch-db #f)
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct full: #t))
+      (let ((dbstructs (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstructs full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (let ((dbstruct (db:setup #f areapath: *toppath*)))
-        (common:cleanup-db dbstruct))
+      (let ((dbstructs (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstructs))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
       (if (not (launch:setup))
@@ -2362,14 +2365,14 @@
 
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
-	   (dbstruct (if (and toppath
-                              (common:on-homehost?))
-                         (db:setup #t)
-                         #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
+	   (dbstructs (if (and toppath
+                               (common:on-homehost?))
+                          (db:setup #t)
+                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
 	    ;;
@@ -2382,15 +2385,16 @@
 	    ;; EOF
 
 	    (repl))
 	   (else
 	    (begin
-	      (set! *db* dbstruct)
+	      (set! *db* dbstructs)
 	      (import extras) ;; might not be needed
 	      ;; (import csi)
 	      (import readline)
 	      (import apropos)
+	      (import dbfile)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 
 	      (if *use-new-readline*
 		  (begin
 		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])