diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp
index 93ae307c80..6ed15a88c9 100644
--- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp
+++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp
@@ -23,35 +23,29 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepPrimAPI_MakeBox.hxx>
-# include <BRepBuilderAPI_GTransform.hxx>
-# include <BRepAlgoAPI_Fuse.hxx>
+# include <BRepPrim_Cylinder.hxx>
 # include <BRepAlgoAPI_Cut.hxx>
+# include <BRepAlgoAPI_Fuse.hxx>
+# include <BRepBuilderAPI_GTransform.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepBuilderAPI_MakePolygon.hxx>
+# include <BRepBuilderAPI_MakeSolid.hxx>
 # include <BRepBuilderAPI_Transform.hxx>
+# include <BRepPrimAPI_MakeBox.hxx>
+# include <BRepPrimAPI_MakeCone.hxx>
 # include <BRepPrimAPI_MakeCylinder.hxx>
 # include <BRepPrimAPI_MakeSphere.hxx>
-# include <BRepPrimAPI_MakeCone.hxx>
 # include <BRepPrimAPI_MakeTorus.hxx>
-# include <BRepPrimAPI_MakePrism.hxx>
-# include <BRepPrim_Cylinder.hxx>
-# include <BRepBuilderAPI_MakePolygon.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepBuilderAPI_MakeSolid.hxx>
-# include <QObject>
-# include <math.h>
 #endif
 
-
-#include "FeaturePrimitive.h"
-#include "DatumPoint.h"
-#include "DatumCS.h"
-#include "FeaturePy.h"
+#include <App/DocumentObject.h>
 #include <Base/Exception.h>
 #include <Base/Tools.h>
-#include <App/Document.h>
-#include <App/Application.h>
 #include <App/FeaturePythonPyImp.h>
 
+#include "FeaturePrimitive.h"
+#include "FeaturePy.h"
+
 using namespace PartDesign;
 
 namespace PartDesign {
diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h
index 1c8a656369..91edae7825 100644
--- a/src/Mod/PartDesign/App/FeaturePrimitive.h
+++ b/src/Mod/PartDesign/App/FeaturePrimitive.h
@@ -24,9 +24,6 @@
 #ifndef PARTDESIGN_FeaturePrimitive_H
 #define PARTDESIGN_FeaturePrimitive_H
 
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
-
 #include "FeatureAddSub.h"
 #include <Mod/Part/App/AttachExtension.h>
 #include <Mod/Part/App/PrismExtension.h>
diff --git a/src/Mod/PartDesign/App/FeaturePyImp.cpp b/src/Mod/PartDesign/App/FeaturePyImp.cpp
index 3ae11c06ff..79a90dbc36 100644
--- a/src/Mod/PartDesign/App/FeaturePyImp.cpp
+++ b/src/Mod/PartDesign/App/FeaturePyImp.cpp
@@ -1,60 +1,58 @@
-/***************************************************************************
- *   Copyright (c) 2007 Werner Mayer <wmayer[at]users.sourceforge.net>     *
- *                                                                         *
- *   This file is part of the FreeCAD CAx development system.              *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or         *
- *   modify it under the terms of the GNU Library General Public           *
- *   License as published by the Free Software Foundation; either          *
- *   version 2 of the License, or (at your option) any later version.      *
- *                                                                         *
- *   This library  is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Library General Public License for more details.                  *
- *                                                                         *
- *   You should have received a copy of the GNU Library General Public     *
- *   License along with this library; see the file COPYING.LIB. If not,    *
- *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
- *   Suite 330, Boston, MA  02111-1307, USA                                *
- *                                                                         *
- ***************************************************************************/
-
-
-#include "PreCompiled.h"
-
-#include "Feature.h"
-
-// inclusion of the generated files (generated out of FeaturePy.xml)
-#include "FeaturePy.h"
-#include "FeaturePy.cpp"
-
-using namespace PartDesign;
-
-// returns a string which represent the object e.g. when printed in python
-std::string FeaturePy::representation(void) const
-{
-    App::DocumentObject* object = this->getFeaturePtr();
-    std::stringstream str;
-    str << "<" << object->getTypeId().getName() << ">";
-    return str.str();
-}
-
-PyObject *FeaturePy::getCustomAttributes(const char* ) const
-{
-    return 0;
-}
-
-int FeaturePy::setCustomAttributes(const char* , PyObject *)
-{
-    return 0; 
-}
-
-PyObject* FeaturePy::getBaseObject(PyObject * /*args*/)
-{
-    App::DocumentObject* base = getFeaturePtr()->getBaseObject();
-    if (base)
-        return base->getPyObject();
-    else
-        return Py::new_reference_to(Py::None());
-}
+/***************************************************************************
+ *   Copyright (c) 2007 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include "PreCompiled.h"
+
+// inclusion of the generated files (generated out of FeaturePy.xml)
+#include "FeaturePy.h"
+#include "FeaturePy.cpp"
+
+using namespace PartDesign;
+
+// returns a string which represent the object e.g. when printed in python
+std::string FeaturePy::representation(void) const
+{
+    App::DocumentObject* object = this->getFeaturePtr();
+    std::stringstream str;
+    str << "<" << object->getTypeId().getName() << ">";
+    return str.str();
+}
+
+PyObject *FeaturePy::getCustomAttributes(const char* ) const
+{
+    return 0;
+}
+
+int FeaturePy::setCustomAttributes(const char* , PyObject *)
+{
+    return 0; 
+}
+
+PyObject* FeaturePy::getBaseObject(PyObject * /*args*/)
+{
+    App::DocumentObject* base = getFeaturePtr()->getBaseObject();
+    if (base)
+        return base->getPyObject();
+    else
+        return Py::new_reference_to(Py::None());
+}
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 24d1352153..9aa05e2d3a 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -56,12 +56,12 @@
 #include <App/Document.h>
 #include <App/OriginFeature.h>
 #include <Base/Reader.h>
