Index: src/ResolvExpr/CurrentObject.cc
===================================================================
--- src/ResolvExpr/CurrentObject.cc	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
+++ src/ResolvExpr/CurrentObject.cc	(revision bf205679e365ce7db05a5c24d237c676a256dbb3)
@@ -26,6 +26,7 @@
 #include "AST/Init.hpp"                // for Designation
 #include "AST/Node.hpp"                // for readonly
-#include "AST/Print.hpp"                // for readonly
+#include "AST/Print.hpp"               // for readonly
 #include "AST/Type.hpp"
+#include "Common/Eval.h"               // for eval
 #include "Common/Indenter.h"           // for Indenter, operator<<
 #include "Common/SemanticError.h"      // for SemanticError
Index: src/ResolvExpr/ResolveAssertions.cc
===================================================================
--- src/ResolvExpr/ResolveAssertions.cc	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
+++ src/ResolvExpr/ResolveAssertions.cc	(revision bf205679e365ce7db05a5c24d237c676a256dbb3)
@@ -30,5 +30,4 @@
 #include "Common/FilterCombos.h"    // for filterCombos
 #include "Common/Indenter.h"        // for Indenter
-#include "Common/utility.h"         // for sort_mins
 #include "GenPoly/GenPoly.h"        // for getFunctionType
 #include "ResolvExpr/AlternativeFinder.h"  // for computeConversionCost
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
+++ src/ResolvExpr/Resolver.cc	(revision bf205679e365ce7db05a5c24d237c676a256dbb3)
@@ -38,4 +38,5 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
+#include "Common/Eval.h"                 // for eval
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
Index: src/ResolvExpr/Resolver.h
===================================================================
--- src/ResolvExpr/Resolver.h	(revision a0d1f1ce155bc63aec8f199d55f9adb9caf34d42)
+++ src/ResolvExpr/Resolver.h	(revision bf205679e365ce7db05a5c24d237c676a256dbb3)
@@ -34,4 +34,5 @@
 	class Decl;
 	class DeletedExpr;
+	class Expr;
 	class Init;
 	class StmtExpr;