diff --git a/edn.meta b/edn.meta
index 25c581e..264b7d8 100644
--- a/edn.meta
+++ b/edn.meta
@@ -5,4 +5,5 @@
  (author "Daniel Ziltener")
  (category parsing)
  (license "BSD")
+ (depends r7rs)
  (test-depends test))
diff --git a/edn.scm b/edn.scm
index 7676eaf..3a8cc7f 100644
--- a/edn.scm
+++ b/edn.scm
@@ -1,10 +1,9 @@
-(cond-expand
-  (r7rs)
-  (chicken (require-extension r7rs srfi-1)))
-
-(use r7rs srfi-1)
-(define-library edn
-  (import (scheme base) r7rs srfi-1)
+(define-library (edn)
+  (import (scheme base)
+          (scheme char)
+          (scheme write)
+          (chicken)
+          (srfi 1))
   (export
    scm-kw->edn-kw boolean->edn char->edn string->edn
    list->edn vector->edn
diff --git a/edn.setup b/edn.setup
index 1d4db3a..a0558d6 100644
--- a/edn.setup
+++ b/edn.setup
@@ -1,6 +1,6 @@
 ;;; -*- scheme -*-
 
-(compile -s -O2 -d1 edn.scm -j edn)
+(compile -s -O2 -d1 edn.scm -j edn -R r7rs -X r7rs)
 (compile -s edn.import.scm -O2 -d0)
 
 (install-extension