@@ -24,13 +24,16 @@
 (declare (uses debugprint))
 (declare (uses commonmod))
 
 (module dbfile
 	*
-	
-  (import scheme
-	  chicken
+(import scheme)
+	  	
+(cond-expand
+ (chicken-4
+  
+  (import chicken
 	  data-structures
 	  extras
 	  matchable
   
 	  (prefix sqlite3 sqlite3:)
@@ -45,11 +48,54 @@
 	  hostinfo
 	  
 	  commonmod
 	  debugprint
 	  )
+  )
+ (chicken-5
+  (import (prefix sqlite3 sqlite3:)
+	  ;; data-structures
+	  ;; extras
+	  ;; files
+	  ;; posix
+	  ;; posix-extras
+	  chicken.base
+	  chicken.condition
+	  chicken.file
+	  chicken.file.posix
+	  chicken.format
+	  chicken.io
+	  chicken.pathname
+	  chicken.port
+	  chicken.process
+	  chicken.process-context
+	  chicken.process-context.posix
+	  chicken.sort
+	  chicken.string
+	  chicken.time
+	  chicken.time.posix
+	  
+	  matchable
+	  md5
+	  message-digest
+	  pathname-expand
+	  regex
+	  regex-case
+	  srfi-1
+	  srfi-18
+	  srfi-69
+	  typed-records
+	  stack
+	  system-information
 
+	  commonmod
+	  debugprint
+	  )
+  (define file-write-access? file-writable?)
+  (define file-move move-file)
+  ))
+  
 ;; parameters
 ;;
 (define dbfile:testsuite-name (make-parameter #f))
 
 (define keep-age-param        (make-parameter 10))      ;; qif file age, if over move to attic