diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_EdgeConnectPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_EdgeConnectPyImp.cpp
index 680aacce6a..cb14b3f555 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_EdgeConnectPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_EdgeConnectPyImp.cpp
@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 #endif
 
@@ -31,6 +29,7 @@
 #include "ShapeFix/ShapeFix_EdgeConnectPy.cpp"
 #include "TopoShapeEdgePy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_EdgePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_EdgePyImp.cpp
index aa3223b598..e10de77e1a 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_EdgePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_EdgePyImp.cpp
@@ -20,21 +20,20 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Precision.hxx>
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 #endif
 
+#include <Base/PlacementPy.h>
+
 #include "ShapeFix/ShapeFix_EdgePy.h"
 #include "ShapeFix/ShapeFix_EdgePy.cpp"
-#include <Base/PlacementPy.h>
-#include <Mod/Part/App/GeometrySurfacePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
+#include "GeometrySurfacePy.h"
 #include "Tools.h"
+#include "TopoShapeEdgePy.h"
+#include "TopoShapeFacePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_FaceConnectPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_FaceConnectPyImp.cpp
index be3b72c6f3..cc0e334a05 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_FaceConnectPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_FaceConnectPyImp.cpp
@@ -20,12 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Face.hxx>
 # include <TopoDS_Shell.hxx>
 #endif
 
@@ -34,6 +31,7 @@
 #include "TopoShapeFacePy.h"
 #include "TopoShapeShellPy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_FacePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_FacePyImp.cpp
index 2209ffad7e..46cc5e146f 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_FacePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_FacePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <TopoDS.hxx>
@@ -33,6 +32,7 @@
 #include <Mod/Part/App/TopoShapeFacePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePyImp.cpp
index 4a23fdff6b..bf4575f47d 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <TopoDS.hxx>
@@ -31,8 +30,8 @@
 #include "ShapeFix/ShapeFix_FixSmallFacePy.cpp"
 #include "TopoShapeFacePy.h"
 
-using namespace Part;
 
