diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp
index 2e96e210ba..ac1daf0dd6 100644
--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp
+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp
@@ -20,47 +20,40 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Inventor/SoDB.h>
 # include <Inventor/SoInput.h>
-# include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/annex/ForeignFiles/SoSTLFileKit.h>
+# include <Inventor/nodes/SoSeparator.h>
+
 # include <QApplication>
 #endif
 
-#include <Base/Interpreter.h>
 #include <Base/Console.h>
+#include <Base/Interpreter.h>
 #include <Base/PyObjectBase.h>
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
 
-#include <Mod/Mesh/App/MeshProperties.h>
-#include <Mod/Mesh/App/Exporter.h>
-
-#include "images.h"
 #include "DlgEvaluateMeshImp.h"
-#include "PropertyEditorMesh.h"
-#include "DlgSettingsMeshView.h"
 #include "DlgSettingsImportExportImp.h"
-#include "SoFCMeshObject.h"
+#include "DlgSettingsMeshView.h"
+#include "images.h"
+#include "PropertyEditorMesh.h"
 #include "SoFCIndexedFaceSet.h"
+#include "SoFCMeshObject.h"
 #include "SoPolygon.h"
 #include "ThumbnailExtension.h"
 #include "ViewProvider.h"
-#include "ViewProviderMeshFaceSet.h"
 #include "ViewProviderCurvature.h"
+#include "ViewProviderDefects.h"
+#include "ViewProviderMeshFaceSet.h"
+#include "ViewProviderPython.h"
 #include "ViewProviderTransform.h"
 #include "ViewProviderTransformDemolding.h"
-#include "ViewProviderDefects.h"
-#include "ViewProviderPython.h"
 #include "Workbench.h"
 
 
diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index 81a8abe0e9..12ebb7458c 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -20,66 +20,59 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # ifdef FC_OS_WIN32
-# include <windows.h>
+#  include <windows.h>
 # endif
+# include <map>
+
 # include <QApplication>
-# include <qaction.h>
-# include <qdir.h>
 # include <qfileinfo.h>
 # include <qinputdialog.h>
 # include <qmessagebox.h>
 # include <QPointer>
 # include <qstringlist.h>
-//# include <gts.h>
-# include <map>
 #endif
 
 #ifndef __InventorAll__
 # include <Gui/InventorAll.h>
 #endif
 
-#include <Mod/Mesh/App/Core/Smoothing.h>
-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/FeatureMeshCurvature.h>
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Interpreter.h>
-#include <Base/Tools.h>
-#include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
 #include <App/DocumentObject.h>
+#include <Base/Console.h>
+#include <Base/Tools.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/FileDialog.h>
-#include <Gui/Selection.h>
+#include <Gui/MainWindow.h>
 #include <Gui/MouseSelection.h>
-#include <Gui/ViewProvider.h>
+#include <Gui/NavigationStyle.h>
+#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <Gui/NavigationStyle.h>
 #include <Gui/WaitCursor.h>
-#include <CXX/Objects.hxx>
 
+#include <Mod/Mesh/App/FeatureMeshCurvature.h>
+#include <Mod/Mesh/App/MeshFeature.h>
+#include <Mod/Mesh/App/Core/Smoothing.h>
+
+#include "DlgDecimating.h"
 #include "DlgEvaluateMeshImp.h"
 #include "DlgRegularSolidImp.h"
-#include "RemoveComponents.h"
-#include "RemeshGmsh.h"
 #include "DlgSmoothing.h"
-#include "DlgDecimating.h"
-#include "ViewProviderMeshFaceSet.h"
-#include "ViewProviderCurvature.h"
 #include "MeshEditor.h"
+#include "RemeshGmsh.h"
+#include "RemoveComponents.h"
 #include "Segmentation.h"
 #include "SegmentationBestFit.h"
+#include "ViewProviderCurvature.h"
+#include "ViewProviderMeshFaceSet.h"
+
 
 using namespace Mesh;
 
diff --git a/src/Mod/Mesh/Gui/DlgDecimating.cpp b/src/Mod/Mesh/Gui/DlgDecimating.cpp
index 2606242a29..8466ef4c42 100644
--- a/src/Mod/Mesh/Gui/DlgDecimating.cpp
+++ b/src/Mod/Mesh/Gui/DlgDecimating.cpp
@@ -21,13 +21,15 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
+#include <Gui/Command.h>
+#include <Gui/Selection.h>
+#include <Gui/WaitCursor.h>
+#include <Mod/Mesh/App/MeshFeature.h>
+
 #include "DlgDecimating.h"
 #include "ui_DlgDecimating.h"
 
-#include <Gui/WaitCursor.h>
-#include <Gui/Command.h>
-#include <Gui/Selection.h>
-#include <Mod/Mesh/App/MeshFeature.h>
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
index fdb2e802d5..8786f45150 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
@@ -20,20 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QDockWidget>
 # include <QMessageBox>
