Index: src/Parser/ExpressionNode.cc
===================================================================
--- src/Parser/ExpressionNode.cc	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/ExpressionNode.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -24,7 +24,7 @@
 #include "SynTree/Constant.h"
 #include "SynTree/Expression.h"
-#include "UnimplementedError.h"
+#include "Common/UnimplementedError.h"
 #include "parseutility.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 using namespace std;
@@ -452,5 +452,5 @@
 };
 
-#include "utility.h"
+#include "Common/utility.h"
 
 Expression *CompositeExprNode::build() const {
Index: src/Parser/LinkageSpec.cc
===================================================================
--- src/Parser/LinkageSpec.cc	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/LinkageSpec.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -18,5 +18,5 @@
 
 #include "LinkageSpec.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 
 LinkageSpec::Type LinkageSpec::fromString( const std::string &stringSpec ) {
Index: src/Parser/ParseNode.h
===================================================================
--- src/Parser/ParseNode.h	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/ParseNode.h	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -21,9 +21,9 @@
 #include <iterator>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
 //#include "SynTree/Declaration.h"
-#include "UniqueName.h"
+#include "Common/UniqueName.h"
 
 class ExpressionNode;
Index: src/Parser/StatementNode.cc
===================================================================
--- src/Parser/StatementNode.cc	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/StatementNode.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -22,5 +22,5 @@
 #include "SynTree/Expression.h"
 #include "parseutility.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 using namespace std;
Index: src/Parser/TypeData.cc
===================================================================
--- src/Parser/TypeData.cc	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/TypeData.cc	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -17,5 +17,5 @@
 #include <algorithm>
 #include <iterator>
-#include "utility.h"
+#include "Common/utility.h"
 #include "TypeData.h"
 #include "SynTree/Type.h"
Index: src/Parser/module.mk
===================================================================
--- src/Parser/module.mk	(revision f3fc8cbecb0781cd1183fbe36b297e9fb0e22c27)
+++ src/Parser/module.mk	(revision d3b7937ae7ab8afece0824b5729b7e86a9f0bd63)
@@ -11,6 +11,6 @@
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  8 20:23:47 2015
-## Update Count     : 87
+## Last Modified On : Thu Jan 28 11:57:23 2016
+## Update Count     : 100
 ###############################################################################
 
@@ -18,6 +18,4 @@
 
 AM_YFLAGS = -d -t -v
-cfa_cpp_LDADD = ${LEXLIB}	# yywrap
-MAINTAINERCLEANFILES = Parser/parser.output
 
 SRC += Parser/parser.yy \
@@ -33,2 +31,4 @@
        Parser/parseutility.cc \
        Parser/Parser.cc
+
+MAINTAINERCLEANFILES += Parser/parser.output