Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -27,23 +27,25 @@
 	*
 	
 (import scheme chicken data-structures extras)
 
 (use (prefix sqlite3 sqlite3:) posix typed-records srfi-18
-	srfi-1 files format srfi-13 matchable 
-	srfi-69 ports
-	(prefix base64 base64:)
-	regex-case regex hostinfo srfi-4
-	pkts (prefix dbi dbi:)
-	stack
-	md5 
-	message-digest
-	(prefix mtconfigf configf:)
-	z3
-	(prefix mtargs args:)
-	directory-utils
-	sparse-vectors)
+     srfi-1 files format srfi-13 matchable 
+     srfi-69 ports
+     (prefix base64 base64:)
+     regex-case regex hostinfo srfi-4
+     (prefix dbi dbi:)
+     stack
+     md5 
+     message-digest
+     z3
+     directory-utils
+     sparse-vectors)
+
+(import pkts)
+(import	(prefix mtconfigf configf:))
+(import	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "megatest-fossil-hash.scm")
 (include "megatest-version.scm")
 

Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -21,12 +21,13 @@
 (declare (unit megamod))
 
 (declare (uses stml2))
 (declare (uses mtargs))
 
-(declare (uses apimod))
 (declare (uses commonmod))
+(declare (uses apimod))
+(declare (uses keysmod))
 (declare (uses dbmod))
 (declare (uses ducttape-lib))
 (declare (uses itemsmod))
 (declare (uses mtconfigf))
 (declare (uses odsmod))
@@ -112,13 +113,15 @@
 (import spiffy)
 
 (import stml2)
 (import (prefix mtargs args:))
 
-(import apimod)
+;; Order here is important!
 (import commonmod)
+(import keysmod)
 (import dbmod)
+(import apimod)
 (import ducttape-lib)
 (import itemsmod)
 (import pkts)
 (import pgdbmod)
 (import rmtmod)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -34,13 +34,15 @@
 (declare (uses mtconfigf))
 
 (import (prefix mtargs args:))
 (import (prefix mtconfigf configf:))
 
+;; order maters
+(declare (uses commonmod))
 (declare (uses apimod))
-;; (declare (uses commonmod))
 (declare (uses cookie))
+(declare (uses keysmod))
 (declare (uses dbmod))
 (declare (uses ducttape-lib))
 (declare (uses megamod))
 (declare (uses mutils))
 (declare (uses pgdbmod))
@@ -50,14 +52,15 @@
 (declare (uses stml2))
 (declare (uses tasksmod))
 (declare (uses testsmod))
 (declare (uses ulex))
 
-(import apimod)
-;; (import commonmod)
-(import cookie)
+(import commonmod)
+(import keysmod)
 (import dbmod)
+(import apimod)
+(import cookie)
 (import ducttape-lib)
 (import megamod)
 (import mutils)
 (import pgdbmod)
 (import pkts)
@@ -65,15 +68,22 @@
 (import runsmod)
 (import stml2)
 (import testsmod)
 (import ulex)
 
+;; NOTE: Order is important!
+
+;; invoke the imports
+(declare (uses mtargs.import))
+(declare (uses mtconfigf.import))
+
 ;; invoke the imports
+(declare (uses commonmod.import))
+(declare (uses keysmod.import))
+(declare (uses dbmod.import))
 (declare (uses apimod.import))
-;; (declare (uses commonmod.import))
 (declare (uses cookie.import))
-(declare (uses dbmod))
 (declare (uses ducttape-lib.import))
 (declare (uses megamod.import))
 (declare (uses mutils.import))
 (declare (uses pkts.import))
 (declare (uses pgdbmod.import))
@@ -82,14 +92,10 @@
 (declare (uses stml2.import))
 (declare (uses tasksmod.import))
 (declare (uses testsmod.import))
 (declare (uses ulex.import))
 
-;; invoke the imports
-(declare (uses mtargs.import))
-(declare (uses mtconfigf.import))
-
 (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
 
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 (define *default-log-port* (current-error-port))