@@ -15,18 +15,37 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 (use csv-xml regex)
-(declare (unit ods))
+(declare (unit odsmod))
 (declare (uses common))
 (declare (uses commonmod))
-(import commonmod)
+(declare (uses debugprint))
+(declare (uses dbfile))
+(declare (uses dbmod))
 
 (module odsmod
 	*
 	
+(import scheme
+	chicken
+	data-structures
+	extras
+	posix
+	ports
+	regex
+	srfi-1
+	srfi-13
+	(prefix sqlite3 sqlite3:)
+	
+	commonmod
+	debugprint
+	dbfile
+	dbmod
+	)
+
 (define ods:dirs
   '("Configurations2"
     "Configurations2/toolpanel"
     "Configurations2/menubar"
     "Configurations2/toolbar"