diff --git a/INIFile/INIFile.hh b/INIFile/INIFile.hh
index 3122f9bd30f77bddea18434065a775e5002bf895..72cb3ab6b214ab86ef38a6ee071bf2ec28df5472 100644
--- a/INIFile/INIFile.hh
+++ b/INIFile/INIFile.hh
@@ -380,7 +380,7 @@ private: // data
 
 #if defined(INCLUDE_TEMPLATES) && !defined(INIFILE_C)
 #define INIFILE_TEMPLATES
-#include "INIFileT.cc"
+#include "INIFileT_impl.hh"
 #endif
 
 #endif
diff --git a/INIFile/INIFileT.cc b/INIFile/INIFileT_impl.hh
similarity index 100%
rename from INIFile/INIFileT.cc
rename to INIFile/INIFileT_impl.hh
diff --git a/libs_required/Math_Tools/ICP/ICP.hh b/libs_required/Math_Tools/ICP/ICP.hh
index 0642601e6100b0acac7e112ff49502e9c05de647..66a530aad31fe8caf6861be17635267ab405fe8e 100644
--- a/libs_required/Math_Tools/ICP/ICP.hh
+++ b/libs_required/Math_Tools/ICP/ICP.hh
@@ -122,7 +122,7 @@ void icp(const std::vector< VectorT >& _points1 , const std::vector< VectorT >&
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(ICP_C)
 #define ICP_TEMPLATES
-#include "ICPT.cc"
+#include "ICPT_impl.hh"
 #endif
 //=============================================================================
 #endif // ICP_HH defined
diff --git a/libs_required/Math_Tools/ICP/ICPT.cc b/libs_required/Math_Tools/ICP/ICPT_impl.hh
similarity index 100%
rename from libs_required/Math_Tools/ICP/ICPT.cc
rename to libs_required/Math_Tools/ICP/ICPT_impl.hh
diff --git a/libs_required/Math_Tools/Math_Tools.hh b/libs_required/Math_Tools/Math_Tools.hh
index dfc4ec2fa91ef20a0b0788d7a07cbf9ce6e9f7de..a7d4712d4bc0eff9bc90303322fcc99e595d8c38 100644
--- a/libs_required/Math_Tools/Math_Tools.hh
+++ b/libs_required/Math_Tools/Math_Tools.hh
@@ -77,7 +77,7 @@ sane_normalized( VectorT _vec);
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(MATH_TOOLS_C)
 #define MATH_TOOLS_TEMPLATES
-#include "Math_ToolsT.cc"
+#include "Math_ToolsT_impl.hh"
 #endif
 //=============================================================================
 #endif // ACG_GEODESICFASTMARCHT_HH defined
diff --git a/libs_required/Math_Tools/Math_ToolsT.cc b/libs_required/Math_Tools/Math_ToolsT_impl.hh
similarity index 100%
rename from libs_required/Math_Tools/Math_ToolsT.cc
rename to libs_required/Math_Tools/Math_ToolsT_impl.hh
diff --git a/libs_required/Math_Tools/PCA/PCA.hh b/libs_required/Math_Tools/PCA/PCA.hh
index a04a59f64c4cc1c8fec4dd1686811790fc1d84e4..7b98b0e7778a8b9b7dde123749e2bedd4b32bdcc 100644
--- a/libs_required/Math_Tools/PCA/PCA.hh
+++ b/libs_required/Math_Tools/PCA/PCA.hh
@@ -130,7 +130,7 @@ private:
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(PCA_C)
 #define PCA_TEMPLATES
-#include "PCAT.cc"
+#include "PCAT_impl.hh"
 #endif
 //=============================================================================
 #endif // PCA_HH defined
diff --git a/libs_required/Math_Tools/PCA/PCAT.cc b/libs_required/Math_Tools/PCA/PCAT_impl.hh
similarity index 100%
rename from libs_required/Math_Tools/PCA/PCAT.cc
rename to libs_required/Math_Tools/PCA/PCAT_impl.hh
diff --git a/libs_required/MeshTools/Curvature.hh b/libs_required/MeshTools/Curvature.hh
index dccdba8b070430fdea4cbcae3862ebc30deb561e..2a5851958f8062c18f108e76f3c44ca8eab2325c 100644
--- a/libs_required/MeshTools/Curvature.hh
+++ b/libs_required/MeshTools/Curvature.hh
@@ -96,7 +96,7 @@ void discrete_mean_curv_op( const MeshT&                           _m,
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(CURVATURE_C)
 #define CURVATURE_TEMPLATES
-#include "CurvatureT.cc"
+#include "CurvatureT_impl.hh"
 #endif
 //=============================================================================
 #endif // CURVATURE_HH defined
diff --git a/libs_required/MeshTools/CurvatureT.cc b/libs_required/MeshTools/CurvatureT_impl.hh
similarity index 100%
rename from libs_required/MeshTools/CurvatureT.cc
rename to libs_required/MeshTools/CurvatureT_impl.hh
diff --git a/libs_required/MeshTools/MeshFunctions.hh b/libs_required/MeshTools/MeshFunctions.hh
index fd6424afd34361c8fa1731274d81b9157368748d..8e8d0e3911c991dbdc45f2c1f5e2f9ef569efe1c 100644
--- a/libs_required/MeshTools/MeshFunctions.hh
+++ b/libs_required/MeshTools/MeshFunctions.hh
@@ -171,7 +171,7 @@ void transformHandleVertices(ACG::Matrix4x4d _matrix , MeshT& _mesh);
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(MESHFUNCTIONS_C)
 #define MESHFUNCTIONS_TEMPLATES
-#include "MeshFunctionsT.cc"
+#include "MeshFunctionsT_impl.hh"
 #endif
 //=============================================================================
 #endif // MESHFUNCTIONS_HH defined
diff --git a/libs_required/MeshTools/MeshFunctionsT.cc b/libs_required/MeshTools/MeshFunctionsT_impl.hh
similarity index 100%
rename from libs_required/MeshTools/MeshFunctionsT.cc
rename to libs_required/MeshTools/MeshFunctionsT_impl.hh
diff --git a/libs_required/MeshTools/MeshInfoT.hh b/libs_required/MeshTools/MeshInfoT.hh
index 753977b5988cd8c42b2d2c08345e10b62faa1f07..a30a672e1859aa8877503478fc445757af542ac8 100644
--- a/libs_required/MeshTools/MeshInfoT.hh
+++ b/libs_required/MeshTools/MeshInfoT.hh
@@ -115,7 +115,7 @@ cog ( const MeshT* _mesh );
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(MESHINFOT_C)
 #define MESHINFOT_TEMPLATES
-#include "MeshInfoT.cc"
+#include "MeshInfoT_impl.hh"
 #endif
 //=============================================================================
 #endif // MESHINFOT_HH defined
diff --git a/libs_required/MeshTools/MeshInfoT.cc b/libs_required/MeshTools/MeshInfoT_impl.hh
similarity index 100%
rename from libs_required/MeshTools/MeshInfoT.cc
rename to libs_required/MeshTools/MeshInfoT_impl.hh
diff --git a/libs_required/MeshTools/MeshNavigationT.hh b/libs_required/MeshTools/MeshNavigationT.hh
index e64833df9add156283bd094ecdb127d8b3aa3e57..b487f1887e16fe80d6da56c8eac527784c1a1c62 100644
--- a/libs_required/MeshTools/MeshNavigationT.hh
+++ b/libs_required/MeshTools/MeshNavigationT.hh
@@ -90,7 +90,7 @@ findClosestBoundary(MeshT* _mesh , typename MeshT::VertexHandle _vh);
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(MESHNAVIGATIONT_C)
 #define MESHNAVIGATIONT_TEMPLATES
-#include "MeshNavigationT.cc"
+#include "MeshNavigationT_impl.hh"
 #endif
 //=============================================================================
 #endif // MESHNAVIGATIONT_HH defined
diff --git a/libs_required/MeshTools/MeshNavigationT.cc b/libs_required/MeshTools/MeshNavigationT_impl.hh
similarity index 100%
rename from libs_required/MeshTools/MeshNavigationT.cc
rename to libs_required/MeshTools/MeshNavigationT_impl.hh
diff --git a/libs_required/MeshTools/MeshSelectionT.hh b/libs_required/MeshTools/MeshSelectionT.hh
index a10e0711bdf579d349efd7f954a35ce3204bcc37..96ef1c9715caf2b45049a4a79ac73559e5bb367a 100644
--- a/libs_required/MeshTools/MeshSelectionT.hh
+++ b/libs_required/MeshTools/MeshSelectionT.hh
@@ -541,7 +541,7 @@ void clearFeatureFaces(MeshT* _mesh);
 //=============================================================================
 #if defined(INCLUDE_TEMPLATES) && !defined(MESHSELECTION_C)
 #define MESHSELECTION_TEMPLATES
-#include "MeshSelectionT.cc"
+#include "MeshSelectionT_impl.hh"
 #endif
 //=============================================================================
 #endif // MESHSELECTION_HH defined
diff --git a/libs_required/MeshTools/MeshSelectionT.cc b/libs_required/MeshTools/MeshSelectionT_impl.hh
similarity index 100%
rename from libs_required/MeshTools/MeshSelectionT.cc
rename to libs_required/MeshTools/MeshSelectionT_impl.hh