diff --git a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
index 023eecfbe9..05db2286c5 100644
--- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
@@ -25,6 +25,7 @@
 #include <Bnd_Tools.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
+#include <BRepBndLib.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <IntTools_Context.hxx>
 #include <NCollection_DataMap.hxx>
diff --git a/src/BRepCheck/BRepCheck.cxx b/src/BRepCheck/BRepCheck.cxx
index 2f587ffd24..a388e20ffb 100644
--- a/src/BRepCheck/BRepCheck.cxx
+++ b/src/BRepCheck/BRepCheck.cxx
@@ -19,7 +19,6 @@
 #include <BRep_Tool.hxx>
 #include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_Wire.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
diff --git a/src/BRepCheck/BRepCheck_Analyzer.cxx b/src/BRepCheck/BRepCheck_Analyzer.cxx
index 67ca44e664..90282fcf22 100644
--- a/src/BRepCheck/BRepCheck_Analyzer.cxx
+++ b/src/BRepCheck/BRepCheck_Analyzer.cxx
@@ -30,11 +30,9 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Mutex.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NullObject.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/BRepCheck/BRepCheck_Analyzer.hxx b/src/BRepCheck/BRepCheck_Analyzer.hxx
index 1f549fab5d..b71f0490bb 100644
--- a/src/BRepCheck/BRepCheck_Analyzer.hxx
+++ b/src/BRepCheck/BRepCheck_Analyzer.hxx
@@ -23,7 +23,6 @@
 
 #include <TopoDS_Shape.hxx>
 #include <BRepCheck_IndexedDataMapOfShapeResult.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class BRepCheck_Result;
 
diff --git a/src/BRepCheck/BRepCheck_Edge.cxx b/src/BRepCheck/BRepCheck_Edge.cxx
index 4e5cd6ca22..32d55b8cd7 100644
--- a/src/BRepCheck/BRepCheck_Edge.cxx
+++ b/src/BRepCheck/BRepCheck_Edge.cxx
@@ -18,13 +18,8 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <Bnd_Box.hxx>
-#include <BRep_CurveOnSurface.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
 #include <BRepLib_ValidateEdge.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_PolygonOnTriangulation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_TFace.hxx>
@@ -32,7 +27,6 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepCheck.hxx>
 #include <BRepCheck_Edge.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <Extrema_LocateExtPC.hxx>
 #include <Geom2d_Curve.hxx>
@@ -45,7 +39,6 @@
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomProjLib.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
diff --git a/src/BRepCheck/BRepCheck_Face.cxx b/src/BRepCheck/BRepCheck_Face.cxx
index c8ee81dabf..f128ec6d4d 100644
--- a/src/BRepCheck/BRepCheck_Face.cxx
+++ b/src/BRepCheck/BRepCheck_Face.cxx
@@ -23,7 +23,6 @@
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepCheck.hxx>
 #include <BRepCheck_Face.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
@@ -48,9 +47,7 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>
diff --git a/src/BRepCheck/BRepCheck_Face.hxx b/src/BRepCheck/BRepCheck_Face.hxx
index a6853e9e39..741a9954b3 100644
--- a/src/BRepCheck/BRepCheck_Face.hxx
+++ b/src/BRepCheck/BRepCheck_Face.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <BRepCheck_Status.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <BRepCheck_Result.hxx>
diff --git a/src/BRepCheck/BRepCheck_Result.hxx b/src/BRepCheck/BRepCheck_Result.hxx
index b993569099..7ba1695020 100644
--- a/src/BRepCheck/BRepCheck_Result.hxx
+++ b/src/BRepCheck/BRepCheck_Result.hxx
@@ -18,10 +18,7 @@
 #define _BRepCheck_Result_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Mutex.hxx>
 #include <Standard_Transient.hxx>
 #include <BRepCheck_DataMapOfShapeListOfStatus.hxx>
diff --git a/src/BRepCheck/BRepCheck_Shell.cxx b/src/BRepCheck/BRepCheck_Shell.cxx
index e5daa1c456..d94e5226ad 100644
--- a/src/BRepCheck/BRepCheck_Shell.cxx
+++ b/src/BRepCheck/BRepCheck_Shell.cxx
@@ -19,7 +19,6 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepCheck.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <Standard_Type.hxx>
 #include <TopExp.hxx>
@@ -29,12 +28,9 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Shell,BRepCheck_Result)
diff --git a/src/BRepCheck/BRepCheck_Shell.hxx b/src/BRepCheck/BRepCheck_Shell.hxx
index 2876d1c0e3..e5535a860e 100644
--- a/src/BRepCheck/BRepCheck_Shell.hxx
+++ b/src/BRepCheck/BRepCheck_Shell.hxx
@@ -18,11 +18,8 @@
 #define _BRepCheck_Shell_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <BRepCheck_Status.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <BRepCheck_Result.hxx>
 #include <TopTools_ListOfShape.hxx>
diff --git a/src/BRepCheck/BRepCheck_Solid.cxx b/src/BRepCheck/BRepCheck_Solid.cxx
index 1e1cb925ce..43baa11a32 100644
--- a/src/BRepCheck/BRepCheck_Solid.cxx
+++ b/src/BRepCheck/BRepCheck_Solid.cxx
@@ -21,7 +21,6 @@
 #include <Geom_Curve.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Transient.hxx>
-#include <NCollection_Map.hxx>
 #include <NCollection_Vector.hxx>
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
@@ -33,7 +32,6 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Solid,BRepCheck_Result)
 
diff --git a/src/BRepCheck/BRepCheck_Vertex.cxx b/src/BRepCheck/BRepCheck_Vertex.cxx
index 89c57693f5..0a0ef698d2 100644
--- a/src/BRepCheck/BRepCheck_Vertex.cxx
+++ b/src/BRepCheck/BRepCheck_Vertex.cxx
@@ -17,11 +17,6 @@
 
 #include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfPointRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
-#include <BRep_ListOfPointRepresentation.hxx>
-#include <BRep_PointRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_TFace.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/BRepCheck/BRepCheck_Vertex.hxx b/src/BRepCheck/BRepCheck_Vertex.hxx
index 1e9f15f40c..b17f0d4034 100644
--- a/src/BRepCheck/BRepCheck_Vertex.hxx
+++ b/src/BRepCheck/BRepCheck_Vertex.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <BRepCheck_Result.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Vertex;
 class TopoDS_Shape;
 
diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx
index 7177add687..10e40a8165 100644
--- a/src/BRepCheck/BRepCheck_Wire.cxx
+++ b/src/BRepCheck/BRepCheck_Wire.cxx
@@ -28,7 +28,6 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepCheck.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <BRepCheck_Wire.hxx>
 #include <BRepTools_WireExplorer.hxx>
@@ -58,16 +57,10 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <TopTools_HArray1OfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfOrientedShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfOrientedShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfOrientedShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
diff --git a/src/BRepCheck/BRepCheck_Wire.hxx b/src/BRepCheck/BRepCheck_Wire.hxx
index ea71c1d846..6beeda0cb9 100644
--- a/src/BRepCheck/BRepCheck_Wire.hxx
+++ b/src/BRepCheck/BRepCheck_Wire.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <BRepCheck_Status.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <BRepCheck_Result.hxx>
diff --git a/src/BRepClass/BRepClass_FClass2dOfFClassifier.hxx b/src/BRepClass/BRepClass_FClass2dOfFClassifier.hxx
index 492066a66f..e938720497 100644
--- a/src/BRepClass/BRepClass_FClass2dOfFClassifier.hxx
+++ b/src/BRepClass/BRepClass_FClass2dOfFClassifier.hxx
@@ -19,11 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <gp_Lin2d.hxx>
-#include <Standard_Real.hxx>
 #include <TopTrans_CurveTransition.hxx>
 #include <BRepClass_Intersector.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/BRepClass/BRepClass_FClassifier.hxx b/src/BRepClass/BRepClass_FClassifier.hxx
index 359d8f9db2..fe43b1fe76 100644
--- a/src/BRepClass/BRepClass_FClassifier.hxx
+++ b/src/BRepClass/BRepClass_FClassifier.hxx
@@ -19,13 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepClass_FClass2dOfFClassifier.hxx>
 #include <BRepClass_Edge.hxx>
-#include <Standard_Real.hxx>
 #include <IntRes2d_Position.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_State.hxx>
 class Standard_DomainError;
 class BRepClass_FaceExplorer;
diff --git a/src/BRepClass/BRepClass_FaceClassifier.cxx b/src/BRepClass/BRepClass_FaceClassifier.cxx
index 65cc41fc0c..b3736626f2 100644
--- a/src/BRepClass/BRepClass_FaceClassifier.cxx
+++ b/src/BRepClass/BRepClass_FaceClassifier.cxx
@@ -20,7 +20,6 @@
 #include <Extrema_ExtPS.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <TopAbs_State.hxx>
 #include <TopoDS_Face.hxx>
 
 //=======================================================================
diff --git a/src/BRepClass/BRepClass_FaceClassifier.hxx b/src/BRepClass/BRepClass_FaceClassifier.hxx
index e4382fb6e2..334f14344e 100644
--- a/src/BRepClass/BRepClass_FaceClassifier.hxx
+++ b/src/BRepClass/BRepClass_FaceClassifier.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepClass_FClassifier.hxx>
-#include <Standard_Real.hxx>
 class BRepClass_FaceExplorer;
 class gp_Pnt2d;
 class TopoDS_Face;
diff --git a/src/BRepClass/BRepClass_FaceExplorer.hxx b/src/BRepClass/BRepClass_FaceExplorer.hxx
index 8866993bc2..fe674e06fd 100644
--- a/src/BRepClass/BRepClass_FaceExplorer.hxx
+++ b/src/BRepClass/BRepClass_FaceExplorer.hxx
@@ -19,15 +19,12 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 #include <TopAbs_Orientation.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopExp_Explorer.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class gp_Pnt2d;
 class gp_Lin2d;
 class BRepClass_Edge;
diff --git a/src/BRepClass/BRepClass_FacePassiveClassifier.hxx b/src/BRepClass/BRepClass_FacePassiveClassifier.hxx
index 9063f70326..f93b6d015a 100644
--- a/src/BRepClass/BRepClass_FacePassiveClassifier.hxx
+++ b/src/BRepClass/BRepClass_FacePassiveClassifier.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <gp_Lin2d.hxx>
-#include <Standard_Real.hxx>
 #include <TopTrans_CurveTransition.hxx>
 #include <BRepClass_Intersector.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/BRepClass/BRepClass_Intersector.hxx b/src/BRepClass/BRepClass_Intersector.hxx
index 05acbc2e63..cdede179d0 100644
--- a/src/BRepClass/BRepClass_Intersector.hxx
+++ b/src/BRepClass/BRepClass_Intersector.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Geom2dInt_IntConicCurveOfGInter.hxx>
-#include <Standard_Real.hxx>
 class gp_Lin2d;
 class BRepClass_Edge;
 class gp_Dir2d;
diff --git a/src/BRepClass3d/BRepClass3d_BndBoxTree.hxx b/src/BRepClass3d/BRepClass3d_BndBoxTree.hxx
index 5050a74828..a817324ab1 100644
--- a/src/BRepClass3d/BRepClass3d_BndBoxTree.hxx
+++ b/src/BRepClass3d/BRepClass3d_BndBoxTree.hxx
@@ -20,12 +20,10 @@
 #include <NCollection_UBTreeFiller.hxx>
 #include <NCollection_UBTree.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <BRepBndLib.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <Geom_Line.hxx>
 #include <Bnd_Box.hxx>
-#include <gp_Lin.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <Precision.hxx>
 
diff --git a/src/BRepClass3d/BRepClass3d_Intersector3d.cxx b/src/BRepClass3d/BRepClass3d_Intersector3d.cxx
index 29977872e2..8b1b5a879b 100644
--- a/src/BRepClass3d/BRepClass3d_Intersector3d.cxx
+++ b/src/BRepClass3d/BRepClass3d_Intersector3d.cxx
@@ -20,13 +20,11 @@
 #include <BRepClass_FaceClassifier.hxx>
 #include <Geom_Line.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS_Face.hxx>
 
 //============================================================================
diff --git a/src/BRepClass3d/BRepClass3d_Intersector3d.hxx b/src/BRepClass3d/BRepClass3d_Intersector3d.hxx
index 7b7c3c0916..23f735e787 100644
--- a/src/BRepClass3d/BRepClass3d_Intersector3d.hxx
+++ b/src/BRepClass3d/BRepClass3d_Intersector3d.hxx
@@ -19,12 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
 #include <IntCurveSurface_TransitionOnCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_State.hxx>
 #include <TopoDS_Face.hxx>
 class gp_Lin;
diff --git a/src/BRepClass3d/BRepClass3d_SClassifier.cxx b/src/BRepClass3d/BRepClass3d_SClassifier.cxx
index 675bbd99c9..1cbf729b23 100644
--- a/src/BRepClass3d/BRepClass3d_SClassifier.cxx
+++ b/src/BRepClass3d/BRepClass3d_SClassifier.cxx
@@ -20,7 +20,6 @@
 #include <BRepClass3d_Intersector3d.hxx>
 #include <BRepClass3d_SClassifier.hxx>
 #include <BRepClass3d_SolidExplorer.hxx>
-#include <BRepTopAdaptor_FClass2d.hxx>
 #include <ElCLib.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Lin.hxx>
@@ -28,10 +27,7 @@
 #include <gp_Vec.hxx>
 #include <IntCurvesFace_Intersector.hxx>
 #include <math_BullardGenerator.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 #include <TopExp.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <Extrema_ExtPS.hxx>
diff --git a/src/BRepClass3d/BRepClass3d_SClassifier.hxx b/src/BRepClass3d/BRepClass3d_SClassifier.hxx
index 732cf5b3b2..f28a5e412d 100644
--- a/src/BRepClass3d/BRepClass3d_SClassifier.hxx
+++ b/src/BRepClass3d/BRepClass3d_SClassifier.hxx
@@ -19,12 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Face.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_State.hxx>
 class BRepClass3d_SolidExplorer;
 class gp_Pnt;
diff --git a/src/BRepClass3d/BRepClass3d_SolidClassifier.cxx b/src/BRepClass3d/BRepClass3d_SolidClassifier.cxx
index ebf241f484..9e33ed99cf 100644
--- a/src/BRepClass3d/BRepClass3d_SolidClassifier.cxx
+++ b/src/BRepClass3d/BRepClass3d_SolidClassifier.cxx
@@ -59,7 +59,6 @@ static StatistiquesBRepClass3d STAT;
 
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Shape.hxx>
 
 BRepClass3d_SolidClassifier::BRepClass3d_SolidClassifier()
diff --git a/src/BRepClass3d/BRepClass3d_SolidClassifier.hxx b/src/BRepClass3d/BRepClass3d_SolidClassifier.hxx
index 4e902600e5..420c14182e 100644
--- a/src/BRepClass3d/BRepClass3d_SolidClassifier.hxx
+++ b/src/BRepClass3d/BRepClass3d_SolidClassifier.hxx
@@ -19,12 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
 #include <BRepClass3d_SolidExplorer.hxx>
 #include <BRepClass3d_SClassifier.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Shape;
 class gp_Pnt;
 
diff --git a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
index 07a45b616d..43b657b336 100644
--- a/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
+++ b/src/BRepClass3d/BRepClass3d_SolidExplorer.cxx
@@ -25,22 +25,15 @@
 
 //-- To printf on NT
 
-#include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBndLib.hxx>
-#include <BRepClass3d_DataMapIteratorOfMapOfInter.hxx>
 #include <BRepClass3d_SolidExplorer.hxx>
-#include <BRepClass_Edge.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepClass_FacePassiveClassifier.hxx>
 #include <BRepTools.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
-#include <ElCLib.hxx>
 #include <Extrema_ExtPS.hxx>
-#include <Geom2d_Curve.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <gp.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/BRepClass3d/BRepClass3d_SolidPassiveClassifier.hxx b/src/BRepClass3d/BRepClass3d_SolidPassiveClassifier.hxx
index 3b40add298..1d83427339 100644
--- a/src/BRepClass3d/BRepClass3d_SolidPassiveClassifier.hxx
+++ b/src/BRepClass3d/BRepClass3d_SolidPassiveClassifier.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <TopoDS_Face.hxx>
 #include <gp_Lin.hxx>
-#include <Standard_Real.hxx>
 #include <TopAbs_State.hxx>
 #include <BRepClass3d_Intersector3d.hxx>
 #include <TopAbs_Orientation.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
index 1ef68ed9d6..8bd58f7e22 100644
--- a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
@@ -25,7 +25,6 @@
 #include <TopExp.hxx>
 #include <BRepExtrema_DistanceSS.hxx>
 #include <TopoDS.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
index 67269dbd62..3e5bc64a72 100644
--- a/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
+++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.hxx
@@ -20,10 +20,8 @@
 #include <BRepExtrema_SupportType.hxx>
 #include <Extrema_ExtAlgo.hxx>
 #include <Extrema_ExtFlag.hxx>
-#include <gp_Pnt.hxx>
 #include <Message_ProgressRange.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
index 0031e66a71..e81108b794 100644
--- a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
@@ -18,7 +18,6 @@
 
 #include <BRepExtrema_DistanceSS.hxx>
 
-#include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
@@ -34,12 +33,10 @@
 #include <Bnd_Box.hxx>
 #include <BRepExtrema_ExtPC.hxx>
 #include <BRepExtrema_ExtPF.hxx>
-#include <Extrema_ExtFlag.hxx>
 #include <BRepExtrema_ExtCC.hxx>
 #include <BRepExtrema_ExtCF.hxx>
 #include <BRepExtrema_ExtFF.hxx>
 #include <BRepClass_FaceClassifier.hxx>
-#include <TopAbs.hxx>
 #include <Geom_Curve.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Curve.hxx>
@@ -54,7 +51,6 @@
 #include <Geom_TrimmedCurve.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepTools.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 
 
 /*********************************************************************************/
diff --git a/src/BRepExtrema/BRepExtrema_ExtCF.cxx b/src/BRepExtrema/BRepExtrema_ExtCF.cxx
index cafdc8db11..4009b81001 100644
--- a/src/BRepExtrema/BRepExtrema_ExtCF.cxx
+++ b/src/BRepExtrema/BRepExtrema_ExtCF.cxx
@@ -18,7 +18,6 @@
 
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
-#include <Geom_Curve.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ExtFF.cxx b/src/BRepExtrema/BRepExtrema_ExtFF.cxx
index 02f7d5826e..377e3e1e72 100644
--- a/src/BRepExtrema/BRepExtrema_ExtFF.cxx
+++ b/src/BRepExtrema/BRepExtrema_ExtFF.cxx
@@ -19,7 +19,6 @@
 
 #include <BRepExtrema_ExtFF.hxx>
 
-#include <BRepExtrema_ExtCF.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
 #include <BRepClass_FaceClassifier.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ExtPF.hxx b/src/BRepExtrema/BRepExtrema_ExtPF.hxx
index 1c90d570ab..e132fc7e84 100644
--- a/src/BRepExtrema/BRepExtrema_ExtPF.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtPF.hxx
@@ -14,9 +14,7 @@
 #ifndef _BRepExtrema_ExtPF_HeaderFile
 #define _BRepExtrema_ExtPF_HeaderFile
 
-#include <Standard_DefineAlloc.hxx>
 #include <Extrema_ExtPS.hxx>
-#include <Standard_Integer.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
 #include <BRepAdaptor_Surface.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx b/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
index 328d23d94d..d863742136 100644
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
@@ -16,10 +16,6 @@
 #ifndef _BRepExtrema_ShapeProximity_HeaderFile
 #define _BRepExtrema_ShapeProximity_HeaderFile
 
-#include <NCollection_DataMap.hxx>
-#include <TColStd_PackedMapOfInteger.hxx>
-
-#include <BRepExtrema_TriangleSet.hxx>
 #include <BRepExtrema_OverlapTool.hxx>
 
 //! Tool class for shape proximity detection.
diff --git a/src/BRepFeat/BRepFeat.cxx b/src/BRepFeat/BRepFeat.cxx
index 4118757b34..725050a01f 100644
--- a/src/BRepFeat/BRepFeat.cxx
+++ b/src/BRepFeat/BRepFeat.cxx
@@ -16,12 +16,10 @@
 
 #include <BRepFeat.hxx>
 
-#include <Bnd_Box.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBndLib.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepTools.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
@@ -36,7 +34,6 @@
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomProjLib.hxx>
 #include <gp_Pnt.hxx>
@@ -54,7 +51,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #define NECHANTBARYC 11
diff --git a/src/BRepFeat/BRepFeat_Builder.cxx b/src/BRepFeat/BRepFeat_Builder.cxx
index 24c641209b..5c53721adb 100644
--- a/src/BRepFeat/BRepFeat_Builder.cxx
+++ b/src/BRepFeat/BRepFeat_Builder.cxx
@@ -30,15 +30,11 @@
 #include <BRep_Tool.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepFeat_Builder.hxx>
-#include <Geom_Curve.hxx>
-#include <IntTools_Tools.hxx>
-#include <Precision.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 
 //=======================================================================
diff --git a/src/BRepFeat/BRepFeat_Builder.hxx b/src/BRepFeat/BRepFeat_Builder.hxx
index b0f2616832..2d3fc4327c 100644
--- a/src/BRepFeat/BRepFeat_Builder.hxx
+++ b/src/BRepFeat/BRepFeat_Builder.hxx
@@ -18,13 +18,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BOPAlgo_BOP.hxx>
-#include <NCollection_BaseAllocator.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/BRepFeat/BRepFeat_Form.cxx b/src/BRepFeat/BRepFeat_Form.cxx
index e04e2ce919..19f1de65c1 100644
--- a/src/BRepFeat/BRepFeat_Form.cxx
+++ b/src/BRepFeat/BRepFeat_Form.cxx
@@ -15,14 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <Bnd_Box.hxx>
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepAlgo.hxx>
-#include <BRepAlgoAPI_BooleanOperation.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepBndLib.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepFeat.hxx>
 #include <BRepFeat_Builder.hxx>
@@ -36,25 +31,16 @@
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-#include <LocOpe.hxx>
-#include <LocOpe_BuildShape.hxx>
 #include <LocOpe_CSIntersector.hxx>
 #include <LocOpe_FindEdges.hxx>
 #include <LocOpe_Gluer.hxx>
 #include <LocOpe_PntFace.hxx>
-#include <LocOpe_SequenceOfCirc.hxx>
 #include <Precision.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/BRepFeat/BRepFeat_Form.hxx b/src/BRepFeat/BRepFeat_Form.hxx
index ef350db86a..793fb952d9 100644
--- a/src/BRepFeat/BRepFeat_Form.hxx
+++ b/src/BRepFeat/BRepFeat_Form.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_ListOfShape.hxx>
diff --git a/src/BRepFeat/BRepFeat_Gluer.cxx b/src/BRepFeat/BRepFeat_Gluer.cxx
index b119560b4a..15e9717947 100644
--- a/src/BRepFeat/BRepFeat_Gluer.cxx
+++ b/src/BRepFeat/BRepFeat_Gluer.cxx
@@ -17,8 +17,6 @@
 
 #include <BRepFeat_Gluer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
diff --git a/src/BRepFeat/BRepFeat_Gluer.hxx b/src/BRepFeat/BRepFeat_Gluer.hxx
index aba0dfe40c..a525775c1a 100644
--- a/src/BRepFeat/BRepFeat_Gluer.hxx
+++ b/src/BRepFeat/BRepFeat_Gluer.hxx
@@ -24,7 +24,6 @@
 #include <LocOpe_Gluer.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
 #include <LocOpe_Operation.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Shape;
 class TopoDS_Face;
diff --git a/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx b/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx
index 025dbfe1f2..ca244cff14 100644
--- a/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx
+++ b/src/BRepFeat/BRepFeat_MakeCylindricalHole.cxx
@@ -16,12 +16,9 @@
 
 
 #include <Bnd_Box.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepFeat_MakeCylindricalHole.hxx>
 #include <BRepPrim_Cylinder.hxx>
-#include <BRepTools.hxx>
 #include <ElCLib.hxx>
 #include <Geom_Curve.hxx>
 #include <gp_Ax1.hxx>
@@ -29,13 +26,11 @@
 #include <LocOpe_PntFace.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <CSLib.hxx>
diff --git a/src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx b/src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx
index 26b0ea93e3..87ff55200b 100644
--- a/src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx
+++ b/src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Ax1.hxx>
 #include <BRepFeat_Status.hxx>
diff --git a/src/BRepFeat/BRepFeat_MakeDPrism.cxx b/src/BRepFeat/BRepFeat_MakeDPrism.cxx
index 4d9e8ac669..7f01a42ba8 100644
--- a/src/BRepFeat/BRepFeat_MakeDPrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakeDPrism.cxx
@@ -16,8 +16,6 @@
 
 
 #include <Bnd_Box.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAlgo.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
@@ -28,7 +26,6 @@
 #include <BRepLib_MakeFace.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepTools.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
@@ -36,13 +33,10 @@
 #include <Geom_Surface.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
 #include <LocOpe.hxx>
 #include <LocOpe_CSIntersector.hxx>
 #include <LocOpe_DPrism.hxx>
 #include <LocOpe_PntFace.hxx>
-#include <LocOpe_SequenceOfLin.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
@@ -51,16 +45,10 @@
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/BRepFeat/BRepFeat_MakeDPrism.hxx b/src/BRepFeat/BRepFeat_MakeDPrism.hxx
index a31e84b660..358e94b8a6 100644
--- a/src/BRepFeat/BRepFeat_MakeDPrism.hxx
+++ b/src/BRepFeat/BRepFeat_MakeDPrism.hxx
@@ -21,15 +21,12 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <TopoDS_Face.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <Standard_Real.hxx>
-#include <TColGeom_SequenceOfCurve.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepFeat_StatusError.hxx>
 #include <BRepFeat_Form.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Geom_Curve;
 class TopoDS_Shape;
 class TopoDS_Edge;
diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
index b87a8827fe..c08cf2d9fd 100644
--- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx
@@ -36,34 +36,20 @@
 #include <BRepTools_Modifier.hxx>
 #include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomLProp_CLProps.hxx>
-#include <GeomProjLib.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
-#include <LocOpe.hxx>
-#include <LocOpe_FindEdges.hxx>
 #include <LocOpe_Gluer.hxx>
 #include <LocOpe_LinearForm.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <TColGeom_Array1OfCurve.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -71,13 +57,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.hxx b/src/BRepFeat/BRepFeat_MakeLinearForm.hxx
index 08c10bdbb5..dad2fc20b2 100644
--- a/src/BRepFeat/BRepFeat_MakeLinearForm.hxx
+++ b/src/BRepFeat/BRepFeat_MakeLinearForm.hxx
@@ -22,12 +22,10 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Vec.hxx>
-#include <Standard_Real.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepFeat_RibSlot.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Geom_Curve;
 class Geom_Plane;
 class TopoDS_Shape;
diff --git a/src/BRepFeat/BRepFeat_MakePipe.cxx b/src/BRepFeat/BRepFeat_MakePipe.cxx
index 7434e2ca24..484db318e8 100644
--- a/src/BRepFeat/BRepFeat_MakePipe.cxx
+++ b/src/BRepFeat/BRepFeat_MakePipe.cxx
@@ -15,18 +15,11 @@
 // commercial license or contractual agreement.
 
 
-#include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepFeat.hxx>
 #include <BRepFeat_MakePipe.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
 #include <LocOpe.hxx>
 #include <LocOpe_Pipe.hxx>
 #include <Standard_ConstructionError.hxx>
@@ -38,11 +31,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
diff --git a/src/BRepFeat/BRepFeat_MakePipe.hxx b/src/BRepFeat/BRepFeat_MakePipe.hxx
index c5d10ffe1f..b1f56a12f5 100644
--- a/src/BRepFeat/BRepFeat_MakePipe.hxx
+++ b/src/BRepFeat/BRepFeat_MakePipe.hxx
@@ -22,13 +22,10 @@
 #include <Standard_Handle.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TColGeom_SequenceOfCurve.hxx>
 #include <BRepFeat_Form.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Geom_Curve;
 class TopoDS_Edge;
 
diff --git a/src/BRepFeat/BRepFeat_MakePrism.cxx b/src/BRepFeat/BRepFeat_MakePrism.cxx
index 6d50d91a80..34ed188e4f 100644
--- a/src/BRepFeat/BRepFeat_MakePrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.cxx
@@ -16,11 +16,9 @@
 
 
 #include <Bnd_Box.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepBndLib.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepFeat.hxx>
 #include <BRepFeat_MakePrism.hxx>
 #include <BRepLib_MakeFace.hxx>
@@ -35,7 +33,6 @@
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <LocOpe.hxx>
 #include <LocOpe_CSIntersector.hxx>
@@ -45,19 +42,13 @@
 #include <Standard_ConstructionError.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
diff --git a/src/BRepFeat/BRepFeat_MakePrism.hxx b/src/BRepFeat/BRepFeat_MakePrism.hxx
index 453927089c..5f559884ac 100644
--- a/src/BRepFeat/BRepFeat_MakePrism.hxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.hxx
@@ -24,12 +24,9 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <gp_Dir.hxx>
-#include <TColGeom_SequenceOfCurve.hxx>
 #include <BRepFeat_StatusError.hxx>
 #include <BRepFeat_Form.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Geom_Curve;
 class TopoDS_Face;
 class TopoDS_Edge;
diff --git a/src/BRepFeat/BRepFeat_MakeRevol.cxx b/src/BRepFeat/BRepFeat_MakeRevol.cxx
index 1f93310c0d..69eeee218d 100644
--- a/src/BRepFeat/BRepFeat_MakeRevol.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevol.cxx
@@ -16,21 +16,14 @@
 
 
 #include <Bnd_Box.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepFeat.hxx>
 #include <BRepFeat_MakeRevol.hxx>
-#include <BRepLib_MakeFace.hxx>
 #include <BRepSweep_Revol.hxx>
 #include <BRepTools_Modifier.hxx>
 #include <BRepTools_TrsfModification.hxx>
 #include <ElCLib.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
@@ -38,32 +31,19 @@
 #include <gp_Ax1.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
-#include <LocOpe.hxx>
 #include <LocOpe_BuildShape.hxx>
 #include <LocOpe_CSIntersector.hxx>
 #include <LocOpe_FindEdges.hxx>
-#include <LocOpe_Gluer.hxx>
 #include <LocOpe_PntFace.hxx>
 #include <LocOpe_Revol.hxx>
-#include <LocOpe_SequenceOfCirc.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
diff --git a/src/BRepFeat/BRepFeat_MakeRevol.hxx b/src/BRepFeat/BRepFeat_MakeRevol.hxx
index c807e66d38..0cf191e9d8 100644
--- a/src/BRepFeat/BRepFeat_MakeRevol.hxx
+++ b/src/BRepFeat/BRepFeat_MakeRevol.hxx
@@ -24,12 +24,9 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <gp_Ax1.hxx>
-#include <TColGeom_SequenceOfCurve.hxx>
 #include <BRepFeat_StatusError.hxx>
 #include <BRepFeat_Form.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Geom_Curve;
 class TopoDS_Face;
 class TopoDS_Edge;
diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
index a2525e7583..e4c3983703 100644
--- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
@@ -36,11 +36,9 @@
 #include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
-#include <CSLib.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom2dAPI_ExtremaCurveCurve.hxx>
 #include <Geom2dAPI_InterCurveCurve.hxx>
 #include <Geom_Circle.hxx>
@@ -55,29 +53,19 @@
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAPI.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomLProp_CLProps.hxx>
-#include <GeomProjLib.hxx>
 #include <gp_Ax1.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
-#include <LocOpe.hxx>
 #include <LocOpe_CSIntersector.hxx>
-#include <LocOpe_FindEdges.hxx>
 #include <LocOpe_Gluer.hxx>
 #include <LocOpe_PntFace.hxx>
 #include <LocOpe_RevolutionForm.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <TColGeom_Array1OfCurve.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -85,13 +73,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean BRepFeat_GettraceFEAT();
diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.hxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.hxx
index b653858708..e6a66a8c77 100644
--- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.hxx
+++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Ax1.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepFeat_RibSlot.hxx>
diff --git a/src/BRepFeat/BRepFeat_RibSlot.cxx b/src/BRepFeat/BRepFeat_RibSlot.cxx
index 9c59a2c302..94a8f0b5c4 100644
--- a/src/BRepFeat/BRepFeat_RibSlot.cxx
+++ b/src/BRepFeat/BRepFeat_RibSlot.cxx
@@ -15,14 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <Bnd_Box.hxx>
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo.hxx>
-#include <BRepAlgoAPI_BooleanOperation.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepFeat.hxx>
@@ -63,10 +58,7 @@
 #include <LocOpe_Gluer.hxx>
 #include <LocOpe_PntFace.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -74,11 +66,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/BRepFeat/BRepFeat_RibSlot.hxx b/src/BRepFeat/BRepFeat_RibSlot.hxx
index e8160baaef..cb28bcc691 100644
--- a/src/BRepFeat/BRepFeat_RibSlot.hxx
+++ b/src/BRepFeat/BRepFeat_RibSlot.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <BRepFeat_PerfSelection.hxx>
@@ -32,7 +31,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <BRepFeat_StatusError.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class TopoDS_Edge;
 class Geom_Plane;
diff --git a/src/BRepFeat/BRepFeat_SplitShape.cxx b/src/BRepFeat/BRepFeat_SplitShape.cxx
index 4b5ea9399c..fdc233bc9b 100644
--- a/src/BRepFeat/BRepFeat_SplitShape.cxx
+++ b/src/BRepFeat/BRepFeat_SplitShape.cxx
@@ -17,16 +17,7 @@
 
 #include <BRepFeat_SplitShape.hxx>
 #include <LocOpe_WiresOnShape.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_Failure.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <StdFail_NotDone.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopExp_Explorer.hxx>
 
 //=======================================================================
diff --git a/src/BRepFeat/BRepFeat_SplitShape.hxx b/src/BRepFeat/BRepFeat_SplitShape.hxx
index 406a7c4d25..ee793bc4ff 100644
--- a/src/BRepFeat/BRepFeat_SplitShape.hxx
+++ b/src/BRepFeat/BRepFeat_SplitShape.hxx
@@ -23,7 +23,6 @@
 
 #include <LocOpe_Spliter.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepFill/BRepFill.cxx b/src/BRepFill/BRepFill.cxx
