Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -31,22 +31,22 @@
      #;(prefix mtconfigf configf:)
      ) 
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses mtargs))
-(import (prefix mtargs args:))
 (declare (uses pkts))
-(import pkts)
 (declare (uses ulex))
-(import ulex)
 (declare (uses cookie))
+(declare (uses stml2))
+(declare (uses mtconfigf))
+(declare (uses ducttape-lib))
+(import (prefix mtargs args:))
+(import pkts)
+(import ulex)
 (import cookie)
-(declare (uses stml2))
 (import stml2)
-(declare (uses mtconfigf))
 (import (prefix mtconfigf configf:))
-(declare (uses ducttape-lib))
 (import ducttape-lib)
 
 ;; invoke the imports - ORDER IS IMPORTANT!
 (declare (uses mtargs.import))
 (declare (uses pkts.import))
@@ -55,24 +55,26 @@
 (declare (uses stml2.import))
 (declare (uses ducttape-lib.import))
 (declare (uses mtconfigf.import))
 
 (declare (uses gutilsmod))
-(import gutilsmod)
 (declare (uses megamod))
-(import megamod)
 (declare (uses commonmod))
-(import commonmod)
 (declare (uses rmtmod))
-(import rmtmod)
 (declare (uses runsmod))
-(import runsmod)
 (declare (uses dbmod))
-(import dbmod)
 (declare (uses testsmod))
-(import testsmod)
 (declare (uses dcommonmod))
+
+
+(import gutilsmod)
+(import megamod)
+(import commonmod)
+(import rmtmod)
+(import runsmod)
+(import dbmod)
+(import testsmod)
 (import dcommonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: dcommonmod.scm
==================================================================
--- dcommonmod.scm
+++ dcommonmod.scm
@@ -23,10 +23,15 @@
 (declare (uses testsmod))
 (declare (uses megamod))
 (declare (uses mtargs))
 (declare (uses mtconfigf))
 (declare (uses gutilsmod))
+(declare (uses subrunmod))
+(declare (uses runsmod))
+(declare (uses rmtmod))
+(declare (uses dbmod))
+(declare (uses servermod))
 
 (module dcommonmod
 	*
 	
 (import scheme chicken data-structures extras)
@@ -86,10 +91,15 @@
 (import (prefix mtconfigf configf:))
 (import gutilsmod)
 (import commonmod)
 (import testsmod)
 (import megamod)
+(import subrunmod)
+(import runsmod)
+(import rmtmod)
+(import dbmod)
+(import servermod)
 (import canvas-draw)
 (import canvas-draw-iup)
 (use (prefix iup iup:))
 (import (prefix mtargs args:))
 
@@ -103,14 +113,14 @@
 (include "run_records.scm")
 (include "task_records.scm")
 (include "test_records.scm")
 (include "vg_records.scm")
 
-(include "dcommon-inc.scm")
 (include "dashboard-tests-inc.scm")
+(include "dcommon-inc.scm")
 (include "vg-inc.scm")
 (include "tree-inc.scm")
 (include "dashboard-context-menu-inc.scm")
 (include "ezsteps-inc.scm")
-;; (include "gutils-inc.scm")
+;;;; (include "gutils-inc.scm")
 
 )