diff --git a/compile-r7rs.scm b/compile-r7rs.scm
index 684db79..1f58e81 100644
--- a/compile-r7rs.scm
+++ b/compile-r7rs.scm
@@ -171,13 +171,14 @@
 (define scheme-type (cdr (assoc 'type (cdr (assoc scheme data)))))
 
 (define scheme-command
-  (apply (cdr (assoc 'command (cdr (assoc scheme data))))
-         (list (if input-file input-file "")
-               (if output-file output-file "")
-               prepend-directories
-               append-directories
-               library-files
-               r6rs?)))
+  (string-append (apply (cdr (assoc 'command (cdr (assoc scheme data))))
+                        (list (if input-file input-file "")
+                              (if output-file output-file "")
+                              prepend-directories
+                              append-directories
+                              library-files
+                              r6rs?))
+                 (string #\newline)))
 
 (define scheme-library-command
   (lambda (library-file)
diff --git a/libs/data.sld b/libs/data.sld
index 4b0840e..aae6c42 100644
--- a/libs/data.sld
+++ b/libs/data.sld
@@ -58,6 +58,10 @@
                                                                  ".a")))
                                   (apply string-append `("csc -R r7rs -X r7rs -static -c -J"
                                                          " "
+                                                        ,@(map (lambda (item)
+                                                                 (string-append "-I " item " "))
+                                                               (append append-directories prepend-directories))
+                                                         " "
                                                          "-unit"
                                                          " "
                                                          ,unit
@@ -68,9 +72,7 @@
                                                          " "
                                                          ,(util-getenv "COMPILE_R7RS_CHICKEN")
                                                          " "
-                                                         ,(search-library-file (append prepend-directories
-                                                                                       append-directories)
-                                                                               library-file)
+                                                         ,(search-library-file (append prepend-directories append-directories) library-file)
                                                          " "
                                                          "&&"
                                                          " "
@@ -85,6 +87,10 @@
                                                " "
                                                ,(util-getenv "COMPILE_R7RS_CHICKEN")
                                                " "
+                                               ,@(map (lambda (item)
+                                                        (string-append "-I " item " "))
+                                                      (append append-directories prepend-directories))
+                                               " "
                                                ,@(map (lambda (library-file)
                                                         (string-append "-uses "
                                                                        (if (string-starts-with? library-file "srfi")