diff --git a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/Path/App/Voronoi.cpp
index f17816a3c6..a8c016b002 100644
--- a/src/Mod/Path/App/Voronoi.cpp
+++ b/src/Mod/Path/App/Voronoi.cpp
@@ -25,16 +25,10 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
-# include <cinttypes>
-# include <iomanip>
-# include <boost/algorithm/string.hpp>
-# include <boost/lexical_cast.hpp>
 #endif
 
 #include <Base/Vector3D.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
+
 #include "Voronoi.h"
 
 using namespace Base;
diff --git a/src/Mod/Path/App/Voronoi.h b/src/Mod/Path/App/Voronoi.h
index 8de08167d8..0dae4605fa 100644
--- a/src/Mod/Path/App/Voronoi.h
+++ b/src/Mod/Path/App/Voronoi.h
@@ -23,15 +23,12 @@
 #define PATH_VORONOI_H
 
 #include <map>
-#include <string>
+#include <vector>
 #include <Base/BaseClass.h>
 #include <Base/Handle.h>
 #include <Base/Vector3D.h>
 
-#include <vector>
-#include <boost/polygon/point_concept.hpp>
 #include <boost/polygon/polygon.hpp>
-#include <boost/polygon/segment_concept.hpp>
 #include <boost/polygon/voronoi.hpp>
 
 #if (SIZE_MAX == UINT_MAX)
diff --git a/src/Mod/Path/App/VoronoiCell.cpp b/src/Mod/Path/App/VoronoiCell.cpp
index 4788aac907..caa4dd3065 100644
--- a/src/Mod/Path/App/VoronoiCell.cpp
+++ b/src/Mod/Path/App/VoronoiCell.cpp
@@ -23,17 +23,6 @@
 
 #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/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
 #include "Voronoi.h"
 #include "VoronoiCell.h"
 
diff --git a/src/Mod/Path/App/VoronoiCell.h b/src/Mod/Path/App/VoronoiCell.h
index 0a8db12069..28f64416cc 100644
--- a/src/Mod/Path/App/VoronoiCell.h
+++ b/src/Mod/Path/App/VoronoiCell.h
@@ -22,10 +22,7 @@
 #ifndef PATH_VORONOICELL_H
 #define PATH_VORONOICELL_H
 
-#include <Base/Handle.h>
 #include <Base/BaseClass.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
 #include "Voronoi.h"
 
 namespace Path
diff --git a/src/Mod/Path/App/VoronoiCellPyImp.cpp b/src/Mod/Path/App/VoronoiCellPyImp.cpp
index 4f1f86f499..d735672a85 100644
--- a/src/Mod/Path/App/VoronoiCellPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiCellPyImp.cpp
@@ -22,23 +22,16 @@
 
 #include "PreCompiled.h"
 
-
-#ifndef _PreComp_
-# include <boost/algorithm/string.hpp>
-#endif
-
-#include "Base/Exception.h"
-#include "Base/GeometryPyCXX.h"
-#include "Base/PlacementPy.h"
 #include "Base/Vector3D.h"
 #include "Base/VectorPy.h"
-#include "Mod/Path/App/Voronoi.h"
-#include "Mod/Path/App/VoronoiCell.h"
-#include "Mod/Path/App/VoronoiCellPy.h"
-#include "Mod/Path/App/VoronoiEdge.h"
-#include "Mod/Path/App/VoronoiEdgePy.h"
 
-#include "Mod/Path/App/VoronoiCellPy.cpp"
+#include "Voronoi.h"
+#include "VoronoiCell.h"
+#include "VoronoiCellPy.h"
+#include "VoronoiCellPy.cpp"
+#include "VoronoiEdge.h"
+#include "VoronoiEdgePy.h"
+
 
 using namespace Path;
 
diff --git a/src/Mod/Path/App/VoronoiEdge.cpp b/src/Mod/Path/App/VoronoiEdge.cpp
index 050260cbb7..56920419ae 100644
--- a/src/Mod/Path/App/VoronoiEdge.cpp
+++ b/src/Mod/Path/App/VoronoiEdge.cpp
@@ -23,20 +23,10 @@
 
 #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/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
 #include "Voronoi.h"
 #include "VoronoiEdge.h"
 
+
 using namespace Base;
 using namespace Path;
 
diff --git a/src/Mod/Path/App/VoronoiEdge.h b/src/Mod/Path/App/VoronoiEdge.h
index 7be172d85d..6842053938 100644
--- a/src/Mod/Path/App/VoronoiEdge.h
+++ b/src/Mod/Path/App/VoronoiEdge.h
@@ -19,15 +19,14 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
 #ifndef PATH_VORONOIEDGE_H
 #define PATH_VORONOIEDGE_H
 
-#include <Base/Handle.h>
 #include <Base/BaseClass.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
 #include "Voronoi.h"
 
