diff --git a/BaseLib/RangeValidator.hpp b/BaseLib/RangeValidator-impl.h
similarity index 100%
rename from BaseLib/RangeValidator.hpp
rename to BaseLib/RangeValidator-impl.h
diff --git a/BaseLib/RangeValidator.h b/BaseLib/RangeValidator.h
index 8773388f2268a62cf4992a1a0bec865535828d28..9b6db9671960891d521f8371297cbf8f0706e1fc 100644
--- a/BaseLib/RangeValidator.h
+++ b/BaseLib/RangeValidator.h
@@ -32,6 +32,6 @@ private:
 
 }
 
-#include "RangeValidator.hpp"
+#include "RangeValidator-impl.h"
 
 #endif /* RANGEVALIDATOR_H_ */
diff --git a/MathLib/LinAlg/Dense/DenseMatrix.tpp b/MathLib/LinAlg/Dense/DenseMatrix-impl.h
similarity index 100%
rename from MathLib/LinAlg/Dense/DenseMatrix.tpp
rename to MathLib/LinAlg/Dense/DenseMatrix-impl.h
diff --git a/MathLib/LinAlg/Dense/DenseMatrix.h b/MathLib/LinAlg/Dense/DenseMatrix.h
index 4ade1eef484c7d161493604bc671e63396b7b064..30241308de2d55e559f8ea2d74415c44bfeab6e0 100644
--- a/MathLib/LinAlg/Dense/DenseMatrix.h
+++ b/MathLib/LinAlg/Dense/DenseMatrix.h
@@ -157,6 +157,6 @@ std::ostream& operator<< (std::ostream &os, const DenseMatrix<FP_TYPE, IDX_TYPE>
 
 } // end namespace MathLib
 
-#include "DenseMatrix.tpp"
+#include "DenseMatrix-impl.h"
 
 #endif
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix.tpp b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
similarity index 100%
rename from MathLib/LinAlg/Dense/GlobalDenseMatrix.tpp
rename to MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
index 1215d880bf254537e739b2ab2e0ef4a42c86c1ef..949d1ba39c62302254f2f754b2513a05a31b455e 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
@@ -99,6 +99,6 @@ public:
 
 } // end namespace MathLib
 
-#include "GlobalDenseMatrix.tpp"
+#include "GlobalDenseMatrix-impl.h"
 
 #endif /* GLOBALDENSEMATRIX_H_ */
diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.tpp b/MathLib/LinAlg/Solvers/GaussAlgorithm-impl.h
similarity index 100%
rename from MathLib/LinAlg/Solvers/GaussAlgorithm.tpp
rename to MathLib/LinAlg/Solvers/GaussAlgorithm-impl.h
diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.h b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
index c707b5c7ce0d8f4a388df67d097dee2fd6175e2d..48d9db8ca1ff39e910bdb988c86c6805ab2a20ad 100644
--- a/MathLib/LinAlg/Solvers/GaussAlgorithm.h
+++ b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
@@ -101,6 +101,6 @@ private:
 
 } // end namespace MathLib
 
-#include "GaussAlgorithm.tpp"
+#include "GaussAlgorithm-impl.h"
 
 #endif /* GAUSSALGORITHM_H_ */
diff --git a/MathLib/LinAlg/Solvers/TriangularSolve.tpp b/MathLib/LinAlg/Solvers/TriangularSolve-impl.h
similarity index 100%
rename from MathLib/LinAlg/Solvers/TriangularSolve.tpp
rename to MathLib/LinAlg/Solvers/TriangularSolve-impl.h
diff --git a/MathLib/LinAlg/Solvers/TriangularSolve.h b/MathLib/LinAlg/Solvers/TriangularSolve.h
index 3ffc4b00b16b55e204c3ab1f5a8dab085309ae09..f4a0d2704e0e4bd5e1d7d28dcf96c9a5333ea2d5 100644
--- a/MathLib/LinAlg/Solvers/TriangularSolve.h
+++ b/MathLib/LinAlg/Solvers/TriangularSolve.h
@@ -50,6 +50,6 @@ void backwardSolve ( DenseMatrix<FP_T> const& mat, VEC_T& x, VEC_T const& b);
 
 } // end namespace MathLib
 
-#include "TriangularSolve.tpp"
+#include "TriangularSolve-impl.h"
 
 #endif /* TRIANGULARSOLVE_H_ */
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.tpp b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h
similarity index 100%
rename from NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.tpp
rename to NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping-impl.h
diff --git a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
index 1903ffae54f325f52c4b07ed74610c81768ee1f4..5afb44a1cac18a06557fed945aba126bcf8959da 100644
--- a/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
+++ b/NumLib/Fem/CoordinatesMapping/NaturalCoordinatesMapping.h
@@ -53,7 +53,7 @@ struct NaturalCoordinatesMapping
 
 } // NumLib
 
-#include "NaturalCoordinatesMapping.tpp"
+#include "NaturalCoordinatesMapping-impl.h"
 
 
 #endif //NATURALCOORDINATESMAPPING_H_
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.tpp b/NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
similarity index 100%
rename from NumLib/Fem/CoordinatesMapping/ShapeMatrices.tpp
rename to NumLib/Fem/CoordinatesMapping/ShapeMatrices-impl.h
diff --git a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
index a8e6840fefc510dc61d8c69811f0d261ca0f37c2..c123312cce8dfa57502183946a9a1fc6605e51e4 100644
--- a/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
+++ b/NumLib/Fem/CoordinatesMapping/ShapeMatrices.h
@@ -86,6 +86,6 @@ struct ShapeMatrices
 
 } // NumLib
 
-#include "ShapeMatrices.tpp"
+#include "ShapeMatrices-impl.h"
 
 #endif //SHAPEMATRICES_H_
diff --git a/NumLib/Fem/Integration/IntegrationGaussRegular.tpp b/NumLib/Fem/Integration/IntegrationGaussRegular-impl.h
similarity index 100%
rename from NumLib/Fem/Integration/IntegrationGaussRegular.tpp
rename to NumLib/Fem/Integration/IntegrationGaussRegular-impl.h
diff --git a/NumLib/Fem/Integration/IntegrationGaussRegular.h b/NumLib/Fem/Integration/IntegrationGaussRegular.h
index 2af2a75a81f56eb87dca8c115445f56cd6dadc1f..c722b76d4e0324221170241b3c3dd8cb010bcde4 100644
--- a/NumLib/Fem/Integration/IntegrationGaussRegular.h
+++ b/NumLib/Fem/Integration/IntegrationGaussRegular.h
@@ -108,6 +108,6 @@ private:
 
 } // NumLib
 
-#include "IntegrationGaussRegular.tpp"
+#include "IntegrationGaussRegular-impl.h"
 
 #endif //INTEGRATIONGAUSSREGULAR_H_
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.tpp b/NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h
similarity index 100%
rename from NumLib/Fem/ShapeFunction/ShapeQuad4.tpp
rename to NumLib/Fem/ShapeFunction/ShapeQuad4-impl.h
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.h b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
index 009fe4f70216d84e69425305f98db6ddff0a1a70..00d710ca06cb3c3d6581b7585cb87ee7a5197ac5 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
@@ -53,6 +53,6 @@ public:
 
 }
 
-#include "ShapeQuad4.tpp"
+#include "ShapeQuad4-impl.h"
 
 #endif //SHAPEQUAD4_H_