Index: src/ResolvExpr/Candidate.cpp
===================================================================
--- src/ResolvExpr/Candidate.cpp	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/ResolvExpr/Candidate.cpp	(revision 1dfc3d0fceddb07634544841e73360351262ab77)
@@ -17,4 +17,5 @@
 
 #include <iostream>
+#include <sstream>
 
 #include "AST/Print.hpp"
@@ -44,5 +45,5 @@
 	sorted.reserve(cands.size());
 	for(const auto & c : cands) {
-		std::stringstream ss;
+		std::ostringstream ss;
 		print( ss, *c, indent );
 		sorted.push_back(ss.str());
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 8f0627739771873f0409e88a71dcaaf6d43b7204)
+++ src/ResolvExpr/Resolver.cc	(revision 1dfc3d0fceddb07634544841e73360351262ab77)
@@ -39,8 +39,9 @@
 #include "AST/Type.hpp"
 #include "Common/Eval.h"                 // for eval
+#include "Common/Iterate.hpp"            // for group_iterate
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
-#include "Common/utility.h"              // for ValueGuard, group_iterate
+#include "Common/ToString.hpp"           // for toCString
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt