Index: src/AST/Node.hpp
===================================================================
--- src/AST/Node.hpp	(revision 5bf397625eb02d50425ba6f01ab313629b305e1c)
+++ src/AST/Node.hpp	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
@@ -19,5 +19,4 @@
 #include <cstddef>     // for nullptr_t
 #include <iosfwd>
-#include <type_traits> // for remove_reference
 
 #include "Common/ErrorObjects.h"  // for SemanticErrorException
@@ -36,6 +35,6 @@
 	Node(const Node&) : strong_count(0), weak_count(0) {}
 	Node(Node&&) : strong_count(0), weak_count(0) {}
-	Node& operator= (const Node&) = delete;
-	Node& operator= (Node&&) = delete;
+	Node& operator=(const Node&) = delete;
+	Node& operator=(Node&&) = delete;
 	virtual ~Node() {}
 
Index: src/GenPoly/GenPoly.cc
===================================================================
--- src/GenPoly/GenPoly.cc	(revision 5bf397625eb02d50425ba6f01ab313629b305e1c)
+++ src/GenPoly/GenPoly.cc	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
@@ -24,5 +24,7 @@
 #include <vector>                       // for vector
 
+#include "AST/Expr.hpp"
 #include "AST/Type.hpp"
+#include "AST/TypeSubstitution.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
Index: src/ResolvExpr/typeops.h
===================================================================
--- src/ResolvExpr/typeops.h	(revision 5bf397625eb02d50425ba6f01ab313629b305e1c)
+++ src/ResolvExpr/typeops.h	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
@@ -18,13 +18,5 @@
 #include <vector>
 
-#include "Cost.h"
-#include "TypeEnvironment.h"
-#include "WidenMode.h"
-#include "AST/Fwd.hpp"
-#include "AST/Node.hpp"
-#include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
-#include "AST/TypeEnvironment.hpp"
-#include "SynTree/SynTree.h"
 #include "SynTree/Type.h"
 
@@ -34,4 +26,6 @@
 
 namespace ResolvExpr {
+	class TypeEnvironment;
+
 	// combos: takes a list of sets and returns a set of lists representing every possible way of forming a list by
 	// picking one element out of each set