Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -122,14 +122,14 @@
 #	server.o \
 #	tasks.o \
 #	tdb.o \
 #	tests.o \
 #	subrun.o \
-TCMTOBJS=$(MOFILES)
+TCMTOBJS=
 
-tcmt : $(TCMTOBJS) tcmt.scm
-	csc $(CSCOPTS) $(TCMTOBJS) tcmt.scm -o tcmt
+tcmt : $(TCMTOBJS) $(MOFILES) tcmt.scm
+	csc $(CSCOPTS) $(MOFILES) $(TCMTOBJS) tcmt.scm -o tcmt
 
 # install documentation to $(PREFIX)/docs
 # DOES NOT REBUILD DOCS
 #
 $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html

Index: mtexec.scm
==================================================================
--- mtexec.scm
+++ mtexec.scm
@@ -26,12 +26,12 @@
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      )
 
 ;; (declare (uses common))
-(declare (uses megatest-version))
-(declare (uses margs))
+;; (declare (uses megatest-version))
+;; (declare (uses margs))
 ;; (declare (uses configf))
 
 (declare (uses megamod))
 (import megamod)
 

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -25,24 +25,28 @@
 (use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
    srfi-19  srfi-18 extras format pkts regex regex-case
      (prefix dbi dbi:)
      nanomsg)
 
-(declare (uses common))
-(declare (uses megatest-version))
-(declare (uses margs))
-(declare (uses configf))
+;; (declare (uses common))
+;; (declare (uses megatest-version))
+;; (declare (uses margs))
+(declare (uses configfmod))
 (declare (uses commonmod))
+(declare (uses megamod))
 (import commonmod)
+(import configfmod)
+(import megamod)
 
 ;; (declare (uses rmt))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
-(require-library stml)
+;; (require-library stml)
+(use stml2)
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 
 (define *runname-mappers* (make-hash-table)) 

Index: tcmt.scm
==================================================================
--- tcmt.scm
+++ tcmt.scm
@@ -26,16 +26,18 @@
 (use srfi-1 posix srfi-69 srfi-18 regex defstruct)
 
 (use trace)
 ;; (trace-call-sites #t)
 
-(declare (uses margs))
-(declare (uses rmt))
-(declare (uses common))
-(declare (uses megatest-version))
+;; (declare (uses margs))
+;; (declare (uses rmt))
+;; (declare (uses common))
+;; (declare (uses megatest-version))
 
+(declare (uses megamod))
 (declare (uses commonmod))
+(import megamod)
 (import commonmod)
 
 (include "megatest-fossil-hash.scm")
 (include "db_records.scm")