diff --git a/srfi-151/chicken-test.scm b/srfi-151/chicken-test.scm
index 161d90f..154d357 100644
--- a/srfi-151/chicken-test.scm
+++ b/srfi-151/chicken-test.scm
@@ -1,4 +1,4 @@
-(use numbers) (use srfi-151) (use test)
+(import (chicken bitwise)) (import srfi-151) (import test)
 (current-test-verbosity #f)
 (test-group "bitwise"
  (test-group "bitwise/basic"
diff --git a/srfi-151/srfi-151.scm b/srfi-151/srfi-151.scm
index da0b07d..d9cdc1f 100644
--- a/srfi-151/srfi-151.scm
+++ b/srfi-151/srfi-151.scm
@@ -1,12 +1,13 @@
 ;;;; chicken implementation of SRFI 151
 (module srfi-151 ()
   (import scheme)
-  (import (only chicken include use case-lambda when))
+  (import (only (chicken base) include case-lambda when)
+          (only (chicken module) export))
 
   ;; Provides bitwise-not, bitwise-and, butwise-ior, bitwise-xor,
   ;; arithmetic-shift, integer-length.  The remaining
   ;; core function, bit-count, is provided in this file.
-  (use numbers)
+  (import (chicken bitwise))
 
   (export bitwise-not bitwise-and bitwise-ior bitwise-xor bitwise-eqv
           bitwise-nand bitwise-nor bitwise-andc1 bitwise-andc2