diff --git a/src/Mod/PartDesign/App/FeatureScaled.cpp b/src/Mod/PartDesign/App/FeatureScaled.cpp
index 61b51871a7..dddef82df3 100644
--- a/src/Mod/PartDesign/App/FeatureScaled.cpp
+++ b/src/Mod/PartDesign/App/FeatureScaled.cpp
@@ -23,17 +23,14 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Precision.hxx>
-# include <GProp_GProps.hxx>
 # include <BRepGProp.hxx>
+# include <GProp_GProps.hxx>
+# include <Precision.hxx>
 #endif
 
 #include "FeatureScaled.h"
 #include "FeatureAddSub.h"
-#include <Mod/Part/App/TopoShape.h>
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
 
 using namespace PartDesign;
 
diff --git a/src/Mod/PartDesign/App/FeatureThickness.cpp b/src/Mod/PartDesign/App/FeatureThickness.cpp
index 3f91def855..56d555b288 100644
--- a/src/Mod/PartDesign/App/FeatureThickness.cpp
+++ b/src/Mod/PartDesign/App/FeatureThickness.cpp
@@ -23,12 +23,12 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <TopoDS.hxx>
 # include <Precision.hxx>
+# include <TopoDS.hxx>
 #endif
 
-#include "FeatureThickness.h"
 #include <Base/Exception.h>
+#include "FeatureThickness.h"
 
 
 using namespace PartDesign;
diff --git a/src/Mod/PartDesign/App/FeatureThickness.h b/src/Mod/PartDesign/App/FeatureThickness.h
index a2cab8eb55..2a1078a4da 100644
--- a/src/Mod/PartDesign/App/FeatureThickness.h
+++ b/src/Mod/PartDesign/App/FeatureThickness.h
@@ -25,7 +25,6 @@
 #define PARTDESIGN_FEATURETHICKNESS_H
 
 #include <App/PropertyStandard.h>
-#include <App/PropertyLinks.h>
 #include <App/PropertyUnits.h>
 #include "FeatureDressUp.h"
 
diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp
index 45b69f3857..fd79b62475 100644
--- a/src/Mod/PartDesign/App/FeatureTransformed.cpp
+++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp
@@ -22,34 +22,32 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepBuilderAPI_Transform.hxx>
-# include <BRepAlgoAPI_Fuse.hxx>
-# include <BRepAlgoAPI_Cut.hxx>
-# include <BRep_Builder.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
-# include <Precision.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepBndLib.hxx>
 # include <Bnd_Box.hxx>
+# include <BRep_Builder.hxx>
+# include <BRepAlgoAPI_Cut.hxx>
+# include <BRepAlgoAPI_Fuse.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
+# include <BRepBuilderAPI_Transform.hxx>
+# include <Precision.hxx>
+# include <TopExp_Explorer.hxx>
 #endif
 
+#include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/Exception.h>
+#include <Base/Parameter.h>
+#include <Base/Reader.h>
+#include <Mod/Part/App/modelRefine.h>
+
 #include "FeatureTransformed.h"
-#include "FeatureMultiTransform.h"
+#include "Body.h"
 #include "FeatureAddSub.h"
 #include "FeatureMirrored.h"
 #include "FeatureLinearPattern.h"
 #include "FeaturePolarPattern.h"
 #include "FeatureSketchBased.h"
-#include "Body.h"
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Parameter.h>
-#include <Base/Reader.h>
-#include <App/Application.h>
-#include <Mod/Part/App/modelRefine.h>
 
 using namespace PartDesign;
 
diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
index dcf82058b8..2b4737b6cb 100644
--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
@@ -24,26 +24,19 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QMessageBox>
 # include <QAction>
 #endif
 
+#include <App/DocumentObject.h>
+#include <Base/Console.h>
+#include <Gui/Command.h>
+#include <Gui/Selection.h>
+#include <Gui/ViewProvider.h>
+#include <Mod/PartDesign/App/FeatureScaled.h>
+
 #include "ui_TaskScaledParameters.h"
 #include "TaskScaledParameters.h"
 #include "TaskMultiTransformParameters.h"
-#include <Base/UnitsApi.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
-#include <Gui/Selection.h>
-#include <Gui/Command.h>
-#include <Mod/PartDesign/App/FeatureScaled.h>
-#include <Mod/Sketcher/App/SketchObject.h>
 
 using namespace PartDesignGui;
 using namespace Gui;
diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.h b/src/Mod/PartDesign/Gui/TaskScaledParameters.h
index 7fc844ff18..618d982b1a 100644
--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.h
@@ -24,9 +24,7 @@
 #ifndef GUI_TASKVIEW_TaskScaledParameters_H
 #define GUI_TASKVIEW_TaskScaledParameters_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-#include <Gui/TaskView/TaskDialog.h>
 
 #include "TaskTransformedParameters.h"
 #include "ViewProviderScaled.h"
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
index fb5ac630d3..ea0bdec706 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
@@ -25,27 +25,18 @@
 
 #ifndef _PreComp_
 # include <QAction>
