diff --git a/lib/chibi/modules.sld b/lib/chibi/modules.sld
index d0e7584a..e59dfaae 100644
--- a/lib/chibi/modules.sld
+++ b/lib/chibi/modules.sld
@@ -3,6 +3,8 @@
   (export module-name module-dir module-includes module-shared-includes
           module-ast module-ast-set! module-ref module-contains?
           analyze-module containing-module load-module module-exports
-          module-name->file procedure-analysis)
-  (import (chibi) (meta) (chibi ast))
+          module-name->file procedure-analysis find-module
+          available-modules-in-directory available-modules
+          modules-exporting-identifier)
+  (import (chibi) (meta) (chibi ast) (chibi filesystem))
   (include "modules.scm"))
diff --git a/lib/meta.scm b/lib/meta.scm
index 0d7cfdc8..034230ff 100644
--- a/lib/meta.scm
+++ b/lib/meta.scm
@@ -15,7 +15,10 @@
 (define (module-meta-data-set! mod x) (vector-set! mod 2 x))
 
 (define (module-exports mod)
-  (or (%module-exports mod) (env-exports (module-env mod))))
+  (or (%module-exports mod)
+      (if (module-env mod)
+          (env-exports (module-env mod))
+          '())))
 
 (define (module-name->strings ls res)
   (if (null? ls)