diff --git a/src/Mod/Mesh/App/Core/Projection.cpp b/src/Mod/Mesh/App/Core/Projection.cpp
index 0d6259c46d..dec77fff5e 100644
--- a/src/Mod/Mesh/App/Core/Projection.cpp
+++ b/src/Mod/Mesh/App/Core/Projection.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
@@ -28,19 +27,13 @@
 #endif
 
 #include "Projection.h"
-#include "MeshKernel.h"
-#include "Iterator.h"
-#include "Algorithm.h"
 #include "Grid.h"
-
-#include <Base/Exception.h>
-#include <Base/Console.h>
-#include <Base/Sequencer.h>
+#include "Iterator.h"
+#include "MeshKernel.h"
 
 
 using namespace MeshCore;
 
-
 // ------------------------------------------------------------------------
 
 MeshProjection::MeshProjection(const MeshKernel& mesh)
diff --git a/src/Mod/Mesh/App/Core/Projection.h b/src/Mod/Mesh/App/Core/Projection.h
index 0a76446f36..64080291af 100644
--- a/src/Mod/Mesh/App/Core/Projection.h
+++ b/src/Mod/Mesh/App/Core/Projection.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_PROJECTION_H
 #define MESH_PROJECTION_H
 
 #include <vector>
 #include <Base/BoundBox.h>
-#include <Base/Vector3D.h>
-#include <Mod/Mesh/App/Core/Elements.h>
+
+#include "Elements.h"
+
 
 using Base::Vector3f;
 
diff --git a/src/Mod/Mesh/App/Core/Segmentation.h b/src/Mod/Mesh/App/Core/Segmentation.h
index 012a7cbcce..af8fd3d054 100644
--- a/src/Mod/Mesh/App/Core/Segmentation.h
+++ b/src/Mod/Mesh/App/Core/Segmentation.h
@@ -23,11 +23,13 @@
 #ifndef MESHCORE_SEGMENTATION_H
 #define MESHCORE_SEGMENTATION_H
 
-#include "MeshKernel.h"
-#include "Curvature.h"
-#include "Visitor.h"
-#include <vector>
 #include <memory>
