diff --git a/src/ikarus.boot b/src/ikarus.boot
index 799a75f..5fb0f36 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libguardians.ss b/src/ikarus.guardians.ss
similarity index 86%
rename from src/libguardians.ss
rename to src/ikarus.guardians.ss
index 8f25544..c0981d1 100644
--- a/src/libguardians.ss
+++ b/src/ikarus.guardians.ss
@@ -3,9 +3,9 @@
 ;;; from Dybvig et al. Guardians paper.
 
 (library (ikarus guardians)
-  (export)
-  (import (scheme))
-  (primitive-set! 'make-guardian 
+  (export make-guardian)
+  (import (except (ikarus) make-guardian))
+  (define make-guardian 
     (lambda ()
       (let ([tc
              (let ([x (cons #f #f)])
diff --git a/src/ikarus.numerics.ss b/src/ikarus.numerics.ss
index 241dfce..2c5e410 100644
--- a/src/ikarus.numerics.ss
+++ b/src/ikarus.numerics.ss
@@ -75,8 +75,6 @@
        (error 'string->flonum "~s is not a string" x)])))
 
 
-
-
 (library (ikarus generic-arithmetic)
   (export + - * = < <= > >= add1 sub1 quotient remainder
           quotient+remainder number->string)
@@ -849,18 +847,4 @@
         [(flonum? x) (foreign-call "ikrt_fl_sqrt" x)]
         [(fixnum? x) (foreign-call "ikrt_fx_sqrt" x)]
         [else (error 'sqrt "unsupported ~s" x)])))
-
-  ;(primitive-set! 'even? even?)
-  ;(primitive-set! 'odd? odd?)
-  ;(primitive-set! 'max max)
-  ;(primitive-set! 'min min)
-  ;(primitive-set! 'complex? complex?)
-  ;(primitive-set! 'real? real?)
-  ;(primitive-set! 'rational? rational?)
-  ;(primitive-set! 'exact? exact?)
-  ;(primitive-set! 'inexact? inexact?)
-  ;(primitive-set! 'integer? integer?)
-  ;(primitive-set! 'exact->inexact exact->inexact)
-  ;(primitive-set! 'modulo modulo)
-
   )
diff --git a/src/makefile.ss b/src/makefile.ss
index 71ec13b..19a53f9 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -27,7 +27,7 @@
       "ikarus.records.ss"
       "ikarus.cxr.ss"
       "ikarus.numerics.ss"
-      "libguardians.ss"
+      "ikarus.guardians.ss"
       "libcore.ss"
       "libchezio.ss"
       "libhash.ss"