diff --git a/src/Mod/Part/App/FeatureChamfer.cpp b/src/Mod/Part/App/FeatureChamfer.cpp
index 3183e93587..2187bed8ff 100644
--- a/src/Mod/Part/App/FeatureChamfer.cpp
+++ b/src/Mod/Part/App/FeatureChamfer.cpp
@@ -20,27 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRepFilletAPI_MakeChamfer.hxx>
 # include <Precision.hxx>
 # include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopTools_ListOfShape.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
 # include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+# include <TopTools_IndexedMapOfShape.hxx>
 #endif
 
-
 #include "FeatureChamfer.h"
 
 
 using namespace Part;
 
-
 PROPERTY_SOURCE(Part::Chamfer, Part::FilletBase)
 
 Chamfer::Chamfer()
diff --git a/src/Mod/Part/App/FeatureChamfer.h b/src/Mod/Part/App/FeatureChamfer.h
index 27a9c5726e..9af5ee50a2 100644
--- a/src/Mod/Part/App/FeatureChamfer.h
+++ b/src/Mod/Part/App/FeatureChamfer.h
@@ -20,13 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATURECHAMFER_H
 #define PART_FEATURECHAMFER_H
 
-#include <App/PropertyStandard.h>
 #include "PartFeature.h"
 
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/FeatureCompound.cpp b/src/Mod/Part/App/FeatureCompound.cpp
index 553cc6306b..8d8a9aeeb9 100644
--- a/src/Mod/Part/App/FeatureCompound.cpp
+++ b/src/Mod/Part/App/FeatureCompound.cpp
@@ -20,23 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRep_Builder.hxx>
+# include <Standard_Failure.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopExp.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
-# include <Standard_Failure.hxx>
 #endif
 
-
 #include "FeatureCompound.h"
 
 
 using namespace Part;
 
-
 PROPERTY_SOURCE(Part::Compound, Part::Feature)
 
 Compound::Compound()
diff --git a/src/Mod/Part/App/FeatureCompound.h b/src/Mod/Part/App/FeatureCompound.h
index 003eece293..86c47e47bd 100644
--- a/src/Mod/Part/App/FeatureCompound.h
+++ b/src/Mod/Part/App/FeatureCompound.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATURECOMPOUND_H
 #define PART_FEATURECOMPOUND_H
 
 #include <App/PropertyLinks.h>
 #include "PartFeature.h"
 
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/FeatureExtrusion.cpp b/src/Mod/Part/App/FeatureExtrusion.cpp
index 67e1978217..3eae98499b 100644
--- a/src/Mod/Part/App/FeatureExtrusion.cpp
+++ b/src/Mod/Part/App/FeatureExtrusion.cpp
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepAdaptor_Surface.hxx>
 # include <BRepAdaptor_Curve.hxx>
+# include <BRepAdaptor_Surface.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepLib_FindSurface.hxx>
 # include <BRepPrimAPI_MakePrism.hxx>
-# include <gp_Pln.hxx>
 # include <gp_Trsf.hxx>
 # include <Precision.hxx>
 # include <TopExp.hxx>
@@ -39,7 +37,6 @@
 #endif
 
 #include <Base/Exception.h>
-#include <Base/Tools.h>
 
 #include "FeatureExtrusion.h"
 #include "ExtrusionHelper.h"
diff --git a/src/Mod/Part/App/FeatureExtrusion.h b/src/Mod/Part/App/FeatureExtrusion.h
index 9b3dcfb309..d9c346e1be 100644
--- a/src/Mod/Part/App/FeatureExtrusion.h
+++ b/src/Mod/Part/App/FeatureExtrusion.h
@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATUREEXTRUSION_H
 #define PART_FEATUREEXTRUSION_H
 
 #include <App/PropertyStandard.h>
 #include <App/PropertyUnits.h>
 
-#include "PartFeature.h"
 #include "FaceMakerCheese.h"
+#include "PartFeature.h"
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/FeatureFace.cpp b/src/Mod/Part/App/FeatureFace.cpp
index 382c2a3305..c1ab98f76b 100644
--- a/src/Mod/Part/App/FeatureFace.cpp
+++ b/src/Mod/Part/App/FeatureFace.cpp
@@ -20,32 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Bnd_Box.hxx>
-# include <gp_Pln.hxx>
-# include <BRep_Builder.hxx>
-# include <BRepBndLib.hxx>
 # include <BRepBuilderAPI_Copy.hxx>
-# include <BRepBuilderAPI_MakeFace.hxx>
-# include <BRepAdaptor_Surface.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_Surface.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Wire.hxx>
-# include <TopExp_Explorer.hxx>
-# include <BRepAlgoAPI_Fuse.hxx>
-# include <gp_Pln.hxx>
 #endif
 
-#include <Base/Placement.h>
-
 #include "FeatureFace.h"
 #include "FaceMaker.h"
-#include <Mod/Part/App/Part2DObject.h>
 
 
 using namespace Part;
diff --git a/src/Mod/Part/App/FeatureFace.h b/src/Mod/Part/App/FeatureFace.h
index dbbc6f08ae..912ad2a554 100644
--- a/src/Mod/Part/App/FeatureFace.h
+++ b/src/Mod/Part/App/FeatureFace.h
@@ -20,11 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FACE_H
 #define PART_FACE_H
 
-#include <Mod/Part/App/PartFeature.h>
+#include "PartFeature.h"
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/FeatureFillet.cpp b/src/Mod/Part/App/FeatureFillet.cpp
index dae4016c17..17ea046085 100644
--- a/src/Mod/Part/App/FeatureFillet.cpp
+++ b/src/Mod/Part/App/FeatureFillet.cpp
@@ -20,10 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRepFilletAPI_MakeFillet.hxx>
+# include <Precision.hxx>
 # include <TopExp.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
@@ -31,15 +31,13 @@
 # include <TopTools_IndexedMapOfShape.hxx>
 #endif
 
-
-#include "FeatureFillet.h"
 #include <Base/Exception.h>
 
-#include <Precision.hxx>
+#include "FeatureFillet.h"
+
 
 using namespace Part;
 
-
 PROPERTY_SOURCE(Part::Fillet, Part::FilletBase)
 
 Fillet::Fillet()
diff --git a/src/Mod/Part/App/FeatureFillet.h b/src/Mod/Part/App/FeatureFillet.h
index e17a216493..86a07eebb0 100644
--- a/src/Mod/Part/App/FeatureFillet.h
+++ b/src/Mod/Part/App/FeatureFillet.h
@@ -20,13 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATUREFILLET_H
 #define PART_FEATUREFILLET_H
 
-#include <App/PropertyStandard.h>
 #include "PartFeature.h"
 
