diff --git a/piclib/CMakeLists.txt b/piclib/CMakeLists.txt
index 7da6043b..be0664d6 100644
--- a/piclib/CMakeLists.txt
+++ b/piclib/CMakeLists.txt
@@ -1,4 +1,5 @@
 list(APPEND PICLIB_SCHEME_LIBS
+  ${PROJECT_SOURCE_DIR}/piclib/picrin/base.scm
   ${PROJECT_SOURCE_DIR}/piclib/picrin/macro.scm
   ${PROJECT_SOURCE_DIR}/piclib/scheme/base.scm
 
diff --git a/piclib/picrin/base.scm b/piclib/picrin/base.scm
new file mode 100644
index 00000000..34522c9f
--- /dev/null
+++ b/piclib/picrin/base.scm
@@ -0,0 +1,10 @@
+(define-library (picrin base)
+  (import (picrin base core))
+
+  (export define
+          set!
+          quote
+          lambda
+          if
+          begin
+          define-syntax))
diff --git a/piclib/picrin/macro.scm b/piclib/picrin/macro.scm
index 7f9ab9e4..7e2c8ff2 100644
--- a/piclib/picrin/macro.scm
+++ b/piclib/picrin/macro.scm
@@ -1,7 +1,7 @@
 ;;; Hygienic Macros
 
 (define-library (picrin macro)
-  (import (picrin base core)
+  (import (picrin base)
           (scheme base)
           (picrin dictionary))
 
diff --git a/piclib/scheme/base.scm b/piclib/scheme/base.scm
index 86d7a92e..a8041eed 100644
--- a/piclib/scheme/base.scm
+++ b/piclib/scheme/base.scm
@@ -1,5 +1,5 @@
 (define-library (scheme base)
-  (import (picrin base core)
+  (import (picrin base)
           (picrin macro))
 
   (export define set! lambda quote