diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
index 8337afd4b2..1a176548a9 100644
--- a/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/HLRBRep_AlgoPyImp.cpp
@@ -27,11 +27,12 @@
 # include <gp_Ax2.hxx>
 # include <gp_Pnt.hxx>
 # include <HLRAlgo_Projector.hxx>
+
+# include <boost/math/special_functions/fpclassify.hpp>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
-#include <boost/math/special_functions/fpclassify.hpp>
 
 #include "HLRBRep/HLRBRep_AlgoPy.h"
 #include "HLRBRep/HLRBRep_AlgoPy.cpp"
diff --git a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
index e5c296dd7e..99b780d9dd 100644
--- a/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
+++ b/src/Mod/Part/App/HLRBRep/HLRBRep_PolyAlgoPyImp.cpp
@@ -28,11 +28,12 @@
 # include <gp_Pnt.hxx>
 # include <HLRAlgo_Projector.hxx>
 # include <Standard_Version.hxx>
+
+# include <boost/math/special_functions/fpclassify.hpp>
 #endif
 
 #include <Base/GeometryPyCXX.h>
 #include <Base/VectorPy.h>
-#include <boost/math/special_functions/fpclassify.hpp>
 
 #include "HLRBRep/HLRBRep_PolyAlgoPy.h"
 #include "HLRBRep/HLRBRep_PolyAlgoPy.cpp"
diff --git a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
index d9f8caa56f..475b1704ee 100644
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -377,6 +377,8 @@
 #include <IntTools_FClass2d.hxx>
 #include <Law_Constant.hxx>
 #include <LProp_NotDefined.hxx>
+#include <math_Gauss.hxx>
+#include <math_Matrix.hxx>
 #include <Message_MsgFile.hxx>
 #include <NCollection_List.hxx>
 #include <OSD_OpenFile.hxx>
@@ -413,6 +415,7 @@
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 #include <ShapeFix_Wire.hxx>
+#include <ShapeFix_Wireframe.hxx>
 #include <ShapeUpgrade_ShellSewing.hxx>
 #include <ShapeUpgrade_RemoveInternalWires.hxx>
 
diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h
index 0cf36e4f2e..804a3216a1 100644
--- a/src/Mod/Part/App/PreCompiled.h
+++ b/src/Mod/Part/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PART_PRECOMPILED_H
 #define PART_PRECOMPILED_H
 
@@ -36,69 +35,53 @@
 #	pragma warning( disable : 4786 )  // specifier longer then 255 chars
 #endif
 
-
 #ifdef _PreComp_
 
 // standard
-#include <list>
-#include <iostream>
-#include <sstream>
-#include <fcntl.h>
-
-#include <array>
-#include <vector>
-#include <list>
-#include <set>
-#include <map>
-#include <memory>
-
-#include <fstream>
-#include <string>
-#include <stdexcept>
-#include <tuple>
-
 #include <cassert>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <ctime>
 
-// QT
+// STL
+#include <array>
+#include <fcntl.h>
+#include <fstream>
+#include <list>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+// Qt
 #include <QtGlobal>
 
 // Boost
-#include <boost_signals2.hpp>
-#include <boost/bind/bind.hpp>
-
-#include <boost/utility.hpp>
-#include <boost_graph_adjacency_list.hpp>
-
-#include <boost/program_options.hpp>
-//namespace po = boost::program_options;
-
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
-
 #include <boost/regex.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/core/ignore_unused.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+// OpenCasCade
 #include "OpenCascadeAll.h"
-#include <math_Gauss.hxx>
-#include <math_Matrix.hxx>
 
 #elif defined(FC_OS_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
-#define NOMINMAX
+# define NOMINMAX
 #endif
 #include <Windows.h>
 #include <io.h>
 #endif //_PreComp_
 
 #ifndef _Standard_Version_HeaderFile
-#include <Standard_Version.hxx>
+# include <Standard_Version.hxx>
 #endif
 
-
 #endif
diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
index f538576ff6..db2892d768 100644
--- a/src/Mod/Part/App/TopoShape.cpp
+++ b/src/Mod/Part/App/TopoShape.cpp
@@ -160,11 +160,10 @@
 # include <BRepAdaptor_HCompCurve.hxx>
 #endif
 
+# include <boost/algorithm/string/predicate.hpp>
+# include <boost/core/ignore_unused.hpp>
 #endif // _PreComp_
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/core/ignore_unused.hpp>
-
 #include <App/Material.h>
 #include <Base/BoundBox.h>
 #include <Base/Builder3D.h>
diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h
index e5529a024d..f88b6d206d 100644
--- a/src/Mod/Part/Gui/PreCompiled.h
+++ b/src/Mod/Part/Gui/PreCompiled.h
@@ -45,118 +45,22 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <cassert>
 #include <cfloat>
-# include <cmath>
-#include <sstream>
+#include <cmath>
 
 // STL
-#include <vector>
-#include <list>
-#include <map>
-#include <string>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
 