+
 namespace Path
 {
 
diff --git a/src/Mod/Path/App/VoronoiEdgePyImp.cpp b/src/Mod/Path/App/VoronoiEdgePyImp.cpp
index 52537a58a6..8b5736459b 100644
--- a/src/Mod/Path/App/VoronoiEdgePyImp.cpp
+++ b/src/Mod/Path/App/VoronoiEdgePyImp.cpp
@@ -22,29 +22,23 @@
 
 #include "PreCompiled.h"
 
-
 #ifndef _PreComp_
-#include <boost/algorithm/string.hpp>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <Geom_Parabola.hxx>
 #endif
 
-#include "Base/Exception.h"
-#include "Base/Vector3D.h"
-#include "Base/VectorPy.h"
-#include "Mod/Part/App/ArcOfParabolaPy.h"
-#include "Mod/Part/App/LineSegmentPy.h"
+#include "Mod/Part/App/Geometry.h"
 #include "Mod/Part/App/TopoShapeEdgePy.h"
-#include "Mod/Path/App/Voronoi.h"
-#include "Mod/Path/App/Voronoi.h"
-#include "Mod/Path/App/VoronoiCell.h"
-#include "Mod/Path/App/VoronoiCellPy.h"
-#include "Mod/Path/App/VoronoiEdge.h"
-#include "Mod/Path/App/VoronoiEdgePy.h"
-#include "Mod/Path/App/VoronoiVertex.h"
-#include "Mod/Path/App/VoronoiVertexPy.h"
 
-#include "Mod/Path/App/VoronoiEdgePy.cpp"
+#include "Voronoi.h"
+#include "VoronoiCell.h"
+#include "VoronoiCellPy.h"
+#include "VoronoiEdge.h"
+#include "VoronoiEdgePy.h"
+#include "VoronoiEdgePy.cpp"
+#include "VoronoiVertex.h"
+#include "VoronoiVertexPy.h"
+
 
 using namespace Path;
 
diff --git a/src/Mod/Path/App/VoronoiPyImp.cpp b/src/Mod/Path/App/VoronoiPyImp.cpp
index f65085eb5b..f485e8bcb7 100644
--- a/src/Mod/Path/App/VoronoiPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiPyImp.cpp
@@ -20,27 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
+
 #include "PreCompiled.h"
 
-
-#ifndef _PreComp_
-# include <boost/algorithm/string.hpp>
-#endif
-
-#include "Base/Exception.h"
 #include "Base/GeometryPyCXX.h"
 #include "Base/Vector3D.h"
 #include "Base/VectorPy.h"
-#include "Mod/Path/App/Voronoi.h"
-#include "Mod/Path/App/VoronoiCell.h"
-#include "Mod/Path/App/VoronoiCellPy.h"
-#include "Mod/Path/App/VoronoiEdge.h"
-#include "Mod/Path/App/VoronoiEdgePy.h"
-#include "Mod/Path/App/VoronoiPy.h"
-#include "Mod/Path/App/VoronoiVertex.h"
-#include "Mod/Path/App/VoronoiVertexPy.h"
 
-#include "Mod/Path/App/VoronoiPy.cpp"
+#include "Voronoi.h"
+#include "VoronoiCell.h"
+#include "VoronoiCellPy.h"
+#include "VoronoiEdge.h"
+#include "VoronoiEdgePy.h"
+#include "VoronoiPy.h"
+#include "VoronoiPy.cpp"
+#include "VoronoiVertex.h"
+#include "VoronoiVertexPy.h"
+
 
 using namespace Path;
 
diff --git a/src/Mod/Path/App/VoronoiVertex.cpp b/src/Mod/Path/App/VoronoiVertex.cpp
index 543e6d6672..5adaab01ff 100644
--- a/src/Mod/Path/App/VoronoiVertex.cpp
+++ b/src/Mod/Path/App/VoronoiVertex.cpp
@@ -23,20 +23,10 @@
 
 #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/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
 #include "Voronoi.h"
 #include "VoronoiVertex.h"
 
+
 using namespace Base;
 using namespace Path;
 
diff --git a/src/Mod/Path/App/VoronoiVertex.h b/src/Mod/Path/App/VoronoiVertex.h
index eac6bd486c..255dfa5a4b 100644
--- a/src/Mod/Path/App/VoronoiVertex.h
+++ b/src/Mod/Path/App/VoronoiVertex.h
@@ -19,15 +19,14 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
+
 #ifndef PATH_VORONOIVERTEX_H
 #define PATH_VORONOIVERTEX_H
 
-#include <Base/Handle.h>
 #include <Base/BaseClass.h>
-#include <Base/Vector3D.h>
-#include <Base/VectorPy.h>
 #include "Voronoi.h"
 
+
 namespace Path
 {
 
diff --git a/src/Mod/Path/App/VoronoiVertexPyImp.cpp b/src/Mod/Path/App/VoronoiVertexPyImp.cpp
index bc8da19d13..14b5562a5c 100644
--- a/src/Mod/Path/App/VoronoiVertexPyImp.cpp
+++ b/src/Mod/Path/App/VoronoiVertexPyImp.cpp
@@ -22,24 +22,16 @@
 
 #include "PreCompiled.h"
 
-
-#ifndef _PreComp_
-# include <boost/algorithm/string.hpp>
-#endif
-
-#include "Base/Exception.h"
-#include "Base/GeometryPyCXX.h"
-#include "Base/PlacementPy.h"
 #include "Base/Vector3D.h"
 #include "Base/VectorPy.h"
-#include "Mod/Path/App/Voronoi.h"
-#include "Mod/Path/App/VoronoiEdge.h"
-#include "Mod/Path/App/VoronoiEdgePy.h"
-#include "Mod/Path/App/VoronoiPy.h"
-#include "Mod/Path/App/VoronoiVertex.h"
-#include "Mod/Path/App/VoronoiVertexPy.h"
 
-#include "Mod/Path/App/VoronoiVertexPy.cpp"
+#include "Voronoi.h"
+#include "VoronoiEdge.h"
+#include "VoronoiEdgePy.h"
+#include "VoronoiVertex.h"
+#include "VoronoiVertexPy.h"
+#include "VoronoiVertexPy.cpp"
+
 
 using namespace Path;