diff --git a/MeshLib/Elements/TemplateEdge.h b/MeshLib/Elements/TemplateEdge.h
index 149a94d739bdbc81d39dbbbac69a2263cc4955df..50b6837b1b0ff7dcffbf42a7e225ac18e81d1deb 100644
--- a/MeshLib/Elements/TemplateEdge.h
+++ b/MeshLib/Elements/TemplateEdge.h
@@ -131,7 +131,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateEdge.hpp"
+#include "TemplateEdge.tpp"
 
 #endif /* TEMPLATEEDGE_H_ */
 
diff --git a/MeshLib/Elements/TemplateEdge.hpp b/MeshLib/Elements/TemplateEdge.tpp
similarity index 89%
rename from MeshLib/Elements/TemplateEdge.hpp
rename to MeshLib/Elements/TemplateEdge.tpp
index 265b1010bd1fcb862f6b0081bbc1e6dcee483ddb..175db9db6ea8c0083e2ea88d54f43f30fb27f89a 100644
--- a/MeshLib/Elements/TemplateEdge.hpp
+++ b/MeshLib/Elements/TemplateEdge.tpp
@@ -4,14 +4,11 @@
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/LICENSE.txt
  *
- * \file TemplateEdge.hpp
+ * \file TemplateEdge.tpp
  *
  *  Created on  Sep 27, 2012 by Thomas Fischer
  */
 
-#ifndef TEMPLATEEDGE_HPP_
-#define TEMPLATEEDGE_HPP_
-
 namespace MeshLib {
 
 template <unsigned ORDER, unsigned NNODES>
@@ -38,4 +35,3 @@ TemplateEdge<ORDER,NNODES>::~TemplateEdge()
 
 } // namespace MeshLib
 
-#endif /* TEMPLATEEDGE_HPP_ */
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index 8b40b39226d0784a7bf93a4b0a367f2897bdb665..9eca86b7627bf0e3ff5585f686f3c2d60614e887 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -114,7 +114,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateHex.hpp"
+#include "TemplateHex.tpp"
 
 #endif /* TEMPLATEHEX_H_ */
 
diff --git a/MeshLib/Elements/TemplateHex.hpp b/MeshLib/Elements/TemplateHex.tpp
similarity index 99%
rename from MeshLib/Elements/TemplateHex.hpp
rename to MeshLib/Elements/TemplateHex.tpp
index ffc6266140f73e7e58b0f11a5ab0e7535415fe8b..6dd746232db8bd313f85795ac68d40043133d4f7 100644
--- a/MeshLib/Elements/TemplateHex.hpp
+++ b/MeshLib/Elements/TemplateHex.tpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file TemplateHex.hpp
+ * \file TemplateHex.tpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index 84b0e9752b4a2a4a3585683339cd18f4ba81a955..694927da41bf5db6e7087bc612ddd793695e03a6 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -119,7 +119,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplatePrism.hpp"
+#include "TemplatePrism.tpp"
 
 #endif /* TEMPLATEPRISM_H_ */
 
diff --git a/MeshLib/Elements/TemplatePrism.hpp b/MeshLib/Elements/TemplatePrism.tpp
similarity index 99%
rename from MeshLib/Elements/TemplatePrism.hpp
rename to MeshLib/Elements/TemplatePrism.tpp
index a6275fc1c1e2d325b45a8dd49956132841338d3a..468fb8c6498a5afbe3f541106448d458d5cfc2cd 100644
--- a/MeshLib/Elements/TemplatePrism.hpp
+++ b/MeshLib/Elements/TemplatePrism.tpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file TemplatePrism.hpp
+ * \file TemplatePrism.tpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 469797675a4be322bc62ab8f5f3dece1adcd6926..7b321890e69323743212e8359892651b52395a5a 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -117,7 +117,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplatePyramid.hpp"
+#include "TemplatePyramid.tpp"
 
 #endif /* TEMPLATEPYRAMID_H_ */
 
