diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
index 2d571dcf09..3aca345bd6 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp
@@ -20,31 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QMessageBox>
-# include <QPushButton>
-# include <QTextCursor>
 # include <QElapsedTimer>
+# include <QMessageBox>
+# include <QPointer>
+# include <QTextCursor>
 #endif
 
-#include "RemeshGmsh.h"
-#include "ui_RemeshGmsh.h"
+#include <App/Application.h>
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
 #include <Base/Stream.h>
-#include <Base/Tools.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/Widgets.h>
 #include <Gui/ReportView.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Core/MeshIO.h>
+
+#include "RemeshGmsh.h"
+#include "ui_RemeshGmsh.h"
+
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.h b/src/Mod/Mesh/Gui/RemeshGmsh.h
index ef9f125fc1..3765bb8e1a 100644
--- a/src/Mod/Mesh/Gui/RemeshGmsh.h
+++ b/src/Mod/Mesh/Gui/RemeshGmsh.h
@@ -20,19 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_REMESHGMSH_H
 #define MESHGUI_REMESHGMSH_H
 
 #include <memory>
 #include <QDialog>
-#include <QPointer>
 #include <QProcess>
-#include <App/DocumentObserver.h>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
 
+
 namespace Mesh {
 class Feature;
 }
diff --git a/src/Mod/Mesh/Gui/RemoveComponents.cpp b/src/Mod/Mesh/Gui/RemoveComponents.cpp
index bf739b2a05..147b66ca02 100644
--- a/src/Mod/Mesh/Gui/RemoveComponents.cpp
+++ b/src/Mod/Mesh/Gui/RemoveComponents.cpp
@@ -20,22 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QPushButton>
 #endif
 