+
 namespace Part
 {
 
diff --git a/src/Mod/Part/App/FeatureGeometrySet.cpp b/src/Mod/Part/App/FeatureGeometrySet.cpp
index fda86d417e..2a2c0e1081 100644
--- a/src/Mod/Part/App/FeatureGeometrySet.cpp
+++ b/src/Mod/Part/App/FeatureGeometrySet.cpp
@@ -20,12 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
-
-#include "Geometry.h"
 
 #include "FeatureGeometrySet.h"
 
diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h
index 47b386a992..79341c0003 100644
--- a/src/Mod/Part/App/FeatureGeometrySet.h
+++ b/src/Mod/Part/App/FeatureGeometrySet.h
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifndef PART_FeatureGeometrySet_H
 #define PART_FeatureGeometrySet_H
 
+#include "PartFeature.h"
 #include "PropertyGeometryList.h"
 
-#include "PartFeature.h"
 
 namespace Part
 {
 
-
 class PartExport FeatureGeometrySet :public Part::Feature
 {
     PROPERTY_HEADER(Part::FeatureGeometrySet);
diff --git a/src/Mod/Part/App/FeatureMirroring.cpp b/src/Mod/Part/App/FeatureMirroring.cpp
index ff10f43bbe..4057881fe9 100644
--- a/src/Mod/Part/App/FeatureMirroring.cpp
+++ b/src/Mod/Part/App/FeatureMirroring.cpp
@@ -20,18 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp.hxx>
+# include <BRepBuilderAPI_Transform.hxx>
 # include <gp_Ax2.hxx>
 # include <gp_Dir.hxx>
 # include <gp_Pnt.hxx>
 # include <gp_Trsf.hxx>
-# include <BRepBuilderAPI_Transform.hxx>
 #endif
 
-
 #include "FeatureMirroring.h"
 
 
diff --git a/src/Mod/Part/App/FeatureMirroring.h b/src/Mod/Part/App/FeatureMirroring.h
index ab59b1e634..6dcdb836b5 100644
--- a/src/Mod/Part/App/FeatureMirroring.h
+++ b/src/Mod/Part/App/FeatureMirroring.h
@@ -20,13 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATUREMIRRORING_H
 #define PART_FEATUREMIRRORING_H
 
 #include <App/PropertyStandard.h>
+
 #include "PartFeature.h"
-#include <Base/Matrix.h>
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/FeatureOffset.cpp b/src/Mod/Part/App/FeatureOffset.cpp
index 785b1effbc..9c265c9a78 100644
--- a/src/Mod/Part/App/FeatureOffset.cpp
+++ b/src/Mod/Part/App/FeatureOffset.cpp
@@ -19,14 +19,15 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Precision.hxx>
 #endif
 
+#include <App/Link.h>
 
 #include "FeatureOffset.h"
-#include <App/Link.h>
 
 
 using namespace Part;
diff --git a/src/Mod/Part/App/FeatureOffset.h b/src/Mod/Part/App/FeatureOffset.h
index e9a7d1208b..a46b55a1ab 100644
--- a/src/Mod/Part/App/FeatureOffset.h
+++ b/src/Mod/Part/App/FeatureOffset.h
@@ -24,8 +24,9 @@
 #define PART_FEATUREOFFSET_H
 
 #include <App/PropertyStandard.h>
-#include <App/PropertyUnits.h>
-#include <Mod/Part/App/PartFeature.h>
+
+#include "PartFeature.h"
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/FeatureRevolution.cpp b/src/Mod/Part/App/FeatureRevolution.cpp
index 367df48443..7ebf8bb27f 100644
--- a/src/Mod/Part/App/FeatureRevolution.cpp
+++ b/src/Mod/Part/App/FeatureRevolution.cpp
@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Ax1.hxx>
-# include <TopoDS.hxx>
 # include <BRepAdaptor_Curve.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Circ.hxx>
+# include <gp_Ax1.hxx>
 # include <TopExp_Explorer.hxx>
+# include <TopoDS.hxx>
 #endif
 
-
 #include "FeatureRevolution.h"
-#include <Base/Tools.h>
-#include <Base/Exception.h>
-#include <App/Application.h>
 #include "FaceMaker.h"
 
+
 using namespace Part;
 
 App::PropertyFloatConstraint::Constraints Revolution::angleRangeU = {-360.0,360.0,1.0};
diff --git a/src/Mod/Part/App/FeatureRevolution.h b/src/Mod/Part/App/FeatureRevolution.h
index a2257ef928..cf8dc28d00 100644
--- a/src/Mod/Part/App/FeatureRevolution.h
+++ b/src/Mod/Part/App/FeatureRevolution.h
@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATUREREVOLUTION_H
 #define PART_FEATUREREVOLUTION_H
 
 #include <App/PropertyStandard.h>
-#include "PartFeature.h"
 #include <Base/Vector3D.h>
 
+#include "PartFeature.h"
+
+
 namespace Part
 {