Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 4bb5d36c9f2ab73665ea3f1cdfc6cebfb5f86823)
+++ src/CodeGen/CodeGenerator.cc	(revision 7831e8fb0419110ca1ed222c6c930777cb7a9753)
@@ -1238,16 +1238,4 @@
 } // namespace CodeGen
 
-
-unsigned Indenter::tabsize = 2;
-
-std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {
-	if ( node ) {
-		node->print( out );
-	} else {
-		out << "nullptr";
-	}
-	return out;
-}
-
 // Local Variables: //
 // tab-width: 4 //
Index: src/CodeGen/FixMain.cc
===================================================================
--- src/CodeGen/FixMain.cc	(revision 4bb5d36c9f2ab73665ea3f1cdfc6cebfb5f86823)
+++ src/CodeGen/FixMain.cc	(revision 7831e8fb0419110ca1ed222c6c930777cb7a9753)
@@ -49,6 +49,4 @@
 
 }
-
-	bool FixMain::replace_main = false;
 
 	template<typename container>
Index: src/CodeGen/FixMain2.cc
===================================================================
--- src/CodeGen/FixMain2.cc	(revision 7831e8fb0419110ca1ed222c6c930777cb7a9753)
+++ src/CodeGen/FixMain2.cc	(revision 7831e8fb0419110ca1ed222c6c930777cb7a9753)
@@ -0,0 +1,28 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// FixMain2.cc -- A side file used to seperate the compiler and demangler.
+//
+// Author           : Andrew Beach
+// Created On       : Tue May 17 10:05:00 2022
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue May 17 10:08:00 2022
+// Update Count     : 0
+//
+
+#include "FixMain.h"
+
+namespace CodeGen {
+
+bool FixMain::replace_main = false;
+
+} // namespace CodeGen
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/CodeGen/module.mk
===================================================================
--- src/CodeGen/module.mk	(revision 4bb5d36c9f2ab73665ea3f1cdfc6cebfb5f86823)
+++ src/CodeGen/module.mk	(revision 7831e8fb0419110ca1ed222c6c930777cb7a9753)
@@ -10,25 +10,28 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Dec 14 07:29:42 2019
-## Update Count     : 4
+## Last Modified By : Andrew Beach
+## Last Modified On : Tue May 17 14:26:00 2022
+## Update Count     : 5
 ###############################################################################
 
-#SRC +=  ArgTweak/Rewriter.cc \
-#	ArgTweak/Mutate.cc
+SRC_CODEGEN = \
+	CodeGen/FixMain2.cc \
+	CodeGen/FixMain.h \
+	CodeGen/OperatorTable.cc \
+	CodeGen/OperatorTable.h
 
-SRC_CODEGEN = \
+SRC += $(SRC_CODEGEN) \
 	CodeGen/CodeGenerator.cc \
 	CodeGen/CodeGenerator.h \
+	CodeGen/Generate.cc \
+	CodeGen/Generate.h \
 	CodeGen/FixMain.cc \
-	CodeGen/FixMain.h \
+	CodeGen/FixNames.cc \
+	CodeGen/FixNames.h \
 	CodeGen/GenType.cc \
 	CodeGen/GenType.h \
 	CodeGen/LinkOnce.cc \
 	CodeGen/LinkOnce.h \
-	CodeGen/OperatorTable.cc \
-	CodeGen/OperatorTable.h \
 	CodeGen/Options.h
 
-SRC += $(SRC_CODEGEN) CodeGen/Generate.cc CodeGen/Generate.h CodeGen/FixNames.cc CodeGen/FixNames.h
 SRCDEMANGLE += $(SRC_CODEGEN)