diff --git a/src/algorithm/Boundary.h b/src/algorithm/Boundary.h
index bc40588..84359e4 100644
--- a/src/algorithm/Boundary.h
+++ b/src/algorithm/Boundary.h
@@ -7,7 +7,14 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Error.h"
+#include "EdgeList.h"
+#include "Edge.h"
+#include "Vertex.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Domain.h b/src/algorithm/Domain.h
index 08bb9ff..6ac33b5 100644
--- a/src/algorithm/Domain.h
+++ b/src/algorithm/Domain.h
@@ -7,7 +7,11 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Boundary.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Edge.h b/src/algorithm/Edge.h
index ea485f8..59fcd45 100644
--- a/src/algorithm/Edge.h
+++ b/src/algorithm/Edge.h
@@ -7,7 +7,13 @@
 */
 #pragma once
 
-#include "TQMesh.h"   
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Facet.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/EdgeList.h b/src/algorithm/EdgeList.h
index 6b6be0c..74babee 100644
--- a/src/algorithm/EdgeList.h
+++ b/src/algorithm/EdgeList.h
@@ -7,7 +7,11 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Edge.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/EntityChecks.h b/src/algorithm/EntityChecks.h
index fa30561..2ce683b 100644
--- a/src/algorithm/EntityChecks.h
+++ b/src/algorithm/EntityChecks.h
@@ -7,7 +7,14 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Facet.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Error.h b/src/algorithm/Error.h
index 7aa488d..a6dd160 100644
--- a/src/algorithm/Error.h
+++ b/src/algorithm/Error.h
@@ -7,7 +7,9 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Facet.h b/src/algorithm/Facet.h
index 72d4c61..f9e8941 100644
--- a/src/algorithm/Facet.h
+++ b/src/algorithm/Facet.h
@@ -7,7 +7,11 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/FacetGeometry.h b/src/algorithm/FacetGeometry.h
index 4c12068..0c32bda 100644
--- a/src/algorithm/FacetGeometry.h
+++ b/src/algorithm/FacetGeometry.h
@@ -7,7 +7,11 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Front.h b/src/algorithm/Front.h
index e894f21..44dd21c 100644
--- a/src/algorithm/Front.h
+++ b/src/algorithm/Front.h
@@ -7,7 +7,14 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "EdgeList.h"
+#include "Vertex.h"
+#include "Domain.h"
+#include "Mesh.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/FrontUpdate.h b/src/algorithm/FrontUpdate.h
index 64ac2ab..1a8c6c9 100644
--- a/src/algorithm/FrontUpdate.h
+++ b/src/algorithm/FrontUpdate.h
@@ -7,7 +7,16 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Triangle.h"
+#include "Front.h"
+#include "Domain.h"
+#include "Mesh.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Mesh.h b/src/algorithm/Mesh.h
index 7abe261..3225f65 100644
--- a/src/algorithm/Mesh.h
+++ b/src/algorithm/Mesh.h
@@ -7,7 +7,15 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Facet.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshBuilder.h b/src/algorithm/MeshBuilder.h
index c3a34fa..054695f 100644
--- a/src/algorithm/MeshBuilder.h
+++ b/src/algorithm/MeshBuilder.h
@@ -7,7 +7,15 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "Front.h"
+#include "EntityChecks.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshChecker.h b/src/algorithm/MeshChecker.h
index f23402b..7e09fca 100644
--- a/src/algorithm/MeshChecker.h
+++ b/src/algorithm/MeshChecker.h
@@ -7,7 +7,14 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshCleanup.h"
+#include "EntityChecks.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshCleanup.h b/src/algorithm/MeshCleanup.h
index 7458fc2..a98a48e 100644
--- a/src/algorithm/MeshCleanup.h
+++ b/src/algorithm/MeshCleanup.h
@@ -7,7 +7,15 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Facet.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshGenerator.h b/src/algorithm/MeshGenerator.h
index 67ac404..40db034 100644
--- a/src/algorithm/MeshGenerator.h
+++ b/src/algorithm/MeshGenerator.h
@@ -7,7 +7,21 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshBuilder.h"
+#include "MeshWriter.h"
+#include "MeshMerger.h"
+#include "MeshingStrategy.h"
+#include "SmoothingStrategy.h"
+#include "RefinementStrategy.h"
+#include "ModificationStrategy.h"
+#include "TriangulationStrategy.h"
+#include "QuadLayerStrategy.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshMerger.h b/src/algorithm/MeshMerger.h
index 6a3ea38..ab40b6d 100644
--- a/src/algorithm/MeshMerger.h
+++ b/src/algorithm/MeshMerger.h
@@ -7,7 +7,12 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Mesh.h"
+#include "MeshCleanup.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshWriter.h b/src/algorithm/MeshWriter.h
index 7483ea1..b382b83 100644
--- a/src/algorithm/MeshWriter.h
+++ b/src/algorithm/MeshWriter.h
@@ -7,7 +7,12 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Mesh.h"
+#include "MeshCleanup.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/MeshingStrategy.h b/src/algorithm/MeshingStrategy.h
index 5f5ba1c..433e54c 100644
--- a/src/algorithm/MeshingStrategy.h
+++ b/src/algorithm/MeshingStrategy.h
@@ -7,7 +7,16 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Front.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "FrontUpdate.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/ModificationStrategy.h b/src/algorithm/ModificationStrategy.h
index 2ea474d..8f7bbe5 100644
--- a/src/algorithm/ModificationStrategy.h
+++ b/src/algorithm/ModificationStrategy.h
@@ -7,7 +7,16 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Mesh.h"
+#include "Domain.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Quad.h b/src/algorithm/Quad.h
index a9f25a2..21dafdc 100644
--- a/src/algorithm/Quad.h
+++ b/src/algorithm/Quad.h
@@ -7,7 +7,15 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Facet.h"
+#include "Domain.h"
+#include "FacetGeometry.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/QuadLayerStrategy.h b/src/algorithm/QuadLayerStrategy.h
index da8364a..bdf8672 100644
--- a/src/algorithm/QuadLayerStrategy.h
+++ b/src/algorithm/QuadLayerStrategy.h
@@ -7,7 +7,20 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Edge.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Domain.h"
+#include "Boundary.h"
+#include "Mesh.h"
+#include "MeshingStrategy.h"
+#include "MeshCleanup.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/RefinementStrategy.h b/src/algorithm/RefinementStrategy.h
index 47ad5dc..8e27334 100644
--- a/src/algorithm/RefinementStrategy.h
+++ b/src/algorithm/RefinementStrategy.h
@@ -7,7 +7,16 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Triangle.h"
+#include "Quad.h"
+#include "Mesh.h"
+#include "Domain.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/SmoothingStrategy.h b/src/algorithm/SmoothingStrategy.h
index 757ae78..bd75549 100644
--- a/src/algorithm/SmoothingStrategy.h
+++ b/src/algorithm/SmoothingStrategy.h
@@ -7,7 +7,13 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "MeshCleanup.h"
+#include "Mesh.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/TQMesh.h b/src/algorithm/TQMesh.h
index 2e545ef..46925d2 100644
--- a/src/algorithm/TQMesh.h
+++ b/src/algorithm/TQMesh.h
@@ -8,19 +8,8 @@
 #pragma once
 
 #include <TQMeshConfig.h>
