diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
index e875533d903ba78b2e19e33845642808fd08f444..44429ee0f537f92c5f7bc884330556411a566165 100644
--- a/Applications/DataExplorer/VtkVis/VtkRaster.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkRaster.cpp
@@ -28,8 +28,8 @@
 #include <limits>
 
 #ifdef GEOTIFF_FOUND
-#include "geo_tiffp.h"
-#include "xtiffio.h"
+#include <geo_tiffp.h>
+#include <xtiffio.h>
 #endif
 
 #include <memory>
diff --git a/BaseLib/Subdivision.cpp b/BaseLib/Subdivision.cpp
index 178a85ec05c6493c8449457f7c6a6b574b6cb9a1..ed06417b3ee38a5414eb5a5538abb4a8fb7ad0a0 100644
--- a/BaseLib/Subdivision.cpp
+++ b/BaseLib/Subdivision.cpp
@@ -10,11 +10,11 @@
 
 #include "Subdivision.h"
 
-#include <BaseLib/Error.h>
-
 #include <algorithm>
 #include <cmath>
 
+#include "BaseLib/Error.h"
+
 namespace BaseLib
 {
 GradualSubdivision::GradualSubdivision(const double L,
diff --git a/MathLib/LinAlg/Lis/LisCheck.h b/MathLib/LinAlg/Lis/LisCheck.h
index 48ca01e914f9d568cdd96eeabdfc054a6ceaa593..802a940e0ecd59de223d46b4137336202c56ac69 100644
--- a/MathLib/LinAlg/Lis/LisCheck.h
+++ b/MathLib/LinAlg/Lis/LisCheck.h
@@ -14,9 +14,11 @@
 
 #pragma once
 
+#include <lis.h>
+
 #include <vector>
+
 #include "BaseLib/Logging.h"
-#include "lis.h"
 
 namespace MathLib
 {
diff --git a/MeshLib/IO/XDMF/mpi/fileIO.cpp b/MeshLib/IO/XDMF/mpi/fileIO.cpp
index a99d4b0e79f175096c6f8bd95e150c8ecde2065c..c7d02ee25270fde901eb321d592de340780bcf89 100644
--- a/MeshLib/IO/XDMF/mpi/fileIO.cpp
+++ b/MeshLib/IO/XDMF/mpi/fileIO.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#include "../fileIO.h"
+#include "MeshLib/IO/XDMF/fileIO.h"
 
 #include <hdf5.h>
 #include <mpi.h>
diff --git a/MeshLib/IO/XDMF/mpi/partition.cpp b/MeshLib/IO/XDMF/mpi/partition.cpp
index ae0a6db43c56e8bb0ce5f5ef33798123943707b4..a9588320e6d058ba55075a33cf09bebad2d8e841 100644
--- a/MeshLib/IO/XDMF/mpi/partition.cpp
+++ b/MeshLib/IO/XDMF/mpi/partition.cpp
@@ -16,8 +16,8 @@
 #include <deque>
 #include <numeric>
 
-#include "../fileIO.h"
 #include "BaseLib/Logging.h"
+#include "MeshLib/IO/XDMF/fileIO.h"
 
 namespace MeshLib::IO
 {
diff --git a/MeshLib/IO/XDMF/posix/fileIO.cpp b/MeshLib/IO/XDMF/posix/fileIO.cpp
index 013cde03a577fc765e054976835c2c40eeb54616..2f7d081a8417d82729a41a5e0bb161e593a1fd6c 100644
--- a/MeshLib/IO/XDMF/posix/fileIO.cpp
+++ b/MeshLib/IO/XDMF/posix/fileIO.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#include "../fileIO.h"
+#include "MeshLib/IO/XDMF/fileIO.h"
 
 #include <hdf5.h>
 namespace MeshLib::IO
diff --git a/MeshLib/IO/XDMF/posix/partition.cpp b/MeshLib/IO/XDMF/posix/partition.cpp
index e5e2c5c7e8e1c4409bd53b1480788d67e95c6c90..76dee6fc05ae865179c513c80f5ee6db98b6676e 100644
--- a/MeshLib/IO/XDMF/posix/partition.cpp
+++ b/MeshLib/IO/XDMF/posix/partition.cpp
@@ -8,7 +8,7 @@
  *
  */
 
-#include "../partition.h"
+#include "MeshLib/IO/XDMF/partition.h"
 
 namespace MeshLib::IO
 {
@@ -21,4 +21,4 @@ std::pair<std::size_t, std::size_t> getPartitionInfo(std::size_t const size)
 {
     return {0, size};
 }
-}  // namespace MeshLib::IO
\ No newline at end of file
+}  // namespace MeshLib::IO
diff --git a/MeshLib/MeshSearch/MeshElementGrid.cpp b/MeshLib/MeshSearch/MeshElementGrid.cpp
index 848cba2fc97bc2ec87a32883390dedd87f74e3b5..1599a65ff50fe006b34da9b5ec00bc56eab8a688 100644
--- a/MeshLib/MeshSearch/MeshElementGrid.cpp
+++ b/MeshLib/MeshSearch/MeshElementGrid.cpp
@@ -15,10 +15,10 @@
 #include <cmath>
 #include <memory>
 
-#include "../Elements/Element.h"
-#include "../Mesh.h"
-#include "../Node.h"
 #include "GeoLib/GEOObjects.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Mesh.h"
+#include "MeshLib/Node.h"
 
 namespace MeshLib
 {
diff --git a/NumLib/Function/Interpolation.h b/NumLib/Function/Interpolation.h
index 1cec844bdf4770eaf05ce8076a2d16bed67868b1..b41c30eb7d41fe03f49393a3ace4b0d3a001a51b 100644
--- a/NumLib/Function/Interpolation.h
+++ b/NumLib/Function/Interpolation.h
@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include<array>
-#include<cassert>
+#include <array>
+#include <cassert>
 
 #include "NumLib/Fem/CoordinatesMapping/NaturalNodeCoordinates.h"
 #include "NumLib/Fem/FiniteElement/TemplateIsoparametric.h"
diff --git a/Tests/GeoLib/AutoCheckGenerators.h b/Tests/GeoLib/AutoCheckGenerators.h
index 31ce490c78db22f47759691fe0f42ce6ede622a9..352b0d486ecffbd0d129e6e74b568c15584753cf 100644
--- a/Tests/GeoLib/AutoCheckGenerators.h
+++ b/Tests/GeoLib/AutoCheckGenerators.h
@@ -9,14 +9,14 @@
 
 #pragma once
 
+#include <autocheck/autocheck.hpp>
 #include <cmath>
 #include <memory>
 #include <random>
 #include <utility>
 
-#include "autocheck/autocheck.hpp"
-#include "MathLib/Point3d.h"
 #include "GeoLib/LineSegment.h"
+#include "MathLib/Point3d.h"
 
 namespace autocheck
 {