Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision b2ea0cddcfd03f2242eda9e8d588f2ce92daf9a7)
@@ -26,5 +26,5 @@
 #include "Candidate.hpp"
 #include "CastCost.hpp"           // for castCost
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "ConversionCost.h"       // for conversionCast
 #include "Cost.h"
Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
+++ src/ResolvExpr/CommonType.cc	(revision b2ea0cddcfd03f2242eda9e8d588f2ce92daf9a7)
@@ -39,5 +39,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY BasicTypes-gen.cpp
 	#define BT ast::BasicKind::
 	static const ast::BasicKind commonTypes[BT NUMBER_OF_BASIC_TYPES][BT NUMBER_OF_BASIC_TYPES] = { // nearest common ancestor
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
+++ src/ResolvExpr/ConversionCost.cc	(revision b2ea0cddcfd03f2242eda9e8d588f2ce92daf9a7)
@@ -35,5 +35,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY BasicTypes-gen.cpp
 	/* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves)
 	                         _Bool
@@ -60,5 +60,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY BasicTypes-gen.cpp
 	static const int costMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
 		/*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
@@ -108,5 +108,5 @@
 
 	// GENERATED START, DO NOT EDIT
-	// GENERATED BY BasicTypes-gen.cc
+	// GENERATED BY BasicTypes-gen.cpp
 	static const int signMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
 		/*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision eb7586e994c3710bc421ab2b1c131baf040bf98d)
+++ src/ResolvExpr/Resolver.cc	(revision b2ea0cddcfd03f2242eda9e8d588f2ce92daf9a7)
@@ -28,5 +28,5 @@
 #include "typeops.h"                     // for extractResultType
 #include "Unify.h"                       // for unify
-#include "CompilationState.h"
+#include "CompilationState.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Init.hpp"