diff --git a/src/Mod/Path/App/AppPath.cpp b/src/Mod/Path/App/AppPath.cpp
index dce12ea957..fe05bece15 100644
--- a/src/Mod/Path/App/AppPath.cpp
+++ b/src/Mod/Path/App/AppPath.cpp
@@ -23,19 +23,18 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 
+#include "AreaPy.h"
 #include "Command.h"
 #include "CommandPy.h"
-#include "Path.h"
-#include "PathPy.h"
-#include "PropertyPath.h"
+#include "FeatureArea.h"
 #include "FeaturePath.h"
 #include "FeaturePathCompound.h"
 #include "FeaturePathShape.h"
-#include "AreaPy.h"
-#include "FeatureArea.h"
+#include "Path.h"
+#include "PathPy.h"
+#include "PropertyPath.h"
 #include "Voronoi.h"
 #include "VoronoiCell.h"
 #include "VoronoiCellPy.h"
diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp
index e3305aff80..36b2c94458 100644
--- a/src/Mod/Path/App/AppPathPy.cpp
+++ b/src/Mod/Path/App/AppPathPy.cpp
@@ -21,39 +21,32 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <BRep_Tool.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <gp_Circ.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Pnt.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Vertex.hxx>
+# include <TopExp_Explorer.hxx>
+#endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
+#include <App/Application.h>
+#include <App/Document.h>
+#include <App/DocumentObjectPy.h>
 #include <Base/Console.h>
-#include <Base/VectorPy.h>
 #include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
 #include <Base/Stream.h>
-#include <App/Document.h>
-#include <App/DocumentObjectPy.h>
-#include <App/Application.h>
-
+#include <Base/VectorPy.h>
 #include <Mod/Part/App/OCCError.h>
-#include <Mod/Part/App/TopoShape.h>
 #include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Part/App/PartPyCXX.h>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopExp_Explorer.hxx>
-#include <gp_Lin.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
 
-#include "CommandPy.h"
-#include "PathPy.h"
-#include "Path.h"
-#include "FeaturePath.h"
-#include "FeaturePathCompound.h"
 #include "Area.h"
+#include "PathPy.h"
+#include "FeaturePath.h"
 
 
 #define PATH_CATCH catch (Standard_Failure &e)                      \
diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp
index 94a5758b4d..92494e4d48 100644
--- a/src/Mod/Path/App/Area.cpp
+++ b/src/Mod/Path/App/Area.cpp
@@ -20,7 +20,6 @@
  *                                                                          *
  ****************************************************************************/
 
-
 #include "PreCompiled.h"
 
 // From Boost 1.75 on the geometry component requires C++14
@@ -28,74 +27,58 @@
 
 #ifndef _PreComp_
 # include <cfloat>
-# include <boost/version.hpp>
-# include <boost/config.hpp>
 
 # include <boost_geometry.hpp>
-# include <boost/geometry/index/rtree.hpp>
-# include <boost/geometry/geometries/geometries.hpp>
 # include <boost/geometry/geometries/register/point.hpp>
-# include <boost/range/adaptor/indexed.hpp>
+# include <boost/geometry/index/rtree.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 <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakeFace.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
+# include <BRepLib.hxx>
 # include <BRepLib_MakeFace.hxx>
 # include <BRepLib_FindSurface.hxx>
-# include <BRepTools.hxx>
 # include <BRepTools_WireExplorer.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 <GCPnts_QuasiUniformDeflection.hxx>
 # include <GCPnts_UniformAbscissa.hxx>
 # include <GCPnts_UniformDeflection.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
 # include <gp_Circ.hxx>
-# include <gp_GTrsf.hxx>
-# include <HLRBRep.hxx>
+# include <HLRAlgo_Projector.hxx>
 # include <HLRBRep_Algo.hxx>
 # include <HLRBRep_HLRToShape.hxx>
-# include <HLRAlgo_Projector.hxx>
+# include <Precision.hxx>
+# include <ShapeAnalysis_FreeBounds.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>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Tools.h>
-
 #include <App/Application.h>
 #include <App/Document.h>
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/FaceMakerBullseye.h>
+#include <Base/Exception.h>
 #include <Mod/Part/App/CrossSection.h>
+#include <Mod/Part/App/FaceMakerBullseye.h>
+#include <Mod/Part/App/PartFeature.h>
+#include <Mod/Path/libarea/Area.h>
+
 #include "Area.h"
-#include "../libarea/Area.h"
+
 
 //FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro
 #if defined(__clang__)