-# include <QKeyEvent>
 # include <QListWidget>
 # include <QMessageBox>
 #endif
 
-#include "ui_TaskThicknessParameters.h"
-#include "TaskThicknessParameters.h"
-#include <Base/UnitsApi.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-#include <Base/Console.h>
+#include <App/DocumentObject.h>
 #include <Gui/Selection.h>
 #include <Gui/Command.h>
-#include <Gui/MainWindow.h>
+#include <Gui/ViewProvider.h>
 #include <Mod/PartDesign/App/FeatureThickness.h>
-#include <Mod/PartDesign/Gui/ReferenceSelection.h>
+
+#include "ui_TaskThicknessParameters.h"
+#include "TaskThicknessParameters.h"
 
 using namespace PartDesignGui;
 using namespace Gui;
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
index 0674829203..715e19c3c5 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
+++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
@@ -23,16 +23,10 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <boost_bind_bind.hpp>
-#endif
+#include <Gui/BitmapFactory.h>
 
 #include "ui_TaskTransformedMessages.h"
 #include "TaskTransformedMessages.h"
-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/BitmapFactory.h>
-
 #include "ViewProviderTransformed.h"
 
 using namespace PartDesignGui;
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h
index 3445dfdd06..44996230f7 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h
+++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h
@@ -25,7 +25,6 @@
 #define GUI_TASKVIEW_TaskTransformedMessages_H
 
 #include <Gui/TaskView/TaskView.h>
-#include <boost_signals2.hpp>
 
 class Ui_TaskTransformedMessages;
 typedef boost::signals2::connection Connection;
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
index 595af78a66..c2bd4b7352 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
@@ -23,38 +23,26 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QMessageBox>
 # include <QListWidget>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS.hxx>
-# include <BRepAdaptor_Surface.hxx>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-
-#include <Base/Console.h>
 #include <App/Application.h>
-#include <App/Document.h>
+#include <App/DocumentObject.h>
 #include <App/Origin.h>
-#include <App/OriginFeature.h>
-#include <Gui/Application.h>
+#include <Base/Console.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 <Mod/PartDesign/App/FeatureTransformed.h>
 #include <Mod/PartDesign/App/Body.h>
 #include <Mod/PartDesign/App/FeatureAddSub.h>
-
-#include "ReferenceSelection.h"
-#include "TaskMultiTransformParameters.h"
-#include "Utils.h"
+#include <Mod/PartDesign/App/FeatureTransformed.h>
 
 #include "TaskTransformedParameters.h"
+#include "TaskMultiTransformParameters.h"
+#include "ReferenceSelection.h"
+
 
 FC_LOG_LEVEL_INIT("PartDesign",true,true)
 
diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
index 0acb02b31c..b4e13e9cc6 100644
--- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h
@@ -26,13 +26,12 @@
 
 #include <QComboBox>
 
+#include <Gui/DocumentObserver.h>
+#include <Gui/Selection.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Part/App/Part2DObject.h>
 #include <Mod/PartDesign/Gui/EnumFlags.h>
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-#include <Gui/DocumentObserver.h>
-
 #include "TaskFeatureParameters.h"
 #include "TaskTransformedMessages.h"
 #include "ViewProviderTransformed.h"
diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
index 30a47bd63f..3bd2d60bff 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ViewProviderScaled.h"
 #include "TaskScaledParameters.h"
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp
index fd25b663e6..c1cd1a91d0 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "TaskThicknessParameters.h"
 #include "ViewProviderThickness.h"
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
index 0e3b7f0b06..184c00bf9b 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
@@ -28,10 +28,10 @@
 # include <BRep_Tool.hxx>
 # include <BRepBndLib.hxx>
 # include <BRepMesh_IncrementalMesh.hxx>
+# include <Poly_Triangulation.hxx>
 # include <Standard_Version.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
-# include <Poly_Triangulation.hxx>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
 # include <Inventor/nodes/SoIndexedFaceSet.h>
@@ -44,21 +44,15 @@
 # include <Inventor/nodes/SoTransparencyType.h>
 # include <QAction>
 # include <QMenu>
-# include <QMessageBox>
 #endif
 
+#include <Base/Console.h>
+#include <Gui/Application.h>
+#include <Mod/Part/App/Tools.h>
+#include <Mod/PartDesign/App/FeatureMultiTransform.h>
+
 #include "ViewProviderTransformed.h"
 #include "TaskTransformedParameters.h"
-#include <Base/Console.h>
-#include <Gui/Control.h>
-#include <Gui/Command.h>
-#include <Gui/Application.h>
-#include <Gui/Command.h>
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/Tools.h>
-#include <Mod/PartDesign/App/FeatureTransformed.h>
-#include <Mod/PartDesign/App/FeatureAddSub.h>
-#include <Mod/PartDesign/App/FeatureMultiTransform.h>
 
 using namespace PartDesignGui;