Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -31,11 +31,11 @@
 
 # module source files
 MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
             ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
             pgdb.scm margsmod.scm debugprint.scm client.scm items.scm \
-            tdb.scm
+            tdb.scm stml2.scm cookie.scm
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
 # ftail.scm rmtmod.scm commonmod.scm removed
@@ -173,11 +173,12 @@
 
 common_records.scm : altdb.scm
 
 vg.o dashboard.o : vg_records.scm megatest-version.scm
 
-dcommon.o : run_records.scm
+dcommon.o : dcommon.scm run_records.scm mofiles/dcommonmod.o $(MOFILES) $(DMOFILES)
+	csc $(CSCOPTS) -c $< $(MOFILES) $(DMOFILES)
 
 mofiles/stml2.o  : mofiles/cookie.o
 
 # for the modularized stuff
 # mofiles/rmtmod.o : mofiles/commonmod.o

Index: build.inc
==================================================================
--- build.inc
+++ build.inc
@@ -20,10 +20,11 @@
 mofiles/pgdb.o : mofiles/configfmod.o
 mofiles/items.o : mofiles/configfmod.o
 mofiles/dcommonmod.o : mofiles/configfmod.o
 mofiles/dbmod.o : mofiles/configfmod.o
 mofiles/commonmod.o : mofiles/configfmod.o
+mofiles/commonmod.o : mofiles/stml2.o
 mofiles/transport.o : mofiles/portlogger.o
 mofiles/rmtmod.o : mofiles/portlogger.o
 mofiles/rmtmod.o : mofiles/items.o
 mofiles/rmtmod.o : mofiles/tdb.o
 mofiles/tasks.o : mofiles/pgdb.o

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -19,10 +19,11 @@
 ;;======================================================================
 
 (declare (unit commonmod))
 (declare (uses margsmod))
 (declare (uses debugprint))
+(declare (uses stml2))
 (declare (uses configfmod))
 
 (module commonmod
 	*
 	
@@ -29,10 +30,11 @@
 ;;(import scheme chicken data-structures extras files ports)
 (import scheme chicken)
 (import margsmod)
 (import debugprint)
 (import configfmod)
+(import stml2)
 
 (use data-structures extras files ports)
 (use 
   (prefix base64 base64:)
   (prefix sqlite3 sqlite3:) 
@@ -52,11 +54,10 @@
   srfi-1
   srfi-4
   srfi-13
   srfi-69
   stack
-  stml2
   typed-records 
   z3
  )
 	
 (include "common_records.scm")

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -22,27 +22,27 @@
 ;; Database access
 ;;======================================================================
 
 ;; dbstruct vector containing all the relevant dbs like main.db, megatest.db, run.db etc
 
-(use (srfi 18) extras tcp stack)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest
-     base64 format dot-locking z3 typed-records matchable)
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
+;; (use (srfi 18) extras tcp stack)
+;; (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest
+;;      base64 format dot-locking z3 typed-records matchable)
+;; (import (prefix sqlite3 sqlite3:))
+;; (import (prefix base64 base64:))
 
 (declare (unit db))
 ;; (declare (uses common))
 ;; (declare (uses client))
 ;; (declare (uses mt))
 ;; (declare (uses margsmod))
 ;; (import margsmod)
 ;; 
 ;; (declare (uses commonmod))
-(declare (uses debugprint))
+;; (declare (uses debugprint))
 ;; (import commonmod)
-(import debugprint)
+;; (import debugprint)
 ;; 
 ;; (declare (uses configfmod))
 ;; (import configfmod)
 ;; 
 ;; (declare (uses dbmod))

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -7,11 +7,11 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 ;; stml is a list of html strings
 
-(declare (unit stml))
+(declare (unit stml2))
 
 (module stml2
     *
 
 (import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1)