diff --git a/src/Mod/Path/App/Area.h b/src/Mod/Path/App/Area.h
index 8994be0f55..614adfafa7 100644
--- a/src/Mod/Path/App/Area.h
+++ b/src/Mod/Path/App/Area.h
@@ -23,22 +23,20 @@
 #ifndef PATH_AREA_H
 #define PATH_AREA_H
 
-#include <QCoreApplication>
 #include <chrono>
+#include <list>
 #include <memory>
 #include <vector>
-#include <list>
-#include <TopoDS.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Circ.hxx>
-#include <gp_GTrsf.hxx>
 
-#include <Base/Console.h>
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/PartPyCXX.h>
+#include <TopoDS.hxx>
+
 #include <Mod/Path/PathGlobal.h>
-#include "Path.h"
+#include <Mod/Part/App/PartPyCXX.h>
+#include <Mod/Part/App/TopoShape.h>
+
 #include "AreaParams.h"
+#include "Path.h"
+
 
 class CArea;
 class CCurve;
diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp
index dffe627c64..42676f7e17 100644
--- a/src/Mod/Path/App/AreaPyImp.cpp
+++ b/src/Mod/Path/App/AreaPyImp.cpp
@@ -24,9 +24,6 @@
 
 #include <Mod/Part/App/OCCError.h>
 #include <Mod/Part/App/TopoShapePy.h>
-#include <Base/VectorPy.h>
-
-#include "Area.h"
 
 // inclusion of the generated files (generated out of AreaPy.xml)
 #include "AreaPy.h"
diff --git a/src/Mod/Path/App/Command.cpp b/src/Mod/Path/App/Command.cpp
index 3f78109903..6d838688ae 100644
--- a/src/Mod/Path/App/Command.cpp
+++ b/src/Mod/Path/App/Command.cpp
@@ -20,23 +20,22 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <cinttypes>
 # include <iomanip>
 # include <boost/algorithm/string.hpp>
-# include <boost/lexical_cast.hpp>
 #endif
 
-#include <Base/Vector3D.h>
-#include <Base/Rotation.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
 #include <Base/Exception.h>
+#include <Base/Reader.h>
+#include <Base/Rotation.h>
+#include <Base/Vector3D.h>
+#include <Base/Writer.h>
+
 #include "Command.h"
 
+
 using namespace Base;
 using namespace Path;
 
diff --git a/src/Mod/Path/App/CommandPyImp.cpp b/src/Mod/Path/App/CommandPyImp.cpp
index 835756ee71..9cca92bdc0 100644
--- a/src/Mod/Path/App/CommandPyImp.cpp
+++ b/src/Mod/Path/App/CommandPyImp.cpp
@@ -21,22 +21,18 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
-
 #ifndef _PreComp_
 # include <boost/algorithm/string.hpp>
 #endif
 
 #include <Base/Exception.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
 #include <Base/PlacementPy.h>
-#include "Mod/Path/App/Command.h"
 
 // files generated out of CommandPy.xml
 #include "CommandPy.h"
 #include "CommandPy.cpp"
 
+
 using namespace Path;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Path/App/FeatureArea.cpp b/src/Mod/Path/App/FeatureArea.cpp
index 26dd7cc07b..03224c1769 100644
--- a/src/Mod/Path/App/FeatureArea.cpp
+++ b/src/Mod/Path/App/FeatureArea.cpp
@@ -21,42 +21,43 @@
  ****************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <BRep_Builder.hxx>
+# include <Precision.hxx>
 # include <TopoDS_Compound.hxx>
 #endif
 
+#include <Base/Console.h> // for FC_LOG_LEVEL_INIT
+#include <Base/Placement.h>
+
 #include "FeatureArea.h"
 #include "FeatureAreaPy.h"
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
-#include <Mod/Part/App/PartFeature.h>
 
-FC_LOG_LEVEL_INIT("Path.Area",true,true)
+
+FC_LOG_LEVEL_INIT("Path.Area", true, true)
 
 using namespace Path;
 
 PROPERTY_SOURCE(Path::FeatureArea, Part::Feature)
 
