Index: src/GenPoly/Box.cc
===================================================================
--- src/GenPoly/Box.cc	(revision 803deb12902ca2c3780803d39417a86c02b8ba33)
+++ src/GenPoly/Box.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -39,7 +39,7 @@
 #include "SymTab/Mangler.h"
 
-#include "SemanticError.h"
-#include "UniqueName.h"
-#include "utility.h"
+#include "Common/SemanticError.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
 
 #include <ext/functional> // temporary
Index: src/GenPoly/CopyParams.cc
===================================================================
--- src/GenPoly/CopyParams.cc	(revision 803deb12902ca2c3780803d39417a86c02b8ba33)
+++ src/GenPoly/CopyParams.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -23,5 +23,5 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Visitor.h"
-#include "UniqueName.h"
+#include "Common/UniqueName.h"
 
 namespace GenPoly {
Index: src/GenPoly/InstantiateGeneric.cc
===================================================================
--- src/GenPoly/InstantiateGeneric.cc	(revision 803deb12902ca2c3780803d39417a86c02b8ba33)
+++ src/GenPoly/InstantiateGeneric.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -31,6 +31,6 @@
 #include "SynTree/TypeSubstitution.h"
 
-#include "UniqueName.h"
-#include "utility.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
 
 namespace GenPoly {
Index: src/GenPoly/Lvalue.cc
===================================================================
--- src/GenPoly/Lvalue.cc	(revision 803deb12902ca2c3780803d39417a86c02b8ba33)
+++ src/GenPoly/Lvalue.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -28,6 +28,6 @@
 #include "ResolvExpr/typeops.h"
 
-#include "UniqueName.h"
-#include "utility.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
 
 namespace GenPoly {
Index: src/GenPoly/Specialize.cc
===================================================================
--- src/GenPoly/Specialize.cc	(revision 803deb12902ca2c3780803d39417a86c02b8ba33)
+++ src/GenPoly/Specialize.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -28,6 +28,6 @@
 #include "SynTree/Mutator.h"
 #include "ResolvExpr/FindOpenVars.h"
-#include "UniqueName.h"
-#include "utility.h"
+#include "Common/UniqueName.h"
+#include "Common/utility.h"
 
 namespace GenPoly {