index e40eb199f7..38fd29fa4f 100644
--- a/src/BRepFill/BRepFill.cxx
+++ b/src/BRepFill/BRepFill.cxx
@@ -38,17 +38,13 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepExtrema_ExtPC.hxx>
-#include <BRepGProp.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_FindSurface.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
-#include <BRepLib_MakeVertex.hxx>
 #include <BRepLib_MakeWire.hxx>
-#include <BRepLProp.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <Geom2d_Line.hxx>
@@ -56,23 +52,15 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomFill_Generator.hxx>
 #include <gp_Ax3.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <GProp_GProps.hxx>
-#include <GProp_PrincipalProps.hxx>
 #include <Precision.hxx>
 #include <Standard_NoSuchObject.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
@@ -84,12 +72,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepFill/BRepFill.hxx b/src/BRepFill/BRepFill.hxx
index d8c8d085c9..d3d74f0884 100644
--- a/src/BRepFill/BRepFill.hxx
+++ b/src/BRepFill/BRepFill.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class TopoDS_Face;
 class TopoDS_Edge;
diff --git a/src/BRepFill/BRepFill_ACRLaw.cxx b/src/BRepFill/BRepFill_ACRLaw.cxx
index dec7b3dc0b..520c366f92 100644
--- a/src/BRepFill/BRepFill_ACRLaw.cxx
+++ b/src/BRepFill/BRepFill_ACRLaw.cxx
@@ -28,7 +28,6 @@
 #include <GeomFill_LocationLaw.hxx>
 #include <Standard_Type.hxx>
 #include <TopExp.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HArray1OfShape.hxx>
diff --git a/src/BRepFill/BRepFill_AdvancedEvolved.cxx b/src/BRepFill/BRepFill_AdvancedEvolved.cxx
index 70f4b2bb16..2d5cdd19f5 100644
--- a/src/BRepFill/BRepFill_AdvancedEvolved.cxx
+++ b/src/BRepFill/BRepFill_AdvancedEvolved.cxx
@@ -19,36 +19,21 @@
 #include <BRep_Builder.hxx>
 #include <BRepFill_PipeShell.hxx>
 #include <BRepFill_TransitionStyle.hxx>
-#include <TopExp.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BOPAlgo_Tools.hxx>
 #include <BRepLib_FindSurface.hxx>
-#include <Geom_Plane.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BOPAlgo_MakerVolume.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopExp_Explorer.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
-#include <math_MultipleVarFunctionWithHessian.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <math_NewtonMinimum.hxx>
 #include <BOPTools_AlgoTools.hxx>
-#include <math_Matrix.hxx>
 #include <math_Vector.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepTools.hxx>
-#include <BRepTopAdaptor_FClass2d.hxx>
-#include <BOPAlgo_BuilderFace.hxx>
 #include <BOPAlgo_BuilderFace.hxx>
 #include <Geom2d_Line.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
 #include <math_GlobOptMin.hxx>
-#include <Geom_ConicalSurface.hxx>
 #include <Extrema_ExtPC.hxx>
 #include <BOPDS_DS.hxx>
 #include <BRepLib.hxx>
@@ -57,7 +42,6 @@
 #include <ShapeFix_Shape.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepGProp_Face.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <ShapeUpgrade_UnifySameDomain.hxx>
 
diff --git a/src/BRepFill/BRepFill_AdvancedEvolved.hxx b/src/BRepFill/BRepFill_AdvancedEvolved.hxx
index 3df98e8e7e..8f4ce93430 100644
--- a/src/BRepFill/BRepFill_AdvancedEvolved.hxx
+++ b/src/BRepFill/BRepFill_AdvancedEvolved.hxx
@@ -24,7 +24,6 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <Standard_CString.hxx>
 
 class BOPAlgo_MakerVolume;
 class TopoDS_Face;
diff --git a/src/BRepFill/BRepFill_ApproxSeewing.cxx b/src/BRepFill/BRepFill_ApproxSeewing.cxx
index fd803701ba..456a491daa 100644
--- a/src/BRepFill/BRepFill_ApproxSeewing.cxx
+++ b/src/BRepFill/BRepFill_ApproxSeewing.cxx
@@ -20,12 +20,10 @@
 #include <AppDef_MultiPointConstraint.hxx>
 #include <AppParCurves_MultiCurve.hxx>
 #include <BRepFill_ApproxSeewing.hxx>
-#include <BSplCLib.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_Curve.hxx>
-#include <PLib.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
diff --git a/src/BRepFill/BRepFill_ApproxSeewing.hxx b/src/BRepFill/BRepFill_ApproxSeewing.hxx
index 89fe6fb864..12e7a58a93 100644
--- a/src/BRepFill/BRepFill_ApproxSeewing.hxx
+++ b/src/BRepFill/BRepFill_ApproxSeewing.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepFill_MultiLine.hxx>
-#include <Standard_Boolean.hxx>
 class Geom_Curve;
 class Geom2d_Curve;
 
diff --git a/src/BRepFill/BRepFill_CompatibleWires.cxx b/src/BRepFill/BRepFill_CompatibleWires.cxx
index b4d2cb8931..13212c52a1 100644
--- a/src/BRepFill/BRepFill_CompatibleWires.cxx
+++ b/src/BRepFill/BRepFill_CompatibleWires.cxx
@@ -34,12 +34,10 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <gp.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Elips.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Vec.hxx>
-#include <GProp_GProps.hxx>
 #include <GProp_PrincipalProps.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
@@ -50,18 +48,15 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_SequenceOfReal.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeSequenceOfShape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepFill/BRepFill_CompatibleWires.hxx b/src/BRepFill/BRepFill_CompatibleWires.hxx
index ace76b4fef..ffcac2acc8 100644
--- a/src/BRepFill/BRepFill_CompatibleWires.hxx
+++ b/src/BRepFill/BRepFill_CompatibleWires.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_SequenceOfShape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Edge;
diff --git a/src/BRepFill/BRepFill_ComputeCLine.hxx b/src/BRepFill/BRepFill_ComputeCLine.hxx
index e736d53bd5..939e646279 100644
--- a/src/BRepFill/BRepFill_ComputeCLine.hxx
+++ b/src/BRepFill/BRepFill_ComputeCLine.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <AppParCurves_Constraint.hxx>
 #include <BRepFill_MultiLine.hxx>
 class AppParCurves_MultiCurve;
diff --git a/src/BRepFill/BRepFill_CurveConstraint.cxx b/src/BRepFill/BRepFill_CurveConstraint.cxx
index b8cf9eb637..d36b0515d9 100644
--- a/src/BRepFill/BRepFill_CurveConstraint.cxx
+++ b/src/BRepFill/BRepFill_CurveConstraint.cxx
@@ -15,24 +15,15 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepFill_CurveConstraint.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom_Plane.hxx>
-#include <GeomAdaptor.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAPI.hxx>
 #include <GeomPlate_CurveConstraint.hxx>
-#include <Precision.hxx>
 #include <ProjLib_ProjectedCurve.hxx>
 #include <ProjLib_ProjectOnPlane.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepFill_CurveConstraint,GeomPlate_CurveConstraint)
diff --git a/src/BRepFill/BRepFill_CurveConstraint.hxx b/src/BRepFill/BRepFill_CurveConstraint.hxx
index d967011775..d9f006e8b5 100644
--- a/src/BRepFill/BRepFill_CurveConstraint.hxx
+++ b/src/BRepFill/BRepFill_CurveConstraint.hxx
@@ -22,7 +22,6 @@
 
 #include <GeomPlate_CurveConstraint.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 
 class BRepFill_CurveConstraint;
 DEFINE_STANDARD_HANDLE(BRepFill_CurveConstraint, GeomPlate_CurveConstraint)
diff --git a/src/BRepFill/BRepFill_Draft.cxx b/src/BRepFill/BRepFill_Draft.cxx
index 65f605bf74..b8c9762958 100644
--- a/src/BRepFill/BRepFill_Draft.cxx
+++ b/src/BRepFill/BRepFill_Draft.cxx
@@ -16,9 +16,6 @@
 
 #include <BRepFill_Draft.hxx>
 
-#include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Bnd_Box.hxx>
 #include <BndLib_Add3dCurve.hxx>
 #include <BndLib_AddSurface.hxx>
 #include <BOPAlgo_Builder.hxx>
@@ -26,14 +23,11 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgoAPI_Section.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepFill_DataMapOfShapeHArray2OfShape.hxx>
 #include <BRepFill_DraftLaw.hxx>
-#include <BRepFill_SectionLaw.hxx>
 #include <BRepFill_ShapeLaw.hxx>
 #include <BRepFill_Sweep.hxx>
 #include <BRepLib_FindSurface.hxx>
@@ -52,16 +46,12 @@
 #include <GeomLProp_SLProps.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Mat.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Trsf.hxx>
 #include <Precision.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -71,7 +61,6 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 #ifdef DRAW
diff --git a/src/BRepFill/BRepFill_DraftLaw.cxx b/src/BRepFill/BRepFill_DraftLaw.cxx
index 4c53a06a63..6b817ece34 100644
--- a/src/BRepFill/BRepFill_DraftLaw.cxx
+++ b/src/BRepFill/BRepFill_DraftLaw.cxx
@@ -20,9 +20,7 @@
 #include <GeomFill_LocationDraft.hxx>
 #include <GeomFill_LocationLaw.hxx>
 #include <gp_Mat.hxx>
-#include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
-#include <gp_XYZ.hxx>
 #include <Standard_Type.hxx>
 #include <TopoDS_Wire.hxx>
 
diff --git a/src/BRepFill/BRepFill_DraftLaw.hxx b/src/BRepFill/BRepFill_DraftLaw.hxx
index 7beb4620b3..dc1956f568 100644
--- a/src/BRepFill/BRepFill_DraftLaw.hxx
+++ b/src/BRepFill/BRepFill_DraftLaw.hxx
@@ -18,7 +18,6 @@
 #define _BRepFill_DraftLaw_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <BRepFill_Edge3DLaw.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/BRepFill/BRepFill_Edge3DLaw.cxx b/src/BRepFill/BRepFill_Edge3DLaw.cxx
index 2fc30df8c1..2da513fb83 100644
--- a/src/BRepFill/BRepFill_Edge3DLaw.cxx
+++ b/src/BRepFill/BRepFill_Edge3DLaw.cxx
@@ -25,7 +25,6 @@
 #include <GeomFill_LocationLaw.hxx>
 #include <Standard_Type.hxx>
 #include <TopExp.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HArray1OfShape.hxx>
diff --git a/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx b/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
index 0d53a0d9d3..e173e0098b 100644
--- a/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
+++ b/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
@@ -18,9 +18,7 @@
 #define _BRepFill_EdgeOnSurfLaw_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <BRepFill_LocationLaw.hxx>
 class TopoDS_Wire;
 class TopoDS_Shape;
diff --git a/src/BRepFill/BRepFill_Evolved.cxx b/src/BRepFill/BRepFill_Evolved.cxx
index a5024f938c..6655ffb441 100644
--- a/src/BRepFill/BRepFill_Evolved.cxx
+++ b/src/BRepFill/BRepFill_Evolved.cxx
@@ -19,15 +19,11 @@
 #include <Bisector_BisecAna.hxx>
 #include <Bnd_Box2d.hxx>
 #include <BndLib_Add2dCurve.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
 #include <BRepAlgo_Loop.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
-#include <BRepFill_DataMapIteratorOfDataMapOfShapeDataMapOfShapeListOfShape.hxx>
 #include <BRepFill_DataMapOfNodeDataMapOfShapeShape.hxx>
-#include <BRepFill_DataMapOfShapeDataMapOfShapeListOfShape.hxx>
 #include <BRepFill_DataMapOfShapeSequenceOfPnt.hxx>
 #include <BRepFill_DataMapOfShapeSequenceOfReal.hxx>
 #include <BRepFill_Evolved.hxx>
@@ -52,13 +48,10 @@
 #include <BRepTools_Quilt.hxx>
 #include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <Geom2d_CartesianPoint.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Geometry.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dAPI_ExtremaCurveCurve.hxx>
 #include <Geom2dInt_GInter.hxx>
 #include <Geom_Curve.hxx>
@@ -67,7 +60,6 @@
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI.hxx>
 #include <GeomProjLib.hxx>
 #include <gp.hxx>
 #include <gp_Ax1.hxx>
@@ -106,11 +98,8 @@
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeSequenceOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 //#define DRAW
diff --git a/src/BRepFill/BRepFill_Evolved.hxx b/src/BRepFill/BRepFill_Evolved.hxx
index a386af2a30..2bc725e431 100644
--- a/src/BRepFill/BRepFill_Evolved.hxx
+++ b/src/BRepFill/BRepFill_Evolved.hxx
@@ -19,12 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_JoinType.hxx>
 #include <BRepFill_DataMapOfShapeDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
diff --git a/src/BRepFill/BRepFill_Filling.cxx b/src/BRepFill/BRepFill_Filling.cxx
index 546919e9aa..89f77932a1 100644
--- a/src/BRepFill/BRepFill_Filling.cxx
+++ b/src/BRepFill/BRepFill_Filling.cxx
@@ -18,11 +18,8 @@
 
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
-#include <BRep_TVertex.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
@@ -32,7 +29,6 @@
 #include <BRepLib.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepLib_MakeEdge.hxx>
-#include <BRepLib_MakeEdge2d.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepLib_MakeWire.hxx>
 #include <BRepTools.hxx>
@@ -47,17 +43,13 @@
 #include <GeomPlate_MakeApprox.hxx>
 #include <GeomPlate_PlateG0Criterion.hxx>
 #include <GeomPlate_PointConstraint.hxx>
-#include <GeomProjLib.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColGeom2d_HArray1OfCurve.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColgp_SequenceOfXY.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -65,7 +57,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <Geom_Surface.hxx>
 
 static gp_Vec MakeFinVec( const TopoDS_Wire aWire, const TopoDS_Vertex aVertex )
diff --git a/src/BRepFill/BRepFill_Generator.cxx b/src/BRepFill/BRepFill_Generator.cxx
index 79d59d1fea..756a31bf03 100644
--- a/src/BRepFill/BRepFill_Generator.cxx
+++ b/src/BRepFill/BRepFill_Generator.cxx
@@ -24,20 +24,15 @@
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Circle.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomConvert.hxx>
-#include <GeomFill.hxx>
 #include <GeomFill_Generator.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Ax3.hxx>
@@ -51,11 +46,11 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
+#include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/BRepFill/BRepFill_Generator.hxx b/src/BRepFill/BRepFill_Generator.hxx
index 39b2bfc9db..421040bd5a 100644
--- a/src/BRepFill/BRepFill_Generator.hxx
+++ b/src/BRepFill/BRepFill_Generator.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopoDS_Shell.hxx>
diff --git a/src/BRepFill/BRepFill_LocationLaw.cxx b/src/BRepFill/BRepFill_LocationLaw.cxx
index 88fb76449e..55979ea65b 100644
--- a/src/BRepFill/BRepFill_LocationLaw.cxx
+++ b/src/BRepFill/BRepFill_LocationLaw.cxx
@@ -28,14 +28,11 @@
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
 #include <gp_XYZ.hxx>
-#include <Precision.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfVec2d.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <TopExp.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BRepFill/BRepFill_LocationLaw.hxx b/src/BRepFill/BRepFill_LocationLaw.hxx
index 4f3effc644..ef0c460388 100644
--- a/src/BRepFill/BRepFill_LocationLaw.hxx
+++ b/src/BRepFill/BRepFill_LocationLaw.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Wire.hxx>
-#include <Standard_Real.hxx>
 #include <GeomFill_HArray1OfLocationLaw.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TopTools_HArray1OfShape.hxx>
@@ -30,7 +29,6 @@
 #include <Standard_Transient.hxx>
 #include <GeomFill_PipeError.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <Standard_Boolean.hxx>
 class GeomFill_LocationLaw;
 class TopoDS_Edge;
 class TopoDS_Vertex;
diff --git a/src/BRepFill/BRepFill_MultiLine.cxx b/src/BRepFill/BRepFill_MultiLine.cxx
index 1d6b1406bf..9f27aa77ab 100644
--- a/src/BRepFill/BRepFill_MultiLine.cxx
+++ b/src/BRepFill/BRepFill_MultiLine.cxx
@@ -18,7 +18,6 @@
 
 #include <BRepIntCurveSurface_Inter.hxx>
 #include <gp.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Circ2d.hxx>
diff --git a/src/BRepFill/BRepFill_MultiLine.hxx b/src/BRepFill/BRepFill_MultiLine.hxx
index cf7899fb2e..2244f4b050 100644
--- a/src/BRepFill/BRepFill_MultiLine.hxx
+++ b/src/BRepFill/BRepFill_MultiLine.hxx
@@ -26,7 +26,6 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/BRepFill/BRepFill_NSections.cxx b/src/BRepFill/BRepFill_NSections.cxx
index c2a827123d..6e7f0c984b 100644
--- a/src/BRepFill/BRepFill_NSections.cxx
+++ b/src/BRepFill/BRepFill_NSections.cxx
@@ -18,7 +18,6 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepFill.hxx>
 #include <BRepFill_NSections.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeWire.hxx>
@@ -26,23 +25,18 @@
 #include <BRepTools_WireExplorer.hxx>
 #include <BSplCLib.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Conic.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomConvert.hxx>
 #include <GeomConvert_ApproxCurve.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomFill_AppSurf.hxx>
-#include <GeomFill_EvolvedSection.hxx>
 #include <GeomFill_HArray1OfSectionLaw.hxx>
 #include <GeomFill_Line.hxx>
 #include <GeomFill_NSections.hxx>
 #include <GeomFill_SectionGenerator.hxx>
 #include <GeomFill_SectionLaw.hxx>
-#include <GeomFill_UniformSection.hxx>
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
diff --git a/src/BRepFill/BRepFill_NSections.hxx b/src/BRepFill/BRepFill_NSections.hxx
index 0efee65da8..5066650231 100644
--- a/src/BRepFill/BRepFill_NSections.hxx
+++ b/src/BRepFill/BRepFill_NSections.hxx
@@ -20,13 +20,11 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <GeomFill_SequenceOfTrsf.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TopTools_HArray2OfShape.hxx>
 #include <BRepFill_SectionLaw.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
 class Geom_BSplineSurface;
diff --git a/src/BRepFill/BRepFill_OffsetAncestors.cxx b/src/BRepFill/BRepFill_OffsetAncestors.cxx
index efd6e3101d..cf387726d8 100644
--- a/src/BRepFill/BRepFill_OffsetAncestors.cxx
+++ b/src/BRepFill/BRepFill_OffsetAncestors.cxx
@@ -22,7 +22,6 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : BRepFill_OffsetAncestors
diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx
index a1a1699211..0c7cb2b840 100644
--- a/src/BRepFill/BRepFill_OffsetWire.cxx
+++ b/src/BRepFill/BRepFill_OffsetWire.cxx
@@ -18,9 +18,7 @@
 
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor2d_OffsetCurve.hxx>
-#include <Bisector_Bisec.hxx>
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
@@ -28,14 +26,12 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepFill_DataMapOfNodeShape.hxx>
-#include <BRepFill_DataMapOfOrientedShapeListOfShape.hxx>
 #include <BRepFill_DataMapOfShapeSequenceOfPnt.hxx>
 #include <BRepFill_DataMapOfShapeSequenceOfReal.hxx>
 #include <BRepFill_OffsetWire.hxx>
 #include <BRepFill_TrimEdgeTool.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
-#include <BRepLib_MakeFace.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepLib_MakeWire.hxx>
 #include <BRepMAT2d_BisectingLocus.hxx>
@@ -44,14 +40,12 @@
 #include <BRepTools.hxx>
 #include <BRepTools_Substitution.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_OffsetCurve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 #include <Geom2dLProp_CLProps2d.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Line.hxx>
@@ -59,9 +53,7 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI.hxx>
 #include <gp.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Vec.hxx>
@@ -72,14 +64,9 @@
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_SequenceOfReal.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -88,15 +75,11 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeSequenceOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepFill/BRepFill_OffsetWire.hxx b/src/BRepFill/BRepFill_OffsetWire.hxx
index a0c3865cb6..f5c89597c0 100644
--- a/src/BRepFill/BRepFill_OffsetWire.hxx
+++ b/src/BRepFill/BRepFill_OffsetWire.hxx
@@ -19,13 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Face.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
-#include <GeomAbs_JoinType.hxx>
 #include <BRepFill_IndexedDataMapOfOrientedShapeListOfShape.hxx>
 #include <BRepMAT2d_BisectingLocus.hxx>
 #include <BRepMAT2d_LinkTopoBilo.hxx>
diff --git a/src/BRepFill/BRepFill_Pipe.cxx b/src/BRepFill/BRepFill_Pipe.cxx
index 00944ac2f4..8fe76d21b8 100644
--- a/src/BRepFill/BRepFill_Pipe.cxx
+++ b/src/BRepFill/BRepFill_Pipe.cxx
@@ -18,7 +18,6 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepFill_Edge3DLaw.hxx>
@@ -44,11 +43,7 @@
 #include <Precision.hxx>
 #include <ShapeUpgrade_RemoveLocations.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <StdFail_NotDone.hxx>
-#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
-#include <TColStd_DataMapOfIntegerInteger.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
@@ -61,9 +56,7 @@
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfIntegerShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 #ifdef DRAW
diff --git a/src/BRepFill/BRepFill_Pipe.hxx b/src/BRepFill/BRepFill_Pipe.hxx
index 26717bcd51..bd26997ade 100644
--- a/src/BRepFill/BRepFill_Pipe.hxx
+++ b/src/BRepFill/BRepFill_Pipe.hxx
@@ -24,15 +24,12 @@
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Shape.hxx>
 #include <gp_Trsf.hxx>
-#include <TopTools_HArray2OfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <BRepFill_DataMapOfShapeHArray2OfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <GeomFill_Trihedron.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class BRepFill_LocationLaw;
 class TopoDS_Face;
 class TopoDS_Edge;
diff --git a/src/BRepFill/BRepFill_PipeShell.cxx b/src/BRepFill/BRepFill_PipeShell.cxx
index b9fbd97435..e0405b02c2 100644
--- a/src/BRepFill/BRepFill_PipeShell.cxx
+++ b/src/BRepFill/BRepFill_PipeShell.cxx
@@ -24,7 +24,6 @@
 #include <BRepFill.hxx>
 #include <BRepFill_ACRLaw.hxx>
 #include <BRepFill_CompatibleWires.hxx>
-#include <BRepFill_DataMapOfShapeHArray2OfShape.hxx>
 #include <BRepFill_Edge3DLaw.hxx>
 #include <BRepFill_EdgeOnSurfLaw.hxx>
 #include <BRepFill_LocationLaw.hxx>
@@ -36,9 +35,7 @@
 #include <BRepFill_ShapeLaw.hxx>
 #include <BRepFill_Sweep.hxx>
 #include <BRepGProp.hxx>
-#include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomFill_ConstantBiNormal.hxx>
 #include <GeomFill_CorrectedFrenet.hxx>
@@ -58,19 +55,15 @@
 #include <GProp_GProps.hxx>
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
-#include <Law_Function.hxx>
 #include <Law_Interpol.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <TopExp.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
