Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -52,10 +52,13 @@
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 # compiled import files
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
+%.import.o : %.import.scm
+	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.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
 
@@ -79,13 +82,13 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
-megatest.o : ducttape-lib.import.o
+# megatest.o : ducttape-lib.import.o
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) ducttape-lib.import.o
+mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES)
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
@@ -131,11 +134,11 @@
 	tests.o \
 	subrun.o \
 
 
 tcmt : $(TCMTOBJS) tcmt.scm
-	csc $(CSCOPTS) $(TCMTOBJS) tcmt.scm -o tcmt
+	csc $(CSCOPTS) $(TCMTOBJS) $(MOFILES) $(MOIMPFILES) tcmt.scm -o tcmt
 
 # install documentation to $(PREFIX)/docs
 # DOES NOT REBUILD DOCS
 #
 $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html
@@ -158,10 +161,12 @@
 # 
 # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
 #	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
 
 # Special dependencies for the includes
+common.o : commonmod.o
+
 tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o  \
 archive.o megatest.o : db_records.scm
 
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -26,12 +26,12 @@
      (prefix sqlite3 sqlite3:)
      (prefix dbi dbi:)
      )
 
 (declare (unit common))
-(declare (uses commonmod))
-(import commonmod)
+;; (declare (uses commonmod))
+;; (import commonmod)
 (import pkts)
 
 (include "common_records.scm")
 
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -41,12 +41,12 @@
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
-(declare (uses ftail))
-(import ftail)
+;; (declare (uses ftail))
+;; (import ftail)
 
 (import stml2)
 
 ;; invoke the imports
 ;; (declare (uses mtargs.import))