diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp
index 1f8d0b73ac..ee650e0383 100644
--- a/src/Mod/Path/App/Area.cpp
+++ b/src/Mod/Path/App/Area.cpp
@@ -42,52 +42,52 @@
 # include <boost/range/adaptor/indexed.hpp>
 # include <boost/range/adaptor/transformed.hpp>
 
+# include <Bnd_Box.hxx>
 # include <BRepLib.hxx>
 # include <BRep_Builder.hxx>
 # include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepAdaptor_Surface.hxx>
+# include <BRepBndLib.hxx>
+# include <BRepBuilderAPI_Copy.hxx>
 # include <BRepBuilderAPI_FindPlane.hxx>
-# include <BRepLib_FindSurface.hxx>
 # include <BRepBuilderAPI_MakeEdge.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
+# include <BRepBuilderAPI_MakeVertex.hxx>
+# include <BRepBuilderAPI_MakeWire.hxx>
+# include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepLib_MakeFace.hxx>
+# include <BRepLib_FindSurface.hxx>
 # include <BRepTools.hxx>
 # include <BRepTools_WireExplorer.hxx>
-# include <TopoDS.hxx>
-# include <TopoDS_Compound.hxx>
-# include <TopoDS_Solid.hxx>
-# include <TopoDS_Vertex.hxx>
-# include <TopExp.hxx>
-# include <TopExp_Explorer.hxx>
 # include <GeomAbs_JoinType.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
 # include <Geom_Circle.hxx>
 # include <Geom_Ellipse.hxx>
 # include <Geom_Line.hxx>
 # include <Geom_Plane.hxx>
-# include <Standard_Failure.hxx>
+# include <GCPnts_QuasiUniformDeflection.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
 # include <gp_Circ.hxx>
 # include <gp_GTrsf.hxx>
-# include <Standard_Version.hxx>
-# include <GCPnts_QuasiUniformDeflection.hxx>
-# include <GCPnts_UniformDeflection.hxx>
-# include <GCPnts_UniformAbscissa.hxx>
-# include <BRepBndLib.hxx>
-# include <BRepLib_MakeFace.hxx>
-# include <Bnd_Box.hxx>
-# include <BRepBuilderAPI_Copy.hxx>
-# include <BRepBuilderAPI_MakeVertex.hxx>
-# include <BRepExtrema_DistShapeShape.hxx>
 # include <HLRBRep.hxx>
 # include <HLRBRep_Algo.hxx>
 # include <HLRBRep_HLRToShape.hxx>
 # include <HLRAlgo_Projector.hxx>
-# include <ShapeFix_ShapeTolerance.hxx>
 # include <ShapeExtend_WireData.hxx>
+# include <ShapeFix_ShapeTolerance.hxx>
 # include <ShapeFix_Wire.hxx>
 # include <ShapeAnalysis_FreeBounds.hxx>
+# include <Standard_Failure.hxx>
+# include <Standard_Version.hxx>
+# include <TopExp.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Compound.hxx>
+# include <TopoDS_Solid.hxx>
+# include <TopoDS_Vertex.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
 #endif
 
 #include <Base/Exception.h>
diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/Path/App/PreCompiled.h
index adde2f8041..f623727e1a 100644
--- a/src/Mod/Path/App/PreCompiled.h
+++ b/src/Mod/Path/App/PreCompiled.h
@@ -44,89 +44,86 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
 #include <bitset>
+#include <cassert>
 #include <cctype>
-
 #include <cinttypes>
+#include <cstdio>
 #include <iomanip>
+#include <iostream>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <vector>
 
 // Boost
-#include <boost/version.hpp>
 #include <boost/config.hpp>
+#include <boost/version.hpp>
 #if defined(BOOST_MSVC) && (BOOST_VERSION == 105500)
 // for fixing issue https://svn.boost.org/trac/boost/ticket/9332
 #   include "boost_fix/intrusive/detail/memory_util.hpp"
 #   include "boost_fix/container/detail/memory_util.hpp"
 #endif
 #include <boost/geometry.hpp>
-#include <boost/geometry/index/rtree.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
+#include <boost/algorithm/string.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
+#include <boost/geometry/index/rtree.hpp>
 #include <boost/range/adaptor/indexed.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/regex.hpp>
-
 //OCC
-#include <BRepLib.hxx>
+#include <Bnd_Box.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
+#include <BRepBndLib.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
 #include <BRepBuilderAPI_FindPlane.hxx>
-#include <BRepLib_FindSurface.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepBuilderAPI_MakeWire.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepLib.hxx>
+#include <BRepLib_FindSurface.hxx>
+#include <BRepLib_MakeFace.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
+#include <GCPnts_QuasiUniformDeflection.hxx>
+#include <GCPnts_UniformDeflection.hxx>
+#include <GCPnts_UniformAbscissa.hxx>
+#include <Geom_Circle.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Plane.hxx>
+#include <GeomAbs_JoinType.hxx>
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <gp_Circ.hxx>
+#include <gp_GTrsf.hxx>
+#include <HLRAlgo_Projector.hxx>
+#include <HLRBRep.hxx>
+#include <HLRBRep_Algo.hxx>
+#include <HLRBRep_HLRToShape.hxx>
+#include <ShapeAnalysis_FreeBounds.hxx>
+#include <ShapeExtend_WireData.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
+#include <ShapeFix_Wire.hxx>
+#include <Standard_Failure.hxx>
+#include <Standard_Version.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <GeomAbs_JoinType.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Plane.hxx>
-#include <Standard_Failure.hxx>
-#include <gp_Circ.hxx>
-#include <gp_GTrsf.hxx>
-#include <Standard_Version.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
-#include <GCPnts_UniformDeflection.hxx>
-#include <GCPnts_UniformAbscissa.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepLib_MakeFace.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
-#include <HLRBRep.hxx>
-#include <HLRBRep_Algo.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <ShapeExtend_WireData.hxx>
-#include <ShapeFix_Wire.hxx>
-#include <ShapeAnalysis_FreeBounds.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
+#include <TopTools_HSequenceOfShape.hxx>
 
 #endif // _PreComp_
 #endif
-