Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -96,18 +96,17 @@
 
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 
-IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o		\
-odsmod.import.o runsmod.import.o testsmod.import.o			\
-archivemod.import.o keysmod.import.o		\
-processmod.import.o servermod.import.o		\
-clientmod.import.o envmod.import.o launchmod.import.o rmtmod.import.o	\
-subrunmod.import.o  commonmod.import.o			\
-ezstepsmod.import.o megamod.import.o runconfigmod.import.o		\
-tasksmod.import.o
+IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o	\
+odsmod.import.o runsmod.import.o testsmod.import.o		\
+archivemod.import.o keysmod.import.o processmod.import.o	\
+servermod.import.o clientmod.import.o envmod.import.o		\
+launchmod.import.o rmtmod.import.o subrunmod.import.o		\
+commonmod.import.o ezstepsmod.import.o megamod.import.o		\
+runconfigmod.import.o tasksmod.import.o
 
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
 # why were the files  mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o listed on this target when MOFILES are there?
 # Removed non module .o files (i.e. $(OFILES)
@@ -206,11 +205,11 @@
 
 mofiles/commonmod.o : megatest-fossil-hash.scm
 mofiles/dbmod.o     : mofiles/commonmod.o mofiles/keysmod.o mofiles/tasksmod.o mofiles/odsmod.o
 mofiles/commonmod.o : mofiles/processmod.o
 mofiles/rmtmod.o    : mofiles/dbmod.o mofiles/commonmod.o mofiles/apimod.o
-mofiles/apimod.o    : mofiles/megamod.o mofiles/dbmod.o
+mofiles/apimod.o    : mofiles/dbmod.o
 # Removed from megamod.o dep:   mofiles/ftail.o
 mofiles/megamod.o   : \
    mofiles/rmtmod.o \
    mofiles/commonmod.o \
    mofiles/apimod.o \

Index: apimod.scm
==================================================================
--- apimod.scm
+++ apimod.scm
@@ -19,11 +19,11 @@
 ;;======================================================================
 
 (declare (unit apimod))
 (declare (uses commonmod))
 (declare (uses dbmod))
-(declare (uses megamod))
+;; (declare (uses megamod))
 
 (module apimod
 	*
 	
 (import scheme chicken data-structures extras)
@@ -30,12 +30,12 @@
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable
 	s11n z3 (prefix base64 base64:) regex stack srfi-13
 	irregex)
 (import commonmod)
 (import dbmod)
-(import megamod)
+;; (import megamod)
 ;; (use (prefix ulex ulex:))
 
 (include "common_records.scm")
 
 
 )

Index: common-inc.scm
==================================================================
--- common-inc.scm
+++ common-inc.scm
@@ -118,45 +118,10 @@
     (else "FAIL")))
 
 (define (common:logpro-exit-code->test-status exit-code)
   (status-sym->string (common:logpro-exit-code->status-sym exit-code)))
 
-(defstruct remote
-  (hh-dat            (common:get-homehost)) ;; homehost record ( addr . hhflag )
-  (server-url        (if *toppath* (server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
-  (last-server-check 0)  ;; last time we checked to see if the server was alive
-  (conndat           #f)
-  (transport         *transport-type*)
-  (server-timeout    (server:expiration-timeout))
-  (force-server      #f)
-  (ro-mode           #f)  
-  (ro-mode-checked   #f)) ;; flag that indicates we have checked for ro-mode
-
-;; launching and hosts
-(defstruct host
-  (reachable    #f)
-  (last-update  0)
-  (last-used    0)
-  (last-cpuload 1))
-
-(define *host-loads*         (make-hash-table))
-
-;; cache environment vars for each run here
-(define *env-vars-by-run-id* (make-hash-table))
-
-;; Testconfig and runconfig caches. 
-(define *testconfigs*        (make-hash-table)) ;; test-name => testconfig
-(define *runconfigs*         (make-hash-table)) ;; target    => runconfig
-
-;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
-;; five seconds ago
-(define *pre-reqs-met-cache* (make-hash-table))
-
-;; cache of verbosity given string
-;;
-(define *verbosity-cache*    (make-hash-table))
-
 (define (common:clear-caches)
   (set! *target*             (make-hash-table))
   (set! *keys*               (make-hash-table))
   (set! *keyvals*            (make-hash-table))
   (set! *toptest-paths*      (make-hash-table))

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -511,10 +511,26 @@
 
 
 
 
 
+(define *host-loads*         (make-hash-table))
+
+;; cache environment vars for each run here
+(define *env-vars-by-run-id* (make-hash-table))
+
+;; Testconfig and runconfig caches. 
+(define *testconfigs*        (make-hash-table)) ;; test-name => testconfig
+(define *runconfigs*         (make-hash-table)) ;; target    => runconfig
+
+;; This is a cache of pre-reqs met, don't re-calc in cases where called with same params less than
+;; five seconds ago
+(define *pre-reqs-met-cache* (make-hash-table))
+
+;; cache of verbosity given string
+;;
+(define *verbosity-cache*    (make-hash-table))
 
 
 
 
 

Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -104,16 +104,15 @@
 (define read-config configf:read-config)
 (define find-and-read-config configf:find-and-read-config)
 (define config:eval-string-in-environment configf:eval-string-in-environment)
 
 (import spiffy)
-(import commonmod)
 
 ;; (import apimod)
 ;; (import archivemod)
 ;; (import clientmod)
-;; (import commonmod)
+(import commonmod)
 ;; (import dbmod)
 ;; (import dcommonmod)
 ;; (import envmod)
 ;; (import ezstepsmod)
 ;; (import ftail)
@@ -120,11 +119,11 @@
 ;; (import itemsmod)
 ;; (import keysmod)
 ;; (import launchmod)
 ;; (import odsmod)
 ;; (import processmod)
-;; ;; (import rmtmod)
+(import rmtmod)
 ;; (import runconfigmod)
 ;; (import runsmod)
 ;; (import servermod)
 ;; (import subrunmod)
 ;; (import tasksmod)

Index: rmt-inc.scm
==================================================================
--- rmt-inc.scm
+++ rmt-inc.scm
@@ -29,10 +29,30 @@
 ;; Globally used variables
 
 ;; db stats
 (define *db-stats*            (make-hash-table)) ;; hash of vectors < count duration-total >
 (define *db-stats-mutex*      (make-mutex))
+
+
+(defstruct remote
+  (hh-dat            (common:get-homehost)) ;; homehost record ( addr . hhflag )
+  (server-url        (if *toppath* (server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
+  (last-server-check 0)  ;; last time we checked to see if the server was alive
+  (conndat           #f)
+  (transport         *transport-type*)
+  (server-timeout    (server:expiration-timeout))
+  (force-server      #f)
+  (ro-mode           #f)  
+  (ro-mode-checked   #f)) ;; flag that indicates we have checked for ro-mode
+
+;; launching and hosts
+(defstruct host
+  (reachable    #f)
+  (last-update  0)
+  (last-used    0)
+  (last-cpuload 1))
+
 
 ;;======================================================================
 ;;  S U P P O R T   F U N C T I O N S
 ;;======================================================================
 

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -31,8 +31,9 @@
 ;; (import commonmod) ;;; DO NOT ALLOW rmt*scm TO DEPEND ON common*scm!!!!
 ;; (import dbmod)
 ;; (import megamod)
 
 (use (prefix ulex ulex:))
+;; (include "rmt-inc.scm")
 
 ;; (include "common_records.scm")
 )