diff --git a/MeshLib/Elements/TemplatePyramid.hpp b/MeshLib/Elements/TemplatePyramid.tpp
similarity index 99%
rename from MeshLib/Elements/TemplatePyramid.hpp
rename to MeshLib/Elements/TemplatePyramid.tpp
index 396b4ab9f4956b451fb7cef666efb1e6e0adbd47..e7a1c17eedddf6c3ebffd47656309746c60b7cab 100644
--- a/MeshLib/Elements/TemplatePyramid.hpp
+++ b/MeshLib/Elements/TemplatePyramid.tpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file TemplatePyramid.hpp
+ * \file TemplatePyramid.tpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 2dcae2b4612b85d100ceceef113a70af020265d4..609cd570c8c1b74d123a388564e1c7394913fadd 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -109,7 +109,7 @@ const unsigned TemplateQuad<ORDER,NNODES>::_edge_nodes[4][2] =
 
 } /* namespace */
 
-#include "TemplateQuad.hpp"
+#include "TemplateQuad.tpp"
 
 #endif /* TEMPLATEQUAD_H_ */
 
diff --git a/MeshLib/Elements/TemplateQuad.hpp b/MeshLib/Elements/TemplateQuad.tpp
similarity index 98%
rename from MeshLib/Elements/TemplateQuad.hpp
rename to MeshLib/Elements/TemplateQuad.tpp
index 84555bdf02845a66308eccb244cd10229afe2713..a8fb836ffd8212614d8d2a95cc6a733b41bfc7dc 100644
--- a/MeshLib/Elements/TemplateQuad.hpp
+++ b/MeshLib/Elements/TemplateQuad.tpp
@@ -5,12 +5,11 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file Quad.hpp
+ * \file Quad.tpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
 
-//#include "Quad.h"
 #include "Node.h"
 #include "Tri.h"
 
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 2c2868cd512f07cf428b30a265184ae0b21ae11c..01c30608d170be73aa7f3786a4a4cf4c410ed1cb 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -120,7 +120,7 @@ protected:
 
 } /* namespace */
 
-#include "TemplateTet.hpp"
+#include "TemplateTet.tpp"
 
 #endif /* TEMPLATETET_H_ */
 
diff --git a/MeshLib/Elements/TemplateTet.hpp b/MeshLib/Elements/TemplateTet.tpp
similarity index 99%
rename from MeshLib/Elements/TemplateTet.hpp
rename to MeshLib/Elements/TemplateTet.tpp
index b192450b54ffa3e7892bb743880ed26630740aa4..fd549805ddce39b6138f0c49887dacc2681debc3 100644
--- a/MeshLib/Elements/TemplateTet.hpp
+++ b/MeshLib/Elements/TemplateTet.tpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file TemplateTet.hpp
+ * \file TemplateTet.tpp
  *
  * Created on 2012-05-02 by Karsten Rink
  */
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index 5fad5041b3e6e1ab81060d5490659ee92ecb8c5d..2d8be333dff42267d13060a70814d4ba0f8412b7 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -122,7 +122,7 @@ const unsigned TemplateTri<ORDER, NNODES>::_edge_nodes[3][2] = {
 
 } /* namespace */
 
-#include "TemplateTri.hpp"
+#include "TemplateTri.tpp"
 
 #endif /* TEMPLATETRI_H_ */
 
diff --git a/MeshLib/Elements/TemplateTri.hpp b/MeshLib/Elements/TemplateTri.tpp
similarity index 95%
rename from MeshLib/Elements/TemplateTri.hpp
rename to MeshLib/Elements/TemplateTri.tpp
index 156f0ea2356a1b327cd945adc0189622e3cf0fb0..7994326053d50edccc581d7992f670b69fba74ef 100644
--- a/MeshLib/Elements/TemplateTri.hpp
+++ b/MeshLib/Elements/TemplateTri.tpp
@@ -4,14 +4,11 @@
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/LICENSE.txt
  *
- * \file TemplateTri.hpp
+ * \file TemplateTri.tpp
  *
  *  Created on  Sep 27, 2012 by Thomas Fischer
  */
 
-#ifndef TEMPLATETRI_HPP_
-#define TEMPLATETRI_HPP_
-
 namespace MeshLib {
 
 template <unsigned ORDER, unsigned NNODES>
@@ -97,4 +94,3 @@ unsigned TemplateTri<ORDER,NNODES>::identifyFace(Node* nodes[3]) const
 
 } // namespace MeshLib
 
-#endif /* TEMPLATETRI_HPP_ */