+# include <QPointer>
 # include <QScrollArea>
 #endif
 
-#include "DlgEvaluateMeshImp.h"
-#include "ui_DlgEvaluateMesh.h"
-#include "DlgEvaluateSettings.h"
-
-#include <Base/Interpreter.h>
-#include <Base/Sequencer.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
@@ -42,13 +36,16 @@
 #include <Gui/WaitCursor.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-
+#include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/App/Core/Evaluation.h>
 #include <Mod/Mesh/App/Core/Degeneration.h>
-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/FeatureMeshDefects.h>
+
+#include "DlgEvaluateMeshImp.h"
+#include "ui_DlgEvaluateMesh.h"
+#include "DlgEvaluateSettings.h"
 #include "ViewProviderDefects.h"
 
+
 using namespace MeshCore;
 using namespace Mesh;
 using namespace MeshGui;
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
index b2a6731f16..43d0e27f08 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
+++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_DLG_EVALUATE_MESH_IMP_H
 #define MESHGUI_DLG_EVALUATE_MESH_IMP_H
 
 #include <map>
-#include <QPointer>
+
 #include <QDialog>
 
 #include <App/Application.h>
@@ -33,6 +32,7 @@
 #include <App/DocumentObserver.h>
 #include <Mod/Mesh/App/Types.h>
 
+
 class QAbstractButton;
 class QScrollArea;
 
diff --git a/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp b/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
index cc59b67f23..48a1a81594 100644
--- a/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
+++ b/src/Mod/Mesh/Gui/DlgEvaluateSettings.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "DlgEvaluateSettings.h"
 #include "ui_DlgEvaluateSettings.h"
 
+
 using namespace MeshGui;
 
 /* TRANSLATOR MeshGui::DlgEvaluateSettings */
diff --git a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
index a5c909e6f9..01f8f03160 100644
--- a/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgRegularSolidImp.cpp
@@ -20,30 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <cfloat>
-# include <qcheckbox.h>
-# include <qcombobox.h>
 # include <qmessagebox.h>
 #endif
 
-#include <Base/PyObjectBase.h>
-#include <Base/Interpreter.h>
-#include <Base/UnitsApi.h>
 #include <App/Document.h>
+#include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/PrefWidgets.h>
 #include <Gui/WaitCursor.h>
 
 #include "DlgRegularSolidImp.h"
 #include "ui_DlgRegularSolid.h"
 
+
 using namespace MeshGui;
 
 /* TRANSLATOR MeshGui::DlgRegularSolidImp */
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
index a3200dcfcc..ed085a17bb 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
@@ -22,11 +22,12 @@
 
 #include "PreCompiled.h"
 
-#include "DlgSettingsImportExportImp.h"
-#include "ui_DlgSettingsImportExport.h"
 #include <App/Application.h>
 #include <Mod/Mesh/App/Core/MeshIO.h>
 
+#include "DlgSettingsImportExportImp.h"
+#include "ui_DlgSettingsImportExport.h"
+
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
index b835f32bd4..76d174d883 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
+++ b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_DLGSETTINGSIMPORTEXPORTIMP_H
 #define MESHGUI_DLGSETTINGSIMPORTEXPORTIMP_H
 
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 #include <Gui/PropertyPage.h>
 
