diff --git a/src/Mod/PartDesign/App/Feature.cpp b/src/Mod/PartDesign/App/Feature.cpp
index c9cba28324..bc04454997 100644
--- a/src/Mod/PartDesign/App/Feature.cpp
+++ b/src/Mod/PartDesign/App/Feature.cpp
@@ -23,30 +23,26 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <BRep_Tool.hxx>
+# include <BRepBuilderAPI_MakeFace.hxx>
+# include <gp_Pln.hxx>
+# include <gp_Pnt.hxx>
 # include <Standard_Failure.hxx>
-# include <TopoDS_Solid.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
-# include <BRep_Tool.hxx>
-# include <gp_Pnt.hxx>
-# include <gp_Pln.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
 #endif
 
-// TODO Cleanup headers (2015-09-04, Fat-Zer)
-#include <Base/Exception.h>
-#include "App/Document.h"
+#include "App/DocumentObject.h"
 #include <App/FeaturePythonPyImp.h>
 #include "App/OriginFeature.h"
-#include "Body.h"
-#include "ShapeBinder.h"
-#include "Feature.h"
-#include "FeaturePy.h"
-#include "Mod/Part/App/DatumFeature.h"
-
 #include <Base/Console.h>
 
-FC_LOG_LEVEL_INIT("PartDesign",true,true)
+#include "Feature.h"
+#include "FeaturePy.h"
+#include "Body.h"
+#include "ShapeBinder.h"
+
+FC_LOG_LEVEL_INIT("PartDesign", true, true)
 
 
 namespace PartDesign {
diff --git a/src/Mod/PartDesign/App/FeatureAddSub.cpp b/src/Mod/PartDesign/App/FeatureAddSub.cpp
index 335d8e3c4c..a5e21257ed 100644
--- a/src/Mod/PartDesign/App/FeatureAddSub.cpp
+++ b/src/Mod/PartDesign/App/FeatureAddSub.cpp
@@ -26,11 +26,11 @@
 # include <Standard_Failure.hxx>
 #endif
 
-
-#include <Base/Parameter.h>
 #include <App/Application.h>
 #include <App/FeaturePythonPyImp.h>
+#include <Base/Parameter.h>
 #include <Mod/Part/App/modelRefine.h>
+
 #include "FeatureAddSub.h"
 #include "FeaturePy.h"
 
diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h
index c662a0df15..f7fea78e3b 100644
--- a/src/Mod/PartDesign/App/FeatureAddSub.h
+++ b/src/Mod/PartDesign/App/FeatureAddSub.h
@@ -24,9 +24,6 @@
 #ifndef PARTDESIGN_FeatureAdditive_H
 #define PARTDESIGN_FeatureAdditive_H
 
-#include <App/PropertyStandard.h>
-#include <Mod/Part/App/PropertyTopoShape.h>
-
 #include "Feature.h"
 
 /// Base class of all additive features in PartDesign
diff --git a/src/Mod/PartDesign/App/FeatureBase.cpp b/src/Mod/PartDesign/App/FeatureBase.cpp
index 123af4b02e..c80c0169b6 100644
--- a/src/Mod/PartDesign/App/FeatureBase.cpp
+++ b/src/Mod/PartDesign/App/FeatureBase.cpp
@@ -26,7 +26,6 @@
 # include <Standard_Failure.hxx>
 #endif
 
-#include <Base/Exception.h>
 #include <App/FeaturePythonPyImp.h>
 #include "Body.h"
 #include "FeatureBase.h"
diff --git a/src/Mod/PartDesign/App/FeatureBase.h b/src/Mod/PartDesign/App/FeatureBase.h
index 1a993d25c0..0324e6316f 100644
--- a/src/Mod/PartDesign/App/FeatureBase.h
+++ b/src/Mod/PartDesign/App/FeatureBase.h
@@ -1,58 +1,56 @@
-/***************************************************************************
- *   Copyright (c) 2017 Stefan Tröger <stefantroeger@gmx.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                                *
- *                                                                         *
- ***************************************************************************/
-
-
-#ifndef PARTDESIGN_FeatureBase_H
-#define PARTDESIGN_FeatureBase_H
-
-#include <App/PropertyStandard.h>
-#include "Feature.h"
-
-
-/// Base class of all additive features in PartDesign
-namespace PartDesign
-{
-
-class PartDesignExport FeatureBase : public PartDesign::Feature
-{
-    PROPERTY_HEADER(PartDesign::FeatureBase);
-
-public:
-    FeatureBase();
-      
-    virtual short int mustExecute(void) const;
-    
-    virtual Part::Feature* getBaseObject(bool silent=false) const;
-        
-    virtual const char* getViewProviderName() const {
-        return "PartDesignGui::ViewProviderBase";
-    }
-    
-    virtual void onChanged(const App::Property* prop);
-    virtual App::DocumentObjectExecReturn* execute(void);
-    virtual void onDocumentRestored();
-};
-
-} //namespace PartDesign
-
-
-#endif // PARTDESIGN_FeatureBase_H
+/***************************************************************************
+ *   Copyright (c) 2017 Stefan Tröger <stefantroeger@gmx.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                                *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef PARTDESIGN_FeatureBase_H
+#define PARTDESIGN_FeatureBase_H
+
+#include "Feature.h"
+
+/// Base class of all additive features in PartDesign
+namespace PartDesign
+{
+
+class PartDesignExport FeatureBase : public PartDesign::Feature
+{
+    PROPERTY_HEADER(PartDesign::FeatureBase);
+
+public:
+    FeatureBase();
+      
+    virtual short int mustExecute(void) const;
+    
+    virtual Part::Feature* getBaseObject(bool silent=false) const;
+        
+    virtual const char* getViewProviderName() const {
+        return "PartDesignGui::ViewProviderBase";
+    }
+    
+    virtual void onChanged(const App::Property* prop);
+    virtual App::DocumentObjectExecReturn* execute(void);
+    virtual void onDocumentRestored();
+};
+
+} //namespace PartDesign
+
+
+#endif // PARTDESIGN_FeatureBase_H
diff --git a/src/Mod/PartDesign/App/FeatureDressUp.cpp b/src/Mod/PartDesign/App/FeatureDressUp.cpp
index 9017eb028b..637d7e88e1 100644
--- a/src/Mod/PartDesign/App/FeatureDressUp.cpp
+++ b/src/Mod/PartDesign/App/FeatureDressUp.cpp
@@ -23,20 +23,17 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <BRep_Tool.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
-#include <BRep_Tool.hxx>
 #include <TopoDS_Edge.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #endif
 
-
-#include "FeatureDressUp.h"
 #include <App/Document.h>
 #include <Base/Exception.h>
-
-
+#include "FeatureDressUp.h"
 
 using namespace PartDesign;
 
diff --git a/src/Mod/PartDesign/App/FeatureDressUp.h b/src/Mod/PartDesign/App/FeatureDressUp.h
index 1a590ba26b..2b1e2e77d0 100644
--- a/src/Mod/PartDesign/App/FeatureDressUp.h
+++ b/src/Mod/PartDesign/App/FeatureDressUp.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_DressUp_H
 #define PARTDESIGN_DressUp_H
 
-#include <App/PropertyStandard.h>
 #include "FeatureAddSub.h"
 
 namespace PartDesign
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.cpp b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
index 0bd4ffd565..24d1352153 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.cpp
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.cpp
@@ -23,64 +23,42 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <sstream>
-# include <functional>
 # include <Bnd_Box.hxx>
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
-# include <BRepAdaptor_CompCurve.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepAdaptor_Surface.hxx>
 # include <BRepBndLib.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
-# include <BRepCheck_Analyzer.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
 # include <BRepGProp.hxx>
 # include <BRepGProp_Face.hxx>
 # include <BRepLProp_SLProps.hxx>
-# include <BRepPrimAPI_MakePrism.hxx>
-# include <BRepFeat_MakePrism.hxx>
-# include <BRepOffsetAPI_MakeOffset.hxx>
-# include <BRepOffsetAPI_ThruSections.hxx>
 # include <BRepProj_Projection.hxx>
 # include <Extrema_ExtCC.hxx>
 # include <Extrema_POnCurv.hxx>
-# include <Geom_Plane.hxx>
-# include <gp_Ax1.hxx>
 # include <gp_Circ.hxx>
 # include <gp_Pln.hxx>
 # include <GProp_GProps.hxx>
-# include <IntTools_FClass2d.hxx>
 # include <ShapeAnalysis.hxx>
-# include <ShapeAnalysis_Surface.hxx>
-# include <ShapeFix_Face.hxx>
-# include <ShapeFix_Shape.hxx>
-# include <ShapeFix_Wire.hxx>
 # include <Standard_Version.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Compound.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
 # include <TopoDS_Face.hxx>
 # include <TopoDS_Vertex.hxx>
 # include <TopoDS_Wire.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
 # include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
-
 #endif
 
-#include <App/OriginFeature.h>
 #include <App/Document.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
+#include <App/OriginFeature.h>
 #include <Base/Reader.h>
-#include <Base/Console.h>
 #include <Base/Tools.h>
-#include <App/Application.h>
 #include <Mod/Part/App/FaceMakerCheese.h>
+
 #include "DatumLine.h"
 #include "DatumPlane.h"
 #include "FeatureSketchBased.h"
diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h
index e21dceb3fe..d8b9e377b0 100644
--- a/src/Mod/PartDesign/App/FeatureSketchBased.h
+++ b/src/Mod/PartDesign/App/FeatureSketchBased.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_SketchBased_H
 #define PARTDESIGN_SketchBased_H
 
-#include <App/PropertyStandard.h>
 #include <Mod/Part/App/Part2DObject.h>
 #include "FeatureAddSub.h"