@@ -19,21 +19,42 @@
 ;;======================================================================
 
 (declare (unit genexample))
 (declare (uses mtargs))
 (declare (uses debugprint))
-(declare (uses common))
+;; (declare (uses common))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses rmtmod))
+(declare (uses testsmod))
+(declare (uses dbfile))
+(declare (uses tasksmod))
 
 (use posix regex matchable)
-(import (prefix mtargs args:)
+
+(module genexample
+	*
+	
+(import scheme
+	chicken
+
+	data-structures
+	extras
+	srfi-1
+	srfi-13
+	srfi-69
+	posix
+	regex
+	matchable
+	(prefix mtargs args:)
 	commonmod
 	configfmod
+	testsmod
 	rmtmod
-	debugprint)
+	debugprint
+	tasksmod
+	dbfile)
 
 ;; (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF
@@ -526,5 +547,6 @@
 
 		      ))))
 	    tests-data)))
        (map (lambda (runrec)(simple-run-id runrec)) runs)))
     ))
+)