diff --git a/Makefile b/Makefile
index dd82b324..bdcd07d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 TESTSCM = unit-tests
 TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM)))
 
-all: cyclone scheme/base.o scheme/read.o icyc
+all: cyclone scheme/base.o scheme/read.o scheme/eval.o icyc
 
 scheme/base.o: cyclone scheme/base.sld
 	./cyclone scheme/base.sld
 
+scheme/eval.o: cyclone scheme/eval.sld
+	./cyclone scheme/eval.sld
+
 scheme/read.o: cyclone scheme/read.sld
 	./cyclone scheme/read.sld
 
diff --git a/cyclone.scm b/cyclone.scm
index c390b1a5..a101324e 100644
--- a/cyclone.scm
+++ b/cyclone.scm
@@ -240,9 +240,9 @@
            (not (null? result)))
       (let ((program
               (append
-                (if (member 'eval result) 
-                    (read-file (get-lib "eval.scm")) 
-                   '())
+                ;(if (member 'eval result) 
+                ;    (read-file (get-lib "eval.scm")) 
+                ;   '())
                 ;(if (member 'read result) 
                 ;    (append
                 ;        (read-file (get-lib "parser.scm"))
diff --git a/icyc.scm b/icyc.scm
index 4bff0073..35214b2f 100644
--- a/icyc.scm
+++ b/icyc.scm
@@ -4,6 +4,9 @@
 ;;
 ;; This module contains a simple Read-Eval-Print Loop
 ;;
+(import (scheme base)
+        (scheme read)
+        (scheme eval))
 (cond-expand
   (cyclone
     (display *Cyc-version-banner*))