-#include <Base/Tools.h>
 #include <Mod/Part/App/FaceMakerCheese.h>
 
+#include "FeatureSketchBased.h"
 #include "DatumLine.h"
 #include "DatumPlane.h"
-#include "FeatureSketchBased.h"
+
 
 using namespace PartDesign;
 
diff --git a/src/Mod/PartDesign/App/FeatureSolid.cpp b/src/Mod/PartDesign/App/FeatureSolid.cpp
index 9f745e7ddb..556ecb2a2a 100644
--- a/src/Mod/PartDesign/App/FeatureSolid.cpp
+++ b/src/Mod/PartDesign/App/FeatureSolid.cpp
@@ -22,14 +22,10 @@
 
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
 
 #include "FeatureSolid.h"
 
 
-
 namespace PartDesign {
 
 
@@ -40,5 +36,5 @@ Solid::Solid()
 }
 
 
-
+
 }
diff --git a/src/Mod/PartDesign/App/FeatureSolid.h b/src/Mod/PartDesign/App/FeatureSolid.h
index fd441c54fd..2ca4aac5ec 100644
--- a/src/Mod/PartDesign/App/FeatureSolid.h
+++ b/src/Mod/PartDesign/App/FeatureSolid.h
@@ -24,11 +24,8 @@
 #ifndef PARTDESIGN_FeatureSolid_H
 #define PARTDESIGN_FeatureSolid_H
 
-#include <App/PropertyStandard.h>
 #include "Feature.h"
 
-class gp_Pnt;
-
 
 /// Base class of all additive features in PartDesign
 namespace PartDesign
diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp
index 4ded07e5fc..14065d1a17 100644
--- a/src/Mod/PartDesign/App/ShapeBinder.cpp
+++ b/src/Mod/PartDesign/App/ShapeBinder.cpp
@@ -23,8 +23,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <cfloat>
-# include <boost_bind_bind.hpp>
 # include <gp_Lin.hxx>
 # include <gp_Pln.hxx>
 # include <BRep_Builder.hxx>
@@ -36,16 +34,15 @@
 #include <unordered_set>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <Base/Console.h>
 #include <App/Application.h>
 #include <App/Document.h>
-#include "ShapeBinder.h"
-#include <App/Document.h>
 #include <App/GroupExtension.h>
-#include <App/OriginFeature.h>
 #include <App/Link.h>
+#include <App/OriginFeature.h>
 #include <Mod/Part/App/TopoShape.h>
 
+#include "ShapeBinder.h"
+
 FC_LOG_LEVEL_INIT("PartDesign",true,true)
 
 #ifndef M_PI
diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h
index 84570806ba..e284bd8efd 100644
--- a/src/Mod/PartDesign/App/ShapeBinder.h
+++ b/src/Mod/PartDesign/App/ShapeBinder.h
@@ -24,13 +24,10 @@
 #ifndef PARTDESIGN_DATUMSHAPE_H
 #define PARTDESIGN_DATUMSHAPE_H
 
-#include <QString>
-#include <boost_signals2.hpp>
 #include <App/PropertyLinks.h>
 #include <App/DocumentObserver.h>
 #include <App/FeaturePython.h>
 #include <Mod/Part/App/DatumFeature.h>
