Index: src/CodeGen/module.mk
===================================================================
--- src/CodeGen/module.mk	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/CodeGen/module.mk	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -24,10 +24,10 @@
 
 SRC += $(SRC_CODEGEN) \
-	CodeGen/Generate.cpp \
-	CodeGen/Generate.hpp \
 	CodeGen/FixMain.cpp \
 	CodeGen/FixMain.hpp \
 	CodeGen/FixNames.cpp \
 	CodeGen/FixNames.hpp \
+	CodeGen/Generate.cpp \
+	CodeGen/Generate.hpp \
 	CodeGen/LinkOnce.cpp \
 	CodeGen/LinkOnce.hpp \
Index: src/ControlStruct/module.mk
===================================================================
--- src/ControlStruct/module.mk	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/ControlStruct/module.mk	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -17,7 +17,7 @@
 SRC += \
 	ControlStruct/ExceptDecl.cpp \
-	ControlStruct/ExceptDecl.h \
+	ControlStruct/ExceptDecl.hpp \
 	ControlStruct/ExceptTranslate.cpp \
-	ControlStruct/ExceptTranslate.h \
+	ControlStruct/ExceptTranslate.hpp \
 	ControlStruct/FixLabels.cpp \
 	ControlStruct/FixLabels.hpp \
Index: c/Validate/ReplacePseudoFunc.hpp
===================================================================
--- src/Validate/ReplacePseudoFunc.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ 	(revision )
@@ -1,10 +1,0 @@
-#pragma once
-
-namespace ast {
-    class TranslationUnit;
-}
-
-namespace Validate {
-
-void replacePseudoFunc( ast::TranslationUnit & translationUnit );
-}
Index: src/Validate/module.mk
===================================================================
--- src/Validate/module.mk	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Validate/module.mk	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -16,5 +16,5 @@
 
 SRC_VALIDATE = \
-	Validate/FindSpecialDecls.h
+	Validate/FindSpecialDecls.hpp
 
 SRC += $(SRC_VALIDATE) \
@@ -40,4 +40,6 @@
 	Validate/HoistTypeDecls.cpp \
 	Validate/HoistTypeDecls.hpp \
+	Validate/ImplementEnumFunc.cpp \
+	Validate/ImplementEnumFunc.hpp \
 	Validate/InitializerLength.cpp \
 	Validate/InitializerLength.hpp \
@@ -52,7 +54,5 @@
 	Validate/ReturnCheck.hpp \
 	Validate/VerifyCtorDtorAssign.cpp \
-	Validate/VerifyCtorDtorAssign.hpp \
-	Validate/ImplementEnumFunc.cpp \
-	Validate/ImplementEnumFunc.hpp
+	Validate/VerifyCtorDtorAssign.hpp
 
 SRCDEMANGLE += $(SRC_VALIDATE)
Index: src/main.cpp
===================================================================
--- src/main.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/main.cpp	(revision c778ef1fa5b161d07ea4e5f42e20a63d926fc1ca)
@@ -66,5 +66,4 @@
 #include "Tuples/Tuples.hpp"                // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
-#include "Validate/ImplementEnumFunc.hpp"   // for implementEnumFunc
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/EliminateTypedef.hpp"    // for eliminateTypedef
@@ -77,4 +76,5 @@
 #include "Validate/HoistStruct.hpp"         // for hoistStruct
 #include "Validate/HoistTypeDecls.hpp"      // for hoistTypeDecls
+#include "Validate/ImplementEnumFunc.hpp"   // for implementEnumFunc
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses