diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.h b/src/Mod/PartDesign/App/FeatureLinearPattern.h
index 9649b28b44..bd4189ecc7 100644
--- a/src/Mod/PartDesign/App/FeatureLinearPattern.h
+++ b/src/Mod/PartDesign/App/FeatureLinearPattern.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_FeatureLinearPattern_H
 #define PARTDESIGN_FeatureLinearPattern_H
 
-#include <App/PropertyStandard.h>
 #include <App/PropertyUnits.h>
 #include "FeatureTransformed.h"
 
diff --git a/src/Mod/PartDesign/App/FeatureLoft.h b/src/Mod/PartDesign/App/FeatureLoft.h
index ad4658e566..70fc16a8af 100644
--- a/src/Mod/PartDesign/App/FeatureLoft.h
+++ b/src/Mod/PartDesign/App/FeatureLoft.h
@@ -24,10 +24,6 @@
 #ifndef PARTDESIGN_Loft_H
 #define PARTDESIGN_Loft_H
 
-#include <App/PropertyUnits.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
-
 #include "FeatureSketchBased.h"
 
 namespace PartDesign
diff --git a/src/Mod/PartDesign/App/FeatureMirrored.h b/src/Mod/PartDesign/App/FeatureMirrored.h
index 1a80a95e92..643f32f8be 100644
--- a/src/Mod/PartDesign/App/FeatureMirrored.h
+++ b/src/Mod/PartDesign/App/FeatureMirrored.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_FeatureMirrored_H
 #define PARTDESIGN_FeatureMirrored_H
 
-#include <App/PropertyStandard.h>
 #include "FeatureTransformed.h"
 
 
diff --git a/src/Mod/PartDesign/App/FeatureMultiTransform.h b/src/Mod/PartDesign/App/FeatureMultiTransform.h
index 5cc181d531..dca8054d7e 100644
--- a/src/Mod/PartDesign/App/FeatureMultiTransform.h
+++ b/src/Mod/PartDesign/App/FeatureMultiTransform.h
@@ -24,7 +24,6 @@
 #ifndef PARTDESIGN_FeatureMultiTransform_H
 #define PARTDESIGN_FeatureMultiTransform_H
 
-#include <App/PropertyStandard.h>
 #include "FeatureTransformed.h"
 
 
diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h
index 3ee59d0d73..af718ed0e0 100644
--- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h
+++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h
@@ -23,14 +23,13 @@
 #ifndef PARTDESIGNGUI_FeaturePickDialog_H
 #define PARTDESIGNGUI_FeaturePickDialog_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/Selection.h>
-#include <Gui/DocumentObserver.h>
-#include <Gui/TaskView/TaskDialog.h>
-#include <Gui/ViewProviderOrigin.h>
 #include <App/DocumentObject.h>
+#include <Gui/DocumentObserver.h>
+#include <Gui/Selection.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
+#include <Gui/ViewProviderOrigin.h>
 
-#include <boost/function.hpp>
 #include <QListWidgetItem>
 
 namespace PartDesignGui {
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h
index a997eaa4cd..dbfc3429c9 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.h
@@ -24,9 +24,7 @@
 #ifndef GUI_TASKVIEW_TaskLinearPatternParameters_H
 #define GUI_TASKVIEW_TaskLinearPatternParameters_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-#include <Gui/TaskView/TaskDialog.h>
 
 #include "TaskTransformedParameters.h"
 #include "ViewProviderLinearPattern.h"
diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.h b/src/Mod/PartDesign/Gui/TaskLoftParameters.h
index f0951bf29a..571e8ccad2 100644
--- a/src/Mod/PartDesign/Gui/TaskLoftParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.h
@@ -24,9 +24,7 @@
 #ifndef GUI_TASKVIEW_TaskLoftParameters_H
 #define GUI_TASKVIEW_TaskLoftParameters_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-#include <Gui/TaskView/TaskDialog.h>
 
 #include "TaskSketchBasedParameters.h"
 #include "ViewProviderLoft.h"
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h
index 297b572391..68d58ad544 100644
--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.h
@@ -24,9 +24,7 @@
 #ifndef GUI_TASKVIEW_TaskMirroredParameters_H
 #define GUI_TASKVIEW_TaskMirroredParameters_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-#include <Gui/TaskView/TaskDialog.h>
 
 #include "TaskTransformedParameters.h"
 #include "ViewProviderMirrored.h"
diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h
index 57188b73d6..8d683ab62e 100644
--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.h
@@ -24,9 +24,7 @@
 #ifndef GUI_TASKVIEW_TaskMultiTransformParameters_H
 #define GUI_TASKVIEW_TaskMultiTransformParameters_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/Selection.h>
-#include <Gui/TaskView/TaskDialog.h>
 
 #include "TaskTransformedParameters.h"
 #include "ViewProviderMultiTransform.h"
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
index 1a4c765dbd..3f57850dce 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ViewProviderLinearPattern.h"
 #include "TaskLinearPatternParameters.h"
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
index b4de80d1fd..5e81e4a3d4 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
@@ -24,22 +24,16 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QMessageBox>
 # include <QMenu>
 #endif
 
-#include "Utils.h"
-#include "ViewProviderLoft.h"
-#include "TaskLoftParameters.h"
-#include <Mod/PartDesign/App/Body.h>
-#include <Mod/PartDesign/App/FeatureLoft.h>
-#include <Mod/Sketcher/App/SketchObject.h>
-#include <Mod/Part/Gui/ReferenceHighlighter.h>
-#include <Gui/Control.h>
-#include <Gui/Command.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
+#include <Mod/Part/Gui/ReferenceHighlighter.h>
+#include <Mod/PartDesign/App/FeatureLoft.h>
 
+#include "ViewProviderLoft.h"
+#include "TaskLoftParameters.h"
 
 using namespace PartDesignGui;
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMainPart.cpp b/src/Mod/PartDesign/Gui/ViewProviderMainPart.cpp
index 274fba2988..48db4c3d64 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMainPart.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMainPart.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ViewProviderMainPart.h"
 #include <Mod/PartDesign/App/FeatureMainPart.h>
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
index 9a01dbb151..e92e8935fe 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ViewProviderMirrored.h"
 #include "TaskMirroredParameters.h"
 
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
index cbd6f4641f..cdb4e00c9b 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
@@ -23,9 +23,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "ViewProviderMultiTransform.h"
 #include "TaskMultiTransformParameters.h"
 #include <Mod/PartDesign/App/FeatureMultiTransform.h>