diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp
index 0b1c9cacd9..2c070e384d 100644
--- a/src/Mod/Part/Gui/DlgPrimitives.cpp
+++ b/src/Mod/Part/Gui/DlgPrimitives.cpp
@@ -20,29 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <gp_Ax1.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
 #include <GC_MakeArcOfCircle.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_TrimmedCurve.hxx>
+#include <gp_Ax3.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Pnt.hxx>
 #include <QMessageBox>
 #include <QSignalMapper>
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #endif
 
-#include <Base/Interpreter.h>
-#include <Base/Rotation.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>
 #include <App/Application.h>
 #include <App/Part.h>
 #include <App/Document.h>
+#include <Base/Rotation.h>
+#include <Base/Tools.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Command.h>
@@ -59,6 +56,7 @@
 #include "ui_DlgPrimitives.h"
 #include "ui_Location.h"
 
+
 using namespace PartGui;
 
 namespace PartGui {
diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
index f366bf2482..7d80357690 100644
--- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
+++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
@@ -21,53 +21,42 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <TopoDS_Face.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
+# include <BRep_Tool.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepBuilderAPI_Transform.hxx>
+# include <BRepCheck_Analyzer.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepPrimAPI_MakePrism.hxx>
 # include <BRepProj_Projection.hxx>
-# include <TopoDS_Builder.hxx>
-# include <TopoDS_Edge.hxx>
+# include <gp_Ax1.hxx>
 # include <ShapeAnalysis.hxx>
 # include <ShapeAnalysis_FreeBounds.hxx>
-# include <ShapeFix_Wire.hxx>
-# include <BRep_Tool.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-# include <Geom_TrimmedCurve.hxx>
-# include <GeomProjLib.hxx>
-# include <BRepBuilderAPI_MakeEdge.hxx>
-# include "ShapeFix_Edge.hxx"
-# include <BRepBuilderAPI_MakeFace.hxx>
 # include <ShapeFix_Face.hxx>
-# include <BRepCheck_Analyzer.hxx>
+# include <ShapeFix_Wire.hxx>
 # include <ShapeFix_Wireframe.hxx>
-# include <BRepPrimAPI_MakePrism.hxx>
-# include <gp_Ax1.hxx>
-# include <BRepBuilderAPI_Transform.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS_Builder.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
 #endif
 
-#include <Inventor/SbVec3d.h>
-
-#include "DlgProjectionOnSurface.h"
-#include "ui_DlgProjectionOnSurface.h"
-
 #include <App/Document.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Gui/MDIView.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/Application.h>
 #include <Gui/SelectionObject.h>
+#include <Inventor/SbVec3d.h>
 
+#include "DlgProjectionOnSurface.h"
+#include "ui_DlgProjectionOnSurface.h"
 #include "ViewProviderExt.h"
 
 
-
-
-
 using namespace PartGui;
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.h b/src/Mod/Part/Gui/DlgProjectionOnSurface.h
index ce6c8e6fbf..a786452bf8 100644
--- a/src/Mod/Part/Gui/DlgProjectionOnSurface.h
+++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.h
@@ -22,20 +22,19 @@
 #ifndef PARTGUI_DLGPROJECTIONONSURFACE_H
 #define PARTGUI_DLGPROJECTIONONSURFACE_H
 
-#include <QWidget>
-#include <QDoubleSpinBox>
-
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/TaskView/TaskView.h>
-
-#include "../App/PartFeature.h"
-#include <App/DocumentObserver.h>
-
-#include "TopoDS_Shape.hxx"
+#include "gp_Dir.hxx"
 #include "TopoDS_Edge.hxx"
 #include "TopoDS_Face.hxx"
+#include "TopoDS_Shape.hxx"
 #include "TopoDS_Wire.hxx"
-#include "gp_Dir.hxx"
+
+#include <QDoubleSpinBox>
+#include <QWidget>
+#include <App/DocumentObserver.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
+#include <Mod/Part/App/PartFeature.h>
+
 
 namespace PartGui {
 
diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp
index 1eef30a5ee..0d87ccf3fa 100644
--- a/src/Mod/Part/Gui/DlgRevolution.cpp
+++ b/src/Mod/Part/Gui/DlgRevolution.cpp
@@ -20,27 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QMessageBox>
-# include <gp_Dir.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Pnt.hxx>
-# include <BRepAdaptor_Curve.hxx>
 # include <BRep_Tool.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <Precision.hxx>
+# include <ShapeExtend_Explorer.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <ShapeExtend_Explorer.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
-# include <Inventor/system/inttypes.h>
-# include <Precision.hxx>
 #endif
 
-#include "ui_DlgRevolution.h"
-#include "DlgRevolution.h"
-#include "../App/PartFeature.h"
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObject.h>
@@ -53,11 +45,10 @@
 #include <Gui/Utilities.h>
 #include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
-#include <Mod/Part/App/Tools.h>
 #include <Mod/Part/App/FeatureRevolution.h>
-#include <Base/Console.h>
-#include <Base/UnitsApi.h>
 
+#include "DlgRevolution.h"
+#include "ui_DlgRevolution.h"
 
 
 using namespace PartGui;
diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h
index 6b2908cfea..a26a1b6c5d 100644
--- a/src/Mod/Part/Gui/DlgRevolution.h
+++ b/src/Mod/Part/Gui/DlgRevolution.h
@@ -23,11 +23,12 @@
 #ifndef PARTGUI_DLGREVOLUTION_H
 #define PARTGUI_DLGREVOLUTION_H
 
-#include <Gui/Selection.h>
 #include <Gui/InputVector.h>
+#include <Gui/Selection.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
+
 namespace PartGui {
 
 class Ui_DlgRevolution;
diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
index 6408511129..8e139e0d6a 100644
--- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
+++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
@@ -20,20 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <QMessageBox>
+#endif
 
-#include <QMessageBox>
-#include "ViewProvider.h"
-#include "DlgSettings3DViewPartImp.h"
-#include "ui_DlgSettings3DViewPart.h"
-
-#include <Gui/PrefWidgets.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Base/Console.h>
+#include <Gui/Application.h>
+#include <Gui/Document.h>
+
+#include "DlgSettings3DViewPartImp.h"
+#include "ui_DlgSettings3DViewPart.h"
+#include "ViewProvider.h"
+
 
 using namespace PartGui;
 
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
index fb4b5318e5..230c2fffb3 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QButtonGroup>
@@ -29,8 +28,8 @@
 # include <Interface_Static.hxx>
 #endif
 
-#include <Base/Parameter.h>
 #include <App/Application.h>
+#include <Base/Parameter.h>
 #include <Mod/Part/App/ImportStep.h>
 
 #include "DlgSettingsGeneral.h"
@@ -38,6 +37,7 @@
 #include "ui_DlgImportExportIges.h"
 #include "ui_DlgImportExportStep.h"
 
+
 using namespace PartGui;
 
 DlgSettingsGeneral::DlgSettingsGeneral(QWidget* parent)
diff --git a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
index 16c5877537..783636d5cb 100644
--- a/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsObjectColor.cpp
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "DlgSettingsObjectColor.h"
 #include "ui_DlgSettingsObjectColor.h"
-#include <Gui/PrefWidgets.h>
+
 
 using namespace PartGui;