Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -209,10 +209,11 @@
    mofiles/pkts.o \
    mofiles/mtargs.o \
    mofiles/mtconfigf.o \
    mofiles/ducttape-lib.o \
    mofiles/stml2.o \
+   mofiles/mutils.o \
    *-inc.scm
 
 mofiles/dcommonmod.o : \
    mofiles/vgmod.o \
    mofiles/treemod.o \

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -19,11 +19,11 @@
 ;;======================================================================
 
 (declare (unit commonmod))
 (declare (uses mtargs))
 ;; (declare (uses stml2))
-(declare (uses mtargs))
+(declare (uses mtconfigf))
 	 
 (module commonmod
 	*
 	
 (import scheme chicken data-structures extras)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -28,22 +28,37 @@
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
-(require-library mutils)
-
 (declare (uses mtargs))
 (import (prefix mtargs args:))
 (declare (uses mtconfigf))
 (import (prefix mtconfigf configf:))
 (declare (uses ducttape-lib))
 (import ducttape-lib)
+(declare (uses pkts))
+(import pkts)
+(declare (uses ulex))
+(import ulex)
+(declare (uses cookie))
+(import cookie)
+(declare (uses stml2))
+(import stml2)
+(declare (uses mutils))
+(import mutils)
+
 ;; invoke the imports
 (declare (uses mtargs.import))
 (declare (uses mtconfigf.import))
 (declare (uses ducttape-lib.import))
+(declare (uses pkts.import))
+(declare (uses ulex.import))
+(declare (uses cookie.import))
+(declare (uses stml2.import))
+(declare (uses mutils.import))
+
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses rmtmod))
 (import rmtmod)

Index: mutils/mutils.scm
==================================================================
--- mutils/mutils.scm
+++ mutils/mutils.scm
@@ -8,10 +8,24 @@
 ;;  PURPOSE.
 
 ;; This is from the perl world, a hash of hashes is a super easy way to keep a handle on
 ;; lots of disparate data
 ;;
+
+(module mutils
+    *
+
+  (import chicken scheme
+	  ;; data-structures posix
+	  srfi-1
+	  ;; srfi-13
+	  srfi-69
+	  ;; ports
+	  extras
+	  regex
+	  )
+
 (define (mutils:hierhash-ref hh . keys)
   (if (null? keys)
       #f
       (let loop ((ht   hh)
 		 (key  (car keys))
@@ -167,5 +181,6 @@
 	 (if (and (list? @l)(not (null? @l))) 
 	     (car @l))) 
        (if (null? @path) @hierlist
 	   (apply mutils:hier-list-get @hierlist @path))))
 
+)

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -8,10 +8,12 @@
 ;;  PURPOSE.
 
 ;; stml is a list of html strings
 
 ;; (declare (unit stml))
+
+(include "cookie.scm")
 
 (module stml2
     *
 
 (import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1)