Index: src/Tuples/AssignExpand.h
===================================================================
--- src/Tuples/AssignExpand.h	(revision 4753415975c6f56302c712e83f72751cbf46c6ad)
+++ src/Tuples/AssignExpand.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -23,5 +23,5 @@
 #include "SynTree/Expression.h"
 
-#include "UniqueName.h"
+#include "Common/UniqueName.h"
 
 namespace Tuples {
Index: src/Tuples/FunctionChecker.cc
===================================================================
--- src/Tuples/FunctionChecker.cc	(revision 4753415975c6f56302c712e83f72751cbf46c6ad)
+++ src/Tuples/FunctionChecker.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -16,5 +16,5 @@
 #include "FunctionChecker.h"
 #include "FunctionFixer.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 
 #include <algorithm>
Index: src/Tuples/FunctionChecker.h
===================================================================
--- src/Tuples/FunctionChecker.h	(revision 4753415975c6f56302c712e83f72751cbf46c6ad)
+++ src/Tuples/FunctionChecker.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -21,5 +21,5 @@
 #include <iostream>
 
-#include "UniqueName.h"
+#include "Common/UniqueName.h"
 
 #include "SynTree/SynTree.h"
Index: src/Tuples/TupleAssignment.cc
===================================================================
--- src/Tuples/TupleAssignment.cc	(revision 4753415975c6f56302c712e83f72751cbf46c6ad)
+++ src/Tuples/TupleAssignment.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -19,5 +19,5 @@
 #include "SynTree/Expression.h"
 #include "TupleAssignment.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 
 #include <functional>