diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp
index 9d3fa9fa74..0d75cf5334 100644
--- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp
+++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp
@@ -20,18 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
 # include <QTreeWidget>
-# include <TopoDS_Shape.hxx>
 # include <TopExp_Explorer.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
-#include "DlgBooleanOperation.h"
-#include "ui_DlgBooleanOperation.h"
-#include "../App/PartFeature.h"
 #include <Base/Exception.h>
 #include <App/Application.h>
 #include <App/Document.h>
@@ -44,6 +40,11 @@
 #include <Gui/Selection.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "DlgBooleanOperation.h"
+#include "ui_DlgBooleanOperation.h"
+
 
 using namespace PartGui;
 namespace bp = boost::placeholders;
diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h
index 421ae4063e..839cf1f062 100644
--- a/src/Mod/Part/Gui/DlgBooleanOperation.h
+++ b/src/Mod/Part/Gui/DlgBooleanOperation.h
@@ -25,7 +25,7 @@
 
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <boost_signals2.hpp>
+
 
 class QTreeWidgetItem;
 
diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 890a264394..ba45b85d6d 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-
 # include <BRepAdaptor_Curve.hxx>
 # include <BRep_Tool.hxx>
 # include <Precision.hxx>
@@ -38,9 +36,9 @@
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Base/UnitsApi.h>
 #include <App/Link.h>
 #include <App/Part.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h
index 0490eab73c..c8a1e258c5 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.h
+++ b/src/Mod/Part/Gui/DlgExtrusion.h
@@ -23,12 +23,13 @@
 #ifndef PARTGUI_DLGEXTRUSION_H
 #define PARTGUI_DLGEXTRUSION_H
 
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/TaskView/TaskView.h>
+#include <QDialog>
 #include <string>
 
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Part/App/FeatureExtrusion.h>
-#include <QDialog>
+
 
 class TopoDS_Shape;
 
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp
index 6b35bc5f1b..ed49d331c9 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.cpp
+++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp
@@ -20,58 +20,56 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
 # include <climits>
 # include <sstream>
+# include <QHeaderView>
+# include <QItemDelegate>
+# include <QItemSelectionModel>
+# include <QLocale>
+# include <QMessageBox>
+# include <QTimer>
+# include <QVBoxLayout>
+
 # include <BRep_Tool.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Shape.hxx>
 # include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
 # include <TopTools_ListOfShape.hxx>
 # include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
-# include <QItemDelegate>
-# include <QLocale>
-# include <QHeaderView>
-# include <QMessageBox>
-# include <QVBoxLayout>
-# include <QItemSelection>
-# include <QItemSelectionModel>
-# include <QTimer>
+
 # include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/details/SoLineDetail.h>
 #endif
 
-#include "DlgFilletEdges.h"
-#include "ui_DlgFilletEdges.h"
-#include "SoBrepFaceSet.h"
-#include "SoBrepEdgeSet.h"
-#include "SoBrepPointSet.h"
-
-
-#include "../App/PartFeature.h"
-#include "../App/FeatureFillet.h"
-#include "../App/FeatureChamfer.h"
-#include <Base/UnitsApi.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/QuantitySpinBox.h>
-#include <Gui/WaitCursor.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
 #include <Gui/SelectionObject.h>
 #include <Gui/SoFCUnifiedSelection.h>
 #include <Gui/ViewProvider.h>
+#include <Gui/WaitCursor.h>
 #include <Gui/Window.h>
+#include <Mod/Part/App/FeatureChamfer.h>
+#include <Mod/Part/App/FeatureFillet.h>
+
+#include "DlgFilletEdges.h"
+#include "ui_DlgFilletEdges.h"
+#include "SoBrepEdgeSet.h"
+#include "SoBrepFaceSet.h"
+#include "SoBrepPointSet.h"
+
 
 using namespace PartGui;
 namespace bp = boost::placeholders;
diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h
index d2c2d3b8f6..187df645d1 100644
--- a/src/Mod/Part/Gui/DlgFilletEdges.h
+++ b/src/Mod/Part/Gui/DlgFilletEdges.h
@@ -23,12 +23,14 @@
 #ifndef PARTGUI_DLGFILLETEDGES_H
 #define PARTGUI_DLGFILLETEDGES_H
 
+#include <QDialog>
+#include <QItemDelegate>
+#include <QStandardItemModel>
+
+#include <Gui/Selection.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-#include <QDialog>
-#include <QStandardItemModel>
-#include <QItemDelegate>
+
 
 namespace Base {
     class Quantity;
diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.cpp b/src/Mod/Part/Gui/DlgPartBoxImp.cpp
index 28a9201311..55833c1a36 100644
--- a/src/Mod/Part/Gui/DlgPartBoxImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartBoxImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "DlgPartBoxImp.h"
 #include "ui_DlgPartBox.h"
 
+
 using namespace PartGui;
 
 /* 
diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
index 16056adf58..5b3b84cc60 100644
--- a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "DlgPartCylinderImp.h"
 #include "ui_DlgPartCylinder.h"
 
+
 using namespace PartGui;
 
 DlgPartCylinderImp::DlgPartCylinderImp(QWidget* parent, Qt::WindowFlags fl)
diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
index 8633ba2084..90deac9a7f 100644
--- a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
@@ -20,11 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <qlineedit.h>
-#endif
 
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
@@ -32,6 +28,7 @@
 #include "DlgPartImportIgesImp.h"
 #include "ui_DlgPartImportIges.h"
 
+
 using namespace PartGui;
 
 /* TRANSLATOR PartGui::DlgPartImportIgesImp */
diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
index c03e6eaab5..b69c884bad 100644
--- a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
+++ b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <qlineedit.h>
-#endif
 
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
+
 #include "DlgPartImportStepImp.h"
 #include "ui_DlgPartImportStep.h"
 
+
 using namespace PartGui;
 
 /* TRANSLATOR PartGui::DlgPartImportStepImp */