Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -535,11 +535,11 @@
 # portlogger-example : portlogger-example.scm api.o archive.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o genexample.o gutils.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 #	csc $(CSCOPTS) portlogger-example.scm api.o archive.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o genexample.o gutils.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o server.o sync-hash.o tasks.o tdb.o tests.o tree.o
 
 # IMPORTSTUBS = $(*import.scm:%.scm=%)
 
-unitdeps.dot : *scm ./utils/plot-uses Makefile
+unitdeps.dot : *mod.scm ./utils/plot-uses Makefile
 	./utils/plot-uses todot processmod.import,dbfile.import,dbmod.import,configfmod.import,mtmod.import,procesmod.import,commonmod.import,mtargs.import,mtargs,debugprint $$(ls *.scm|grep -v import) > unitdeps.dot
 
 # ./utils/plot-uses todot commonmod,portlogger,stml2,debugprint,mtargs apimod.scm commonmod.scm configfmod.scm dbmod.scm megatestmod.scm mtmod.scm processmod.scm rmtmod.scm servermod.scm tcp-transportmod.scm > uses.dot ; dot uses.dot -Tpdf -o uses.pdf
 
 #  apimod.scm commonmod.scm configfmod.scm dbmod.scm megatestmod.scm mtmod.scm processmod.scm rmtmod.scm servermod.scm tcp-transportmod.scm testsmod.scm

Index: archivemod.scm
==================================================================
--- archivemod.scm
+++ archivemod.scm
@@ -122,11 +122,11 @@
 	typed-records
 	z3
 	)
 	
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; 
 ;;======================================================================
 

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -133,10 +133,14 @@
 ;;
 ;;======================================================================
 
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
+(include "db_records.scm")
+(include "key_records.scm")
+(include "common_records.scm")
+
 
 ;; http - use the old http + in /tmp db
 ;; tcp  - use tcp transport with cachedb db
 ;; nfs  - use direct to disk access (read-only)
 ;;
@@ -626,13 +630,10 @@
 
 ;;======================================================================
 ;; old stuff from keys.scm
 ;;======================================================================
 
-(include "key_records.scm")
-(include "common_records.scm")
-
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...
   (string-intersperse keys ","))
 
 ;; (define (args:usage . a) #f)
 

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -45,11 +45,11 @@
 
 (use srfi-1 posix regex regex-case srfi-69)
 (use (prefix sqlite3 sqlite3:))
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 
 (import commonmod
 	configfmod
 	rmtmod

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -36,11 +36,11 @@
 (declare (uses keys))
 (declare (uses commonmod))
 (import commonmod)
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 
 (define (control-panel db tdb keys)
   (let* ((var-params (make-hash-table)) ;; register all the widgets here for querying on run, rollup, remove?

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -62,11 +62,11 @@
 	runsmod
 	subrunmod
 	)
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 
 ;;======================================================================
 ;; C O M M O N
 ;;======================================================================

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -108,11 +108,11 @@
 	runsmod
 	testsmod
 	)
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "vg_records.scm")

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -80,12 +80,12 @@
 	debugprint
 	mtmod
 	)
 
 (include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
 (include "run_records.scm")
 
 (define *number-of-writes* 0)
 (define *number-non-write-queries* 0)
 

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -41,12 +41,12 @@
         dbmod
 	debugprint)
 
 (include "megatest-version.scm")
 (include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
 (include "run_records.scm")
 
 ;; yes, this is non-ideal 
 (define dashboard:update-summary-tab #f)
 (define dashboard:update-servers-table #f)

Index: ezstepsmod.scm
==================================================================
--- ezstepsmod.scm
+++ ezstepsmod.scm
@@ -127,12 +127,12 @@
 	runsmod
 	fsmod
 	)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 
 
 ;;(rmt:get-test-info-by-id run-id test-id) -> testdat
 

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -31,11 +31,11 @@
 	commonmod
 	configfmod
 	rmtmod
 	debugprint)
 
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF
   ;; You should have at least one expect:required. This ensures that your process ran
   ;; comment out the line below and replace "put pattern here" with a pattern that will

Index: key_records.scm
==================================================================
--- key_records.scm
+++ key_records.scm
@@ -16,17 +16,17 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
-(define-inline (keys->valslots keys) ;; => ?,?,? ....
+(define (keys->valslots keys) ;; => ?,?,? ....
   (string-intersperse (map (lambda (x) "?") keys) ","))
 
-;; (define-inline (keys->key/field keys . additional)
+;; (define (keys->key/field keys . additional)
 ;;   (string-join (map (lambda (k)(conc k " TEXT"))
 ;; 		    (append keys additional)) ","))
 
-(define-inline (item-list->path itemdat)
+(define (item-list->path itemdat)
   (if (list? itemdat)
       (string-intersperse  (map cadr itemdat) "/")
       ""))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -47,12 +47,12 @@
 	(prefix sqlite3 sqlite3:)
 	(prefix mtargs args:)
 )
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "megatest-fossil-hash.scm")
 
 (import commonmod
 	processmod
 	configfmod

Index: launchmod.scm
==================================================================
--- launchmod.scm
+++ launchmod.scm
@@ -127,12 +127,12 @@
 	runsmod
 	fsmod
 	)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "megatest-fossil-hash.scm")
 
 ;;======================================================================
 ;; ezsteps
 ;;======================================================================

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -119,12 +119,12 @@
         )
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:))
 (use readline apropos json http-client directory-utils typed-records)

