Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -43,11 +43,11 @@
             tcp-transportmod.scm rmtmod.scm portlogger.scm apimod.scm \
 	    configfmod.scm processmod.scm servermod.scm megatestmod.scm \
 	    stml2.scm fsmod.scm cpumod.scm mtmod.scm odsmod.scm \
             pkts.scm testsmod.scm pgdb.scm cookie.scm launchmod.scm \
             subrunmod.scm runsmod.scm tasksmod.scm archivemod.scm \
-  	    ezstepsmod.scm
+            ezstepsmod.scm
 
 transport-mode.scm : transport-mode.scm.template
 	cp transport-mode.scm.template transport-mode.scm
 
 dashboard-transport-mode.scm : dashboard-transport-mode.scm.template
@@ -64,15 +64,16 @@
 mofiles/servermod.o  : mofiles/commonmod.o
 mofiles/rmtmod.o     : mofiles/mtmod.o mofiles/apimod.o
 mofiles/dbmod.o      : mofiles/mtmod.o
 # mofiles/mtmod.o      : mofiles/tcp-transportmod.o
 mofiles/megatestmod.o : mofiles/pkts.o mofiles/servermod.o mofiles/fsmod.o
-mofiles/mtmod.o      : mofiles/testsmod.o
+# mofiles/mtmod.o      : mofiles/testsmod.o
 mofiles/subrunmod.o  : mofiles/tasksmod.o
 mofiles/launchmod.o  : mofiles/subrunmod.o mofiles/runsmod.o
 mofiles/launchmod.o  : mofiles/ezstepsmod.o
 mofiles/runsmod.o    : mofiles/archivemod.o
+mofiles/testsmod.o   : mofiles/dbmod.o
 
 mofiles/dbfile.o     : \
        mofiles/debugprint.o mofiles/commonmod.o  mofiles/configfmod.o
 mofiles/apimod.o : mofiles/commonmod.o mofiles/tcp-transportmod.o mofiles/configfmod.o mofiles/megatestmod.o
 mofiles/dbmod.o : mofiles/dbfile.o

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -33,10 +33,12 @@
 (declare (uses rmtmod))
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
 (declare (uses subrun))
+(declare (uses testsmod))
+(declare (uses subrunmod))
 
 (use format fmt)
 (require-library iup)
 (import (prefix iup iup:))
 
@@ -50,10 +52,12 @@
 (include "run_records.scm")
 
 (import commonmod
 	configfmod
 	rmtmod
+	testsmod
+	subrunmod
 	debugprint)
 
 (define (dboard:launch-testpanel run-id test-id)
   (let* ((dboardexe (common:find-local-megatest "dashboard"))
          (cmd (conc dboardexe

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -30,17 +30,20 @@
 (declare (uses rmtmod))
 (declare (uses megatestmod))
 (declare (uses dbmod))
 (declare (uses dbfile))
 (declare (uses tasksmod))
+(declare (uses testsmod))
 
 (declare (uses dcommon))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses rmt))
 (declare (uses ezsteps))
 (declare (uses subrun))
+(declare (uses runsmod))
+(declare (uses subrunmod))
 
 (use format fmt)
 (require-library iup)
 (import (prefix iup iup:))
 
@@ -55,10 +58,13 @@
 	debugprint
 	megatestmod
 	dbmod
 	dbfile
 	tasksmod
+	testsmod
+	runsmod
+	subrunmod
 	)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -69,12 +69,10 @@
 (declare (uses subrunmod.import))
 (declare (uses archivemod))
 (declare (uses archivemod.import))
 (declare (uses runsmod))
 (declare (uses runsmod.import))
-(declare (uses fsmod))
-(declare (uses fsmod.import))
 (declare (uses cpumod))
 (declare (uses cpumod.import))
 (declare (uses runsmod))
 (declare (uses ezstepsmod))
 (declare (uses launchmod))
@@ -119,10 +117,12 @@
 	megatestmod
 	servermod
 	tasksmod
 	runsmod
 	rmtmod
+	launchmod
+	fsmod
         )
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")

Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -34,10 +34,11 @@
 (declare (uses megatestmod))
 (declare (uses rmtmod))
 (declare (uses stml2))
 (declare (uses mtmod))
 (declare (uses servermod))
+(declare (uses fsmod))
 
 (use srfi-69)
 
 (module testsmod
 	*
@@ -121,10 +122,11 @@
 	megatestmod
 	rmtmod
 	stml2
 	mtmod
 	servermod
+	fsmod
 	)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")