diff --git a/src/Mod/Mesh/App/Core/Elements.cpp b/src/Mod/Mesh/App/Core/Elements.cpp
index 0c60df21da..af4380e5e7 100644
--- a/src/Mod/Mesh/App/Core/Elements.cpp
+++ b/src/Mod/Mesh/App/Core/Elements.cpp
@@ -20,22 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-#include <Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Box3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h>
+#include <Mod/Mesh/App/WildMagic4/Wm4IntrSegment3Plane3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4DistSegment3Triangle3.h>
+#include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h>
 
 #include "Elements.h"
 #include "Algorithm.h"
 #include "tritritest.h"
 #include "Utilities.h"
 
+
 using namespace MeshCore;
 using namespace Wm4;
 
diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h
index 083801b693..fc2673c9a5 100644
--- a/src/Mod/Mesh/App/Core/Elements.h
+++ b/src/Mod/Mesh/App/Core/Elements.h
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_ELEMENTS_H
 #define MESH_ELEMENTS_H
 
-#include <functional>
-#include <vector>
 #include <climits>
 #include <cstring>
+#include <functional>
+#include <vector>
+
+#include <Base/BoundBox.h>
+#include <Base/Matrix.h>
 
 #include "Definitions.h"
 
-#include <Base/BoundBox.h>
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
 
 // Cannot use namespace Base in constructors of MeshPoint
 #ifdef _MSC_VER
diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp
index e3e610abbc..e702621f13 100644
--- a/src/Mod/Mesh/App/Core/Evaluation.cpp
+++ b/src/Mod/Mesh/App/Core/Evaluation.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,21 +27,17 @@
 # include <vector>
 #endif
 
-#include <Mod/Mesh/App/WildMagic4/Wm4Matrix3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
+#include <Base/Matrix.h>
+#include <Base/Sequencer.h>
 
 #include "Evaluation.h"
-#include "Iterator.h"
 #include "Algorithm.h"
 #include "Approximation.h"
-#include "MeshIO.h"
-#include "Helpers.h"
-#include "Grid.h"
-#include "TopoAlgorithm.h"
 #include "Functional.h"
-#include <Base/Matrix.h>
+#include "Grid.h"
+#include "Iterator.h"
+#include "TopoAlgorithm.h"
 
-#include <Base/Sequencer.h>
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h
index ef69b19ea1..67178df649 100644
--- a/src/Mod/Mesh/App/Core/Evaluation.h
+++ b/src/Mod/Mesh/App/Core/Evaluation.h
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_EVALUATION_H
 #define MESH_EVALUATION_H
 
-#include <list>
 #include <cmath>
+#include <list>
 
 #include "MeshKernel.h"
 #include "Visitor.h"
 