-#include <Mod/PartDesign/PartDesignGlobal.h>
 
 namespace PartDesign
 {
diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
index 9a31600a18..5f2a272d3f 100644
--- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
@@ -24,32 +24,24 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <Precision.hxx>
 # include <QMessageBox>
-# include <QRegExp>
-# include <QTextStream>
-# include <sstream>
 #endif
 
-#include "TaskPrimitiveParameters.h"
-#include "ui_TaskPrimitiveParameters.h"
-#include "ViewProviderDatumCS.h"
-
 #include <App/Origin.h>
 #include <Base/Console.h>
-#include <Base/Interpreter.h>
 #include <Base/UnitsApi.h>
 #include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
 #include <Gui/MainWindow.h>
 #include <Gui/ViewProviderOrigin.h>
-#include <Mod/Part/App/DatumFeature.h>
 #include <Mod/PartDesign/App/Body.h>
-#include <Mod/PartDesign/App/DatumCS.h>
 #include <Mod/PartDesign/App/FeaturePrimitive.h>
 
+#include "TaskPrimitiveParameters.h"
+#include "ui_TaskPrimitiveParameters.h"
+
+
 using namespace PartDesignGui;
 
 TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h
index b6f49a0e86..9a2c2dc9ac 100644
--- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h
@@ -25,16 +25,12 @@
 #define GUI_TASKVIEW_TaskPrimitiveParameters_H
 
 #include <memory>
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
 #include <Gui/DocumentObserver.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 
-#include "TaskSketchBasedParameters.h"
 #include "ViewProviderPrimitive.h"
 #include "TaskDatumParameters.h"
-#include <Mod/PartDesign/App/DatumCS.h>
-#include <Mod/PartDesign/App/FeaturePrimitive.h>
 
 namespace App {
 class Property;
diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
index bd6bf4cba0..fa64f11d3a 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
@@ -24,7 +24,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
 # include <QMessageBox>
 #endif
 
@@ -34,15 +33,13 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 
-#include <Mod/PartDesign/App/ShapeBinder.h>
 #include <Mod/Part/App/PartFeature.h>
-
-#include "ReferenceSelection.h"
-#include "Workbench.h"
+#include <Mod/PartDesign/App/ShapeBinder.h>
 
 #include "ui_TaskShapeBinder.h"
 #include "TaskShapeBinder.h"
 
+
 using namespace PartDesignGui;
 using namespace Gui;
 
diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.h b/src/Mod/PartDesign/Gui/TaskShapeBinder.h
index fdf1364a0d..957b66da62 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.h
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.h
@@ -24,8 +24,8 @@
 #ifndef GUI_TASKVIEW_TaskDatumShapeBinder_H
 #define GUI_TASKVIEW_TaskDatumShapeBinder_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 
 #include "ViewProviderShapeBinder.h"
 
diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
index 51899349d9..a4695bbd38 100644
--- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
@@ -25,35 +25,24 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <sstream>
 # include <QRegExp>
 # include <QTextStream>
-# include <Precision.hxx>
 #endif
 
-#include <Base/Console.h>
-#include <App/Application.h>
 #include <App/Document.h>
 #include <App/Origin.h>
-#include <App/OriginFeature.h>
+#include <Base/Console.h>
 #include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
 #include <Gui/CommandT.h>
-
+#include <Gui/Document.h>
+#include <Gui/Selection.h>
+#include <Gui/ViewProvider.h>
 #include <Mod/Part/App/DatumFeature.h>
 #include <Mod/PartDesign/App/FeatureSketchBased.h>
 #include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/PartDesign/App/Body.h>
-
-#include "Utils.h"
-#include "ReferenceSelection.h"
 
 #include "TaskSketchBasedParameters.h"
+#include "ReferenceSelection.h"
 
 using namespace PartDesignGui;
 using namespace Gui;
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp
index 94bc874159..27ebe48b3d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp
@@ -23,20 +23,18 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QAction>
 # include <QMenu>
 # include <QMessageBox>
 #endif
 
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/Control.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Mod/PartDesign/App/FeaturePrimitive.h>
+
 #include "ViewProviderPrimitive.h"
 #include "TaskPrimitiveParameters.h"
-#include <Base/Console.h>
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/Control.h>
-#include <Gui/Command.h>
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
-#include <Mod/PartDesign/App/FeaturePrimitive.h>
 
 
 using namespace PartDesignGui;
diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
index d834ca4aa0..37a1975cd2 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
@@ -24,9 +24,7 @@
 #ifndef PARTGUI_ViewProviderPrimitive_H
 #define PARTGUI_ViewProviderPrimitive_H
 
-#include "ViewProvider.h"
 #include "ViewProviderAddSub.h"
-#include <Mod/Part/Gui/SoBrepFaceSet.h>
 
 namespace PartDesignGui {
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
index d9d73d1a85..1d81c2fee8 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
@@ -25,22 +25,19 @@
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QMessageBox>
 # include <QMenu>
-# include <Inventor/nodes/SoSeparator.h>
+# include <QMessageBox>
 # include <TopExp.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
 #endif
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <Base/Console.h>
 #include <Gui/ActionFunction.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/ViewParams.h>
-
 #include <Mod/PartDesign/App/ShapeBinder.h>
 
 #include "ViewProviderShapeBinder.h"
diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
index ca340858a6..27a219923d 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
+++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
@@ -26,7 +26,6 @@
 
 #include <Gui/ViewProviderPythonFeature.h>
 #include <Mod/Part/Gui/ViewProvider.h>
-#include <Mod/PartDesign/PartDesignGlobal.h>
 
 namespace PartDesignGui {
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp
index fc84aeefcd..82f4266602 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderSketchBased.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <Gui/Application.h>
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/PartDesign/App/FeatureSketchBased.h>