diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp
index c1d06389e2..fc9e917762 100644
--- a/src/Mod/Measure/App/Measurement.cpp
+++ b/src/Mod/Measure/App/Measurement.cpp
@@ -22,11 +22,11 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
 # include <BRepGProp.hxx>
 # include <GCPnts_AbscissaPoint.hxx>
-# include <gp_Circ.hxx>
 # include <gp_Lin.hxx>
 # include <GProp_GProps.hxx>
 # include <TopoDS.hxx>
diff --git a/src/Mod/Part/App/ParabolaPyImp.cpp b/src/Mod/Part/App/ParabolaPyImp.cpp
index 82eac5a661..83947e9ed0 100644
--- a/src/Mod/Part/App/ParabolaPyImp.cpp
+++ b/src/Mod/Part/App/ParabolaPyImp.cpp
@@ -20,21 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Geom_Parabola.hxx>
-# include <gp_Parab.hxx>
 # include <gce_MakeParab.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
+#include "ParabolaPy.h"
+#include "ParabolaPy.cpp"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/ParabolaPy.h>
-#include <Mod/Part/App/ParabolaPy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp
index d91dee9075..32f83bfac8 100644
--- a/src/Mod/Part/App/Part2DObject.cpp
+++ b/src/Mod/Part/App/Part2DObject.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <TopoDS_Shape.hxx>
@@ -44,18 +43,14 @@
 #define M_PI       3.14159265358979323846
 #endif
 
-
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Reader.h>
-#include <App/Property.h>
-#include <App/PropertyLinks.h>
-#include "Part2DObject.h"
-#include "Geometry.h"
-#include "DatumFeature.h"
-
 #include <App/FeaturePythonPyImp.h>
-#include <Mod/Part/App/Part2DObjectPy.h>
+#include <App/PropertyLinks.h>
+#include <Base/Reader.h>
+
+#include "Part2DObject.h"
+#include "Part2DObjectPy.h"
+#include "Geometry.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h
index 0559418720..4291c38019 100644
--- a/src/Mod/Part/App/Part2DObject.h
+++ b/src/Mod/Part/App/Part2DObject.h
@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifndef PART_PART2DOBJECT_H
 #define PART_PART2DOBJECT_H
 
 #include <App/PropertyStandard.h>
 #include <Base/Axis.h>
 
-#include "PartFeature.h"
 #include "AttachExtension.h"
 
+
 class TopoDS_Face;
 
 namespace Part
diff --git a/src/Mod/Part/App/Part2DObjectPyImp.cpp b/src/Mod/Part/App/Part2DObjectPyImp.cpp
index f3c43d70e4..fb0dd3b01b 100644
--- a/src/Mod/Part/App/Part2DObjectPyImp.cpp
+++ b/src/Mod/Part/App/Part2DObjectPyImp.cpp
@@ -22,13 +22,14 @@
 
 #include "PreCompiled.h"
 
-#include "Mod/Part/App/Part2DObject.h"
+#include "Part2DObject.h"
 #include "OCCError.h"
 
 // inclusion of the generated files (generated out of Part2DObjectPy.xml)
 #include "Part2DObjectPy.h"
 #include "Part2DObjectPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp
index 475f4924e8..58f128b294 100644
--- a/src/Mod/Part/App/PartFeature.cpp
+++ b/src/Mod/Part/App/PartFeature.cpp
@@ -20,58 +20,51 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <sstream>
-# include <gp_Trsf.hxx>
-# include <gp_Ax1.hxx>
-# include <BRepBuilderAPI_MakeShape.hxx>
+# include <Bnd_Box.hxx>
+# include <BRepAdaptor_Curve.hxx>
 # include <BRepAlgoAPI_Fuse.hxx>
 # include <BRepAlgoAPI_Common.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
-# include <TopTools_IndexedMapOfShape.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_MakeShape.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepGProp.hxx>
+# include <BRepIntCurveSurface_Inter.hxx>
+# include <gce_MakeDir.hxx>
+# include <gce_MakeLin.hxx>
+# include <gp_Ax1.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Trsf.hxx>
+# include <GProp_GProps.hxx>
+# include <IntCurveSurface_IntersectionPoint.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
-# include <TopoDS_Face.hxx>
-# include <gp_Dir.hxx>
-# include <gp_Pln.hxx> // for Precision::Confusion()
-# include <Bnd_Box.hxx>
-# include <BRepBndLib.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
-# include <BRepAdaptor_Curve.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
-# include <GProp_GProps.hxx>
-# include <BRepGProp.hxx>
-# include <gce_MakeLin.hxx>
-# include <BRepIntCurveSurface_Inter.hxx>
-# include <IntCurveSurface_IntersectionPoint.hxx>
-# include <gce_MakeDir.hxx>
+# include <TopTools_IndexedMapOfShape.hxx>
+# include <TopTools_ListIteratorOfListOfShape.hxx>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <Base/Console.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Placement.h>
-#include <Base/Rotation.h>
 #include <App/Application.h>
-#include <App/FeaturePythonPyImp.h>
 #include <App/Document.h>