+
 namespace MeshCore {
 
 /**
diff --git a/src/Mod/Mesh/App/Core/Functional.h b/src/Mod/Mesh/App/Core/Functional.h
index f40bc907e6..cf71a8dd09 100644
--- a/src/Mod/Mesh/App/Core/Functional.h
+++ b/src/Mod/Mesh/App/Core/Functional.h
@@ -20,14 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_FUNCTIONAL_H
 #define MESH_FUNCTIONAL_H
 
 #include <algorithm>
 #include <QtConcurrentRun>
 #include <QFuture>
-#include <QThread>
+
 
 namespace MeshCore
 {
diff --git a/src/Mod/Mesh/App/Core/Grid.cpp b/src/Mod/Mesh/App/Core/Grid.cpp
index 7515ed6328..f59b806184 100644
--- a/src/Mod/Mesh/App/Core/Grid.cpp
+++ b/src/Mod/Mesh/App/Core/Grid.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,11 +27,10 @@
 #endif
 
 #include "Grid.h"
-#include "Iterator.h"
-
-#include "MeshKernel.h"
 #include "Algorithm.h"
-#include "Tools.h"
+#include "Iterator.h"
+#include "MeshKernel.h"
+
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Helpers.h b/src/Mod/Mesh/App/Core/Helpers.h
index d65781f8da..b5dbc4390b 100644
--- a/src/Mod/Mesh/App/Core/Helpers.h
+++ b/src/Mod/Mesh/App/Core/Helpers.h
@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_HELPERS_H
 #define MESH_HELPERS_H
 
 #include "Elements.h"
 
-#include <Base/Vector3D.h>
 
 namespace MeshCore {
 
-
 /**
  * Helper class for points.
  */
diff --git a/src/Mod/Mesh/App/Core/Info.cpp b/src/Mod/Mesh/App/Core/Info.cpp
index 02577e4f9c..a7f80fe47b 100644
--- a/src/Mod/Mesh/App/Core/Info.cpp
+++ b/src/Mod/Mesh/App/Core/Info.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -31,10 +30,8 @@
 #endif
 
 #include "Info.h"
-#include "Algorithm.h"
 #include "Iterator.h"
 
-#include <Base/Exception.h>
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Iterator.h b/src/Mod/Mesh/App/Core/Iterator.h
index eb0fdaa293..d251399d87 100644
--- a/src/Mod/Mesh/App/Core/Iterator.h
+++ b/src/Mod/Mesh/App/Core/Iterator.h
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_ITERATOR_H
 #define MESH_ITERATOR_H
 
-#include "MeshKernel.h"
-#include "Elements.h"
-#include <Base/Matrix.h>
-#include <Base/Vector3D.h>
 #include <climits>
 
+#include <Base/Matrix.h>
+
+#include "MeshKernel.h"
+
+
 namespace MeshCore {
 
 class MeshKernel;
diff --git a/src/Mod/Mesh/App/Core/KDTree.cpp b/src/Mod/Mesh/App/Core/KDTree.cpp
index b957528b63..f4857b371f 100644
--- a/src/Mod/Mesh/App/Core/KDTree.cpp
+++ b/src/Mod/Mesh/App/Core/KDTree.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifdef _MSC_VER
 # pragma warning(disable : 4396)
 #endif
-#ifndef _PreComp_
-#endif
 
-#include "KDTree.h"
 #include <kdtree++/kdtree.hpp>
+#include "KDTree.h"
+
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp
index f4d3cd22b2..531e47dccb 100644
--- a/src/Mod/Mesh/App/Core/MeshIO.cpp
+++ b/src/Mod/Mesh/App/Core/MeshIO.cpp
@@ -20,44 +20,45 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include "Definitions.h"
-#include "Iterator.h"
 
-#include "MeshKernel.h"
-#include "MeshIO.h"
-#include "Algorithm.h"
-#include "Builder.h"
-#include "Degeneration.h"
-#include "IO/Reader3MF.h"
-#include "IO/ReaderOBJ.h"
-#include "IO/Writer3MF.h"
-#include "IO/WriterOBJ.h"
+#ifndef _PreComp_
+# include <algorithm>
+# include <cmath>
+# include <iomanip>
+# include <sstream>
+# include <string_view>
+#endif
+
+#include <boost/algorithm/string.hpp>
+#include <boost/convert.hpp>
+#include <boost/convert/spirit.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
 
 #include <Base/Builder3D.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
-#include <Base/Reader.h>
-#include <Base/Writer.h>
 #include <Base/FileInfo.h>
+#include <Base/Placement.h>
+#include <Base/Reader.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
-#include <Base/Placement.h>
 #include <Base/Tools.h>
+#include <Base/Writer.h>
+#include "IO/Reader3MF.h"
+#include "IO/ReaderOBJ.h"
+#include "IO/Writer3MF.h"
+#include "IO/WriterOBJ.h"
 #include <zipios++/gzipoutputstream.h>
 #include <zipios++/zipoutputstream.h>
 
-#include <cmath>
-#include <sstream>
-#include <iomanip>
-#include <algorithm>
-#include <string_view>
-#include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/convert.hpp>
-#include <boost/convert/spirit.hpp>
+#include "MeshIO.h"
+#include "Builder.h"
+#include "Definitions.h"
+#include "Degeneration.h"
+#include "Iterator.h"
+#include "MeshKernel.h"
 
 
 using namespace MeshCore;
diff --git a/src/Mod/Mesh/App/Core/MeshIO.h b/src/Mod/Mesh/App/Core/MeshIO.h
index b2edf2ddef..cb8a926fb3 100644
--- a/src/Mod/Mesh/App/Core/MeshIO.h
+++ b/src/Mod/Mesh/App/Core/MeshIO.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_IO_H
 #define MESH_IO_H
 
-#include "MeshKernel.h"
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
 #include <App/Material.h>
+#include <Base/Matrix.h>
+
+#include "MeshKernel.h"
+
 
 namespace Base {
 class XMLReader;
diff --git a/src/Mod/Mesh/App/Core/MeshKernel.cpp b/src/Mod/Mesh/App/Core/MeshKernel.cpp
index de6b80b2a1..1be0c06ef5 100644
--- a/src/Mod/Mesh/App/Core/MeshKernel.cpp
+++ b/src/Mod/Mesh/App/Core/MeshKernel.cpp
@@ -20,30 +20,27 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
-# include <stdexcept>
 # include <map>
 # include <queue>
+# include <stdexcept>
 #endif
 
 #include <Base/Exception.h>
-#include <Base/Sequencer.h>
 #include <Base/Stream.h>
 #include <Base/Swap.h>
 
-#include "Algorithm.h"
-#include "Approximation.h"
-#include "Helpers.h"
 #include "MeshKernel.h"
-#include "Iterator.h"
-#include "Evaluation.h"
+#include "Algorithm.h"
 #include "Builder.h"
-#include "Smoothing.h"
+#include "Evaluation.h"
+#include "Iterator.h"
 #include "MeshIO.h"
+#include "Smoothing.h"
+
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/MeshKernel.h b/src/Mod/Mesh/App/Core/MeshKernel.h
index e82c7b8dcb..45b6c58bda 100644
--- a/src/Mod/Mesh/App/Core/MeshKernel.h
+++ b/src/Mod/Mesh/App/Core/MeshKernel.h
@@ -20,19 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_KERNEL_H
 #define MESH_KERNEL_H
 
 #include <cassert>
 #include <iosfwd>
 
-#include "Elements.h"
+#include <Base/BoundBox.h>
+#include <Base/Matrix.h>
+
 #include "Helpers.h"
 
-#include <Base/BoundBox.h>
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
 
 namespace Base{
   class Polygon2d;