Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -32,11 +32,11 @@
 keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm	\
 runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm	\
 pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm ulex.scm		\
 stml2.scm cookie.scm megamod.scm mutils.scm
 
-GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm
+GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm gutilsmod.scm
 
 # Eggs to install (straightforward ones)
 
 EGGS=matchable readline apropos base64 regex-literals format		\
 regex-case test coops trace csv dot-locking posix-utils posix-extras	\
@@ -44,11 +44,11 @@
 http-client spiffy uri-common intarweb spiffy-request-vars		\
 spiffy-directory-listing ssax sxml-serializer sxml-modifications iup	\
 canvas-draw sqlite3
 
 GUISRCF = dashboard-context-menu.scm dashboard-tests.scm	\
-dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm
+dashboard-guimonitor.scm dcommon.scm tree.scm vg.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
@@ -66,11 +66,11 @@
 #	csc -I ducttape -J -c ducttape-lib.scm -o mofiles/ducttape-lib.o
 
 mofiles/%.o %.import.scm : %.scm
 	@[ -e mofiles ] && mkdir -p mofiles
 	csc $(CSCOPTS) -I $* -J -c $< -o mofiles/$*.o
-	touch $*.import.scm # ensure it is touched after the .o is made
+	@touch $*.import.scm # ensure it is touched after the .o is made
 
 # a.import.o : a.import.scm a.o
 # csc -unit a.import -c a.import.scm -o $*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
@@ -107,12 +107,12 @@
 	csc dashboard.scm $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard
 
 ndboard : newdashboard.scm $(GOFILES)
 	csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard
 
-mtut:  $(MOFILES) megatest-fossil-hash.scm mtut.scm
-	csc $(CSCOPTS) $(MOFILES) mtut.scm -o mtut
+mtut:  $(MOFILES) $(MOIMPFILES) megatest-fossil-hash.scm mtut.scm
+	csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) mtut.scm -o mtut
 
 TCMTOBJS=
 
 tcmt : $(TCMTOBJS) $(MOFILES) tcmt.scm
 	csc $(CSCOPTS) $(MOFILES) $(TCMTOBJS) tcmt.scm -o tcmt
@@ -146,36 +146,40 @@
 #======================================================================
 
 tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o \
    dashboard-main.o monitor.o archive.o : db_records.scm migrate-fix.scm
 
-tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
+tests.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 
 db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 
 tests.o tasks.o dashboard-tasks.o : task_records.scm
 
 runs.o : test_records.scm
 
 common_records.scm : altdb.scm
 
-vg.o dashboard.o : vg_records.scm mofiles/dcommonmod.o
+vg.o : vg_records.scm mofiles/dcommonmod.o
 
-dcommon.o : run_records.scm migrate-fix.scm mofiles/stml2.o
+mofiles/dcommonmod.o : run_records.scm migrate-fix.scm mofiles/stml2.o \
+                       mofiles/gutilsmod.o
 
 mofiles/stml2.o : mofiles/cookie.o
 
 # special include based modules
 mofiles/pkts.o : pkts/pkts.scm
 mofiles/mtargs.o : mtargs/mtargs.scm
 mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
 mofiles/ulex.o : ulex/ulex.scm
 mofiles/mutils.o : mutils/mutils.scm
+mofiles/cookie.o : stml2/cookie.scm
+mofiles/stml2.o : stml2/stml2.scm
 
 # for the modularized stuff
 
-mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o mofiles/mtargs.o mofiles/pkts.o mofiles/mtconfigf.o
+mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o \
+                      mofiles/mtargs.o mofiles/pkts.o mofiles/mtconfigf.o
 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/ulex.o
@@ -481,12 +485,12 @@
 	fi
 	if csi -ne '(use postgresql)';then \
 	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
-portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
-	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 
 # create a pdf dot graphviz diagram from notations in rmt.scm
 rmt.pdf : rmt.scm
 	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -32,51 +32,45 @@
      ) 
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses mtargs))
 (import (prefix mtargs args:))
-
+(declare (uses mtconfigf))
+(import (prefix mtconfigf configf:))
 (declare (uses ducttape-lib))
 (import ducttape-lib)
 
-(declare (uses mtconfigf))
-(import (prefix mtconfigf configf:))
-
 ;; invoke the imports - ORDER IS IMPORTANT!
 (declare (uses mtargs.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 dcommonmod)
-
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "vg_records.scm")
 
 ;; invoke the imports - ORDER IS IMPORTANT!
+(declare (uses gutilsmod.import))
 (declare (uses commonmod.import))
 (declare (uses testsmod.import))
 (declare (uses rmtmod.import))
 (declare (uses runsmod.import))
 (declare (uses megamod.import))

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -26,12 +26,10 @@
 (use regex typed-records matchable)
 
 (declare (unit dcommon))
 
 (declare (uses megatest-version))
-(declare (uses gutils))
-(declare (uses db))
 (declare (uses commonmod))
 (import commonmod)
 
 ;; (declare (uses synchash))
 

Index: dcommonmod.scm
==================================================================
--- dcommonmod.scm
+++ dcommonmod.scm
@@ -21,10 +21,12 @@
 (declare (unit dcommonmod))
 (declare (uses commonmod))
 (declare (uses testsmod))
 (declare (uses megamod))
 (declare (uses mtargs))
+(declare (uses mtconfigf))
+(declare (uses gutilsmod))
 
 (module dcommonmod
 	*
 	
 (import scheme chicken data-structures extras)
@@ -79,12 +81,12 @@
 	udp
 	uri-common
 	z3
 	)
 
-(use (prefix mtconfigf configf:))
-
+(import (prefix mtconfigf configf:))
+(import gutilsmod)
 (import commonmod)
 (import testsmod)
 (import megamod)
 (import canvas-draw)
 (import canvas-draw-iup)
@@ -107,8 +109,8 @@
 (include "dashboard-tests-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")
 
 )

DELETED gutils.scm
Index: gutils.scm
==================================================================
--- gutils.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;======================================================================
-
-(require-library iup)
-(import (prefix iup iup:))
-(use canvas-draw)
-
-(use srfi-1 regex regex-case srfi-69)
-(declare (unit gutils))
-

ADDED   gutilsmod.scm
Index: gutilsmod.scm
==================================================================
--- /dev/null
+++ gutilsmod.scm
@@ -0,0 +1,33 @@
+;;======================================================================
+;; Copyright 2006-2012, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;;======================================================================
+
+(require-library iup)
+(import (prefix iup iup:))
+(use canvas-draw)
+
+(use srfi-1 regex regex-case srfi-69)
+(declare (unit gutilsmod))
+
+(module gutilsmod
+  *
+
+(import  scheme chicken data-structures extras srfi-1)
+(include "gutils-inc.scm")
+)

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -31,24 +31,23 @@
 ;; (declare (uses megatest-version))
 ;; (declare (uses margs))
 
 (declare (uses mtconfigf))
 (import (prefix mtconfigf configf:))
-
 (declare (uses stml2))
 (import stml2)
+(declare (uses ducttape-lib))
+(import ducttape-lib)
 
+(declare (uses mtconfigf.import))
 (declare (uses commonmod))
 (declare (uses megamod))
 (import commonmod)
 (import megamod)
 
 ;; (declare (uses rmt))
 
-(declare (uses ducttape-lib))
-(import ducttape-lib)
-
 ;; (include "megatest-fossil-hash.scm") ;; comes from megamod
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -9,12 +9,10 @@
 
 ;; stml is a list of html strings
 
 ;; (declare (unit stml))
 
-(include "cookie.scm")
-
 (module stml2
     *
 
 (import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1)