diff --git a/src/hsx.lisp b/src/hsx.lisp
index d23ab9c..dccac5e 100644
--- a/src/hsx.lisp
+++ b/src/hsx.lisp
@@ -1,5 +1,6 @@
 (defpackage #:hsx/hsx
   (:use #:cl)
+  (:import-from #:hsx/builtin)
   (:export #:hsx))
 (in-package #:hsx/hsx)
 
diff --git a/src/main.lisp b/src/main.lisp
index 3500f02..dfa81b3 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -4,7 +4,6 @@
         #:hsx/element
         #:hsx/defhsx
         #:hsx/hsx)
-  (:import-from #:hsx/builtin)
   (:export #:hsx
            #:deftag
            #:defcomp
diff --git a/tests/hsx.lisp b/tests/hsx.lisp
index 2f8d914..259c362 100644
--- a/tests/hsx.lisp
+++ b/tests/hsx.lisp
@@ -1,8 +1,7 @@
 (defpackage #:hsx-test/hsx
   (:use #:cl
         #:fiveam
-        #:hsx/hsx)
-  (:import-from #:hsx/builtin))
+        #:hsx/hsx))
 (in-package #:hsx-test/hsx)
 
 (def-suite hsx-test)