diff --git a/src/Mod/MeshPart/App/AppMeshPart.cpp b/src/Mod/MeshPart/App/AppMeshPart.cpp
index c4b0ac005e..6483d22c43 100644
--- a/src/Mod/MeshPart/App/AppMeshPart.cpp
+++ b/src/Mod/MeshPart/App/AppMeshPart.cpp
@@ -23,8 +23,8 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
+#include <Base/PyObjectBase.h>
 
 
 namespace MeshPart {
diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp
index fbf872d55e..05eb911083 100644
--- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp
+++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp
@@ -20,33 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <BRepBuilderAPI_MakePolygon.hxx>
 # include <TopoDS.hxx>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Base/PyObjectBase.h>
 #include <Base/Console.h>
-#include <Base/Vector3D.h>
 #include <Base/Converter.h>
-#include <Base/Interpreter.h>
-#include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
-#include <Mod/Part/App/TopoShapePy.h>
+#include <Base/Interpreter.h>
+#include <Base/Vector3D.h>
+#include <Base/VectorPy.h>
 #include <Mod/Part/App/TopoShapeEdgePy.h>
+#include <Mod/Part/App/TopoShapePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
+#include <Mod/Mesh/App/MeshPy.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Mod/Mesh/App/Mesh.h>
-#include <Mod/Mesh/App/MeshPy.h>
+
 #include "MeshAlgos.h"
 #include "Mesher.h"
 
+
 namespace MeshPart {
 class Module : public Py::ExtensionModule<Module>
 {
diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp
index 9e2d8d1399..deb0d5eff3 100644
--- a/src/Mod/MeshPart/App/CurveProjector.cpp
+++ b/src/Mod/MeshPart/App/CurveProjector.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # ifdef FC_OS_LINUX
@@ -28,41 +27,36 @@
 # endif
 # include <Bnd_Box.hxx>
 # include <BndLib_Add3dCurve.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
 # include <BRepBuilderAPI_MakeVertex.hxx>
 # include <BRepExtrema_DistShapeShape.hxx>
 # include <GCPnts_AbscissaPoint.hxx>
 # include <GCPnts_UniformDeflection.hxx>
 # include <GCPnts_UniformAbscissa.hxx>
+# include <GeomAPI_IntCS.hxx>
+# include <Geom_Curve.hxx>
+# include <Geom_Plane.hxx>
 # include <gp_Pln.hxx>
+# include <Standard_Failure.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
-# include <Geom_Curve.hxx>
-# include <Geom_Plane.hxx>
-# include <BRep_Tool.hxx>
-# include <GeomAPI_IntCS.hxx>
-# include <Standard_Failure.hxx>
 #endif
 
-
-#include "MeshAlgos.h"
-#include "CurveProjector.h"
-
-#include <Mod/Mesh/App/Core/MeshIO.h>
-#include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Mod/Mesh/App/Core/Iterator.h>
-#include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/Projection.h>
-#include <Mod/Mesh/App/Core/Grid.h>
-#include <Mod/Mesh/App/Mesh.h>
-
-#include <Base/Exception.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
 
+#include <Mod/Mesh/App/Core/Algorithm.h>
+#include <Mod/Mesh/App/Core/Grid.h>
+#include <Mod/Mesh/App/Core/Iterator.h>
+#include <Mod/Mesh/App/Core/MeshKernel.h>
+#include <Mod/Mesh/App/Core/Projection.h>
+
+#include "MeshAlgos.h"
+
 
 using namespace MeshPart;
 using MeshCore::MeshKernel;
diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h
index ac5f558e1f..4fb0d5ff37 100644
--- a/src/Mod/MeshPart/App/CurveProjector.h
+++ b/src/Mod/MeshPart/App/CurveProjector.h
@@ -20,21 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _CurveProjector_h_
 #define _CurveProjector_h_
 
 #ifdef FC_USE_GTS
-#  include <gts.h>
+# include <gts.h>
 #endif
 
-#include <gp_Pln.hxx>
 #include <TopoDS_Edge.hxx>
 
-#include <Base/Vector3D.h>
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/MeshPart/MeshPartGlobal.h>
 
+
 namespace MeshCore
 {
 class MeshKernel;
diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp
index 4719e1a2a1..3699437022 100644
--- a/src/Mod/MeshPart/App/MeshAlgos.cpp
+++ b/src/Mod/MeshPart/App/MeshAlgos.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # ifdef FC_OS_LINUX
@@ -28,21 +27,15 @@
 # endif
 #endif
 
+#include <Base/Console.h>
+#include <Base/Builder3D.h>
+#include <Mod/Mesh/App/Core/Evaluation.h>
+#include <Mod/Mesh/App/Core/Iterator.h>
+#include <Mod/Mesh/App/Core/MeshKernel.h>
+#include <Mod/Mesh/App/Core/TopoAlgorithm.h>
 
 #include "MeshAlgos.h"
 
-#include <Mod/Mesh/App/Mesh.h>
-#include <Mod/Mesh/App/Core/MeshIO.h>
-#include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Mod/Mesh/App/Core/Iterator.h>
-#include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/TopoAlgorithm.h>
-#include <Mod/Mesh/App/Core/Evaluation.h>
-
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Console.h>
-#include <Base/Builder3D.h>
 
 using namespace MeshPart;
 using namespace MeshCore;
diff --git a/src/Mod/MeshPart/App/MeshAlgos.h b/src/Mod/MeshPart/App/MeshAlgos.h
index 686caa99fa..2e8b1827c4 100644
--- a/src/Mod/MeshPart/App/MeshAlgos.h
+++ b/src/Mod/MeshPart/App/MeshAlgos.h
@@ -20,20 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _MeshAlgos_h_
 #define _MeshAlgos_h_
 
 #ifdef FC_USE_GTS
-#  include <gts.h>
+# include <gts.h>
 #endif
 
 #include <vector>
 
-#include <Base/Vector3D.h>
-
 #include "CurveProjector.h"
 
+
 class TopoDS_Edge;
 class TopoDS_Shape;
 
diff --git a/src/Mod/MeshPart/App/MeshFlattening.cpp b/src/Mod/MeshPart/App/MeshFlattening.cpp
index 049956d10f..9d1290373d 100644
--- a/src/Mod/MeshPart/App/MeshFlattening.cpp
+++ b/src/Mod/MeshPart/App/MeshFlattening.cpp
@@ -20,23 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <map>
+# include <set>
+# include <vector>
+
+# include <BRep_Tool.hxx>
+# include <Geom_BSplineSurface.hxx>
+# include <Geom_Surface.hxx>
+# include <Poly_Triangulation.hxx>
+# include <Standard_Version.hxx>
+# include <TColStd_Array1OfReal.hxx>
+# include <TopLoc_Location.hxx>
+#endif
+
 #include "MeshFlattening.h"
 #include "MeshFlatteningLscmRelax.h"
-#include <Poly_Triangulation.hxx>
-#include <BRep_Tool.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TopLoc_Location.hxx>
-#include <Standard_Version.hxx>
-
-#include <set>
-#include <map>
-#include <vector>
-#include <exception>
 
 
 std::vector<ColMat<double, 3>> getBoundaries(ColMat<double, 3> vertices, ColMat<long, 3> tris)
diff --git a/src/Mod/MeshPart/App/MeshFlattening.h b/src/Mod/MeshPart/App/MeshFlattening.h
index dbbc331f12..38f8155129 100644
--- a/src/Mod/MeshPart/App/MeshFlattening.h
+++ b/src/Mod/MeshPart/App/MeshFlattening.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHFLATTENING
 #define MESHFLATTENING
 
@@ -29,17 +28,12 @@
 // - unwrap faces which are nurbs and return nurbs (no cuts, meshing internally)
 // 	- TODO: map any curves from origin to flattened faces
 
-#include "MeshFlatteningNurbs.h"
-#include <BRepTools.hxx>
 #include <TopoDS_Face.hxx>
 #include <vector>
 
 #include <Eigen/Geometry>
-#include <Eigen/IterativeLinearSolvers>
-#include <Eigen/SparseCore>
-#include <Eigen/QR>
 
-#include <vector>
+#include "MeshFlatteningNurbs.h"
 
 
 using Vector3 = Eigen::Vector3d;
diff --git a/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp b/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
index 98cdac2404..d2e9525562 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
+++ b/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
@@ -20,16 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "PreCompiled.h"
-#include <Base/Interpreter.h>
-#include <Mod/Part/App/TopoShapeFacePy.h>
-#include <Mod/Part/App/TopoShapeEdgePy.h>
+#ifndef _PreComp_
+# include <map>
+# include <memory>
+# include <stdexcept>
+# include <vector>
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
+#endif
 
-#include <Eigen/Core>
-#include <Eigen/Geometry>
-#include <Eigen/Sparse>
 #include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/class.hpp>
@@ -37,23 +38,16 @@
 #include <boost/python/call.hpp>
 #include <boost/python/copy_const_reference.hpp>
 #include <boost/python/return_value_policy.hpp>
-
-#include <memory>
-#include <vector>
-#include <tuple>
-#include <map>
-#include <stdexcept>
+#include <Eigen/Core>
+#include <Eigen/Geometry>
+#include <Eigen/Sparse>
+#include <Mod/Part/App/TopoShapeEdgePy.h>
+#include <Mod/Part/App/TopoShapeFacePy.h>
 
 #include "MeshFlattening.h"
 #include "MeshFlatteningLscmRelax.h"
 #include "MeshFlatteningNurbs.h"
 
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS.hxx>
-#include <ShapeFix_Edge.hxx>
-
-
 
 namespace py = boost::python;
 
diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp
index 456b8b12c6..98ee6a6dc2 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp
+++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.cpp
@@ -20,26 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include "MeshFlatteningLscmRelax.h"
-#include <Eigen/IterativeLinearSolvers>
-#include <Eigen/SparseCholesky>
-#include <Eigen/SVD>
-#include <iostream>
-#include <algorithm>
-#include <cmath>
-
-#include <set>
-#include <map>
-#include <vector>
-#include <tuple>
-#include <array>
+#ifndef _PreComp_
+# include <array>
+# include <cmath>
+# include <iostream>
+# include <map>
+# include <set>
+# include <vector>
+#endif
 
 #ifndef M_PI
-#define M_PI    3.14159265358979323846f
+# define M_PI 3.14159265358979323846f
 #endif
 
+#include <Eigen/SparseCholesky>
+
+#include "MeshFlatteningLscmRelax.h"
+
+
 // TODO:
 // area constrained (scale the final unwrapped mesh to the original area)
 // FEM approach
diff --git a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h
index eef86ca033..2fc592c94e 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h
+++ b/src/Mod/MeshPart/App/MeshFlatteningLscmRelax.h
@@ -35,14 +35,12 @@
 // 6: K.u=forces ->u
 // 7: x1, y1 += w * u
 
-#include "MeshFlattening.h"
-
-#include <vector>
 #include <memory>
 #include <tuple>
+#include <vector>
+
+#include "MeshFlattening.h"
 
-#include <Eigen/Geometry>
-#include <Eigen/IterativeLinearSolvers>
 
 using spMat = Eigen::SparseMatrix<double>;
 
diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp
index 076aec68e4..602837af1b 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp
+++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.cpp
@@ -20,11 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <cmath>
+# include <iostream>
+#endif
+
 #include "MeshFlatteningNurbs.h"
-#include <iostream>
-#include <cmath>
 
 
 namespace nurbs{
diff --git a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h
index a477699663..acfef85eb4 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningNurbs.h
+++ b/src/Mod/MeshPart/App/MeshFlatteningNurbs.h
@@ -20,16 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifndef NURBS_H
 #define NURBS_H
 
-#include <Eigen/Geometry>
-#include <Eigen/IterativeLinearSolvers>
-#include <Eigen/SparseCore>
 #include <tuple>
 
+#include <Eigen/IterativeLinearSolvers>
+
+
 namespace nurbs{
 
 using trip = Eigen::Triplet<double>;
diff --git a/src/Mod/MeshPart/App/MeshFlatteningPy.cpp b/src/Mod/MeshPart/App/MeshFlatteningPy.cpp
index fbe5b29f45..7c2080419f 100644
--- a/src/Mod/MeshPart/App/MeshFlatteningPy.cpp
+++ b/src/Mod/MeshPart/App/MeshFlatteningPy.cpp
@@ -20,41 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #ifdef _MSC_VER
-    #define strdup _strdup
+# define strdup _strdup
 #endif
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <stdexcept>
+# include <vector>
+
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Face.hxx>
+#endif
+
 #include <Mod/Part/App/TopoShapeFacePy.h>
 #include <Mod/Part/App/TopoShapeEdgePy.h>
-
-#include <Eigen/Core>
-#include <Eigen/Geometry>
-#include <Eigen/Sparse>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/operators.h>
-#include <pybind11/numpy.h>
 #include <pybind11/eigen.h>
 
-#include <memory>
-#include <vector>
-#include <tuple>
-#include <map>
-#include <stdexcept>
-
 #include "MeshFlattening.h"
 #include "MeshFlatteningLscmRelax.h"
 #include "MeshFlatteningNurbs.h"
 
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS.hxx>
-#include <ShapeFix_Edge.hxx>
-
-
 
 namespace py = pybind11;
 
diff --git a/src/Mod/MeshPart/App/Mesher.cpp b/src/Mod/MeshPart/App/Mesher.cpp
index fb1dbe0030..0dc4270c73 100644
--- a/src/Mod/MeshPart/App/Mesher.cpp
+++ b/src/Mod/MeshPart/App/Mesher.cpp
@@ -21,19 +21,21 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#include <algorithm>
-#include "Mesher.h"
+#ifndef _PreComp_
+# include <algorithm>
+# include <BRepMesh_IncrementalMesh.hxx>
+# include <BRepTools.hxx>
+# include <Standard_Version.hxx>
+# include <TopoDS_Shape.hxx>
+#endif
 
 #include <Base/Console.h>
-#include <Base/Exception.h>
 #include <Base/Tools.h>
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Part/App/TopoShape.h>
 
-#include <TopoDS_Shape.hxx>
-#include <BRepTools.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <Standard_Version.hxx>
+#include "Mesher.h"
+
 
 #ifdef HAVE_SMESH
 #if defined(__clang__)
diff --git a/src/Mod/MeshPart/App/Mesher.h b/src/Mod/MeshPart/App/Mesher.h
index 43bc6929d7..a200846a17 100644
--- a/src/Mod/MeshPart/App/Mesher.h
+++ b/src/Mod/MeshPart/App/Mesher.h
@@ -24,9 +24,11 @@
 #define MESHPART_MESHER_H
 
 #include <sstream>
+
 #include <Base/Stream.h>
+
 #ifdef HAVE_SMESH
-#include <SMESH_Version.h>
+# include <SMESH_Version.h>
 #endif
 
 class TopoDS_Shape;
diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
index 06ec9e93d3..57c51bbb2d 100644
--- a/src/Mod/MeshPart/App/PreCompiled.h
+++ b/src/Mod/MeshPart/App/PreCompiled.h
@@ -36,15 +36,20 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
+#include <algorithm>
+#include <array>
 #include <bitset>
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 // OpenCasCade =====================================================================================
 // Base
@@ -110,39 +115,53 @@
 #include <Standard_TypeMismatch.hxx>
 #include <Standard_Underflow.hxx>
 #include <Standard_UUID.hxx>
+#include <Standard_Version.hxx>
 #include <Standard_WayOfLife.hxx>
 
-
-#include <TCollection_ExtendedString.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-
+#include <Bnd_Box.hxx>
+#include <BndLib_Add3dCurve.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepBuilderAPI.hxx>
+#include <BRepBuilderAPI_Copy.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepCheck_Analyzer.hxx>
+#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
+#include <BRepCheck_Result.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepPrimAPI_MakeBox.hxx>
+#include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_ShapeSet.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_Result.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 
-#include <BRepTools.hxx>
-#include <Standard_DefineHandle.hxx>
 #include <GCE2d_MakeSegment.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <GCPnts_UniformDeflection.hxx>
 #include <GCPnts_UniformAbscissa.hxx>
 #include <Geom_Axis2Placement.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
 #include <Geom_CartesianPoint.hxx>
+#include <Geom_Circle.hxx>
+#include <Geom_ConicalSurface.hxx>
+#include <Geom_CylindricalSurface.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_Hyperbola.hxx>
 #include <Geom_Line.hxx>
+#include <Geom_Parabola.hxx>
+#include <Geom_Plane.hxx>
+#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
+#include <Geom_SurfaceOfLinearExtrusion.hxx>
+#include <Geom_SurfaceOfRevolution.hxx>
+#include <Geom_ToroidalSurface.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
@@ -150,21 +169,6 @@
 #include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_Parabola.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_ToroidalSurface.hxx>
 #include <GeomAPI_IntCS.hxx>
 #include <GeomTools_Curve2dSet.hxx>
 #include <gp_Ax2d.hxx>
@@ -185,44 +189,39 @@
 #include <gp_Torus.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
+
 #include <Precision.hxx>
+#include <Poly_Triangulation.hxx>
 #include <Quantity_NameOfColor.hxx>
 #include <Quantity_PhysicalQuantity.hxx>
 #include <Quantity_TypeOfColor.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_ErrorHandler.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_IStream.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <Standard_OStream.hxx>
-#include <Standard_Real.hxx>
-#include <TCollection_AsciiString.hxx>
+
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_MapIteratorOfMapOfTransient.hxx>
 #include <TColStd_MapOfTransient.hxx>
+#include <TColStd_SequenceOfExtendedString.hxx>
+#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
+#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_ListIteratorOfListOfShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
+
 #include <UnitsAPI.hxx>
-#include <Bnd_Box.hxx>
-#include <BndLib_Add3dCurve.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
 
 #endif // _PreComp_
 #endif