diff --git a/src/Mod/Mesh/App/Core/Algorithm.cpp b/src/Mod/Mesh/App/Core/Algorithm.cpp
index 8a5c6ec52c..429783c7ac 100644
--- a/src/Mod/Mesh/App/Core/Algorithm.cpp
+++ b/src/Mod/Mesh/App/Core/Algorithm.cpp
@@ -20,13 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
 #endif
 
+#include <Base/Console.h>
+#include <Base/Sequencer.h>
+
 #include "Algorithm.h"
 #include "Approximation.h"
 #include "Elements.h"
@@ -34,8 +36,6 @@
 #include "Grid.h"
 #include "Triangulation.h"
 
-#include <Base/Console.h>
-#include <Base/Sequencer.h>
 
 using namespace MeshCore;
 using Base::BoundBox3f;
diff --git a/src/Mod/Mesh/App/Core/Algorithm.h b/src/Mod/Mesh/App/Core/Algorithm.h
index 9a5f07dbcc..0cc8a63ac6 100644
--- a/src/Mod/Mesh/App/Core/Algorithm.h
+++ b/src/Mod/Mesh/App/Core/Algorithm.h
@@ -20,17 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHALGORITHM_H
 #define MESHALGORITHM_H
 
+#include <map>
 #include <set>
 #include <vector>
-#include <map>
 
-#include "MeshKernel.h"
 #include "Elements.h"
-#include <Base/Vector3D.h>
+#include "MeshKernel.h"
+
 
 // forward declarations
 
diff --git a/src/Mod/Mesh/App/Core/Approximation.cpp b/src/Mod/Mesh/App/Core/Approximation.cpp
index b9c7431ef4..e4f37db717 100644
--- a/src/Mod/Mesh/App/Core/Approximation.cpp
+++ b/src/Mod/Mesh/App/Core/Approximation.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -29,32 +28,27 @@
 # include <iterator>
 #endif
 
-#include "Approximation.h"
-#include "Elements.h"
-#include "Utilities.h"
-#include "CylinderFit.h"
-#include "SphereFit.h"
-
 #include <Base/BoundBox.h>
 #include <Base/Console.h>
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4ApprPlaneFit3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4DistVector3Plane3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Matrix3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4ApprPolyFit3.h>
+#include <Mod/Mesh/App/WildMagic4/Wm4ApprQuadraticFit3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4ApprSphereFit3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Sphere3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4ApprCylinderFit3.h>
 
 //#define FC_USE_EIGEN
 #include <Eigen/QR>
 #include <Eigen/Eigen>
-#include <unsupported/Eigen/NonLinearOptimization>
 #ifdef FC_USE_EIGEN
-#include <Eigen/Eigenvalues>
+# include <Eigen/Eigenvalues>
 #endif
 
+#include "Approximation.h"
+#include "CylinderFit.h"
+#include "Elements.h"
+#include "SphereFit.h"
+#include "Utilities.h"
+
+
 using namespace MeshCore;
 
 Approximation::Approximation()
diff --git a/src/Mod/Mesh/App/Core/Approximation.h b/src/Mod/Mesh/App/Core/Approximation.h
index 537f0b9870..974eef92ba 100644
--- a/src/Mod/Mesh/App/Core/Approximation.h
+++ b/src/Mod/Mesh/App/Core/Approximation.h
@@ -20,25 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_APPROXIMATION_H
 #define MESH_APPROXIMATION_H
 
-#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4QuadricSurface.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4Eigen.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4ImplicitSurface.h>
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
 
-#include <Base/Vector3D.h>
-#include <Base/Matrix.h>
 #include <Base/BoundBox.h>
