diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp
index 125de7caad..ee49850477 100644
--- a/src/Mod/PartDesign/App/AppPartDesign.cpp
+++ b/src/Mod/PartDesign/App/AppPartDesign.cpp
@@ -27,39 +27,39 @@
 #endif
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
-#include "FeaturePad.h"
-#include "FeatureSolid.h"
-#include "FeaturePocket.h"
-#include "FeatureFillet.h"
-#include "FeatureSketchBased.h"
-#include "FeatureRevolution.h"
-#include "FeatureGroove.h"
 #include "Body.h"
-#include "FeatureDressUp.h"
+#include "DatumCS.h"
+#include "DatumLine.h"
+#include "DatumPlane.h"
+#include "DatumPoint.h"
+#include "FeatureBase.h"
+#include "FeatureBoolean.h"
 #include "FeatureChamfer.h"
 #include "FeatureDraft.h"
-#include "FeatureTransformed.h"
-#include "FeatureMirrored.h"
-#include "FeatureLinearPattern.h"
-#include "FeaturePolarPattern.h"
-#include "FeatureScaled.h"
-#include "FeatureMultiTransform.h"
-#include "FeatureHole.h"
-#include "DatumPlane.h"
-#include "DatumLine.h"
-#include "DatumPoint.h"
-#include "FeatureBoolean.h"
-#include "FeaturePrimitive.h"
-#include "DatumCS.h"
-#include "FeatureThickness.h"
-#include "FeaturePipe.h"
-#include "FeatureLoft.h"
-#include "ShapeBinder.h"
-#include "FeatureBase.h"
+#include "FeatureDressUp.h"
+#include "FeatureFillet.h"
+#include "FeatureGroove.h"
 #include "FeatureHelix.h"
