@@ -28,25 +28,52 @@
 (use address-info tcp)
 
 (module tcp-transportmod
 	*
 	
-  (import scheme
-	  (prefix sqlite3 sqlite3:)
-	  chicken
-	  data-structures
+(import scheme)
 
-	  address-info
-	  directory-utils
+(cond-expand
+ (chicken-4
+  (import (prefix sqlite3 sqlite3:)
+	  chicken
 	  extras
-	  files
 	  hostinfo
+
+	  ports
+	  posix
+	  files
+	  data-structures
+	  tcp
+	  ))
+ (chicken-5
+  (import chicken.base
+	  chicken.condition
+	  chicken.file
+	  chicken.pathname
+	  chicken.process-context.posix
+	  chicken.process
+	  chicken.sort
+	  chicken.string
+	  chicken.time
+	  chicken.tcp
+	  chicken.random
+	  chicken.file.posix
+	  chicken.pretty-print
+	  chicken.io
+	  chicken.port
+	  chicken.process-context
+
+	  system-information)
+  (define unsetenv unset-environment-variable!)
+  ))
+ 
+ (import  address-info
+	  directory-utils
 	  matchable
 	  md5
 	  message-digest
-	  ports
-	  posix
 	  regex
 	  regex-case
 	  s11n
 	  srfi-1
 	  srfi-18
@@ -53,11 +80,10 @@
 	  srfi-4
 	  srfi-69
 	  stack
 	  typed-records
 	  tcp-server
-	  tcp
 	  
 	  debugprint
 	  commonmod
 	  dbfile
 	  dbmod