diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 1a72be0124..e8e94dac8d 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -9,7 +9,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_math.hxx>
@@ -26,15 +25,15 @@
 
 #include "AttacherTexts.h"
 #include "PropertyEnumAttacherItem.h"
-#include "SoBrepEdgeSet.h"
-#include "SoBrepFaceSet.h"
-#include "SoBrepPointSet.h"
-#include "SoFCShapeObject.h"
-#include "TaskDimension.h"
 #include "DlgSettings3DViewPartImp.h"
 #include "DlgSettingsGeneral.h"
 #include "DlgSettingsMeasure.h"
 #include "DlgSettingsObjectColor.h"
+#include "TaskDimension.h"
+#include "SoBrepEdgeSet.h"
+#include "SoBrepFaceSet.h"
+#include "SoBrepPointSet.h"
+#include "SoFCShapeObject.h"
 #include "ViewProvider.h"
 #include "ViewProvider2DObject.h"
 #include "ViewProviderAttachExtension.h"
diff --git a/src/Mod/Part/Gui/AttacherTexts.cpp b/src/Mod/Part/Gui/AttacherTexts.cpp
index 8f4963e514..865cad5d41 100644
--- a/src/Mod/Part/Gui/AttacherTexts.cpp
+++ b/src/Mod/Part/Gui/AttacherTexts.cpp
@@ -19,14 +19,17 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <QApplication>
 #endif
-#include "AttacherTexts.h"
-#include <Base/PyObjectBase.h>
+
 #include <Base/Console.h>
 
+#include "AttacherTexts.h"
+
+
 using namespace Attacher;
 
 namespace AttacherGui {
diff --git a/src/Mod/Part/Gui/AttacherTexts.h b/src/Mod/Part/Gui/AttacherTexts.h
index 2deb659230..83cd40e50f 100644
--- a/src/Mod/Part/Gui/AttacherTexts.h
+++ b/src/Mod/Part/Gui/AttacherTexts.h
@@ -28,11 +28,9 @@
 #ifndef PARTATTACHERTEXTS_H
 #define PARTATTACHERTEXTS_H
 
-
 #include <vector>
 #include <QString>
 #include <QStringList>
-#include <CXX/Objects.hxx>
 #include <Mod/Part/App/Attacher.h>
 
 
diff --git a/src/Mod/Part/Gui/BoxSelection.cpp b/src/Mod/Part/Gui/BoxSelection.cpp
index 7ce3362dc3..e64ae32b71 100644
--- a/src/Mod/Part/Gui/BoxSelection.cpp
+++ b/src/Mod/Part/Gui/BoxSelection.cpp
@@ -20,35 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
 # include <BRep_Tool.hxx>
-# include <BRepGProp.hxx>
-# include <GProp_GProps.hxx>
 # include <gp_Pnt.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
-# include <QFontMetrics>
-# include <QMessageBox>
-# include <QSet>
 # include <Inventor/SoPickedPoint.h>
-# include <Inventor/actions/SoRayPickAction.h>
-# include <Inventor/actions/SoSearchAction.h>
-# include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
-# include <Inventor/nodes/SoSeparator.h>
 #endif
 
-#include "BoxSelection.h"
-#include "ViewProviderExt.h"
-
+#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
@@ -57,9 +45,8 @@
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 
-#include <App/Document.h>
-#include <App/DocumentObject.h>
-#include <Mod/Part/App/PartFeature.h>
+#include "BoxSelection.h"
+#include "ViewProviderExt.h"
 
 
 using namespace PartGui;
diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
index 4b46ae1816..9ba8898f5f 100644
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -20,46 +20,41 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-# include <Standard_math.hxx>
-# include <BRep_Builder.hxx>
-# include <BRepAlgoAPI_Section.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopExp_Explorer.hxx>
-# include <gp_Pln.hxx>
 # include <cfloat>
 # include <QFuture>
-# include <QFutureWatcher>
 # include <QKeyEvent>
-# include <QtConcurrentMap>
-# include <Python.h>
+
+# include <BRep_Builder.hxx>
+# include <Standard_math.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Compound.hxx>
+
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
-# include <Inventor/nodes/SoFaceSet.h>
 # include <Inventor/nodes/SoLineSet.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
 
-#include "ui_CrossSections.h"
-#include "CrossSections.h"
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/CrossSection.h>
 #include <App/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
+#include <Base/Sequencer.h>
+#include <Base/UnitsApi.h>
 #include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
-#include <App/Link.h>
-#include <Base/Sequencer.h>
-#include <Base/UnitsApi.h>
+#include <Gui/ViewProvider.h>
+#include <Mod/Part/App/CrossSection.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "CrossSections.h"
+#include "ui_CrossSections.h"
+
 
 using namespace PartGui;
 namespace bp = boost::placeholders;
diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h
index e5e003e3af..552a60ffdc 100644
--- a/src/Mod/Part/Gui/CrossSections.h
+++ b/src/Mod/Part/Gui/CrossSections.h
@@ -23,12 +23,14 @@
 #ifndef PARTGUI_CROSSSECTIONS_H
 #define PARTGUI_CROSSSECTIONS_H
 
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/TaskView/TaskView.h>
-#include <Base/BoundBox.h>
 #include <QDialog>
 #include <QPointer>
 
+#include <Base/BoundBox.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
+
+
 namespace Gui {
 class View3DInventor;
 }