Index: stml2/cookie.scm
==================================================================
--- stml2/cookie.scm
+++ stml2/cookie.scm
@@ -43,15 +43,30 @@
 ;;   <http://www.netscape.com/newsref/std/cookie_spec.html>
 
 ;; (declare (unit cookie))
 
 (module cookie
-    *
+	*
+	
+(cond-expand
+ (chicken-4
+  (import chicken
+	  scheme
+	  data-structures
+	  extras
+	  ports
+	  posix))
+ (chicken-5
+  (import scheme
+	  chicken.base
+	  chicken.time.posix
+	  chicken.string
+	  chicken.format
+	  )))
 
-(import chicken scheme data-structures extras srfi-13 ports posix)
-  
-(require-extension srfi-1 srfi-13 srfi-14 regex)
+(import srfi-1 srfi-13 srfi-14 regex)
+
 ;; (use  srfi-1 srfi-13 srfi-14 regex)
 ;; (declare (export parse-cookie-string construct-cookie-string))
 
 ;; #>
 ;; #include <time.h>

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -11,15 +11,43 @@
 
 ;; (declare (unit stml))
 
 (module stml2
     *
+(cond-expand
+ (chicken-4
+  (import chicken
+	  scheme
+	  data-structures
+	  extras
+	  ports
+	  posix
+	  files))
+ (chicken-5
+  (import scheme
+	  chicken.base
+	  chicken.time.posix
+	  chicken.string
+	  chicken.format
+	  chicken.condition
+	  chicken.process-context
+	  chicken.blob
+	  chicken.io
+	  chicken.process-context.posix
+	  chicken.port
+	  chicken.pathname
+	  chicken.file
+	  chicken.process
+	  chicken.time
+	  )))
 
-(import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) 
+(import srfi-1 srfi-13 srfi-14 regex
+	srfi-69 typed-records) 
 
 (import cookie)
-(use (prefix dbi dbi:) (prefix crypt c:) typed-records)
+
+(import (prefix dbi dbi:) (prefix crypt c:) typed-records)
 
 ;; (declare (uses misc-stml))
 (use regex)
 
 ;; The (usually global) sdat contains everything about the session