Index: src/Validate/FixQualifiedTypes.cpp
===================================================================
--- src/Validate/FixQualifiedTypes.cpp	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/Validate/FixQualifiedTypes.cpp	(revision afdb74b47df46baca69fdd94ae046d3d0dbcfee1)
@@ -16,9 +16,10 @@
 #include "Validate/FixQualifiedTypes.hpp"
 
+#include "AST/LinkageSpec.hpp"             // for Linkage
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
+#include "Common/ToString.hpp"             // for toString
+#include "SymTab/Mangler.h"                // for Mangler
 #include "Validate/NoIdSymbolTable.hpp"
-#include "SymTab/Mangler.h"            // for Mangler
-#include "AST/LinkageSpec.hpp"			   // for Linkage
 
 namespace Validate {
Index: src/Validate/ForallPointerDecay.cpp
===================================================================
--- src/Validate/ForallPointerDecay.cpp	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/Validate/ForallPointerDecay.cpp	(revision afdb74b47df46baca69fdd94ae046d3d0dbcfee1)
@@ -22,4 +22,5 @@
 #include "CodeGen/OperatorTable.h"
 #include "Common/CodeLocation.h"
+#include "Common/ToString.hpp"
 #include "SymTab/FixFunction.h"
 
Index: src/Validate/HandleAttributes.cc
===================================================================
--- src/Validate/HandleAttributes.cc	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/Validate/HandleAttributes.cc	(revision afdb74b47df46baca69fdd94ae046d3d0dbcfee1)
@@ -19,4 +19,5 @@
 #include "Common/Eval.h"
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"
 #include "Common/SemanticError.h"
 #include "ResolvExpr/Resolver.h"
Index: src/Validate/HoistStruct.cpp
===================================================================
--- src/Validate/HoistStruct.cpp	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/Validate/HoistStruct.cpp	(revision afdb74b47df46baca69fdd94ae046d3d0dbcfee1)
@@ -16,7 +16,8 @@
 #include "Validate/HoistStruct.hpp"
 
+#include <sstream>
+
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "Common/utility.h"
 
 namespace Validate {