@@ -91,10 +84,8 @@ IMPLEMENT_STANDARD_RTTIEXT(BRepFill_PipeShell,Standard_Transient)
 static Standard_Boolean Affich = 0;
 #endif
 
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfIntegerShape.hxx>
-#include <TopoDS_Compound.hxx>
 
 
 static Standard_Boolean BuildBoundaries(const BRepFill_Sweep&               theSweep,
diff --git a/src/BRepFill/BRepFill_PipeShell.hxx b/src/BRepFill/BRepFill_PipeShell.hxx
index 89b8b10c50..3ff08b460c 100644
--- a/src/BRepFill/BRepFill_PipeShell.hxx
+++ b/src/BRepFill/BRepFill_PipeShell.hxx
@@ -24,9 +24,7 @@
 #include <TopoDS_Shape.hxx>
 #include <BRepFill_SequenceOfSection.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_HArray2OfShape.hxx>
 #include <GeomFill_Trihedron.hxx>
 #include <BRepFill_TransitionStyle.hxx>
diff --git a/src/BRepFill/BRepFill_Section.cxx b/src/BRepFill/BRepFill_Section.cxx
index 09e5d6f8a7..c15fa7a25a 100644
--- a/src/BRepFill/BRepFill_Section.cxx
+++ b/src/BRepFill/BRepFill_Section.cxx
@@ -22,7 +22,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
 #include <ShapeUpgrade_RemoveLocations.hxx>
 
diff --git a/src/BRepFill/BRepFill_Section.hxx b/src/BRepFill/BRepFill_Section.hxx
index f9bf2892d2..b07da5e4c3 100644
--- a/src/BRepFill/BRepFill_Section.hxx
+++ b/src/BRepFill/BRepFill_Section.hxx
@@ -19,11 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <Standard_Boolean.hxx>
 
 
 //! To store section definition
diff --git a/src/BRepFill/BRepFill_SectionLaw.cxx b/src/BRepFill/BRepFill_SectionLaw.cxx
index 03a32f4458..aa86b68b27 100644
--- a/src/BRepFill/BRepFill_SectionLaw.cxx
+++ b/src/BRepFill/BRepFill_SectionLaw.cxx
@@ -20,22 +20,10 @@
 #include <BRepFill_SectionLaw.hxx>
 #include <BRepLProp.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomFill_SectionLaw.hxx>
-#include <GeomFill_UniformSection.hxx>
-#include <Precision.hxx>
 #include <Standard_Type.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
-#include <TopExp.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepFill_SectionLaw,Standard_Transient)
diff --git a/src/BRepFill/BRepFill_SectionLaw.hxx b/src/BRepFill/BRepFill_SectionLaw.hxx
index af7e022483..8e08fe6a96 100644
--- a/src/BRepFill/BRepFill_SectionLaw.hxx
+++ b/src/BRepFill/BRepFill_SectionLaw.hxx
@@ -22,12 +22,10 @@
 
 #include <GeomFill_HArray1OfSectionLaw.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
-#include <Standard_Boolean.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Real.hxx>
 class GeomFill_SectionLaw;
 class TopoDS_Vertex;
 class TopoDS_Shape;
diff --git a/src/BRepFill/BRepFill_SectionPlacement.cxx b/src/BRepFill/BRepFill_SectionPlacement.cxx
index 0164700549..631d94183d 100644
--- a/src/BRepFill/BRepFill_SectionPlacement.cxx
+++ b/src/BRepFill/BRepFill_SectionPlacement.cxx
@@ -17,15 +17,12 @@
 
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_CompCurve.hxx>
-#include <BRepAdaptor_Curve.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepExtrema_SupportType.hxx>
 #include <BRepFill_LocationLaw.hxx>
 #include <BRepFill_SectionPlacement.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
@@ -35,7 +32,6 @@
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
diff --git a/src/BRepFill/BRepFill_SectionPlacement.hxx b/src/BRepFill/BRepFill_SectionPlacement.hxx
index d691ec9966..aafc11761d 100644
--- a/src/BRepFill/BRepFill_SectionPlacement.hxx
+++ b/src/BRepFill/BRepFill_SectionPlacement.hxx
@@ -23,9 +23,7 @@
 
 #include <TopoDS_Shape.hxx>
 #include <gp_Trsf.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class BRepFill_LocationLaw;
 
 
diff --git a/src/BRepFill/BRepFill_ShapeLaw.hxx b/src/BRepFill/BRepFill_ShapeLaw.hxx
index 43adea9134..9eaa4e47c3 100644
--- a/src/BRepFill/BRepFill_ShapeLaw.hxx
+++ b/src/BRepFill/BRepFill_ShapeLaw.hxx
@@ -22,11 +22,9 @@
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_HArray1OfShape.hxx>
-#include <Standard_Boolean.hxx>
 #include <BRepFill_SectionLaw.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 class Law_Function;
 class TopoDS_Vertex;
 class TopoDS_Wire;
diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx
index a9a6d2bdd6..d26a35f807 100644
--- a/src/BRepFill/BRepFill_Sweep.cxx
+++ b/src/BRepFill/BRepFill_Sweep.cxx
@@ -18,34 +18,27 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Approx_CurveOnSurface.hxx>
 #include <Approx_SameParameter.hxx>
-#include <Bnd_Box.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRep_TVertex.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepCheck_Edge.hxx>
-#include <BRepFill_CurveConstraint.hxx>
 #include <BRepFill_LocationLaw.hxx>
 #include <BRepFill_SectionLaw.hxx>
 #include <BRepFill_Sweep.hxx>
 #include <BRepFill_TrimShellCorner.hxx>
 #include <BRepLib.hxx>
-#include <BRepLib_FaceError.hxx>
 #include <BRepLib_FindSurface.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepTools_Substitution.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
@@ -58,7 +51,6 @@
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomConvert_ApproxSurface.hxx>
 #include <GeomFill_LocationLaw.hxx>
 #include <GeomFill_SectionLaw.hxx>
 #include <GeomFill_Sweep.hxx>
@@ -68,14 +60,12 @@
 #include <gp_Vec2d.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColGeom_Array2OfSurface.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfBoolean.hxx>
-#include <TColStd_Array2OfInteger.hxx>
 #include <TColStd_Array2OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TopAbs_Orientation.hxx>
@@ -91,13 +81,10 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_Array2OfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_HArray1OfShape.hxx>
 #include <TopTools_HArray2OfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_SequenceOfShape.hxx>
 
 #include <stdio.h>
 //#include <BRepFill_TrimCorner.hxx>
diff --git a/src/BRepFill/BRepFill_Sweep.hxx b/src/BRepFill/BRepFill_Sweep.hxx
index 8f5fbec144..24979e63e6 100644
--- a/src/BRepFill/BRepFill_Sweep.hxx
+++ b/src/BRepFill/BRepFill_Sweep.hxx
@@ -21,13 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomFill_ApproxStyle.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_HArray2OfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopoDS_Wire.hxx>
diff --git a/src/BRepFill/BRepFill_TrimEdgeTool.cxx b/src/BRepFill/BRepFill_TrimEdgeTool.cxx
index 4d3e56406c..e6ae701b4c 100644
--- a/src/BRepFill/BRepFill_TrimEdgeTool.cxx
+++ b/src/BRepFill/BRepFill_TrimEdgeTool.cxx
@@ -26,18 +26,13 @@
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAPI_ProjectPointOnCurve.hxx>
 #include <Geom2dInt_GInter.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomProjLib.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
 #include <Precision.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <BRepAdaptor_Curve.hxx>
diff --git a/src/BRepFill/BRepFill_TrimEdgeTool.hxx b/src/BRepFill/BRepFill_TrimEdgeTool.hxx
index b0979f165b..2fba09f557 100644
--- a/src/BRepFill/BRepFill_TrimEdgeTool.hxx
+++ b/src/BRepFill/BRepFill_TrimEdgeTool.hxx
@@ -21,9 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Standard_Real.hxx>
 #include <Bisector_Bisec.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAbs_JoinType.hxx>
diff --git a/src/BRepFill/BRepFill_TrimShellCorner.cxx b/src/BRepFill/BRepFill_TrimShellCorner.cxx
index 65ce9a96f6..8b2a07fa34 100644
--- a/src/BRepFill/BRepFill_TrimShellCorner.cxx
+++ b/src/BRepFill/BRepFill_TrimShellCorner.cxx
@@ -25,10 +25,8 @@
 #include <BRepLib_MakeWire.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepTools_ReShape.hxx>
-#include <gce_MakeLin.hxx>
 #include <GCPnts_UniformAbscissa.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_Curve.hxx>
 #include <GeomLib.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pln.hxx>
@@ -39,10 +37,7 @@
 #include <IntTools_Tools.hxx>
 #include <TColgp_Array1OfDir.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TColStd_Array1OfBoolean.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -55,10 +50,8 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_Array1OfListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
diff --git a/src/BRepFill/BRepFill_TrimShellCorner.hxx b/src/BRepFill/BRepFill_TrimShellCorner.hxx
index 1d5e9a0fb6..283e546b91 100644
--- a/src/BRepFill/BRepFill_TrimShellCorner.hxx
+++ b/src/BRepFill/BRepFill_TrimShellCorner.hxx
@@ -23,11 +23,8 @@
 #include <BRepFill_TransitionStyle.hxx>
 #include <gp_Ax2.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopTools_HArray2OfShape.hxx>
 #include <TopTools_HArray1OfShape.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BOPDS_PDS.hxx>
diff --git a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
index 53de917a72..581e1e94e0 100644
--- a/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
+++ b/src/BRepFill/BRepFill_TrimSurfaceTool.cxx
@@ -16,14 +16,12 @@
 
 
 #include <GeomAdaptor_SurfaceOfRevolution.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepFill_ApproxSeewing.hxx>
 #include <BRepFill_ComputeCLine.hxx>
 #include <BRepFill_MultiLine.hxx>
 #include <BRepFill_TrimSurfaceTool.hxx>
 #include <BRepIntCurveSurface_Inter.hxx>
-#include <BSplCLib.hxx>
 #include <ElCLib.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
@@ -31,7 +29,6 @@
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dAPI_ProjectPointOnCurve.hxx>
 #include <Geom2dInt_GInter.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
@@ -47,15 +44,9 @@
 #include <gp_Torus.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
-#include <PLib.hxx>
 #include <Precision.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TopAbs_State.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepFill/BRepFill_TrimSurfaceTool.hxx b/src/BRepFill/BRepFill_TrimSurfaceTool.hxx
index 9767e69a3b..57ffa14385 100644
--- a/src/BRepFill/BRepFill_TrimSurfaceTool.hxx
+++ b/src/BRepFill/BRepFill_TrimSurfaceTool.hxx
@@ -23,9 +23,7 @@
 
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class Geom2d_Curve;
 class gp_Pnt2d;
diff --git a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.hxx b/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.hxx
index b8a3da7d8d..51d88284a3 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.hxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepBuilderAPI_MakeShape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ChFiDS_SecHArray1.hxx>
 class TopoDS_Edge;
 class TopoDS_Vertex;
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
index 85bcc71d61..8cbf619fc8 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cxx
@@ -17,7 +17,6 @@
 
 #include <BRepFilletAPI_MakeChamfer.hxx>
 #include <ChFiDS_Spine.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@@ -25,7 +24,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : BRepFilletAPI_MakeChamfer
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx
index 5850a8d6cd..3b7b37fcb7 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.hxx
@@ -26,7 +26,6 @@
 #include <BRepFilletAPI_LocalOperation.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <ChFiDS_SecHArray1.hxx>
 class TopoDS_Shape;
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
index 54c31dafd1..f1b3287e34 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cxx
@@ -19,20 +19,14 @@
 #include <ChFiDS_ErrorStatus.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <Geom_Surface.hxx>
-#include <Law_Function.hxx>
-#include <Law_Interpol.hxx>
 #include <Law_Linear.hxx>
-#include <Law_S.hxx>
 #include <Precision.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : BRepFilletAPI_MakeFillet
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx
index 36585fda23..6113821c2b 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.hxx
@@ -29,7 +29,6 @@
 #include <GeomAbs_Shape.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <ChFiDS_SecHArray1.hxx>
 #include <ChFiDS_ErrorStatus.hxx>
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx
index a7a3a85a26..63c24f723f 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx
@@ -23,10 +23,7 @@
 
 #include <ChFi2d_Builder.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_SequenceOfShape.hxx>
-#include <Standard_Integer.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <ChFi2d_ConstructionError.hxx>
 class TopoDS_Face;
diff --git a/src/BRepGProp/BRepGProp.cxx b/src/BRepGProp/BRepGProp.cxx
index 9aab6e6019..43c9d08129 100644
--- a/src/BRepGProp/BRepGProp.cxx
+++ b/src/BRepGProp/BRepGProp.cxx
@@ -19,18 +19,14 @@
 #include <BRepGProp_MeshProps.hxx>
 #include <BRepGProp_MeshCinert.hxx>
 #include <BRepGProp_VinertGK.hxx>
-#include <GProp_PGProps.hxx>
 #include <BRepGProp_Face.hxx>
 #include <BRepGProp_Domain.hxx>
 #include <TopoDS.hxx>
 #include <BRepAdaptor_Curve.hxx>
 
-#include <TopTools.hxx>
 #include <BRep_Tool.hxx>  
-#include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <BRepCheck_Shell.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 static Standard_Integer AffichEps = 0;
diff --git a/src/BRepGProp/BRepGProp.hxx b/src/BRepGProp/BRepGProp.hxx
index 0f0acebc7c..977b5affb7 100644
--- a/src/BRepGProp/BRepGProp.hxx
+++ b/src/BRepGProp/BRepGProp.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfXYZ.hxx>
 
diff --git a/src/BRepGProp/BRepGProp_Cinert.hxx b/src/BRepGProp/BRepGProp_Cinert.hxx
index 212af6abc5..291260426a 100644
--- a/src/BRepGProp/BRepGProp_Cinert.hxx
+++ b/src/BRepGProp/BRepGProp_Cinert.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <GProp_GProps.hxx>
 class BRepAdaptor_Curve;
diff --git a/src/BRepGProp/BRepGProp_Domain.cxx b/src/BRepGProp/BRepGProp_Domain.cxx
index 3e31b7816e..6cd020c5ec 100644
--- a/src/BRepGProp/BRepGProp_Domain.cxx
+++ b/src/BRepGProp/BRepGProp_Domain.cxx
@@ -17,7 +17,6 @@
 
 #include <BRepGProp_Domain.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
 
 //=======================================================================
 //function : Next
diff --git a/src/BRepGProp/BRepGProp_EdgeTool.cxx b/src/BRepGProp/BRepGProp_EdgeTool.cxx
index c76af72509..60685eac9f 100644
--- a/src/BRepGProp/BRepGProp_EdgeTool.cxx
+++ b/src/BRepGProp/BRepGProp_EdgeTool.cxx
@@ -21,7 +21,6 @@
 #include <GeomAdaptor_Curve.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Standard_OutOfRange.hxx>
 
 Standard_Real  BRepGProp_EdgeTool::FirstParameter(const BRepAdaptor_Curve& C)
 {
diff --git a/src/BRepGProp/BRepGProp_EdgeTool.hxx b/src/BRepGProp/BRepGProp_EdgeTool.hxx
index f697986b4a..2e4197d77a 100644
--- a/src/BRepGProp/BRepGProp_EdgeTool.hxx
+++ b/src/BRepGProp/BRepGProp_EdgeTool.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/BRepGProp/BRepGProp_Face.cxx b/src/BRepGProp/BRepGProp_Face.cxx
index f0ea770bc2..38892ac8a5 100644
--- a/src/BRepGProp/BRepGProp_Face.cxx
+++ b/src/BRepGProp/BRepGProp_Face.cxx
@@ -27,7 +27,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
 #include <math.hxx>
 #include <Precision.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepGProp/BRepGProp_Face.hxx b/src/BRepGProp/BRepGProp_Face.hxx
index ce731620c2..7dd3a32b6f 100644
--- a/src/BRepGProp/BRepGProp_Face.hxx
+++ b/src/BRepGProp/BRepGProp_Face.hxx
@@ -23,10 +23,8 @@
 
 #include <BRepAdaptor_Surface.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <GeomAbs_IsoType.hxx>
 #include <TColStd_HArray1OfReal.hxx>
diff --git a/src/BRepGProp/BRepGProp_Gauss.cxx b/src/BRepGProp/BRepGProp_Gauss.cxx
index 0ce6ff1ad9..800783d8b1 100644
--- a/src/BRepGProp/BRepGProp_Gauss.cxx
+++ b/src/BRepGProp/BRepGProp_Gauss.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 #include <math.hxx>
-#include <Precision.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <Standard_Assert.hxx>
 #include <BRepGProp_Face.hxx>
 #include <BRepGProp_Domain.hxx>
diff --git a/src/BRepGProp/BRepGProp_MeshCinert.cxx b/src/BRepGProp/BRepGProp_MeshCinert.cxx
index 349ee14a71..be7a9dcc75 100644
--- a/src/BRepGProp/BRepGProp_MeshCinert.cxx
+++ b/src/BRepGProp/BRepGProp_MeshCinert.cxx
@@ -15,7 +15,6 @@
 #include <gp_Pnt.hxx>
 #include <math.hxx>
 #include <TopoDS_Edge.hxx>
-#include <Poly_Polygon3D.hxx>
 #include <BRep_Tool.hxx>
 
 //=======================================================================
diff --git a/src/BRepGProp/BRepGProp_MeshProps.hxx b/src/BRepGProp/BRepGProp_MeshProps.hxx
index 57622d0d98..4b0dc9ab00 100644
--- a/src/BRepGProp/BRepGProp_MeshProps.hxx
+++ b/src/BRepGProp/BRepGProp_MeshProps.hxx
@@ -16,7 +16,6 @@
 
 #include <GProp_GProps.hxx>
 #include <TopAbs_Orientation.hxx>
-#include <Poly_Array1OfTriangle.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 
 class Poly_Triangulation;
diff --git a/src/BRepGProp/BRepGProp_Sinert.hxx b/src/BRepGProp/BRepGProp_Sinert.hxx
index 7fe9238a58..654ef3acd4 100644
--- a/src/BRepGProp/BRepGProp_Sinert.hxx
+++ b/src/BRepGProp/BRepGProp_Sinert.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <GProp_GProps.hxx>
 class BRepGProp_Face;
 class gp_Pnt;
diff --git a/src/BRepGProp/BRepGProp_TFunction.cxx b/src/BRepGProp/BRepGProp_TFunction.cxx
index f7422000b9..e8a8674d03 100644
--- a/src/BRepGProp/BRepGProp_TFunction.cxx
+++ b/src/BRepGProp/BRepGProp_TFunction.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepGProp_Face.hxx>
 #include <BRepGProp_TFunction.hxx>
 #include <gp_Pnt.hxx>
 #include <math_KronrodSingleIntegration.hxx>
diff --git a/src/BRepGProp/BRepGProp_TFunction.hxx b/src/BRepGProp/BRepGProp_TFunction.hxx
index 6566403995..e2655b6a18 100644
--- a/src/BRepGProp/BRepGProp_TFunction.hxx
+++ b/src/BRepGProp/BRepGProp_TFunction.hxx
@@ -22,12 +22,9 @@
 
 #include <BRepGProp_Face.hxx>
 #include <BRepGProp_UFunction.hxx>
-#include <Standard_Real.hxx>
 #include <GProp_ValueType.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <math_Function.hxx>
-#include <Standard_Address.hxx>
 class gp_Pnt;
 
 
diff --git a/src/BRepGProp/BRepGProp_UFunction.cxx b/src/BRepGProp/BRepGProp_UFunction.cxx
index 1fdc71c276..5083b266b9 100644
--- a/src/BRepGProp/BRepGProp_UFunction.cxx
+++ b/src/BRepGProp/BRepGProp_UFunction.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepGProp_Face.hxx>
 #include <BRepGProp_UFunction.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_XYZ.hxx>
diff --git a/src/BRepGProp/BRepGProp_UFunction.hxx b/src/BRepGProp/BRepGProp_UFunction.hxx
index 9a70a66381..893b8804cf 100644
--- a/src/BRepGProp/BRepGProp_UFunction.hxx
+++ b/src/BRepGProp/BRepGProp_UFunction.hxx
@@ -22,8 +22,6 @@
 
 #include <BRepGProp_Face.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <GProp_ValueType.hxx>
 #include <Standard_Boolean.hxx>
 #include <math_Function.hxx>
diff --git a/src/BRepGProp/BRepGProp_Vinert.hxx b/src/BRepGProp/BRepGProp_Vinert.hxx
index f762c62017..5c4cf05c13 100644
--- a/src/BRepGProp/BRepGProp_Vinert.hxx
+++ b/src/BRepGProp/BRepGProp_Vinert.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <GProp_GProps.hxx>
 class BRepGProp_Face;
 class gp_Pnt;
diff --git a/src/BRepGProp/BRepGProp_VinertGK.cxx b/src/BRepGProp/BRepGProp_VinertGK.cxx
index 01737d7725..bf8b8d8677 100644
--- a/src/BRepGProp/BRepGProp_VinertGK.cxx
+++ b/src/BRepGProp/BRepGProp_VinertGK.cxx
@@ -15,7 +15,6 @@
 
 
 #include <BRepGProp_Domain.hxx>
-#include <BRepGProp_Face.hxx>
 #include <BRepGProp_TFunction.hxx>
 #include <BRepGProp_VinertGK.hxx>
 #include <gp_Pln.hxx>
diff --git a/src/BRepGProp/BRepGProp_VinertGK.hxx b/src/BRepGProp/BRepGProp_VinertGK.hxx
index 7aaf3829c5..1593ace13b 100644
--- a/src/BRepGProp/BRepGProp_VinertGK.hxx
+++ b/src/BRepGProp/BRepGProp_VinertGK.hxx
@@ -18,11 +18,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <GProp_GProps.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Address.hxx>
 class BRepGProp_Face;
 class BRepGProp_Domain;
diff --git a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
index 396e7d08b3..8d4fef7bbd 100644
--- a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
+++ b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.cxx
@@ -24,12 +24,10 @@
 #include <Geom_Line.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <gp_Lin.hxx>
-#include <gp_Pnt.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
 //===========================================================================
diff --git a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.hxx b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.hxx
index b3d555b04f..1694ed1ca9 100644
--- a/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.hxx
+++ b/src/BRepIntCurveSurface/BRepIntCurveSurface_Inter.hxx
@@ -19,8 +19,6 @@
 
 #include <GeomAdaptor_Curve.hxx>
 #include <IntCurveSurface_HInter.hxx>
-#include <TopAbs_State.hxx>
-#include <Bnd_Box.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <Bnd_HArray1OfBox.hxx>
 #include <IntCurveSurface_TransitionOnCurve.hxx>
diff --git a/src/BRepLProp/BRepLProp.cxx b/src/BRepLProp/BRepLProp.cxx
index f6f48c9859..14f88cdf9e 100644
--- a/src/BRepLProp/BRepLProp.cxx
+++ b/src/BRepLProp/BRepLProp.cxx
@@ -16,7 +16,6 @@
 
 #include <BRepLProp.hxx>
 
-#include <BRepAdaptor_Curve.hxx>
 #include <BRepLProp_CLProps.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Vec.hxx>
diff --git a/src/BRepLProp/BRepLProp_CLProps.hxx b/src/BRepLProp/BRepLProp_CLProps.hxx
index 7503ed5ddc..3f1597c431 100644
--- a/src/BRepLProp/BRepLProp_CLProps.hxx
+++ b/src/BRepLProp/BRepLProp_CLProps.hxx
@@ -19,16 +19,12 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepAdaptor_Curve.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Dir.hxx>
 #include <LProp_Status.hxx>
-#include <Standard_Boolean.hxx>
 class LProp_BadContinuity;
 class Standard_DomainError;
 class Standard_OutOfRange;
diff --git a/src/BRepLProp/BRepLProp_CurveTool.hxx b/src/BRepLProp/BRepLProp_CurveTool.hxx
index c60e8b515b..fb693eaef5 100644
--- a/src/BRepLProp/BRepLProp_CurveTool.hxx
+++ b/src/BRepLProp/BRepLProp_CurveTool.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class BRepAdaptor_Curve;
 class gp_Pnt;
diff --git a/src/BRepLProp/BRepLProp_SLProps.hxx b/src/BRepLProp/BRepLProp_SLProps.hxx
index ff836adf1a..0ea0a22388 100644
--- a/src/BRepLProp/BRepLProp_SLProps.hxx
+++ b/src/BRepLProp/BRepLProp_SLProps.hxx
@@ -19,16 +19,13 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepAdaptor_Surface.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Dir.hxx>
 #include <LProp_Status.hxx>
-#include <Standard_Boolean.hxx>
 class LProp_BadContinuity;
 class Standard_DomainError;
 class Standard_OutOfRange;
diff --git a/src/BRepLProp/BRepLProp_SurfaceTool.hxx b/src/BRepLProp/BRepLProp_SurfaceTool.hxx
index f65b70ec08..5f3d64cad4 100644
--- a/src/BRepLProp/BRepLProp_SurfaceTool.hxx
+++ b/src/BRepLProp/BRepLProp_SurfaceTool.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class BRepAdaptor_Surface;
 class gp_Pnt;
diff --git a/src/BRepLib/BRepLib.cxx b/src/BRepLib/BRepLib.cxx
index d89ecb4c1f..b956633f1c 100644
--- a/src/BRepLib/BRepLib.cxx
+++ b/src/BRepLib/BRepLib.cxx
@@ -19,26 +19,17 @@
 
 #include <BRepLib.hxx>
 
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <AdvApprox_ApproxAFunction.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <Approx_CurvilinearParameter.hxx>
 #include <Approx_SameParameter.hxx>
-#include <Bnd_Box.hxx>
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRepCheck.hxx>
 #include <BRep_TEdge.hxx>
-#include <BRep_TFace.hxx>
 #include <BRep_Tool.hxx>
 #include <BRep_TVertex.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepLib_MakeFace.hxx>
@@ -46,13 +37,10 @@
 #include <ElSLib.hxx>
 #include <Extrema_LocateExtPC.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dConvert.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
@@ -72,11 +60,9 @@
 #include <ProjLib_ProjectedCurve.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Real.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_MapOfTransient.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -84,10 +70,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TShort_HArray1OfShortReal.hxx>
 #include <TColgp_Array1OfXY.hxx>
 #include <BRepTools_ReShape.hxx>
 #include <TopTools_DataMapOfShapeReal.hxx>
diff --git a/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx b/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
index 29d5d42f39..335e4b748a 100644
--- a/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
+++ b/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
@@ -23,7 +23,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <Geom_Curve.hxx>
 
 //=======================================================================
 //function : BRepLib_CheckCurveOnSurface
diff --git a/src/BRepLib/BRepLib_FindSurface.cxx b/src/BRepLib/BRepLib_FindSurface.cxx
index 21a85b697e..5b3cbf38b2 100644
--- a/src/BRepLib/BRepLib_FindSurface.cxx
+++ b/src/BRepLib/BRepLib_FindSurface.cxx
@@ -29,23 +29,13 @@
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomLib.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Hypr.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Parab.hxx>
 #include <gp_Vec.hxx>
 #include <math_Jacobi.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TopExp.hxx>
diff --git a/src/BRepLib/BRepLib_FindSurface.hxx b/src/BRepLib/BRepLib_FindSurface.hxx
index d4300d66c6..dc682feee8 100644
--- a/src/BRepLib/BRepLib_FindSurface.hxx
+++ b/src/BRepLib/BRepLib_FindSurface.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopLoc_Location.hxx>
 class Geom_Surface;
 class TopoDS_Shape;
diff --git a/src/BRepLib/BRepLib_FuseEdges.cxx b/src/BRepLib/BRepLib_FuseEdges.cxx
index cdf173c507..a1b802143c 100644
--- a/src/BRepLib/BRepLib_FuseEdges.cxx
+++ b/src/BRepLib/BRepLib_FuseEdges.cxx
@@ -25,18 +25,14 @@
 #include <BRepLib_FuseEdges.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepTools_Substitution.hxx>
-#include <BSplCLib.hxx>
 #include <ElCLib.hxx>
-#include <ElSLib.hxx>
 #include <Extrema_LocateExtPC.hxx>
-#include <Geom2d_BoundedCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BoundedCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Ellipse.hxx>
@@ -47,10 +43,6 @@
 #include <GeomConvert.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <GeomLib.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Trsf2d.hxx>
-#include <gp_Vec2d.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NullObject.hxx>
@@ -64,10 +56,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
 #include <TopTools_DataMapOfIntegerListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
diff --git a/src/BRepLib/BRepLib_FuseEdges.hxx b/src/BRepLib/BRepLib_FuseEdges.hxx
index 1dd9906f6f..75de842823 100644
--- a/src/BRepLib/BRepLib_FuseEdges.hxx
+++ b/src/BRepLib/BRepLib_FuseEdges.hxx
@@ -18,17 +18,14 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfIntegerListOfShape.hxx>
 #include <TopTools_DataMapOfIntegerShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <Standard_Integer.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Vertex;
diff --git a/src/BRepLib/BRepLib_MakeEdge.hxx b/src/BRepLib/BRepLib_MakeEdge.hxx
index e4177c6179..ed3b47968d 100644
--- a/src/BRepLib/BRepLib_MakeEdge.hxx
+++ b/src/BRepLib/BRepLib_MakeEdge.hxx
@@ -24,7 +24,6 @@
 #include <BRepLib_EdgeError.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <BRepLib_MakeShape.hxx>
-#include <Standard_Real.hxx>
 class gp_Pnt;
 class gp_Lin;
 class gp_Circ;
diff --git a/src/BRepLib/BRepLib_MakeEdge2d.hxx b/src/BRepLib/BRepLib_MakeEdge2d.hxx
index 7a10165fe3..d42b5d2dc5 100644
--- a/src/BRepLib/BRepLib_MakeEdge2d.hxx
+++ b/src/BRepLib/BRepLib_MakeEdge2d.hxx
@@ -24,7 +24,6 @@
 #include <BRepLib_EdgeError.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <BRepLib_MakeShape.hxx>
-#include <Standard_Real.hxx>
 class gp_Pnt2d;
 class gp_Lin2d;
 class gp_Circ2d;
diff --git a/src/BRepLib/BRepLib_MakeFace.hxx b/src/BRepLib/BRepLib_MakeFace.hxx
index abd8fbae4a..1bbc39fd9b 100644
--- a/src/BRepLib/BRepLib_MakeFace.hxx
+++ b/src/BRepLib/BRepLib_MakeFace.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepLib_FaceError.hxx>
 #include <BRepLib_MakeShape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Face;
 class gp_Pln;
 class gp_Cylinder;
diff --git a/src/BRepLib/BRepLib_MakePolygon.cxx b/src/BRepLib/BRepLib_MakePolygon.cxx
index 18965a8717..ea9f0dc1ca 100644
--- a/src/BRepLib/BRepLib_MakePolygon.cxx
+++ b/src/BRepLib/BRepLib_MakePolygon.cxx
@@ -16,8 +16,6 @@
 
 
 #include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakePolygon.hxx>
 #include <BRepTools.hxx>
diff --git a/src/BRepLib/BRepLib_MakePolygon.hxx b/src/BRepLib/BRepLib_MakePolygon.hxx
index 644bdabe3a..96e006b051 100644
--- a/src/BRepLib/BRepLib_MakePolygon.hxx
+++ b/src/BRepLib/BRepLib_MakePolygon.hxx
@@ -19,12 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
 #include <BRepLib_MakeShape.hxx>
-#include <Standard_Boolean.hxx>
 class gp_Pnt;
 class TopoDS_Wire;
 
diff --git a/src/BRepLib/BRepLib_MakeShape.cxx b/src/BRepLib/BRepLib_MakeShape.cxx
index c8df93fc8e..910aaf8e32 100644
--- a/src/BRepLib/BRepLib_MakeShape.cxx
+++ b/src/BRepLib/BRepLib_MakeShape.cxx
@@ -16,8 +16,6 @@
 
 
 #include <BRepLib_MakeShape.hxx>
-#include <StdFail_NotDone.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/BRepLib/BRepLib_MakeShape.hxx b/src/BRepLib/BRepLib_MakeShape.hxx
index 80bba52e00..8d7a00d598 100644
--- a/src/BRepLib/BRepLib_MakeShape.hxx
+++ b/src/BRepLib/BRepLib_MakeShape.hxx
@@ -25,8 +25,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <BRepLib_Command.hxx>
 #include <BRepLib_ShapeModification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 class TopoDS_Face;
 class TopoDS_Edge;
 
diff --git a/src/BRepLib/BRepLib_MakeShell.cxx b/src/BRepLib/BRepLib_MakeShell.cxx
index c866cb7105..e29094422b 100644
--- a/src/BRepLib/BRepLib_MakeShell.cxx
+++ b/src/BRepLib/BRepLib_MakeShell.cxx
@@ -24,7 +24,6 @@
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <gp_Pnt.hxx>
 #include <Precision.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColGeom2d_Array1OfCurve.hxx>
diff --git a/src/BRepLib/BRepLib_MakeShell.hxx b/src/BRepLib/BRepLib_MakeShell.hxx
index 75dd2c99fa..8fd81a723e 100644
--- a/src/BRepLib/BRepLib_MakeShell.hxx
+++ b/src/BRepLib/BRepLib_MakeShell.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepLib_ShellError.hxx>
 #include <BRepLib_MakeShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Geom_Surface;
 class TopoDS_Shell;
 
diff --git a/src/BRepLib/BRepLib_MakeSolid.cxx b/src/BRepLib/BRepLib_MakeSolid.cxx
index 178fb9ddfb..e64c3a7f8c 100644
--- a/src/BRepLib/BRepLib_MakeSolid.cxx
+++ b/src/BRepLib/BRepLib_MakeSolid.cxx
@@ -17,7 +17,6 @@
 
 #include <BRep_Builder.hxx>
 #include <BRepLib_MakeSolid.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_CompSolid.hxx>
@@ -25,7 +24,6 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
diff --git a/src/BRepLib/BRepLib_MakeSolid.hxx b/src/BRepLib/BRepLib_MakeSolid.hxx
index 4546fd48d3..54d0a08ce5 100644
--- a/src/BRepLib/BRepLib_MakeSolid.hxx
+++ b/src/BRepLib/BRepLib_MakeSolid.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <TopTools_ListOfShape.hxx>
 #include <BRepLib_MakeShape.hxx>
 #include <BRepLib_ShapeModification.hxx>
 class TopoDS_CompSolid;
diff --git a/src/BRepLib/BRepLib_MakeVertex.hxx b/src/BRepLib/BRepLib_MakeVertex.hxx
index a84d9c6bdc..ea39532f1b 100644
--- a/src/BRepLib/BRepLib_MakeVertex.hxx
+++ b/src/BRepLib/BRepLib_MakeVertex.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepLib_MakeShape.hxx>
 class gp_Pnt;
diff --git a/src/BRepLib/BRepLib_MakeWire.cxx b/src/BRepLib/BRepLib_MakeWire.cxx
index 6733de36f4..b91b7d0d03 100644
--- a/src/BRepLib/BRepLib_MakeWire.cxx
+++ b/src/BRepLib/BRepLib_MakeWire.cxx
@@ -17,11 +17,7 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepLib.hxx>
-#include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeWire.hxx>
-#include <Geom_Curve.hxx>
-#include <gp.hxx>
 #include <gp_Pnt.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TopExp.hxx>
@@ -31,7 +27,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
diff --git a/src/BRepLib/BRepLib_MakeWire.hxx b/src/BRepLib/BRepLib_MakeWire.hxx
index d227ece0f1..195b826ebf 100644
--- a/src/BRepLib/BRepLib_MakeWire.hxx
+++ b/src/BRepLib/BRepLib_MakeWire.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepLib_WireError.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/BRepLib/BRepLib_MakeWire_1.cxx b/src/BRepLib/BRepLib_MakeWire_1.cxx
index 7dde7a53bb..7e3f332ecb 100644
--- a/src/BRepLib/BRepLib_MakeWire_1.cxx
+++ b/src/BRepLib/BRepLib_MakeWire_1.cxx
@@ -24,16 +24,11 @@
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfOrientedShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfOrientedShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <NCollection_UBTreeFiller.hxx>
diff --git a/src/BRepLib/BRepLib_ValidateEdge.cxx b/src/BRepLib/BRepLib_ValidateEdge.cxx
index ba34e4faa1..2b55aa7c21 100644
--- a/src/BRepLib/BRepLib_ValidateEdge.cxx
+++ b/src/BRepLib/BRepLib_ValidateEdge.cxx
@@ -13,7 +13,6 @@
 
 #include <BRepLib_ValidateEdge.hxx>
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRepCheck.hxx>
 #include <Extrema_LocateExtPC.hxx>
diff --git a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
index ef992f3594..dcbd1e4084 100644
--- a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
+++ b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
@@ -27,16 +27,12 @@
 #include <MAT2d_Mat2d.hxx>
 #include <MAT2d_SequenceOfSequenceOfGeometry.hxx>
 #include <MAT2d_Tool2d.hxx>
-#include <MAT_Arc.hxx>
 #include <MAT_BasicElt.hxx>
-#include <MAT_Bisector.hxx>
-#include <MAT_DataMapIteratorOfDataMapOfIntegerBasicElt.hxx>
 #include <MAT_DataMapOfIntegerBasicElt.hxx>
 #include <MAT_Graph.hxx>
 #include <MAT_ListOfBisector.hxx>
 #include <MAT_Node.hxx>
 #include <Precision.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColGeom2d_SequenceOfGeometry.hxx>
 #include <Geom2d_Curve.hxx>
 
diff --git a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.hxx b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.hxx
index 76e75bb475..8f03b29859 100644
--- a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.hxx
+++ b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <MAT2d_Tool2d.hxx>
-#include <Standard_Boolean.hxx>
 #include <MAT2d_DataMapOfBiIntInteger.hxx>
 #include <Standard_Integer.hxx>
 #include <MAT_Side.hxx>
diff --git a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx
index e231f4029f..32ba12c3be 100644
--- a/src/BRepMAT2d/BRepMAT2d_Explorer.cxx
+++ b/src/BRepMAT2d/BRepMAT2d_Explorer.cxx
@@ -21,11 +21,9 @@
 #include <BRepLib.hxx>
 #include <BRepMAT2d_Explorer.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <GCE2d_MakeArcOfCircle.hxx>
 #include <GCE2d_MakeSegment.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BoundedCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Ellipse.hxx>
@@ -35,19 +33,12 @@
 #include <Geom2d_Parabola.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dConvert.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <GeomAPI.hxx>
-#include <gp.hxx>
-#include <gp_Pln.hxx>
 #include <MAT2d_SequenceOfSequenceOfCurve.hxx>
 #include <Precision.hxx>
 #include <TColGeom2d_SequenceOfCurve.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BRepMAT2d/BRepMAT2d_Explorer.hxx b/src/BRepMAT2d/BRepMAT2d_Explorer.hxx
index 1866743b74..9c530d1822 100644
--- a/src/BRepMAT2d/BRepMAT2d_Explorer.hxx
+++ b/src/BRepMAT2d/BRepMAT2d_Explorer.hxx
@@ -26,7 +26,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TColStd_SequenceOfBoolean.hxx>
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColGeom2d_SequenceOfCurve.hxx>
 class TopoDS_Face;
 class TopoDS_Wire;
diff --git a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx
index 3c4003cbb5..b28b253baa 100644
--- a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx
+++ b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.cxx
@@ -16,22 +16,17 @@
 
 
 #include <BRepMAT2d_BisectingLocus.hxx>
-#include <BRepMAT2d_DataMapOfShapeSequenceOfBasicElt.hxx>
 #include <BRepMAT2d_Explorer.hxx>
 #include <BRepMAT2d_LinkTopoBilo.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <Geom2d_CartesianPoint.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom2d_Geometry.hxx>
-#include <gp_Pnt2d.hxx>
 #include <MAT_BasicElt.hxx>
 #include <MAT_Graph.hxx>
 #include <MAT_SequenceOfBasicElt.hxx>
-#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom2d_SequenceOfCurve.hxx>
-#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 #include <TColStd_DataMapOfIntegerInteger.hxx>
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
diff --git a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.hxx b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.hxx
index 935ce27af9..98ff365f5a 100644
--- a/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.hxx
+++ b/src/BRepMAT2d/BRepMAT2d_LinkTopoBilo.hxx
@@ -25,7 +25,6 @@
 #include <BRepMAT2d_DataMapOfBasicEltShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class BRepMAT2d_Explorer;
 class BRepMAT2d_BisectingLocus;
 class MAT_BasicElt;
diff --git a/src/BRepMesh/BRepMesh_BaseMeshAlgo.cxx b/src/BRepMesh/BRepMesh_BaseMeshAlgo.cxx
index 81e318a016..da37dfca9b 100644
--- a/src/BRepMesh/BRepMesh_BaseMeshAlgo.cxx
+++ b/src/BRepMesh/BRepMesh_BaseMeshAlgo.cxx
@@ -14,8 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_BaseMeshAlgo.hxx>
-#include <BRepMesh_DataStructureOfDelaun.hxx>
-#include <IMeshData_Face.hxx>
 #include <IMeshData_Wire.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshData_PCurve.hxx>
diff --git a/src/BRepMesh/BRepMesh_Circle.hxx b/src/BRepMesh/BRepMesh_Circle.hxx
index c37813fc19..8fcf55e7ee 100644
--- a/src/BRepMesh/BRepMesh_Circle.hxx
+++ b/src/BRepMesh/BRepMesh_Circle.hxx
@@ -16,7 +16,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Macro.hxx>
 #include <gp_XY.hxx>
 
 //! Describes a 2d circle with a size of only 3 Standard_Real 
diff --git a/src/BRepMesh/BRepMesh_CircleInspector.hxx b/src/BRepMesh/BRepMesh_CircleInspector.hxx
index f185f50849..c01d9e8e5f 100644
--- a/src/BRepMesh/BRepMesh_CircleInspector.hxx
+++ b/src/BRepMesh/BRepMesh_CircleInspector.hxx
@@ -18,9 +18,7 @@
 
 #include <IMeshData_Types.hxx>
 #include <BRepMesh_Circle.hxx>
-#include <Precision.hxx>
 #include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
 #include <NCollection_CellFilter.hxx>
 
 //! Auxiliary class to find circles shot by the given point.
diff --git a/src/BRepMesh/BRepMesh_CircleTool.hxx b/src/BRepMesh/BRepMesh_CircleTool.hxx
index 7a307bef3d..614f47bbb7 100644
--- a/src/BRepMesh/BRepMesh_CircleTool.hxx
+++ b/src/BRepMesh/BRepMesh_CircleTool.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Real.hxx>
 #include <BRepMesh_CircleInspector.hxx>
 #include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <IMeshData_Types.hxx>
diff --git a/src/BRepMesh/BRepMesh_Classifier.hxx b/src/BRepMesh/BRepMesh_Classifier.hxx
index d675cb4bd0..2cfe84f56e 100644
--- a/src/BRepMesh/BRepMesh_Classifier.hxx
+++ b/src/BRepMesh/BRepMesh_Classifier.hxx
@@ -16,9 +16,6 @@
 #ifndef _BRepMesh_Classifier_HeaderFile
 #define _BRepMesh_Classifier_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <TopAbs_State.hxx>
 #include <IMeshData_Types.hxx>
 #include <NCollection_Handle.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx b/src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx
index da28dd093c..add0a50374 100644
--- a/src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx
+++ b/src/BRepMesh/BRepMesh_ConeRangeSplitter.cxx
@@ -14,7 +14,9 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_ConeRangeSplitter.hxx>
+
 #include <GCPnts_TangentialDeflection.hxx>
+#include <IMeshTools_Parameters.hxx>
 
 //=======================================================================
 // Function: GetSplitSteps
diff --git a/src/BRepMesh/BRepMesh_ConeRangeSplitter.hxx b/src/BRepMesh/BRepMesh_ConeRangeSplitter.hxx
index e9abf42fec..c34e652a29 100644
--- a/src/BRepMesh/BRepMesh_ConeRangeSplitter.hxx
+++ b/src/BRepMesh/BRepMesh_ConeRangeSplitter.hxx
@@ -17,7 +17,6 @@
 #define _BRepMesh_ConeRangeSplitter_HeaderFile
 
 #include <BRepMesh_DefaultRangeSplitter.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 //! Auxiliary class extending default range splitter in
 //! order to generate internal nodes for conical surface.
diff --git a/src/BRepMesh/BRepMesh_ConstrainedBaseMeshAlgo.hxx b/src/BRepMesh/BRepMesh_ConstrainedBaseMeshAlgo.hxx
index ea21bdda16..a46c9afe0d 100644
--- a/src/BRepMesh/BRepMesh_ConstrainedBaseMeshAlgo.hxx
+++ b/src/BRepMesh/BRepMesh_ConstrainedBaseMeshAlgo.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_ConstrainedBaseMeshAlgo_HeaderFile
 
 #include <BRepMesh_BaseMeshAlgo.hxx>
-#include <NCollection_Shared.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 class BRepMesh_Delaun;
 
diff --git a/src/BRepMesh/BRepMesh_CurveTessellator.cxx b/src/BRepMesh/BRepMesh_CurveTessellator.cxx
index ec6860afa2..fbb1b47305 100644
--- a/src/BRepMesh/BRepMesh_CurveTessellator.cxx
+++ b/src/BRepMesh/BRepMesh_CurveTessellator.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMesh_CurveTessellator.hxx>
 #include <gp_Pnt.hxx>
-#include <BRep_Tool.hxx>
 #include <TopoDS_Edge.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshData_PCurve.hxx>
diff --git a/src/BRepMesh/BRepMesh_CustomBaseMeshAlgo.hxx b/src/BRepMesh/BRepMesh_CustomBaseMeshAlgo.hxx
index bfeba79de4..547a9c89ff 100644
--- a/src/BRepMesh/BRepMesh_CustomBaseMeshAlgo.hxx
+++ b/src/BRepMesh/BRepMesh_CustomBaseMeshAlgo.hxx
@@ -18,7 +18,6 @@
 
 #include <BRepMesh_ConstrainedBaseMeshAlgo.hxx>
 #include <NCollection_Shared.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 #include <BRepMesh_Delaun.hxx>
 #include <BRepMesh_MeshTool.hxx>
diff --git a/src/BRepMesh/BRepMesh_CylinderRangeSplitter.cxx b/src/BRepMesh/BRepMesh_CylinderRangeSplitter.cxx
index 7016ad86c8..734fd5e5e6 100644
--- a/src/BRepMesh/BRepMesh_CylinderRangeSplitter.cxx
+++ b/src/BRepMesh/BRepMesh_CylinderRangeSplitter.cxx
@@ -14,7 +14,9 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_CylinderRangeSplitter.hxx>
+
 #include <GCPnts_TangentialDeflection.hxx>
+#include <IMeshTools_Parameters.hxx>
 
 //=======================================================================
 // Function: Reset
diff --git a/src/BRepMesh/BRepMesh_CylinderRangeSplitter.hxx b/src/BRepMesh/BRepMesh_CylinderRangeSplitter.hxx
index 87a94574f6..21053afa11 100644
--- a/src/BRepMesh/BRepMesh_CylinderRangeSplitter.hxx
+++ b/src/BRepMesh/BRepMesh_CylinderRangeSplitter.hxx
@@ -17,7 +17,6 @@
 #define _BRepMesh_CylinderRangeSplitter_HeaderFile
 
 #include <BRepMesh_DefaultRangeSplitter.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 //! Auxiliary class extending default range splitter in
 //! order to generate internal nodes for cylindrical surface.
diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
index e69a110dc9..bd9bc087a4 100644
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
@@ -19,7 +19,6 @@
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepMesh_Edge.hxx>
 
-#include <TopoDS_Compound.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 #include <Standard_ErrorHandler.hxx>
diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
index 86457a0f8f..f8e034531d 100644
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
@@ -15,10 +15,6 @@
 #define _BRepMesh_DataStructureOfDelaun_HeaderFile
 
 #include <Standard_Transient.hxx>
-#include <BRepMesh_Triangle.hxx>
-#include <BRepMesh_PairOfIndex.hxx>
-#include <Standard_OStream.hxx>
-#include <IMeshData_Types.hxx>
 #include <BRepMesh_VertexTool.hxx>
 
 class BRepMesh_Edge;
diff --git a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx
index 89557796a2..a7359f8ee9 100644
--- a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx
+++ b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.cxx
@@ -15,9 +15,7 @@
 
 #include <BRepMesh_DefaultRangeSplitter.hxx>
 
-#include <GCPnts_AbscissaPoint.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAbs_IsoType.hxx>
 #include <BRep_Tool.hxx>
 
 //=======================================================================
diff --git a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.hxx b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.hxx
index 23f9864dcc..3037d27643 100644
--- a/src/BRepMesh/BRepMesh_DefaultRangeSplitter.hxx
+++ b/src/BRepMesh/BRepMesh_DefaultRangeSplitter.hxx
@@ -16,10 +16,6 @@
 #ifndef _BRepMesh_DefaultRangeSplitter_HeaderFile
 #define _BRepMesh_DefaultRangeSplitter_HeaderFile
 
-#include <Standard_Type.hxx>
-#include <gp_Pnt2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <IMeshData_Types.hxx>
 #include <IMeshData_Face.hxx>
 
 struct IMeshTools_Parameters;
diff --git a/src/BRepMesh/BRepMesh_Deflection.cxx b/src/BRepMesh/BRepMesh_Deflection.cxx
index 8d8fc97b05..7e274d7b01 100644
--- a/src/BRepMesh/BRepMesh_Deflection.cxx
+++ b/src/BRepMesh/BRepMesh_Deflection.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMesh_Deflection.hxx>
 
-#include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepMesh_ShapeTool.hxx>
 #include <IMeshData_Edge.hxx>
diff --git a/src/BRepMesh/BRepMesh_Deflection.hxx b/src/BRepMesh/BRepMesh_Deflection.hxx
index 015670603b..4d16ed6c5a 100644
--- a/src/BRepMesh/BRepMesh_Deflection.hxx
+++ b/src/BRepMesh/BRepMesh_Deflection.hxx
@@ -16,7 +16,6 @@
 #ifndef _BRepMesh_Deflection_HeaderFile
 #define _BRepMesh_Deflection_HeaderFile
 
-#include <Standard_Type.hxx>
 #include <Standard_Handle.hxx>
 #include <Standard_Transient.hxx>
 #include <IMeshData_Types.hxx>
diff --git a/src/BRepMesh/BRepMesh_DelabellaBaseMeshAlgo.hxx b/src/BRepMesh/BRepMesh_DelabellaBaseMeshAlgo.hxx
index 0f4af0f2c7..1b9dac12c0 100644
--- a/src/BRepMesh/BRepMesh_DelabellaBaseMeshAlgo.hxx
+++ b/src/BRepMesh/BRepMesh_DelabellaBaseMeshAlgo.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_DelabellaBaseMeshAlgo_HeaderFile
 
 #include <BRepMesh_CustomBaseMeshAlgo.hxx>
-#include <NCollection_Shared.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 
 //! Class provides base functionality to build face triangulation using Delabella project.
diff --git a/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.cxx b/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.cxx
index 8b02c4a46c..49ae2f0f78 100644
--- a/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.cxx
+++ b/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.cxx
@@ -14,8 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_DelabellaMeshAlgoFactory.hxx>
-#include <BRepMesh_DefaultRangeSplitter.hxx>
-#include <BRepMesh_NURBSRangeSplitter.hxx>
 #include <BRepMesh_SphereRangeSplitter.hxx>
 #include <BRepMesh_CylinderRangeSplitter.hxx>
 #include <BRepMesh_ConeRangeSplitter.hxx>
@@ -23,7 +21,6 @@
 #include <BRepMesh_DelaunayBaseMeshAlgo.hxx>
 #include <BRepMesh_DelabellaBaseMeshAlgo.hxx>
 #include <BRepMesh_CustomDelaunayBaseMeshAlgo.hxx>
-#include <BRepMesh_DelaunayNodeInsertionMeshAlgo.hxx>
 #include <BRepMesh_DelaunayDeflectionControlMeshAlgo.hxx>
 #include <BRepMesh_BoundaryParamsRangeSplitter.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.hxx b/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.hxx
index 486e0d51ae..6a8cf2b727 100644
--- a/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.hxx
+++ b/src/BRepMesh/BRepMesh_DelabellaMeshAlgoFactory.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_DelabellaMeshAlgoFactory_HeaderFile
 
 #include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
-#include <GeomAbs_SurfaceType.hxx>
 #include <IMeshTools_MeshAlgoFactory.hxx>
 
 //! Implementation of IMeshTools_MeshAlgoFactory providing Delabella-based
diff --git a/src/BRepMesh/BRepMesh_Delaun.cxx b/src/BRepMesh/BRepMesh_Delaun.cxx
index e2bb8fed47..0aa1eeb2ba 100644
--- a/src/BRepMesh/BRepMesh_Delaun.cxx
+++ b/src/BRepMesh/BRepMesh_Delaun.cxx
@@ -16,7 +16,6 @@
 
 #include <BRepMesh_Delaun.hxx>
 
-#include <gp.hxx>
 #include <gp_XY.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
diff --git a/src/BRepMesh/BRepMesh_Delaun.hxx b/src/BRepMesh/BRepMesh_Delaun.hxx
index 04c7df1fdc..fb575548b2 100755
--- a/src/BRepMesh/BRepMesh_Delaun.hxx
+++ b/src/BRepMesh/BRepMesh_Delaun.hxx
@@ -18,17 +18,12 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Macro.hxx>
 
-#include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
 #include <BRepMesh_CircleTool.hxx>
 #include <BRepMesh_Triangle.hxx>
 #include <BRepMesh_Edge.hxx>
 #include <IMeshData_Types.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh_GeomTool.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_SequenceOfInteger.hxx>
-#include <TColStd_MapOfInteger.hxx>
 #include <Message_ProgressRange.hxx>
 
 class Bnd_B2d;
diff --git a/src/BRepMesh/BRepMesh_DelaunayBaseMeshAlgo.hxx b/src/BRepMesh/BRepMesh_DelaunayBaseMeshAlgo.hxx
index 093d668758..bce1b39a34 100644
--- a/src/BRepMesh/BRepMesh_DelaunayBaseMeshAlgo.hxx
+++ b/src/BRepMesh/BRepMesh_DelaunayBaseMeshAlgo.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_DelaunayBaseMeshAlgo_HeaderFile
 
 #include <BRepMesh_ConstrainedBaseMeshAlgo.hxx>
-#include <NCollection_Shared.hxx>
-#include <IMeshTools_Parameters.hxx>
 
 
 //! Class provides base functionality to build face triangulation using Dealunay approach.
diff --git a/src/BRepMesh/BRepMesh_DiscretRoot.hxx b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
index 77bb24cae7..50b45c0d94 100644
--- a/src/BRepMesh/BRepMesh_DiscretRoot.hxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
@@ -15,7 +15,6 @@
 #define _BRepMesh_DiscretRoot_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Transient.hxx>
 #include <Message_ProgressRange.hxx>
diff --git a/src/BRepMesh/BRepMesh_Edge.hxx b/src/BRepMesh/BRepMesh_Edge.hxx
index 8b9718dd44..f0c50b9bf5 100644
--- a/src/BRepMesh/BRepMesh_Edge.hxx
+++ b/src/BRepMesh/BRepMesh_Edge.hxx
@@ -15,8 +15,6 @@
 #define _BRepMesh_Edge_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Macro.hxx>
 #include <BRepMesh_DegreeOfFreedom.hxx>
 #include <BRepMesh_OrientedEdge.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_EdgeDiscret.cxx b/src/BRepMesh/BRepMesh_EdgeDiscret.cxx
index 6fe4463fb4..a68165a291 100644
--- a/src/BRepMesh/BRepMesh_EdgeDiscret.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeDiscret.cxx
@@ -16,7 +16,6 @@
 #include <BRepMesh_EdgeDiscret.hxx>
 #include <BRepMesh_Deflection.hxx>
 #include <IMeshData_Model.hxx>
-#include <IMeshData_Edge.hxx>
 #include <IMeshData_Face.hxx>
 #include <IMeshData_PCurve.hxx>
 #include <TopExp.hxx>
diff --git a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
index ab778b9256..7070c0997e 100644
--- a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
@@ -23,12 +23,9 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Extrema_LocateExtPC.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 
 class gp_Pnt;
 class TopoDS_Edge;
diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
index 8e4b264e99..e41a33f39d 100644
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
@@ -17,9 +17,7 @@
 #define _BRepMesh_EdgeTessellationExtractor_HeaderFile
 
 #include <IMeshTools_CurveTessellator.hxx>
-#include <IMeshData_Types.hxx>
 #include <BRepMesh_EdgeParameterProvider.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TopLoc_Location.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_FaceDiscret.cxx b/src/BRepMesh/BRepMesh_FaceDiscret.cxx
index 5d76218476..a2b8cccf66 100644
--- a/src/BRepMesh/BRepMesh_FaceDiscret.cxx
+++ b/src/BRepMesh/BRepMesh_FaceDiscret.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMesh_FaceDiscret.hxx>
 #include <IMeshData_Model.hxx>
-#include <IMeshData_Face.hxx>
 #include <IMeshData_Wire.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshTools_MeshAlgo.hxx>
diff --git a/src/BRepMesh/BRepMesh_FaceDiscret.hxx b/src/BRepMesh/BRepMesh_FaceDiscret.hxx
index 026ec0310e..63bae95c96 100644
--- a/src/BRepMesh/BRepMesh_FaceDiscret.hxx
+++ b/src/BRepMesh/BRepMesh_FaceDiscret.hxx
@@ -18,9 +18,7 @@
 
 #include <IMeshTools_ModelAlgo.hxx>
 #include <IMeshTools_Parameters.hxx>
-#include <IMeshData_Types.hxx>
 #include <IMeshTools_MeshAlgoFactory.hxx>
-#include <NCollection_Array1.hxx>
 
 //! Class implements functionality starting triangulation of model's faces.
 //! Each face is processed separately and can be executed in parallel mode.
diff --git a/src/BRepMesh/BRepMesh_GeomTool.cxx b/src/BRepMesh/BRepMesh_GeomTool.cxx
index abdb8ddead..ffa7649433 100644
--- a/src/BRepMesh/BRepMesh_GeomTool.cxx
+++ b/src/BRepMesh/BRepMesh_GeomTool.cxx
@@ -25,7 +25,6 @@
 #include <Adaptor3d_Curve.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <Geom2d_Curve.hxx>
 #include <BRep_Tool.hxx>
 
 namespace
diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
index 04c46f92c1..cbd18c4aa3 100644
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
@@ -17,7 +17,6 @@
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <BRepMesh_Context.hxx>
 #include <BRepMesh_PluginMacro.hxx>
-#include <IMeshData_Status.hxx>
 #include <IMeshData_Face.hxx>
 #include <IMeshData_Wire.hxx>
 #include <IMeshTools_MeshBuilder.hxx>
diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
index db19ca960d..3853c84075 100644
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
@@ -15,7 +15,6 @@
 #define _BRepMesh_IncrementalMesh_HeaderFile
 
 #include <BRepMesh_DiscretRoot.hxx>
-#include <IMeshTools_Parameters.hxx>
 #include <IMeshTools_Context.hxx>
 #include <Standard_NumericError.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_MeshAlgoFactory.cxx b/src/BRepMesh/BRepMesh_MeshAlgoFactory.cxx
index e6650d27e9..00fd9f9556 100644
--- a/src/BRepMesh/BRepMesh_MeshAlgoFactory.cxx
+++ b/src/BRepMesh/BRepMesh_MeshAlgoFactory.cxx
@@ -14,14 +14,11 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_MeshAlgoFactory.hxx>
-#include <BRepMesh_DefaultRangeSplitter.hxx>
-#include <BRepMesh_NURBSRangeSplitter.hxx>
 #include <BRepMesh_SphereRangeSplitter.hxx>
 #include <BRepMesh_CylinderRangeSplitter.hxx>
 #include <BRepMesh_ConeRangeSplitter.hxx>
 #include <BRepMesh_TorusRangeSplitter.hxx>
 #include <BRepMesh_DelaunayBaseMeshAlgo.hxx>
-#include <BRepMesh_DelaunayNodeInsertionMeshAlgo.hxx>
 #include <BRepMesh_DelaunayDeflectionControlMeshAlgo.hxx>
 #include <BRepMesh_BoundaryParamsRangeSplitter.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_MeshAlgoFactory.hxx b/src/BRepMesh/BRepMesh_MeshAlgoFactory.hxx
index 491cb16e83..7ea9a82953 100644
--- a/src/BRepMesh/BRepMesh_MeshAlgoFactory.hxx
+++ b/src/BRepMesh/BRepMesh_MeshAlgoFactory.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_MeshAlgoFactory_HeaderFile
 
 #include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
-#include <GeomAbs_SurfaceType.hxx>
 #include <IMeshTools_MeshAlgoFactory.hxx>
 
 //! Default implementation of IMeshTools_MeshAlgoFactory providing algorithms 
diff --git a/src/BRepMesh/BRepMesh_MeshTool.hxx b/src/BRepMesh/BRepMesh_MeshTool.hxx
index 88c0d071ea..ed51a81f2b 100644
--- a/src/BRepMesh/BRepMesh_MeshTool.hxx
+++ b/src/BRepMesh/BRepMesh_MeshTool.hxx
@@ -17,7 +17,6 @@
 #define _BRepMesh_MeshTool_HeaderFile
 
 #include <Standard_Transient.hxx>
-#include <Standard_DefineHandle.hxx>
 #include <BRepMesh_DataStructureOfDelaun.hxx>
 #include <BRepMesh_CircleTool.hxx>
 #include <gp_Lin2d.hxx>
diff --git a/src/BRepMesh/BRepMesh_ModelHealer.cxx b/src/BRepMesh/BRepMesh_ModelHealer.cxx
index e943015c16..def938d41a 100644
--- a/src/BRepMesh/BRepMesh_ModelHealer.cxx
+++ b/src/BRepMesh/BRepMesh_ModelHealer.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMesh_ModelHealer.hxx>
 #include <BRepMesh_Deflection.hxx>
-#include <BRepMesh_ShapeTool.hxx>
 #include <BRepMesh_FaceChecker.hxx>
 #include <BRepMesh_EdgeDiscret.hxx>
 #include <IMeshData_Face.hxx>
diff --git a/src/BRepMesh/BRepMesh_ModelHealer.hxx b/src/BRepMesh/BRepMesh_ModelHealer.hxx
index 5d6d129432..46ab5216fe 100644
--- a/src/BRepMesh/BRepMesh_ModelHealer.hxx
+++ b/src/BRepMesh/BRepMesh_ModelHealer.hxx
@@ -18,7 +18,6 @@
 
 #include <IMeshTools_ModelAlgo.hxx>
 #include <IMeshTools_Parameters.hxx>
-#include <IMeshData_Types.hxx>
 #include <IMeshData_Model.hxx>
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_ModelPostProcessor.cxx b/src/BRepMesh/BRepMesh_ModelPostProcessor.cxx
index b6253542c4..800bc7993b 100644
--- a/src/BRepMesh/BRepMesh_ModelPostProcessor.cxx
+++ b/src/BRepMesh/BRepMesh_ModelPostProcessor.cxx
@@ -14,10 +14,12 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_ModelPostProcessor.hxx>
+
 #include <BRepMesh_ShapeTool.hxx>
 #include <IMeshData_Model.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshData_PCurve.hxx>
+#include <IMeshTools_Parameters.hxx>
 #include <OSD_Parallel.hxx>
 #include <BRepLib.hxx>
 #include <Poly_TriangulationParameters.hxx>
diff --git a/src/BRepMesh/BRepMesh_ModelPostProcessor.hxx b/src/BRepMesh/BRepMesh_ModelPostProcessor.hxx
index f780f05adb..9b050ccd91 100644
--- a/src/BRepMesh/BRepMesh_ModelPostProcessor.hxx
+++ b/src/BRepMesh/BRepMesh_ModelPostProcessor.hxx
@@ -17,7 +17,6 @@
 #define _BRepMesh_ModelPostProcessor_HeaderFile
 
 #include <IMeshTools_ModelAlgo.hxx>
-#include <IMeshTools_Parameters.hxx>
 #include <IMeshData_Types.hxx>
 
 //! Class implements functionality of model post-processing tool.
diff --git a/src/BRepMesh/BRepMesh_ModelPreProcessor.cxx b/src/BRepMesh/BRepMesh_ModelPreProcessor.cxx
index 8fdd133577..5466059a53 100644
--- a/src/BRepMesh/BRepMesh_ModelPreProcessor.cxx
+++ b/src/BRepMesh/BRepMesh_ModelPreProcessor.cxx
@@ -14,13 +14,14 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_ModelPreProcessor.hxx>
+
 #include <BRepMesh_Deflection.hxx>
 #include <BRepMesh_ShapeTool.hxx>
-#include <BRep_Tool.hxx>
 #include <IMeshData_Model.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshData_Wire.hxx>
 #include <IMeshData_PCurve.hxx>
+#include <IMeshTools_Parameters.hxx>
 #include <OSD_Parallel.hxx>
 #include <BRepMesh_ConeRangeSplitter.hxx>
 #include <Poly_TriangulationParameters.hxx>
diff --git a/src/BRepMesh/BRepMesh_ModelPreProcessor.hxx b/src/BRepMesh/BRepMesh_ModelPreProcessor.hxx
index 8f0903f1cb..0da23a99ce 100644
--- a/src/BRepMesh/BRepMesh_ModelPreProcessor.hxx
+++ b/src/BRepMesh/BRepMesh_ModelPreProcessor.hxx
@@ -17,7 +17,6 @@
 #define _BRepMesh_ModelPreProcessor_HeaderFile
 
 #include <IMeshTools_ModelAlgo.hxx>
-#include <IMeshTools_Parameters.hxx>
 #include <IMeshData_Types.hxx>
 
 //! Class implements functionality of model pre-processing tool.
diff --git a/src/BRepMesh/BRepMesh_OrientedEdge.hxx b/src/BRepMesh/BRepMesh_OrientedEdge.hxx
index 5b64f407bb..0cc32b0707 100644
--- a/src/BRepMesh/BRepMesh_OrientedEdge.hxx
+++ b/src/BRepMesh/BRepMesh_OrientedEdge.hxx
@@ -16,8 +16,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Macro.hxx>
-#include <BRepMesh_DegreeOfFreedom.hxx>
 
 //! Light weighted structure representing simple link.
 class BRepMesh_OrientedEdge
diff --git a/src/BRepMesh/BRepMesh_PluginEntryType.hxx b/src/BRepMesh/BRepMesh_PluginEntryType.hxx
index 2233c30ca3..b3523e6f89 100644
--- a/src/BRepMesh/BRepMesh_PluginEntryType.hxx
+++ b/src/BRepMesh/BRepMesh_PluginEntryType.hxx
@@ -14,8 +14,6 @@
 #ifndef _BRepMesh_PluginEntryType_HeaderFile
 #define _BRepMesh_PluginEntryType_HeaderFile
 
-#include <Standard_Real.hxx>
-
 class TopoDS_Shape;
 class BRepMesh_DiscretRoot;
 
diff --git a/src/BRepMesh/BRepMesh_ShapeTool.cxx b/src/BRepMesh/BRepMesh_ShapeTool.cxx
index 21a1bad3bd..bb3f924d2f 100644
--- a/src/BRepMesh/BRepMesh_ShapeTool.cxx
+++ b/src/BRepMesh/BRepMesh_ShapeTool.cxx
@@ -16,7 +16,6 @@
 #include <BRepMesh_ShapeTool.hxx>
 #include <IMeshData_Edge.hxx>
 #include <IMeshData_PCurve.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/BRepMesh/BRepMesh_ShapeTool.hxx b/src/BRepMesh/BRepMesh_ShapeTool.hxx
index f47ebfba25..f14157cb9f 100644
--- a/src/BRepMesh/BRepMesh_ShapeTool.hxx
+++ b/src/BRepMesh/BRepMesh_ShapeTool.hxx
@@ -17,8 +17,6 @@
 #define _BRepMesh_ShapeTool_HeaderFile
 
 #include <Standard_Transient.hxx>
-#include <Standard_Handle.hxx>
-#include <Standard_Type.hxx>
 #include <IMeshData_Types.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
diff --git a/src/BRepMesh/BRepMesh_ShapeVisitor.cxx b/src/BRepMesh/BRepMesh_ShapeVisitor.cxx
index 0c4727ab07..22c4bc28c1 100644
--- a/src/BRepMesh/BRepMesh_ShapeVisitor.cxx
+++ b/src/BRepMesh/BRepMesh_ShapeVisitor.cxx
@@ -14,11 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <BRepMesh_ShapeVisitor.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopExp.hxx>
 #include <ShapeAnalysis.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/BRepMesh/BRepMesh_Triangle.hxx b/src/BRepMesh/BRepMesh_Triangle.hxx
index 72ee6eb666..abc61fd367 100644
--- a/src/BRepMesh/BRepMesh_Triangle.hxx
+++ b/src/BRepMesh/BRepMesh_Triangle.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Macro.hxx>
 
 #include <BRepMesh_DegreeOfFreedom.hxx>
 
diff --git a/src/BRepMesh/BRepMesh_Triangulator.hxx b/src/BRepMesh/BRepMesh_Triangulator.hxx
index 5c3f09d9e3..cdbbc54582 100644
--- a/src/BRepMesh/BRepMesh_Triangulator.hxx
+++ b/src/BRepMesh/BRepMesh_Triangulator.hxx
@@ -16,10 +16,7 @@
 #ifndef _BRepMesh_Triangulator_HeaderFile
 #define _BRepMesh_Triangulator_HeaderFile
 
-#include <gp_XYZ.hxx>
-#include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
-#include <Poly_Triangle.hxx>
 #include <Poly_Triangulation.hxx>
 #include <IMeshData_Types.hxx>
 #include <NCollection_Vector.hxx>
diff --git a/src/BRepMesh/BRepMesh_Vertex.hxx b/src/BRepMesh/BRepMesh_Vertex.hxx
index 5c6e7cf102..b991817a84 100644
--- a/src/BRepMesh/BRepMesh_Vertex.hxx
+++ b/src/BRepMesh/BRepMesh_Vertex.hxx
@@ -17,7 +17,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Macro.hxx>
 #include <gp_XY.hxx>
 #include <BRepMesh_DegreeOfFreedom.hxx>
 #include <Precision.hxx>
diff --git a/src/BRepMesh/BRepMesh_VertexInspector.hxx b/src/BRepMesh/BRepMesh_VertexInspector.hxx
index e8efa57dbf..d4aa73acb3 100644
--- a/src/BRepMesh/BRepMesh_VertexInspector.hxx
+++ b/src/BRepMesh/BRepMesh_VertexInspector.hxx
@@ -18,7 +18,6 @@
 
 #include <Precision.hxx>
 #include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
 #include <IMeshData_Types.hxx>
 #include <NCollection_CellFilter.hxx>
 #include <BRepMesh_Vertex.hxx>
diff --git a/src/BRepMesh/BRepMesh_VertexTool.hxx b/src/BRepMesh/BRepMesh_VertexTool.hxx
index cdf10a6594..68abb52863 100644
--- a/src/BRepMesh/BRepMesh_VertexTool.hxx
+++ b/src/BRepMesh/BRepMesh_VertexTool.hxx
@@ -14,7 +14,6 @@
 #ifndef _BRepMesh_VertexTool_HeaderFile
 #define _BRepMesh_VertexTool_HeaderFile
 
-#include <NCollection_Array1.hxx>
 #include <Standard_Transient.hxx>
 #include <BRepMesh_VertexInspector.hxx>
 #include <Standard_OStream.hxx>
diff --git a/src/BRepMeshData/BRepMeshData_Curve.cxx b/src/BRepMeshData/BRepMeshData_Curve.cxx
index 7b954cd0ae..a1daaf3af7 100644
--- a/src/BRepMeshData/BRepMeshData_Curve.cxx
+++ b/src/BRepMeshData/BRepMeshData_Curve.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMeshData_Curve.hxx>
 #include <gp_Pnt.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
 #include <BRepMesh_Vertex.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMeshData_Curve, IMeshData_Curve)
diff --git a/src/BRepMeshData/BRepMeshData_Edge.cxx b/src/BRepMeshData/BRepMeshData_Edge.cxx
index 1af0dc15c0..9b30ed791a 100644
--- a/src/BRepMeshData/BRepMeshData_Edge.cxx
+++ b/src/BRepMeshData/BRepMeshData_Edge.cxx
@@ -16,8 +16,6 @@
 #include <BRepMeshData_Edge.hxx>
 #include <BRepMeshData_PCurve.hxx>
 #include <BRepMeshData_Curve.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
-#include <BRepMesh_Vertex.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMeshData_Edge, IMeshData_Edge)
 
diff --git a/src/BRepMeshData/BRepMeshData_Edge.hxx b/src/BRepMeshData/BRepMeshData_Edge.hxx
index 432d4582b1..0f64ab5804 100644
--- a/src/BRepMeshData/BRepMeshData_Edge.hxx
+++ b/src/BRepMeshData/BRepMeshData_Edge.hxx
@@ -17,7 +17,6 @@
 #define _BRepMeshData_Edge_HeaderFile
 
 #include <IMeshData_Edge.hxx>
-#include <IMeshData_Curve.hxx>
 #include <NCollection_IncAllocator.hxx>
 #include <IMeshData_Types.hxx>
 
diff --git a/src/BRepMeshData/BRepMeshData_Face.cxx b/src/BRepMeshData/BRepMeshData_Face.cxx
index 833e108c27..1180e0e675 100644
--- a/src/BRepMeshData/BRepMeshData_Face.cxx
+++ b/src/BRepMeshData/BRepMeshData_Face.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMeshData_Face.hxx>
 #include <BRepMeshData_Wire.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
 #include <BRepMesh_Vertex.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMeshData_Face, IMeshData_Face)
diff --git a/src/BRepMeshData/BRepMeshData_Model.cxx b/src/BRepMeshData/BRepMeshData_Model.cxx
index e62bb3cf0b..1731c174e2 100644
--- a/src/BRepMeshData/BRepMeshData_Model.cxx
+++ b/src/BRepMeshData/BRepMeshData_Model.cxx
@@ -17,8 +17,6 @@
 
 #include <BRepMeshData_Face.hxx>
 #include <BRepMeshData_Edge.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
-#include <BRepMesh_Vertex.hxx>
 #include <NCollection_IncAllocator.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMeshData_Model, IMeshData_Model)
diff --git a/src/BRepMeshData/BRepMeshData_Model.hxx b/src/BRepMeshData/BRepMeshData_Model.hxx
index b76315aeac..efdd356441 100644
--- a/src/BRepMeshData/BRepMeshData_Model.hxx
+++ b/src/BRepMeshData/BRepMeshData_Model.hxx
@@ -19,7 +19,6 @@
 #include <IMeshData_Model.hxx>
 #include <IMeshData_Types.hxx>
 #include <NCollection_IncAllocator.hxx>
-#include <IMeshData_Face.hxx>
 #include <IMeshData_Edge.hxx>
 
 //! Default implementation of model entity.
diff --git a/src/BRepMeshData/BRepMeshData_PCurve.cxx b/src/BRepMeshData/BRepMeshData_PCurve.cxx
index 818b7a3c62..cff9950e9a 100644
--- a/src/BRepMeshData/BRepMeshData_PCurve.cxx
+++ b/src/BRepMeshData/BRepMeshData_PCurve.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepMeshData_PCurve.hxx>
 #include <gp_Pnt2d.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
 #include <BRepMesh_Vertex.hxx>
 #include <Standard_OutOfRange.hxx>
 
diff --git a/src/BRepMeshData/BRepMeshData_Wire.cxx b/src/BRepMeshData/BRepMeshData_Wire.cxx
index deb56edb7a..db266c9674 100644
--- a/src/BRepMeshData/BRepMeshData_Wire.cxx
+++ b/src/BRepMeshData/BRepMeshData_Wire.cxx
@@ -15,8 +15,6 @@
 
 #include <BRepMeshData_Wire.hxx>
 #include <IMeshData_Edge.hxx>
-#include <BRepMesh_OrientedEdge.hxx>
-#include <BRepMesh_Vertex.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepMeshData_Wire, IMeshData_Wire)
 
diff --git a/src/BRepOffset/BRepOffset.cxx b/src/BRepOffset/BRepOffset.cxx
index 7fac35f35f..84b411df82 100644
--- a/src/BRepOffset/BRepOffset.cxx
+++ b/src/BRepOffset/BRepOffset.cxx
@@ -17,7 +17,6 @@
 
 #include <BRepOffset.hxx>
 #include <BRep_Tool.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
@@ -39,7 +38,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_ListOfShape.hxx>
 #include <TopoDS_Vertex.hxx>
 
 //=======================================================================
diff --git a/src/BRepOffset/BRepOffset_Analyse.cxx b/src/BRepOffset/BRepOffset_Analyse.cxx
index 8247b362af..facfbed344 100644
--- a/src/BRepOffset/BRepOffset_Analyse.cxx
+++ b/src/BRepOffset/BRepOffset_Analyse.cxx
@@ -18,26 +18,19 @@
 #include <Adaptor3d_Surface.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #include <BOPTools_AlgoTools3D.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepOffset_Analyse.hxx>
 #include <BRepOffset_Interval.hxx>
-#include <BRepOffset_ListIteratorOfListOfInterval.hxx>
 #include <BRepOffset_Tool.hxx>
 #include <BRepPrimAPI_MakePrism.hxx>
 #include <BRepTools.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
 #include <gp.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <IntTools_Context.hxx>
-#include <Precision.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -46,7 +39,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <ChFi3d.hxx>
 
diff --git a/src/BRepOffset/BRepOffset_Analyse.hxx b/src/BRepOffset/BRepOffset_Analyse.hxx
index 1b7eb83bf4..9172a4ddf0 100644
--- a/src/BRepOffset/BRepOffset_Analyse.hxx
+++ b/src/BRepOffset/BRepOffset_Analyse.hxx
@@ -19,13 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
 #include <BRepOffset_DataMapOfShapeListOfInterval.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <Standard_Real.hxx>
 #include <BRepOffset_ListOfInterval.hxx>
 #include <ChFiDS_TypeOfConcavity.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx
index f59ca2b58d..1249748124 100644
--- a/src/BRepOffset/BRepOffset_Inter2d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter2d.cxx
@@ -18,16 +18,9 @@
 
 #include <BRepOffset_Inter2d.hxx>
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Bnd_Box.hxx>
-#include <BndLib_Add3dCurve.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
@@ -77,8 +70,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepOffset/BRepOffset_Inter3d.cxx b/src/BRepOffset/BRepOffset_Inter3d.cxx
index 8fc46ce06d..00804755ec 100644
--- a/src/BRepOffset/BRepOffset_Inter3d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter3d.cxx
@@ -24,15 +24,12 @@
 #include <BRepAlgo_Image.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepOffset_Analyse.hxx>
-#include <BRepOffset_DataMapOfShapeOffset.hxx>
 #include <BRepOffset_Inter3d.hxx>
 #include <BRepOffset_Interval.hxx>
 #include <BRepOffset_ListOfInterval.hxx>
 #include <BRepOffset_Offset.hxx>
 #include <BRepOffset_Tool.hxx>
-#include <Extrema_ExtPC.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <Precision.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -42,8 +39,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 //
 #include <BRepBndLib.hxx>
diff --git a/src/BRepOffset/BRepOffset_Inter3d.hxx b/src/BRepOffset/BRepOffset_Inter3d.hxx
index ffbddf3844..c002d47ffb 100644
--- a/src/BRepOffset/BRepOffset_Inter3d.hxx
+++ b/src/BRepOffset/BRepOffset_Inter3d.hxx
@@ -25,11 +25,9 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopAbs_State.hxx>
-#include <Standard_Real.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepOffset_DataMapOfShapeOffset.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <Standard_Boolean.hxx>
 class BRepAlgo_AsDes;
 class BRepAlgo_Image;
 class TopoDS_Face;
diff --git a/src/BRepOffset/BRepOffset_MakeLoops.cxx b/src/BRepOffset/BRepOffset_MakeLoops.cxx
index 738dba4132..3bc335d1bb 100644
--- a/src/BRepOffset/BRepOffset_MakeLoops.cxx
+++ b/src/BRepOffset/BRepOffset_MakeLoops.cxx
@@ -19,7 +19,6 @@
 #include <BRep_Tool.hxx>
 #include <BRep_TVertex.hxx>
 #include <BRepAlgo_AsDes.hxx>
-#include <BRepAlgo_Image.hxx>
 #include <BRepAlgo_Loop.hxx>
 #include <BRepOffset_Analyse.hxx>
 #include <BRepOffset_MakeLoops.hxx>
@@ -30,7 +29,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #include <stdio.h>
diff --git a/src/BRepOffset/BRepOffset_MakeLoops.hxx b/src/BRepOffset/BRepOffset_MakeLoops.hxx
index e309f50e4f..9f32735f85 100644
--- a/src/BRepOffset/BRepOffset_MakeLoops.hxx
+++ b/src/BRepOffset/BRepOffset_MakeLoops.hxx
@@ -25,7 +25,6 @@
 
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <Standard_Boolean.hxx>
 class BRepAlgo_AsDes;
 class BRepAlgo_Image;
 class BRepOffset_Analyse;
diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx
index e18919550c..7da4639d31 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx
@@ -27,9 +27,7 @@
 #include <BRep_TVertex.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo_AsDes.hxx>
-#include <BRepAlgo_Image.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepCheck_Edge.hxx>
 #include <BRepCheck_Vertex.hxx>
@@ -40,15 +38,9 @@
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepLib_MakeVertex.hxx>
-#include <BRepOffset_Analyse.hxx>
-#include <BRepOffset_DataMapIteratorOfDataMapOfShapeOffset.hxx>
 #include <BRepOffset_DataMapOfShapeMapOfShape.hxx>
-#include <BRepOffset_DataMapOfShapeOffset.hxx>
 #include <BRepOffset_Inter2d.hxx>
 #include <BRepOffset_Inter3d.hxx>
-#include <BRepOffset_Interval.hxx>
-#include <BRepOffset_ListOfInterval.hxx>
-#include <BRepOffset_MakeLoops.hxx>
 #include <BRepOffset_MakeOffset.hxx>
 #include <BRepOffset_Offset.hxx>
 #include <BRepOffset_Tool.hxx>
@@ -67,11 +59,9 @@
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_ConicalSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_SphericalSurface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
@@ -79,7 +69,6 @@
 #include <GeomLib.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 #include <gp_Cone.hxx>
-#include <gp_Lin2d.hxx>
 #include <gp_Pnt.hxx>
 #include <GProp_GProps.hxx>
 #include <IntTools_FClass2d.hxx>
@@ -87,8 +76,6 @@
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
@@ -100,16 +87,10 @@
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeReal.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TopTools_SequenceOfShape.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
 #include <Geom_Line.hxx>
 #include <NCollection_Vector.hxx>
diff --git a/src/BRepOffset/BRepOffset_MakeOffset.hxx b/src/BRepOffset/BRepOffset_MakeOffset.hxx
index dc19d393db..4aaf867151 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset.hxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset.hxx
@@ -21,13 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Compound.hxx>
 #include <BRepOffset_Mode.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_JoinType.hxx>
-#include <TopTools_DataMapOfShapeReal.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <BRepOffset_Analyse.hxx>
 #include <BRepAlgo_Image.hxx>
diff --git a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
index dab0aac318..04359001d2 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset_1.cxx
@@ -22,7 +22,6 @@
 #include <BRepOffset_MakeOffset.hxx>
 
 #include <Precision.hxx>
-#include <TopoDS.hxx>
 
 #include <BRepAlgo_AsDes.hxx>
 #include <BRepAlgo_Image.hxx>
@@ -35,18 +34,12 @@
 
 #include <BRepAdaptor_Curve.hxx>
 
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-
-#include <TopTools_DataMapOfShapeInteger.hxx>
-
 #include <BRepOffset_Tool.hxx>
 
 #include <BRepClass3d_SolidClassifier.hxx>
 
 #include <BOPDS_DS.hxx>
 
-#include <BOPAlgo_Builder.hxx>
 #include <BOPAlgo_BuilderFace.hxx>
 #include <BOPAlgo_MakerVolume.hxx>
 #include <BOPAlgo_PaveFiller.hxx>
@@ -61,7 +54,6 @@
 
 #include <BOPTools_AlgoTools3D.hxx>
 #include <BOPTools_AlgoTools.hxx>
-#include <BOPTools_AlgoTools2D.hxx>
 #include <BOPTools_Set.hxx>
 
 #include <IntTools_Context.hxx>
diff --git a/src/BRepOffset/BRepOffset_MakeSimpleOffset.cxx b/src/BRepOffset/BRepOffset_MakeSimpleOffset.cxx
index d3f5ed8cd9..8c8ed3ed03 100644
--- a/src/BRepOffset/BRepOffset_MakeSimpleOffset.cxx
+++ b/src/BRepOffset/BRepOffset_MakeSimpleOffset.cxx
@@ -41,7 +41,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 
 //=============================================================================
diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx
index 449b3452af..b1ecb8c476 100644
--- a/src/BRepOffset/BRepOffset_Offset.cxx
+++ b/src/BRepOffset/BRepOffset_Offset.cxx
@@ -19,8 +19,6 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepGProp.hxx>
@@ -47,7 +45,6 @@
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
@@ -75,7 +72,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/BRepOffset/BRepOffset_SimpleOffset.cxx b/src/BRepOffset/BRepOffset_SimpleOffset.cxx
index b8d804f7a7..730241e053 100644
--- a/src/BRepOffset/BRepOffset_SimpleOffset.cxx
+++ b/src/BRepOffset/BRepOffset_SimpleOffset.cxx
@@ -28,7 +28,6 @@
 #include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <NCollection_Vector.hxx>
-#include <ShapeAnalysis_Edge.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepOffset/BRepOffset_SimpleOffset.hxx b/src/BRepOffset/BRepOffset_SimpleOffset.hxx
index ea45b2ae1d..a5c46ba99d 100644
--- a/src/BRepOffset/BRepOffset_SimpleOffset.hxx
+++ b/src/BRepOffset/BRepOffset_SimpleOffset.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Real.hxx>
 #include <Standard_Macro.hxx>
 #include <Standard_Type.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <NCollection_DataMap.hxx>
 
diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index 97cc14cd26..a7a1930e24 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -22,38 +22,30 @@
 #include <BOPDS_DS.hxx>
 #include <BOPTools_AlgoTools.hxx>
 #include <BOPTools_AlgoTools2D.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo_AsDes.hxx>
 #include <BRepAlgo_Image.hxx>
-#include <BRepBndLib.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
-#include <BRepLib_MakePolygon.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepOffset_Analyse.hxx>
 #include <BRepOffset_Interval.hxx>
 #include <BRepOffset_ListOfInterval.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_Modifier.hxx>
-#include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <Extrema_ExtPC.hxx>
 #include <Extrema_ExtPC2d.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
-#include <GCPnts_UniformAbscissa.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Circle.hxx>
@@ -69,7 +61,6 @@
 #include <Geom2dInt_GInter.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Conic.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
@@ -97,11 +88,9 @@
 #include <IntRes2d_IntersectionSegment.hxx>
 #include <IntTools_FaceFace.hxx>
 #include <Precision.hxx>
-#include <ProjLib_HProjectedCurve.hxx>
 #include <ProjLib_ProjectedCurve.hxx>
 #include <ShapeCustom_Curve2d.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -114,7 +103,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 #include <stdio.h>
diff --git a/src/BRepOffset/BRepOffset_Tool.hxx b/src/BRepOffset/BRepOffset_Tool.hxx
index 7287d5c773..48334f4268 100644
--- a/src/BRepOffset/BRepOffset_Tool.hxx
+++ b/src/BRepOffset/BRepOffset_Tool.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <TopAbs_Orientation.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopAbs_State.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
index 4e2f73ed37..051cf89694 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.cxx
@@ -17,12 +17,10 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
-#include <BRepFill_DataMapIteratorOfDataMapOfShapeSequenceOfReal.hxx>
 #include <BRepFill_DataMapOfShapeSequenceOfReal.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeVertex.hxx>
@@ -37,10 +35,7 @@
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NullObject.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TopExp.hxx>
@@ -50,9 +45,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeSequenceOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 #include <Geom2dInt_GInter.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
index a74e31b3bb..e3ecd5f825 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
@@ -19,13 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
 #include <BRepBuilderAPI_ModifyShape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Draft_ErrorStatus.hxx>
 #include <BRepTools_ReShape.hxx>
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.cxx
index 9495f84a8e..7434f95acb 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.cxx
@@ -19,7 +19,6 @@
 #include <BRepOffsetAPI_FindContigousEdges.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
 //=======================================================================
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.hxx
index 487fc01afa..6612755ef0 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_FindContigousEdges.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TopTools_ListOfShape.hxx>
 class BRepBuilderAPI_Sewing;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.cxx
index d1c59133c1..588137c4e2 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.cxx
@@ -15,7 +15,6 @@
 #include <BRepOffsetAPI_MakeDraft.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Dir.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.hxx
index a7865e360e..ad30fdd503 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeDraft.hxx
@@ -25,7 +25,6 @@
 #include <BRepBuilderAPI_MakeShape.hxx>
 #include <Standard_Real.hxx>
 #include <BRepBuilderAPI_TransitionMode.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Shape;
 class gp_Dir;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.cxx
index 0fc1c6763c..0bf9d40fd6 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.cxx
@@ -16,15 +16,12 @@
 
 
 #include <BRepFill.hxx>
-#include <BRepFill_Evolved.hxx>
 #include <BRepOffsetAPI_MakeEvolved.hxx>
 #include <gp_Ax3.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS.hxx>
-#include <Standard_NotImplemented.hxx>
 
 static const TopTools_ListOfShape anEmptyList;
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.hxx
index ae64f39ae4..f108d3b7ac 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeEvolved.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepFill_Evolved.hxx>
 #include <BRepFill_AdvancedEvolved.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
 #include <GeomAbs_JoinType.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Wire;
 class TopoDS_Shape;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.cxx
index 5eb9909159..cd3bed2bff 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.cxx
@@ -17,9 +17,6 @@
 
 #include <BRepOffsetAPI_MakeFilling.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.hxx
index 8bddfa045c..56947b9b1e 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeFilling.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepFill_Filling.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
index a6b1720535..02b8959bfb 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
@@ -20,8 +20,6 @@
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepFill_ListIteratorOfListOfOffsetWire.hxx>
-#include <BRepFill_OffsetWire.hxx>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <Extrema_ExtPS.hxx>
@@ -37,7 +35,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 #include <BRepTools.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.hxx
index cc45358ff1..0a09eb5693 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <GeomAbs_JoinType.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepFill_ListOfOffsetWire.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Wire;
 class TopoDS_Shape;
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.cxx
index f6a5ff0a13..67d0ba3bf7 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.cxx
@@ -14,11 +14,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <BRepOffset_MakeOffset.hxx>
 #include <BRepOffsetAPI_MakeOffsetShape.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : BRepOffsetAPI_MakeOffsetShape
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.hxx
index 231fc0444e..acb40eb6f1 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeOffsetShape.hxx
@@ -24,9 +24,7 @@
 #include <BRepOffset_MakeOffset.hxx>
 #include <BRepOffset_MakeSimpleOffset.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 #include <BRepOffset_Mode.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_JoinType.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Shape;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
index 3d3f80fe6e..eca836ba18 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx
@@ -15,16 +15,13 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepFill_Pipe.hxx>
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx
index 22f58e90ec..e65918546e 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.hxx
@@ -24,8 +24,6 @@
 #include <BRepFill_Pipe.hxx>
 #include <BRepPrimAPI_MakeSweep.hxx>
 #include <GeomFill_Trihedron.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Wire;
 class TopoDS_Shape;
 
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
index b222a52b04..2f2b4b6fe5 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
@@ -21,8 +21,6 @@
 #include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 #include <Law_Function.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.hxx
index 4cde357186..4533640e4b 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.hxx
@@ -22,11 +22,9 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepPrimAPI_MakeSweep.hxx>
-#include <Standard_Boolean.hxx>
 #include <BRepFill_PipeShell.hxx>
 #include <BRepFill_TypeOfContact.hxx>
 #include <BRepBuilderAPI_PipeError.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <BRepBuilderAPI_TransitionMode.hxx>
 #include <TopTools_ListOfShape.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.cxx
index 5238dd920d..bf8547da4f 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.cxx
@@ -15,12 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepOffset_MakeOffset.hxx>
 #include <BRepOffsetAPI_MakeThickSolid.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 
 //=======================================================================
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.hxx
index 245f7bdf7e..850d9b81f1 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakeThickSolid.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepOffsetAPI_MakeOffsetShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <Standard_Real.hxx>
 #include <BRepOffset_Mode.hxx>
 #include <Standard_Boolean.hxx>
 #include <GeomAbs_JoinType.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx
index 67bce0849c..25d8297b72 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx
@@ -32,7 +32,6 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
@@ -57,8 +56,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 static Standard_Boolean IsLinear(const TopoDS_Edge& anEdge,
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.hxx
index 5d9be2a4f8..8a00f578f9 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.hxx
@@ -18,11 +18,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <BRepOffsetAPI_SequenceOfSequenceOfShape.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
index 6d0be92578..b8468212b9 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.cxx
@@ -16,10 +16,6 @@
 
 
 #include <BRepOffsetAPI_NormalProjection.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <StdFail_NotDone.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
 BRepOffsetAPI_NormalProjection::BRepOffsetAPI_NormalProjection()
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.hxx
index 09a56d0cb7..48e81ad93f 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_NormalProjection.hxx
@@ -23,10 +23,7 @@
 
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Shape;
 class TopoDS_Edge;
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
index 5129308edf..c931227136 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
@@ -56,7 +56,6 @@
 #include <BSplCLib.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Conic.hxx>
 #include <Geom_Curve.hxx>
@@ -76,7 +75,6 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_NullObject.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
@@ -91,7 +89,6 @@
 #include <TopTools_DataMapOfShapeReal.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeReal.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
 //=======================================================================
diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.hxx b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.hxx
index dbe90ba5ee..a69dc022b4 100644
--- a/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.hxx
+++ b/src/BRepOffsetAPI/BRepOffsetAPI_ThruSections.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopTools_SequenceOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeListOfInteger.hxx>
diff --git a/src/BRepPreviewAPI/BRepPreviewAPI_MakeBox.cxx b/src/BRepPreviewAPI/BRepPreviewAPI_MakeBox.cxx
index 6cd21578fb..f30f355a31 100644
--- a/src/BRepPreviewAPI/BRepPreviewAPI_MakeBox.cxx
+++ b/src/BRepPreviewAPI/BRepPreviewAPI_MakeBox.cxx
@@ -15,14 +15,11 @@
 
 #include <BRepPreviewAPI_MakeBox.hxx>
 
-#include <BRep_Builder.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 
-#include <TopoDS_Compound.hxx>
-
 //=======================================================================
 //function : Build
 //purpose  :
diff --git a/src/BRepPrim/BRepPrim_Builder.cxx b/src/BRepPrim/BRepPrim_Builder.cxx
index 59ae5f9459..4fe5053d43 100644
--- a/src/BRepPrim/BRepPrim_Builder.cxx
+++ b/src/BRepPrim/BRepPrim_Builder.cxx
@@ -25,7 +25,6 @@
 #include <Geom_Plane.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Circ2d.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/BRepPrim/BRepPrim_Builder.hxx b/src/BRepPrim/BRepPrim_Builder.hxx
index 20ce195b3e..79dce65adb 100644
--- a/src/BRepPrim/BRepPrim_Builder.hxx
+++ b/src/BRepPrim/BRepPrim_Builder.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRep_Builder.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Shell;
 class TopoDS_Face;
 class gp_Pln;
diff --git a/src/BRepPrim/BRepPrim_Cone.hxx b/src/BRepPrim/BRepPrim_Cone.hxx
index f2bcc30ae8..ef1270d2f2 100644
--- a/src/BRepPrim/BRepPrim_Cone.hxx
+++ b/src/BRepPrim/BRepPrim_Cone.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <BRepPrim_Revolution.hxx>
 class gp_Ax2;
 class gp_Pnt;
diff --git a/src/BRepPrim/BRepPrim_Cylinder.cxx b/src/BRepPrim/BRepPrim_Cylinder.cxx
index b49e89e241..fabb6ad333 100644
--- a/src/BRepPrim/BRepPrim_Cylinder.cxx
+++ b/src/BRepPrim/BRepPrim_Cylinder.cxx
@@ -24,7 +24,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Face.hxx>
 
 //=======================================================================
diff --git a/src/BRepPrim/BRepPrim_Cylinder.hxx b/src/BRepPrim/BRepPrim_Cylinder.hxx
index 1b53715953..87f34da134 100644
--- a/src/BRepPrim/BRepPrim_Cylinder.hxx
+++ b/src/BRepPrim/BRepPrim_Cylinder.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <BRepPrim_Revolution.hxx>
 class gp_Ax2;
 class gp_Pnt;
diff --git a/src/BRepPrim/BRepPrim_FaceBuilder.hxx b/src/BRepPrim/BRepPrim_FaceBuilder.hxx
index a59082d3f0..612e2aeaad 100644
--- a/src/BRepPrim/BRepPrim_FaceBuilder.hxx
+++ b/src/BRepPrim/BRepPrim_FaceBuilder.hxx
@@ -24,7 +24,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class BRep_Builder;
 class Geom_Surface;
diff --git a/src/BRepPrim/BRepPrim_GWedge.cxx b/src/BRepPrim/BRepPrim_GWedge.cxx
index b0eba6c7a6..c8343464ae 100644
--- a/src/BRepPrim/BRepPrim_GWedge.cxx
+++ b/src/BRepPrim/BRepPrim_GWedge.cxx
@@ -15,8 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepPrim_Builder.hxx>
-#include <BRepPrim_Direction.hxx>
 #include <BRepPrim_GWedge.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
@@ -27,12 +25,9 @@
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
 
 #define NBFACES 6
 #define NBWIRES 6
diff --git a/src/BRepPrim/BRepPrim_GWedge.hxx b/src/BRepPrim/BRepPrim_GWedge.hxx
index 58dc5e54d1..854f147004 100644
--- a/src/BRepPrim/BRepPrim_GWedge.hxx
+++ b/src/BRepPrim/BRepPrim_GWedge.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepPrim_Builder.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_Real.hxx>
 #include <TopoDS_Shell.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/BRepPrim/BRepPrim_OneAxis.cxx b/src/BRepPrim/BRepPrim_OneAxis.cxx
index 3cd65c3ee1..f3a1e71add 100644
--- a/src/BRepPrim/BRepPrim_OneAxis.cxx
+++ b/src/BRepPrim/BRepPrim_OneAxis.cxx
@@ -16,24 +16,20 @@
 
 
 #include <BRepPrim_Builder.hxx>
-#include <BRepPrim_Direction.hxx>
 #include <BRepPrim_OneAxis.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Circ2d.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
 
 #define NBVERTICES 6
 #define VAXISTOP    0
diff --git a/src/BRepPrim/BRepPrim_OneAxis.hxx b/src/BRepPrim/BRepPrim_OneAxis.hxx
index 9cb99a347b..ea07e580a1 100644
--- a/src/BRepPrim/BRepPrim_OneAxis.hxx
+++ b/src/BRepPrim/BRepPrim_OneAxis.hxx
@@ -19,13 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepPrim_Builder.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_Real.hxx>
 #include <TopoDS_Shell.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
diff --git a/src/BRepPrim/BRepPrim_Sphere.cxx b/src/BRepPrim/BRepPrim_Sphere.cxx
index de802b37bb..eec0b5141e 100644
--- a/src/BRepPrim/BRepPrim_Sphere.cxx
+++ b/src/BRepPrim/BRepPrim_Sphere.cxx
@@ -24,7 +24,6 @@
 #include <gp_Ax2d.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Face.hxx>
 
 // parameters on the meridian
diff --git a/src/BRepPrim/BRepPrim_Sphere.hxx b/src/BRepPrim/BRepPrim_Sphere.hxx
index 15aa5a9126..3b11fa624a 100644
--- a/src/BRepPrim/BRepPrim_Sphere.hxx
+++ b/src/BRepPrim/BRepPrim_Sphere.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <BRepPrim_Revolution.hxx>
 class gp_Pnt;
 class gp_Ax2;
diff --git a/src/BRepPrim/BRepPrim_Torus.cxx b/src/BRepPrim/BRepPrim_Torus.cxx
index 52dd97c805..49aaeb32e1 100644
--- a/src/BRepPrim/BRepPrim_Torus.cxx
+++ b/src/BRepPrim/BRepPrim_Torus.cxx
@@ -25,7 +25,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Face.hxx>
 
 //=======================================================================
diff --git a/src/BRepPrim/BRepPrim_Torus.hxx b/src/BRepPrim/BRepPrim_Torus.hxx
index 8b2910b695..c040556ec6 100644
--- a/src/BRepPrim/BRepPrim_Torus.hxx
+++ b/src/BRepPrim/BRepPrim_Torus.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <BRepPrim_Revolution.hxx>
 class gp_Ax2;
 class gp_Pnt;
diff --git a/src/BRepPrim/BRepPrim_Wedge.cxx b/src/BRepPrim/BRepPrim_Wedge.cxx
index 3416bd01d8..610b4b69ee 100644
--- a/src/BRepPrim/BRepPrim_Wedge.cxx
+++ b/src/BRepPrim/BRepPrim_Wedge.cxx
@@ -17,7 +17,6 @@
 
 #include <BRepPrim_Wedge.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : BRepPrim_Wedge
diff --git a/src/BRepPrim/BRepPrim_Wedge.hxx b/src/BRepPrim/BRepPrim_Wedge.hxx
index bdd822b465..eee8e810d8 100644
--- a/src/BRepPrim/BRepPrim_Wedge.hxx
+++ b/src/BRepPrim/BRepPrim_Wedge.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepPrim_GWedge.hxx>
-#include <Standard_Real.hxx>
 class gp_Ax2;
 
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeBox.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeBox.cxx
index 52cda67cc8..8b20ae7bb7 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeBox.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeBox.cxx
@@ -16,16 +16,10 @@
 
 
 #include <BRepBuilderAPI.hxx>
-#include <BRepPrim_Direction.hxx>
-#include <BRepPrim_Wedge.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeBox.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeBox.hxx
index 4e9061d512..c677bb32bd 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeBox.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeBox.hxx
@@ -19,11 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepPrim_Wedge.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 class gp_Pnt;
 class gp_Ax2;
 class TopoDS_Shell;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
index 728bf46885..9228e10aae 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
@@ -15,13 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepBuilderAPI.hxx>
-#include <BRepPrim_Cone.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
 #include <gp.hxx>
 #include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : BRepPrimAPI_MakeCone
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.hxx
index 0b9da1eca7..c57b67013b 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepPrim_Cone.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Address.hxx>
 class gp_Ax2;
 
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
index e68e23d72b..3b6a2e4a4b 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
@@ -15,13 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepBuilderAPI.hxx>
-#include <BRepPrim_Cylinder.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <gp.hxx>
 #include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : BRepPrimAPI_MakeCylinder
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.hxx
index 316fea7a37..ccaaff210a 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepPrim_Cylinder.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Address.hxx>
 class gp_Ax2;
 
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.hxx
index c4ab4ba7f0..c7df3c9ab6 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeHalfSpace.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Solid.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx
index dc9d9fefe4..51a0b76859 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.cxx
@@ -15,10 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepBuilderAPI.hxx>
 #include <BRepPrim_OneAxis.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shell.hxx>
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.hxx
index ce4eb1b293..38e703e1b8 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeOneAxis.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Address.hxx>
 class TopoDS_Face;
 class TopoDS_Shell;
 class TopoDS_Solid;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx
index 7d7550cbd3..81910b59f7 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakePrism.hxx
@@ -19,11 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepSweep_Prism.hxx>
 #include <BRepPrimAPI_MakeSweep.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 class TopoDS_Shape;
 class gp_Vec;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.cxx
index b8e61e9b06..8385f5aa13 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.cxx
@@ -22,8 +22,6 @@
 #include <BRepPrimAPI_MakeRevol.hxx>
 #include <BRepSweep_Revol.hxx>
 #include <gp_Ax1.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Lin.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx
index 82df13808f..d685b76714 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeRevol.hxx
@@ -25,8 +25,6 @@
 #include <TopTools_ListOfShape.hxx>
 #include <BRepPrimAPI_MakeSweep.hxx>
 #include <BRepTools_History.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Shape;
 class gp_Ax1;
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.cxx
index 6594565734..5c5efecb45 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.cxx
@@ -23,7 +23,6 @@
 #include <Geom_Plane.hxx>
 #include <GeomProjLib.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : Project
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.hxx
index bc2a048ede..3a3f1c0293 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeRevolution.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepPrim_Revolution.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Address.hxx>
 class Geom_Curve;
 class gp_Ax2;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
index d302518252..dbf2fda517 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
@@ -16,13 +16,11 @@
 
 
 #include <BRepBuilderAPI.hxx>
-#include <BRepPrim_Sphere.hxx>
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <gp.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : BRepPrimAPI_MakeSphere
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.hxx
index f8dfcc2bfe..2542f2c907 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.hxx
@@ -19,12 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepPrim_Sphere.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Address.hxx>
 class gp_Pnt;
 class gp_Ax2;
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.hxx
index a1f6559d23..f05da8aca9 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeSweep.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepBuilderAPI_MakeShape.hxx>
 class TopoDS_Shape;
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.cxx
index ce577d5369..69a5b3aed2 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.cxx
@@ -15,11 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepBuilderAPI.hxx>
-#include <BRepPrim_Torus.hxx>
 #include <BRepPrimAPI_MakeTorus.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_DomainError.hxx>
 
 //=======================================================================
 //function : BRepPrimAPI_MakeTorus
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.hxx
index c229971812..820733aaac 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeTorus.hxx
@@ -23,8 +23,6 @@
 
 #include <BRepPrim_Torus.hxx>
 #include <BRepPrimAPI_MakeOneAxis.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Address.hxx>
 class gp_Ax2;
 
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
index d98e4d25d8..2d83a23cef 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
@@ -15,11 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepPrim_Wedge.hxx>
 #include <BRepPrimAPI_MakeWedge.hxx>
 #include <gp_Ax2.hxx>
-#include <Standard_DomainError.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.hxx b/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.hxx
index ea643c0e41..cb0707eb9c 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.hxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeWedge.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepPrim_Wedge.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
-#include <Standard_Real.hxx>
 class gp_Ax2;
 class TopoDS_Shell;
 class TopoDS_Solid;
diff --git a/src/BRepProj/BRepProj_Projection.cxx b/src/BRepProj/BRepProj_Projection.cxx
index a448b9300d..d0a3a64bb7 100644
--- a/src/BRepProj/BRepProj_Projection.cxx
+++ b/src/BRepProj/BRepProj_Projection.cxx
@@ -14,12 +14,9 @@
 
 
 #include <Bnd_Box.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAlgoAPI_Section.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepFill_Generator.hxx>
-#include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepLib_MakeWire.hxx>
 #include <BRepProj_Projection.hxx>
@@ -33,15 +30,10 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NullObject.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
 
 //=======================================================================
 //function : DistanceOut
diff --git a/src/BRepProj/BRepProj_Projection.hxx b/src/BRepProj/BRepProj_Projection.hxx
index 1732247227..a224b5f7ac 100644
--- a/src/BRepProj/BRepProj_Projection.hxx
+++ b/src/BRepProj/BRepProj_Projection.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
diff --git a/src/BRepSweep/BRepSweep_Builder.cxx b/src/BRepSweep/BRepSweep_Builder.cxx
index 70a4e50381..989d6cdd65 100644
--- a/src/BRepSweep/BRepSweep_Builder.cxx
+++ b/src/BRepSweep/BRepSweep_Builder.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRep_Builder.hxx>
 #include <BRepSweep_Builder.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BRepSweep/BRepSweep_Iterator.cxx b/src/BRepSweep/BRepSweep_Iterator.cxx
index 32fc4382f0..c0f0d96f2c 100644
--- a/src/BRepSweep/BRepSweep_Iterator.cxx
+++ b/src/BRepSweep/BRepSweep_Iterator.cxx
@@ -16,8 +16,6 @@
 
 
 #include <BRepSweep_Iterator.hxx>
-#include <Standard_NoMoreObject.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <TopoDS_Shape.hxx>
 
 //=======================================================================
diff --git a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
index a91c49a978..590d80fd11 100644
--- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
+++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
@@ -15,14 +15,11 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepSweep_Builder.hxx>
 #include <BRepSweep_Iterator.hxx>
 #include <BRepSweep_NumLinearRegularSweep.hxx>
 #include <BRepSweep_Tool.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_NoMoreObject.hxx>
 #include <Standard_NoSuchObject.hxx>
-#include <Standard_RangeError.hxx>
 #include <Sweep_NumShape.hxx>
 #include <Sweep_NumShapeIterator.hxx>
 #include <Sweep_NumShapeTool.hxx>
@@ -30,7 +27,6 @@
 #include <TopAbs_Orientation.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
-#include <TopoDS.hxx>
 
 //=======================================================================
 //function : BRepSweep_NumLinearRegularSweep
diff --git a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
index b105441f9b..86a2a1206e 100644
--- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
+++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
@@ -19,17 +19,14 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepSweep_Builder.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Sweep_NumShape.hxx>
 #include <BRepSweep_Tool.hxx>
 #include <Sweep_NumShapeTool.hxx>
 #include <TopTools_Array2OfShape.hxx>
 #include <TColStd_Array2OfBoolean.hxx>
 #include <TopAbs_Orientation.hxx>
-#include <Standard_Boolean.hxx>
 
 
 //! This  a generic  class  is  used   to build Sweept
diff --git a/src/BRepSweep/BRepSweep_Revol.hxx b/src/BRepSweep/BRepSweep_Revol.hxx
index 043623bdbe..001dada271 100644
--- a/src/BRepSweep/BRepSweep_Revol.hxx
+++ b/src/BRepSweep/BRepSweep_Revol.hxx
@@ -23,7 +23,6 @@
 
 #include <BRepSweep_Rotation.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Shape;
 class gp_Ax1;
 class Sweep_NumShape;
diff --git a/src/BRepSweep/BRepSweep_Rotation.cxx b/src/BRepSweep/BRepSweep_Rotation.cxx
index 2a468000a6..679b850ff7 100644
--- a/src/BRepSweep/BRepSweep_Rotation.cxx
+++ b/src/BRepSweep/BRepSweep_Rotation.cxx
@@ -45,7 +45,6 @@
 #include <gp_Ax22d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Lin.hxx>
diff --git a/src/BRepSweep/BRepSweep_Rotation.hxx b/src/BRepSweep/BRepSweep_Rotation.hxx
index 0e157e03aa..fe162223b9 100644
--- a/src/BRepSweep/BRepSweep_Rotation.hxx
+++ b/src/BRepSweep/BRepSweep_Rotation.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Ax1.hxx>
 #include <BRepSweep_Trsf.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/BRepSweep/BRepSweep_Tool.cxx b/src/BRepSweep/BRepSweep_Tool.cxx
index 534e6b0f9a..5cd34b8af1 100644
--- a/src/BRepSweep/BRepSweep_Tool.cxx
+++ b/src/BRepSweep/BRepSweep_Tool.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRepSweep_Tool.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TopExp.hxx>
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/BRepSweep/BRepSweep_Tool.hxx b/src/BRepSweep/BRepSweep_Tool.hxx
index da74db3ad7..8e2de58612 100644
--- a/src/BRepSweep/BRepSweep_Tool.hxx
+++ b/src/BRepSweep/BRepSweep_Tool.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <Standard_Integer.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopAbs_Orientation.hxx>
 class TopoDS_Shape;
diff --git a/src/BRepSweep/BRepSweep_Translation.cxx b/src/BRepSweep/BRepSweep_Translation.cxx
index 4bb9d92723..388f7a2b71 100644
--- a/src/BRepSweep/BRepSweep_Translation.cxx
+++ b/src/BRepSweep/BRepSweep_Translation.cxx
@@ -17,14 +17,11 @@
 #include <BRepSweep_Translation.hxx>
 
 #include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepTools.hxx>
-#include <ElSLib.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
@@ -35,7 +32,6 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <gp.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Lin.hxx>
diff --git a/src/BRepSweep/BRepSweep_Trsf.cxx b/src/BRepSweep/BRepSweep_Trsf.cxx
index 3b0b3b9bfc..b1649a7dd9 100644
--- a/src/BRepSweep/BRepSweep_Trsf.cxx
+++ b/src/BRepSweep/BRepSweep_Trsf.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepLProp.hxx>
diff --git a/src/BRepSweep/BRepSweep_Trsf.hxx b/src/BRepSweep/BRepSweep_Trsf.hxx
index 4d40d07650..dcb80b3f62 100644
--- a/src/BRepSweep/BRepSweep_Trsf.hxx
+++ b/src/BRepSweep/BRepSweep_Trsf.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopLoc_Location.hxx>
-#include <Standard_Boolean.hxx>
 #include <BRepSweep_NumLinearRegularSweep.hxx>
 #include <TopAbs_Orientation.hxx>
 class BRep_Builder;
diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx
index 89574e3008..216dc8ccf4 100644
--- a/src/BRepTest/BRepTest_BasicCommands.cxx
+++ b/src/BRepTest/BRepTest_BasicCommands.cxx
@@ -33,9 +33,9 @@
 #include <gp_Ax2.hxx>
 #include <gp_Mat.hxx>
 #include <gp_GTrsf.hxx>
+#include <GeomAdaptor_Surface.hxx>
 #include <BRepOffsetAPI_NormalProjection.hxx>
 #include <BRepLib.hxx>
-#include <BRep_Builder.hxx>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
 #include <Bnd_Box2d.hxx>
@@ -45,13 +45,11 @@
 #include <BRepTools_WireExplorer.hxx>
 
 #include <GCPnts_QuasiUniformAbscissa.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <ProjLib_ComputeApproxOnPolarSurface.hxx>
 #include <DrawTrSurf.hxx>
 #include <Geom_Plane.hxx>
 
-#include <OSD_Timer.hxx>
 #include <Draw_Segment3D.hxx>
 #include <Draw_Marker3D.hxx>
 #include <Draw_MarkerShape.hxx>
@@ -60,8 +58,6 @@
 #include <BRepTools.hxx>
 #include <Standard_Dump.hxx>
 
-#include <stdio.h>
-
 Standard_IMPORT Draw_Viewer dout;
 
 //=======================================================================
@@ -850,7 +846,6 @@ static Standard_Integer IsBoxesInterfered(Draw_Interpretor& theDI,
 //function : gbounding
 //purpose  : 
 //=======================================================================
-#include <GeomAdaptor_Surface.hxx>
 #include <BndLib_AddSurface.hxx>
 #include <BndLib_Add3dCurve.hxx>
 #include <BndLib_Add2dCurve.hxx>
@@ -989,7 +984,6 @@ static Standard_Integer precision(Draw_Interpretor& di,Standard_Integer n,const
 //purpose  : 
 //=======================================================================
 #include <IntCurvesFace_ShapeIntersector.hxx>
-#include <gp_Lin.hxx>
 
 static Standard_Integer reperageshape(Draw_Interpretor& di, Standard_Integer narg , const char** a) 
 {
diff --git a/src/BRepTest/BRepTest_ChamferCommands.cxx b/src/BRepTest/BRepTest_ChamferCommands.cxx
index 63a3c2a2e2..4e2961c5a2 100644
--- a/src/BRepTest/BRepTest_ChamferCommands.cxx
+++ b/src/BRepTest/BRepTest_ChamferCommands.cxx
@@ -23,7 +23,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Shape.hxx>
 
 #include <Precision.hxx>
diff --git a/src/BRepTest/BRepTest_CheckCommands.cxx b/src/BRepTest/BRepTest_CheckCommands.cxx
index 35b1c10a5c..be90986d70 100644
--- a/src/BRepTest/BRepTest_CheckCommands.cxx
+++ b/src/BRepTest/BRepTest_CheckCommands.cxx
@@ -19,15 +19,9 @@
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepCheck_Result.hxx>
 #include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-#include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <DBRep_DrawableShape.hxx>
-#include <Draw_SequenceOfDrawable3D.hxx>
 #include <BRepCheck.hxx>
 #include <BRepCheck_Edge.hxx>
 #include <Draw_Interpretor.hxx>
@@ -35,27 +29,20 @@
 #include <Draw.hxx>
 #include <DBRep.hxx>
 #include <BRepTest.hxx>
-#include <GeometryTest.hxx>
-#include <Precision.hxx>
-#include <LocalAnalysis.hxx>
 #include <LocalAnalysis_SurfaceContinuity.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <DrawTrSurf.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TopoDS.hxx>
 #include <TopExp.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <BRep_Tool.hxx>
 
 #include <TopOpeBRepTool_PurgeInternalEdges.hxx>
 //#include <TopOpeBRepTool_FuseEdges.hxx>
diff --git a/src/BRepTest/BRepTest_CurveCommands.cxx b/src/BRepTest/BRepTest_CurveCommands.cxx
index 3039254739..37e39897d8 100644
--- a/src/BRepTest/BRepTest_CurveCommands.cxx
+++ b/src/BRepTest/BRepTest_CurveCommands.cxx
@@ -17,13 +17,8 @@
 #include <BRepTest.hxx>
 #include <GeometryTest.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeEdge2d.hxx>
@@ -56,7 +51,6 @@
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <DrawTrSurf.hxx>
-#include <DrawTrSurf_BSplineCurve2d.hxx>
 #include <DrawTrSurf_Point.hxx>
 
 #include <gp.hxx>
diff --git a/src/BRepTest/BRepTest_DrawableHistory.hxx b/src/BRepTest/BRepTest_DrawableHistory.hxx
index e5d0ebe000..c6ee8ca1f6 100644
--- a/src/BRepTest/BRepTest_DrawableHistory.hxx
+++ b/src/BRepTest/BRepTest_DrawableHistory.hxx
@@ -17,7 +17,6 @@
 #define _BRepTest_DrawableHistory_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <BRepTools_History.hxx>
 
diff --git a/src/BRepTest/BRepTest_ExtremaCommands.cxx b/src/BRepTest/BRepTest_ExtremaCommands.cxx
index 3be19ae908..ee9d0f4f7d 100644
--- a/src/BRepTest/BRepTest_ExtremaCommands.cxx
+++ b/src/BRepTest/BRepTest_ExtremaCommands.cxx
@@ -20,7 +20,6 @@
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepExtrema_ShapeProximity.hxx>
 #include <BRepExtrema_SelfIntersection.hxx>
-#include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <Draw_ProgressIndicator.hxx>
@@ -30,7 +29,6 @@
 #include <Message.hxx>
 #include <OSD_Timer.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 #include <Precision.hxx>
 
 #include <stdio.h>
diff --git a/src/BRepTest/BRepTest_FeatureCommands.cxx b/src/BRepTest/BRepTest_FeatureCommands.cxx
index c3ebfcc734..8b69ec1ba2 100644
--- a/src/BRepTest/BRepTest_FeatureCommands.cxx
+++ b/src/BRepTest/BRepTest_FeatureCommands.cxx
@@ -19,27 +19,13 @@
 #include <DrawTrSurf.hxx>
 #include <Draw_ProgressIndicator.hxx>
 
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS.hxx>
 
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_CylindricalSurface.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Cylinder.hxx>
 
 //#include <BRepFeat_LocalOperation.hxx>
-#include <BRepFeat_Builder.hxx>
 #include <BRepFeat_MakeCylindricalHole.hxx>
 #include <BRepFeat_SplitShape.hxx>
 #include <BRepFeat_Gluer.hxx>
@@ -57,7 +43,6 @@
 
 #include <BRepOffset_MakeOffset.hxx>
 #include <BRepOffset_MakeSimpleOffset.hxx>
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <DBRep.hxx>
 #include <DBRep_DrawableShape.hxx>
diff --git a/src/BRepTest/BRepTest_FilletCommands.cxx b/src/BRepTest/BRepTest_FilletCommands.cxx
index 281f58e566..b4ef1ea156 100644
--- a/src/BRepTest/BRepTest_FilletCommands.cxx
+++ b/src/BRepTest/BRepTest_FilletCommands.cxx
@@ -16,26 +16,21 @@
 
 #include <BRepTest.hxx>
 #include <BRepTest_Objects.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <DBRep.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BiTgte_Blend.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 
 #include <BOPAlgo_PaveFiller.hxx>
 
-#include <BRepAlgoAPI_BooleanOperation.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Section.hxx>
@@ -43,13 +38,9 @@
 #include <FilletSurf_Builder.hxx>
 #include <ChFi3d_FilletShape.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom2d_Curve.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <FilletSurf_StatusType.hxx>
 #include <FilletSurf_ErrorTypeStatus.hxx>
-#include <TopAbs.hxx>
 #include <DrawTrSurf.hxx>
 #include <Message.hxx>
 #include <Draw_ProgressIndicator.hxx>
diff --git a/src/BRepTest/BRepTest_FillingCommands.cxx b/src/BRepTest/BRepTest_FillingCommands.cxx
index 0bd777772d..a5e7fb9673 100644
--- a/src/BRepTest/BRepTest_FillingCommands.cxx
+++ b/src/BRepTest/BRepTest_FillingCommands.cxx
@@ -31,68 +31,38 @@
 #include <Draw_Appli.hxx>
 #include <Draw_ProgressIndicator.hxx>
 #include <DrawTrSurf.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopExp.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Curve.hxx>  
 #include <BRepTest.hxx>
 #include <DBRep.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <BRep_Tool.hxx>
 
 #include <BRepLib.hxx>
 #include <BRep_Builder.hxx>
-#include <GeomPlate_BuildPlateSurface.hxx>
-#include <GeomPlate_BuildAveragePlane.hxx>
 #include <GeomPlate_Surface.hxx>
-#include <GeomPlate_BuildAveragePlane.hxx>
-#include <GeomPlate_HArray1OfHCurve.hxx>
 
 #include <GeomPlate_MakeApprox.hxx>
 #include <GeomPlate_PlateG0Criterion.hxx>
 #include <GeomPlate_PlateG1Criterion.hxx>
 #include <BRepFill_CurveConstraint.hxx>
-#include <GeomPlate_PointConstraint.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <Geom_Surface.hxx>
 
 #include <TopoDS_Wire.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_WireError.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <TColGeom2d_HArray1OfCurve.hxx>
 
 #include <AdvApp2Var_ApproxAFunc2Var.hxx>
-#include <AdvApp2Var_Context.hxx>
-#include <AdvApprox_PrefCutting.hxx>
-#include <AdvApprox_Cutting.hxx>
-#include <AdvApprox_DichoCutting.hxx>
 
 #include <Geom_BSplineSurface.hxx>
 
-#include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray2OfReal.hxx>
-
 #include <TColgp_SequenceOfXY.hxx>
 #include <TColgp_SequenceOfXYZ.hxx>
 
 #include <BRepAdaptor_Curve.hxx>
-#include <Adaptor3d_IsoCurve.hxx>
 
-#include <Extrema_ExtPS.hxx>
-#include <Extrema_POnSurf.hxx>
-#include <Geom_Plane.hxx>
 #include <BRepOffsetAPI_MakeFilling.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
-#include <GeomConvert_ApproxSurface.hxx>
 
 #include <BRepTest_Objects.hxx>
 
diff --git a/src/BRepTest/BRepTest_GPropCommands.cxx b/src/BRepTest/BRepTest_GPropCommands.cxx
index 90c28f5308..7c9817b60c 100644
--- a/src/BRepTest/BRepTest_GPropCommands.cxx
+++ b/src/BRepTest/BRepTest_GPropCommands.cxx
@@ -22,16 +22,9 @@
 #include <BRepGProp.hxx>
 #include <TopoDS_Shape.hxx>
 #include <GProp_PrincipalProps.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Ax3.hxx>
 
 #include <Draw_Axis3D.hxx>
 #include <Precision.hxx>
-#include <OSD_Chronometer.hxx>
-#include <Geom_Surface.hxx>
-#include <DrawTrSurf.hxx>
-#include <Geom_Plane.hxx>
-#include <gp_Pln.hxx>
 
 #ifdef _WIN32
 Standard_IMPORT Draw_Viewer dout;
diff --git a/src/BRepTest/BRepTest_HistoryCommands.cxx b/src/BRepTest/BRepTest_HistoryCommands.cxx
index ab1e401e9b..3006fefc94 100644
--- a/src/BRepTest/BRepTest_HistoryCommands.cxx
+++ b/src/BRepTest/BRepTest_HistoryCommands.cxx
@@ -24,7 +24,6 @@
 #include <DBRep.hxx>
 
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 
 static Standard_Integer SetFillHistory(Draw_Interpretor&, Standard_Integer, const char**);
 static Standard_Integer SaveHistory   (Draw_Interpretor&, Standard_Integer, const char**);
diff --git a/src/BRepTest/BRepTest_MatCommands.cxx b/src/BRepTest/BRepTest_MatCommands.cxx
index 7a4d8c14ae..04255f2aff 100644
--- a/src/BRepTest/BRepTest_MatCommands.cxx
+++ b/src/BRepTest/BRepTest_MatCommands.cxx
@@ -17,7 +17,6 @@
 #include <BRepTest.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
-#include <DrawTrSurf.hxx>
 #include <DrawTrSurf_Curve2d.hxx>
 
 #include <Geom2d_Line.hxx>
@@ -30,14 +29,10 @@
 #include <MAT_Bisector.hxx>
 #include <MAT_Zone.hxx>
 #include <MAT_Graph.hxx>
-#include <MAT_Arc.hxx>
 #include <MAT_BasicElt.hxx>
-#include <MAT_Node.hxx>
 #include <MAT_Side.hxx>
 
-#include <Bisector_Bisec.hxx>
 #include <Bisector_BisecAna.hxx>
-#include <Bisector_Curve.hxx>
 #include <Precision.hxx>
 
 #include <BRepMAT2d_Explorer.hxx>
diff --git a/src/BRepTest/BRepTest_OtherCommands.cxx b/src/BRepTest/BRepTest_OtherCommands.cxx
index 17d5d26ffd..a6e860adee 100644
--- a/src/BRepTest/BRepTest_OtherCommands.cxx
+++ b/src/BRepTest/BRepTest_OtherCommands.cxx
@@ -25,47 +25,26 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <Standard_ErrorHandler.hxx>
 #include <Precision.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Ax1.hxx>
 
 #include <ElCLib.hxx>
 
 #include <TColgp_SequenceOfPnt.hxx>
 
-#include <GeomAbs_JoinType.hxx>
-#include <Geom_Line.hxx>
-
 #include <IntCurvesFace_Intersector.hxx>
 
-#include <TopAbs.hxx>
 #include <TopAbs_Orientation.hxx>
 
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_CompSolid.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Shell.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Iterator.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 
-#include <TopExp_Explorer.hxx>
-
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-
 #include <LocOpe_CSIntersector.hxx>
 #include <LocOpe_SequenceOfLin.hxx>
 #include <LocOpe_PntFace.hxx>
diff --git a/src/BRepTest/BRepTest_PrimitiveCommands.cxx b/src/BRepTest/BRepTest_PrimitiveCommands.cxx
index 3ad36cedf7..3ca7233d23 100644
--- a/src/BRepTest/BRepTest_PrimitiveCommands.cxx
+++ b/src/BRepTest/BRepTest_PrimitiveCommands.cxx
@@ -19,15 +19,12 @@
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 #include <DrawTrSurf.hxx>
-#include <TopoDS_Solid.hxx>
-#include <BRep_Builder.hxx>
 #include <BRepBuilderAPI.hxx>
 #include <BRepPreviewAPI_MakeBox.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepPrimAPI_MakeWedge.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRepPrimAPI_MakeCone.hxx>
-#include <BRepPrimAPI_MakeSphere.hxx>
 #include <BRepPrimAPI_MakeTorus.hxx>
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <Geom_Plane.hxx>
diff --git a/src/BRepTest/BRepTest_ProjectionCommands.cxx b/src/BRepTest/BRepTest_ProjectionCommands.cxx
index 72a83082be..ff20ac9977 100644
--- a/src/BRepTest/BRepTest_ProjectionCommands.cxx
+++ b/src/BRepTest/BRepTest_ProjectionCommands.cxx
@@ -14,17 +14,11 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <GeometryTest.hxx>
-#include <DrawTrSurf.hxx>
 #include <Draw_Appli.hxx>
-#include <TopoDS_Shape.hxx>
 #include <DBRep.hxx>
 #include <Draw_Interpretor.hxx>
 #include <BRepProj_Projection.hxx>
-#include <TopExp_Explorer.hxx>
 #include <BRepTest.hxx>
-#include <TopoDS.hxx>
-#include <stdio.h>
 
 //=======================================================================
 //function : prj
diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx
index 82eb8550ad..1ef3fd00da 100644
--- a/src/BRepTest/BRepTest_SurfaceCommands.cxx
+++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx
@@ -23,27 +23,21 @@
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
 
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
 #include <BRepTools_Quilt.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeShell.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
 #include <BRepOffsetAPI_FindContigousEdges.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <Precision.hxx>
 #include <Draw_ProgressIndicator.hxx>
-#include <NCollection_Vector.hxx>
 #include <BRepBuilderAPI_FastSewing.hxx>
 
 #include <GeomAPI_ProjectPointOnSurf.hxx>
@@ -51,7 +45,6 @@
 
 #ifdef _WIN32
 //#define strcasecmp strcmp Already defined
-#include <stdio.h>
 #endif
 
 //-----------------------------------------------------------------------
diff --git a/src/BRepTest/BRepTest_SweepCommands.cxx b/src/BRepTest/BRepTest_SweepCommands.cxx
index 3cf1503ee1..40c0f6f119 100644
--- a/src/BRepTest/BRepTest_SweepCommands.cxx
+++ b/src/BRepTest/BRepTest_SweepCommands.cxx
@@ -23,7 +23,6 @@
 #include <Draw_Appli.hxx>
 
 #include <BRepFill.hxx>
-#include <BRepBuilderAPI_PipeError.hxx>
 #include <BRepFill_Generator.hxx>
 #include <BRepPrimAPI_MakePrism.hxx>
 #include <BRepPrimAPI_MakeRevol.hxx>
@@ -35,13 +34,11 @@
 
 #include <BRepLib_MakeWire.hxx>
 #include <TopoDS.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopExp_Explorer.hxx>
 
 #include <Precision.hxx>
 #include <Law_Interpol.hxx>
 #include <gp_Ax1.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Pnt2d.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 
diff --git a/src/BRepTest/BRepTest_TopologyCommands.cxx b/src/BRepTest/BRepTest_TopologyCommands.cxx
index 6dd9c0c4b7..22e895fee6 100644
--- a/src/BRepTest/BRepTest_TopologyCommands.cxx
+++ b/src/BRepTest/BRepTest_TopologyCommands.cxx
@@ -17,31 +17,16 @@
 #include <BRepTest.hxx>
 #include <DBRep.hxx>
 #include <Draw_Interpretor.hxx>
-#include <DrawTrSurf.hxx>
-#include <Geom_Plane.hxx>
 #include <Draw_Appli.hxx>
-#include <BRep_Builder.hxx>
 
-#include <BRepFilletAPI_MakeFillet.hxx>
-#include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepPrimAPI_MakeHalfSpace.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
-#include <BRepExtrema_ExtPF.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <gp.hxx>
-#include <gp_Pln.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopExp.hxx>
 
 static Standard_Integer halfspace(Draw_Interpretor& di,
-				  Standard_Integer n, const char** a)
+                                  Standard_Integer n, const char** a)
 {
   if (n < 6) return 1;
 
diff --git a/src/BRepToIGES/BRepToIGES_BREntity.cxx b/src/BRepToIGES/BRepToIGES_BREntity.cxx
index 37d1cba74c..2487684fa8 100644
--- a/src/BRepToIGES/BRepToIGES_BREntity.cxx
+++ b/src/BRepToIGES/BRepToIGES_BREntity.cxx
@@ -22,14 +22,11 @@
 #include <BRepToIGES_BRShell.hxx>
 #include <BRepToIGES_BRSolid.hxx>
 #include <BRepToIGES_BRWire.hxx>
-#include <Geom_Geometry.hxx>
-#include <gp_Trsf.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <IGESData_IGESModel.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_Static.hxx>
 #include <Standard_Transient.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_CompSolid.hxx>
@@ -43,7 +40,6 @@
 #include <Transfer_FinderProcess.hxx>
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_TransientMapper.hxx>
-#include <TransferBRep_OrientedShapeMapper.hxx>
 #include <TransferBRep_ShapeMapper.hxx>
 
 //#include <ShapeCustom.hxx>
diff --git a/src/BRepToIGES/BRepToIGES_BREntity.hxx b/src/BRepToIGES/BRepToIGES_BREntity.hxx
index 86ef7f881e..18247ccf67 100644
--- a/src/BRepToIGES/BRepToIGES_BREntity.hxx
+++ b/src/BRepToIGES/BRepToIGES_BREntity.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 #include <Message_ProgressRange.hxx>
 
diff --git a/src/BRepToIGES/BRepToIGES_BRShell.cxx b/src/BRepToIGES/BRepToIGES_BRShell.cxx
index 34e5f6dce5..be1a0a0623 100644
--- a/src/BRepToIGES/BRepToIGES_BRShell.cxx
+++ b/src/BRepToIGES/BRepToIGES_BRShell.cxx
@@ -20,7 +20,6 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
-#include <BRepToIGES_BREntity.hxx>
 #include <BRepToIGES_BRShell.hxx>
 #include <BRepToIGES_BRWire.hxx>
 #include <BRepTools.hxx>
@@ -29,19 +28,12 @@
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_ToroidalSurface.hxx>
 #include <GeomToIGES_GeomSurface.hxx>
-#include <gp.hxx>
 #include <gp_Trsf.hxx>
 #include <IGESBasic_Group.hxx>
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
-#include <IGESGeom_CurveOnSurface.hxx>
-#include <IGESGeom_HArray1OfCurveOnSurface.hxx>
-#include <IGESGeom_SurfaceOfRevolution.hxx>
 #include <IGESGeom_TrimmedSurface.hxx>
 #include <Interface_Macros.hxx>
 #include <Message_ProgressScope.hxx>
@@ -51,7 +43,6 @@
 #include <ShapeAlgo_AlgoContainer.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
@@ -59,7 +50,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 #include <Transfer_FinderProcess.hxx>
diff --git a/src/BRepToIGES/BRepToIGES_BRSolid.cxx b/src/BRepToIGES/BRepToIGES_BRSolid.cxx
index 21ababf37b..16f6ff6328 100644
--- a/src/BRepToIGES/BRepToIGES_BRSolid.cxx
+++ b/src/BRepToIGES/BRepToIGES_BRSolid.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRep_Tool.hxx>
-#include <BRepToIGES_BREntity.hxx>
 #include <BRepToIGES_BRShell.hxx>
 #include <BRepToIGES_BRSolid.hxx>
 #include <BRepToIGES_BRWire.hxx>
diff --git a/src/BRepToIGES/BRepToIGES_BRWire.cxx b/src/BRepToIGES/BRepToIGES_BRWire.cxx
index 6db3258f44..91be5308af 100644
--- a/src/BRepToIGES/BRepToIGES_BRWire.cxx
+++ b/src/BRepToIGES/BRepToIGES_BRWire.cxx
@@ -19,14 +19,12 @@
 //S4181 pdn implementing of writing IGES elementary surfaces.
 
 #include <BRep_Tool.hxx>
-#include <BRepToIGES_BREntity.hxx>
 #include <BRepToIGES_BRWire.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2dToIGES_Geom2dCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
@@ -46,26 +44,19 @@
 #include <gp.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Dir2d.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Trsf2d.hxx>
-#include <IGESData_HArray1OfIGESEntity.hxx>
-#include <IGESData_IGESEntity.hxx>
-#include <IGESData_IGESModel.hxx>
 #include <IGESGeom_CompositeCurve.hxx>
 #include <IGESGeom_Point.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Static.hxx>
 #include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeBuild_Edge.hxx>
-#include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepToIGES/BRepToIGES_BRWire.hxx b/src/BRepToIGES/BRepToIGES_BRWire.hxx
index 600ec0369f..6994a8ad8b 100644
--- a/src/BRepToIGES/BRepToIGES_BRWire.hxx
+++ b/src/BRepToIGES/BRepToIGES_BRWire.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <BRepToIGES_BREntity.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 
 class IGESData_IGESEntity;
diff --git a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cxx b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cxx
index d1e166b633..19264ed464 100644
--- a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cxx
+++ b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cxx
@@ -29,49 +29,18 @@
 #include <BRepToIGESBRep_Entity.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2dToIGES_Geom2dCurve.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_Parabola.hxx>
-#include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomToIGES_GeomCurve.hxx>
 #include <GeomToIGES_GeomSurface.hxx>
-#include <gp.hxx>
-#include <gp_Circ2d.hxx>
-#include <gp_Elips2d.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Trsf2d.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESBasic_Group.hxx>
 #include <IGESBasic_HArray1OfHArray1OfIGESEntity.hxx>
 #include <IGESBasic_HArray1OfHArray1OfInteger.hxx>
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
-#include <IGESData_IGESModel.hxx>
-#include <IGESGeom_CompositeCurve.hxx>
-#include <IGESGeom_Point.hxx>
 #include <IGESSolid_EdgeList.hxx>
-#include <IGESSolid_Face.hxx>
-#include <IGESSolid_HArray1OfFace.hxx>
-#include <IGESSolid_HArray1OfLoop.hxx>
-#include <IGESSolid_HArray1OfShell.hxx>
 #include <IGESSolid_HArray1OfVertexList.hxx>
 #include <IGESSolid_Loop.hxx>
 #include <IGESSolid_ManifoldSolid.hxx>
@@ -90,7 +59,6 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_CompSolid.hxx>
@@ -102,10 +70,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <Transfer_FinderProcess.hxx>
-#include <Transfer_SimpleBinderOfTransient.hxx>
-#include <Transfer_TransientMapper.hxx>
-#include <TransferBRep_OrientedShapeMapper.hxx>
-#include <TransferBRep_ShapeMapper.hxx>
 
 //#include <GeomConvert.hxx>
 //#include <Geom2dConvert.hxx>
diff --git a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.hxx b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.hxx
index 248eebaff1..60332515c3 100644
--- a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.hxx
+++ b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.hxx
@@ -25,7 +25,6 @@
 #include <TColStd_IndexedMapOfTransient.hxx>
 #include <BRepToIGES_BREntity.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Message_ProgressRange.hxx>
 
 class IGESSolid_EdgeList;
diff --git a/src/BRepTools/BRepTools.cxx b/src/BRepTools/BRepTools.cxx
index 90ea3e49a5..37b11db375 100644
--- a/src/BRepTools/BRepTools.cxx
+++ b/src/BRepTools/BRepTools.cxx
@@ -19,16 +19,10 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Bnd_Box2d.hxx>
 #include <BndLib_Add2dCurve.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepTools_MapOfVertexPnt2d.hxx>
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <ElCLib.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
@@ -36,38 +30,27 @@
 #include <Geom_Curve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <gp_Lin2d.hxx>
-#include <gp_Vec2d.hxx>
 #include <Message.hxx>
 #include <OSD_FileSystem.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Precision.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Stream.hxx>
-#include <TColGeom2d_SequenceOfCurve.hxx>
-#include <TColgp_SequenceOfPnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_MapOfTransient.hxx>
-#include <TColStd_SequenceOfReal.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_CompSolid.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_SequenceOfShape.hxx>
 #include <GeomLib_CheckCurveOnSurface.hxx>
 #include <errno.h>
-#include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_Modifier.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
diff --git a/src/BRepTools/BRepTools.hxx b/src/BRepTools/BRepTools.hxx
index d187da66d5..aad8edf62c 100644
--- a/src/BRepTools/BRepTools.hxx
+++ b/src/BRepTools/BRepTools.hxx
@@ -23,11 +23,9 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_IStream.hxx>
-#include <Standard_CString.hxx>
 #include <Message_ProgressRange.hxx>
 #include <TopTools_ListOfShape.hxx>
 
diff --git a/src/BRepTools/BRepTools_GTrsfModification.cxx b/src/BRepTools/BRepTools_GTrsfModification.cxx
index 9123e8fe5d..dfb116dc88 100644
--- a/src/BRepTools/BRepTools_GTrsfModification.cxx
+++ b/src/BRepTools/BRepTools_GTrsfModification.cxx
@@ -24,21 +24,14 @@
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomLib.hxx>
-#include <gp.hxx>
 #include <gp_GTrsf.hxx>
-#include <gp_GTrsf2d.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_TrsfForm.hxx>
 #include <gp_XYZ.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_Type.hxx>
-#include <TopAbs.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/BRepTools/BRepTools_GTrsfModification.hxx b/src/BRepTools/BRepTools_GTrsfModification.hxx
index b096fb428b..20c9ca7f72 100644
--- a/src/BRepTools/BRepTools_GTrsfModification.hxx
+++ b/src/BRepTools/BRepTools_GTrsfModification.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <gp_GTrsf.hxx>
-#include <Standard_Real.hxx>
 #include <BRepTools_Modification.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/BRepTools/BRepTools_MapOfVertexPnt2d.hxx b/src/BRepTools/BRepTools_MapOfVertexPnt2d.hxx
index 3a507c68b6..d622b4c016 100644
--- a/src/BRepTools/BRepTools_MapOfVertexPnt2d.hxx
+++ b/src/BRepTools/BRepTools_MapOfVertexPnt2d.hxx
@@ -17,7 +17,6 @@
 #ifndef BRepTools_MapOfVertexPnt2d_HeaderFile
 #define BRepTools_MapOfVertexPnt2d_HeaderFile
 
-#include <TopoDS_Shape.hxx>
 #include <TColgp_SequenceOfPnt2d.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 #include <NCollection_DataMap.hxx>
diff --git a/src/BRepTools/BRepTools_Modification.hxx b/src/BRepTools/BRepTools_Modification.hxx
index f2df46efb7..dd198429b9 100644
--- a/src/BRepTools/BRepTools_Modification.hxx
+++ b/src/BRepTools/BRepTools_Modification.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
diff --git a/src/BRepTools/BRepTools_Modifier.cxx b/src/BRepTools/BRepTools_Modifier.cxx
index f4cf6f39c2..df686dd4cc 100644
--- a/src/BRepTools/BRepTools_Modifier.cxx
+++ b/src/BRepTools/BRepTools_Modifier.cxx
@@ -18,9 +18,6 @@
 
 #include <BRepTools_Modification.hxx>
 #include <BRepTools_Modifier.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_NullObject.hxx>
-#include <TColStd_ListIteratorOfListOfTransient.hxx>
 #include <TColStd_ListOfTransient.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Edge.hxx>
@@ -30,7 +27,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 #if 0
@@ -51,7 +47,6 @@
 #include <gp.hxx>
 
 #include <Standard_NullObject.hxx>
-#include <gp_Trsf.hxx>
 #include <BRepTools_TrsfModification.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Geom_Surface.hxx>
diff --git a/src/BRepTools/BRepTools_Modifier.hxx b/src/BRepTools/BRepTools_Modifier.hxx
index 021cd4f6b2..6c99ac0c12 100644
--- a/src/BRepTools/BRepTools_Modifier.hxx
+++ b/src/BRepTools/BRepTools_Modifier.hxx
@@ -26,8 +26,6 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <Standard_Boolean.hxx>
 
 #include <NCollection_DataMap.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.cxx b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
index f3941f0174..fff0a4d6b8 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
@@ -16,30 +16,20 @@
 
 #include <BRepTools_NurbsConvertModification.hxx>
 
-#include <Approx_SameParameter.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
-#include <BSplCLib.hxx>
 #include <ElSLib.hxx>
 #include <Extrema_LocateExtPC.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dConvert.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
@@ -49,20 +39,13 @@
 #include <GeomConvert.hxx>
 #include <gp_GTrsf2d.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_TrsfForm.hxx>
 #include <ProjLib_ComputeApprox.hxx>
 #include <ProjLib_ComputeApproxOnPolarSurface.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListIteratorOfListOfTransient.hxx>
-#include <TopAbs.hxx>
 #include <TopLoc_Location.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRep_Builder.hxx>
 IMPLEMENT_STANDARD_RTTIEXT(BRepTools_NurbsConvertModification,BRepTools_Modification)
 
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.hxx b/src/BRepTools/BRepTools_NurbsConvertModification.hxx
index 8e79209702..8bed3a7ae5 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.hxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.hxx
@@ -18,13 +18,11 @@
 #define _BRepTools_NurbsConvertModification_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopTools_ListOfShape.hxx>
 #include <TColStd_ListOfTransient.hxx>
 #include <TColStd_IndexedDataMapOfTransientTransient.hxx>
 #include <BRepTools_Modification.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
diff --git a/src/BRepTools/BRepTools_PurgeLocations.cxx b/src/BRepTools/BRepTools_PurgeLocations.cxx
index 1bc807ac29..c7359b73eb 100644
--- a/src/BRepTools/BRepTools_PurgeLocations.cxx
+++ b/src/BRepTools/BRepTools_PurgeLocations.cxx
@@ -15,7 +15,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <NCollection_Vector.hxx>
 #include <BRepTools.hxx>
-#include <StdFail_NotDone.hxx>
 #include <BRepTools_TrsfModification.hxx>
 #include <BRepTools_Modifier.hxx>
 #include <TopLoc_Datum3D.hxx>
diff --git a/src/BRepTools/BRepTools_PurgeLocations.hxx b/src/BRepTools/BRepTools_PurgeLocations.hxx
index f25186a233..cdcb562ce6 100644
--- a/src/BRepTools/BRepTools_PurgeLocations.hxx
+++ b/src/BRepTools/BRepTools_PurgeLocations.hxx
@@ -15,7 +15,6 @@
 #define _BRepTools_PurgeLocations_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 #include <BRepTools_ReShape.hxx>
 #include <TopTools_LocationSet.hxx>
diff --git a/src/BRepTools/BRepTools_Quilt.cxx b/src/BRepTools/BRepTools_Quilt.cxx
index f31c864840..d36202ab25 100644
--- a/src/BRepTools/BRepTools_Quilt.cxx
+++ b/src/BRepTools/BRepTools_Quilt.cxx
@@ -30,11 +30,8 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
diff --git a/src/BRepTools/BRepTools_Quilt.hxx b/src/BRepTools/BRepTools_Quilt.hxx
index f12c7087eb..6e82d35c2e 100644
--- a/src/BRepTools/BRepTools_Quilt.hxx
+++ b/src/BRepTools/BRepTools_Quilt.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Edge;
 class TopoDS_Vertex;
 class TopoDS_Shape;
diff --git a/src/BRepTools/BRepTools_ReShape.cxx b/src/BRepTools/BRepTools_ReShape.cxx
index 63c00a0331..7b282a9850 100644
--- a/src/BRepTools/BRepTools_ReShape.cxx
+++ b/src/BRepTools/BRepTools_ReShape.cxx
@@ -17,24 +17,17 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools_ReShape.hxx>
 #include <Geom_Surface.hxx>
 #include <NCollection_IndexedMap.hxx>
 #include <Standard_Type.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_Shape.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(BRepTools_ReShape,Standard_Transient)
 
diff --git a/src/BRepTools/BRepTools_ReShape.hxx b/src/BRepTools/BRepTools_ReShape.hxx
index 9109072fdf..8a2be07ff6 100644
--- a/src/BRepTools/BRepTools_ReShape.hxx
+++ b/src/BRepTools/BRepTools_ReShape.hxx
@@ -22,7 +22,6 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 
diff --git a/src/BRepTools/BRepTools_ShapeSet.cxx b/src/BRepTools/BRepTools_ShapeSet.cxx
index 3d3026b56b..4473b78cad 100644
--- a/src/BRepTools/BRepTools_ShapeSet.cxx
+++ b/src/BRepTools/BRepTools_ShapeSet.cxx
@@ -21,16 +21,11 @@
 #include <BRep_CurveOnSurface.hxx>
 #include <BRep_CurveRepresentation.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_ListIteratorOfListOfPointRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_PointOnCurve.hxx>
 #include <BRep_PointOnCurveOnSurface.hxx>
 #include <BRep_PointOnSurface.hxx>
 #include <BRep_Polygon3D.hxx>
-#include <BRep_PolygonOnClosedSurface.hxx>
-#include <BRep_PolygonOnClosedTriangulation.hxx>
-#include <BRep_PolygonOnSurface.hxx>
 #include <BRep_PolygonOnTriangulation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_TFace.hxx>
@@ -40,15 +35,10 @@
 #include <BRepTools_ShapeSet.hxx>
 #include <GeomTools.hxx>
 #include <Message_ProgressScope.hxx>
-#include <Poly.hxx>
-#include <Poly_Polygon2D.hxx>
 #include <Poly_Polygon3D.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
-#include <Precision.hxx>
 #include <Standard_Stream.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepTools/BRepTools_ShapeSet.hxx b/src/BRepTools/BRepTools_ShapeSet.hxx
index 8fc31e52d1..444f0e4ed3 100644
--- a/src/BRepTools/BRepTools_ShapeSet.hxx
+++ b/src/BRepTools/BRepTools_ShapeSet.hxx
@@ -26,7 +26,6 @@
 #include <GeomTools_CurveSet.hxx>
 #include <GeomTools_Curve2dSet.hxx>
 #include <TColStd_IndexedMapOfTransient.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ShapeSet.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_IStream.hxx>
diff --git a/src/BRepTools/BRepTools_Substitution.cxx b/src/BRepTools/BRepTools_Substitution.cxx
index a7e1c34fde..0ee437456f 100644
--- a/src/BRepTools/BRepTools_Substitution.cxx
+++ b/src/BRepTools/BRepTools_Substitution.cxx
@@ -24,7 +24,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 //=======================================================================
 //function : BRepTools_Substitution
diff --git a/src/BRepTools/BRepTools_Substitution.hxx b/src/BRepTools/BRepTools_Substitution.hxx
index 6421529eac..00463bb522 100644
--- a/src/BRepTools/BRepTools_Substitution.hxx
+++ b/src/BRepTools/BRepTools_Substitution.hxx
@@ -19,11 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Shape;
 
 
diff --git a/src/BRepTools/BRepTools_TrsfModification.cxx b/src/BRepTools/BRepTools_TrsfModification.cxx
index 6bc92499cd..acf1d6773f 100644
--- a/src/BRepTools/BRepTools_TrsfModification.cxx
+++ b/src/BRepTools/BRepTools_TrsfModification.cxx
@@ -20,19 +20,15 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomLib.hxx>
-#include <gp.hxx>
 #include <gp_GTrsf2d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_TrsfForm.hxx>
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BRepTools/BRepTools_TrsfModification.hxx b/src/BRepTools/BRepTools_TrsfModification.hxx
index 5675146b85..f0df27766b 100644
--- a/src/BRepTools/BRepTools_TrsfModification.hxx
+++ b/src/BRepTools/BRepTools_TrsfModification.hxx
@@ -22,8 +22,6 @@
 
 #include <gp_Trsf.hxx>
 #include <BRepTools_Modification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/BRepTools/BRepTools_WireExplorer.cxx b/src/BRepTools/BRepTools_WireExplorer.cxx
index be98890d39..0cd69bc486 100644
--- a/src/BRepTools/BRepTools_WireExplorer.cxx
+++ b/src/BRepTools/BRepTools_WireExplorer.cxx
@@ -24,8 +24,6 @@
 #include <GeomAdaptor_Surface.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoMoreObject.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -35,10 +33,7 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
diff --git a/src/BRepTools/BRepTools_WireExplorer.hxx b/src/BRepTools/BRepTools_WireExplorer.hxx
index 09fb0e9d82..0800a002bd 100644
--- a/src/BRepTools/BRepTools_WireExplorer.hxx
+++ b/src/BRepTools/BRepTools_WireExplorer.hxx
@@ -19,15 +19,12 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TopAbs_Orientation.hxx>
 class TopoDS_Wire;
 
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.hxx b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.hxx
index 0288f53b3f..0c34b28e9e 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.hxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <BRepTopAdaptor_SeqOfPtr.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
-#include <Standard_Real.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopAbs_State.hxx>
-#include <Standard_Boolean.hxx>
 class gp_Pnt2d;
 
 
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
index 01260ed326..d8da86887a 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
@@ -13,8 +13,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_HVertex.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
index 82e8acba3c..3f71994b3a 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
@@ -17,14 +17,12 @@
 #ifndef _BRepTopAdaptor_HVertex_HeaderFile
 #define _BRepTopAdaptor_HVertex_HeaderFile
 
+#include <Adaptor3d_HVertex.hxx>
+#include <BRepAdaptor_Curve2d.hxx>
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
-
-#include <TopoDS_Vertex.hxx>
-#include <Adaptor3d_HVertex.hxx>
-#include <Standard_Real.hxx>
 #include <TopAbs_Orientation.hxx>
-#include <Standard_Boolean.hxx>
+#include <TopoDS_Vertex.hxx>
 
 class gp_Pnt2d;
 
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
index f4001581a2..8be3506a8f 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
@@ -14,13 +14,8 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_HVertex.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <BRepClass_FaceClassifier.hxx>
-#include <BRepClass_FaceExplorer.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <BRepTopAdaptor_HVertex.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
index 1708c09567..f5f17b1847 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
@@ -22,7 +22,6 @@
 #include <BRepAdaptor_Curve2d.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Face.hxx>
-#include <TColStd_ListOfTransient.hxx>
 #include <TColStd_ListIteratorOfListOfTransient.hxx>
 #include <Adaptor3d_TopolTool.hxx>
 #include <TopAbs_State.hxx>
diff --git a/src/BSplCLib/BSplCLib.cxx b/src/BSplCLib/BSplCLib.cxx
index ed00af0c4c..cae229290b 100644
--- a/src/BSplCLib/BSplCLib.cxx
+++ b/src/BSplCLib/BSplCLib.cxx
@@ -30,9 +30,6 @@
 #include <BSplCLib.hxx>
 #include <ElCLib.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
 #include <math_Matrix.hxx>
 #include <NCollection_LocalArray.hxx>
 #include <PLib.hxx>
diff --git a/src/BSplCLib/BSplCLib.hxx b/src/BSplCLib/BSplCLib.hxx
index e1e8c9d5fd..92efed9613 100644
--- a/src/BSplCLib/BSplCLib.hxx
+++ b/src/BSplCLib/BSplCLib.hxx
@@ -17,24 +17,22 @@
 #ifndef _BSplCLib_HeaderFile
 #define _BSplCLib_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <TColStd_Array1OfReal.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <Standard_Boolean.hxx>
+#include <BSplCLib_EvaluatorFunction.hxx>
 #include <BSplCLib_KnotDistribution.hxx>
 #include <BSplCLib_MultDistribution.hxx>
 #include <GeomAbs_BSplKnotDistribution.hxx>
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <BSplCLib_EvaluatorFunction.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfReal.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+
 class gp_Pnt;
 class gp_Pnt2d;
 class gp_Vec;
diff --git a/src/BSplCLib/BSplCLib_Cache.cxx b/src/BSplCLib/BSplCLib_Cache.cxx
index 2075211c4e..9cde739a15 100644
--- a/src/BSplCLib/BSplCLib_Cache.cxx
+++ b/src/BSplCLib/BSplCLib_Cache.cxx
@@ -18,7 +18,6 @@
 
 #include <TColgp_HArray1OfPnt.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
 
diff --git a/src/BSplCLib/BSplCLib_Cache.hxx b/src/BSplCLib/BSplCLib_Cache.hxx
index a4bfd46abb..e203b8368a 100644
--- a/src/BSplCLib/BSplCLib_Cache.hxx
+++ b/src/BSplCLib/BSplCLib_Cache.hxx
@@ -14,23 +14,8 @@
 #ifndef _BSplCLib_Cache_Headerfile
 #define _BSplCLib_Cache_Headerfile
 
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_Transient.hxx>
-
-#include <gp_Pnt2d.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec2d.hxx>
-#include <gp_Vec.hxx>
-
-#include <TColStd_HArray2OfReal.hxx>
-#include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-
 #include <BSplCLib_CacheParams.hxx>
+#include <TColStd_HArray2OfReal.hxx>
 
 //! \brief A cache class for Bezier and B-spline curves.
 //!
diff --git a/src/BSplCLib/BSplCLib_CacheParams.hxx b/src/BSplCLib/BSplCLib_CacheParams.hxx
index a25094b251..91e4776981 100644
--- a/src/BSplCLib/BSplCLib_CacheParams.hxx
+++ b/src/BSplCLib/BSplCLib_CacheParams.hxx
@@ -14,9 +14,6 @@
 #ifndef _BSplCLib_CacheParams_Headerfile
 #define _BSplCLib_CacheParams_Headerfile
 
-#include <Standard_Real.hxx>
-#include <TColStd_Array1OfReal.hxx>
-
 #include <BSplCLib.hxx>
 
 //! Simple structure containing parameters describing parameterization
diff --git a/src/BSplSLib/BSplSLib.hxx b/src/BSplSLib/BSplSLib.hxx
index 30c1836088..104a02134d 100644
--- a/src/BSplSLib/BSplSLib.hxx
+++ b/src/BSplSLib/BSplSLib.hxx
@@ -17,23 +17,18 @@
 #ifndef _BSplSLib_HeaderFile
 #define _BSplSLib_HeaderFile
 
+#include <BSplSLib_EvaluatorFunction.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <TColStd_Array2OfReal.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <BSplSLib_EvaluatorFunction.hxx>
+#include <TColgp_Array2OfPnt.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TColStd_Array2OfReal.hxx>
+
 class gp_Pnt;
 class gp_Vec;
 
-
 //! BSplSLib   B-spline surface Library
 //! This  package provides   an  implementation  of  geometric
 //! functions for rational and non rational, periodic  and non
diff --git a/src/BSplSLib/BSplSLib_Cache.cxx b/src/BSplSLib/BSplSLib_Cache.cxx
index 7ccce9adee..4849d95c15 100644
--- a/src/BSplSLib/BSplSLib_Cache.cxx
+++ b/src/BSplSLib/BSplSLib_Cache.cxx
@@ -17,8 +17,6 @@
 #include <NCollection_LocalArray.hxx>
 
 #include <TColgp_HArray2OfPnt.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
 
diff --git a/src/BSplSLib/BSplSLib_Cache.hxx b/src/BSplSLib/BSplSLib_Cache.hxx
index 965ba6e8bc..f2ba99424c 100644
--- a/src/BSplSLib/BSplSLib_Cache.hxx
+++ b/src/BSplSLib/BSplSLib_Cache.hxx
@@ -14,19 +14,7 @@
 #ifndef _BSplSLib_Cache_Headerfile
 #define _BSplSLib_Cache_Headerfile
 
-#include <Standard.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_Transient.hxx>
-
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-
-#include <TColgp_Array2OfPnt.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfReal.hxx>
 
 #include <BSplCLib_CacheParams.hxx>
diff --git a/src/BSplSLib/BSplSLib_EvaluatorFunction.hxx b/src/BSplSLib/BSplSLib_EvaluatorFunction.hxx
index d2f4ffed79..7b3cb057dd 100644
--- a/src/BSplSLib/BSplSLib_EvaluatorFunction.hxx
+++ b/src/BSplSLib/BSplSLib_EvaluatorFunction.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _Standard_PrimitiveTypes_HeaderFile
-#include <Standard_PrimitiveTypes.hxx>
 #endif
 
 // History - C function pointer converted to a virtual class
diff --git a/src/BVH/BVH.cxx b/src/BVH/BVH.cxx
index 105f71f5b5..52b9e540da 100644
--- a/src/BVH/BVH.cxx
+++ b/src/BVH/BVH.cxx
@@ -13,18 +13,12 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <BVH_Geometry.hxx>
-#include <BVH_QuickSorter.hxx>
-#include <BVH_RadixSorter.hxx>
-#include <BVH_Triangulation.hxx>
 #include <BVH_DistanceField.hxx>
 #include <BVH_LinearBuilder.hxx>
 #include <BVH_BinnedBuilder.hxx>
 #include <BVH_SweepPlaneBuilder.hxx>
 #include <BVH_SpatialMedianBuilder.hxx>
 
-#include <Standard_Real.hxx>
-
 IMPLEMENT_STANDARD_RTTIEXT(BVH_BuilderTransient,  Standard_Transient)
 IMPLEMENT_STANDARD_RTTIEXT(BVH_TreeBaseTransient, Standard_Transient)
 IMPLEMENT_STANDARD_RTTIEXT(BVH_ObjectTransient,   Standard_Transient)
diff --git a/src/Blend/Blend_FuncInv.hxx b/src/Blend/Blend_FuncInv.hxx
index d48137bf9d..bfc7a2a7c4 100644
--- a/src/Blend/Blend_FuncInv.hxx
+++ b/src/Blend/Blend_FuncInv.hxx
@@ -17,6 +17,7 @@
 #ifndef _Blend_FuncInv_HeaderFile
 #define _Blend_FuncInv_HeaderFile
 
+#include <Adaptor2d_Curve2d.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
diff --git a/src/CDF/CDF_Application.cxx b/src/CDF/CDF_Application.cxx
index 39875d9348..410f9bb92b 100644
--- a/src/CDF/CDF_Application.cxx
+++ b/src/CDF/CDF_Application.cxx
@@ -22,7 +22,6 @@
 #include <CDM_CanCloseStatus.hxx>
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
-#include <PCDM_Reader.hxx>
 #include <PCDM_ReadWriter.hxx>
 #include <PCDM_RetrievalDriver.hxx>
 #include <PCDM_StorageDriver.hxx>
diff --git a/src/CDF/CDF_Application.hxx b/src/CDF/CDF_Application.hxx
index 9c218887bc..950b3713da 100644
--- a/src/CDF/CDF_Application.hxx
+++ b/src/CDF/CDF_Application.hxx
@@ -23,7 +23,6 @@
 #include <CDF_MetaDataDriver.hxx>
 #include <CDM_Application.hxx>
 #include <CDM_CanCloseStatus.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
 #include <Standard_IStream.hxx>
 #include <NCollection_IndexedDataMap.hxx>
 
diff --git a/src/CDF/CDF_Directory.hxx b/src/CDF/CDF_Directory.hxx
index 27f2ff84fe..5c472ee7db 100644
--- a/src/CDF/CDF_Directory.hxx
+++ b/src/CDF/CDF_Directory.hxx
@@ -18,11 +18,9 @@
 #define _CDF_Directory_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <CDM_ListOfDocument.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class CDM_Document;
 
diff --git a/src/CDF/CDF_DirectoryIterator.cxx b/src/CDF/CDF_DirectoryIterator.cxx
index a9612a83ab..ab85d7acd8 100644
--- a/src/CDF/CDF_DirectoryIterator.cxx
+++ b/src/CDF/CDF_DirectoryIterator.cxx
@@ -18,7 +18,6 @@
 #include <CDF_Directory.hxx>
 #include <CDF_DirectoryIterator.hxx>
 #include <CDM_Document.hxx>
-#include <Standard_NoSuchObject.hxx>
 
 
 CDF_DirectoryIterator::CDF_DirectoryIterator(const Handle(CDF_Directory)& aDirectory):myIterator(aDirectory->List()) {}
diff --git a/src/CDF/CDF_DirectoryIterator.hxx b/src/CDF/CDF_DirectoryIterator.hxx
index 4a163c697b..86640f4baf 100644
--- a/src/CDF/CDF_DirectoryIterator.hxx
+++ b/src/CDF/CDF_DirectoryIterator.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <CDM_ListIteratorOfListOfDocument.hxx>
-#include <Standard_Boolean.hxx>
 class CDF_Directory;
 class CDM_Document;
 
diff --git a/src/CDF/CDF_FWOSDriver.cxx b/src/CDF/CDF_FWOSDriver.cxx
index 4fd9d7ed1c..2b28131c5d 100644
--- a/src/CDF/CDF_FWOSDriver.cxx
+++ b/src/CDF/CDF_FWOSDriver.cxx
@@ -13,7 +13,6 @@
 
 
 #include <CDF_FWOSDriver.hxx>
-#include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
 #include <OSD_Directory.hxx>
 #include <OSD_File.hxx>
diff --git a/src/CDF/CDF_FWOSDriver.hxx b/src/CDF/CDF_FWOSDriver.hxx
index 585698a83e..7ae928c352 100644
--- a/src/CDF/CDF_FWOSDriver.hxx
+++ b/src/CDF/CDF_FWOSDriver.hxx
@@ -18,12 +18,10 @@
 #define _CDF_FWOSDriver_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <CDF_MetaDataDriver.hxx>
 #include <CDM_MetaDataLookUpTable.hxx>
 
-#include <Standard_Boolean.hxx>
 class TCollection_ExtendedString;
 class CDM_MetaData;
 class CDM_Document;
diff --git a/src/CDF/CDF_MetaDataDriver.cxx b/src/CDF/CDF_MetaDataDriver.cxx
index 812445f603..bdaa54fdae 100644
--- a/src/CDF/CDF_MetaDataDriver.cxx
+++ b/src/CDF/CDF_MetaDataDriver.cxx
@@ -17,12 +17,9 @@
 
 #include <CDF_Application.hxx>
 #include <CDF_MetaDataDriver.hxx>
-#include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
 #include <PCDM_ReferenceIterator.hxx>
-#include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
-#include <Standard_NullObject.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <OSD_Thread.hxx>
 
diff --git a/src/CDF/CDF_Store.cxx b/src/CDF/CDF_Store.cxx
index 48b4733903..197e312453 100644
--- a/src/CDF/CDF_Store.cxx
+++ b/src/CDF/CDF_Store.cxx
@@ -20,8 +20,6 @@
 #include <CDF_StoreSetNameStatus.hxx>
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
-#include <PCDM.hxx>
-#include <PCDM_StorageDriver.hxx>
 #include <PCDM_StoreStatus.hxx>
 #include <Standard_ProgramError.hxx>
 
diff --git a/src/CDF/CDF_Store.hxx b/src/CDF/CDF_Store.hxx
index 9286300b75..372de7a81c 100644
--- a/src/CDF/CDF_Store.hxx
+++ b/src/CDF/CDF_Store.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <PCDM_StoreStatus.hxx>
-#include <CDF_TryStoreStatus.hxx>
-#include <Standard_ExtString.hxx>
 #include <CDF_StoreSetNameStatus.hxx>
-#include <CDF_SubComponentStatus.hxx>
 #include <TCollection_HExtendedString.hxx>
 
 #include <Message_ProgressRange.hxx>
diff --git a/src/CDF/CDF_StoreList.cxx b/src/CDF/CDF_StoreList.cxx
index e8b44c3a86..b1d91602aa 100644
--- a/src/CDF/CDF_StoreList.cxx
+++ b/src/CDF/CDF_StoreList.cxx
@@ -21,8 +21,6 @@
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
 #include <CDM_ReferenceIterator.hxx>
-#include <PCDM.hxx>
-#include <PCDM_Document.hxx>
 #include <PCDM_StorageDriver.hxx>
 #include <TCollection_ExtendedString.hxx>
 
diff --git a/src/CDF/CDF_StoreList.hxx b/src/CDF/CDF_StoreList.hxx
index 1f79e21682..10fb41ebd2 100644
--- a/src/CDF/CDF_StoreList.hxx
+++ b/src/CDF/CDF_StoreList.hxx
@@ -20,13 +20,10 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <CDM_MapOfDocument.hxx>
 #include <CDM_ListOfDocument.hxx>
 #include <CDM_MapIteratorOfMapOfDocument.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <PCDM_StoreStatus.hxx>
-#include <Message_ProgressIndicator.hxx>
 
 class CDM_Document;
 class CDM_MetaData;
diff --git a/src/CDM/CDM_Application.cxx b/src/CDM/CDM_Application.cxx
index 1f138cb7df..1d842f5189 100644
--- a/src/CDM/CDM_Application.cxx
+++ b/src/CDM/CDM_Application.cxx
@@ -18,7 +18,6 @@
 #include <CDM_Application.hxx>
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
-#include <CDM_Reference.hxx>
 #include <Resource_Manager.hxx>
 #include <Standard_Dump.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/CDM/CDM_Application.hxx b/src/CDM/CDM_Application.hxx
index 3e47f24987..0f81748280 100644
--- a/src/CDM/CDM_Application.hxx
+++ b/src/CDM/CDM_Application.hxx
@@ -18,14 +18,9 @@
 #define _CDM_Application_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_ExtString.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 #include <CDM_MetaDataLookUpTable.hxx>
 #include <Message_ProgressRange.hxx>
 
diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx
index c91c9190df..9efef91453 100644
--- a/src/CDM/CDM_Document.cxx
+++ b/src/CDM/CDM_Document.cxx
@@ -19,7 +19,6 @@
 #include <CDM_Application.hxx>
 #include <CDM_DataMapIteratorOfMetaDataLookUpTable.hxx>
 #include <CDM_Document.hxx>
-#include <CDM_ListIteratorOfListOfDocument.hxx>
 #include <CDM_ListOfDocument.hxx>
 #include <CDM_MetaData.hxx>
 #include <CDM_NamesDirectory.hxx>
@@ -29,10 +28,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Dump.hxx>
 #include <Standard_Failure.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_NullObject.hxx>
-#include <Standard_ProgramError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <UTL.hxx>
diff --git a/src/CDM/CDM_MapOfDocument.hxx b/src/CDM/CDM_MapOfDocument.hxx
index 167dc793a8..613ed2642d 100644
--- a/src/CDM/CDM_MapOfDocument.hxx
+++ b/src/CDM/CDM_MapOfDocument.hxx
@@ -17,7 +17,6 @@
 #ifndef CDM_MapOfDocument_HeaderFile
 #define CDM_MapOfDocument_HeaderFile
 
-#include <CDM_Document.hxx>
 #include <CDM_DocumentHasher.hxx>
 #include <NCollection_Map.hxx>
 
diff --git a/src/CDM/CDM_MetaData.cxx b/src/CDM/CDM_MetaData.cxx
index 21e7499479..5c5e273bb0 100644
--- a/src/CDM/CDM_MetaData.cxx
+++ b/src/CDM/CDM_MetaData.cxx
@@ -19,7 +19,6 @@
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
 #include <CDM_MetaDataLookUpTable.hxx>
-#include <CDM_Reference.hxx>
 #include <Standard_Dump.hxx>
 #include <CDF_Application.hxx>
 #include <Standard_NullObject.hxx>
diff --git a/src/CDM/CDM_MetaData.hxx b/src/CDM/CDM_MetaData.hxx
index 26af074bc7..45d7e1b83d 100644
--- a/src/CDM/CDM_MetaData.hxx
+++ b/src/CDM/CDM_MetaData.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <CDM_DocumentPointer.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/CDM/CDM_Reference.hxx b/src/CDM/CDM_Reference.hxx
index 3a9c00f2ed..cb3ea8556a 100644
--- a/src/CDM/CDM_Reference.hxx
+++ b/src/CDM/CDM_Reference.hxx
@@ -22,7 +22,6 @@
 
 #include <CDM_DocumentPointer.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class CDM_Document;
 class CDM_Application;
diff --git a/src/CDM/CDM_ReferenceIterator.hxx b/src/CDM/CDM_ReferenceIterator.hxx
index 497c4590b4..bd51c6feca 100644
--- a/src/CDM/CDM_ReferenceIterator.hxx
+++ b/src/CDM/CDM_ReferenceIterator.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <CDM_ListIteratorOfListOfReferences.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class CDM_Document;
 
diff --git a/src/ChFi2d/ChFi2d_AnaFilletAlgo.cxx b/src/ChFi2d/ChFi2d_AnaFilletAlgo.cxx
index 0df834c1bb..3462905295 100644
--- a/src/ChFi2d/ChFi2d_AnaFilletAlgo.cxx
+++ b/src/ChFi2d/ChFi2d_AnaFilletAlgo.cxx
@@ -14,9 +14,6 @@
 #include <ChFi2d_AnaFilletAlgo.hxx>
 
 #include <gp_Ax3.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Lin2d.hxx>
-#include <gp_Circ2d.hxx>
 
 #include <Standard_TypeMismatch.hxx>
 
diff --git a/src/ChFi2d/ChFi2d_Builder.cxx b/src/ChFi2d/ChFi2d_Builder.cxx
index 0e797fe32f..441488344a 100644
--- a/src/ChFi2d/ChFi2d_Builder.cxx
+++ b/src/ChFi2d/ChFi2d_Builder.cxx
@@ -24,7 +24,6 @@
 #include <ChFi2d.hxx>
 #include <ChFi2d_Builder.hxx>
 #include <ElCLib.hxx>
-#include <GccEnt_Position.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
@@ -38,11 +37,9 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Circ2d.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
 #include <Precision.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopExp.hxx>
@@ -55,7 +52,6 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 static Standard_Boolean IsIssuedFrom(const TopoDS_Edge& E,
 				     const TopTools_IndexedMapOfShape& Map,
diff --git a/src/ChFi2d/ChFi2d_Builder.hxx b/src/ChFi2d/ChFi2d_Builder.hxx
index 95d01765cd..b32409d644 100644
--- a/src/ChFi2d/ChFi2d_Builder.hxx
+++ b/src/ChFi2d/ChFi2d_Builder.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <ChFi2d_ConstructionError.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 
 class TopoDS_Edge;
diff --git a/src/ChFi2d/ChFi2d_Builder_0.cxx b/src/ChFi2d/ChFi2d_Builder_0.cxx
index 657ba0c6df..5d12686ec6 100644
--- a/src/ChFi2d/ChFi2d_Builder_0.cxx
+++ b/src/ChFi2d/ChFi2d_Builder_0.cxx
@@ -42,7 +42,6 @@
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAPI.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
diff --git a/src/ChFi2d/ChFi2d_ChamferAPI.cxx b/src/ChFi2d/ChFi2d_ChamferAPI.cxx
index 9a0224b433..516092415e 100644
--- a/src/ChFi2d/ChFi2d_ChamferAPI.cxx
+++ b/src/ChFi2d/ChFi2d_ChamferAPI.cxx
@@ -13,10 +13,8 @@
 
 #include <ChFi2d_ChamferAPI.hxx>
 
-#include <Precision.hxx>
 #include <gp_Pnt.hxx>
 #include <GC_MakeLine.hxx>
-#include <Geom_Line.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <TopoDS_Iterator.hxx>
diff --git a/src/ChFi2d/ChFi2d_FilletAlgo.cxx b/src/ChFi2d/ChFi2d_FilletAlgo.cxx
index 547a2b9b5a..f93ed7c1d1 100644
--- a/src/ChFi2d/ChFi2d_FilletAlgo.cxx
+++ b/src/ChFi2d/ChFi2d_FilletAlgo.cxx
@@ -27,7 +27,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
-#include <gp_Circ.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom2d_Line.hxx>
 
diff --git a/src/ChFi2d/ChFi2d_FilletAlgo.hxx b/src/ChFi2d/ChFi2d_FilletAlgo.hxx
index fdd396f57b..042985dd30 100644
--- a/src/ChFi2d/ChFi2d_FilletAlgo.hxx
+++ b/src/ChFi2d/ChFi2d_FilletAlgo.hxx
@@ -18,7 +18,6 @@
 
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
-#include <gp_Pnt.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <TColStd_ListOfReal.hxx>
diff --git a/src/ChFi3d/ChFi3d.cxx b/src/ChFi3d/ChFi3d.cxx
index 9c792365f3..d9c03e4d9f 100644
--- a/src/ChFi3d/ChFi3d.cxx
+++ b/src/ChFi3d/ChFi3d.cxx
@@ -17,16 +17,11 @@
 #include <ChFi3d.hxx>
 
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
 #include <Precision.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <BRepTools.hxx>
diff --git a/src/ChFi3d/ChFi3d.hxx b/src/ChFi3d/ChFi3d.hxx
index b36266ee1c..6292eb31af 100644
--- a/src/ChFi3d/ChFi3d.hxx
+++ b/src/ChFi3d/ChFi3d.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <Standard_Boolean.hxx>
 #include <ChFiDS_TypeOfConcavity.hxx>
diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx
index 03444145c8..e56235f70d 100644
--- a/src/ChFi3d/ChFi3d_Builder.cxx
+++ b/src/ChFi3d/ChFi3d_Builder.cxx
@@ -16,52 +16,28 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
-#include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepLib.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
-#include <ChFi3d.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ListIteratorOfListOfStripe.hxx>
-#include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_Surface.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Precision.hxx>
 #include <ShapeFix.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TColStd_MapIteratorOfMapOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <TopAbs.hxx>
-#include <TopAbs_Orientation.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -69,7 +45,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
-#include <TopOpeBRepDS_BuildTool.hxx>
 #include <TopOpeBRepDS_Curve.hxx>
 #include <TopOpeBRepDS_CurveExplorer.hxx>
 #include <TopOpeBRepDS_CurvePointInterference.hxx>
@@ -77,7 +52,6 @@
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_ListOfInterference.hxx>
 #include <TopOpeBRepDS_PointIterator.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/ChFi3d/ChFi3d_Builder.hxx b/src/ChFi3d/ChFi3d_Builder.hxx
index f24419fca6..2073173217 100644
--- a/src/ChFi3d/ChFi3d_Builder.hxx
+++ b/src/ChFi3d/ChFi3d_Builder.hxx
@@ -21,7 +21,6 @@
 #include <BRepAdaptor_Surface.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <ChFiDS_ErrorStatus.hxx>
-#include <ChFiDS_ListOfStripe.hxx>
 #include <ChFiDS_Map.hxx>
 #include <ChFiDS_Regularities.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
diff --git a/src/ChFi3d/ChFi3d_Builder_0.cxx b/src/ChFi3d/ChFi3d_Builder_0.cxx
index 27ea6dd75b..5e64b338a1 100644
--- a/src/ChFi3d/ChFi3d_Builder_0.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_0.cxx
@@ -18,147 +18,66 @@
 //  Modified by skv - Fri Oct 24 14:24:47 2003 OCC4077
 //  Modified by skv - Mon Jun 16 15:50:44 2003 OCC615
 
+#include <ChFi3d_Builder_0.hxx>
+
+#include <AppParCurves_MultiBSpCurve.hxx>
+#include <Approx_SameParameter.hxx>
+#include <BRepLib.hxx>
+#include <BRepTools.hxx>
+#include <BRepTopAdaptor_HVertex.hxx>
+#include <BRepTopAdaptor_TopolTool.hxx>
+#include <BRep_Builder.hxx>
 #include <ChFi3d.hxx>
-#include <Precision.hxx>
-
-#include <Standard_NotImplemented.hxx>
-#include <Standard_ConstructionError.hxx>
-
-#include <gp.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Lin2d.hxx>
+#include <ChFiDS_FilSpine.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <BSplCLib.hxx>
-#include <GeomLib.hxx>
-
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfXYZ.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_Array1OfReal.hxx>
-
-#include <Geom_TrimmedCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_Ellipse.hxx>
+#include <Extrema_LocateExtCC.hxx>
+#include <GCPnts_AbscissaPoint.hxx>
+#include <Geom2dInt_GInter.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Ellipse.hxx>
 #include <Geom2d_Hyperbola.hxx>
+#include <Geom2d_Line.hxx>
 #include <Geom2d_Parabola.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_OffsetCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-
-#include <FairCurve_Batten.hxx>
-#include <FairCurve_AnalysisCode.hxx>
-#include <Convert_ParameterisationType.hxx>
-#include <GeomConvert_CompCurveToBSplineCurve.hxx>
-#include <GeomConvert.hxx>
-#include <GeomLib_Interpolate.hxx>
-#include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GC_MakeCircle.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepTopAdaptor_HVertex.hxx>
-#include <BRepTopAdaptor_TopolTool.hxx>
-#include <LocalAnalysis_SurfaceContinuity.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
-#include <BRepTools.hxx>
-#include <BRepTools_WireExplorer.hxx>
-#include <BRepLib.hxx>
-#include <BRepLib_MakeEdge.hxx>
-#include <BRepLib_MakeWire.hxx>
-#include <BRepLib_MakeFace.hxx>
-
-#include <TopAbs.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_Array1OfShape.hxx>
-
-
 #include <GeomAbs_Shape.hxx>
-#include <Bnd_Box2d.hxx>
-
-//#include <math_FunctionSample.hxx>
-//#include <math_FunctionAllRoots.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-
-#include <IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter.hxx>
+#include <GeomAPI_PointsToBSpline.hxx>
+#include <GeomAPI_ProjectPointOnCurve.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <GeomConvert.hxx>
+#include <GeomConvert_CompCurveToBSplineCurve.hxx>
+#include <GeomFill_SimpleBound.hxx>
+#include <GeomInt_IntSS.hxx>
+#include <GeomInt_WLApprox.hxx>
+#include <GeomLib.hxx>
+#include <GeomLProp_CLProps.hxx>
+#include <Geom_Ellipse.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_RectangularTrimmedSurface.hxx>
+#include <IntAna_QuadQuadGeo.hxx>
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
-#include <IntSurf_Quadric.hxx>
-#include <IntSurf_PntOn2S.hxx>
-#include <IntSurf_LineOn2S.hxx>
-#include <IntAna_QuadQuadGeo.hxx>
-#include <IntAna2d_AnaIntersection.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
-#include <IntWalk_PWalking.hxx>
 #include <IntPatch_WLine.hxx>
-#include <Geom2dInt_GInter.hxx>
-#include <GeomInt_WLApprox.hxx>
-#include <GeomInt_IntSS.hxx>
-#include <AppParCurves_MultiBSpCurve.hxx>
-#include <Approx_SameParameter.hxx>
-
-#include <TopAbs.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopExp.hxx>
-
-#include <TopOpeBRepDS.hxx>
-#include <TopOpeBRepDS_Surface.hxx>
-#include <TopOpeBRepDS_Point.hxx>
-#include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
-#include <TopOpeBRepDS_CurvePointInterference.hxx>
-#include <TopOpeBRepDS_ListOfInterference.hxx>
-#include <TopOpeBRepDS_InterferenceIterator.hxx>
-#include <TopOpeBRepTool_TOOL.hxx>
-#include <ProjLib_ProjectedCurve.hxx>
-
-#include <BRepBlend_PointOnRst.hxx>
-
-#include <ChFiDS_HData.hxx>
-#include <ChFiDS_SurfData.hxx>
-#include <ChFiDS_FaceInterference.hxx>
-#include <ChFiDS_Spine.hxx>
-#include <ChFiDS_FilSpine.hxx>
-#include <ChFiDS_SequenceOfSurfData.hxx>
-#include <ChFiDS_Regul.hxx>
-#include <Law_Function.hxx>
+#include <IntSurf_LineOn2S.hxx>
+#include <IntWalk_PWalking.hxx>
 #include <Law_Composite.hxx>
-#include <GeomAPI_PointsToBSpline.hxx>
-#include <GeomLProp_CLProps.hxx>
+#include <ProjLib_ProjectedCurve.hxx>
+#include <Standard_NotImplemented.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TColgp_Array1OfXYZ.hxx>
+#include <TColStd_Array1OfReal.hxx>
+#include <TopAbs.hxx>
+#include <TopExp.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopOpeBRepDS_InterferenceIterator.hxx>
+#include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
 
-#include <ChFi3d_Builder_0.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean ChFi3d_GetcontextFORCEBLEND(); 
@@ -170,12 +89,6 @@ extern void ChFi3d_SettraceDRAWINT(const Standard_Boolean b);
 extern void ChFi3d_SettraceDRAWSPINE(const Standard_Boolean b);
 #endif
 
-#include <stdio.h>
-
-#include <GeomAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
-
 //=======================================================================
 //function : ChFi3d_InPeriod
 //purpose  : 
diff --git a/src/ChFi3d/ChFi3d_Builder_0.hxx b/src/ChFi3d/ChFi3d_Builder_0.hxx
index e3655b03c9..7cce099556 100644
--- a/src/ChFi3d/ChFi3d_Builder_0.hxx
+++ b/src/ChFi3d/ChFi3d_Builder_0.hxx
@@ -20,8 +20,6 @@
 #include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
 #include <TopOpeBRepDS_CurvePointInterference.hxx>
 #include <TopOpeBRepDS_DataStructure.hxx>
-#include <TopOpeBRepDS_Curve.hxx>
-#include <TopOpeBRepDS_Surface.hxx>
 #include <BRepBlend_Extremity.hxx>
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
@@ -33,43 +31,24 @@
 #include <ChFiDS_Map.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <IntSurf_LineOn2S.hxx>
 #include <IntSurf_TypeTrans.hxx>
-#include <GeomFill_Boundary.hxx>
 #include <GeomFill_BoundWithSurf.hxx>
-#include <GeomFill_SimpleBound.hxx>
-#include <GeomFill_ConstrainedFilling.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_Circle.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <Extrema_LocateExtCC.hxx>
-#include <Extrema_POnCurv.hxx>
 #include <Bnd_Box.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
-#include <gp_Dir2d.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfVec.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TopTools_Array1OfShape.hxx>
 #ifdef OCCT_DEBUG
 #include <OSD_Chronometer.hxx>
diff --git a/src/ChFi3d/ChFi3d_Builder_1.cxx b/src/ChFi3d/ChFi3d_Builder_1.cxx
index 8897fb1f5a..d8f9df9ce1 100644
--- a/src/ChFi3d/ChFi3d_Builder_1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_1.cxx
@@ -16,34 +16,20 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
 #include <AppBlend_Approx.hxx>
 #include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
 #include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepLProp_SLProps.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
 #include <ChFi3d.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFi3d_Builder_0.hxx>
-#include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_ErrorStatus.hxx>
 #include <ChFiDS_FilSpine.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ListIteratorOfListOfStripe.hxx>
-#include <ChFiDS_ListIteratorOfRegularities.hxx>
-#include <ChFiDS_Regul.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <ChFiDS_State.hxx>
 #include <ChFiDS_Stripe.hxx>
@@ -59,12 +45,10 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <LocalAnalysis_SurfaceContinuity.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <TopAbs.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
@@ -76,8 +60,6 @@
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_Surface.hxx>
-#include <TopOpeBRepTool_TOOL.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRepLib_MakeEdge.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx
index 5330c4d7e8..04f981f39e 100644
--- a/src/ChFi3d/ChFi3d_Builder_2.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_2.cxx
@@ -16,20 +16,7 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
-#include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepLProp_SLProps.hxx>
@@ -44,10 +31,7 @@
 #include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ErrorStatus.hxx>
 #include <ChFiDS_FaceInterference.hxx>
-#include <ChFiDS_FilSpine.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfHElSpine.hxx>
 #include <ChFiDS_ListOfHElSpine.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
@@ -56,34 +40,23 @@
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
 #include <ElCLib.hxx>
-#include <Extrema_ExtPC.hxx>
 #include <Extrema_ExtPS.hxx>
 #include <Extrema_LocateExtPC.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <gp_Pln.hxx>
+#include <GeomFill_ConstrainedFilling.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_XYZ.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfVec.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <TopAbs.hxx>
@@ -96,10 +69,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 #ifdef DRAW
diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx
index 3bcd519a36..f22c19b2b2 100644
--- a/src/ChFi3d/ChFi3d_Builder_6.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_6.cxx
@@ -20,22 +20,11 @@
 //  ComputeData(), case where BRepBlend_Walking::Continu() can't get up to Target
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
-#include <Approx_SweepFunction.hxx>
 #include <Blend_CurvPointFuncInv.hxx>
-#include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_Point.hxx>
 #include <Blend_RstRstFunction.hxx>
 #include <Blend_SurfCurvFuncInv.hxx>
 #include <Blend_SurfPointFuncInv.hxx>
 #include <Blend_SurfRstFunction.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_AppFunc.hxx>
 #include <BRepBlend_AppFuncRst.hxx>
 #include <BRepBlend_AppFuncRstRst.hxx>
@@ -44,9 +33,7 @@
 #include <BRepBlend_ConstRad.hxx>
 #include <BRepBlend_ConstRadInv.hxx>
 #include <BRepBlend_CSWalking.hxx>
-#include <BRepBlend_Extremity.hxx>
 #include <BRepBlend_Line.hxx>
-#include <BRepBlend_PointOnRst.hxx>
 #include <BRepBlend_RstRstLineBuilder.hxx>
 #include <BRepBlend_SurfRstLineBuilder.hxx>
 #include <BRepBlend_Walking.hxx>
@@ -59,7 +46,6 @@
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_Spine.hxx>
-#include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
@@ -71,7 +57,6 @@
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomLib.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Pnt.hxx>
@@ -81,9 +66,6 @@
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TopExp.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@@ -94,7 +76,6 @@
 #include <TopOpeBRepDS_DataStructure.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_Surface.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 #include <stdio.h>
diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx
index 9d78c53944..8a0da73023 100644
--- a/src/ChFi3d/ChFi3d_Builder_C1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx
@@ -18,22 +18,7 @@
 //  Modified by skv - Thu Aug 21 11:55:58 2008 OCC20222
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
-#include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepExtrema_ExtCC.hxx>
@@ -46,7 +31,6 @@
 #include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_Map.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
@@ -54,10 +38,8 @@
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ElCLib.hxx>
-#include <ElSLib.hxx>
 #include <Extrema_ExtCC.hxx>
 #include <Extrema_ExtPC.hxx>
-#include <Extrema_ExtPC2d.hxx>
 #include <Extrema_ExtPS.hxx>
 #include <Extrema_LocateExtCC.hxx>
 #include <Extrema_POnCurv.hxx>
@@ -71,51 +53,33 @@
 #include <Geom_BoundedCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <GeomInt_IntSS.hxx>
 #include <GeomLib.hxx>
 #include <GeomProjLib.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Elips.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
-#include <IntRes2d_Transition.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Failure.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TopAbs.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@@ -127,7 +91,6 @@
 #include <TopOpeBRepDS_DataStructure.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_Kind.hxx>
-#include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
 #include <TopOpeBRepDS_ListOfInterference.hxx>
 #include <TopOpeBRepDS_Point.hxx>
 #include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
@@ -135,7 +98,6 @@
 #include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 # ifdef DRAW
@@ -154,7 +116,6 @@ extern void ChFi3d_ResultChron(OSD_Chronometer & ch,Standard_Real& time);
 #endif
 #include <Geom2dAPI_ProjectPointOnCurve.hxx>
 #include <math_FunctionSample.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BoundedSurface.hxx>
diff --git a/src/ChFi3d/ChFi3d_Builder_C2.cxx b/src/ChFi3d/ChFi3d_Builder_C2.cxx
index a61a85c00d..37a13afa21 100644
--- a/src/ChFi3d/ChFi3d_Builder_C2.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C2.cxx
@@ -16,30 +16,15 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
 #include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
-#include <ChFi3d.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
@@ -51,30 +36,16 @@
 #include <Geom_BoundedCurve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomLib.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Dir2d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
-#include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_Failure.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TopAbs.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopAbs_ShapeEnum.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -87,10 +58,7 @@
 #include <TopOpeBRepDS_DataStructure.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_ListOfInterference.hxx>
-#include <TopOpeBRepDS_Point.hxx>
-#include <TopOpeBRepDS_Surface.hxx>
 #include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 static void Reduce(const Standard_Real& p1,
 		   const Standard_Real& p2,
diff --git a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
index bc70df03a0..c58f6ec7a7 100644
--- a/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_CnCrn.cxx
@@ -36,34 +36,20 @@
 // Traitement des coins  		 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
 #include <AppBlend_Approx.hxx>
-#include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
 #include <Bnd_Box2d.hxx>
 #include <BndLib_Add2dCurve.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepTools.hxx>
-#include <BRepTopAdaptor_TopolTool.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
@@ -84,15 +70,12 @@
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAdaptor.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomInt_IntSS.hxx>
 #include <GeomLib.hxx>
 #include <GeomPlate_BuildPlateSurface.hxx>
 #include <GeomPlate_CurveConstraint.hxx>
-#include <GeomPlate_HArray1OfHCurve.hxx>
 #include <GeomPlate_MakeApprox.hxx>
 #include <GeomPlate_PlateG0Criterion.hxx>
 #include <GeomPlate_Surface.hxx>
@@ -103,7 +86,6 @@
 #include <PLib.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColGeom2d_Array1OfCurve.hxx>
 #include <TColGeom2d_HArray1OfCurve.hxx>
@@ -111,7 +93,6 @@
 #include <TColGeom_Array1OfCurve.hxx>
 #include <TColGeom_SequenceOfCurve.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfXYZ.hxx>
 #include <TColgp_SequenceOfXY.hxx>
 #include <TColgp_SequenceOfXYZ.hxx>
@@ -120,7 +101,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfInteger.hxx>
 #include <TColStd_Array2OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TopExp.hxx>
diff --git a/src/ChFi3d/ChFi3d_Builder_NotImp.cxx b/src/ChFi3d/ChFi3d_Builder_NotImp.cxx
index 21038bf9df..1edf9acc9d 100644
--- a/src/ChFi3d/ChFi3d_Builder_NotImp.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_NotImp.cxx
@@ -15,39 +15,15 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
 #include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
 #include <ChFi3d_Builder.hxx>
-#include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_Spine.hxx>
-#include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom_Surface.hxx>
-#include <gp_Pnt2d.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
-#include <TopOpeBRepDS_HDataStructure.hxx>
 
 //=======================================================================
 //function : SimulSurf
diff --git a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx
index a1a04de26c..c893b55c79 100644
--- a/src/ChFi3d/ChFi3d_Builder_SpKP.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_SpKP.cxx
@@ -16,38 +16,19 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <AppBlend_Approx.hxx>
 #include <Blend_CurvPointFuncInv.hxx>
 #include <Blend_FuncInv.hxx>
-#include <Blend_Function.hxx>
-#include <Blend_RstRstFunction.hxx>
-#include <Blend_SurfCurvFuncInv.hxx>
-#include <Blend_SurfPointFuncInv.hxx>
-#include <Blend_SurfRstFunction.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <ChFiDS_CommonPoint.hxx>
-#include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_Spine.hxx>
-#include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_RstMap.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dHatch_Hatcher.hxx>
 #include <Geom2dHatch_Intersector.hxx>
@@ -55,25 +36,16 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <GeomAbs_SurfaceType.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <gp.hxx>
 #include <gp_Circ.hxx>
-#include <gp_Dir2d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <HatchGen_Domain.hxx>
 #include <HatchGen_PointOnElement.hxx>
 #include <HatchGen_PointOnHatching.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <TopExp.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/ChFi3d/ChFi3d_ChBuilder.cxx b/src/ChFi3d/ChFi3d_ChBuilder.cxx
index dfef8e25d1..078a647231 100644
--- a/src/ChFi3d/ChFi3d_ChBuilder.cxx
+++ b/src/ChFi3d/ChFi3d_ChBuilder.cxx
@@ -16,12 +16,6 @@
 
 
 #include <Adaptor3d_TopolTool.hxx>
-#include <Blend_Point.hxx>
-#include <BlendFunc_SectionShape.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_Chamfer.hxx>
 #include <BRepBlend_ChamfInv.hxx>
 #include <BRepBlend_ConstThroat.hxx>
@@ -40,7 +34,6 @@
 #include <ChFiDS_CircSection.hxx>
 #include <ChFiDS_HData.hxx>
 #include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_ListIteratorOfRegularities.hxx>
 #include <ChFiDS_ListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
@@ -50,18 +43,15 @@
 #include <ChFiDS_SurfData.hxx>
 #include <ElSLib.hxx>
 #include <Extrema_GenLocateExtPS.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepBuild_HBuilder.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <memory>
 
 #ifdef OCCT_DEBUG
diff --git a/src/ChFi3d/ChFi3d_ChBuilder.hxx b/src/ChFi3d/ChFi3d_ChBuilder.hxx
index 2a708db296..f1ce9edbf9 100644
--- a/src/ChFi3d/ChFi3d_ChBuilder.hxx
+++ b/src/ChFi3d/ChFi3d_ChBuilder.hxx
@@ -17,7 +17,6 @@
 #ifndef _ChFi3d_ChBuilder_HeaderFile
 #define _ChFi3d_ChBuilder_HeaderFile
 
-#include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <ChFi3d_Builder.hxx>
 #include <ChFiDS_ChamfMethod.hxx>
diff --git a/src/ChFi3d/ChFi3d_ChBuilder_C2.cxx b/src/ChFi3d/ChFi3d_ChBuilder_C2.cxx
index f21f2ada1a..6420d81384 100644
--- a/src/ChFi3d/ChFi3d_ChBuilder_C2.cxx
+++ b/src/ChFi3d/ChFi3d_ChBuilder_C2.cxx
@@ -15,20 +15,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_TopolTool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <ChFi3d_ChBuilder.hxx>
-#include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_Spine.hxx>
-#include <ChFiDS_Stripe.hxx>
-#include <ChFiDS_SurfData.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 
 //=======================================================================
 //function : PerformTwoCorner
diff --git a/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx b/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx
index f7f731f6c7..8167011f30 100644
--- a/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx
+++ b/src/ChFi3d/ChFi3d_ChBuilder_C3.cxx
@@ -17,59 +17,37 @@
 
 #include <Adaptor3d_TopolTool.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepLib_MakeEdge.hxx>
 #include <ChFi3d_Builder_0.hxx>
 #include <ChFi3d_ChBuilder.hxx>
 #include <ChFiDS_ChamfSpine.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
-#include <ChFiDS_Spine.hxx>
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData_Fcts.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dInt_GInter.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAbs_SurfaceType.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <GeomFill_ConstrainedFilling.hxx>
 #include <GeomInt_IntSS.hxx>
-#include <gp.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Lin2d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <IntCurveSurface_HInter.hxx>
-#include <IntCurveSurface_IntersectionPoint.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
 #include <Precision.hxx>
-#include <ProjLib_ProjectedCurve.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColStd_ListOfInteger.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/ChFi3d/ChFi3d_Debug.cxx b/src/ChFi3d/ChFi3d_Debug.cxx
index d2e0c2affe..3570e34664 100644
--- a/src/ChFi3d/ChFi3d_Debug.cxx
+++ b/src/ChFi3d/ChFi3d_Debug.cxx
@@ -28,11 +28,9 @@
 #include <Geom2d_Line.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <gp_Ax1.hxx>
 
 #ifdef DRAW
 #include <DBRep.hxx>
diff --git a/src/ChFi3d/ChFi3d_FilBuilder.cxx b/src/ChFi3d/ChFi3d_FilBuilder.cxx
index db74a9b2ed..65164af459 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder.cxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder.cxx
@@ -17,9 +17,6 @@
 // Modified:    MPS :  (10-04-97) portage WNT pour GetFilletShape
 
 #include <Adaptor3d_TopolTool.hxx>
-#include <Blend_Point.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_ConstRad.hxx>
 #include <BRepBlend_ConstRadInv.hxx>
 #include <BRepBlend_CurvPointRadInv.hxx>
@@ -42,7 +39,6 @@
 #include <ChFiDS_FilSpine.hxx>
 #include <ChFiDS_HData.hxx>
 #include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_ListIteratorOfRegularities.hxx>
 #include <ChFiDS_ListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
@@ -52,7 +48,6 @@
 #include <ChFiDS_SurfData.hxx>
 #include <ElSLib.hxx>
 #include <Geom_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <gp_XY.hxx>
 #include <Law_Composite.hxx>
 #include <Law_Function.hxx>
@@ -68,7 +63,6 @@
 #include <TopOpeBRepDS_Curve.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
 #include <TopOpeBRepDS_Surface.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
 #include <OSD_Chronometer.hxx>
diff --git a/src/ChFi3d/ChFi3d_FilBuilder.hxx b/src/ChFi3d/ChFi3d_FilBuilder.hxx
index 17e4083d60..0099b2abeb 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder.hxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder.hxx
@@ -17,7 +17,6 @@
 #ifndef _ChFi3d_FilBuilder_HeaderFile
 #define _ChFi3d_FilBuilder_HeaderFile
 
-#include <BRepAdaptor_Curve2d.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BlendFunc_SectionShape.hxx>
 #include <ChFi3d_Builder.hxx>
diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
index 8b7aa491a9..b54b8f997b 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder_C2.cxx
@@ -17,15 +17,7 @@
 
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBlend_CSCircular.hxx>
 #include <BRepBlend_Line.hxx>
 #include <BRepLProp_CLProps.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
@@ -37,8 +29,6 @@
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_FilSpine.hxx>
 #include <ChFiDS_HData.hxx>
-#include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
@@ -46,40 +36,22 @@
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
-#include <Geom2d_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dConvert.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomFill_ConstrainedFilling.hxx>
 #include <GeomFill_SimpleBound.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_XY.hxx>
-#include <IntCurveSurface_HInter.hxx>
-#include <IntCurveSurface_IntersectionPoint.hxx>
-#include <IntSurf_LineOn2S.hxx>
-#include <IntSurf_Transition.hxx>
-#include <IntSurf_TypeTrans.hxx>
-#include <Law_Function.hxx>
-#include <Law_Linear.hxx>
-#include <math_Vector.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <TopAbs.hxx>
@@ -92,8 +64,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopOpeBRepDS_DataStructure.hxx>
 #include <TopOpeBRepDS_HDataStructure.hxx>
-#include <TopOpeBRepDS_ListOfInterference.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
diff --git a/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx b/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx
index 46370db8b8..6403c2141e 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder_C3.cxx
@@ -16,13 +16,6 @@
 
 
 #include <Adaptor3d_CurveOnSurface.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Adaptor3d_TopolTool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Curve2d.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <BRepBlend_ConstRad.hxx>
 #include <BRepBlend_ConstRadInv.hxx>
 #include <BRepBlend_EvolRad.hxx>
@@ -36,51 +29,27 @@
 #include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_HData.hxx>
 #include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfStripe.hxx>
 #include <ChFiDS_Regul.hxx>
-#include <ChFiDS_SequenceOfSurfData.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
-#include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_Plane.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <gp_Ax2.hxx>
+#include <GeomFill_ConstrainedFilling.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_XY.hxx>
-#include <IntAna_QuadQuadGeo.hxx>
-#include <IntCurveSurface_IntersectionPoint.hxx>
-#include <Law_Function.hxx>
 #include <Law_S.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
-#include <Standard_Failure.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_ListOfInteger.hxx>
-#include <TopAbs.hxx>
 #include <TopAbs_Orientation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/ChFiDS/ChFiDS_ChamfSpine.hxx b/src/ChFiDS/ChFiDS_ChamfSpine.hxx
index be957da658..8632241968 100644
--- a/src/ChFiDS/ChFiDS_ChamfSpine.hxx
+++ b/src/ChFiDS/ChFiDS_ChamfSpine.hxx
@@ -18,12 +18,9 @@
 #define _ChFiDS_ChamfSpine_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ChFiDS_ChamfMethod.hxx>
-#include <ChFiDS_ChamfMode.hxx>
 #include <ChFiDS_Spine.hxx>
 
 
diff --git a/src/ChFiDS/ChFiDS_CircSection.hxx b/src/ChFiDS/ChFiDS_CircSection.hxx
index e5e5be4088..88677095d2 100644
--- a/src/ChFiDS/ChFiDS_CircSection.hxx
+++ b/src/ChFiDS/ChFiDS_CircSection.hxx
@@ -23,7 +23,6 @@
 
 #include <gp_Circ.hxx>
 #include <gp_Lin.hxx>
-#include <Standard_Real.hxx>
 
 
 //! A Section of fillet.
diff --git a/src/ChFiDS/ChFiDS_CommonPoint.cxx b/src/ChFiDS/ChFiDS_CommonPoint.cxx
index 754fb26a46..e68424220f 100644
--- a/src/ChFiDS/ChFiDS_CommonPoint.cxx
+++ b/src/ChFiDS/ChFiDS_CommonPoint.cxx
@@ -16,10 +16,7 @@
 
 
 #include <ChFiDS_CommonPoint.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/ChFiDS/ChFiDS_CommonPoint.hxx b/src/ChFiDS/ChFiDS_CommonPoint.hxx
index 15f725ecc1..d61da63b67 100644
--- a/src/ChFiDS/ChFiDS_CommonPoint.hxx
+++ b/src/ChFiDS/ChFiDS_CommonPoint.hxx
@@ -25,7 +25,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopAbs_Orientation.hxx>
 
diff --git a/src/ChFiDS/ChFiDS_ElSpine.cxx b/src/ChFiDS/ChFiDS_ElSpine.cxx
index 8e46350225..a43d69b8bd 100644
--- a/src/ChFiDS/ChFiDS_ElSpine.cxx
+++ b/src/ChFiDS/ChFiDS_ElSpine.cxx
@@ -18,7 +18,6 @@
 #include <Adaptor3d_Curve.hxx>
 #include <ChFiDS_ElSpine.hxx>
 #include <ChFiDS_SurfData.hxx>
-#include <ElCLib.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_Curve.hxx>
@@ -31,9 +30,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_OutOfRange.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_ElSpine, Adaptor3d_Curve)
 
diff --git a/src/ChFiDS/ChFiDS_ElSpine.hxx b/src/ChFiDS/ChFiDS_ElSpine.hxx
index 451fda9ef5..ece7ccf4b2 100644
--- a/src/ChFiDS/ChFiDS_ElSpine.hxx
+++ b/src/ChFiDS/ChFiDS_ElSpine.hxx
@@ -25,8 +25,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <TColgp_SequenceOfAx1.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/ChFiDS/ChFiDS_FilSpine.cxx b/src/ChFiDS/ChFiDS_FilSpine.cxx
index 9506dc44b3..bfd3538257 100644
--- a/src/ChFiDS/ChFiDS_FilSpine.cxx
+++ b/src/ChFiDS/ChFiDS_FilSpine.cxx
@@ -24,7 +24,6 @@
 #include <Law_Constant.hxx>
 #include <Law_Function.hxx>
 #include <Law_Interpol.hxx>
-#include <Law_ListIteratorOfLaws.hxx>
 #include <Law_S.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
diff --git a/src/ChFiDS/ChFiDS_HData.hxx b/src/ChFiDS/ChFiDS_HData.hxx
index f39cfa855d..9e9f76a82d 100644
--- a/src/ChFiDS/ChFiDS_HData.hxx
+++ b/src/ChFiDS/ChFiDS_HData.hxx
@@ -17,7 +17,6 @@
 #ifndef ChFiDS_HData_HeaderFile
 #define ChFiDS_HData_HeaderFile
 
-#include <ChFiDS_SurfData.hxx>
 #include <ChFiDS_SequenceOfSurfData.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/ChFiDS/ChFiDS_Map.hxx b/src/ChFiDS/ChFiDS_Map.hxx
index 9de642c619..1b73eb64c1 100644
--- a/src/ChFiDS/ChFiDS_Map.hxx
+++ b/src/ChFiDS/ChFiDS_Map.hxx
@@ -25,7 +25,6 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <Standard_Integer.hxx>
 class TopoDS_Shape;
 
 
diff --git a/src/ChFiDS/ChFiDS_Regul.hxx b/src/ChFiDS/ChFiDS_Regul.hxx
index 2da4c5e88f..c76f1d5bff 100644
--- a/src/ChFiDS/ChFiDS_Regul.hxx
+++ b/src/ChFiDS/ChFiDS_Regul.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 
 
diff --git a/src/ChFiDS/ChFiDS_SecHArray1.hxx b/src/ChFiDS/ChFiDS_SecHArray1.hxx
index 28ec3b8c93..a41a7904ba 100644
--- a/src/ChFiDS/ChFiDS_SecHArray1.hxx
+++ b/src/ChFiDS/ChFiDS_SecHArray1.hxx
@@ -17,7 +17,6 @@
 #ifndef ChFiDS_SecHArray1_HeaderFile
 #define ChFiDS_SecHArray1_HeaderFile
 
-#include <ChFiDS_CircSection.hxx>
 #include <ChFiDS_SecArray1.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/ChFiDS/ChFiDS_Spine.cxx b/src/ChFiDS/ChFiDS_Spine.cxx
index 7b721c21a5..b6c08471e5 100644
--- a/src/ChFiDS/ChFiDS_Spine.cxx
+++ b/src/ChFiDS/ChFiDS_Spine.cxx
@@ -17,10 +17,6 @@
 // Modified by isg, Thu Mar 17 09:21:31 1994
 
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <ChFiDS_ErrorStatus.hxx>
-#include <ChFiDS_ElSpine.hxx>
-#include <ChFiDS_ListIteratorOfListOfHElSpine.hxx>
 #include <ChFiDS_Spine.hxx>
 #include <ElCLib.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
diff --git a/src/ChFiDS/ChFiDS_Stripe.hxx b/src/ChFiDS/ChFiDS_Stripe.hxx
index bcfda80450..b8289715ad 100644
--- a/src/ChFiDS/ChFiDS_Stripe.hxx
+++ b/src/ChFiDS/ChFiDS_Stripe.hxx
@@ -20,12 +20,10 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <ChFiDS_HData.hxx>
 #include <Standard_Integer.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 class ChFiDS_Spine;
 class Geom2d_Curve;
 
diff --git a/src/ChFiDS/ChFiDS_StripeMap.cxx b/src/ChFiDS/ChFiDS_StripeMap.cxx
index 8c71c09e36..c3970c0fdc 100644
--- a/src/ChFiDS/ChFiDS_StripeMap.cxx
+++ b/src/ChFiDS/ChFiDS_StripeMap.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <ChFiDS_Stripe.hxx>
 #include <ChFiDS_StripeMap.hxx>
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/ChFiDS/ChFiDS_SurfData.cxx b/src/ChFiDS/ChFiDS_SurfData.cxx
index f66a5d9430..ab1e1bfb90 100644
--- a/src/ChFiDS/ChFiDS_SurfData.cxx
+++ b/src/ChFiDS/ChFiDS_SurfData.cxx
@@ -15,8 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <ChFiDS_CommonPoint.hxx>
-#include <ChFiDS_FaceInterference.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/ChFiDS/ChFiDS_SurfData.hxx b/src/ChFiDS/ChFiDS_SurfData.hxx
index 3113807f09..3f09cb9b63 100644
--- a/src/ChFiDS/ChFiDS_SurfData.hxx
+++ b/src/ChFiDS/ChFiDS_SurfData.hxx
@@ -18,14 +18,12 @@
 #define _ChFiDS_SurfData_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <ChFiDS_CommonPoint.hxx>
 #include <ChFiDS_FaceInterference.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <Standard_Transient.hxx>
 
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData.cxx b/src/ChFiKPart/ChFiKPart_ComputeData.cxx
index 1071c71b20..8305e9e80c 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Surface.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <ChFiDS_ChamfSpine.hxx>
 #include <ChFiDS_FilSpine.hxx>
@@ -35,53 +34,16 @@
 #include <ChFiKPart_ComputeData_FilPlnPln.hxx>
 #include <ChFiKPart_ComputeData_Rotule.hxx>
 #include <ChFiKPart_ComputeData_Sphere.hxx>
-#include <ElCLib.hxx>
-#include <ElSLib.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <Geom2d_Circle.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dInt_GInter.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_ToroidalSurface.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_SurfaceType.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <gp.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Cylinder.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Lin2d.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Vec.hxx>
-#include <IntAna_QuadQuadGeo.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
-#include <IntRes2d_Position.hxx>
-#include <IntRes2d_Transition.hxx>
-#include <IntRes2d_TypeTrans.hxx>
-#include <IntSurf_Transition.hxx>
-#include <IntSurf_TypeTrans.hxx>
-#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <TopExp.hxx>
-#include <TopOpeBRepDS_Curve.hxx>
 #include <TopOpeBRepDS_DataStructure.hxx>
-#include <TopOpeBRepDS_Surface.hxx>
 
 //#include <BRepAdaptor_Curve2d.hxx>
 //#include <BRepAdaptor_Curve2d.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_CS.hxx b/src/ChFiKPart/ChFiKPart_ComputeData_CS.hxx
index 4eb71729c3..ab010b382c 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_CS.hxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_CS.hxx
@@ -18,7 +18,6 @@
 #define ChFiKPart_ComputeData_CS_HeaderFile
 
 #include <Adaptor3d_Surface.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Cylinder.hxx>
 #include <gp_Circ.hxx>
 
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx
index 54c78ead82..812867bcdd 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_ChAsymPlnCon.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Adaptor3d_Surface.hxx>
-#include <ChFiDS_Spine.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
 #include <ChFiKPart_ComputeData_Fcts.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCon.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCon.cxx
index b0f0cb1c2f..a400a735f0 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCon.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_ChPlnCon.cxx
@@ -23,19 +23,10 @@
 #include <ChFiKPart_ComputeData_Fcts.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <Geom2d_Circle.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <gp.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Lin2d.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
 #include <TopOpeBRepDS_DataStructure.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_Fcts.hxx b/src/ChFiKPart/ChFiKPart_ComputeData_Fcts.hxx
index 10d774861e..588a643d7b 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_Fcts.hxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_Fcts.hxx
@@ -17,11 +17,7 @@
 #ifndef _ChFiKPart_ComputeData_Fcts_HeaderFile
 #define _ChFiKPart_ComputeData_Fcts_HeaderFile
 
-#include <gp_Pnt2d.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <TopOpeBRepDS_DataStructure.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx
index ca0df400fb..03b32f2a26 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnCon.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Adaptor3d_Surface.hxx>
-#include <ChFiDS_Spine.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
 #include <ChFiKPart_ComputeData_Fcts.hxx>
@@ -25,7 +24,6 @@
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_Circle.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_ToroidalSurface.hxx>
 #include <gp.hxx>
@@ -35,7 +33,6 @@
 #include <gp_Cone.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnPln.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnPln.cxx
index 096dc16dd7..a377202b87 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnPln.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_FilPlnPln.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Adaptor3d_Surface.hxx>
-#include <ChFiDS_Spine.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
 #include <ChFiKPart_ComputeData_Fcts.hxx>
@@ -26,9 +25,7 @@
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_Line.hxx>
 #include <gp.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
-#include <gp_Cylinder.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Lin.hxx>
diff --git a/src/ChFiKPart/ChFiKPart_ComputeData_Rotule.cxx b/src/ChFiKPart/ChFiKPart_ComputeData_Rotule.cxx
index 2e12faab80..57f4432200 100644
--- a/src/ChFiKPart/ChFiKPart_ComputeData_Rotule.cxx
+++ b/src/ChFiKPart/ChFiKPart_ComputeData_Rotule.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Adaptor3d_Surface.hxx>
-#include <ChFiDS_Spine.hxx>
 #include <ChFiDS_SurfData.hxx>
 #include <ChFiKPart_ComputeData.hxx>
 #include <ChFiKPart_ComputeData_Fcts.hxx>
@@ -25,7 +24,6 @@
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom_Circle.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_ToroidalSurface.hxx>
 #include <gp.hxx>
 #include <gp_Ax2.hxx>
@@ -33,8 +31,6 @@
 #include <gp_Ax22d.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Lin2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/TopExp/TopExp.hxx b/src/TopExp/TopExp.hxx
index bc3b734b9e..33b39ab7e3 100644
--- a/src/TopExp/TopExp.hxx
+++ b/src/TopExp/TopExp.hxx
@@ -25,9 +25,10 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
+#include <TopoDS_Vertex.hxx>
 #include <Standard_Boolean.hxx>
+
 class TopoDS_Shape;
-class TopoDS_Vertex;
 class TopoDS_Edge;
 class TopoDS_Wire;