Index: src/Validate/Autogen.cpp
===================================================================
--- src/Validate/Autogen.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/Autogen.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -16,11 +16,11 @@
 #include "Autogen.hpp"
 
-#include <algorithm>               // for count_if
-#include <cassert>                 // for strict_dynamic_cast, assert, assertf
-#include <iterator>                // for back_insert_iterator, back_inserter
-#include <list>                    // for list, _List_iterator, list<>::iter...
-#include <set>                     // for set, _Rb_tree_const_iterator
-#include <utility>                 // for pair
-#include <vector>                  // for vector
+#include <algorithm>                   // for count_if
+#include <cassert>                     // for strict_dynamic_cast, assert, a...
+#include <iterator>                    // for back_insert_iterator, back_ins...
+#include <list>                        // for list, _List_iterator, list<>::...
+#include <set>                         // for set, _Rb_tree_const_iterator
+#include <utility>                     // for pair
+#include <vector>                      // for vector
 
 #include "AST/Attribute.hpp"
@@ -34,12 +34,12 @@
 #include "AST/Stmt.hpp"
 #include "AST/SymbolTable.hpp"
-#include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
-#include "Common/ScopedMap.h"      // for ScopedMap<>::const_iterator, Scope...
-#include "Common/utility.h"        // for cloneAll, operator+
-#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::iterator
-#include "InitTweak/GenInit.h"     // for fixReturnStatements
-#include "InitTweak/InitTweak.h"   // for isAssignment, isCopyConstructor
+#include "CodeGen/OperatorTable.hpp"   // for isCtorDtor, isCtorDtorAssign
+#include "Common/ScopedMap.hpp"        // for ScopedMap<>::const_iterator, S...
+#include "Common/Utility.hpp"          // for cloneAll, operator+
+#include "GenPoly/ScopedSet.hpp"       // for ScopedSet, ScopedSet<>::iterator
+#include "InitTweak/GenInit.hpp"       // for fixReturnStatements
+#include "InitTweak/InitTweak.hpp"     // for isAssignment, isCopyConstructor
 #include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
-#include "SymTab/Mangler.h"        // for Mangler
+#include "SymTab/Mangler.hpp"          // for Mangler
 #include "CompilationState.hpp"
 
