diff --git a/hy/contrib/walk.hy b/hy/contrib/walk.hy
index 8106492..45d991f 100644
--- a/hy/contrib/walk.hy
+++ b/hy/contrib/walk.hy
@@ -247,7 +247,11 @@ Arguments without a header are under None.
   (defn handle-call [self]
     (setv head (first self.form))
     (if (in head '[fn fn*]) (self.handle-fn)
-        (in head '[import require quote]) (self.handle-base)
+        (in head '[import
+                   require
+                   quote
+                   eval-and-compile
+                   eval-when-compile]) (self.handle-base)
         (= head 'except) (self.handle-except)
         (= head ".") (self.handle-dot)
         (= head 'defclass) (self.handle-defclass)