-#include "RemoveComponents.h"
-#include "ui_RemoveComponents.h"
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 
-using namespace MeshGui;
+#include "RemoveComponents.h"
+#include "ui_RemoveComponents.h"
 
 
+using namespace MeshGui;
+
 RemoveComponents::RemoveComponents(QWidget* parent, Qt::WindowFlags fl)
   : QWidget(parent, fl)
 {
diff --git a/src/Mod/Mesh/Gui/Segmentation.cpp b/src/Mod/Mesh/Gui/Segmentation.cpp
index 95a6f27fdf..745a0a8f11 100644
--- a/src/Mod/Mesh/Gui/Segmentation.cpp
+++ b/src/Mod/Mesh/Gui/Segmentation.cpp
@@ -20,25 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
-#include "Segmentation.h"
-#include "ui_Segmentation.h"
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
-
-#include <Mod/Mesh/App/Core/Segmentation.h>
 #include <Mod/Mesh/App/Core/Curvature.h>
+#include <Mod/Mesh/App/Core/Segmentation.h>
 #include <Mod/Mesh/App/Core/Smoothing.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 
+#include "Segmentation.h"
+#include "ui_Segmentation.h"
+
+
 using namespace MeshGui;
 
 Segmentation::Segmentation(Mesh::Feature* mesh, QWidget* parent, Qt::WindowFlags fl)
diff --git a/src/Mod/Mesh/Gui/Segmentation.h b/src/Mod/Mesh/Gui/Segmentation.h
index 2686f8f270..2517ddf8c3 100644
--- a/src/Mod/Mesh/Gui/Segmentation.h
+++ b/src/Mod/Mesh/Gui/Segmentation.h
@@ -20,17 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_SEGMENTATION_H
 #define MESHGUI_SEGMENTATION_H
 
 #include <QWidget>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 #ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
+# include <Mod/Mesh/MeshGlobal.h>
 #endif
 
+
 // forward declarations
 namespace Mesh { class Feature; }
 
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
index 11299a564b..f050efde30 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.cpp
@@ -20,20 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
+
 # include <QDialog>
 # include <QDoubleSpinBox>
-# include <QVBoxLayout>
 # include <QMessageBox>
 # include <QPointer>
+# include <QVBoxLayout>
 #endif
 
-#include "SegmentationBestFit.h"
-#include "ui_SegmentationBestFit.h"
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
@@ -41,9 +38,12 @@
 #include <Gui/SelectionObject.h>
 #include <Mod/Mesh/App/Core/Approximation.h>
 #include <Mod/Mesh/App/Core/Segmentation.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 
+#include "SegmentationBestFit.h"
+#include "ui_SegmentationBestFit.h"
+
+
 using namespace MeshGui;
 
 namespace MeshGui {
diff --git a/src/Mod/Mesh/Gui/SegmentationBestFit.h b/src/Mod/Mesh/Gui/SegmentationBestFit.h
index abca9a7fa9..9ebf6c351c 100644
--- a/src/Mod/Mesh/Gui/SegmentationBestFit.h
+++ b/src/Mod/Mesh/Gui/SegmentationBestFit.h
@@ -20,16 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_SEGMENTATIONBESTFIT_H
 #define MESHGUI_SEGMENTATIONBESTFIT_H
 
-#include <QDialog>
 #include <list>
+#include <QDialog>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
+
 #include "MeshSelection.h"
 
+
 class QDoubleSpinBox;
 
 // forward declarations
diff --git a/src/Mod/Mesh/Gui/Selection.cpp b/src/Mod/Mesh/Gui/Selection.cpp
index eb87787412..39135855b5 100644
--- a/src/Mod/Mesh/Gui/Selection.cpp
+++ b/src/Mod/Mesh/Gui/Selection.cpp
@@ -21,14 +21,12 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "Selection.h"
 #include "ui_Selection.h"
 
-using namespace MeshGui;
 
+using namespace MeshGui;
 
 /* TRANSLATOR MeshGui::Selection */
 
diff --git a/src/Mod/Mesh/Gui/Selection.h b/src/Mod/Mesh/Gui/Selection.h
index 3ef79fb70a..3a5466e4b4 100644
--- a/src/Mod/Mesh/Gui/Selection.h
+++ b/src/Mod/Mesh/Gui/Selection.h
@@ -20,18 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_SELECTION_H
 #define MESHGUI_SELECTION_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 "MeshSelection.h"
 
+
 namespace MeshGui {
 
 class Ui_Selection;
diff --git a/src/Mod/Mesh/Gui/ThumbnailExtension.cpp b/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
index c00e616be5..0a15266feb 100644
--- a/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
+++ b/src/Mod/Mesh/Gui/ThumbnailExtension.cpp
@@ -20,24 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <Inventor/SbRotation.h>
-#include <Inventor/SbViewportRegion.h>
-#include <Inventor/nodes/SoCoordinate3.h>
-#include <Inventor/nodes/SoIndexedFaceSet.h>
-#include <Inventor/nodes/SoDirectionalLight.h>
-#include <Inventor/nodes/SoOrthographicCamera.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <QBuffer>
-#include <QByteArray>
+# include <QBuffer>
+# include <QByteArray>
+
+# include <Inventor/SbRotation.h>
+# include <Inventor/SbViewportRegion.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoDirectionalLight.h>
+# include <Inventor/nodes/SoIndexedFaceSet.h>
+# include <Inventor/nodes/SoOrthographicCamera.h>
+# include <Inventor/nodes/SoSeparator.h>
 #endif
 
+#include <Gui/SoFCOffscreenRenderer.h>
+
 #include "ThumbnailExtension.h"
 #include "ViewProvider.h"
-#include <Gui/SoFCOffscreenRenderer.h>
+
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp
index 645289015a..694fe048de 100644
--- a/src/Mod/Mesh/Gui/Workbench.cpp
+++ b/src/Mod/Mesh/Gui/Workbench.cpp
@@ -20,24 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <qobject.h>
 # include <QGroupBox>
 # include <QLabel>
 #endif
 
-#include "Workbench.h"
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/MenuManager.h>
-#include <Gui/ToolBarManager.h>
 #include <Gui/Selection.h>
+#include <Gui/ToolBarManager.h>
 #include <Gui/TaskView/TaskView.h>
+#include <Mod/Mesh/App/MeshFeature.h>
+
+#include "Workbench.h"
 
-#include "../App/MeshFeature.h"
 
 using namespace MeshGui;
 
diff --git a/src/Mod/Mesh/Gui/Workbench.h b/src/Mod/Mesh/Gui/Workbench.h
index 5433d6e137..8b05c9d1c8 100644
--- a/src/Mod/Mesh/Gui/Workbench.h
+++ b/src/Mod/Mesh/Gui/Workbench.h
@@ -20,14 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESH_WORKBENCH_H
 #define MESH_WORKBENCH_H
 
-#ifndef MESH_GLOBAL_H
-#include <Mod/Mesh/MeshGlobal.h>
-#endif
 #include <Gui/Workbench.h>
+#ifndef MESH_GLOBAL_H
+# include <Mod/Mesh/MeshGlobal.h>
+#endif
+
 
 namespace MeshGui {