diff --git a/compiler/compiler-structs.rkt b/compiler/compiler-structs.rkt
index fe4aac0..7c6d5d0 100644
--- a/compiler/compiler-structs.rkt
+++ b/compiler/compiler-structs.rkt
@@ -1,4 +1,6 @@
 #lang typed/racket/base
+(require "expression-structs.rkt"
+         "analyzer-structs.rkt")
 
 
 (provide (all-defined-out))
@@ -38,3 +40,8 @@
 (define-type Linkage (U NextLinkage
                         LabelLinkage
                         ReturnLinkage))
+
+
+;; Lambda and compile-time environment
+(define-struct: lam+cenv ([lam : (U Lam CaseLam)]
+                          [cenv : CompileTimeEnvironment]))
diff --git a/compiler/compiler.rkt b/compiler/compiler.rkt
index 54d967a..b943f7d 100644
--- a/compiler/compiler.rkt
+++ b/compiler/compiler.rkt
@@ -63,8 +63,6 @@
            (make-AssignImmediate target (make-Reg 'val))))))))
 
 
-(define-struct: lam+cenv ([lam : (U Lam CaseLam)]
-                          [cenv : CompileTimeEnvironment]))