Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -51,11 +51,13 @@
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 
 mofiles/%.o : %.scm ../adat.scm
 	mkdir -p mofiles
+	rm -f $*.import.scm mofiles/$*.import.scm
 	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
+	ln -f $*.import.scm mofiles/$*.import.scm
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
@@ -314,11 +316,14 @@
 
 $(MTQA_FOSSIL) :
 	fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL)
 
 clean : 
-	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
+	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest \
+        $(PREFIX)/dashboard mtest mtutil dboard dboard.o megatest.o dashboard.o \
+        megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o mtut.o \
+	*.import.scm mofiles/*.import.scm *.bak *~ *-original *-merge *-baseline
 
 #======================================================================
 # Make the records files
 #======================================================================
 

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -23,18 +23,20 @@
 (define (toplevel-command . a) #f)
 
 (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
-     (prefix mtconfigf configf:))
+     nanomsg)
 
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
-;; (declare (uses configf))
 ;; (declare (uses rmt))
+
+;; mtconfigf is compiled in as a compilation unit
+(declare (uses mtconfigf))
+(import (prefix mtconfigf configf:))
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")