-PARAM_ENUM_STRING_DECLARE(static const char *Enums,AREA_PARAMS_ALL)
+PARAM_ENUM_STRING_DECLARE(static const char* Enums, AREA_PARAMS_ALL)
 
 FeatureArea::FeatureArea()
     :myInited(false)
 {
-    ADD_PROPERTY(Sources,(nullptr));
-    ADD_PROPERTY(WorkPlane,(TopoDS_Shape()));
+    ADD_PROPERTY(Sources, (nullptr));
+    ADD_PROPERTY(WorkPlane, (TopoDS_Shape()));
 
-    PARAM_PROP_ADD("Area",AREA_PARAMS_OPCODE);
-    PARAM_PROP_ADD("Area",AREA_PARAMS_BASE);
-    PARAM_PROP_ADD("Offset",AREA_PARAMS_OFFSET);
+    PARAM_PROP_ADD("Area", AREA_PARAMS_OPCODE);
+    PARAM_PROP_ADD("Area", AREA_PARAMS_BASE);
+    PARAM_PROP_ADD("Offset", AREA_PARAMS_OFFSET);
     PARAM_PROP_ADD("Offset", AREA_PARAMS_OFFSET_CONF);
-    PARAM_PROP_ADD("Pocket",AREA_PARAMS_POCKET);
-    PARAM_PROP_ADD("Pocket",AREA_PARAMS_POCKET_CONF);
-    PARAM_PROP_ADD("Section",AREA_PARAMS_SECTION);
-    PARAM_PROP_ADD("libarea",AREA_PARAMS_CAREA);
+    PARAM_PROP_ADD("Pocket", AREA_PARAMS_POCKET);
+    PARAM_PROP_ADD("Pocket", AREA_PARAMS_POCKET_CONF);
+    PARAM_PROP_ADD("Section", AREA_PARAMS_SECTION);
+    PARAM_PROP_ADD("libarea", AREA_PARAMS_CAREA);
 
-    PARAM_PROP_SET_ENUM(Enums,AREA_PARAMS_ALL);
+    PARAM_PROP_SET_ENUM(Enums, AREA_PARAMS_ALL);
     PocketMode.setValue((long)0);
 }
 
diff --git a/src/Mod/Path/App/FeatureArea.h b/src/Mod/Path/App/FeatureArea.h
index 6dfd90b2fc..9a2a83a549 100644
--- a/src/Mod/Path/App/FeatureArea.h
+++ b/src/Mod/Path/App/FeatureArea.h
@@ -24,13 +24,13 @@
 #define PATH_FeatureArea_H
 
 #include <App/DocumentObject.h>
-#include <App/GeoFeature.h>
-#include <App/PropertyUnits.h>
 #include <App/FeaturePython.h>
+#include <App/PropertyUnits.h>
 #include "Mod/Part/App/PartFeature.h"
 
 #include "Area.h"
 