+using namespace Part;
 
 std::string ShapeFix_FixSmallFacePy::representation() const
 {
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallSolidPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallSolidPyImp.cpp
index ae24b8b5ec..9b9e10b965 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallSolidPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallSolidPyImp.cpp
@@ -20,19 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <ShapeBuild_ReShape.hxx>
-# include <TopoDS_Shape.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_FixSmallSolidPy.h"
 #include "ShapeFix/ShapeFix_FixSmallSolidPy.cpp"
 #include "TopoShapePy.h"
 
-using namespace Part;
 
+using namespace Part;
 
 std::string ShapeFix_FixSmallSolidPy::representation() const
 {
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_FreeBoundsPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_FreeBoundsPyImp.cpp
index 6a2bd4251b..22cf89c550 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_FreeBoundsPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_FreeBoundsPyImp.cpp
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Shell.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_FreeBoundsPy.h"
 #include "ShapeFix/ShapeFix_FreeBoundsPy.cpp"
 #include "TopoShapePy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_RootPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_RootPyImp.cpp
index e79aac1afb..b61c693644 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_RootPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_RootPyImp.cpp
@@ -20,16 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Precision.hxx>
-# include <Standard_Failure.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_RootPy.h"
 #include "ShapeFix/ShapeFix_RootPy.cpp"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_ShapePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_ShapePyImp.cpp
index bf7c15af68..3ff8999235 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_ShapePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_ShapePyImp.cpp
@@ -20,20 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <TopoDS.hxx>
-#endif
 
 #include "ShapeFix/ShapeFix_ShapePy.h"
 #include "ShapeFix/ShapeFix_ShapePy.cpp"
 #include "ShapeFix/ShapeFix_EdgePy.h"
-#include "ShapeFix/ShapeFix_WirePy.h"
 #include "ShapeFix/ShapeFix_FacePy.h"
 #include "ShapeFix/ShapeFix_ShellPy.h"
 #include "ShapeFix/ShapeFix_SolidPy.h"
-#include <Mod/Part/App/TopoShapePy.h>
+#include "ShapeFix/ShapeFix_WirePy.h"
+#include "TopoShapePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_ShapeTolerancePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_ShapeTolerancePyImp.cpp
index 9da4b99833..11e2e0545a 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_ShapeTolerancePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_ShapeTolerancePyImp.cpp
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Shell.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_ShapeTolerancePy.h"
 #include "ShapeFix/ShapeFix_ShapeTolerancePy.cpp"
 #include "TopoShapePy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_ShellPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_ShellPyImp.cpp
index 8a6c78fbdc..d8cc6c9fff 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_ShellPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_ShellPyImp.cpp
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Precision.hxx>
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_ShellPy.h"
 #include "ShapeFix/ShapeFix_ShellPy.cpp"
 #include "ShapeFix/ShapeFix_FacePy.h"
-#include <Mod/Part/App/TopoShapeShellPy.h>
+#include "TopoShapeShellPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_SolidPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_SolidPyImp.cpp
index d54e30f2ca..2eac76f081 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_SolidPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_SolidPyImp.cpp
@@ -20,26 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Precision.hxx>
-# include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Solid.hxx>
-#endif
 
-#if OCC_VERSION_HEX >= 0x070500
-# include <Message_ProgressRange.hxx>
+# if OCC_VERSION_HEX >= 0x070500
+#  include <Message_ProgressRange.hxx>
+# endif
 #endif
 
 #include "ShapeFix/ShapeFix_SolidPy.h"
 #include "ShapeFix/ShapeFix_SolidPy.cpp"
 #include "ShapeFix/ShapeFix_ShellPy.h"
-#include "ShapeFix/ShapeFix_FacePy.h"
-#include <Mod/Part/App/TopoShapeShellPy.h>
-#include <Mod/Part/App/TopoShapeSolidPy.h>
+#include "TopoShapeShellPy.h"
+#include "TopoShapeSolidPy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_SplitCommonVertexPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_SplitCommonVertexPyImp.cpp
index 283cf08483..ab63ad0209 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_SplitCommonVertexPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_SplitCommonVertexPyImp.cpp
@@ -20,20 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <TopoDS.hxx>
-#endif
-
+#
 #include "ShapeFix/ShapeFix_SplitCommonVertexPy.h"
 #include "ShapeFix/ShapeFix_SplitCommonVertexPy.cpp"
-#include "ShapeFix/ShapeFix_EdgePy.h"
-#include "ShapeFix/ShapeFix_WirePy.h"
-#include "ShapeFix/ShapeFix_FacePy.h"
-#include "ShapeFix/ShapeFix_ShellPy.h"
-#include "ShapeFix/ShapeFix_SolidPy.h"
-#include <Mod/Part/App/TopoShapePy.h>
+#include "TopoShapePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_SplitToolPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_SplitToolPyImp.cpp
index 0b74d7f1f3..ccfa69d338 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_SplitToolPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_SplitToolPyImp.cpp
@@ -20,14 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <ShapeFix_Wire.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <TopoDS_Face.hxx>
-# include <TopoDS_Vertex.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_SplitToolPy.h"
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_WirePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_WirePyImp.cpp
index c7572f4bc4..b478eda156 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_WirePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_WirePyImp.cpp
@@ -20,22 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <ShapeFix_Wire.hxx>
 # include <TopoDS.hxx>
 #endif
 
+#include <Base/PlacementPy.h>
+
 #include "ShapeFix/ShapeFix_WirePy.h"
 #include "ShapeFix/ShapeFix_WirePy.cpp"
 #include "ShapeFix/ShapeFix_EdgePy.h"
-#include <Base/PlacementPy.h>
-#include <Mod/Part/App/GeometrySurfacePy.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeWirePy.h>
+#include "GeometrySurfacePy.h"
 #include "OCCError.h"
 #include "Tools.h"
+#include "TopoShapeFacePy.h"
+#include "TopoShapeWirePy.h"
+
 
 using namespace Part;
 
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_WireVertexPyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_WireVertexPyImp.cpp
index 1690a30a48..8ae6665f61 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_WireVertexPyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_WireVertexPyImp.cpp
@@ -20,18 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Standard_Failure.hxx>
 # include <TopoDS.hxx>
-# include <TopoDS_Wire.hxx>
 #endif
 
 #include "ShapeFix/ShapeFix_WireVertexPy.h"
 #include "ShapeFix/ShapeFix_WireVertexPy.cpp"
 #include "TopoShapeWirePy.h"
 
+
 using namespace Part;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Part/App/ShapeFix/ShapeFix_WireframePyImp.cpp b/src/Mod/Part/App/ShapeFix/ShapeFix_WireframePyImp.cpp
index 093fa973c5..7142265b8e 100644
--- a/src/Mod/Part/App/ShapeFix/ShapeFix_WireframePyImp.cpp
+++ b/src/Mod/Part/App/ShapeFix/ShapeFix_WireframePyImp.cpp
@@ -20,21 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <TopoDS.hxx>
-#endif
 
 #include "ShapeFix/ShapeFix_WireframePy.h"
 #include "ShapeFix/ShapeFix_WireframePy.cpp"
-#include "ShapeFix/ShapeFix_WirePy.h"
-#include <Mod/Part/App/GeometrySurfacePy.h>
-#include <Mod/Part/App/TopoShapePy.h>
+#include "TopoShapePy.h"
+
 
 using namespace Part;
 
-
 std::string ShapeFix_WireframePy::representation() const
 {
     return "<ShapeFix_Wireframe object>";