diff --git a/MeshLib/Elements/Face.h b/MeshLib/Elements/Face.h
index d9a5ad0babfb597da6c7960fb4adf0b36517229c..b338d7a2694f279cdb27b2ea5163fdde91d52d7f 100644
--- a/MeshLib/Elements/Face.h
+++ b/MeshLib/Elements/Face.h
@@ -17,12 +17,11 @@
 
 #include <limits>
 
-#include "Element.h"
+#include "GeoLib/Point.h"
 
-// GeoLib
-#include "Point.h"
+#include "MathLib/Vector3.h"
 
-#include "Vector3.h"
+#include "Element.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/FemElem.h b/MeshLib/Elements/FemElem.h
index a7e90822fc1534060baf9c144391ec6ff2dfcb5f..b604a313e22905686cc6be42d8599e63c8d6c8c8 100644
--- a/MeshLib/Elements/FemElem.h
+++ b/MeshLib/Elements/FemElem.h
@@ -15,7 +15,8 @@
 #ifndef FEMELEM_H_
 #define FEMELEM_H_
 
-#include "Point.h"
+// GeoLib
+#include "GeoLib/Point.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplateHex-impl.h b/MeshLib/Elements/TemplateHex-impl.h
index 7a462b3357980099c836350cebbd780b19a9decd..82b78a80f0f7b50e1d514bc34d2c3b707e9efef4 100644
--- a/MeshLib/Elements/TemplateHex-impl.h
+++ b/MeshLib/Elements/TemplateHex-impl.h
@@ -14,11 +14,12 @@
 
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Quad.h"
 #include "Prism.h"
 
-#include "AnalyticalGeometry.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index 43231955e5ccd4d44aa4c7f1ecb47733cc6497f3..6566be8670dc02842d388f774e4647f1b9031523 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -16,7 +16,7 @@
 #define TEMPLATEHEX_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateLine.h b/MeshLib/Elements/TemplateLine.h
index 3a3d661baea87eedf4d177037a983a9b2bbc0ca6..11f275e523f10137c86ab62f94bb3c3c94cce6cb 100644
--- a/MeshLib/Elements/TemplateLine.h
+++ b/MeshLib/Elements/TemplateLine.h
@@ -19,12 +19,12 @@
 #include <limits>
 #include <cmath>
 
-#include "MeshEnums.h"
-#include "Element.h"
-#include "Node.h"
+#include "MathLib/MathTools.h"
 
-#include "MathTools.h"
+#include "MeshLib/MeshEnums.h"
+#include "MeshLib/Node.h"
 
+#include "Element.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplatePrism-impl.h b/MeshLib/Elements/TemplatePrism-impl.h
index b460682cd20d5014e2498d874771521e38b8046a..392220ee8a589f3d97372ff7e34c76d5ef66b45b 100644
--- a/MeshLib/Elements/TemplatePrism-impl.h
+++ b/MeshLib/Elements/TemplatePrism-impl.h
@@ -15,13 +15,12 @@
 // Thirdparty
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Tri.h"
-#include "Pyramid.h"
 #include "Quad.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLPRISMTYPE>
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index ea98f9ce71fb009c14a54cf665b834bdc5bfeedb..28147429f9cfd89626956b5e68fe7cc41df1679a 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPRISM_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplatePyramid-impl.h b/MeshLib/Elements/TemplatePyramid-impl.h
index a1a3f6ee5413daf7e5dccb57056aad7dd6150109..35166030c12054342c1181418fcb56ceff4ac425 100644
--- a/MeshLib/Elements/TemplatePyramid-impl.h
+++ b/MeshLib/Elements/TemplatePyramid-impl.h
@@ -15,13 +15,12 @@
 // Thirdparty
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Tri.h"
-#include "Tet.h"
 #include "Quad.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 620075d88c404f532f2fc839c4965b50752da814..648c0e7ea2fa2c8ee976c9c1f8f7f74a6ebc5409 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPYRAMID_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateQuad-impl.h b/MeshLib/Elements/TemplateQuad-impl.h
index 23829e4974ad9cc0d8499b57fcaafee60f117838..f7df20f2eec66ece99c797640f7564ec068cb469 100644
--- a/MeshLib/Elements/TemplateQuad-impl.h
+++ b/MeshLib/Elements/TemplateQuad-impl.h
@@ -14,12 +14,10 @@
 
 #include <array>
 
-#include "Node.h"
-#include "Tri.h"
+#include "MeshLib/Node.h"
 
-// MathLib
-#include "MathTools.h"
-#include "AnalyticalGeometry.h"
+#include "MathLib/MathTools.h"
+#include "GeoLib/AnalyticalGeometry.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 407c2b98056e693b2319d30436cd30b69e3d3cf4..a80230bd430f029f0ddf93fac95b445ced78f211 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -16,7 +16,7 @@
 #define TEMPLATEQUAD_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Face.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTet-impl.h b/MeshLib/Elements/TemplateTet-impl.h
index 5d70c1778a6e9756ce27911acfc46312051bf594..67c032850f5580bb8c81a30222b0111ccfc91335 100644
--- a/MeshLib/Elements/TemplateTet-impl.h
+++ b/MeshLib/Elements/TemplateTet-impl.h
@@ -14,11 +14,10 @@
 
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
 #include "Tri.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLTETTYPE>
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 7fee311b3484c277eaa9eb096630529e7cfb7d23..29bffdde3dc3f6c77a91ecfe794eef05ca841800 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -16,7 +16,7 @@
 #define TEMPLATETET_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTri-impl.h b/MeshLib/Elements/TemplateTri-impl.h
index 04f2f581e27bd33c28c2bc6e62efeedce8a163db..df90c64b73b5a71fb9844deca31ed1a214f80be0 100644
--- a/MeshLib/Elements/TemplateTri-impl.h
+++ b/MeshLib/Elements/TemplateTri-impl.h
@@ -12,9 +12,6 @@
  *
  */
 
-// MathLib
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLTRITYPE>
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index 0ddaf4983489263af8efce6e282a867376b0413c..4ef0afa29212ef1b3ac78e812c5f72972d48dbcb 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -16,14 +16,16 @@
 #define TEMPLATETRI_H_
 
 #include <array>
-#include "Line.h"
-#include "Node.h"
-#include "Face.h"
-#include "MeshEnums.h"
 
-#include "MathTools.h"
-#include "AnalyticalGeometry.h"
+#include "GeoLib/AnalyticalGeometry.h"
+
+#include "MathLib/MathTools.h"
 
+#include "MeshLib/MeshEnums.h"
+#include "MeshLib/Node.h"
+
+#include "Face.h"
+#include "Line.h"
 
 namespace MeshLib {