+
 namespace Path
 {
 
diff --git a/src/Mod/Path/App/FeatureAreaPyImp.cpp b/src/Mod/Path/App/FeatureAreaPyImp.cpp
index 1bf741aae3..ac2d4b479f 100644
--- a/src/Mod/Path/App/FeatureAreaPyImp.cpp
+++ b/src/Mod/Path/App/FeatureAreaPyImp.cpp
@@ -22,9 +22,7 @@
 
 #include "PreCompiled.h"
 
-#include <CXX/Objects.hxx>
 #include <Mod/Part/App/TopoShapePy.h>
-#include "FeatureArea.h"
 
 // inclusion of the generated files (generated out of FeatureAreaPy.xml)
 #include "FeatureAreaPy.h"
@@ -32,8 +30,8 @@
 
 #include "AreaPy.h"
 
-using namespace Path;
 
+using namespace Path;
 
 // returns a string which represent the object e.g. when printed in python
 std::string FeatureAreaPy::representation() const
diff --git a/src/Mod/Path/App/FeaturePath.cpp b/src/Mod/Path/App/FeaturePath.cpp
index fe9d8eec06..77e4212362 100644
--- a/src/Mod/Path/App/FeaturePath.cpp
+++ b/src/Mod/Path/App/FeaturePath.cpp
@@ -20,15 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
+#include <App/DocumentObjectPy.h>
 
 #include "FeaturePath.h"
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
+
 
 using namespace Path;
 
diff --git a/src/Mod/Path/App/FeaturePath.h b/src/Mod/Path/App/FeaturePath.h
index 926b671b60..298077ffcd 100644
--- a/src/Mod/Path/App/FeaturePath.h
+++ b/src/Mod/Path/App/FeaturePath.h
@@ -20,19 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PATH_FeaturePath_H
 #define PATH_FeaturePath_H
 
 #include <App/DocumentObject.h>
 #include <App/GeoFeature.h>
-#include <App/PropertyFile.h>
-#include <App/PropertyGeo.h>
 #include <App/FeaturePython.h>
 
-#include "Path.h"
 #include "PropertyPath.h"
 
+
 namespace Path
 {
 
diff --git a/src/Mod/Path/App/FeaturePathCompound.cpp b/src/Mod/Path/App/FeaturePathCompound.cpp
index 4dc2a38951..f93bc21572 100644
--- a/src/Mod/Path/App/FeaturePathCompound.cpp
+++ b/src/Mod/Path/App/FeaturePathCompound.cpp
@@ -20,17 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "FeaturePathCompound.h"
 #include "Command.h"
-#include "Path.h"
 #include "FeaturePathCompoundPy.h"
-#include <App/FeaturePythonPyImp.h>
+
 
 using namespace Path;
 using namespace App;
diff --git a/src/Mod/Path/App/FeaturePathCompound.h b/src/Mod/Path/App/FeaturePathCompound.h
index b20bbdafb4..3fa2330bae 100644
--- a/src/Mod/Path/App/FeaturePathCompound.h
+++ b/src/Mod/Path/App/FeaturePathCompound.h
@@ -20,18 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PATH_FeatureCompound_H
 #define PATH_FeatureCompound_H
 
-#include <App/GeoFeature.h>
-#include <App/PropertyFile.h>
-#include <App/PropertyGeo.h>
-#include <App/PropertyUnits.h>
+#include <App/PropertyLinks.h>
 
-#include "Path.h"
 #include "FeaturePath.h"
-#include "PropertyPath.h"
+
 
 namespace Path
 {
diff --git a/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp b/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp
index 82ba77bd63..5d62b84258 100644
--- a/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp
+++ b/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp
@@ -20,18 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "FeaturePathCompound.h"
-#include <CXX/Objects.hxx>
-
 // inclusion of the generated files (generated out of FeaturePathCompoundPy.xml)
 #include "FeaturePathCompoundPy.h"
 #include "FeaturePathCompoundPy.cpp"
 
-using namespace Path;
 
+using namespace Path;
 
 // returns a string which represents the object e.g. when printed in python
 std::string FeaturePathCompoundPy::representation() const
diff --git a/src/Mod/Path/App/FeaturePathShape.cpp b/src/Mod/Path/App/FeaturePathShape.cpp
index 5b2430398d..42895dc7bc 100644
--- a/src/Mod/Path/App/FeaturePathShape.cpp
+++ b/src/Mod/Path/App/FeaturePathShape.cpp
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (c) 2014 Yorik van Havre <yorik@uncreated.net>              *
+ *   Copyright (c) 2017 Lei Zheng <realthunder.dev@gmail.com>             *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -19,31 +20,15 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
-/*
- *  Copyright (c) 2017 Zheng, Lei <realthunder.dev@gmail.com>
- */
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <TopoDS.hxx>
-# include <TopoDS_Shape.hxx>
-# include <TopoDS_Edge.hxx>
-# include <TopExp_Explorer.hxx>
-# include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
-# include <BRepBuilderAPI_MakeWire.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
 #include "FeaturePathShape.h"
-#include "Command.h"
 
-#include <App/DocumentObjectPy.h>
-#include <Base/Placement.h>
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/PartFeature.h>
-
-#include "FeatureArea.h"
 
 using namespace Path;
 
diff --git a/src/Mod/Path/App/FeaturePathShape.h b/src/Mod/Path/App/FeaturePathShape.h
index a20d3d7c4a..6f995a45b9 100644
--- a/src/Mod/Path/App/FeaturePathShape.h
+++ b/src/Mod/Path/App/FeaturePathShape.h
@@ -25,15 +25,12 @@
 #define PATH_FeaturePathShape_H
 
 #include <App/DocumentObject.h>
-#include <App/GeoFeature.h>
-#include <App/PropertyGeo.h>
 #include <App/FeaturePython.h>
-#include "Mod/Part/App/PropertyTopoShape.h"
+#include <App/PropertyGeo.h>
 
-#include "PropertyPath.h"
-#include "FeaturePath.h"
 #include "FeatureArea.h"
-#include "Area.h"
+#include "FeaturePath.h"
+
 
 namespace Path
 {
diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/Path/App/PreCompiled.h
index 2d814c4266..b510b2868c 100644
--- a/src/Mod/Path/App/PreCompiled.h
+++ b/src/Mod/Path/App/PreCompiled.h
@@ -59,11 +59,10 @@
 
 // Boost
 #include <boost/config.hpp>
-#include <boost/version.hpp>
-
 #include <boost/geometry.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
+#include <boost/version.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
@@ -100,7 +99,8 @@
 #include <GeomAbs_JoinType.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <gp_Circ.hxx>
-#include <gp_GTrsf.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Pnt.hxx>
 #include <HLRAlgo_Projector.hxx>
 #include <HLRBRep.hxx>
 #include <HLRBRep_Algo.hxx>
@@ -113,12 +113,12 @@
 #include <Standard_Version.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 
 #endif // _PreComp_