Index: src/InitTweak/BasicInit.cc
===================================================================
--- src/InitTweak/BasicInit.cc	(revision 61f9356c5a7f6b519ed835460f72dc5f34708073)
+++ src/InitTweak/BasicInit.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -20,5 +20,5 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Type.h"
Index: src/InitTweak/DeclarationHoister.cc
===================================================================
--- src/InitTweak/DeclarationHoister.cc	(revision 61f9356c5a7f6b519ed835460f72dc5f34708073)
+++ src/InitTweak/DeclarationHoister.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -20,5 +20,5 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Statement.h"
Index: src/InitTweak/InitExpander.cc
===================================================================
--- src/InitTweak/InitExpander.cc	(revision 61f9356c5a7f6b519ed835460f72dc5f34708073)
+++ src/InitTweak/InitExpander.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -19,5 +19,5 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "InitExpander.h"
 #include "InitModel.h"
Index: src/InitTweak/InitExpander.h
===================================================================
--- src/InitTweak/InitExpander.h	(revision 61f9356c5a7f6b519ed835460f72dc5f34708073)
+++ src/InitTweak/InitExpander.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -19,5 +19,5 @@
 #include <string>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"
Index: src/InitTweak/InitModel.h
===================================================================
--- src/InitTweak/InitModel.h	(revision 61f9356c5a7f6b519ed835460f72dc5f34708073)
+++ src/InitTweak/InitModel.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -18,5 +18,5 @@
 
 #include "Association.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 #include "SynTree/Visitor.h"