-
 #include "STLHeaders.h"
-
-#include "VecND.h"
-#include "Timer.h"
-#include "Geometry.h"
-#include "Container.h"
-#include "Helpers.h"
-#include "MathUtility.h"
-#include "Testing.h"
-#include "ParaReader.h"
-#include "ProgressBar.h"
-#include "VtkIO.h"
+#include "CppUtils.h"
 
 #include "utils.h"
 #include "Error.h"
diff --git a/src/algorithm/Triangle.h b/src/algorithm/Triangle.h
index 233396b..53d66fc 100644
--- a/src/algorithm/Triangle.h
+++ b/src/algorithm/Triangle.h
@@ -7,7 +7,15 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Facet.h"
+#include "Domain.h"
+#include "FacetGeometry.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/TriangulationStrategy.h b/src/algorithm/TriangulationStrategy.h
index b35d326..3b3ce72 100644
--- a/src/algorithm/TriangulationStrategy.h
+++ b/src/algorithm/TriangulationStrategy.h
@@ -7,7 +7,17 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshCleanup.h"
+#include "MeshingStrategy.h"
+#include "EntityChecks.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/Vertex.h b/src/algorithm/Vertex.h
index ded9867..3215087 100644
--- a/src/algorithm/Vertex.h
+++ b/src/algorithm/Vertex.h
@@ -7,7 +7,9 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 namespace TQMesh {
 
diff --git a/src/algorithm/utils.h b/src/algorithm/utils.h
index dd5b7dd..cdd038a 100644
--- a/src/algorithm/utils.h
+++ b/src/algorithm/utils.h
@@ -7,7 +7,9 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 namespace TQMesh {
 
diff --git a/src/examples/01_simple_triangular_mesh.cpp b/src/examples/01_simple_triangular_mesh.cpp
index 7561d6b..540cce3 100644
--- a/src/examples/01_simple_triangular_mesh.cpp
+++ b/src/examples/01_simple_triangular_mesh.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/02_square_in_channel.cpp b/src/examples/02_square_in_channel.cpp
index 147cadf..f2a55b4 100644
--- a/src/examples/02_square_in_channel.cpp
+++ b/src/examples/02_square_in_channel.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/03_boundary_shapes.cpp b/src/examples/03_boundary_shapes.cpp
index a6281bc..ba06308 100644
--- a/src/examples/03_boundary_shapes.cpp
+++ b/src/examples/03_boundary_shapes.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/04_fixed_vertices.cpp b/src/examples/04_fixed_vertices.cpp
index e7dfaaa..9a8afc5 100644
--- a/src/examples/04_fixed_vertices.cpp
+++ b/src/examples/04_fixed_vertices.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/05_merge_meshes.cpp b/src/examples/05_merge_meshes.cpp
index 4b689b1..24595b8 100644
--- a/src/examples/05_merge_meshes.cpp
+++ b/src/examples/05_merge_meshes.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/06_airfoil_from_csv.cpp b/src/examples/06_airfoil_from_csv.cpp
index 573624f..9411225 100644
--- a/src/examples/06_airfoil_from_csv.cpp
+++ b/src/examples/06_airfoil_from_csv.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/07_multiple_meshes.cpp b/src/examples/07_multiple_meshes.cpp
index 1384868..bdff37a 100644
--- a/src/examples/07_multiple_meshes.cpp
+++ b/src/examples/07_multiple_meshes.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/examples/08_thin_fracture.cpp b/src/examples/08_thin_fracture.cpp
index cbf9857..3eb312f 100644
--- a/src/examples/08_thin_fracture.cpp
+++ b/src/examples/08_thin_fracture.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 /*********************************************************************
diff --git a/src/examples/09_tqmesh_banner.cpp b/src/examples/09_tqmesh_banner.cpp
index 28ef720..205beb8 100644
--- a/src/examples/09_tqmesh_banner.cpp
+++ b/src/examples/09_tqmesh_banner.cpp
@@ -5,19 +5,12 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
 #include <iostream>
 #include <cassert>
 
-#include <TQMeshConfig.h>
-
+#include "TQMesh.h"
 #include "run_examples.h"
 
-#include "VecND.h"
-#include "Log.h"
-
-#include "MeshGenerator.h"
-
 using namespace CppUtils;
 using namespace TQMesh;
 
diff --git a/src/tests/TestBuilder.h b/src/tests/TestBuilder.h
index 9eb2c11..3ac1036 100644
--- a/src/tests/TestBuilder.h
+++ b/src/tests/TestBuilder.h
@@ -7,7 +7,14 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Boundary.h"
 
 namespace TQMesh {
 
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index 2ed9df8..0bded7c 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -5,8 +5,10 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
-#include "TQMesh.h"
 #include "tests.h"
 
 using CppUtils::LOG_PROPERTIES;
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 792dd05..e7dc818 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -5,8 +5,11 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 #include "tests.h"
-#include "TQMesh.h"
 
 /*********************************************************************
 * Log utils
diff --git a/src/tests/tests.h b/src/tests/tests.h
index 163d72a..59f26ce 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -7,7 +7,9 @@
 */
 #pragma once
 
-#include "TQMesh.h"
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 /*********************************************************************
 * Adjust logging output stream
diff --git a/src/tests/tests_Boundary.cpp b/src/tests/tests_Boundary.cpp
index 1f2cfd6..a13fb81 100644
--- a/src/tests/tests_Boundary.cpp
+++ b/src/tests/tests_Boundary.cpp
@@ -6,8 +6,16 @@
 * on usage and license.
 */
 
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Boundary.h"
+#include "Domain.h"
 
 namespace BoundaryTests 
 {
diff --git a/src/tests/tests_EdgeList.cpp b/src/tests/tests_EdgeList.cpp
index a584976..f90bd60 100644
--- a/src/tests/tests_EdgeList.cpp
+++ b/src/tests/tests_EdgeList.cpp
@@ -6,8 +6,16 @@
 * on usage and license.
 */
 
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
+
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Edge.h"
+#include "EdgeList.h"
 
 namespace EdgeListTests 
 {
diff --git a/src/tests/tests_Front.cpp b/src/tests/tests_Front.cpp
index 8eac6da..422db19 100644
--- a/src/tests/tests_Front.cpp
+++ b/src/tests/tests_Front.cpp
@@ -5,10 +5,19 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
 #include "TestBuilder.h"
-#include "TQMesh.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Front.h"
+#include "Mesh.h"
 
 namespace FrontTests 
 {
diff --git a/src/tests/tests_Mesh.cpp b/src/tests/tests_Mesh.cpp
index 913e3ce..65942ae 100644
--- a/src/tests/tests_Mesh.cpp
+++ b/src/tests/tests_Mesh.cpp
@@ -5,10 +5,24 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
 #include "TestBuilder.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshBuilder.h"
+#include "MeshChecker.h"
+#include "RefinementStrategy.h"
+#include "MeshCleanup.h"
+#include "TriangulationStrategy.h"
+#include "QuadLayerStrategy.h"
+#include "SmoothingStrategy.h"
 
 namespace MeshTests 
 {
diff --git a/src/tests/tests_MeshChecker.cpp b/src/tests/tests_MeshChecker.cpp
index e65e107..bc9499e 100644
--- a/src/tests/tests_MeshChecker.cpp
+++ b/src/tests/tests_MeshChecker.cpp
@@ -5,10 +5,18 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
 #include "TestBuilder.h"
-#include "TQMesh.h"
+
+#include "MeshChecker.h"
+#include "MeshBuilder.h"
+#include "MeshCleanup.h"
+#include "TriangulationStrategy.h"
+#include "SmoothingStrategy.h"
 
 namespace CheckerTests 
 {
diff --git a/src/tests/tests_MeshCleanup.cpp b/src/tests/tests_MeshCleanup.cpp
index 654544a..6c0b8c2 100644
--- a/src/tests/tests_MeshCleanup.cpp
+++ b/src/tests/tests_MeshCleanup.cpp
@@ -5,10 +5,18 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 #include "tests.h"
 #include "TestBuilder.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshCleanup.h"
+#include "EntityChecks.h"
 
 namespace CleanupTests 
 {
diff --git a/src/tests/tests_MeshGenerator.cpp b/src/tests/tests_MeshGenerator.cpp
index 57ade70..a13c024 100644
--- a/src/tests/tests_MeshGenerator.cpp
+++ b/src/tests/tests_MeshGenerator.cpp
@@ -5,10 +5,23 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
 #include "TestBuilder.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "MeshGenerator.h"
+#include "MeshMerger.h"
+#include "RefinementStrategy.h"
+#include "MeshCleanup.h"
+#include "SmoothingStrategy.h"
+#include "EntityChecks.h"
 
 namespace MeshGeneratorTests 
 {
diff --git a/src/tests/tests_ParaReader.cpp b/src/tests/tests_ParaReader.cpp
index 35db20e..1980385 100644
--- a/src/tests/tests_ParaReader.cpp
+++ b/src/tests/tests_ParaReader.cpp
@@ -5,9 +5,10 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
-
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 #include "tests.h"
-#include "TQMesh.h"
  
 namespace ParaReaderTests 
 {
diff --git a/src/tests/tests_Quad.cpp b/src/tests/tests_Quad.cpp
index abe334e..6d1e59b 100644
--- a/src/tests/tests_Quad.cpp
+++ b/src/tests/tests_Quad.cpp
@@ -5,9 +5,18 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Front.h"
+#include "Quad.h"
 
 namespace QuadTests 
 {
diff --git a/src/tests/tests_SizeFunction.cpp b/src/tests/tests_SizeFunction.cpp
index 2583455..8617bc5 100644
--- a/src/tests/tests_SizeFunction.cpp
+++ b/src/tests/tests_SizeFunction.cpp
@@ -5,9 +5,16 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "utils.h"
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
 
 namespace SizeFunctionTests 
 {
diff --git a/src/tests/tests_SmoothingStrategy.cpp b/src/tests/tests_SmoothingStrategy.cpp
index 833b9b5..aba3509 100644
--- a/src/tests/tests_SmoothingStrategy.cpp
+++ b/src/tests/tests_SmoothingStrategy.cpp
@@ -5,9 +5,17 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Mesh.h"
+#include "SmoothingStrategy.h"
 
 namespace MeshSmootherTests 
 {
diff --git a/src/tests/tests_Triangle.cpp b/src/tests/tests_Triangle.cpp
index 26cf379..025dfc7 100644
--- a/src/tests/tests_Triangle.cpp
+++ b/src/tests/tests_Triangle.cpp
@@ -5,9 +5,17 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Edge.h"
+#include "Domain.h"
+#include "Front.h"
+#include "Triangle.h"
 
 namespace TriangleTests 
 {
diff --git a/src/tests/tests_Vertex.cpp b/src/tests/tests_Vertex.cpp
index d8944b5..2e3bc33 100644
--- a/src/tests/tests_Vertex.cpp
+++ b/src/tests/tests_Vertex.cpp
@@ -5,9 +5,15 @@
 * Refer to the accompanying documentation for details
 * on usage and license.
 */
+#include <TQMeshConfig.h>
+#include "STLHeaders.h"
+#include "CppUtils.h"
 
 #include "tests.h"
-#include "TQMesh.h"
+
+#include "Vertex.h"
+#include "Triangle.h"
+#include "Quad.h"
 
 namespace VertexTests 
 {
diff --git a/src/utils/CppUtils.h b/src/utils/CppUtils.h
new file mode 100644
index 0000000..f3882ac
--- /dev/null
+++ b/src/utils/CppUtils.h
@@ -0,0 +1,19 @@
+/*
+* This file is part of the CppUtils library.  
+* This code was written by Florian Setzwein in 2022, 
+* and is covered under the MIT License
+* Refer to the accompanying documentation for details
+* on usage and license.
+*/
+#pragma once
+
+#include "VecND.h"
+#include "Timer.h"
+#include "Geometry.h"
+#include "Container.h"
+#include "Helpers.h"
+#include "MathUtility.h"
+#include "Testing.h"
+#include "ParaReader.h"
+#include "ProgressBar.h"
+#include "VtkIO.h"
diff --git a/src/utils/Log.h b/src/utils/Log.h
index 4ebe40b..6d8c2b8 100644
--- a/src/utils/Log.h
+++ b/src/utils/Log.h
@@ -216,7 +216,7 @@ class LogProperties
 
 };
 
-inline LogProperties LOG_PROPERTIES;
+static inline LogProperties LOG_PROPERTIES;
 
 /*********************************************************************
 * The interface for the actual SimpleLogger
diff --git a/src/utils/Timer.h b/src/utils/Timer.h
index 5db4e0c..1dc5e8d 100644
--- a/src/utils/Timer.h
+++ b/src/utils/Timer.h
@@ -29,6 +29,8 @@ class Timer
   // Getter
   const Timevector& times() const { return tv_; }
   const Msgvector& messages() const { return msg_; }
+  const std::string& message(std::size_t i) const { return msg_[i]; }
+  std::size_t size() const { return tv_.size(); }
 
   // Measure time
   void count(const std::string& msg="")