Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -5,22 +5,22 @@
 SRCFILES = common.scm items.scm launch.scm \
    ods.scm runconfig.scm server.scm configf.scm \
    db.scm keys.scm margs.scm megatest-version.scm \
    process.scm runs.scm tasks.scm tests.scm genexample.scm \
    http-transport.scm nmsg-transport.scm filedb.scm \
-   client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
-   tree.scm ezsteps.scm lock-queue.scm sdb.scm \
+   client.scm synchash.scm daemon.scm mt.scm \
+   ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm tdb.scm rpc-transport.scm \
    portlogger.scm archive.scm env.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 directory-utils hostinfo tcp-server rpc csv-xml fmt \
 json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
 spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3
 
-GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm vg.scm
+GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -36,11 +36,11 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
-(declare (uses dcommon))
+;; (declare (uses dcommon))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.