diff --git a/src/Mod/Mesh/App/AppMesh.cpp b/src/Mod/Mesh/App/AppMesh.cpp
index 8bd25946d3..2dcdb0f382 100644
--- a/src/Mod/Mesh/App/AppMesh.cpp
+++ b/src/Mod/Mesh/App/AppMesh.cpp
@@ -22,26 +22,27 @@
 
 #include "PreCompiled.h"
 
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
-#include <App/Application.h>
 
-#include "Exporter.h"
-#include "Mesh.h"
-#include "MeshPy.h"
-#include "MeshPointPy.h"
 #include "EdgePy.h"
+#include "Exporter.h"
 #include "FacetPy.h"
-#include "MeshFeaturePy.h"
-#include "FeatureMeshImport.h"
-#include "FeatureMeshExport.h"
-#include "FeatureMeshTransform.h"
-#include "FeatureMeshTransformDemolding.h"
 #include "FeatureMeshCurvature.h"
+#include "FeatureMeshDefects.h"
+#include "FeatureMeshExport.h"
+#include "FeatureMeshImport.h"
 #include "FeatureMeshSegmentByMesh.h"
 #include "FeatureMeshSetOperations.h"
-#include "FeatureMeshDefects.h"
 #include "FeatureMeshSolid.h"
+#include "FeatureMeshTransform.h"
+#include "FeatureMeshTransformDemolding.h"
+#include "Mesh.h"
+#include "MeshFeaturePy.h"
+#include "MeshPointPy.h"
+#include "MeshPy.h"
+
 
 namespace Mesh {
 extern PyObject* initModule();
diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp
index 9196910800..889d2ed3ad 100644
--- a/src/Mod/Mesh/App/AppMeshPy.cpp
+++ b/src/Mod/Mesh/App/AppMeshPy.cpp
@@ -23,38 +23,29 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
-# include <memory>
 # include <map>
+# include <memory>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/Interpreter.h>
-#include <Base/FileInfo.h>
-#include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectPy.h>
-#include <App/Property.h>
-#include <Base/PlacementPy.h>
-
 #include <Base/GeometryPyCXX.h>
+#include <Base/Interpreter.h>
+#include <Base/PlacementPy.h>
 #include <Base/VectorPy.h>
-
-#include "Core/MeshKernel.h"
-#include "Core/MeshIO.h"
+#include "Core/Approximation.h"
 #include "Core/Evaluation.h"
 #include "Core/Iterator.h"
-#include "Core/Approximation.h"
-
+#include "Core/MeshIO.h"
+#include "Core/MeshKernel.h"
 #include "WildMagic4/Wm4ContBox3.h"
 
-#include "Mesh.h"
+#include "MeshPy.h"
 #include "Exporter.h"
 #include "Importer.h"
-#include "FeatureMeshImport.h"
-#include <Mod/Mesh/App/MeshPy.h>
+#include "Mesh.h"
+
 
 using namespace Mesh;
 using namespace MeshCore;
diff --git a/src/Mod/Mesh/App/Edge.cpp b/src/Mod/Mesh/App/Edge.cpp
index 388b4a69b7..d74f146803 100644
--- a/src/Mod/Mesh/App/Edge.cpp
+++ b/src/Mod/Mesh/App/Edge.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
@@ -29,6 +28,7 @@
 #include "Edge.h"
 #include "Mesh.h"
 
+
 using namespace Mesh;
 
 Edge::Edge()
diff --git a/src/Mod/Mesh/App/Edge.h b/src/Mod/Mesh/App/Edge.h
index 46e317ca94..fd55122b54 100644
--- a/src/Mod/Mesh/App/Edge.h
+++ b/src/Mod/Mesh/App/Edge.h
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_EDGE_H
 #define MESH_EDGE_H
 
-#include <Base/Matrix.h>
-#include <Base/Vector3D.h>
 #include <Base/Handle.h>
 
 #include <Mod/Mesh/App/Core/Elements.h>
 
+
 namespace Mesh
 {
 // forward declaration
diff --git a/src/Mod/Mesh/App/EdgePyImp.cpp b/src/Mod/Mesh/App/EdgePyImp.cpp
index 701595297a..bd8db71541 100644
--- a/src/Mod/Mesh/App/EdgePyImp.cpp
+++ b/src/Mod/Mesh/App/EdgePyImp.cpp
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Mesh.h"
-#include "Edge.h"
-#include <Mod/Mesh/App/EdgePy.h>
-#include <Mod/Mesh/App/EdgePy.cpp>
-
 #include <Base/Converter.h>
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+
+#include "Edge.h"
+#include "EdgePy.h"
+#include "EdgePy.cpp"
+
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/App/Exporter.cpp b/src/Mod/Mesh/App/Exporter.cpp
index dd39288442..4d0cbabe9c 100644
--- a/src/Mod/Mesh/App/Exporter.cpp
+++ b/src/Mod/Mesh/App/Exporter.cpp
@@ -28,27 +28,23 @@
 # include <boost/core/ignore_unused.hpp>
 #endif
 
-#include "Exporter.h"
-#include "MeshFeature.h"
-
-#include "Core/Iterator.h"
-#include "Core/IO/Writer3MF.h"
-
-#include <Base/Console.h>
+#include <App/Application.h>
+#include <App/ComplexGeoData.h>
+#include <App/ComplexGeoDataPy.h>
+#include <App/DocumentObject.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
 #include <Base/Tools.h>
-
-#include <App/Application.h>
-#include <App/ComplexGeoData.h>
-#include <App/ComplexGeoDataPy.h>
-#include <App/DocumentObject.h>
-
+#include "Core/Iterator.h"
+#include "Core/IO/Writer3MF.h"
 #include <zipios++/zipoutputstream.h>
 
+#include "Exporter.h"
+
+
 using namespace Mesh;
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Exporter.h b/src/Mod/Mesh/App/Exporter.h
index 367c4a51ff..0d45dbf179 100644
--- a/src/Mod/Mesh/App/Exporter.h
+++ b/src/Mod/Mesh/App/Exporter.h
@@ -24,18 +24,14 @@
 #define MESH_EXPORTER_H
 
 #include <map>
-#include <vector>
 #include <ostream>
-
-#include <Base/Type.h>
-
-#include <App/Property.h>
+#include <vector>
 
 #include "MeshFeature.h"
 #include "Core/MeshIO.h"
-#include "Core/MeshKernel.h"
 #include "Core/IO/Writer3MF.h"
 
+
 namespace Mesh
 {
 
diff --git a/src/Mod/Mesh/App/Facet.cpp b/src/Mod/Mesh/App/Facet.cpp
index d66f4ab45d..ba14408fc0 100644
--- a/src/Mod/Mesh/App/Facet.cpp
+++ b/src/Mod/Mesh/App/Facet.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
@@ -29,6 +28,7 @@
 #include "Facet.h"
 #include "Mesh.h"
 
+
 using namespace Mesh;
 
 Facet::Facet(const MeshCore::MeshFacet& face, const MeshObject* obj, MeshCore::FacetIndex index)
diff --git a/src/Mod/Mesh/App/Facet.h b/src/Mod/Mesh/App/Facet.h
index 5873530119..b149711c00 100644
--- a/src/Mod/Mesh/App/Facet.h
+++ b/src/Mod/Mesh/App/Facet.h
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_FACET_H
 #define MESH_FACET_H
 
-#include <Base/Matrix.h>
-#include <Base/Vector3D.h>
-#include <Base/Handle.h>
+#include "Edge.h"
 
-#include <Mod/Mesh/App/Edge.h>
 
 namespace Mesh
 {
diff --git a/src/Mod/Mesh/App/FacetPyImp.cpp b/src/Mod/Mesh/App/FacetPyImp.cpp
index 899e7a4828..2aab7a77f0 100644
--- a/src/Mod/Mesh/App/FacetPyImp.cpp
+++ b/src/Mod/Mesh/App/FacetPyImp.cpp
@@ -20,17 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Mesh.h"
-#include "Facet.h"
-#include <Mod/Mesh/App/FacetPy.h>
-#include <Mod/Mesh/App/FacetPy.cpp>
-#include <Mod/Mesh/App/EdgePy.h>
-
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
+
+#include "Facet.h"
+#include "FacetPy.h"
+#include "FacetPy.cpp"
+#include "EdgePy.h"
+#include "Mesh.h"
+
 
 using namespace Mesh;