From fd06af12d6c149e4696569fef77090dcd7cf319b Mon Sep 17 00:00:00 2001
From: Dmitrij Naumov <dmitrij@naumov.de>
Date: Thu, 9 Oct 2014 21:41:28 +0000
Subject: [PATCH] [ML] Make all include paths explicit.

---
 MeshLib/CMakeLists.txt                        |  8 ------
 MeshLib/Elements/Cell.cpp                     |  5 ++--
 MeshLib/Elements/Element.cpp                  |  6 ++---
 MeshLib/Elements/Face.cpp                     |  8 +++---
 MeshLib/Mesh.cpp                              | 12 ++++-----
 MeshLib/Mesh.h                                |  4 +--
 .../MeshEditing/DuplicateMeshComponents.cpp   | 19 +++++++-------
 MeshLib/MeshEditing/ElementExtraction.cpp     | 13 ++++++----
 MeshLib/MeshEditing/ElementExtraction.h       |  4 +--
 .../MeshEditing/ElementValueModification.cpp  | 10 +++++---
 .../Mesh2MeshPropertyInterpolation.cpp        | 14 +++++------
 MeshLib/MeshEditing/MeshRevision.cpp          | 25 ++++++++-----------
 MeshLib/MeshEditing/MeshRevision.h            |  1 -
 MeshLib/MeshEditing/moveMeshNodes.h           |  2 +-
 MeshLib/MeshEditing/removeMeshNodes.cpp       |  7 +++---
 .../MeshGenerators/ConvertRasterToMesh.cpp    |  7 +++---
 MeshLib/MeshGenerators/ConvertRasterToMesh.h  |  7 ++----
 .../MeshGenerators/LayeredMeshGenerator.cpp   | 10 ++++----
 MeshLib/MeshGenerators/LayeredVolume.cpp      | 13 +++++-----
 MeshLib/MeshGenerators/LayeredVolume.h        |  2 +-
 MeshLib/MeshGenerators/MeshGenerator.cpp      | 13 +++++-----
 MeshLib/MeshGenerators/MeshLayerMapper.cpp    | 14 +++++------
 MeshLib/MeshInformation.h                     |  3 +--
 MeshLib/MeshQuality/AngleSkewMetric.cpp       |  7 +++---
 MeshLib/MeshQuality/AreaMetric.cpp            |  2 +-
 MeshLib/MeshQuality/EdgeRatioMetric.cpp       |  5 ++--
 MeshLib/MeshQuality/EdgeRatioMetric.h         |  2 +-
 MeshLib/MeshQuality/ElementQualityMetric.cpp  |  6 +++--
 MeshLib/MeshQuality/ElementQualityMetric.h    | 10 +++-----
 MeshLib/MeshQuality/MeshValidation.cpp        | 10 ++++----
 MeshLib/MeshQuality/RadiusEdgeRatioMetric.cpp |  4 +--
 MeshLib/MeshSearcher.cpp                      |  4 +--
 MeshLib/MeshSubset.h                          |  6 ++---
 MeshLib/MeshSubsets.h                         |  6 ++---
 MeshLib/MeshSurfaceExtraction.cpp             |  4 +--
 MeshLib/Node.h                                |  8 +++---
 MeshLib/convertMeshToGeo.cpp                  |  9 ++++---
 37 files changed, 140 insertions(+), 150 deletions(-)

diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index a4c120e0ef5..0c4f19ccae4 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -9,14 +9,6 @@ SET ( SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCE
 # Create the library
 ADD_LIBRARY(MeshLib STATIC ${SOURCES})
 
-include_directories(
-	.
-	../BaseLib
-	../GeoLib
-	../MathLib
-)
-
-
 target_link_libraries (MeshLib
 	BaseLib
 	GeoLib
diff --git a/MeshLib/Elements/Cell.cpp b/MeshLib/Elements/Cell.cpp
index 45d5dca6e9b..1c7b5689998 100644
--- a/MeshLib/Elements/Cell.cpp
+++ b/MeshLib/Elements/Cell.cpp
@@ -12,9 +12,10 @@
  *
  */
 
+#include "MathLib/Vector3.h"
+#include "MeshLib/Node.h"
+
 #include "Cell.h"
-#include "Node.h"
-#include "Vector3.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp
index 276c19d8d85..7352e8fff11 100644
--- a/MeshLib/Elements/Element.cpp
+++ b/MeshLib/Elements/Element.cpp
@@ -14,12 +14,12 @@
 
 #include "logog/include/logog.hpp"
 
+#include "MathLib/MathTools.h"
+#include "MeshLib/Node.h"
+
 #include "Element.h"
-#include "Node.h"
 #include "Line.h"
 
-#include "MathTools.h"
-
 namespace MeshLib {
 
 Element::Element(unsigned value, std::size_t id)
diff --git a/MeshLib/Elements/Face.cpp b/MeshLib/Elements/Face.cpp
index 23bdafb8b05..4dbf914ee01 100644
--- a/MeshLib/Elements/Face.cpp
+++ b/MeshLib/Elements/Face.cpp
@@ -12,13 +12,11 @@
  *
  */
 
+#include "MathLib/MathTools.h"
+#include "MathLib/Vector3.h"
+
 #include "Face.h"
 #include "Line.h"
-#include "Node.h"
-
-#include "MathTools.h"
-#include "Vector3.h"
-
 
 namespace MeshLib {
 
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
index 546b73ebf97..0d1ba4a9889 100644
--- a/MeshLib/Mesh.cpp
+++ b/MeshLib/Mesh.cpp
@@ -12,11 +12,14 @@
  *
  */
 
-#include "boost/optional.hpp"
+#include <boost/optional.hpp>
+
+#include "logog/include/logog.hpp"
+
+#include "BaseLib/RunTime.h"
 
 #include "Mesh.h"
 
-#include "Node.h"
 #include "Elements/Tri.h"
 #include "Elements/Quad.h"
 #include "Elements/Tet.h"
@@ -24,11 +27,6 @@
 #include "Elements/Pyramid.h"
 #include "Elements/Prism.h"
 
-#include "logog/include/logog.hpp"
-
-#include "RunTime.h"
-#include "uniqueInsert.h"
-
 namespace MeshLib
 {
 
diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
index ef7785a212a..ce1dddbd1d0 100644
--- a/MeshLib/Mesh.h
+++ b/MeshLib/Mesh.h
@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "MeshEnums.h"
-
 #include "BaseLib/Counter.h"
 
+#include "MeshEnums.h"
+
 namespace MeshLib
 {
 	class Node;
diff --git a/MeshLib/MeshEditing/DuplicateMeshComponents.cpp b/MeshLib/MeshEditing/DuplicateMeshComponents.cpp
index c853898d1c0..ad0f3ba3338 100644
--- a/MeshLib/MeshEditing/DuplicateMeshComponents.cpp
+++ b/MeshLib/MeshEditing/DuplicateMeshComponents.cpp
@@ -14,16 +14,15 @@
 
 #include "DuplicateMeshComponents.h"
 
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Element.h"
-#include "Elements/Line.h"
-#include "Elements/Tri.h"
-#include "Elements/Quad.h"
-#include "Elements/Tet.h"
-#include "Elements/Hex.h"
-#include "Elements/Pyramid.h"
-#include "Elements/Prism.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Elements/Line.h"
+#include "MeshLib/Elements/Tri.h"
+#include "MeshLib/Elements/Quad.h"
+#include "MeshLib/Elements/Tet.h"
+#include "MeshLib/Elements/Hex.h"
+#include "MeshLib/Elements/Pyramid.h"
+#include "MeshLib/Elements/Prism.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshEditing/ElementExtraction.cpp b/MeshLib/MeshEditing/ElementExtraction.cpp
index 698f983ca99..5b0d35dbf96 100644
--- a/MeshLib/MeshEditing/ElementExtraction.cpp
+++ b/MeshLib/MeshEditing/ElementExtraction.cpp
@@ -13,14 +13,17 @@
  */
 
 #include "ElementExtraction.h"
-#include "Mesh.h"
-#include "Elements/Element.h"
-#include "MeshEditing/DuplicateMeshComponents.h"
-#include "AABB.h"
-#include "MeshQuality/MeshValidation.h"
 
 #include "logog/include/logog.hpp"
 
+#include "GeoLib/AABB.h"
+
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/MeshQuality/MeshValidation.h"
+
+#include "DuplicateMeshComponents.h"
+
 namespace MeshLib {
 
 ElementExtraction::ElementExtraction(const MeshLib::Mesh &mesh)
diff --git a/MeshLib/MeshEditing/ElementExtraction.h b/MeshLib/MeshEditing/ElementExtraction.h
index 9e01ff3b1aa..dfe268c7870 100644
--- a/MeshLib/MeshEditing/ElementExtraction.h
+++ b/MeshLib/MeshEditing/ElementExtraction.h
@@ -17,8 +17,8 @@
 
 #include <string>
 #include <vector>
-#include "MeshEnums.h"
-#include "Node.h"
+#include "MeshLib/MeshEnums.h"
+#include "MeshLib/Node.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshEditing/ElementValueModification.cpp b/MeshLib/MeshEditing/ElementValueModification.cpp
index 34976808ce1..092cc2f7cc5 100644
--- a/MeshLib/MeshEditing/ElementValueModification.cpp
+++ b/MeshLib/MeshEditing/ElementValueModification.cpp
@@ -12,14 +12,16 @@
  *
  */
 
-#include <algorithm>
-
 #include "ElementValueModification.h"
-#include "Mesh.h"
-#include "Elements/Element.h"
+
+#include <algorithm>
 
 #include "logog/include/logog.hpp"
 
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
+
+
 namespace MeshLib {
 
 std::vector<unsigned> ElementValueModification::getMeshValues(const MeshLib::Mesh &mesh)
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index 4f9ffafe00a..41ac0f37ad5 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -19,14 +19,12 @@
 
 #include "logog/include/logog.hpp"
 
-// GeoLib
-#include "AABB.h"
-#include "Grid.h"
-
-// MeshLib
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Face.h"
+#include "GeoLib/AABB.h"
+#include "GeoLib/Grid.h"
+
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Face.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshEditing/MeshRevision.cpp b/MeshLib/MeshEditing/MeshRevision.cpp
index 91b56f92d46..76ccbc40a88 100644
--- a/MeshLib/MeshEditing/MeshRevision.cpp
+++ b/MeshLib/MeshEditing/MeshRevision.cpp
@@ -17,20 +17,17 @@
 // ThirdParty/logog
 #include "logog/include/logog.hpp"
 
-// GeoLib
-#include "Grid.h"
-
-// MeshLib
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Element.h"
-#include "Elements/Line.h"
-#include "Elements/Tri.h"
-#include "Elements/Quad.h"
-#include "Elements/Tet.h"
-#include "Elements/Hex.h"
-#include "Elements/Pyramid.h"
-#include "Elements/Prism.h"
+#include "GeoLib/Grid.h"
+
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Elements/Line.h"
+#include "MeshLib/Elements/Tri.h"
+#include "MeshLib/Elements/Quad.h"
+#include "MeshLib/Elements/Tet.h"
+#include "MeshLib/Elements/Hex.h"
+#include "MeshLib/Elements/Pyramid.h"
+#include "MeshLib/Elements/Prism.h"
 
 #include "DuplicateMeshComponents.h"
 
diff --git a/MeshLib/MeshEditing/MeshRevision.h b/MeshLib/MeshEditing/MeshRevision.h
index 1b9dfd7e49d..17406116356 100644
--- a/MeshLib/MeshEditing/MeshRevision.h
+++ b/MeshLib/MeshEditing/MeshRevision.h
@@ -19,7 +19,6 @@
 #include <limits>
 #include <string>
 #include <vector>
-#include <cstddef>
 
 // forward declaration
 namespace MeshLib {
diff --git a/MeshLib/MeshEditing/moveMeshNodes.h b/MeshLib/MeshEditing/moveMeshNodes.h
index 159e6d9a567..58273ccd851 100644
--- a/MeshLib/MeshEditing/moveMeshNodes.h
+++ b/MeshLib/MeshEditing/moveMeshNodes.h
@@ -13,7 +13,7 @@
 #ifndef MOVEMESHNODES_H_
 #define MOVEMESHNODES_H_
 
-#include "Node.h"
+#include "MeshLib/Node.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshEditing/removeMeshNodes.cpp b/MeshLib/MeshEditing/removeMeshNodes.cpp
index 491ff45a9eb..6e357578de2 100644
--- a/MeshLib/MeshEditing/removeMeshNodes.cpp
+++ b/MeshLib/MeshEditing/removeMeshNodes.cpp
@@ -13,9 +13,10 @@
  */
 
 #include "removeMeshNodes.h"
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Element.h"
+
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Element.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshGenerators/ConvertRasterToMesh.cpp b/MeshLib/MeshGenerators/ConvertRasterToMesh.cpp
index 5fcfbfab7e1..4cb54f6c11e 100644
--- a/MeshLib/MeshGenerators/ConvertRasterToMesh.cpp
+++ b/MeshLib/MeshGenerators/ConvertRasterToMesh.cpp
@@ -13,10 +13,9 @@
 
 #include "ConvertRasterToMesh.h"
 
-// MeshLib
-#include "Node.h"
-#include "Elements/Tri.h"
-#include "Elements/Quad.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Tri.h"
+#include "MeshLib/Elements/Quad.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshGenerators/ConvertRasterToMesh.h b/MeshLib/MeshGenerators/ConvertRasterToMesh.h
index 0aae395cf2c..02c910aae5b 100644
--- a/MeshLib/MeshGenerators/ConvertRasterToMesh.h
+++ b/MeshLib/MeshGenerators/ConvertRasterToMesh.h
@@ -15,11 +15,8 @@
 #ifndef CONVERTRASTERTOMESH_H_
 #define CONVERTRASTERTOMESH_H_
 
-// GeoLib
-#include "Raster.h"
-
-// MeshLib
-#include "MeshEnums.h"
+#include "GeoLib/Raster.h"
+#include "MeshLib/MeshEnums.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
index d16106a875b..982d5475a38 100644
--- a/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/LayeredMeshGenerator.cpp
@@ -19,12 +19,12 @@
 
 #include "FileIO/AsciiRasterInterface.h"
 
-#include "Raster.h"
+#include "GeoLib/Raster.h"
 
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Element.h"
-#include "MeshQuality/MeshValidation.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/MeshQuality/MeshValidation.h"
 
 LayeredMeshGenerator::LayeredMeshGenerator()
 : _elevation_epsilon(0.0001)
diff --git a/MeshLib/MeshGenerators/LayeredVolume.cpp b/MeshLib/MeshGenerators/LayeredVolume.cpp
index 3263dcb0343..7fff70c2d80 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.cpp
+++ b/MeshLib/MeshGenerators/LayeredVolume.cpp
@@ -14,14 +14,15 @@
 
 #include "LayeredVolume.h"
 
-#include "Vector3.h"
+#include "MathLib/Vector3.h"
 
-#include "Raster.h"
+#include "GeoLib/Raster.h"
 
-#include "Elements/Tri.h"
-#include "Elements/Quad.h"
-#include "MeshGenerators/MeshLayerMapper.h"
-#include "MeshEditing/ElementExtraction.h"
+#include "MeshLib/Elements/Tri.h"
+#include "MeshLib/Elements/Quad.h"
+#include "MeshLib/MeshEditing/ElementExtraction.h"
+
+#include "MeshLayerMapper.h"
 
 
 bool LayeredVolume::createRasterLayers(const MeshLib::Mesh &mesh, const std::vector<GeoLib::Raster const*> &rasters, double noDataReplacementValue)
diff --git a/MeshLib/MeshGenerators/LayeredVolume.h b/MeshLib/MeshGenerators/LayeredVolume.h
index 9d6a2560df4..1628944daee 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.h
+++ b/MeshLib/MeshGenerators/LayeredVolume.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "Node.h"
+#include "MeshLib/Node.h"
 #include "LayeredMeshGenerator.h"
 
 namespace GeoLib {
diff --git a/MeshLib/MeshGenerators/MeshGenerator.cpp b/MeshLib/MeshGenerators/MeshGenerator.cpp
index 1963417678d..f4480282cd5 100644
--- a/MeshLib/MeshGenerators/MeshGenerator.cpp
+++ b/MeshLib/MeshGenerators/MeshGenerator.cpp
@@ -13,15 +13,16 @@
  */
 
 #include "MeshGenerator.h"
-#include "Node.h"
-
-#include "Elements/Line.h"
-#include "Elements/Quad.h"
-#include "Elements/Hex.h"
-#include "Elements/Tri.h"
 
 #include <vector>
 
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Line.h"
+#include "MeshLib/Elements/Quad.h"
+#include "MeshLib/Elements/Hex.h"
+#include "MeshLib/Elements/Tri.h"
+
+
 namespace MeshLib
 {
 Mesh* MeshGenerator::generateLineMesh(
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
index c56b846d708..6ce15970ad2 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp
@@ -20,15 +20,15 @@
 
 #include "FileIO/AsciiRasterInterface.h"
 
-#include "Raster.h"
+#include "GeoLib/Raster.h"
 
-#include "Elements/Tet.h"
-#include "Elements/Hex.h"
-#include "Elements/Pyramid.h"
-#include "Elements/Prism.h"
-#include "MeshSurfaceExtraction.h"
+#include "MathLib/MathTools.h"
 
-#include "MathTools.h"
+#include "MeshLib/Elements/Tet.h"
+#include "MeshLib/Elements/Hex.h"
+#include "MeshLib/Elements/Pyramid.h"
+#include "MeshLib/Elements/Prism.h"
+#include "MeshLib/MeshSurfaceExtraction.h"
 
 const unsigned MeshLayerMapper::_pyramid_base[3][4] =
 {
diff --git a/MeshLib/MeshInformation.h b/MeshLib/MeshInformation.h
index cf3432f2f62..c151d63d85d 100644
--- a/MeshLib/MeshInformation.h
+++ b/MeshLib/MeshInformation.h
@@ -16,8 +16,7 @@
 #define MESHINFORMATION_H
 
 #include <array>
-
-#include "AABB.h"
+#include "GeoLib/AABB.h"
 #include "Node.h"
 
 namespace MeshLib {
diff --git a/MeshLib/MeshQuality/AngleSkewMetric.cpp b/MeshLib/MeshQuality/AngleSkewMetric.cpp
index 8c89da67eb4..1c93230ed5b 100644
--- a/MeshLib/MeshQuality/AngleSkewMetric.cpp
+++ b/MeshLib/MeshQuality/AngleSkewMetric.cpp
@@ -13,12 +13,13 @@
  */
 
 #include "AngleSkewMetric.h"
-#include "Node.h"
-
-#include "MathTools.h"
 
 #include <cmath>
 
+#include "MeshLib/Node.h"
+
+#include "MathLib/MathTools.h"
+
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
diff --git a/MeshLib/MeshQuality/AreaMetric.cpp b/MeshLib/MeshQuality/AreaMetric.cpp
index 758e161b706..15961c6d4ac 100644
--- a/MeshLib/MeshQuality/AreaMetric.cpp
+++ b/MeshLib/MeshQuality/AreaMetric.cpp
@@ -14,7 +14,7 @@
 
 
 #include "AreaMetric.h"
-#include "MathTools.h"
+#include "MathLib/MathTools.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshQuality/EdgeRatioMetric.cpp b/MeshLib/MeshQuality/EdgeRatioMetric.cpp
index 17e224d22bb..eeace73ed1d 100644
--- a/MeshLib/MeshQuality/EdgeRatioMetric.cpp
+++ b/MeshLib/MeshQuality/EdgeRatioMetric.cpp
@@ -13,8 +13,9 @@
  */
 
 #include "EdgeRatioMetric.h"
-#include "Node.h"
-#include "MathTools.h"
+
+#include "MathLib/MathTools.h"
+#include "MeshLib/Node.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshQuality/EdgeRatioMetric.h b/MeshLib/MeshQuality/EdgeRatioMetric.h
index eadfbeaca93..ad5032151f8 100644
--- a/MeshLib/MeshQuality/EdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/EdgeRatioMetric.h
@@ -16,7 +16,7 @@
 #define EDGERATIOMETRIC_H_
 
 #include "ElementQualityMetric.h"
-#include "Point.h"
+#include "GeoLib/Point.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.cpp b/MeshLib/MeshQuality/ElementQualityMetric.cpp
index 287df5edbc0..e7ca69dfad4 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.cpp
+++ b/MeshLib/MeshQuality/ElementQualityMetric.cpp
@@ -13,11 +13,13 @@
  */
 
 #include "ElementQualityMetric.h"
-#include "Node.h"
-#include "Point.h"
+
 #include <cmath>
 #include <iostream>
 
+#include "GeoLib/Point.h"
+#include "MeshLib/Node.h"
+
 namespace MeshLib
 {
 ElementQualityMetric::ElementQualityMetric(Mesh const& mesh) :
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.h b/MeshLib/MeshQuality/ElementQualityMetric.h
index 5ce2575c0f7..88fc87a6150 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.h
+++ b/MeshLib/MeshQuality/ElementQualityMetric.h
@@ -17,14 +17,12 @@
 
 #include <vector>
 
-// BaseLib
-#include "Histogram.h"
+#include "logog/include/logog.hpp"
 
-// MSH
-#include "Mesh.h"
-#include "Elements/Element.h"
+#include "BaseLib/Histogram.h"
 
-#include "logog/include/logog.hpp"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Elements/Element.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshQuality/MeshValidation.cpp b/MeshLib/MeshQuality/MeshValidation.cpp
index 3c5eb3402ea..fb019452772 100644
--- a/MeshLib/MeshQuality/MeshValidation.cpp
+++ b/MeshLib/MeshQuality/MeshValidation.cpp
@@ -18,11 +18,11 @@
 
 #include "logog/include/logog.hpp"
 
-#include "Mesh.h"
-#include "Node.h"
-#include "Elements/Element.h"
-#include "MeshEditing/removeMeshNodes.h"
-#include "MeshEditing/MeshRevision.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Node.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/MeshEditing/removeMeshNodes.h"
+#include "MeshLib/MeshEditing/MeshRevision.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.cpp b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.cpp
index bb6bb3b7396..60c44b34cfd 100644
--- a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.cpp
+++ b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.cpp
@@ -14,8 +14,8 @@
 
 #include "RadiusEdgeRatioMetric.h"
 
-#include "Node.h"
-#include "MinimalBoundingSphere.h"
+#include "GeoLib/MinimalBoundingSphere.h"
+#include "MeshLib/Node.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshSearcher.cpp b/MeshLib/MeshSearcher.cpp
index 2fcb015ba46..6ba37e373d1 100644
--- a/MeshLib/MeshSearcher.cpp
+++ b/MeshLib/MeshSearcher.cpp
@@ -9,12 +9,12 @@
 
 #include "MeshSearcher.h"
 
+#include <algorithm>
+
 #include "Mesh.h"
 #include "Node.h"
 #include "Elements/Element.h"
 
-#include <algorithm>
-
 namespace MeshLib
 {
 
diff --git a/MeshLib/MeshSubset.h b/MeshLib/MeshSubset.h
index 4822afff495..7d3ee03f51f 100644
--- a/MeshLib/MeshSubset.h
+++ b/MeshLib/MeshSubset.h
@@ -15,9 +15,9 @@
 
 #include <vector>
 
-#include "MeshLib/Mesh.h"
-#include "MeshLib/Node.h"
-#include "MeshLib/Elements/Element.h"
+#include "Mesh.h"
+#include "Node.h"
+#include "Elements/Element.h"
 
 
 namespace MeshLib
diff --git a/MeshLib/MeshSubsets.h b/MeshLib/MeshSubsets.h
index ee8fe468d14..96fdf7687b5 100644
--- a/MeshLib/MeshSubsets.h
+++ b/MeshLib/MeshSubsets.h
@@ -13,13 +13,13 @@
 #ifndef MESHSUBSETS_H_
 #define MESHSUBSETS_H_
 
-#include <vector>
 #include <algorithm>
-#include <stdexcept>
 #include <functional>
 #include <numeric>
+#include <stdexcept>
+#include <vector>
 
-#include "MeshLib/MeshSubset.h"
+#include "MeshSubset.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index 16e1944642f..14b5ed0c241 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -18,9 +18,9 @@
 
 #include "logog/include/logog.hpp"
 
-#include "PointWithID.h"
+#include "GeoLib/PointWithID.h"
+
 #include "Mesh.h"
-#include "Node.h"
 #include "Elements/Face.h"
 #include "Elements/Cell.h"
 #include "Elements/Tri.h"
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index 927bc0c17e1..c493e19d544 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -17,15 +17,17 @@
 
 #include <cstdlib>
 #include <limits>
-#include <vector>
 #include <set>
+#include <vector>
 
 #include "GeoLib/PointWithID.h"
-#include "Mesh.h"
+
 #include "MeshEditing/removeMeshNodes.h"
-#include "MeshSurfaceExtraction.h"
 #include "MeshGenerators/MeshLayerMapper.h"
 
+#include "MeshSurfaceExtraction.h"
+#include "Mesh.h"
+
 namespace MeshLib {
 
 class Element;
diff --git a/MeshLib/convertMeshToGeo.cpp b/MeshLib/convertMeshToGeo.cpp
index d3e0e2148fa..cbe71e3269d 100644
--- a/MeshLib/convertMeshToGeo.cpp
+++ b/MeshLib/convertMeshToGeo.cpp
@@ -14,16 +14,17 @@
 
 #include "convertMeshToGeo.h"
 
-// ThirdParty/logog
 #include "logog/include/logog.hpp"
 
-#include "GEOObjects.h"
-#include "Surface.h"
+#include "GeoLib/GEOObjects.h"
+namespace GeoLib
+{
+    class Surface;
+}
 
 #include "Mesh.h"
 #include "Elements/Tri.h"
 #include "Elements/Quad.h"
-#include "Node.h"
 #include "MeshInformation.h"
 
 namespace MeshLib {
-- 
GitLab