+
 namespace MeshGui {
 
 class Ui_DlgSettingsImportExport;
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp b/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
index 93f2a2e111..5a925da55a 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.cpp
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
+#include <Gui/Window.h>
+
 #include "DlgSettingsMeshView.h"
 #include "ui_DlgSettingsMeshView.h"
-#include <Gui/PrefWidgets.h>
-#include <Gui/Window.h>
+
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
index f0ec2b2bea..9abb757b5a 100644
--- a/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
+++ b/src/Mod/Mesh/Gui/DlgSettingsMeshView.h
@@ -20,16 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_DLGSETTINGSMESHVIEW_H
 #define MESHGUI_DLGSETTINGSMESHVIEW_H
 
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
-#include <Gui/PropertyPage.h>
 #include <memory>
 
+#include <Gui/PropertyPage.h>
+
+
 namespace MeshGui {
 class Ui_DlgSettingsMeshView;
 /**
diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
index f87c0698be..f1d08ac27f 100644
--- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp
+++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp
@@ -26,15 +26,16 @@
 # include <QDialogButtonBox>
 #endif
 
+#include <Gui/Command.h>
+#include <Gui/Selection.h>
+#include <Gui/WaitCursor.h>
+#include <Mod/Mesh/App/MeshFeature.h>
+#include <Mod/Mesh/App/Core/Smoothing.h>
+
 #include "DlgSmoothing.h"
 #include "ui_DlgSmoothing.h"
 #include "Selection.h"
 
-#include <Gui/WaitCursor.h>
-#include <Gui/Command.h>
-#include <Gui/Selection.h>
-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Core/Smoothing.h>
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp
index 200504119a..4db0fdc963 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.cpp
+++ b/src/Mod/Mesh/Gui/MeshEditor.cpp
@@ -27,11 +27,10 @@
 # include <functional>
 # include <QMenu>
 # include <QTimer>
+
 # include <Inventor/SbLine.h>
-# include <Inventor/SbPlane.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/details/SoPointDetail.h>
 # include <Inventor/events/SoKeyboardEvent.h>
 # include <Inventor/events/SoLocation2Event.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
@@ -41,24 +40,24 @@
 # include <Inventor/nodes/SoDirectionalLight.h>
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoFaceSet.h>
-# include <Inventor/nodes/SoLineSet.h>
-# include <Inventor/nodes/SoMarkerSet.h>
 # include <Inventor/nodes/SoPickStyle.h>
+# include <Inventor/nodes/SoPointSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoShapeHints.h>
 #endif
 
+#include <App/Application.h>
+#include <App/Document.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
+#include <Gui/WaitCursor.h>
+#include <Mod/Mesh/App/MeshFeature.h>
+#include <Mod/Mesh/App/Core/Algorithm.h>
+
 #include "MeshEditor.h"
 #include "SoFCMeshObject.h"
 #include "SoPolygon.h"
-#include <App/Document.h>
-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/Triangulation.h>
-#include <Gui/Application.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
+
 
 using namespace MeshGui;
 namespace sp = std::placeholders;
diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h
index 3867fd034a..13416cf227 100644
--- a/src/Mod/Mesh/Gui/MeshEditor.h
+++ b/src/Mod/Mesh/Gui/MeshEditor.h
@@ -24,8 +24,9 @@
 #define MESHGUI_MESHEDITOR_H
 
 #include <QObject>
+
 #include <Mod/Mesh/Gui/ViewProvider.h>
-#include <boost_signals2.hpp>
+
 
 class SoCoordinate3;
 class SoFaceSet;
diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp
index 3110521901..a944d0cfbc 100644
--- a/src/Mod/Mesh/Gui/MeshSelection.cpp
+++ b/src/Mod/Mesh/Gui/MeshSelection.cpp
@@ -24,22 +24,19 @@
 #ifndef _PreComp_
 # include <algorithm>
 # include <climits>
+# include <QBitmap>
+
 # include <Inventor/SbBox2s.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoFaceDetail.h>
-# include <Inventor/events/SoLocation2Event.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
-# include <QBitmap>
 #endif
 
-#include "MeshSelection.h"
-#include "ViewProvider.h"
-
-#include <Base/Console.h>
-#include <Base/Tools.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Base/Console.h>
+#include <Base/Tools.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/MouseSelection.h>
@@ -48,11 +45,13 @@
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
 #include <Mod/Mesh/App/Core/Iterator.h>
 #include <Mod/Mesh/App/Core/TopoAlgorithm.h>
-#include <Mod/Mesh/App/Core/Tools.h>
+
+#include "MeshSelection.h"
+#include "ViewProvider.h"
+
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/MeshSelection.h b/src/Mod/Mesh/Gui/MeshSelection.h
index f3af6c48b5..630e29aac0 100644
--- a/src/Mod/Mesh/Gui/MeshSelection.h
+++ b/src/Mod/Mesh/Gui/MeshSelection.h
@@ -20,20 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_MESHSELECTION_H
 #define MESHGUI_MESHSELECTION_H
 
 #include <vector>
 #include <QWidget>
-#include <Inventor/nodes/SoEventCallback.h>
+
 #include <Gui/SelectionObject.h>
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/TaskView/TaskView.h>
+#include <Inventor/nodes/SoEventCallback.h>
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 
+
 namespace Gui {
     class View3DInventorViewer;
 }
diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
index 150405b5ad..a86d6e5313 100644
--- a/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
+++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <Mod/Mesh/App/MeshFeature.h>
+
 #include "PropertyEditorMesh.h"
 
+
 using namespace MeshGui;
 using MeshCore::MeshKernel;
 
diff --git a/src/Mod/Mesh/Gui/PropertyEditorMesh.h b/src/Mod/Mesh/Gui/PropertyEditorMesh.h
index 2887de68ea..694b42e19f 100644
--- a/src/Mod/Mesh/Gui/PropertyEditorMesh.h
+++ b/src/Mod/Mesh/Gui/PropertyEditorMesh.h
@@ -25,9 +25,10 @@
 
 #include <Gui/propertyeditor/PropertyItem.h>
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 
+
 namespace MeshGui {
 
 /**