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

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -36,10 +36,13 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses gutils))
 (declare (uses rmt))
 (declare (uses ezsteps))
+(declare (uses commonmod))
+(import commonmod)
+
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
 
 (include "common_records.scm")

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -34,10 +34,13 @@
 (declare (unit dashboard-guimonitor))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses db))
 (declare (uses tasks))
+(declare (uses commonmod))
+(import commonmod)
+
 
 (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
@@ -35,10 +35,13 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses gutils))
 (declare (uses rmt))
 (declare (uses ezsteps))
+(declare (uses commonmod))
+(import commonmod)
+
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
 
 (include "common_records.scm")

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -46,10 +46,13 @@
 (declare (uses vg))
 (declare (uses subrun))
 ;; (declare (uses dashboard-main))
 (declare (uses megatest-version))
 (declare (uses mt))
+(declare (uses commonmod))
+(import commonmod)
+
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -28,10 +28,13 @@
 (declare (unit dcommon))
 
 (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
+(declare (uses commonmod))
+(import commonmod)
+
 ;; (declare (uses synchash))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -24,10 +24,13 @@
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+(declare (uses commonmod))
+(import commonmod)
+
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -21,10 +21,13 @@
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
 
 (declare (unit items))
 (declare (uses common))
+(declare (uses commonmod))
+(import commonmod)
+
 
 (include "common_records.scm")
 
 ;; Puts out all combinations
 (define (process-itemlist hierdepth curritemkey itemlist)

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -24,10 +24,13 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit keys))
 (declare (uses common))
+(declare (uses commonmod))
+(import commonmod)
+
 
 (include "key_records.scm")
 (include "common_records.scm")
 
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -19,10 +19,13 @@
 (use (prefix sqlite3 sqlite3:) srfi-18)
 
 (declare (unit lock-queue))
 (declare (uses common))
 (declare (uses tasks))
+(declare (uses commonmod))
+(import commonmod)
+
 
 ;;======================================================================
 ;; attempt to prevent overlapping updates of rollup files by queueing
 ;; update requests in an sqlite db
 ;;======================================================================

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -46,10 +46,11 @@
 ;; (declare (uses daemon))
 (declare (uses db))
 ;; (declare (uses dcommon))
 
 (declare (uses commonmod))
+(import commonmod)
 (declare (uses rmtmod))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))

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

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -29,10 +29,13 @@
 
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses configf))
+(declare (uses commonmod))
+(import commonmod)
+
 ;; (declare (uses rmt))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")

Index: ods.scm
==================================================================
--- ods.scm
+++ ods.scm
@@ -17,10 +17,13 @@
 ;;
 
 (use csv-xml regex)
 (declare (unit ods))
 (declare (uses common))
+(declare (uses commonmod))
+(import commonmod)
+
 
 (define ods:dirs
   '("Configurations2"
     "Configurations2/toolpanel"
     "Configurations2/menubar"

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

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -23,10 +23,13 @@
      call-with-environment-variables)
 (declare (unit subrun))
 ;;(declare (uses runs))
 (declare (uses db))
 (declare (uses common))
+(declare (uses commonmod))
+(import commonmod)
+
 ;;(declare (uses items))
 ;;(declare (uses runconfig))
 ;;(declare (uses tests))
 ;;(declare (uses server))
 (declare (uses mt))

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -32,10 +32,13 @@
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")

Index: vgmod.scm
==================================================================
--- vgmod.scm
+++ vgmod.scm
@@ -18,10 +18,11 @@
 
 ;;======================================================================
 
 (declare (unit vgmod))
 (declare (uses commonmod))
+(import commonmod)
 
 (module vgmod
 	*
 	
 (import scheme chicken data-structures extras)