diff --git a/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp b/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp
index 1d19fb21a2..0f7d49343e 100644
--- a/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp
+++ b/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp
@@ -20,19 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
 #include "PathSim.h"
 #include "PathSimPy.h"
 
diff --git a/src/Mod/Path/PathSimulator/App/PathSim.cpp b/src/Mod/Path/PathSimulator/App/PathSim.cpp
index c3e66e7af8..ee9b5b9931 100644
--- a/src/Mod/Path/PathSimulator/App/PathSim.cpp
+++ b/src/Mod/Path/PathSimulator/App/PathSim.cpp
@@ -22,17 +22,9 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <boost/regex.hpp>
-#endif
-
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Base/Exception.h>
-#include <Base/Console.h>
-
 #include "PathSim.h"
 
+
 using namespace Base;
 using namespace PathSimulator;
 
diff --git a/src/Mod/Path/PathSimulator/App/PathSim.h b/src/Mod/Path/PathSimulator/App/PathSim.h
index fb36e2fd48..c6bf74f19e 100644
--- a/src/Mod/Path/PathSimulator/App/PathSim.h
+++ b/src/Mod/Path/PathSimulator/App/PathSim.h
@@ -20,20 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef PATHSIMULATOR_PathSim_H
 #define PATHSIMULATOR_PathSim_H
 
-// Exporting of App classes
-
-#include <Base/Persistence.h>
-#include <Base/Vector3D.h>
-#include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
+
 #include <Mod/Path/App/Command.h>
 #include <Mod/Part/App/TopoShape.h>
+
 #include "VolSim.h"
 
+
 using namespace Path;
 
 namespace PathSimulator
diff --git a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp b/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp
index 9d1cc842f0..6097889989 100644
--- a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp
+++ b/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp
@@ -23,16 +23,17 @@
 #include "PreCompiled.h"
 
 #include <Base/PlacementPy.h>
-#include <Base/VectorPy.h>
-#include <Mod/Part/App/TopoShapePy.h>
-#include <Mod/Path/App/CommandPy.h>
-#include <Mod/Mesh/App/MeshPy.h>
-#include "Mod/Path/PathSimulator/App/PathSim.h"
 
+#include <Mod/Mesh/App/MeshPy.h>
+#include <Mod/Path/App/CommandPy.h>
+#include <Mod/Part/App/TopoShapePy.h>
+
+#include "PathSim.h"
 // inclusion of the generated files (generated out of PathSimPy.xml)
 #include "PathSimPy.h"
 #include "PathSimPy.cpp"
 
+
 using namespace PathSimulator;
 
 // returns a string which represents the object e.g. when printed in python
diff --git a/src/Mod/Path/PathSimulator/App/PreCompiled.cpp b/src/Mod/Path/PathSimulator/App/PreCompiled.cpp
index d4ee9e9bef..9dc04433fe 100644
--- a/src/Mod/Path/PathSimulator/App/PreCompiled.cpp
+++ b/src/Mod/Path/PathSimulator/App/PreCompiled.cpp
@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
diff --git a/src/Mod/Path/PathSimulator/App/PreCompiled.h b/src/Mod/Path/PathSimulator/App/PreCompiled.h
index afecd871fb..c8463f6304 100644
--- a/src/Mod/Path/PathSimulator/App/PreCompiled.h
+++ b/src/Mod/Path/PathSimulator/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef APP_PRECOMPILED_H
 #define APP_PRECOMPILED_H
 
diff --git a/src/Mod/Path/PathSimulator/App/VolSim.cpp b/src/Mod/Path/PathSimulator/App/VolSim.cpp
index 9fb45a31bf..60bf0a31c0 100644
--- a/src/Mod/Path/PathSimulator/App/VolSim.cpp
+++ b/src/Mod/Path/PathSimulator/App/VolSim.cpp
@@ -21,19 +21,18 @@
 ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <Base/Console.h>
+#ifndef _PreComp_
+#include <algorithm>
+#endif
 
 #include <BRepBndLib.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <gp_Pnt.hxx>
 
-#ifndef _PreComp_
-# include <algorithm>
-#endif
-
 #include "VolSim.h"
 
+
 //************************************************************************************************************
 // stock
 //************************************************************************************************************
diff --git a/src/Mod/Path/PathSimulator/App/VolSim.h b/src/Mod/Path/PathSimulator/App/VolSim.h
index 1d983ac534..0a82fbb476 100644
--- a/src/Mod/Path/PathSimulator/App/VolSim.h
+++ b/src/Mod/Path/PathSimulator/App/VolSim.h
@@ -22,14 +22,15 @@
 *   Volumetric Path simulation engine                                     *
 ***************************************************************************/
 
-
 #ifndef PATHSIMULATOR_VolSim_H
 #define PATHSIMULATOR_VolSim_H
 
 #include <vector>
+
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Path/App/Command.h>
 
+
 #define SIM_EPSILON 0.00001
 #define SIM_TESSEL_TOP		1
 #define SIM_TESSEL_BOT		2