diff --git a/edn-impl.scm b/edn-impl.scm
index 220e004..ad332a1 100644
--- a/edn-impl.scm
+++ b/edn-impl.scm
@@ -1,9 +1,3 @@
-(import scheme
-	srfi-69
-	srfi-1
-	(chicken base)
-	(chicken keyword)
-	(chicken port))
 ;; EDN Reading
 ;; ===========
 
diff --git a/edn.scm b/edn.scm
index 3128da0..7cdfe5a 100644
--- a/edn.scm
+++ b/edn.scm
@@ -5,6 +5,12 @@
 @(heading "Documentation")
 @(noop)
 
-(use srfi-1 srfi-69 srfi-88)
 (module edn (parse-entry tag-handlers write-edn read-edn)
-  "edn-impl.scm")
+  (import srfi-1
+	  srfi-69
+	  srfi-88
+	  scheme
+	  (chicken base)
+	  (chicken keyword)
+	  (chicken port))
+  (include "edn-impl.scm"))
diff --git a/tests/run.scm b/tests/run.scm
index 4a582e9..19c8561 100644
--- a/tests/run.scm
+++ b/tests/run.scm
@@ -1,4 +1,5 @@
 (require-extension r7rs srfi-69 srfi-64 srfi-88 srfi-1 hahn)
+(import (chicken port))
 (include "../edn-impl.scm")
 ;; (run-hahn -o edn.wiki edn.scm edn-impl.scm)