Index: src/Validate/CompoundLiteral.cpp
===================================================================
--- src/Validate/CompoundLiteral.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/CompoundLiteral.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -20,5 +20,5 @@
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "Common/UniqueName.h"
+#include "Common/UniqueName.hpp"
 
 namespace Validate {
Index: src/Validate/EliminateTypedef.cpp
===================================================================
--- src/Validate/EliminateTypedef.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/EliminateTypedef.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -21,5 +21,5 @@
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
-#include "Common/utility.h"
+#include "Common/Utility.hpp"
 
 namespace Validate {
Index: src/Validate/EnumAndPointerDecay.cpp
===================================================================
--- src/Validate/EnumAndPointerDecay.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/EnumAndPointerDecay.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -20,5 +20,5 @@
 #include "AST/Pass.hpp"
 #include "AST/Type.hpp"
-#include "SymTab/FixFunction.h"
+#include "SymTab/FixFunction.hpp"
 #include "Validate/NoIdSymbolTable.hpp"
 
Index: src/Validate/FindSpecialDecls.cpp
===================================================================
--- src/Validate/FindSpecialDecls.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/FindSpecialDecls.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -14,5 +14,5 @@
 //
 
-#include "Validate/FindSpecialDecls.h"
+#include "Validate/FindSpecialDecls.hpp"
 
 #include "AST/Decl.hpp"
Index: src/Validate/FindSpecialDecls.h
===================================================================
--- src/Validate/FindSpecialDecls.h	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-//
-// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
-//
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// FindSpecialDeclarations.h -- Find special declarations used in the compiler.
-//
-// Author           : Rob Schluntz
-// Created On       : Thu Aug 30 09:49:02 2018
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Nov 10 15:16:00 2021
-// Update Count     : 3
-//
-
-#pragma once
-
-namespace ast {
-	class TranslationUnit;
-}
-
-namespace Validate {
-
-/// Find and remember some of the special declarations that are useful for
-/// generating code, so that they do not have to be discovered multiple times.
-void findGlobalDecls( ast::TranslationUnit & translationUnit );
-
-} // namespace Validate
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Validate/FindSpecialDecls.hpp
===================================================================
--- src/Validate/FindSpecialDecls.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Validate/FindSpecialDecls.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -0,0 +1,34 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// FindSpecialDeclarations.hpp -- Find special declarations used in the compiler.
+//
+// Author           : Rob Schluntz
+// Created On       : Thu Aug 30 09:49:02 2018
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Nov 10 15:16:00 2021
+// Update Count     : 3
+//
+
+#pragma once
+
+namespace ast {
+	class TranslationUnit;
+}
+
+namespace Validate {
+
+/// Find and remember some of the special declarations that are useful for
+/// generating code, so that they do not have to be discovered multiple times.
+void findGlobalDecls( ast::TranslationUnit & translationUnit );
+
+} // namespace Validate
+
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //
Index: src/Validate/FixQualifiedTypes.cpp
===================================================================
--- src/Validate/FixQualifiedTypes.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/FixQualifiedTypes.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -21,5 +21,5 @@
 #include "AST/TranslationUnit.hpp"
 #include "Common/ToString.hpp"             // for toString
-#include "SymTab/Mangler.h"                // for Mangler
+#include "SymTab/Mangler.hpp"              // for Mangler
 #include "Validate/NoIdSymbolTable.hpp"
 
Index: src/Validate/FixReturnTypes.cpp
===================================================================
--- src/Validate/FixReturnTypes.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/FixReturnTypes.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -20,5 +20,5 @@
 #include "AST/Type.hpp"
 #include "CodeGen/CodeGenerator.hpp"
-#include "ResolvExpr/Unify.h"
+#include "ResolvExpr/Unify.hpp"
 
 namespace Validate {
Index: src/Validate/ForallPointerDecay.cpp
===================================================================
--- src/Validate/ForallPointerDecay.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/ForallPointerDecay.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -20,9 +20,9 @@
 #include "AST/DeclReplacer.hpp"
 #include "AST/Pass.hpp"
-#include "CodeGen/OperatorTable.h"
-#include "Common/CodeLocation.h"
+#include "CodeGen/OperatorTable.hpp"
+#include "Common/CodeLocation.hpp"
 #include "Common/ToString.hpp"
-#include "Common/utility.h"
-#include "SymTab/FixFunction.h"
+#include "Common/Utility.hpp"
+#include "SymTab/FixFunction.hpp"
 
 namespace Validate {
Index: src/Validate/ImplementEnumFunc.cpp
===================================================================
--- src/Validate/ImplementEnumFunc.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/ImplementEnumFunc.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -2,6 +2,6 @@
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
-#include "CodeGen/OperatorTable.h"  // for isCtorDtor, isCtorDtorAssign
-#include "InitTweak/InitTweak.h"    // for isAssignment, isCopyConstructor
+#include "CodeGen/OperatorTable.hpp"  // for isCtorDtor, isCtorDtorAssign
+#include "InitTweak/InitTweak.hpp"    // for isAssignment, isCopyConstructor
 namespace Validate {
 
Index: src/Validate/ReplaceTypedef.cpp
===================================================================
--- src/Validate/ReplaceTypedef.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/ReplaceTypedef.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -18,7 +18,7 @@
 #include "AST/Copy.hpp"
 #include "AST/Pass.hpp"
-#include "Common/ScopedMap.h"
-#include "Common/UniqueName.h"
-#include "ResolvExpr/Unify.h"
+#include "Common/ScopedMap.hpp"
+#include "Common/UniqueName.hpp"
+#include "ResolvExpr/Unify.hpp"
 
 namespace Validate {
Index: src/Validate/VerifyCtorDtorAssign.cpp
===================================================================
--- src/Validate/VerifyCtorDtorAssign.cpp	(revision 6d9aa7989fd14486da164e5e2bf757e49c2096cb)
+++ src/Validate/VerifyCtorDtorAssign.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
@@ -17,5 +17,5 @@
 
 #include "AST/Pass.hpp"
-#include "CodeGen/OperatorTable.h"
+#include "CodeGen/OperatorTable.hpp"
 
 namespace Validate {