Index: src/SymTab/FixFunction.cc
===================================================================
--- src/SymTab/FixFunction.cc	(revision 21a2a7d9c6395caabfb563f85756ba506c922512)
+++ src/SymTab/FixFunction.cc	(revision fa6ca1ac779b46c587efb95ae262f52a9c5378e0)
@@ -21,5 +21,5 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "Common/utility.h"       // for maybeClone, copy
+#include "Common/utility.h"       // for copy
 #include "SynTree/Declaration.h"  // for FunctionDecl, ObjectDecl, Declarati...
 #include "SynTree/Expression.h"   // for Expression
Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 21a2a7d9c6395caabfb563f85756ba506c922512)
+++ src/SymTab/Mangler.cc	(revision fa6ca1ac779b46c587efb95ae262f52a9c5378e0)
@@ -24,6 +24,6 @@
 #include "CodeGen/OperatorTable.h"       // for OperatorInfo, operatorLookup
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"           // for toCString
 #include "Common/SemanticError.h"        // for SemanticError
-#include "Common/utility.h"              // for toString
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
 #include "SynTree/LinkageSpec.h"         // for Spec, isOverridable, AutoGen, Int...
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision 21a2a7d9c6395caabfb563f85756ba506c922512)
+++ src/SymTab/Validate.cc	(revision fa6ca1ac779b46c587efb95ae262f52a9c5378e0)
@@ -55,6 +55,7 @@
 #include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "Common/utility.h"            // for cloneAll, deleteAll
 #include "CompilationState.h"          // skip some passes in new-ast build
 #include "Concurrency/Keywords.h"      // for applyKeywords
Index: src/SymTab/ValidateType.cc
===================================================================
--- src/SymTab/ValidateType.cc	(revision 21a2a7d9c6395caabfb563f85756ba506c922512)
+++ src/SymTab/ValidateType.cc	(revision fa6ca1ac779b46c587efb95ae262f52a9c5378e0)
@@ -18,4 +18,5 @@
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"
+#include "Common/ToString.hpp"
 #include "SymTab/FixFunction.h"
 #include "SynTree/Declaration.h"