diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp
index e9e4700257..92494e4d48 100644
--- a/src/Mod/Path/App/Area.cpp
+++ b/src/Mod/Path/App/Area.cpp
@@ -45,8 +45,8 @@
 # include <BRepBuilderAPI_MakeWire.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
 # include <BRepLib.hxx>
-# include <BRepLib_FindSurface.hxx>
 # include <BRepLib_MakeFace.hxx>
+# include <BRepLib_FindSurface.hxx>
 # include <BRepTools_WireExplorer.hxx>
 # include <GCPnts_QuasiUniformDeflection.hxx>
 # include <GCPnts_UniformAbscissa.hxx>
diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/Path/App/PreCompiled.h
index 11fc11b120..b510b2868c 100644
--- a/src/Mod/Path/App/PreCompiled.h
+++ b/src/Mod/Path/App/PreCompiled.h
@@ -20,6 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
+
 #ifndef PATH_PRECOMPILED_H
 #define PATH_PRECOMPILED_H
 
@@ -43,19 +44,30 @@
 #ifdef _PreComp_
 
 // standard
+#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/config.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>
 #include <boost/geometry/index/rtree.hpp>
+#include <boost/range/adaptor/indexed.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 
 //OCC
@@ -65,23 +77,32 @@
 #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_MakeWire.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_UniformAbscissa.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_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <HLRAlgo_Projector.hxx>
+#include <HLRBRep.hxx>
 #include <HLRBRep_Algo.hxx>
 #include <HLRBRep_HLRToShape.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
@@ -94,6 +115,7 @@
 #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>
diff --git a/src/Mod/Path/Gui/AppPathGuiPy.cpp b/src/Mod/Path/Gui/AppPathGuiPy.cpp
index 63f6066b1f..5b336d208d 100644
--- a/src/Mod/Path/Gui/AppPathGuiPy.cpp
+++ b/src/Mod/Path/Gui/AppPathGuiPy.cpp
@@ -23,8 +23,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <vector>
-
 # include <QDir>
 # include <QFileInfo>
 #endif
diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp
index 2ee14b9d5e..0d817c5c74 100644
--- a/src/Mod/Path/Gui/Command.cpp
+++ b/src/Mod/Path/Gui/Command.cpp
@@ -22,7 +22,6 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <vector>
 # include <TopExp_Explorer.hxx>
 #endif
 
diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.cpp b/src/Mod/Path/Gui/DlgProcessorChooser.cpp
index f316f53919..273af7465e 100644
--- a/src/Mod/Path/Gui/DlgProcessorChooser.cpp
+++ b/src/Mod/Path/Gui/DlgProcessorChooser.cpp
@@ -23,7 +23,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <vector>
 # include <QDialog>
 #endif
 
diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.h b/src/Mod/Path/Gui/DlgProcessorChooser.h
index 5a36c3cd82..2cb7ae3021 100644
--- a/src/Mod/Path/Gui/DlgProcessorChooser.h
+++ b/src/Mod/Path/Gui/DlgProcessorChooser.h
@@ -23,7 +23,6 @@
 #ifndef PATH_DlgProcessorChooser_H
 #define PATH_DlgProcessorChooser_H
 
-#include <vector>
 #include <QDialog>
 
 
diff --git a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h
index f110cd084c..7a7399fb4b 100644
--- a/src/Mod/Path/Gui/PreCompiled.h
+++ b/src/Mod/Path/Gui/PreCompiled.h
@@ -46,16 +46,29 @@
 
 #ifdef _PreComp_
 
+// boost
+#include <boost/algorithm/string/replace.hpp>
+
+// standard
+#include <iostream>
+#include <cassert>
+#include <cmath>
+
 // STL
 #include <vector>
+#include <map>
+#include <string>
+#include <list>
+#include <set>
+#include <algorithm>
+#include <stack>
+#include <queue>
+#include <bitset>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
-// boost
-#include <boost/algorithm/string/replace.hpp>
-
 // OCC
 #include <TopExp_Explorer.hxx>
 
@@ -65,17 +78,9 @@
 #endif
 
 // all of Inventor
-#include <Inventor/SbVec3f.h>
-#include <Inventor/details/SoLineDetail.h>
-#include <Inventor/nodes/SoBaseColor.h>
-#include <Inventor/nodes/SoCoordinate3.h>
-#include <Inventor/nodes/SoDrawStyle.h>
-#include <Inventor/nodes/SoMaterial.h>
-#include <Inventor/nodes/SoMaterialBinding.h>
-#include <Inventor/nodes/SoPointSet.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoSwitch.h>
-#include <Inventor/nodes/SoTransform.h>
+#ifndef __InventorAll__
+# include <Gui/InventorAll.h>
+#endif
 
 #endif //_PreComp_
 
diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
index 9f00d2ae93..a5ff799522 100644
--- a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
+++ b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp
@@ -23,7 +23,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <vector>
 # include <QRegularExpression>
 #endif
 
diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/Path/Gui/TaskDlgPathCompound.h
index dae78306a5..0473b112ae 100644
--- a/src/Mod/Path/Gui/TaskDlgPathCompound.h
+++ b/src/Mod/Path/Gui/TaskDlgPathCompound.h
@@ -23,8 +23,6 @@
 #ifndef PATHGUI_TaskDlgPathCompound_H
 #define PATHGUI_TaskDlgPathCompound_H
 
-#include <vector>
-
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Mod/Path/App/FeaturePathCompound.h>
diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/Path/Gui/ViewProviderArea.cpp
index 11768c59e0..8a2cca3282 100644
--- a/src/Mod/Path/Gui/ViewProviderArea.cpp
+++ b/src/Mod/Path/Gui/ViewProviderArea.cpp
@@ -21,9 +21,6 @@
  ****************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <vector>
-#endif
 
 #include <Gui/Application.h>
 #include <Mod/Path/App/FeatureArea.h>
diff --git a/src/Mod/Path/Gui/ViewProviderArea.h b/src/Mod/Path/Gui/ViewProviderArea.h
index 5bde542864..7da299d4b5 100644
--- a/src/Mod/Path/Gui/ViewProviderArea.h
+++ b/src/Mod/Path/Gui/ViewProviderArea.h
@@ -23,8 +23,6 @@
 #ifndef PATH_ViewProviderArea_H
 #define PATH_ViewProviderArea_H
 
-#include <vector>
-
 #include <Gui/ViewProviderPythonFeature.h>
 #include <Mod/Part/Gui/ViewProviderPlaneParametric.h>
 
diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp
index 3ca37dfbd5..63b24a4bae 100644
--- a/src/Mod/Path/Gui/ViewProviderPath.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPath.cpp
@@ -23,7 +23,6 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <vector>
 # include <boost/algorithm/string/replace.hpp>
 
 # include <Inventor/SbVec3f.h>
diff --git a/src/Mod/Path/Gui/ViewProviderPath.h b/src/Mod/Path/Gui/ViewProviderPath.h
index 7f39f6fc31..9b5b4c1762 100644
--- a/src/Mod/Path/Gui/ViewProviderPath.h
+++ b/src/Mod/Path/Gui/ViewProviderPath.h
@@ -23,8 +23,6 @@
 #ifndef PATH_ViewProviderPath_H
 #define PATH_ViewProviderPath_H
 
-#include <vector>
-
 #include <App/PropertyGeo.h>
 #include <Gui/Selection.h>
 #include <Gui/ViewProviderGeometryObject.h>
diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
index facc075bf4..a6d72afa0e 100644
--- a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp
@@ -22,8 +22,6 @@
 
 #include "PreCompiled.h"
 
-#include <vector>
-
 #include <Gui/BitmapFactory.h>
 #include <Gui/Control.h>
 
diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.h b/src/Mod/Path/Gui/ViewProviderPathCompound.h
index 0b14f229dd..0930cf8b8e 100644
--- a/src/Mod/Path/Gui/ViewProviderPathCompound.h
+++ b/src/Mod/Path/Gui/ViewProviderPathCompound.h
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
+
 #ifndef PATH_ViewProviderPathCompound_H
 #define PATH_ViewProviderPathCompound_H
 
-#include <vector>
-
 #include "ViewProviderPath.h"
 
-
 namespace PathGui
 {
 
diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/Path/Gui/ViewProviderPathShape.cpp
index 6b735c6ea9..cb0b45cdf3 100644
--- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPathShape.cpp
@@ -22,8 +22,6 @@
 
 #include "PreCompiled.h"
 
-#include <vector>
-
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Mod/Path/App/FeaturePathShape.h>
diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.h b/src/Mod/Path/Gui/ViewProviderPathShape.h
index 55a73ce9d8..8e60a3b7d8 100644
--- a/src/Mod/Path/Gui/ViewProviderPathShape.h
+++ b/src/Mod/Path/Gui/ViewProviderPathShape.h
@@ -20,14 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
+
 #ifndef PATH_ViewProviderPathShape_H
 #define PATH_ViewProviderPathShape_H
 
-#include <vector>
-
 #include "ViewProviderPath.h"
 
-
 namespace PathGui
 {
 
diff --git a/src/Mod/Path/PathSimulator/App/PreCompiled.h b/src/Mod/Path/PathSimulator/App/PreCompiled.h
index a1dfa37453..c8463f6304 100644
--- a/src/Mod/Path/PathSimulator/App/PreCompiled.h
+++ b/src/Mod/Path/PathSimulator/App/PreCompiled.h
@@ -40,10 +40,29 @@
 
 #ifdef _PreComp_
 
+// standard
+#include <cstdio>
+#include <cassert>
+#include <iostream>
+
 // STL
 #include <algorithm>
+#include <iostream>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <string>
 #include <vector>
 
+// Boost
+#include <boost/regex.hpp>
+
+// Xerces
+#include <xercesc/util/XercesDefs.hpp>
+
 #endif //_PreComp_
 
 #endif