diff --git a/executable_semantics/ast/BUILD b/executable_semantics/ast/BUILD
index a7e24a4c179e..45558f5f6320 100644
--- a/executable_semantics/ast/BUILD
+++ b/executable_semantics/ast/BUILD
@@ -19,8 +19,6 @@ cc_library(
         ":pattern",
         ":struct_definition",
         "//common:ostream",
-        "//executable_semantics/interpreter:address",
-        "//executable_semantics/interpreter:containers",
         "@llvm-project//llvm:Support",
     ],
 )
diff --git a/executable_semantics/ast/declaration.h b/executable_semantics/ast/declaration.h
index 29e01781c5c8..6f2162afa8bd 100644
--- a/executable_semantics/ast/declaration.h
+++ b/executable_semantics/ast/declaration.h
@@ -13,24 +13,10 @@
 #include "executable_semantics/ast/member.h"
 #include "executable_semantics/ast/pattern.h"
 #include "executable_semantics/ast/struct_definition.h"
-#include "executable_semantics/interpreter/address.h"
-#include "executable_semantics/interpreter/dictionary.h"
 #include "llvm/Support/Compiler.h"
 
 namespace Carbon {
 
-class Value;
-
-using TypeEnv = Dictionary<std::string, const Value*>;
-using Env = Dictionary<std::string, Address>;
-
-struct TypeCheckContext {
-  // Symbol table mapping names of runtime entities to their type.
-  TypeEnv types;
-  // Symbol table mapping names of compile time entities to their value.
-  Env values;
-};
-
 // Abstract base class of all AST nodes representing patterns.
 //
 // Declaration and its derived classes support LLVM-style RTTI, including
diff --git a/executable_semantics/interpreter/typecheck.h b/executable_semantics/interpreter/typecheck.h
index acb9acb4bd9a..b9565c618400 100644
--- a/executable_semantics/interpreter/typecheck.h
+++ b/executable_semantics/interpreter/typecheck.h
@@ -39,6 +39,13 @@ struct TCStatement {
   TypeEnv types;
 };
 
+struct TypeCheckContext {
+  // Symbol table mapping names of runtime entities to their type.
+  TypeEnv types;
+  // Symbol table mapping names of compile time entities to their value.
+  Env values;
+};
+
 auto TypeCheckExp(const Expression* e, TypeEnv types, Env values)
     -> TCExpression;
 auto TypeCheckPattern(const Pattern* p, TypeEnv types, Env values,