+#include "FeatureHole.h"
+#include "FeatureLinearPattern.h"
+#include "FeatureLoft.h"
+#include "FeatureMirrored.h"
+#include "FeatureMultiTransform.h"
+#include "FeaturePad.h"
+#include "FeaturePipe.h"
+#include "FeaturePocket.h"
+#include "FeaturePolarPattern.h"
+#include "FeaturePrimitive.h"
+#include "FeatureRevolution.h"
+#include "FeatureScaled.h"
+#include "FeatureSketchBased.h"
+#include "FeatureSolid.h"
+#include "FeatureThickness.h"
+#include "FeatureTransformed.h"
+#include "ShapeBinder.h"
 
 namespace PartDesign {
 extern PyObject* initModule();
diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp
index abd8bcb7e5..8beae3af88 100644
--- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp
+++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp
@@ -22,13 +22,11 @@
 
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <Python.h>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 #include <Base/Tools.h>
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index a6bae0cee7..45e4077531 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -24,54 +24,45 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <TopoDS_Face.hxx>
-# include <TopoDS.hxx>
-# include <BRepAdaptor_Surface.hxx>
 # include <BRep_Tool.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopLoc_Location.hxx>
+# include <BRepAdaptor_Surface.hxx>
 # include <GeomLib_IsPlanarSurface.hxx>
 # include <QMessageBox>
-# include <Inventor/nodes/SoCamera.h>
-# include <sstream>
-# include <algorithm>
+# include <TopExp_Explorer.hxx>
+# include <TopLoc_Location.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Face.hxx>
 #endif
 
-#include <App/DocumentObjectGroup.h>
 #include <App/Origin.h>
-#include <App/OriginFeature.h>
 #include <App/Part.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/CommandT.h>
 #include <Gui/Control.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Document.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Mod/Sketcher/App/SketchObject.h>
-
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureGroove.h>
-#include <Mod/PartDesign/App/FeatureRevolution.h>
-
-#include <Mod/PartDesign/App/FeatureTransformed.h>
 #include <Mod/PartDesign/App/FeatureMultiTransform.h>
-#include <Mod/PartDesign/App/DatumPoint.h>
+#include <Mod/PartDesign/App/FeatureRevolution.h>
+#include <Mod/PartDesign/App/FeatureTransformed.h>
 #include <Mod/PartDesign/App/DatumLine.h>
 #include <Mod/PartDesign/App/DatumPlane.h>
+#include <Mod/PartDesign/App/DatumPoint.h>
 #include <Mod/PartDesign/App/FeatureDressUp.h>
 #include <Mod/PartDesign/App/ShapeBinder.h>
 
-#include "TaskFeaturePick.h"
+#include "DlgActiveBody.h"
 #include "ReferenceSelection.h"
+#include "TaskFeaturePick.h"
 #include "Utils.h"
 #include "WorkflowManager.h"
 #include "ViewProvider.h"
 #include "ViewProviderBody.h"
-#include "DlgActiveBody.h"
+
 
 // TODO Remove this header after fixing code so it won;t be needed here (2015-10-20, Fat-Zer)
 #include "ui_DlgReference.h"
diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp
index 5d1bdb959f..492962e503 100644
--- a/src/Mod/PartDesign/Gui/CommandBody.cpp
+++ b/src/Mod/PartDesign/Gui/CommandBody.cpp
@@ -24,35 +24,29 @@
 
 #ifndef _PreComp_
 # include <QApplication>
-# include <QMessageBox>
 # include <QInputDialog>
-# include <Inventor/C/basic.h>
+# include <QMessageBox>
 # include <TopExp_Explorer.hxx>
 #endif
 
-#include <Base/Console.h>
 #include <App/Origin.h>
 #include <App/Part.h>
+#include <Base/Console.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/Document.h>
 #include <Gui/Application.h>
-#include <Gui/ActiveObjectList.h>
 #include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-
 #include <Mod/Sketcher/App/SketchObject.h>
 #include <Mod/PartDesign/App/Body.h>
-#include <Mod/PartDesign/App/Feature.h>
 #include <Mod/PartDesign/App/FeatureBase.h>
 #include <Mod/PartDesign/App/FeatureSketchBased.h>
 
-#include "Utils.h"
 #include "TaskFeaturePick.h"
+#include "Utils.h"
 #include "WorkflowManager.h"
 
 
-
 //===========================================================================
 // Shared functions
 //===========================================================================
diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
index 6aceb1116d..cb8dd7f158 100644
--- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
+++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
@@ -22,26 +22,25 @@
 
 
 #include "PreCompiled.h"
-#include <Mod/PartDesign/App/Body.h>
-#include <Mod/PartDesign/App/FeaturePrimitive.h>
+
 #ifndef _PreComp_
-# include <Inventor/nodes/SoPickStyle.h>
 # include <QApplication>
 # include <QMessageBox>
 #endif
 
 #include <App/Document.h>
-#include <Gui/Command.h>
 #include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/MainWindow.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Application.h>
-#include <Base/Console.h>
+#include <Mod/PartDesign/App/Body.h>
+#include <Mod/PartDesign/App/FeaturePrimitive.h>
 
+#include "DlgActiveBody.h"
 #include "Utils.h"
 #include "WorkflowManager.h"
-#include "DlgActiveBody.h"
 
 using namespace std;
 
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 04927fbc6b..e9d1a8b8ee 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -23,26 +23,16 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <boost_bind_bind.hpp>
-# include <QMessageBox>
-#endif
-
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/MDIView.h>
-#include <Gui/MenuManager.h>
-
 #include <Mod/Sketcher/Gui/Workbench.h>
 #include <Mod/PartDesign/App/Body.h>
-#include <Mod/PartDesign/App/Feature.h>
 #include <Mod/PartDesign/App/FeatureMultiTransform.h>
 
 #include "Utils.h"
-
 #include "Workbench.h"
-
 #include "WorkflowManager.h"
 
 using namespace PartDesignGui;
diff --git a/src/Mod/PartDesign/Gui/Workbench.h b/src/Mod/PartDesign/Gui/Workbench.h
index 647bd6c54a..97975ea020 100644
--- a/src/Mod/PartDesign/Gui/Workbench.h
+++ b/src/Mod/PartDesign/Gui/Workbench.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_WORKBENCH_H
 #define PARTDESIGN_WORKBENCH_H
 
-#include <boost_signals2.hpp>
 #include <Gui/Workbench.h>
 #include <Mod/PartDesign/PartDesignGlobal.h>
 
diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.cpp b/src/Mod/PartDesign/Gui/WorkflowManager.cpp
index 2671d35e62..6277f5c8fa 100644
--- a/src/Mod/PartDesign/Gui/WorkflowManager.cpp
+++ b/src/Mod/PartDesign/Gui/WorkflowManager.cpp
@@ -23,20 +23,15 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <vector>
-# include <list>
-# include <set>
-# include <boost_bind_bind.hpp>
 # include <QMessageBox>
 # include <QPushButton>
 #endif
 
-#include <Base/Exception.h>
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Command.h>
 #include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Gui/MainWindow.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/Feature.h>
 #include "WorkflowManager.h"
@@ -45,10 +40,8 @@
 using namespace PartDesignGui;
 namespace bp = boost::placeholders;
 
-
 WorkflowManager * WorkflowManager::_instance = nullptr;
 
-
 WorkflowManager::WorkflowManager() {
     // Fill the map with already opened documents
    for ( auto doc : App::GetApplication().getDocuments() ) {
diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.h b/src/Mod/PartDesign/Gui/WorkflowManager.h
index a66e7e10d1..baf60419db 100644
--- a/src/Mod/PartDesign/Gui/WorkflowManager.h
+++ b/src/Mod/PartDesign/Gui/WorkflowManager.h
@@ -23,9 +23,6 @@
 #ifndef WORKFLOWMANAGER_H_PB7A5GCM
 #define WORKFLOWMANAGER_H_PB7A5GCM
 
-#include <boost_signals2.hpp>
-#include <map>
-
 namespace App {
     class Document;
 }