diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp
index 97c132100d6a6b410d73e7046c11baa94bb307a2..7987eac98c3292574742ae4e861affc5178aa0b2 100644
--- a/Tests/BaseLib/TestFilePathStringManipulation.cpp
+++ b/Tests/BaseLib/TestFilePathStringManipulation.cpp
@@ -11,8 +11,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "BaseLib/FileTools.h"
-#include "gtest/gtest.h"
 
 #ifdef WIN32
 TEST(BaseLib, CopyPathToFileNameWin)
diff --git a/Tests/FileIO/TestBoostGmlInterface.cpp b/Tests/FileIO/TestBoostGmlInterface.cpp
index 1a74bf6e0ec21997025372e7902ae95281e8fc6f..eacb84155c92152a35878bf6e57edd982b538870 100644
--- a/Tests/FileIO/TestBoostGmlInterface.cpp
+++ b/Tests/FileIO/TestBoostGmlInterface.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 
 #include "BaseLib/StringTools.h"
@@ -20,7 +22,6 @@
 #include "InfoLib/TestInfo.h"
 #include "Tests/FileIO/TestGmlInterface.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 TEST_F(TestGmlInterface, BoostXmlGmlWriterReaderTest)
 {
diff --git a/Tests/FileIO/TestCsvReader.cpp b/Tests/FileIO/TestCsvReader.cpp
index f2f5186d94ba230880de1816ae823daeba3f7b9b..44b35aafe2085d8edfe6bb5f9cae279c9878b55e 100644
--- a/Tests/FileIO/TestCsvReader.cpp
+++ b/Tests/FileIO/TestCsvReader.cpp
@@ -12,13 +12,14 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 
 #include "Applications/FileIO/CsvInterface.h"
 #include "GeoLib/Point.h"
 #include "InfoLib/TestInfo.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 class CsvInterfaceTest : public ::testing::Test
 {
diff --git a/Tests/FileIO/TestCsvWriter.cpp b/Tests/FileIO/TestCsvWriter.cpp
index 1873a4809bda091d883b78c3e9f71f19f99fe1b3..360a7ca5705fcdb3c6881082b12036f3ce065746 100644
--- a/Tests/FileIO/TestCsvWriter.cpp
+++ b/Tests/FileIO/TestCsvWriter.cpp
@@ -8,6 +8,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 #include <string>
 #include <vector>
@@ -15,7 +17,6 @@
 #include "Applications/FileIO/CsvInterface.h"
 #include "InfoLib/TestInfo.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 TEST(CsvWriter, WriteReadTest)
 {
diff --git a/Tests/FileIO/TestGmlInterface.h b/Tests/FileIO/TestGmlInterface.h
index 15a3a1b05f7f79f74c3a81d5c7a68a451818a66d..66e419bb79e4e37fd51f2305f1c3b717ee5a9d2c 100644
--- a/Tests/FileIO/TestGmlInterface.h
+++ b/Tests/FileIO/TestGmlInterface.h
@@ -12,9 +12,9 @@
  *
  */
 
-#include <cstdio>
+#include <gtest/gtest.h>
 
-#include "gtest/gtest.h"
+#include <cstdio>
 
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/Polyline.h"
diff --git a/Tests/FileIO/TestGmsInterface.cpp b/Tests/FileIO/TestGmsInterface.cpp
index e55a1096e8c5bb4d3d0797ed779118c602d0fcac..1af5125114fd2c81495b20f4a5dcc4188a87b359 100644
--- a/Tests/FileIO/TestGmsInterface.cpp
+++ b/Tests/FileIO/TestGmsInterface.cpp
@@ -8,13 +8,14 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "Applications/FileIO/GMSInterface.h"
 #include "InfoLib/TestInfo.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshInformation.h"
-#include "gtest/gtest.h"
 
 TEST(FileIO, TestGmsInterface)
 {
diff --git a/Tests/FileIO/TestTetGenInterface.cpp b/Tests/FileIO/TestTetGenInterface.cpp
index d176e64f38e491c19f6b0c50ebec79b77a0bfdba..97a460a6f41a4b24949c93fc1ad18c587291f117 100644
--- a/Tests/FileIO/TestTetGenInterface.cpp
+++ b/Tests/FileIO/TestTetGenInterface.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <limits>
 #include <memory>
 #include <vector>
@@ -25,7 +27,6 @@
 #include "MeshLib/MeshInformation.h"
 #include "MeshLib/Node.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 // read TetGen geometry
 TEST(FileIO, TetGenSmeshReader)
diff --git a/Tests/FileIO_Qt/TestQtGmlInterface.cpp b/Tests/FileIO_Qt/TestQtGmlInterface.cpp
index e45f337faf8a6ff354379d18ffd81815d752f603..70a9afaa1ff69f72ceb082a3fbbf7bd72f5ab46b 100644
--- a/Tests/FileIO_Qt/TestQtGmlInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtGmlInterface.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 
 #include "BaseLib/StringTools.h"
@@ -20,7 +22,6 @@
 #include "InfoLib/TestInfo.h"
 #include "Tests/FileIO/TestGmlInterface.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 TEST_F(TestGmlInterface, QtXmlGmlWriterReaderTest)
 {
diff --git a/Tests/FileIO_Qt/TestQtPrjInterface.cpp b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
index 1797594d77239e3e71be96937a4ad37608f34a28..158c569f0bfeca1ed5f185e134eefc3a44671206 100644
--- a/Tests/FileIO_Qt/TestQtPrjInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
@@ -8,6 +8,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 
 #include "Applications/DataHolderLib/BoundaryCondition.h"
@@ -16,7 +18,6 @@
 #include "Applications/FileIO/XmlIO/Qt/XmlPrjInterface.h"
 #include "GeoLib/GEOObjects.h"
 #include "InfoLib/TestInfo.h"
-#include "gtest/gtest.h"
 
 TEST(TestQtPrjInterface, QtXmlPrjReader)
 {
diff --git a/Tests/FileIO_Qt/TestVtkRaster.cpp b/Tests/FileIO_Qt/TestVtkRaster.cpp
index 0dd6fc652301ee93d933b359273a9891af666f36..665254937fd25fa5c905829d0cfb4c7de68e0454 100644
--- a/Tests/FileIO_Qt/TestVtkRaster.cpp
+++ b/Tests/FileIO_Qt/TestVtkRaster.cpp
@@ -8,6 +8,7 @@
  *
  */
 
+#include <gtest/gtest.h>
 #include <vtkImageAlgorithm.h>
 #include <vtkImageData.h>
 #include <vtkPNGReader.h>
@@ -19,7 +20,6 @@
 #include "Applications/FileIO/AsciiRasterInterface.h"
 #include "GeoLib/Raster.h"
 #include "InfoLib/TestInfo.h"
-#include "gtest/gtest.h"
 
 TEST(TestVtkRaster, TestPNGReader)
 {
diff --git a/Tests/FileIO_SWMM/TestSwmmInterface.cpp b/Tests/FileIO_SWMM/TestSwmmInterface.cpp
index 40856ec45f54de3254995ac1726d882825d69c9f..1b5269f1020cdba4b6e891b2168d638ff93a3196 100644
--- a/Tests/FileIO_SWMM/TestSwmmInterface.cpp
+++ b/Tests/FileIO_SWMM/TestSwmmInterface.cpp
@@ -8,6 +8,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "Applications/FileIO/SWMM/SwmmInterface.h"
@@ -15,7 +17,6 @@
 #include "InfoLib/TestInfo.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshInformation.h"
-#include "gtest/gtest.h"
 
 TEST(FileIO, TestSwmmInterface)
 {
diff --git a/Tests/GeoLib/IO/TestGLIReader.cpp b/Tests/GeoLib/IO/TestGLIReader.cpp
index d3874d681b068e73adbb3d4e5c8087792e81f1f2..5930a73b3985e158ef4ac4838d97aef201f42e63 100644
--- a/Tests/GeoLib/IO/TestGLIReader.cpp
+++ b/Tests/GeoLib/IO/TestGLIReader.cpp
@@ -10,6 +10,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 #include <fstream>
 
@@ -18,7 +20,6 @@
 #include "GeoLib/GEOObjects.h"
 #include "InfoLib/TestInfo.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 class OGSIOVer4InterfaceTest : public ::testing::Test
 {
diff --git a/Tests/GeoLib/TestAABB.cpp b/Tests/GeoLib/TestAABB.cpp
index 2a33dfc9eb20ffd5e0e80ecbbc7436d2ed9b6ef9..e0c522edffcd9e3b15bc82a747b20b6f3b005038 100644
--- a/Tests/GeoLib/TestAABB.cpp
+++ b/Tests/GeoLib/TestAABB.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdlib>
 #include <ctime>
 #include <list>
@@ -20,7 +22,6 @@
 #include "GeoLib/AABB.h"
 #include "GeoLib/Point.h"
 #include "MathLib/Point3d.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLibAABB, RandomNumberOfPointersToRandomPoints)
 {
diff --git a/Tests/GeoLib/TestBoundingSphere.cpp b/Tests/GeoLib/TestBoundingSphere.cpp
index 98dcf95532578ba8f7f85dbfdebd4205061937fa..b738c0a8b6e70b27215ea1a22bd0dc8453287e7a 100644
--- a/Tests/GeoLib/TestBoundingSphere.cpp
+++ b/Tests/GeoLib/TestBoundingSphere.cpp
@@ -12,12 +12,13 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <random>
 
 #include "GeoLib/MinimalBoundingSphere.h"
 #include "MathLib/Point3d.h"
-#include "gtest/gtest.h"
 
 std::vector<MathLib::Point3d*>* getRandomSpherePoints(
     MathLib::Point3d const& center, double const radius, std::size_t n_points)
diff --git a/Tests/GeoLib/TestComputeAndInsertAllIntersectionPoints.cpp b/Tests/GeoLib/TestComputeAndInsertAllIntersectionPoints.cpp
index 0639112cb538053a352a1e544b39777bc3c4de4f..dce6f7e446ff8c959e695bc8329e2e8974e07209 100644
--- a/Tests/GeoLib/TestComputeAndInsertAllIntersectionPoints.cpp
+++ b/Tests/GeoLib/TestComputeAndInsertAllIntersectionPoints.cpp
@@ -9,6 +9,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 #include <tuple>
 
@@ -16,7 +18,6 @@
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/Point.h"
 #include "GeoLib/Polyline.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, TestComputeAndInsertAllIntersectionPoints)
 {
diff --git a/Tests/GeoLib/TestComputeRotationMatrix.cpp b/Tests/GeoLib/TestComputeRotationMatrix.cpp
index 4e9370950ed37cae14b6ad2b5ba3413e522174c0..6c48002ec4df4371c8ff8d76115bad05f61eb81c 100644
--- a/Tests/GeoLib/TestComputeRotationMatrix.cpp
+++ b/Tests/GeoLib/TestComputeRotationMatrix.cpp
@@ -9,8 +9,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "GeoLib/AnalyticalGeometry.h"
-#include "gtest/gtest.h"
 
 auto test3equal = [](double a, double b, double c,
                      Eigen::Vector3d const& result) {
diff --git a/Tests/GeoLib/TestDuplicateGeometry.cpp b/Tests/GeoLib/TestDuplicateGeometry.cpp
index 680b6b71bca559a0ad26caba1d814bab2fff19c5..772bd3064659f85607270b8ed6738e74ba5bc990 100644
--- a/Tests/GeoLib/TestDuplicateGeometry.cpp
+++ b/Tests/GeoLib/TestDuplicateGeometry.cpp
@@ -8,6 +8,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdlib>
 #include <ctime>
 #include <random>
@@ -19,7 +21,6 @@
 #include "GeoLib/Polyline.h"
 #include "GeoLib/Surface.h"
 #include "GeoLib/Triangle.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, DuplicateGeometry)
 {
diff --git a/Tests/GeoLib/TestGrid.cpp b/Tests/GeoLib/TestGrid.cpp
index d0cb19aa8453ebc7cf0dd6ee43b59e3b80404787..543848ec90bf28db97a9fbf6f9a70609209c29f7 100644
--- a/Tests/GeoLib/TestGrid.cpp
+++ b/Tests/GeoLib/TestGrid.cpp
@@ -11,12 +11,13 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Grid.h"
 #include "GeoLib/Point.h"
 #include "MathLib/MathTools.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, InsertZeroPointsInGrid)
 {
diff --git a/Tests/GeoLib/TestLineSegmentIntersect.cpp b/Tests/GeoLib/TestLineSegmentIntersect.cpp
index 260a04d85665206d1b1a94139d456022055b81e3..32b1c2e09fac23aa4db08ef52b37473c09fca2d8 100644
--- a/Tests/GeoLib/TestLineSegmentIntersect.cpp
+++ b/Tests/GeoLib/TestLineSegmentIntersect.cpp
@@ -9,12 +9,13 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 #include <random>
 
 #include "GeoLib/AnalyticalGeometry.h"
 #include "GeoLib/Point.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, TestXAxisParallelLineSegmentIntersection2d)
 {
diff --git a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
index 652135d228302d337cdf9969301a14844156ceb2..a0c25101657981ae4bfe2d8c3ce20ab701e7b070 100644
--- a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
+++ b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <array>
 #include <ctime>
 #include <functional>
@@ -16,7 +18,6 @@
 #include "GeoLib/AnalyticalGeometry.h"
 #include "MathLib/Point3d.h"
 #include "Tests/GeoLib/AutoCheckGenerators.h"
-#include "gtest/gtest.h"
 
 namespace ac = autocheck;
 
diff --git a/Tests/GeoLib/TestOctTree.cpp b/Tests/GeoLib/TestOctTree.cpp
index 18128993f1bc237b268eec4f269fa0a2fca76d05..62cb593011801e914b9adf5232471c75e442f3f9 100644
--- a/Tests/GeoLib/TestOctTree.cpp
+++ b/Tests/GeoLib/TestOctTree.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 #include <memory>
 #include <random>
@@ -14,7 +16,6 @@
 #include "GeoLib/AABB.h"
 #include "GeoLib/OctTree.h"
 #include "GeoLib/Point.h"
-#include "gtest/gtest.h"
 
 class GeoLibOctTree : public testing::Test
 {
diff --git a/Tests/GeoLib/TestParallel.cpp b/Tests/GeoLib/TestParallel.cpp
index 596f18072703fc6d933fd0ec94cac4c94cd792ac..7fabfb5645623bcaf6ec97dbc5e993de82ae9cb7 100644
--- a/Tests/GeoLib/TestParallel.cpp
+++ b/Tests/GeoLib/TestParallel.cpp
@@ -9,8 +9,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "GeoLib/AnalyticalGeometry.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, TestParallel)
 {
diff --git a/Tests/GeoLib/TestPointToStationConversion.cpp b/Tests/GeoLib/TestPointToStationConversion.cpp
index b4eb903f8f3377ac707193dbbcb027bd33e655b8..4be5acb588e9f9e98c667970280ff27089b46596 100644
--- a/Tests/GeoLib/TestPointToStationConversion.cpp
+++ b/Tests/GeoLib/TestPointToStationConversion.cpp
@@ -9,10 +9,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "GeoLib/GEOObjects.h"
 #include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
 #include "InfoLib/TestInfo.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, PointToStationConversion)
 {
diff --git a/Tests/GeoLib/TestPointVec.cpp b/Tests/GeoLib/TestPointVec.cpp
index 36f21f91673399c435ea49a85172169ae7a04d9b..e21a5ad1635a323206f15fc77eb574c0f7e99512 100644
--- a/Tests/GeoLib/TestPointVec.cpp
+++ b/Tests/GeoLib/TestPointVec.cpp
@@ -7,11 +7,12 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 #include <random>
 
 #include "GeoLib/PointVec.h"
-#include "gtest/gtest.h"
 
 class PointVecTest : public testing::Test
 {
diff --git a/Tests/GeoLib/TestPolygon.cpp b/Tests/GeoLib/TestPolygon.cpp
index 88198dd9b8a0ec655c89a395e85b631b2b5c5774..d2b4a1a20bc74a4ffd74ea348e4217beda0ee903 100644
--- a/Tests/GeoLib/TestPolygon.cpp
+++ b/Tests/GeoLib/TestPolygon.cpp
@@ -10,10 +10,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "GeoLib/LineSegment.h"
 #include "GeoLib/Point.h"
 #include "GeoLib/Polygon.h"
-#include "gtest/gtest.h"
 
 /**
  * Polygon:
diff --git a/Tests/GeoLib/TestPolyline.cpp b/Tests/GeoLib/TestPolyline.cpp
index 64be31b4b7069e6c5d64feb2d4019b2e9471358d..721a56cbd2640b8547d76b82fe3e2d2384daa7a5 100644
--- a/Tests/GeoLib/TestPolyline.cpp
+++ b/Tests/GeoLib/TestPolyline.cpp
@@ -10,10 +10,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 
 #include "GeoLib/Polyline.h"
-#include "gtest/gtest.h"
 
 TEST(GeoLib, PolylineTest)
 {
diff --git a/Tests/GeoLib/TestSimplePolygonTree.cpp b/Tests/GeoLib/TestSimplePolygonTree.cpp
index 16e91a48ac5448c115b6f41679377a7a0594418a..65a633e40c2ad35e6705d7ff8a622811665cf792 100644
--- a/Tests/GeoLib/TestSimplePolygonTree.cpp
+++ b/Tests/GeoLib/TestSimplePolygonTree.cpp
@@ -11,12 +11,13 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Point.h"
 #include "GeoLib/Polygon.h"
 #include "GeoLib/SimplePolygonTree.h"
-#include "gtest/gtest.h"
 
 /**
  *       2
diff --git a/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp b/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp
index 49a058d0f4c7cca4269214f6b924f3dc40051c8b..cd960fff6802e6d132fbdf07eb75d6c57ad5e548 100644
--- a/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp
+++ b/Tests/GeoLib/TestSurfaceIsPointInSurface.cpp
@@ -9,6 +9,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <array>
 #include <boost/math/constants/constants.hpp>
 #include <memory>
@@ -25,7 +27,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
 #include "MeshLib/convertMeshToGeo.h"
-#include "gtest/gtest.h"
 
 inline double constant(double /*unused*/, double /*unused*/)
 {
diff --git a/Tests/MathLib/TestPiecewiseLinearCurve.cpp b/Tests/MathLib/TestPiecewiseLinearCurve.cpp
index a4812e0688170fcd303f93334066bf3655eb1bca..72c1348bcfe71faeb0e2bfe1efb120d85a69890f 100644
--- a/Tests/MathLib/TestPiecewiseLinearCurve.cpp
+++ b/Tests/MathLib/TestPiecewiseLinearCurve.cpp
@@ -10,6 +10,8 @@
  * Created on November 11, 2016, 10:58 AM
  */
 
+#include <gtest/gtest.h>
+
 #include <cmath>
 #include <limits>
 
@@ -17,7 +19,6 @@
 #include "MathLib/Curve/CreatePiecewiseLinearCurve.h"
 #include "MathLib/Curve/PiecewiseLinearMonotonicCurve.h"
 #include "Tests/TestTools.h"
-#include "gtest/gtest.h"
 
 template <typename CurveType>
 std::unique_ptr<CurveType> createPiecewiseLinearCurve(const char xml[])
diff --git a/Tests/MathLib/TestPiecewiseLinearInterpolation.cpp b/Tests/MathLib/TestPiecewiseLinearInterpolation.cpp
index 6770b5f55ab7d9593d352e706fec6a6e7cb492cc..2fffcca6a72e0bf2c1a7cbdafe471ccb95d4b131 100644
--- a/Tests/MathLib/TestPiecewiseLinearInterpolation.cpp
+++ b/Tests/MathLib/TestPiecewiseLinearInterpolation.cpp
@@ -14,8 +14,9 @@
 #include <limits>
 
 // google test
+#include <gtest/gtest.h>
+
 #include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h"
-#include "gtest/gtest.h"
 
 TEST(MathLibInterpolationAlgorithms, PiecewiseLinearInterpolation)
 {
diff --git a/Tests/MathLib/TestPoint3dWithID.cpp b/Tests/MathLib/TestPoint3dWithID.cpp
index 10a700ee19cb90cbfad591b92506eb19579c4008..d80a021d53b744dea1738c7a57ce1f5254b2d28d 100644
--- a/Tests/MathLib/TestPoint3dWithID.cpp
+++ b/Tests/MathLib/TestPoint3dWithID.cpp
@@ -9,10 +9,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 
 #include "MathLib/Point3dWithID.h"
-#include "gtest/gtest.h"
 
 using namespace MathLib;
 
diff --git a/Tests/MathLib/TestTemplatePoint.cpp b/Tests/MathLib/TestTemplatePoint.cpp
index 49679d51022ed6eede520205aedd6de0d210af20..5b0ec339b2fef5dd710901f46a55880a70a0c504 100644
--- a/Tests/MathLib/TestTemplatePoint.cpp
+++ b/Tests/MathLib/TestTemplatePoint.cpp
@@ -9,10 +9,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <array>
 
 #include "MathLib/TemplatePoint.h"
-#include "gtest/gtest.h"
 
 using namespace MathLib;
 
diff --git a/Tests/MathLib/TestWeightedPoint.cpp b/Tests/MathLib/TestWeightedPoint.cpp
index 5e0809fbe097ee65d342f55c0eedc9d0c4f7a1e1..e46590fd6b50fec5d14e3e72ea9e7edbd5a3ecd7 100644
--- a/Tests/MathLib/TestWeightedPoint.cpp
+++ b/Tests/MathLib/TestWeightedPoint.cpp
@@ -7,8 +7,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "MathLib/TemplateWeightedPoint.h"
-#include "gtest/gtest.h"
 
 TEST(MathLib, WeightedPoint1D)
 {
diff --git a/Tests/MeshLib/MeshProperties.cpp b/Tests/MeshLib/MeshProperties.cpp
index aaf98abd451ea189189c8c798dc1f0c936d78590..a0a1b668c9e8342a6800f95a844eedee2c02ef53 100644
--- a/Tests/MeshLib/MeshProperties.cpp
+++ b/Tests/MeshLib/MeshProperties.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <Eigen/Eigen>
 #include <numeric>
 
@@ -14,7 +16,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/PropertyVector.h"
-#include "gtest/gtest.h"
 
 class MeshLibProperties : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestAddLayerToMesh.cpp b/Tests/MeshLib/TestAddLayerToMesh.cpp
index 906a63b2b7034ba7b0e49ef6ce629baa43fe15c6..37d0530c9ac07c458de9944ea013cb14a7f8f925 100644
--- a/Tests/MeshLib/TestAddLayerToMesh.cpp
+++ b/Tests/MeshLib/TestAddLayerToMesh.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MeshLib/Elements/Element.h"
@@ -17,7 +19,6 @@
 #include "MeshLib/MeshQuality/MeshValidation.h"
 #include "MeshLib/MeshSurfaceExtraction.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 namespace AddLayerValidation
 {
diff --git a/Tests/MeshLib/TestBoundaryElementSearch.cpp b/Tests/MeshLib/TestBoundaryElementSearch.cpp
index eb006aeeb1b947f0504847ca1ab6f30b91ea380b..4974497b00406d4c9ec1fe2c2f91e313b226fc20 100644
--- a/Tests/MeshLib/TestBoundaryElementSearch.cpp
+++ b/Tests/MeshLib/TestBoundaryElementSearch.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <numeric>
 
@@ -21,7 +23,6 @@
 #include "MeshLib/MeshGenerators/QuadraticMeshGenerator.h"
 #include "MeshLib/MeshSearch/NodeSearch.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 using namespace MeshLib;
 
diff --git a/Tests/MeshLib/TestDuplicate.cpp b/Tests/MeshLib/TestDuplicate.cpp
index 820a54ac792177728309fecf4d965e666a8413f8..16539557bdb0fee31b0dfe5a6e17cd658e5fb3c7 100644
--- a/Tests/MeshLib/TestDuplicate.cpp
+++ b/Tests/MeshLib/TestDuplicate.cpp
@@ -11,6 +11,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MathLib/MathTools.h"
@@ -21,7 +23,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/MeshValidation.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, Duplicate)
 {
diff --git a/Tests/MeshLib/TestElementConstants.cpp b/Tests/MeshLib/TestElementConstants.cpp
index 0a87cc5561ac62e3e193c382fdc4254060cccb13..b35cb957e7e72045cc2598eccde2603b63d56a28 100644
--- a/Tests/MeshLib/TestElementConstants.cpp
+++ b/Tests/MeshLib/TestElementConstants.cpp
@@ -7,10 +7,11 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "MeshLib/Elements/Hex.h"
 #include "MeshLib/Elements/Quad.h"
 #include "MeshLib/Elements/Tet.h"
-#include "gtest/gtest.h"
 
 using namespace MeshLib;
 
diff --git a/Tests/MeshLib/TestElementStatus.cpp b/Tests/MeshLib/TestElementStatus.cpp
index 5855316acf686ab42b07098b97e4c3b4a13b792d..7cca831e311a9dacb5685046985cc45aafd50b36 100644
--- a/Tests/MeshLib/TestElementStatus.cpp
+++ b/Tests/MeshLib/TestElementStatus.cpp
@@ -11,6 +11,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MeshLib/ElementStatus.h"
@@ -18,7 +20,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, ElementStatus)
 {
diff --git a/Tests/MeshLib/TestFlipElements.cpp b/Tests/MeshLib/TestFlipElements.cpp
index fd5034c6e9dbd76b9c2615874984c95815848629..1cc9a27b8a21464446a9edf886520bab0cb58d42 100644
--- a/Tests/MeshLib/TestFlipElements.cpp
+++ b/Tests/MeshLib/TestFlipElements.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MeshLib/Elements/Element.h"
@@ -15,7 +17,6 @@
 #include "MeshLib/MeshEditing/FlipElements.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, FlipLineMesh)
 {
diff --git a/Tests/MeshLib/TestHexQualityCriteria.cpp b/Tests/MeshLib/TestHexQualityCriteria.cpp
index f5881e86ec40fced0830b040a691ed028a75f674..fd0e9c6a899ddc7a364030fbdf5f29b97c7201c2 100644
--- a/Tests/MeshLib/TestHexQualityCriteria.cpp
+++ b/Tests/MeshLib/TestHexQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <numeric>
 #include <random>
@@ -16,7 +18,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class HexElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestLineMesh.cpp b/Tests/MeshLib/TestLineMesh.cpp
index e4a76483494c2ab5716dd7eaca5114aa370398dd..a9f43ddcb038150e2448e5bf47caa7531f5e5570 100644
--- a/Tests/MeshLib/TestLineMesh.cpp
+++ b/Tests/MeshLib/TestLineMesh.cpp
@@ -7,12 +7,13 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 
 #include "MeshLib/Elements/Line.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
-#include "gtest/gtest.h"
 
 class MeshLibLineMesh : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestMeshGenerator.cpp b/Tests/MeshLib/TestMeshGenerator.cpp
index 650bc8fde057709cafa68e5362f77e5d07440f92..778bb7cf67d83a1b62843b9617b8a78ac6559d03 100644
--- a/Tests/MeshLib/TestMeshGenerator.cpp
+++ b/Tests/MeshLib/TestMeshGenerator.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <cmath>
 #include <memory>
 #include <numeric>
@@ -17,7 +19,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 using namespace MeshLib;
 
diff --git a/Tests/MeshLib/TestMeshNodeSearch.cpp b/Tests/MeshLib/TestMeshNodeSearch.cpp
index f8d7cddf7bebc367f6583f7069743fbdc32f3689..c2ff9f682eae472af854a7216cd28842224d5abb 100644
--- a/Tests/MeshLib/TestMeshNodeSearch.cpp
+++ b/Tests/MeshLib/TestMeshNodeSearch.cpp
@@ -10,6 +10,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Polyline.h"
@@ -19,7 +21,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 using namespace MeshLib;
 
diff --git a/Tests/MeshLib/TestMeshRevision.cpp b/Tests/MeshLib/TestMeshRevision.cpp
index 7d49ca8f2ce7e60a4ffc088bb174f647855cddf2..ce803443701caf5bc6ce012b8091f40ff45e657f 100644
--- a/Tests/MeshLib/TestMeshRevision.cpp
+++ b/Tests/MeshLib/TestMeshRevision.cpp
@@ -11,6 +11,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/Elements/Hex.h"
 #include "MeshLib/Elements/Prism.h"
@@ -21,7 +23,6 @@
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshEditing/MeshRevision.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshEditing, Tri)
 {
diff --git a/Tests/MeshLib/TestMeshValidation.cpp b/Tests/MeshLib/TestMeshValidation.cpp
index 501799c95d8b98d56ccbf27d8563e64c44ca0b1b..1d9f2e29b56c58e4cec2483ef057c44c51c06c6e 100644
--- a/Tests/MeshLib/TestMeshValidation.cpp
+++ b/Tests/MeshLib/TestMeshValidation.cpp
@@ -11,6 +11,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Raster.h"
@@ -22,7 +24,6 @@
 #include "MeshLib/MeshGenerators/RasterToMesh.h"
 #include "MeshLib/MeshQuality/MeshValidation.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 void detectHoles(MeshLib::Mesh const& mesh,
                  std::vector<std::size_t>
diff --git a/Tests/MeshLib/TestMoveMeshNodes.cpp b/Tests/MeshLib/TestMoveMeshNodes.cpp
index 47d2f9672a1440501630e2b65925615f8ccf0a4f..df26cf0d27e6334cd348a971b7e21be1bb5d379a 100644
--- a/Tests/MeshLib/TestMoveMeshNodes.cpp
+++ b/Tests/MeshLib/TestMoveMeshNodes.cpp
@@ -6,6 +6,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdlib>
 #include <ctime>
 #include <numeric>
@@ -13,7 +15,6 @@
 
 #include "MeshLib/MeshEditing/moveMeshNodes.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, moveMeshNodes)
 {
diff --git a/Tests/MeshLib/TestNodeAdjacencyTable.cpp b/Tests/MeshLib/TestNodeAdjacencyTable.cpp
index f0c9c75a6b3ca58924532da0cdbf7828983919a8..c9c34f031cd3d2b9298deac4e0cd6ea86e59580b 100644
--- a/Tests/MeshLib/TestNodeAdjacencyTable.cpp
+++ b/Tests/MeshLib/TestNodeAdjacencyTable.cpp
@@ -7,6 +7,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MeshLib/Elements/Element.h"
@@ -14,7 +16,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Node.h"
 #include "MeshLib/NodeAdjacencyTable.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, CreateNodeAdjacencyTable1D)
 {
diff --git a/Tests/MeshLib/TestNodeSearch.cpp b/Tests/MeshLib/TestNodeSearch.cpp
index 25bcaf49a2ed229b60a831af60cca0db061b109d..45164f1fd0031ee707ecc596f900d6ad975ab18b 100644
--- a/Tests/MeshLib/TestNodeSearch.cpp
+++ b/Tests/MeshLib/TestNodeSearch.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Raster.h"
@@ -17,7 +19,6 @@
 #include "MeshLib/MeshGenerators/RasterToMesh.h"
 #include "MeshLib/MeshSearch/NodeSearch.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(NodeSearch, UnusedNodes)
 {
diff --git a/Tests/MeshLib/TestPrismQualityCriteria.cpp b/Tests/MeshLib/TestPrismQualityCriteria.cpp
index ae17a57019ace3cea660ea039e88ba905fb40ca6..64264f824b1a5295353dd25cd3ee41148baba5d6 100644
--- a/Tests/MeshLib/TestPrismQualityCriteria.cpp
+++ b/Tests/MeshLib/TestPrismQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <numeric>
 #include <random>
@@ -16,7 +18,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class PrismElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestPyramidQualityCriteria.cpp b/Tests/MeshLib/TestPyramidQualityCriteria.cpp
index 503af6312ecf106dc602f01dd25f3e3f2db5b917..3e3d8fb62dbac8f30f06edade27257c514ff4985 100644
--- a/Tests/MeshLib/TestPyramidQualityCriteria.cpp
+++ b/Tests/MeshLib/TestPyramidQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <numeric>
 #include <random>
@@ -16,7 +18,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class PyramidElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestQuadMesh.cpp b/Tests/MeshLib/TestQuadMesh.cpp
index cf6dbcf911773683daef71e571d3d62b3be3eb90..6fd6861c6fc2ab47ae46de22c6d0a081500f5505 100644
--- a/Tests/MeshLib/TestQuadMesh.cpp
+++ b/Tests/MeshLib/TestQuadMesh.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <ctime>
 #include <iterator>
 #include <list>
@@ -14,7 +16,6 @@
 #include "MeshLib/Elements/Quad.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
-#include "gtest/gtest.h"
 
 class MeshLibQuadMesh : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestQuadQualityCriteria.cpp b/Tests/MeshLib/TestQuadQualityCriteria.cpp
index a4e094fcb82464e30997a8688cad65c7ab691d44..07d063552ac737ae10a6fdb3b7877363768ce3d4 100644
--- a/Tests/MeshLib/TestQuadQualityCriteria.cpp
+++ b/Tests/MeshLib/TestQuadQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <numeric>
 #include <random>
@@ -16,7 +18,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class QuadElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestQuadraticMesh.cpp b/Tests/MeshLib/TestQuadraticMesh.cpp
index 8e016b1a1e6519c2d9887b94f29522d84d8432dd..a151e270c24f3ddd5b94e665ae103789eb3e740f 100644
--- a/Tests/MeshLib/TestQuadraticMesh.cpp
+++ b/Tests/MeshLib/TestQuadraticMesh.cpp
@@ -7,6 +7,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "GeoLib/Polyline.h"
@@ -17,7 +19,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshGenerators/QuadraticMeshGenerator.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, QuadraticOrderMesh_Line)
 {
diff --git a/Tests/MeshLib/TestRasterDataToMesh.cpp b/Tests/MeshLib/TestRasterDataToMesh.cpp
index 649dd6a77a3a1477854cba2605759d2556c90080..6055fabfd0e8275359bcf5c66d894caa637fcad3 100644
--- a/Tests/MeshLib/TestRasterDataToMesh.cpp
+++ b/Tests/MeshLib/TestRasterDataToMesh.cpp
@@ -9,6 +9,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cstdio>
 #include <memory>
@@ -19,7 +21,6 @@
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshEditing/RasterDataToMesh.h"
-#include "gtest/gtest.h"
 
 class RasterDataToMeshTest : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestRasterToMesh.cpp b/Tests/MeshLib/TestRasterToMesh.cpp
index a4513461c5ce50a98a4c69bcf08b45e337e46318..5e15dd24e7040b22e770c8ace5872b7e4dc780b2 100644
--- a/Tests/MeshLib/TestRasterToMesh.cpp
+++ b/Tests/MeshLib/TestRasterToMesh.cpp
@@ -8,6 +8,8 @@
  *
  */
 
+#include <gtest/gtest.h>
+
 #include <cstdio>
 #include <memory>
 
@@ -19,7 +21,6 @@
 #include "MeshLib/MeshGenerators/RasterToMesh.h"
 #include "MeshLib/MeshInformation.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 #ifdef OGS_BUILD_GUI
 #include <vtkImageData.h>
diff --git a/Tests/MeshLib/TestRemove.cpp b/Tests/MeshLib/TestRemove.cpp
index e7fccd8b424f9c772cb081e273fe79cb8b2c66a9..89f82424efa273340e59053b243f133e7da71704 100644
--- a/Tests/MeshLib/TestRemove.cpp
+++ b/Tests/MeshLib/TestRemove.cpp
@@ -11,6 +11,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <memory>
 
 #include "MathLib/MathTools.h"
@@ -20,7 +22,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/MeshValidation.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLib, RemoveNodes)
 {
diff --git a/Tests/MeshLib/TestTetQualityCriteria.cpp b/Tests/MeshLib/TestTetQualityCriteria.cpp
index 27de5eeffdf4dfcb2ed5311ef8705afc2f6ea43b..34eed0b480d0594e24f58d1ec4eb0f2669178db6 100644
--- a/Tests/MeshLib/TestTetQualityCriteria.cpp
+++ b/Tests/MeshLib/TestTetQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <Eigen/Eigen>
 #include <boost/math/constants/constants.hpp>
 #include <cmath>
@@ -19,7 +21,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class TetElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestTriLineMesh.cpp b/Tests/MeshLib/TestTriLineMesh.cpp
index dd229e248f5a9761a074dc30b3c123b0bb5de232..776ec355a4ffa614781085272a5576c126dcec93 100644
--- a/Tests/MeshLib/TestTriLineMesh.cpp
+++ b/Tests/MeshLib/TestTriLineMesh.cpp
@@ -7,11 +7,12 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "MeshLib/Elements/Line.h"
 #include "MeshLib/Elements/Tri.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshEnums.h"
-#include "gtest/gtest.h"
 
 /// Creates a mesh consisiting of two triangles sharing a line element on their
 /// common edge.
diff --git a/Tests/MeshLib/TestTriQualityCriteria.cpp b/Tests/MeshLib/TestTriQualityCriteria.cpp
index 0766b68b2e300880dc53c557b4239babe94b587d..965825746e7bfefa875d62d9a02277ffa80fb9b5 100644
--- a/Tests/MeshLib/TestTriQualityCriteria.cpp
+++ b/Tests/MeshLib/TestTriQualityCriteria.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include <boost/math/constants/constants.hpp>
 #include <cmath>
 #include <memory>
@@ -18,7 +20,6 @@
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/MeshQuality/ElementQualityInterface.h"
 #include "MeshLib/Node.h"
-#include "gtest/gtest.h"
 
 class TriElementQuality : public ::testing::Test
 {
diff --git a/Tests/MeshLib/TestUniqueMeshId.cpp b/Tests/MeshLib/TestUniqueMeshId.cpp
index 45fdb1bfd7ae3412f2f02b302462582a2be26709..ca5caf40af26e1bcfdde76cbdc317a025d1eb5ba 100644
--- a/Tests/MeshLib/TestUniqueMeshId.cpp
+++ b/Tests/MeshLib/TestUniqueMeshId.cpp
@@ -7,8 +7,9 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
+
 #include "MeshLib/Mesh.h"
-#include "gtest/gtest.h"
 
 using namespace MeshLib;
 
diff --git a/Tests/MeshLib/TestVtkMappedMeshSource.cpp b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
index a99aa0754f22b0ed0d54504f25c3877d9977642c..ea26874f3df812048e89f6d418f508f9fce2fc76 100644
--- a/Tests/MeshLib/TestVtkMappedMeshSource.cpp
+++ b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
@@ -12,6 +12,7 @@
  *
  */
 
+#include <gtest/gtest.h>
 #include <vtkCellData.h>
 #include <vtkNew.h>
 #include <vtkPointData.h>
@@ -32,7 +33,6 @@
 #include "MeshLib/MeshGenerators/VtkMeshConverter.h"
 #include "MeshLib/Vtk/VtkMappedMeshSource.h"
 #include "filesystem.h"
-#include "gtest/gtest.h"
 
 // Creates a mesh with different types of data (double, int, etc.) and point,
 // cell, or integration point properties.
diff --git a/Tests/MeshLib/TestVtkMappedPropertyVector.cpp b/Tests/MeshLib/TestVtkMappedPropertyVector.cpp
index 709f0ab888687cd4d43b9e15be92e90606156a60..2622ff6fe79d255259e5751936b48ed8ef313f37 100644
--- a/Tests/MeshLib/TestVtkMappedPropertyVector.cpp
+++ b/Tests/MeshLib/TestVtkMappedPropertyVector.cpp
@@ -11,6 +11,7 @@
  *              http://www.opengeosys.org/project/license
  *
  */
+#include <gtest/gtest.h>
 #include <vtkDoubleArray.h>
 #include <vtkIntArray.h>
 #include <vtkNew.h>
@@ -21,7 +22,6 @@
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
-#include "gtest/gtest.h"
 
 // Creates a PropertyVector<double> and maps it into a vtkDataArray-equivalent
 TEST(MeshLibMappedPropertyVector, Double)
diff --git a/Tests/MeshLib/TestVtkMeshConverter.cpp b/Tests/MeshLib/TestVtkMeshConverter.cpp
index 97d1a74917d43127f839a9060f9c2189025f2097..2a6986f1cf727dc582513eac1114018b462b1485 100644
--- a/Tests/MeshLib/TestVtkMeshConverter.cpp
+++ b/Tests/MeshLib/TestVtkMeshConverter.cpp
@@ -7,6 +7,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <gtest/gtest.h>
 #include <vtkCellArray.h>
 #include <vtkCellData.h>
 #include <vtkDoubleArray.h>
@@ -21,7 +22,6 @@
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/VtkMeshConverter.h"
-#include "gtest/gtest.h"
 
 /// Constructs this VTK mesh: https://gist.github.com/bilke/8bc7e5e7084ad4d806e1
 class TestVtkMeshConverter : public ::testing::Test
diff --git a/Tests/MeshLib/TestVtkMeshNodalCoordinatesTemplate.cpp b/Tests/MeshLib/TestVtkMeshNodalCoordinatesTemplate.cpp
index e8027bc9b55e64d3d4e7fb0f5515b6b5bc6e7daf..bf4455ccae862e9ba0a3eba4267d40f7c7cd5cb7 100644
--- a/Tests/MeshLib/TestVtkMeshNodalCoordinatesTemplate.cpp
+++ b/Tests/MeshLib/TestVtkMeshNodalCoordinatesTemplate.cpp
@@ -11,13 +11,13 @@
  *              http://www.opengeosys.org/project/license
  *
  */
+#include <gtest/gtest.h>
 #include <vtkNew.h>
 #include <vtkUnstructuredGrid.h>
 
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 #include "MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h"
-#include "gtest/gtest.h"
 
 TEST(MeshLibdalCoordinates, Init)
 {
diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp
index b178470d7fd637ebc0dd7e5b234598d1971e773e..35e99d19d0a27beef5ae5f2c50b64d64c275aab9 100644
--- a/Tests/testrunner.cpp
+++ b/Tests/testrunner.cpp
@@ -12,6 +12,7 @@
  *
  */
 
+#include <gtest/gtest.h>
 #include <spdlog/spdlog.h>
 
 #include <clocale>
@@ -20,7 +21,6 @@
 #include "BaseLib/Error.h"
 #include "BaseLib/Logging.h"
 #include "NumLib/DOF/GlobalMatrixProviders.h"
-#include "gtest/gtest.h"
 
 #ifdef OGS_BUILD_GUI
 #include <QCoreApplication>