Index: monitor.scm
==================================================================
--- monitor.scm
+++ monitor.scm
@@ -26,9 +26,9 @@
 (declare (uses runconfig))
 (declare (uses commonmod))
 (import commonmod)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -42,12 +42,12 @@
 
 ;; make mt: calls in megatestmod work
 ;; (read-config-set! read-config)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
 ;; here.

Index: mtmod.scm
==================================================================
--- mtmod.scm
+++ mtmod.scm
@@ -109,11 +109,11 @@
   )))
 
 ;; imports common to chk5 and ck4
 (import srfi-13)
 
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; stuff from keys that can't be in commonmod. Maybe move all from commonmod to here?
 ;;======================================================================
 

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -53,11 +53,11 @@
 	apimod
 	mtmod
 	servermod
 	)
 
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 (defstruct alldat
   (areapath #f)
   (ulexdat  #f)
   )

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -43,12 +43,12 @@
      sxml-modifications matchable)
 
 
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; (include "debugger.scm")
 

Index: runsmod.scm
==================================================================
--- runsmod.scm
+++ runsmod.scm
@@ -128,12 +128,12 @@
 	archivemod
 	fsmod
 	)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 
 ;; use this struct to facilitate refactoring
 ;;

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -35,11 +35,11 @@
 	configfmod
 	debugprint
 	(prefix mtargs args:))
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 (define (db:kill-servers)
   (let* ((tl (launch:setup)) ;; need this to initialize *toppath*
         (servdir (conc *toppath* "/.servinfo"))
         (servfiles (glob (conc servdir "/*:*.db")))

Index: servermod.scm
==================================================================
--- servermod.scm
+++ servermod.scm
@@ -47,11 +47,11 @@
 	(prefix mtargs args:)
 	mtmod
 	)
 
 (include "common_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 (define (server:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))

Index: subrunmod.scm
==================================================================
--- subrunmod.scm
+++ subrunmod.scm
@@ -121,11 +121,11 @@
 	tasksmod
 	)
 
 ;(include "common_records.scm")
 ;;(include "key_records.scm")
-(include "db_records.scm") ;; provides db:test-get-id
+;; (include "db_records.scm") ;; provides db:test-get-id
 ;;(include "run_records.scm")
 ;;(include "test_records.scm")
 
 (define (subrun:subrun-test-initialized? test-run-dir)
   (if (and (common:file-exists? (conc test-run-dir "/subrun-area") )

Index: tasksmod.scm
==================================================================
--- tasksmod.scm
+++ tasksmod.scm
@@ -115,11 +115,11 @@
 	mtmod
 	megatestmod
 	)
 
 (include "task_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; Tasks db
 ;;======================================================================
 

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -39,11 +39,11 @@
 	rmtmod
 	(prefix mtargs args:))
 
 (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 (define origargs (cdr (argv)))
 (define remargs (args:get-args
 		 (argv)
 		 `( "-target"

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -40,12 +40,12 @@
 	debugprint
 	rmtmod
 	(prefix mtargs args:))
 
 (include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
 (include "run_records.scm")
 
 ;;======================================================================
 ;;
 ;; T E S T   D A T A B A S E S

Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -126,12 +126,12 @@
 	servermod
 	fsmod
 	)
 
 (include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
 (include "js-path.scm")
 
 (define (init-java-script-lib)

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -37,12 +37,12 @@
 (import (prefix mtargs args:)
 	debugprint)
 
 (include "megatest-version.scm")
 (include "common_records.scm")
-(include "db_records.scm")
-(include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
 
 ;;======================================================================
 ;; T R E E   S T U F F 
 ;;======================================================================