@@ -28,11 +28,14 @@
    ezsteps.scm lock-queue.scm sdb.scm \
    rmt.scm api.scm subrun.scm \
    portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm
 
 # module source files
-MSRCFILES = ftail.scm
+MSRCFILES = ftail.scm db.scm common.scm
+
+# mtest module source files actually used by mtest building
+MTMSRCFILES = ftail.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 \
@@ -42,12 +45,13 @@
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
+MTMOFILES =  $(addprefix mofiles/,$(MTMSRCFILES:%.scm=%.o))
 
-mofiles/%.o : %.scm
+mofiles/%.o : src/%.scm
 	mkdir -p mofiles
 	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
@@ -65,21 +69,21 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o
-	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
+mtest: $(OFILES) readline-fix.scm megatest.o $(MTMOFILES)
+	csc $(CSCOPTS) $(OFILES) $(MTMOFILES) megatest.o -o mtest
 
 
-dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES)
-	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard
+dboard : $(OFILES) $(GOFILES) dashboard.scm $(MTMOFILES)
+	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MTMOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
-mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm
+mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm $(MOFILES)
 	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
@@ -99,11 +103,10 @@
 	megatest-version.o \
 	ods.o \
 	portlogger.o \
 	process.o \
 	rmt.o \
-	rpc-transport.o \
 	runconfig.o \
 	runs.o \
 	server.o \
 	tasks.o \
 	tdb.o \
@@ -147,10 +150,12 @@
 megatest.o : megatest-fossil-hash.scm
 rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm
 common_records.scm : altdb.scm
 vg.o dashboard.o : vg_records.scm
 dcommon.o : run_records.scm
+mofiles/db.o : mofiles/common.o
+
 # Temporary while transitioning to new routine
 # runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
 
 megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
 	echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new