diff --git a/src/Mod/Part/App/HyperbolaPyImp.cpp b/src/Mod/Part/App/HyperbolaPyImp.cpp
index b2079f94a0..b3a65c4d99 100644
--- a/src/Mod/Part/App/HyperbolaPyImp.cpp
+++ b/src/Mod/Part/App/HyperbolaPyImp.cpp
@@ -20,21 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp_Hypr.hxx>
-# include <Geom_Hyperbola.hxx>
 # include <GC_MakeHyperbola.hxx>
+# include <Geom_Hyperbola.hxx>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
 
+#include "HyperbolaPy.h"
+#include "HyperbolaPy.cpp"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/HyperbolaPy.h>
-#include <Mod/Part/App/HyperbolaPy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ImportIges.h b/src/Mod/Part/App/ImportIges.h
index ebc40e57d5..6d760fcdbd 100644
--- a/src/Mod/Part/App/ImportIges.h
+++ b/src/Mod/Part/App/ImportIges.h
@@ -20,12 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_IMPORT_IGES_H
 #define PART_IMPORT_IGES_H
 
 #include <Mod/Part/PartGlobal.h>
-#include <TopoDS_Shape.hxx>
+
 
 namespace App {
 class Document;
diff --git a/src/Mod/Part/App/ImportStep.h b/src/Mod/Part/App/ImportStep.h
index 65b7f4148d..84163393f5 100644
--- a/src/Mod/Part/App/ImportStep.h
+++ b/src/Mod/Part/App/ImportStep.h
@@ -20,15 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _ImportStep_h_
 #define _ImportStep_h_
 
-#include <TopoDS_Shape.hxx>
 #include <Mod/Part/PartGlobal.h>
-#include <App/ComplexGeoData.h>
+
 
 namespace App {
 class Document;
diff --git a/src/Mod/Part/App/LinePyImp.cpp b/src/Mod/Part/App/LinePyImp.cpp
index ab466a3def..2a43b36023 100644
--- a/src/Mod/Part/App/LinePyImp.cpp
+++ b/src/Mod/Part/App/LinePyImp.cpp
@@ -20,23 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp.hxx>
-# include <gp_Lin.hxx>
 # include <Geom_Line.hxx>
 # include <GC_MakeLine.hxx>
-# include <Precision.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
+#include "LinePy.h"
+#include "LinePy.cpp"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/LinePy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/LineSegmentPyImp.cpp b/src/Mod/Part/App/LineSegmentPyImp.cpp
index 494dd239f7..58438b1a91 100644
--- a/src/Mod/Part/App/LineSegmentPyImp.cpp
+++ b/src/Mod/Part/App/LineSegmentPyImp.cpp
@@ -20,26 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <gp.hxx>
-# include <gp_Lin.hxx>
+# include <GC_MakeSegment.hxx>
 # include <Geom_Line.hxx>
 # include <Geom_TrimmedCurve.hxx>
-# include <GC_MakeLine.hxx>
-# include <GC_MakeSegment.hxx>
-# include <Precision.hxx>
 #endif
 
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
+#include <Base/VectorPy.h>
 
+#include "LineSegmentPy.h"
+#include "LineSegmentPy.cpp"
+#include "LinePy.h"
 #include "OCCError.h"
-#include "Geometry.h"
-#include <Mod/Part/App/LinePy.h>
-#include <Mod/Part/App/LineSegmentPy.h>
-#include <Mod/Part/App/LineSegmentPy.cpp>
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/modelRefine.cpp b/src/Mod/Part/App/modelRefine.cpp
index cdbf9021d8..3ae916200e 100644
--- a/src/Mod/Part/App/modelRefine.cpp
+++ b/src/Mod/Part/App/modelRefine.cpp
@@ -20,59 +20,54 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <algorithm>
 # include <iterator>
-# include <Geom_Surface.hxx>
-# include <Geom_RectangularTrimmedSurface.hxx>
-# include <GeomAdaptor_Surface.hxx>
-# include <Geom_Plane.hxx>
-# include <Geom_CylindricalSurface.hxx>
-# include <gp_Ax3.hxx>
-# include <Geom_BSplineSurface.hxx>
-# include <gp_Pln.hxx>
-# include <gp_Cylinder.hxx>
-# include <TColgp_Array2OfPnt.hxx>
-# include <TColStd_Array1OfReal.hxx>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopoDS.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
+# include <Bnd_Box.hxx>
+# include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
-# include <BRepLib_MakeWire.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepGProp.hxx>
 # include <BRepLib_FuseEdges.hxx>
+# include <BRepLib_MakeWire.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeSolid.hxx>
 # include <BRepBuilderAPI_Sewing.hxx>
+# include <Geom_BSplineSurface.hxx>
 # include <Geom_Conic.hxx>
-# include <ShapeBuild_ReShape.hxx>
-# include <ShapeFix_Face.hxx>
-# include <TopTools_ListOfShape.hxx>
-# include <TopTools_ListIteratorOfListOfShape.hxx>
-# include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-# include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
-# include <BRep_Builder.hxx>
-# include <Bnd_Box.hxx>
-# include <BRepBndLib.hxx>
-# include <ShapeAnalysis_Edge.hxx>
+# include <Geom_CylindricalSurface.hxx>
+# include <Geom_Plane.hxx>
+# include <Geom_RectangularTrimmedSurface.hxx>
+# include <Geom_Surface.hxx>
+# include <GeomAdaptor_Surface.hxx>
+# include <GeomAPI_ProjectPointOnSurf.hxx>
+# include <gp_Ax3.hxx>
+# include <gp_Cylinder.hxx>
+# include <gp_Pln.hxx>
+# include <GProp_GProps.hxx>
 # include <ShapeAnalysis_Curve.hxx>
 # include <ShapeAnalysis_Shell.hxx>
-# include <BRepAdaptor_Curve.hxx>
-# include <TColgp_SequenceOfPnt.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
-# include <BRepGProp.hxx>
-# include <GProp_GProps.hxx>
+# include <ShapeBuild_ReShape.hxx>
+# include <ShapeFix_Face.hxx>
 # include <Standard_Version.hxx>
+# include <TColgp_Array2OfPnt.hxx>
+# include <TColgp_SequenceOfPnt.hxx>
+# include <TColStd_Array1OfReal.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Compound.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
+# include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
+# include <TopTools_ListIteratorOfListOfShape.hxx>
+# include <TopTools_ListOfShape.hxx>
 #endif // _PreComp_
 
-#include <Base/Tools.h>
-
 #include <Base/Console.h>
-#include <Base/Tools.h>
 
 #include "modelRefine.h"
 
@@ -80,7 +75,6 @@
 using namespace ModelRefine;
 
 
-
 void ModelRefine::getFaceEdges(const TopoDS_Face &face, EdgeVectorType &edges)
 {
     TopExp_Explorer it;
diff --git a/src/Mod/Part/App/modelRefine.h b/src/Mod/Part/App/modelRefine.h
index 5ba8e6a950..4186d1c1db 100644
--- a/src/Mod/Part/App/modelRefine.h
+++ b/src/Mod/Part/App/modelRefine.h
@@ -20,24 +20,24 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MODELREFINE_H
 #define MODELREFINE_H
 
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
+#include <vector>
+
+#include <BRepBuilderAPI_MakeShape.hxx>
 #include <GeomAbs_SurfaceType.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shell.hxx>
+
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <BRepBuilderAPI_MakeShape.hxx>
+#include <TopTools_MapOfShape.hxx>
+
 #include <Mod/Part/PartGlobal.h>