-// OpenCasCade Base
-#include <Standard_Failure.hxx>
-#include <Standard_Version.hxx>
-
-#if OCC_VERSION_HEX < 0x070400
-#include <BRepMesh.hxx>
-#endif
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <Poly_Connect.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <Poly_Triangulation.hxx>
-
-#include <gp_Ax1.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Trsf.hxx>
-
-#include <gce_ErrorType.hxx>
-#include <GC_MakeArcOfCircle.hxx>
-
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_ElementarySurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
-#include <GeomLProp_SLProps.hxx>
-#include <GeomLib.hxx>
-#include <GeomProjLib.hxx>
-
-#include <TopoDS.hxx>
-#include <TopoDS_Builder.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRepTools.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_Result.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepLProp_SLProps.hxx>
-#include <BRepGProp_Face.hxx>
-#include <BRepPrimAPI_MakeSphere.hxx>
-#include <BRepPrimAPI_MakePrism.hxx>
-#include <BRepProj_Projection.hxx>
-#include <BRepTools_ShapeSet.hxx>
-
-#include <Bnd_Box.hxx>
-#include <GCPnts_UniformDeflection.hxx>
-#include <Precision.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-
-#include <Interface_Static.hxx>
-
-#include <ShapeAnalysis.hxx>
-#include <ShapeAnalysis_FreeBounds.hxx>
-#include <ShapeFix_Wire.hxx>
-#include <ShapeExtend_Explorer.hxx>
-#include <ShapeFix_Edge.hxx>
-#include <ShapeFix_Face.hxx>
-#include <ShapeFix_Wireframe.hxx>
-
-# include <BOPAlgo_ArgumentAnalyzer.hxx>
-# include <BOPAlgo_ListOfCheckResult.hxx>
+// OpenCasCade
+#include <Mod/Part/App/OpenCascadeAll.h>
 
 // Boost
-#include <boost_signals2.hpp>
-#include <boost/bind/bind.hpp>
+#include <boost/regex.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 
 // Qt Toolkit
 #ifndef __QtAll__
@@ -165,33 +69,23 @@
 
 // GL
 // Include glext before InventorAll
-# ifdef FC_OS_WIN32
+#ifdef FC_OS_WIN32
+# include <GL/gl.h>
+# include <GL/glext.h>
+#else
+# ifdef FC_OS_MACOSX
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glext.h>
+# else
+#  ifndef GL_GLEXT_PROTOTYPES
+#   define GL_GLEXT_PROTOTYPES 1
+#  endif
 #  include <GL/gl.h>
 #  include <GL/glext.h>
-# else
-#  ifdef FC_OS_MACOSX
-#   include <OpenGL/gl.h>
-#   include <OpenGL/glext.h>
-#  else
-#   ifndef GL_GLEXT_PROTOTYPES
-#    define GL_GLEXT_PROTOTYPES 1
-#   endif
-#   include <GL/gl.h>
-#   include <GL/glext.h>
-#  endif //FC_OS_MACOSX
-# endif //FC_OS_WIN32
+# endif //FC_OS_MACOSX
+#endif //FC_OS_WIN32
 // Should come after glext.h to avoid warnings
-# include <Inventor/C/glue/gl.h>
-
-#include <Inventor/misc/SoContextHandler.h>
-#include <Inventor/nodes/SoDepthBuffer.h>
-#include <Inventor/nodes/SoVertexProperty.h>
-#include <Inventor/nodes/SoNurbsCurve.h>
-#include <Inventor/engines/SoCalculator.h>
-#include <Inventor/nodes/SoResetTransform.h>
-#include <Inventor/elements/SoOverrideElement.h>
-#include <Inventor/elements/SoPointSizeElement.h>
-#include <Inventor/engines/SoConcatenate.h>
+#include <Inventor/C/glue/gl.h>
 
 // Inventor includes OpenGL
 #ifndef __InventorAll__
diff --git a/src/Mod/Part/Gui/ReferenceHighlighter.cpp b/src/Mod/Part/Gui/ReferenceHighlighter.cpp
index 480a57db64..a42d50bc7e 100644
--- a/src/Mod/Part/Gui/ReferenceHighlighter.cpp
+++ b/src/Mod/Part/Gui/ReferenceHighlighter.cpp
@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+
+# include <boost/algorithm/string/predicate.hpp>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
 #include "ReferenceHighlighter.h"
 
 
diff --git a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
index 4b1761d6e7..3eff9506e2 100644
--- a/src/Mod/Part/Gui/ViewProviderExt.cpp
+++ b/src/Mod/Part/Gui/ViewProviderExt.cpp
@@ -66,10 +66,10 @@
 # include <Inventor/nodes/SoPolygonOffset.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoShapeHints.h>
-#endif
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/regex.hpp>
+# include <boost/regex.hpp>
+# include <boost/algorithm/string/predicate.hpp>
+#endif
 
 #include <App/Application.h>
 #include <App/Document.h>