diff --git a/applications/test/00-dummy/Make/files b/applications/test/00-dummy/Make/files
index 5dc1cd06a3..29df13e761 100644
--- a/applications/test/00-dummy/Make/files
+++ b/applications/test/00-dummy/Make/files
@@ -1,4 +1,4 @@
 /* Install into FOAM_APPBIN to support 'fake' builds (to test packaging) */
-Test-dummyLib.C
+Test-dummyLib.cpp
 
 EXE = $(FOAM_APPBIN)/Test-dummyLib
diff --git a/applications/test/00-dummy/Test-dummyLib.C b/applications/test/00-dummy/Test-dummyLib.cpp
similarity index 100%
rename from applications/test/00-dummy/Test-dummyLib.C
rename to applications/test/00-dummy/Test-dummyLib.cpp
diff --git a/applications/test/00-dummy/library/Make/files b/applications/test/00-dummy/library/Make/files
index 680663a97b..d9b5ace3c7 100644
--- a/applications/test/00-dummy/library/Make/files
+++ b/applications/test/00-dummy/library/Make/files
@@ -1,4 +1,4 @@
 /* Install into central FOAM_LIBBIN for 'fake' builds (test packaging) */
-dummyLib.C
+dummyLib.cpp
 
 LIB = $(FOAM_LIBBIN)/libTestDummy-OpenFOAM
diff --git a/applications/test/00-dummy/library/dummy/Make/files b/applications/test/00-dummy/library/dummy/Make/files
index 946086a064..8a4a9898b4 100644
--- a/applications/test/00-dummy/library/dummy/Make/files
+++ b/applications/test/00-dummy/library/dummy/Make/files
@@ -1,4 +1,4 @@
 /* Install into central FOAM_LIBBIN/dummy for 'fake' builds (test packaging) */
-dummyMpiLib.C
+dummyMpiLib.cpp
 
 LIB = $(FOAM_LIBBIN)/dummy/libTestDummyMpi
diff --git a/applications/test/00-dummy/library/dummy/dummyMpiLib.C b/applications/test/00-dummy/library/dummy/dummyMpiLib.cpp
similarity index 100%
rename from applications/test/00-dummy/library/dummy/dummyMpiLib.C
rename to applications/test/00-dummy/library/dummy/dummyMpiLib.cpp
diff --git a/applications/test/00-dummy/library/dummyLib.C b/applications/test/00-dummy/library/dummyLib.cpp
similarity index 100%
rename from applications/test/00-dummy/library/dummyLib.C
rename to applications/test/00-dummy/library/dummyLib.cpp
diff --git a/applications/test/00-dummy/library/mpi/Make/files b/applications/test/00-dummy/library/mpi/Make/files
index bb3cd16a46..18aaea21a6 100644
--- a/applications/test/00-dummy/library/mpi/Make/files
+++ b/applications/test/00-dummy/library/mpi/Make/files
@@ -1,4 +1,4 @@
 /* Install into central FOAM_MPI_LIBBIN for 'fake' builds (test packaging) */
-dummyMpiLib.C
+dummyMpiLib.cpp
 
 LIB = $(FOAM_MPI_LIBBIN)/libTestDummyMpi
diff --git a/applications/test/00-dummy/library/mpi/dummyMpiLib.C b/applications/test/00-dummy/library/mpi/dummyMpiLib.cpp
similarity index 100%
rename from applications/test/00-dummy/library/mpi/dummyMpiLib.C
rename to applications/test/00-dummy/library/mpi/dummyMpiLib.cpp
diff --git a/applications/test/00-openmp/Make/files b/applications/test/00-openmp/Make/files
index c2749a9419..c6cd1af43d 100644
--- a/applications/test/00-openmp/Make/files
+++ b/applications/test/00-openmp/Make/files
@@ -1,3 +1,3 @@
-Test-openmp.C
+Test-openmp.cpp
 
 EXE = $(FOAM_USER_APPBIN)/Test-openmp
diff --git a/applications/test/00-openmp/Test-openmp.C b/applications/test/00-openmp/Test-openmp.cpp
similarity index 100%
rename from applications/test/00-openmp/Test-openmp.C
rename to applications/test/00-openmp/Test-openmp.cpp
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index c78f0c4b92..fb29333b6f 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -22,11 +22,12 @@
 #     Link source files in the specified dir(s) into their respective
 #     lnInclude directories
 #
-#     Header files (C)       :  .h
-#     Source files (C)       :  .c
-#     Header files (C++)     :  .H .hh .hpp .hxx
-#     Source files (C++)     :  .C .cc .cpp .cxx
-#     Template files (C++)   :    .tcc .tpp .txx
+#     Header files    : .h .H  .hh .hpp .hxx
+#     Template files  :    .C .tcc .tpp .txx
+#
+# Note
+#     OpenFOAM has historically used '.C' files both for compiled code
+#     and templated code.
 #
 # GNU make suffixes : .c .cc .C .cpp
 #
@@ -226,12 +227,11 @@ do
             \( -name lnInclude -o -name Make -o -name config -o -name noLink \) \
             -prune \
             -o \( \
-                -name '*.[CHch]' \
-                -o -name '*.cc' \
+                   -name '*.[CHh]' \
                 -o -name '*.hh' \
-                -o -name '*.[cht]xx' \
-                -o -name '*.[cht]pp' \
                 -o -name '*.tcc' \
+                -o -name '*.[ht]pp' \
+                -o -name '*.[ht]xx' \
             \)  \
             -exec ln "$optLink" {} . \;
     )