@@ -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)