Index: src/AST/Decl.cpp
===================================================================
--- src/AST/Decl.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Decl.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -20,6 +20,6 @@
 #include <unordered_map>
 
-#include "Common/Eval.h"       // for eval
-#include "Common/SemanticError.h"
+#include "Common/Eval.hpp"     // for eval
+#include "Common/SemanticError.hpp"
 
 #include "Fwd.hpp"             // for UniqueId
Index: src/AST/Expr.cpp
===================================================================
--- src/AST/Expr.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Expr.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -27,9 +27,9 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
-#include "Common/utility.h"
-#include "Common/SemanticError.h"
-#include "GenPoly/Lvalue.h"        // for referencesPermissable
-#include "ResolvExpr/Unify.h"      // for extractResultType
-#include "Tuples/Tuples.h"         // for makeTupleType
+#include "Common/Utility.hpp"
+#include "Common/SemanticError.hpp"
+#include "GenPoly/Lvalue.hpp"      // for referencesPermissable
+#include "ResolvExpr/Unify.hpp"    // for extractResultType
+#include "Tuples/Tuples.hpp"       // for makeTupleType
 
 namespace ast {
Index: src/AST/Inspect.cpp
===================================================================
--- src/AST/Inspect.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Inspect.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -24,5 +24,5 @@
 #include "AST/Stmt.hpp"
 #include "AST/Type.hpp"
-#include "CodeGen/OperatorTable.h"
+#include "CodeGen/OperatorTable.hpp"
 
 namespace ast {
Index: src/AST/Label.hpp
===================================================================
--- src/AST/Label.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Label.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -21,5 +21,5 @@
 
 #include "Node.hpp"
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 namespace ast {
Index: src/AST/LinkageSpec.cpp
===================================================================
--- src/AST/LinkageSpec.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/LinkageSpec.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -20,6 +20,6 @@
 #include <string>
 
-#include "Common/CodeLocation.h"
-#include "Common/SemanticError.h"
+#include "Common/CodeLocation.hpp"
+#include "Common/SemanticError.hpp"
 
 namespace ast {
Index: src/AST/LinkageSpec.hpp
===================================================================
--- src/AST/LinkageSpec.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/LinkageSpec.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -19,5 +19,5 @@
 
 #include "Bitfield.hpp"
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 namespace ast {
Index: src/AST/Node.hpp
===================================================================
--- src/AST/Node.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Node.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -20,5 +20,5 @@
 #include <iosfwd>
 
-#include "Common/ErrorObjects.h"  // for SemanticErrorException
+#include "Common/ErrorObjects.hpp"  // for SemanticErrorException
 
 namespace ast {
Index: src/AST/ParseNode.hpp
===================================================================
--- src/AST/ParseNode.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/ParseNode.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -18,5 +18,5 @@
 #include "Node.hpp"
 
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 namespace ast {
Index: src/AST/Pass.hpp
===================================================================
--- src/AST/Pass.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Pass.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -423,5 +423,5 @@
 }
 
-#include "Common/Stats.h"
+#include "Common/Stats.hpp"
 
 namespace ast {
Index: src/AST/Pass.proto.hpp
===================================================================
--- src/AST/Pass.proto.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Pass.proto.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Pass.impl.hpp --
+// Pass.proto.hpp --
 //
 // Author           : Thierry Delisle
@@ -18,6 +18,6 @@
 
 #include "Common/Iterate.hpp"
-#include "Common/Stats/Heap.h"
-#include "Common/utility.h"
+#include "Common/Stats/Heap.hpp"
+#include "Common/Utility.hpp"
 namespace ast {
 	template<typename core_t> class Pass;
Index: src/AST/Print.hpp
===================================================================
--- src/AST/Print.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Print.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -19,5 +19,5 @@
 
 #include "AST/Fwd.hpp"
-#include "Common/Indenter.h"
+#include "Common/Indenter.hpp"
 
 namespace ast {
Index: src/AST/Stmt.hpp
===================================================================
--- src/AST/Stmt.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Stmt.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -24,5 +24,5 @@
 #include "ParseNode.hpp"
 #include "Visitor.hpp"
-#include "Common/CodeLocation.h"
+#include "Common/CodeLocation.hpp"
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
Index: src/AST/SymbolTable.cpp
===================================================================
--- src/AST/SymbolTable.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/SymbolTable.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -23,13 +23,13 @@
 #include "Inspect.hpp"
 #include "Type.hpp"
-#include "CodeGen/OperatorTable.h"         // for isCtorDtorAssign
-#include "Common/SemanticError.h"
-#include "Common/Stats/Counter.h"
-#include "GenPoly/GenPoly.h"
-#include "InitTweak/InitTweak.h"
-#include "ResolvExpr/Cost.h"
+#include "CodeGen/OperatorTable.hpp"       // for isCtorDtorAssign
+#include "Common/SemanticError.hpp"
+#include "Common/Stats/Counter.hpp"
+#include "GenPoly/GenPoly.hpp"
+#include "InitTweak/InitTweak.hpp"
+#include "ResolvExpr/Cost.hpp"
 #include "ResolvExpr/CandidateFinder.hpp"  // for referenceToRvalueConversion
-#include "ResolvExpr/Unify.h"
-#include "SymTab/Mangler.h"
+#include "ResolvExpr/Unify.hpp"
+#include "SymTab/Mangler.hpp"
 
 namespace ast {
Index: src/AST/SymbolTable.hpp
===================================================================
--- src/AST/SymbolTable.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/SymbolTable.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -21,6 +21,6 @@
 #include "Fwd.hpp"
 #include "Node.hpp"                // for ptr, readonly
-#include "Common/CodeLocation.h"
-#include "Common/PersistentMap.h"
+#include "Common/CodeLocation.hpp"
+#include "Common/PersistentMap.hpp"
 
 namespace ResolvExpr {
Index: src/AST/Type.cpp
===================================================================
--- src/AST/Type.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Type.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -23,6 +23,6 @@
 #include "Init.hpp"
 #include "Inspect.hpp"
-#include "Common/utility.h"      // for copy, move
-#include "Tuples/Tuples.h"       // for isTtype
+#include "Common/Utility.hpp"    // for copy, move
+#include "Tuples/Tuples.hpp"     // for isTtype
 
 namespace ast {
Index: src/AST/TypeEnvironment.cpp
===================================================================
--- src/AST/TypeEnvironment.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/TypeEnvironment.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -29,9 +29,9 @@
 #include "Print.hpp"
 #include "Type.hpp"
-#include "Common/Indenter.h"
-#include "ResolvExpr/typeops.h"    // for occurs
-#include "ResolvExpr/WidenMode.h"
-#include "ResolvExpr/Unify.h"      // for unifyInexact
-#include "Tuples/Tuples.h"         // for isTtype
+#include "Common/Indenter.hpp"
+#include "ResolvExpr/Typeops.hpp"    // for occurs
+#include "ResolvExpr/WidenMode.hpp"
+#include "ResolvExpr/Unify.hpp"      // for unifyInexact
+#include "Tuples/Tuples.hpp"         // for isTtype
 #include "CompilationState.hpp"
 
Index: src/AST/TypeEnvironment.hpp
===================================================================
--- src/AST/TypeEnvironment.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/TypeEnvironment.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -28,6 +28,6 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
-#include "Common/Indenter.h"
-#include "ResolvExpr/WidenMode.h"
+#include "Common/Indenter.hpp"
+#include "ResolvExpr/WidenMode.hpp"
 
 namespace ast {
Index: src/AST/TypeSubstitution.cpp
===================================================================
--- src/AST/TypeSubstitution.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/TypeSubstitution.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeSubstitution.cc --
+// TypeSubstitution.cpp --
 //
 // Author           : Richard C. Bilson
Index: src/AST/TypeSubstitution.hpp
===================================================================
--- src/AST/TypeSubstitution.hpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/TypeSubstitution.hpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeSubstitution.h --
+// TypeSubstitution.hpp --
 //
 // Author           : Richard C. Bilson
@@ -16,15 +16,15 @@
 #pragma once
 
-#include <cassert>                 // for assert
-#include <list>                    // for list<>::iterator, _List_iterator
+#include <cassert>                   // for assert
+#include <list>                      // for list<>::iterator, _List_iterator
 #include <unordered_map>
 #include <unordered_set>
-#include <string>                  // for string, operator!=
-#include <utility>                 // for pair
+#include <string>                    // for string, operator!=
+#include <utility>                   // for pair
 
-#include "Fwd.hpp"        // for UniqueId
+#include "Fwd.hpp"                   // for UniqueId
 #include "ParseNode.hpp"
 #include "Type.hpp"
-#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/SemanticError.hpp"  // for SemanticError
 #include "Visitor.hpp"
 #include "Decl.hpp"
Index: src/AST/Util.cpp
===================================================================
--- src/AST/Util.cpp	(revision acb33f15d3e545defb3cca21e653745f42fa6553)
+++ src/AST/Util.cpp	(revision 31f48370c9fb2839ef3cfac9f848ba193f19dc78)
@@ -20,6 +20,6 @@
 #include "Pass.hpp"
 #include "TranslationUnit.hpp"
-#include "Common/utility.h"
-#include "GenPoly/ScopedSet.h"
+#include "Common/Utility.hpp"
+#include "GenPoly/ScopedSet.hpp"
 
 #include <vector>