diff --git a/src/builtin.lisp b/src/builtin.lisp
index 2afed93..61779a2 100644
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -6,7 +6,7 @@
 
 
 (defmacro define-and-export-builtin-elements (&rest names)
-  `(eval-when (:compile-toplevel :load-toplevel :execute)
+  `(progn
      ,@(mapcan (lambda (name)
                  (list `(deftag ,name)
                        `(export ',name)))
diff --git a/src/defhsx.lisp b/src/defhsx.lisp
index 9072348..18b41c9 100644
--- a/src/defhsx.lisp
+++ b/src/defhsx.lisp
@@ -1,4 +1,4 @@
-(uiop:define-package #:hsx/defhsx
+(defpackage #:hsx/defhsx
   (:use #:cl)
   (:import-from #:alexandria
                 #:make-keyword
@@ -11,11 +11,10 @@
 
 
 (defmacro defhsx (name element-type)
-  `(eval-when (:compile-toplevel :load-toplevel :execute)
-     (defmacro ,name (&body body)
-       (multiple-value-bind (props children)
-           (parse-body body)
-         `(create-element ,',element-type (list ,@props) ,@children)))))
+  `(defmacro ,name (&body body)
+     (multiple-value-bind (props children)
+         (parse-body body)
+       `(create-element ,',element-type (list ,@props) ,@children))))
 
 (defun parse-body (body)
   (if (keywordp (first body))
diff --git a/src/element.lisp b/src/element.lisp
index 5a31635..b7896c6 100644
--- a/src/element.lisp
+++ b/src/element.lisp
@@ -1,9 +1,9 @@
 (defpackage #:hsx/element
   (:use #:cl)
-  (:export #:element-type
+  (:export #:create-element
+           #:element-type
            #:element-props
            #:element-children
-           #:create-element
            #:expand-component))
 (in-package #:hsx/element)
 
diff --git a/src/hsx.lisp b/src/hsx.lisp
index b3334e4..b1d68c7 100644
--- a/src/hsx.lisp
+++ b/src/hsx.lisp
@@ -1,4 +1,4 @@
-(uiop:define-package #:hsx/hsx
+(defpackage #:hsx/hsx
   (:use #:cl)
   (:export #:hsx))
 (in-package #:hsx/hsx)