+#include <App/FeaturePythonPyImp.h>
 #include <App/Link.h>
 #include <App/GeoFeatureGroupExtension.h>
+#include <Base/Exception.h>
+#include <Base/Placement.h>
+#include <Base/Rotation.h>
+#include <Base/Stream.h>
 
-#include "PartPyCXX.h"
 #include "PartFeature.h"
 #include "PartFeaturePy.h"
+#include "PartPyCXX.h"
 #include "TopoShapePy.h"
 
+
 using namespace Part;
 namespace bp = boost::placeholders;
 
diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h
index b06d3f1139..9bcfd0d9e3 100644
--- a/src/Mod/Part/App/PartFeature.h
+++ b/src/Mod/Part/App/PartFeature.h
@@ -20,21 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATURE_H
 #define PART_FEATURE_H
 
-#include "TopoShape.h"
-#include "PropertyTopoShape.h"
-#include <App/GeoFeature.h>
 #include <App/FeaturePython.h>
-#include <App/PropertyGeo.h>
-// includes for findAllFacesCutBy()
-#include <TopoDS_Face.hxx>
-#include <BRep_Builder.hxx>
-#include <TopoDS_Compound.hxx>
+#include <App/GeoFeature.h>
 #include <Mod/Part/PartGlobal.h>
 
+#include <TopoDS_Face.hxx>
+
+#include "PropertyTopoShape.h"
+
+
 class gp_Dir;
 class BRepBuilderAPI_MakeShape;
 
diff --git a/src/Mod/Part/App/PartFeaturePyImp.cpp b/src/Mod/Part/App/PartFeaturePyImp.cpp
index e6f8fc5472..b4e1d618d8 100644
--- a/src/Mod/Part/App/PartFeaturePyImp.cpp
+++ b/src/Mod/Part/App/PartFeaturePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #include "PartFeature.h"
@@ -29,6 +28,7 @@
 #include "PartFeaturePy.h"
 #include "PartFeaturePy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represent the object e.g. when printed in python
diff --git a/src/Mod/Part/App/PartFeatureReference.cpp b/src/Mod/Part/App/PartFeatureReference.cpp
index c8f053f776..0a2bfd4cdf 100644
--- a/src/Mod/Part/App/PartFeatureReference.cpp
+++ b/src/Mod/Part/App/PartFeatureReference.cpp
@@ -20,33 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <gp_Trsf.hxx>
 # include <gp_Ax1.hxx>
+# include <gp_Trsf.hxx>
 #endif
 
-
-//#include <strstream>
-//#include <Base/Console.h>
-//#include <Base/Writer.h>
-//#include <Base/Reader.h>
-//#include <Base/Exception.h>
-//#include <Base/FileInfo.h>
-//#include <Base/Stream.h>
 #include <Base/Placement.h>
 #include <Base/Rotation.h>
 
 #include "PartFeatureReference.h"
 
+
 using namespace Part;
 
-
 PROPERTY_SOURCE(Part::FeatureReference, App::GeoFeature)
 
-
 FeatureReference::FeatureReference(void) 
 {
     ADD_PROPERTY(Reference, (nullptr));
@@ -80,5 +70,5 @@ TopLoc_Location FeatureReference::getLocation() const
 }
 
 // ---------------------------------------------------------
-
-
+
+
diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h
index 45bc9c88eb..f6b6074f31 100644
--- a/src/Mod/Part/App/PartFeatureReference.h
+++ b/src/Mod/Part/App/PartFeatureReference.h
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FeatureReference_H
 #define PART_FeatureReference_H
 
-#include "TopoShape.h"
-#include "PropertyTopoShape.h"
 #include <App/GeoFeature.h>