+#include <Base/Matrix.h>
+#include <Base/Vector3D.h>
+
 
 namespace Wm4
 {
diff --git a/src/Mod/Mesh/App/Core/Builder.cpp b/src/Mod/Mesh/App/Core/Builder.cpp
index 7ef68e4fbd..18101c2e7a 100644
--- a/src/Mod/Mesh/App/Core/Builder.cpp
+++ b/src/Mod/Mesh/App/Core/Builder.cpp
@@ -20,21 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
 #endif
 
-#include <Base/Sequencer.h>
 #include <Base/Exception.h>
+#include <Base/Sequencer.h>
 
 #include "Builder.h"
-#include "MeshKernel.h"
 #include "Functional.h"
+#include "MeshKernel.h"
 #include <QVector>
 
+
 using namespace MeshCore;
 
 
diff --git a/src/Mod/Mesh/App/Core/Builder.h b/src/Mod/Mesh/App/Core/Builder.h
index 6aec23a7e9..a525772f8e 100644
--- a/src/Mod/Mesh/App/Core/Builder.h
+++ b/src/Mod/Mesh/App/Core/Builder.h
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "MeshKernel.h"
-#include <Base/Vector3D.h>
+
 
 namespace Base {
 class SequencerLauncher;
diff --git a/src/Mod/Mesh/App/Core/Curvature.cpp b/src/Mod/Mesh/App/Core/Curvature.cpp
index 1f9c632eb3..558dee633e 100644
--- a/src/Mod/Mesh/App/Core/Curvature.cpp
+++ b/src/Mod/Mesh/App/Core/Curvature.cpp
@@ -30,22 +30,22 @@
 #include <QFutureWatcher>
 #include <QtConcurrentMap>
 
+#include <Base/Sequencer.h>
+#include <Base/Tools.h>
+
 //#define OPTIMIZE_CURVATURE
 #ifdef OPTIMIZE_CURVATURE
-#include <Eigen/Eigenvalues>
+# include <Eigen/Eigenvalues>
 #else
-#include <Mod/Mesh/App/WildMagic4/Wm4Vector3.h>
-#include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
+# include <Mod/Mesh/App/WildMagic4/Wm4MeshCurvature.h>
 #endif
 
 #include "Curvature.h"
-#include "Algorithm.h"
 #include "Approximation.h"
-#include "MeshKernel.h"
 #include "Iterator.h"
+#include "MeshKernel.h"
 #include "Tools.h"
-#include <Base/Sequencer.h>
-#include <Base/Tools.h>
+
 
 using namespace MeshCore;
 namespace sp = std::placeholders;
diff --git a/src/Mod/Mesh/App/Core/CylinderFit.cpp b/src/Mod/Mesh/App/Core/CylinderFit.cpp
index e4e9b967e4..620afc73aa 100644
--- a/src/Mod/Mesh/App/Core/CylinderFit.cpp
+++ b/src/Mod/Mesh/App/Core/CylinderFit.cpp
@@ -61,10 +61,12 @@
 # include <iterator>
 #endif
 
-#include "CylinderFit.h"
 #include <Base/Console.h>
 #include <Mod/Mesh/App/WildMagic4/Wm4ApprLineFit3.h>
 
+#include "CylinderFit.h"
+
+
 using namespace MeshCoreFit;
 
 CylinderFit::CylinderFit()
diff --git a/src/Mod/Mesh/App/Core/CylinderFit.h b/src/Mod/Mesh/App/Core/CylinderFit.h
index 1a7fb895bd..2127504aa0 100644
--- a/src/Mod/Mesh/App/Core/CylinderFit.h
+++ b/src/Mod/Mesh/App/Core/CylinderFit.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_CYLINDER_FIT_H
 #define MESH_CYLINDER_FIT_H
 
-#include "Approximation.h"
 #include <Eigen/Eigenvalues>
 
+#include "Approximation.h"
+
+
 // -------------------------------------------------------------------------------
 namespace MeshCoreFit {
 
diff --git a/src/Mod/Mesh/App/Core/Decimation.cpp b/src/Mod/Mesh/App/Core/Decimation.cpp
index b719119c2b..e62e047e0a 100644
--- a/src/Mod/Mesh/App/Core/Decimation.cpp
+++ b/src/Mod/Mesh/App/Core/Decimation.cpp
@@ -20,17 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "Decimation.h"
 #include "MeshKernel.h"
-#include "Algorithm.h"
-#include "Iterator.h"
-#include "TopoAlgorithm.h"
-#include <Base/Tools.h>
 #include "Simplify.h"
 
 
diff --git a/src/Mod/Mesh/App/Core/Definitions.cpp b/src/Mod/Mesh/App/Core/Definitions.cpp
index ebbdec2b6d..65f9d32a42 100644
--- a/src/Mod/Mesh/App/Core/Definitions.cpp
+++ b/src/Mod/Mesh/App/Core/Definitions.cpp
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include <cmath>
 
-#include "Definitions.h"
 #include <Base/Tools.h>
+#include "Definitions.h"
+
 
 namespace MeshCore {
 
diff --git a/src/Mod/Mesh/App/Core/Definitions.h b/src/Mod/Mesh/App/Core/Definitions.h
index 7ea30444c1..71c4ca6b28 100644
--- a/src/Mod/Mesh/App/Core/Definitions.h
+++ b/src/Mod/Mesh/App/Core/Definitions.h
@@ -20,27 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_DEFINITIONS_H
 #define MESH_DEFINITIONS_H
 
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 
 #include <climits>
 
 // default values
-#define MESH_MIN_PT_DIST           1.0e-6f
-#define MESH_MIN_EDGE_LEN          1.0e-3f
-#define MESH_MIN_EDGE_ANGLE        2.0
-#define MESH_REMOVE_MIN_LEN        true
-#define MESH_REMOVE_G3_EDGES       true
+#define MESH_MIN_PT_DIST     1.0e-6f
+#define MESH_MIN_EDGE_LEN    1.0e-3f
+#define MESH_MIN_EDGE_ANGLE  2.0
+#define MESH_REMOVE_MIN_LEN  true
+#define MESH_REMOVE_G3_EDGES true
 
 /*
  * general constant definitions
  */
-#define FLOAT_EPS   1.0e-4f
+#define FLOAT_EPS 1.0e-4f
 
 #ifndef  FLOAT_MAX
 # define FLOAT_MAX 1e30f
diff --git a/src/Mod/Mesh/App/Core/Degeneration.cpp b/src/Mod/Mesh/App/Core/Degeneration.cpp
index acf787655e..54e5a4b107 100644
--- a/src/Mod/Mesh/App/Core/Degeneration.cpp
+++ b/src/Mod/Mesh/App/Core/Degeneration.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
@@ -29,19 +28,14 @@
 # include <queue>
 #endif
 
+#include <boost/math/special_functions/fpclassify.hpp>
+
 #include "Degeneration.h"
-#include "Definitions.h"
-#include "Iterator.h"
-#include "Helpers.h"
-#include "MeshKernel.h"
-#include "Algorithm.h"
-#include "Info.h"
 #include "Grid.h"
+#include "Iterator.h"
 #include "TopoAlgorithm.h"
 #include "Triangulation.h"
 
-#include <boost/math/special_functions/fpclassify.hpp>
-#include <Base/Sequencer.h>
 
 using namespace MeshCore;
 
diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h
index 89d29e25c2..de4e7e4033 100644
--- a/src/Mod/Mesh/App/Core/Degeneration.h
+++ b/src/Mod/Mesh/App/Core/Degeneration.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_DEGENERATION_H
 #define MESH_DEGENERATION_H
 
@@ -28,8 +27,9 @@
 #include <string>
 #include <vector>
 
-#include "Evaluation.h"
 #include "Definitions.h"
+#include "Evaluation.h"
+
 
 namespace MeshCore {