Index: src/Common/Assert.cpp
===================================================================
--- src/Common/Assert.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/Assert.cpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Assert.cc --
+// Assert.cpp --
 //
 // Author           : Peter A. Buhr
@@ -22,5 +22,5 @@
 #define CFA_ASSERT_FMT "*CFA assertion error* \"%s\" from program \"%s\" in \"%s\" at line %d in file \"%s\""
 
-// called by macro assert in assert.h
+// called by macro assert in cassert
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
 	fprintf( stderr, CFA_ASSERT_FMT ".\n", assertion, __progname, function, line, file );
Index: src/Common/FilterCombos.hpp
===================================================================
--- src/Common/FilterCombos.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/FilterCombos.hpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -22,5 +22,5 @@
 
 /// Combo iterator that simply collects values into a vector, marking all values as valid.
-/// Prefer combos in typeops.h to use of IntoVectorComboIter with filterCombos
+/// Prefer combos in Typeops.hpp to use of IntoVectorComboIter with filterCombos
 /// @param T	The element type of the vector.
 template<typename T>
Index: src/Common/Stats.hpp
===================================================================
--- src/Common/Stats.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/Stats.hpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -24,5 +24,5 @@
 
 These can be enabled using the --stats option, to which a comma seperated list of options can be passed.
-For more details see Stats.cc
+For more information, see Stats/Stats.cpp
 
 Counters:
Index: src/Common/Stats/Base.hpp
===================================================================
--- src/Common/Stats/Base.hpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/Stats/Base.hpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Heap.hpp --
 //
 // Author           : Thierry Delisle
Index: src/Common/Stats/Heap.cpp
===================================================================
--- src/Common/Stats/Heap.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/Stats/Heap.cpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.cc --
+// Heap.cpp --
 //
 // Author           : Thierry Delisle
@@ -69,5 +69,5 @@
 		void stacktrace_push(size_t id) {
 			++stacktrace_depth;
-			assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cc");
+			assertf(stacktrace_depth < stacktrace_max_depth, "Stack trace too deep: increase size of array in Heap.cpp");
 			trace[stacktrace_depth] = id;
 		}
@@ -87,5 +87,5 @@
 			passes_cnt++;
 
-			assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cc");
+			assertf(passes_cnt < passes_size, "Too many passes for Stats::Heap, increase the size of the array in Heap.cpp");
 		}
 
Index: src/Common/Stats/Stats.cpp
===================================================================
--- src/Common/Stats/Stats.cpp	(revision 0f612d22e304288d5575379f38cb245443b974b8)
+++ src/Common/Stats/Stats.cpp	(revision ccfbfd90ab1713dc68c30f792b4a896c53587954)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Stats.cc --
+// Stats.cpp --
 //
 // Author           : Thierry Delisle