-#include <App/FeaturePython.h>
-#include <App/PropertyLinks.h>
+
+#include "PropertyTopoShape.h"
+
 
 namespace Part
 {
diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp
index d228ae4719..9d39428935 100644
--- a/src/Mod/Part/App/PartFeatures.cpp
+++ b/src/Mod/Part/App/PartFeatures.cpp
@@ -20,34 +20,32 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <BRepFill.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepAdaptor_Curve.hxx>
+# include <memory>
 # include <BRepAdaptor_CompCurve.hxx>
-# include <BRepLib_MakeWire.hxx>
-# include <Geom_BSplineSurface.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Shell.hxx>
-# include <TopTools_HSequenceOfShape.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
+# include <BRepFill.hxx>
+# include <BRepLib_MakeWire.hxx>
 # include <BRepOffsetAPI_MakePipeShell.hxx>
+# include <Geom_BSplineSurface.hxx>
+# include <Precision.hxx>
 # include <ShapeAnalysis.hxx>
 # include <ShapeAnalysis_FreeBounds.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <TopoDS_Iterator.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
-# include <Precision.hxx>
-# include <memory>
+# include <TopoDS_Face.hxx>
+# include <TopoDS_Iterator.hxx>
+# include <TopoDS_Shell.hxx>
+# include <TopTools_HSequenceOfShape.hxx>
+# include <TopTools_ListIteratorOfListOfShape.hxx>
 #endif
 
+#include <App/Link.h>
 
 #include "PartFeatures.h"
-#include <App/Link.h>
 
 
 using namespace Part;
diff --git a/src/Mod/Part/App/PartFeatures.h b/src/Mod/Part/App/PartFeatures.h
index 898dce1945..1b25bee920 100644
--- a/src/Mod/Part/App/PartFeatures.h
+++ b/src/Mod/Part/App/PartFeatures.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_FEATURES_H
 #define PART_FEATURES_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/PartPyCXX.cpp b/src/Mod/Part/App/PartPyCXX.cpp
index 53967567ca..656fe6d4b0 100644
--- a/src/Mod/Part/App/PartPyCXX.cpp
+++ b/src/Mod/Part/App/PartPyCXX.cpp
@@ -21,16 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #include "PartPyCXX.h"
-#include <CXX/Objects.hxx>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
-#include <Mod/Part/App/TopoShapeVertexPy.h>
-#include <Mod/Part/App/TopoShapeSolidPy.h>
-#include <Mod/Part/App/TopoShapeShellPy.h>
-#include <Mod/Part/App/TopoShapeCompSolidPy.h>
-#include <Mod/Part/App/TopoShapeCompoundPy.h>
+
 
 namespace Part {
 PartExport Py::Object shape2pyshape(const TopoShape &shape)
diff --git a/src/Mod/Part/App/PartPyCXX.h b/src/Mod/Part/App/PartPyCXX.h
index f306e44a64..b9b7a75b54 100644
--- a/src/Mod/Part/App/PartPyCXX.h
+++ b/src/Mod/Part/App/PartPyCXX.h
@@ -24,8 +24,10 @@
 #define PART_PYCXX_H
 
 #include <CXX/Extensions.hxx>
+
 #include <Mod/Part/App/TopoShapePy.h>
 
+
 namespace Py {
     typedef ExtensionObject<Part::TopoShapePy> TopoShape;
     template<>
diff --git a/src/Mod/Part/App/PlanePyImp.cpp b/src/Mod/Part/App/PlanePyImp.cpp
index e97759f538..fc51109cd6 100644
--- a/src/Mod/Part/App/PlanePyImp.cpp
+++ b/src/Mod/Part/App/PlanePyImp.cpp
@@ -20,29 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <gp_Ax1.hxx>
 # include <gp_Dir.hxx>
 # include <gp_Pnt.hxx>
-# include <gp_Lin.hxx>
-# include <gp_Pln.hxx>
-# include <Geom_Line.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_TrimmedCurve.hxx>
 # include <GC_MakePlane.hxx>
+# include <Geom_Plane.hxx>
 # include <Standard_Failure.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
+#include "PlanePy.h"
+#include "PlanePy.cpp"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/PlanePy.h>
-#include <Mod/Part/App/PlanePy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/PlateSurfacePyImp.cpp b/src/Mod/Part/App/PlateSurfacePyImp.cpp
index 321ed4790c..c3a56c6f31 100644
--- a/src/Mod/Part/App/PlateSurfacePyImp.cpp
+++ b/src/Mod/Part/App/PlateSurfacePyImp.cpp
@@ -20,25 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <GeomPlate_MakeApprox.hxx>
-# include <GeomPlate_Surface.hxx>
 # include <GeomPlate_BuildPlateSurface.hxx>
+# include <GeomPlate_MakeApprox.hxx>
 # include <GeomPlate_PointConstraint.hxx>
-# include <GeomPlate_CurveConstraint.hxx>
+# include <GeomPlate_Surface.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 #include <Base/Vector3D.h>
 
-#include "OCCError.h"
-#include "Geometry.h"
 #include "PlateSurfacePy.h"
 #include "PlateSurfacePy.cpp"
 #include "BSplineSurfacePy.h"
+#include "OCCError.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/PointPyImp.cpp b/src/Mod/Part/App/PointPyImp.cpp
index 8e2e267cf9..aa88203090 100644
--- a/src/Mod/Part/App/PointPyImp.cpp
+++ b/src/Mod/Part/App/PointPyImp.cpp
@@ -20,28 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRepBuilderAPI_MakeVertex.hxx>
-# include <gp.hxx>
-# include <Geom_CartesianPoint.hxx>
 # include <GC_MakeLine.hxx>
-# include <GC_MakeSegment.hxx>
-# include <Precision.hxx>
+# include <Geom_CartesianPoint.hxx>
 # include <TopoDS_Vertex.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
-#include "Geometry.h"
 #include "PointPy.h"
 #include "PointPy.cpp"
 #include "OCCError.h"
-#include "TopoShape.h"
 #include "TopoShapeVertexPy.h"
 
+
 using namespace Part;
 
 extern const char* gce_ErrorStatusText(gce_ErrorType et);
diff --git a/src/Mod/Part/App/PrecisionPyImp.cpp b/src/Mod/Part/App/PrecisionPyImp.cpp
index e3cab88ca0..3c8bf6dc5c 100644
--- a/src/Mod/Part/App/PrecisionPyImp.cpp
+++ b/src/Mod/Part/App/PrecisionPyImp.cpp
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include "PrecisionPy.h"
 #include "PrecisionPy.cpp"
 
+
 using namespace Part;