@@ -16,13 +16,22 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 (use csv-xml regex)
 (declare (unit ods))
-(declare (uses common))
 (declare (uses commonmod))
+;; (declare (uses common))
+
+(module ods
+*
+
+(import scheme chicken data-structures extras files ports)
 (import commonmod)
+(import regex
+	srfi-13
+	posix
+	)
 
 (define ods:dirs
   '("Configurations2"
     "Configurations2/toolpanel"
     "Configurations2/menubar"
@@ -223,5 +232,6 @@
 	    (map print 
 		 (map ods:sheet data))
 	    (map display ods:content-footer)))
 	(system (conc "cd " path "; zip " fname " -n mimetype mimetype `find . |grep -v mimetype` > /dev/null")))))
 
+)