+#include <vector>
+
+#include "Curvature.h"
+#include "MeshKernel.h"
+#include "Visitor.h"
+
 
 namespace MeshCore {
 
diff --git a/src/Mod/Mesh/App/Core/SetOperations.cpp b/src/Mod/Mesh/App/Core/SetOperations.cpp
index 6a5dff594a..ea03004680 100644
--- a/src/Mod/Mesh/App/Core/SetOperations.cpp
+++ b/src/Mod/Mesh/App/Core/SetOperations.cpp
@@ -20,31 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-
 #ifndef _PreComp_
+# include <fstream>
 # include <ios>
 #endif
 
-#include <fstream>
+#include <Base/Builder3D.h>
+#include <Base/Sequencer.h>
+
 #include "SetOperations.h"
 #include "Algorithm.h"
-#include "Elements.h"
-#include "Iterator.h"
-#include "Grid.h"
-#include "MeshIO.h"
-#include "Visitor.h"
 #include "Builder.h"
-#include "Grid.h"
-#include "Evaluation.h"
 #include "Definitions.h"
+#include "Elements.h"
+#include "Grid.h"
+#include "Iterator.h"
 #include "Triangulation.h"
+#include "Visitor.h"
 
-#include <Base/Sequencer.h>
-#include <Base/Builder3D.h>
-#include <Base/Tools2D.h>
 
 using namespace Base;
 using namespace MeshCore;
diff --git a/src/Mod/Mesh/App/Core/SetOperations.h b/src/Mod/Mesh/App/Core/SetOperations.h
index 155a6f2177..ac27e1be36 100644
--- a/src/Mod/Mesh/App/Core/SetOperations.h
+++ b/src/Mod/Mesh/App/Core/SetOperations.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_SETOPERATIONS_H
 #define MESH_SETOPERATIONS_H
 
@@ -28,12 +27,12 @@
 #include <map>
 #include <set>
 
-#include "MeshKernel.h"
-#include "Elements.h"
+#include <Base/Builder3D.h>
+
 #include "Iterator.h"
+#include "MeshKernel.h"
 #include "Visitor.h"
 
-#include <Base/Builder3D.h>
 
 // forward declarations
 
diff --git a/src/Mod/Mesh/App/Core/Simplify.h b/src/Mod/Mesh/App/Core/Simplify.h
index 3ae345a4f4..05881fab7c 100644
--- a/src/Mod/Mesh/App/Core/Simplify.h
+++ b/src/Mod/Mesh/App/Core/Simplify.h
@@ -11,7 +11,7 @@
 // * Remove macros loop,i,j,k
 
 #include <vector>
-#include <Base/Vector3D.h>
+
 
 #ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES
diff --git a/src/Mod/Mesh/App/Core/Smoothing.cpp b/src/Mod/Mesh/App/Core/Smoothing.cpp
index 05a0fa5dc2..d18703082f 100644
--- a/src/Mod/Mesh/App/Core/Smoothing.cpp
+++ b/src/Mod/Mesh/App/Core/Smoothing.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
+
+#include <Base/Tools.h>
 
 #include "Smoothing.h"
-#include "MeshKernel.h"
 #include "Algorithm.h"
-#include "Elements.h"
-#include "Iterator.h"
 #include "Approximation.h"
-#include <Base/Tools.h>
+#include "Iterator.h"
+#include "MeshKernel.h"
 
 
 using namespace MeshCore;
diff --git a/src/Mod/Mesh/App/Core/Smoothing.h b/src/Mod/Mesh/App/Core/Smoothing.h
index fe784c5797..f3b0acdf3b 100644
--- a/src/Mod/Mesh/App/Core/Smoothing.h
+++ b/src/Mod/Mesh/App/Core/Smoothing.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_SMOOTHING_H
 #define MESH_SMOOTHING_H
 
 #include <vector>
+
 #include "Definitions.h"
 
+
 namespace MeshCore
 {
 class MeshKernel;
diff --git a/src/Mod/Mesh/App/Core/SphereFit.cpp b/src/Mod/Mesh/App/Core/SphereFit.cpp
index 9b54cb007a..6e0cf04f80 100644
--- a/src/Mod/Mesh/App/Core/SphereFit.cpp
+++ b/src/Mod/Mesh/App/Core/SphereFit.cpp
@@ -29,19 +29,18 @@
 #endif
 
 #include "SphereFit.h"
-#include <Base/Console.h>
+
 
 using namespace MeshCoreFit;
 
 SphereFit::SphereFit()
-  : _vCenter(0,0,0)
-  , _dRadius(0)
-  , _numIter(0)
-  , _posConvLimit(0.0001)
-  , _vConvLimit(0.001)
-  , _maxIter(50)
-{
-}
+  : _vCenter(0, 0, 0),
+	_dRadius(0),
+	_numIter(0),
+	_posConvLimit(0.0001),
+	_vConvLimit(0.001),
+	_maxIter(50)
+{}
 
 SphereFit::~SphereFit()
 {
diff --git a/src/Mod/Mesh/App/Core/SphereFit.h b/src/Mod/Mesh/App/Core/SphereFit.h
index 8d24f96083..d42e23077a 100644
--- a/src/Mod/Mesh/App/Core/SphereFit.h
+++ b/src/Mod/Mesh/App/Core/SphereFit.h
@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_SPHERE_FIT_H
 #define MESH_SPHERE_FIT_H
 
-#include "Approximation.h"
 #include <Eigen/Eigenvalues>
+#include "Approximation.h"
+
 
 // -------------------------------------------------------------------------------
 namespace MeshCoreFit {
diff --git a/src/Mod/Mesh/App/Core/Tools.cpp b/src/Mod/Mesh/App/Core/Tools.cpp
index 3be59ebb6f..9dfa85e44d 100644
--- a/src/Mod/Mesh/App/Core/Tools.cpp
+++ b/src/Mod/Mesh/App/Core/Tools.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -28,7 +27,6 @@
 #endif
 
 #include "Tools.h"
-#include "Iterator.h"
 
 
 using namespace MeshCore;
diff --git a/src/Mod/Mesh/App/Core/Tools.h b/src/Mod/Mesh/App/Core/Tools.h
index f092616fff..3de8c9a633 100644
--- a/src/Mod/Mesh/App/Core/Tools.h
+++ b/src/Mod/Mesh/App/Core/Tools.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_TOOLS_H
 #define MESH_TOOLS_H
 
@@ -28,11 +27,11 @@
 
 #include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Triangle3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4Sphere3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Triangle3.h>
 
-#include "MeshKernel.h"
 #include "Algorithm.h"
 #include "Iterator.h"
+#include "MeshKernel.h"
+
 
 namespace MeshCore {
 
diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
index 1dae82e2df..4ebc1eb708 100644
--- a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
+++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
@@ -20,26 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
-# include <utility>
 # include <queue>
+# include <utility>
 #endif
 
+#include <Base/Console.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
 
 #include "TopoAlgorithm.h"
+#include "Evaluation.h"
 #include "Iterator.h"
 #include "MeshKernel.h"
-#include "Algorithm.h"
-#include "Evaluation.h"
 #include "Triangulation.h"
-#include "Definitions.h"
-#include <Base/Console.h>
+
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.h b/src/Mod/Mesh/App/Core/TopoAlgorithm.h
index ab8e3c4224..101f6e83fc 100644
--- a/src/Mod/Mesh/App/Core/TopoAlgorithm.h
+++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.h
@@ -20,22 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_TOPOALGORITHM_H
 #define MESH_TOPOALGORITHM_H
 
 #include <map>
 #include <vector>
 
-#include "Definitions.h"
-#include "Iterator.h"
-#include "MeshKernel.h"
-#include "Elements.h"
-#include "Visitor.h"
 #include "Algorithm.h"
+#include "Elements.h"
+#include "MeshKernel.h"
 
-#include <Base/Vector3D.h>
-#include <Base/Sequencer.h>
 
 namespace MeshCore {
 class AbstractPolygonTriangulator;
diff --git a/src/Mod/Mesh/App/Core/Triangulation.cpp b/src/Mod/Mesh/App/Core/Triangulation.cpp
index f6bfd1170c..01d281034d 100644
--- a/src/Mod/Mesh/App/Core/Triangulation.cpp
+++ b/src/Mod/Mesh/App/Core/Triangulation.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <queue>
@@ -28,13 +27,12 @@
 
 #include <Base/Console.h>
 #include <Base/Exception.h>
+#include <Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h>
+
 #include "Triangulation.h"
 #include "Approximation.h"
-#include "Algorithm.h"
 #include "MeshKernel.h"
 
-#include <Mod/Mesh/App/WildMagic4/Wm4Delaunay2.h>
-
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Triangulation.h b/src/Mod/Mesh/App/Core/Triangulation.h
index 1b2edcc022..9a6b3abd66 100644
--- a/src/Mod/Mesh/App/Core/Triangulation.h
+++ b/src/Mod/Mesh/App/Core/Triangulation.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_TRIANGULATION_H
 #define MESH_TRIANGULATION_H
 
 #include "Elements.h"
-#include <Base/Vector3D.h>
+
 
 namespace MeshCore
 {
diff --git a/src/Mod/Mesh/App/Core/Trim.cpp b/src/Mod/Mesh/App/Core/Trim.cpp
index 8420e5907c..a946adcd93 100644
--- a/src/Mod/Mesh/App/Core/Trim.cpp
+++ b/src/Mod/Mesh/App/Core/Trim.cpp
@@ -21,12 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <algorithm>
+#ifndef _PreComp_
+# include <algorithm>
+#endif
+
+#include <Base/Sequencer.h>
 
 #include "Trim.h"
 #include "Grid.h"
 #include "Iterator.h"
-#include <Base/Sequencer.h>
+
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Trim.h b/src/Mod/Mesh/App/Core/Trim.h
index 0dcce77df6..caac18044c 100644
--- a/src/Mod/Mesh/App/Core/Trim.h
+++ b/src/Mod/Mesh/App/Core/Trim.h
@@ -23,11 +23,11 @@
 #ifndef MESHTRIM_H
 #define MESHTRIM_H
 
-#include <Mod/Mesh/App/Core/Elements.h>
-#include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Base/Tools2D.h>
 #include <Base/ViewProj.h>
 
+#include "MeshKernel.h"
+
+
 namespace MeshCore {
 
 /**
diff --git a/src/Mod/Mesh/App/Core/TrimByPlane.cpp b/src/Mod/Mesh/App/Core/TrimByPlane.cpp
index d785b5772b..df991df20b 100644
--- a/src/Mod/Mesh/App/Core/TrimByPlane.cpp
+++ b/src/Mod/Mesh/App/Core/TrimByPlane.cpp
@@ -21,12 +21,15 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <algorithm>
+#ifndef _PreComp_
+# include <algorithm>
+#endif
 
 #include "TrimByPlane.h"
 #include "Grid.h"
 #include "Iterator.h"
 
+
 using namespace MeshCore;
 
 MeshTrimByPlane::MeshTrimByPlane(MeshKernel &rclM)
diff --git a/src/Mod/Mesh/App/Core/TrimByPlane.h b/src/Mod/Mesh/App/Core/TrimByPlane.h
index 642336de7e..6774e5c8fd 100644
--- a/src/Mod/Mesh/App/Core/TrimByPlane.h
+++ b/src/Mod/Mesh/App/Core/TrimByPlane.h
@@ -23,8 +23,8 @@
 #ifndef MESHTRIM_BY_PLANE_H
 #define MESHTRIM_BY_PLANE_H
 
-#include <Mod/Mesh/App/Core/Elements.h>
-#include <Mod/Mesh/App/Core/MeshKernel.h>
+#include "MeshKernel.h"
+
 
 namespace MeshCore {
 
diff --git a/src/Mod/Mesh/App/Core/Utilities.h b/src/Mod/Mesh/App/Core/Utilities.h
index 712ffeb6a6..305e7c0b41 100644
--- a/src/Mod/Mesh/App/Core/Utilities.h
+++ b/src/Mod/Mesh/App/Core/Utilities.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_UTILITIES_H
 #define MESH_UTILITIES_H
 
 #include <Base/Converter.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
 
+
 namespace Base {
 // Specialization for Wm4::Vector3d
 template <>
diff --git a/src/Mod/Mesh/App/Core/Visitor.cpp b/src/Mod/Mesh/App/Core/Visitor.cpp
index f2984672ce..b807f739ce 100644
--- a/src/Mod/Mesh/App/Core/Visitor.cpp
+++ b/src/Mod/Mesh/App/Core/Visitor.cpp
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "MeshKernel.h"
+#include "MeshKernel.h" // must be before Visitor.h
 #include "Visitor.h"
 #include "Algorithm.h"
 #include "Approximation.h"
 
+
 using namespace MeshCore;
 
 
diff --git a/src/Mod/Mesh/App/Core/Visitor.h b/src/Mod/Mesh/App/Core/Visitor.h
index d90f80b3c9..2a9596f2e5 100644
--- a/src/Mod/Mesh/App/Core/Visitor.h
+++ b/src/Mod/Mesh/App/Core/Visitor.h
@@ -20,14 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef VISITOR_H
 #define VISITOR_H
 
 #include <vector>
-#include <Base/Vector3D.h>
 #include <Mod/Mesh/MeshGlobal.h>
 
+
 namespace MeshCore {
 
 class MeshFacet;
diff --git a/src/Mod/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h
index 6b6f1a887b..85cbcde7d5 100644
--- a/src/Mod/Mesh/App/PreCompiled.h
+++ b/src/Mod/Mesh/App/PreCompiled.h
@@ -43,6 +43,7 @@
 #include <cmath>
 #include <cfloat>
 #include <fcntl.h>
+#include <fstream>
 #include <ios>
 
 #ifdef FC_USE_GTS