Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 0b8bf2756f5d522b7c14e40729098a2599ad2997)
+++ src/Makefile.in	(revision d76c588058daa6269114595a571223a110ced0ab)
@@ -170,5 +170,6 @@
 	AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
 	AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
-	AST/Stmt.$(OBJEXT) AST/Type.$(OBJEXT) \
+	AST/Stmt.$(OBJEXT) AST/SymbolTable.$(OBJEXT) \
+	AST/Type.$(OBJEXT) AST/TypeEnvironment.$(OBJEXT) \
 	AST/TypeSubstitution.$(OBJEXT)
 am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
@@ -582,5 +583,7 @@
 	AST/Print.cpp \
 	AST/Stmt.cpp \
+	AST/SymbolTable.cpp \
 	AST/Type.cpp \
+	AST/TypeEnvironment.cpp \
 	AST/TypeSubstitution.cpp
 
@@ -750,5 +753,9 @@
 AST/Print.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
 AST/Stmt.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/SymbolTable.$(OBJEXT): AST/$(am__dirstamp) \
+	AST/$(DEPDIR)/$(am__dirstamp)
 AST/Type.$(OBJEXT): AST/$(am__dirstamp) AST/$(DEPDIR)/$(am__dirstamp)
+AST/TypeEnvironment.$(OBJEXT): AST/$(am__dirstamp) \
+	AST/$(DEPDIR)/$(am__dirstamp)
 AST/TypeSubstitution.$(OBJEXT): AST/$(am__dirstamp) \
 	AST/$(DEPDIR)/$(am__dirstamp)
@@ -1184,5 +1191,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Print.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Stmt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/SymbolTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Type.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/TypeEnvironment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/TypeSubstitution.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/CodeGenerator.Po@am__quote@