Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -24,10 +24,13 @@
 (declare (uses db))
 (declare (uses common))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;;======================================================================

Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -30,10 +30,13 @@
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;; client:get-signature

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -42,10 +42,13 @@
 ;; (declare (uses filedb))
 (declare (uses subrun))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -37,10 +37,13 @@
 (declare (uses db))
 (declare (uses tasks))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -41,10 +41,13 @@
 ;; (declare (uses filedb))
 (declare (uses subrun))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -30,10 +30,13 @@
 (declare (uses gutils))
 (declare (uses db))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (declare (uses dcommonmod))
 (import dcommonmod)
 
 ;; (declare (uses synchash))

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -30,10 +30,13 @@
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ fs-transport.scm
@@ -32,10 +32,13 @@
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -38,10 +38,13 @@
 (declare (uses portlogger))
 (declare (uses rmt))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -35,10 +35,13 @@
 (declare (uses db))
 (declare (uses ezsteps))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -31,10 +31,13 @@
 (declare (uses rmt))
 ;; (declare (uses filedb))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -32,10 +32,13 @@
 (declare (uses megatest-version))
 (declare (uses margs))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 ;; (declare (uses launch))
 ;; (declare (uses gutils))
 ;; (declare (uses db))
 ;; (declare (uses server))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -25,10 +25,13 @@
 (declare (unit portlogger))
 (declare (uses db))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 ;; lsof -i
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -32,10 +32,13 @@
 (declare (uses archive))
 ;; (declare (uses filedb))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -33,10 +33,13 @@
 ;;(declare (uses archive))
 ;; (declare (uses filedb))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 ;;(include "common_records.scm")
 ;;(include "key_records.scm")
 (include "db_records.scm") ;; provides db:test-get-id
 ;;(include "run_records.scm")

Index: synchash.scm
==================================================================
--- synchash.scm
+++ synchash.scm
@@ -27,10 +27,14 @@
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit synchash))
 (declare (uses db))
 (declare (uses server))
+
+(declare (uses dbmod))
+(import dbmod)
+
 (include "db_records.scm")
 
 (define (synchash:make)
    (make-hash-table))
 

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -34,10 +34,13 @@
 (declare (uses mt))
 (declare (uses db))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (declare (uses ods))
 (import ods)
 
 (include "common_records.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -38,10 +38,13 @@
 (import (prefix sqlite3 sqlite3:))
 (require-library stml)
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -36,10 +36,13 @@
 ;; (declare (uses synchash))
 (declare (uses dcommon))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses dbmod))
+(import dbmod)
 
 
 (include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")