diff --git a/MeshLib/ElementCoordinatesMappingLocal.cpp b/MeshLib/ElementCoordinatesMappingLocal.cpp
index 9ccaf5e57ad619b5ad93326bd3fd1e613d8ed716..48ff05b35ad5f59396d7dc8f0c088caa51836cd8 100644
--- a/MeshLib/ElementCoordinatesMappingLocal.cpp
+++ b/MeshLib/ElementCoordinatesMappingLocal.cpp
@@ -13,8 +13,10 @@
 
 #include "GeoLib/AnalyticalGeometry.h"
 
-#include "MathLib/MathTools.h"
+#include "MeshLib/Elements/Element.h"
 #include "MeshLib/Node.h"
+#include "MathLib/MathTools.h"
+#include "MathLib/Vector3.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/ElementCoordinatesMappingLocal.h b/MeshLib/ElementCoordinatesMappingLocal.h
index 3a46788363ec78c2c5df40eb57b3a3600e4984d2..9d393ea4c2322204bf6f366c270f6c96b3e9d42d 100644
--- a/MeshLib/ElementCoordinatesMappingLocal.h
+++ b/MeshLib/ElementCoordinatesMappingLocal.h
@@ -13,17 +13,21 @@
 
 #ifdef OGS_USE_EIGEN
 #include <Eigen/Eigen>
+#else
+#include "MathLib/LinAlg/Dense/DenseMatrix.h"
 #endif
 
-#include "MathLib/Vector3.h"
-#include "MathLib/LinAlg/Dense/DenseMatrix.h"
+#include "MathLib/Point3d.h"
 
-#include "MeshLib/Elements/Element.h"
 #include "MeshLib/CoordinateSystem.h"
 
 namespace MeshLib
 {
+    class Element;
+}
 
+namespace MeshLib
+{
 #ifdef OGS_USE_EIGEN
 typedef Eigen::Matrix<double, 3u, 3u, Eigen::RowMajor> RotationMatrix;
 #else