diff --git a/src/CPnts/CPnts_AbscissaPoint.cxx b/src/CPnts/CPnts_AbscissaPoint.cxx
index 082a08a161..456f8b03ed 100644
--- a/src/CPnts/CPnts_AbscissaPoint.cxx
+++ b/src/CPnts/CPnts_AbscissaPoint.cxx
@@ -29,7 +29,6 @@
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <math_FunctionRoot.hxx>
diff --git a/src/CPnts/CPnts_AbscissaPoint.hxx b/src/CPnts/CPnts_AbscissaPoint.hxx
index 74deff54ff..bd6c7a6cdc 100644
--- a/src/CPnts/CPnts_AbscissaPoint.hxx
+++ b/src/CPnts/CPnts_AbscissaPoint.hxx
@@ -19,10 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <CPnts_MyRootFunction.hxx>
 class Adaptor3d_Curve;
 class Adaptor2d_Curve2d;
diff --git a/src/CPnts/CPnts_MyGaussFunction.hxx b/src/CPnts/CPnts_MyGaussFunction.hxx
index 3e313590db..0e7b02b130 100644
--- a/src/CPnts/CPnts_MyGaussFunction.hxx
+++ b/src/CPnts/CPnts_MyGaussFunction.hxx
@@ -22,9 +22,7 @@
 #include <Standard_Handle.hxx>
 
 #include <CPnts_RealFunction.hxx>
-#include <Standard_Address.hxx>
 #include <math_Function.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 
 
diff --git a/src/CPnts/CPnts_MyRootFunction.hxx b/src/CPnts/CPnts_MyRootFunction.hxx
index 357d35a02c..58be58672c 100644
--- a/src/CPnts/CPnts_MyRootFunction.hxx
+++ b/src/CPnts/CPnts_MyRootFunction.hxx
@@ -23,11 +23,8 @@
 
 #include <CPnts_MyGaussFunction.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 #include <CPnts_RealFunction.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Boolean.hxx>
 
 
 //! Implements a function for the Newton algorithm to find the
diff --git a/src/CPnts/CPnts_UniformDeflection.cxx b/src/CPnts/CPnts_UniformDeflection.cxx
index d3d6225688..f7e1422935 100644
--- a/src/CPnts/CPnts_UniformDeflection.cxx
+++ b/src/CPnts/CPnts_UniformDeflection.cxx
@@ -45,9 +45,6 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 
 static inline void D03d(const Standard_Address C, const Standard_Real U,
diff --git a/src/CPnts/CPnts_UniformDeflection.hxx b/src/CPnts/CPnts_UniformDeflection.hxx
index 11efcc63ed..03b290745a 100644
--- a/src/CPnts/CPnts_UniformDeflection.hxx
+++ b/src/CPnts/CPnts_UniformDeflection.hxx
@@ -19,11 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 class Adaptor3d_Curve;
diff --git a/src/CSLib/CSLib.hxx b/src/CSLib/CSLib.hxx
index 3021a9d971..df62e65384 100644
--- a/src/CSLib/CSLib.hxx
+++ b/src/CSLib/CSLib.hxx
@@ -21,11 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <CSLib_DerivativeStatus.hxx>
 #include <Standard_Boolean.hxx>
 #include <CSLib_NormalStatus.hxx>
-#include <Standard_Integer.hxx>
 #include <TColgp_Array2OfVec.hxx>
 class gp_Vec;
 class gp_Dir;
diff --git a/src/CSLib/CSLib_Class2d.cxx b/src/CSLib/CSLib_Class2d.cxx
index ea51544443..9bbe360eb8 100644
--- a/src/CSLib/CSLib_Class2d.cxx
+++ b/src/CSLib/CSLib_Class2d.cxx
@@ -18,7 +18,6 @@
 
 #include <CSLib_Class2d.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Standard_ConstructionError.hxx>
 
 static inline 
   Standard_Real Transform2d(const Standard_Real u,
diff --git a/src/CSLib/CSLib_Class2d.hxx b/src/CSLib/CSLib_Class2d.hxx
index 95ec8e2d29..d5bc8187ed 100644
--- a/src/CSLib/CSLib_Class2d.hxx
+++ b/src/CSLib/CSLib_Class2d.hxx
@@ -21,9 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <NCollection_Handle.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/CSLib/CSLib_NormalPolyDef.hxx b/src/CSLib/CSLib_NormalPolyDef.hxx
index 93d3ae1384..22713945b3 100644
--- a/src/CSLib/CSLib_NormalPolyDef.hxx
+++ b/src/CSLib/CSLib_NormalPolyDef.hxx
@@ -21,12 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <math_FunctionWithDerivative.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
-
 
 
 class CSLib_NormalPolyDef  : public math_FunctionWithDerivative
diff --git a/src/Contap/Contap_ArcFunction.cxx b/src/Contap/Contap_ArcFunction.cxx
index 7b1dd96759..254467a8ac 100644
--- a/src/Contap/Contap_ArcFunction.cxx
+++ b/src/Contap/Contap_ArcFunction.cxx
@@ -15,14 +15,11 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
 #include <Contap_ArcFunction.hxx>
 #include <Contap_HContTool.hxx>
 #include <Contap_HCurve2dTool.hxx>
 #include <Contap_SurfProps.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
 #include <IntSurf_Quadric.hxx>
 
 Contap_ArcFunction::Contap_ArcFunction ():
diff --git a/src/Contap/Contap_ArcFunction.hxx b/src/Contap/Contap_ArcFunction.hxx
index a9acd69523..3270f1e582 100644
--- a/src/Contap/Contap_ArcFunction.hxx
+++ b/src/Contap/Contap_ArcFunction.hxx
@@ -17,6 +17,7 @@
 #ifndef _Contap_ArcFunction_HeaderFile
 #define _Contap_ArcFunction_HeaderFile
 
+#include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Contap_TFunction.hxx>
 #include <gp_Dir.hxx>
diff --git a/src/Contap/Contap_ContAna.cxx b/src/Contap/Contap_ContAna.cxx
index 4c81c24e7a..9e684fbded 100644
--- a/src/Contap/Contap_ContAna.cxx
+++ b/src/Contap/Contap_ContAna.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Contap_ContAna.hxx>
-#include <gp.hxx>
 #include <gp_Cone.hxx>
 #include <gp_Cylinder.hxx>
 #include <gp_Dir.hxx>
diff --git a/src/Contap/Contap_ContAna.hxx b/src/Contap/Contap_ContAna.hxx
index f0384bdf0c..094f5a8f04 100644
--- a/src/Contap/Contap_ContAna.hxx
+++ b/src/Contap/Contap_ContAna.hxx
@@ -17,23 +17,20 @@
 #ifndef _Contap_ContAna_HeaderFile
 #define _Contap_ContAna_HeaderFile
 
+#include <GeomAbs_CurveType.hxx>
+#include <gp_Circ.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Pnt.hxx>
 #include <Standard.hxx>
+#include <Standard_Boolean.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <Standard_Real.hxx>
-#include <gp_Circ.hxx>
 class gp_Sphere;
 class gp_Cylinder;
 class gp_Cone;
 class gp_Lin;
 
-
 //! This class provides the computation of the contours
 //! for quadric surfaces.
 class Contap_ContAna 
diff --git a/src/Contap/Contap_Contour.cxx b/src/Contap/Contap_Contour.cxx
index 935bf5f859..90a00e7779 100644
--- a/src/Contap/Contap_Contour.cxx
+++ b/src/Contap/Contap_Contour.cxx
@@ -18,7 +18,6 @@
 #include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_HSurfaceTool.hxx>
 #include <Adaptor3d_TopolTool.hxx>
-#include <Bnd_Box.hxx>
 #include <BndLib_AddSurface.hxx>
 #include <Contap_ContAna.hxx>
 #include <Contap_Contour.hxx>
@@ -39,7 +38,6 @@
 #include <IntSurf_SequenceOfPathPoint.hxx>
 #include <math_FunctionSetRoot.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TopTrans_CurveTransition.hxx>
diff --git a/src/Contap/Contap_HContTool.cxx b/src/Contap/Contap_HContTool.cxx
index a5032f1f56..b7c9cb38da 100644
--- a/src/Contap/Contap_HContTool.cxx
+++ b/src/Contap/Contap_HContTool.cxx
@@ -15,8 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_HVertex.hxx>
 #include <Contap_HContTool.hxx>
 #include <Extrema_EPCOfExtPC2d.hxx>
diff --git a/src/Contap/Contap_HCurve2dTool.cxx b/src/Contap/Contap_HCurve2dTool.cxx
index 7eaf179b94..bc89e3af47 100644
--- a/src/Contap/Contap_HCurve2dTool.cxx
+++ b/src/Contap/Contap_HCurve2dTool.cxx
@@ -15,15 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
 #include <Contap_HCurve2dTool.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_OutOfRange.hxx>
 
 //============================================================
 Standard_Integer Contap_HCurve2dTool::NbSamples (const Handle(Adaptor2d_Curve2d)& C,
diff --git a/src/Contap/Contap_HCurve2dTool.hxx b/src/Contap/Contap_HCurve2dTool.hxx
index 0d235caa6b..a1fdc58358 100644
--- a/src/Contap/Contap_HCurve2dTool.hxx
+++ b/src/Contap/Contap_HCurve2dTool.hxx
@@ -17,30 +17,21 @@
 #ifndef _Contap_HCurve2dTool_HeaderFile
 #define _Contap_HCurve2dTool_HeaderFile
 
+#include <Adaptor2d_Curve2d.hxx>
+#include <GeomAbs_Shape.hxx>
 #include <Standard.hxx>
+#include <Standard_Boolean.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-
-#include <Standard_Real.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Boolean.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <gp_Lin2d.hxx>
-#include <gp_Circ2d.hxx>
-#include <gp_Elips2d.hxx>
-#include <gp_Hypr2d.hxx>
-#include <gp_Parab2d.hxx>
+
 class gp_Pnt2d;
 class gp_Vec2d;
 class Geom2d_BezierCurve;
 class Geom2d_BSplineCurve;
 
-
-
 class Contap_HCurve2dTool 
 {
 public:
diff --git a/src/Contap/Contap_Line.cxx b/src/Contap/Contap_Line.cxx
index 187f6b4b49..f8130a6f68 100644
--- a/src/Contap/Contap_Line.cxx
+++ b/src/Contap/Contap_Line.cxx
@@ -21,9 +21,7 @@
 #include <gp_Circ.hxx>
 #include <gp_Lin.hxx>
 #include <IntSurf_LineOn2S.hxx>
-#include <IntSurf_PntOn2S.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
 
 Contap_Line::Contap_Line () {
   svtx = new Contap_TheHSequenceOfPoint ();
diff --git a/src/Contap/Contap_Line.hxx b/src/Contap/Contap_Line.hxx
index 8ac4aedb6a..4c5aeb63af 100644
--- a/src/Contap/Contap_Line.hxx
+++ b/src/Contap/Contap_Line.hxx
@@ -17,27 +17,22 @@
 #ifndef _Contap_Line_HeaderFile
 #define _Contap_Line_HeaderFile
 
+#include <Contap_IType.hxx>
+#include <Contap_TheHSequenceOfPoint.hxx>
+#include <gp_Dir.hxx>
+#include <gp_Pnt.hxx>
+#include <IntSurf_TypeTrans.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-
-#include <IntSurf_TypeTrans.hxx>
-#include <Contap_TheHSequenceOfPoint.hxx>
-#include <Contap_IType.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Circ.hxx>
+
 class IntSurf_LineOn2S;
 class IntSurf_PntOn2S;
 class gp_Lin;
 class gp_Circ;
 class Contap_Point;
 
-
-
 class Contap_Line 
 {
 public:
diff --git a/src/Contap/Contap_Point.cxx b/src/Contap/Contap_Point.cxx
index 2549c34b62..59ed466279 100644
--- a/src/Contap/Contap_Point.cxx
+++ b/src/Contap/Contap_Point.cxx
@@ -15,12 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_HVertex.hxx>
 #include <Contap_Point.hxx>
 #include <gp_Pnt.hxx>
-#include <IntSurf_Transition.hxx>
-#include <Standard_DomainError.hxx>
 
 Contap_Point::Contap_Point ():
 uparam(0.0), vparam(0.0), paraline(0.0),
diff --git a/src/Contap/Contap_Point.hxx b/src/Contap/Contap_Point.hxx
index 56a550f28e..a17f7cb007 100644
--- a/src/Contap/Contap_Point.hxx
+++ b/src/Contap/Contap_Point.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <IntSurf_Transition.hxx>
 
 class Adaptor3d_HVertex;
diff --git a/src/Contap/Contap_SurfFunction.cxx b/src/Contap/Contap_SurfFunction.cxx
index a09efd2c4c..4d2fadd9af 100644
--- a/src/Contap/Contap_SurfFunction.cxx
+++ b/src/Contap/Contap_SurfFunction.cxx
@@ -16,14 +16,12 @@
 
 // jag 940616 Tolpetit = 1.e-16
 
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_HSurfaceTool.hxx>
 #include <Contap_HContTool.hxx>
 #include <Contap_SurfFunction.hxx>
 #include <Contap_SurfProps.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Dir2d.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <math_Matrix.hxx>
 #include <StdFail_UndefinedDerivative.hxx>
diff --git a/src/Contap/Contap_SurfProps.cxx b/src/Contap/Contap_SurfProps.cxx
index 81deb40646..f60050dd8c 100644
--- a/src/Contap/Contap_SurfProps.cxx
+++ b/src/Contap/Contap_SurfProps.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_HSurfaceTool.hxx>
 #include <Contap_SurfProps.hxx>
 #include <ElSLib.hxx>
diff --git a/src/Convert/Convert_CircleToBSplineCurve.cxx b/src/Convert/Convert_CircleToBSplineCurve.cxx
index be06a04952..1890f698bd 100644
--- a/src/Convert/Convert_CircleToBSplineCurve.cxx
+++ b/src/Convert/Convert_CircleToBSplineCurve.cxx
@@ -22,10 +22,8 @@
 #include <gp_Trsf2d.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
 //Attention :
diff --git a/src/Convert/Convert_CircleToBSplineCurve.hxx b/src/Convert/Convert_CircleToBSplineCurve.hxx
index 528298f371..9337d7efbc 100644
--- a/src/Convert/Convert_CircleToBSplineCurve.hxx
+++ b/src/Convert/Convert_CircleToBSplineCurve.hxx
@@ -23,7 +23,6 @@
 
 #include <Convert_ConicToBSplineCurve.hxx>
 #include <Convert_ParameterisationType.hxx>
-#include <Standard_Real.hxx>
 class gp_Circ2d;
 
 
diff --git a/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.cxx b/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.cxx
index e02aa0b5f5..9582478e01 100644
--- a/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.cxx
+++ b/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.cxx
@@ -21,8 +21,6 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <PLib.hxx>
-#include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 
 //=======================================================================
diff --git a/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.hxx b/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.hxx
index 44d102dce9..7201ac59ad 100644
--- a/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.hxx
+++ b/src/Convert/Convert_CompBezierCurves2dToBSplineCurve2d.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Convert_SequenceOfArray1OfPoles2d.hxx>
 #include <TColgp_SequenceOfPnt2d.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/Convert/Convert_CompBezierCurvesToBSplineCurve.cxx b/src/Convert/Convert_CompBezierCurvesToBSplineCurve.cxx
index 234c5d4033..8e90f10df9 100644
--- a/src/Convert/Convert_CompBezierCurvesToBSplineCurve.cxx
+++ b/src/Convert/Convert_CompBezierCurvesToBSplineCurve.cxx
@@ -20,9 +20,7 @@
 #include <gp.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <PLib.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 
 //=======================================================================
diff --git a/src/Convert/Convert_CompBezierCurvesToBSplineCurve.hxx b/src/Convert/Convert_CompBezierCurvesToBSplineCurve.hxx
index 8a76451b8b..adeb2ee599 100644
--- a/src/Convert/Convert_CompBezierCurvesToBSplineCurve.hxx
+++ b/src/Convert/Convert_CompBezierCurvesToBSplineCurve.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Convert_SequenceOfArray1OfPoles.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/Convert/Convert_CompPolynomialToPoles.cxx b/src/Convert/Convert_CompPolynomialToPoles.cxx
index 1399723aef..8d0043c453 100644
--- a/src/Convert/Convert_CompPolynomialToPoles.cxx
+++ b/src/Convert/Convert_CompPolynomialToPoles.cxx
@@ -29,7 +29,6 @@
 #include <Convert_CompPolynomialToPoles.hxx>
 #include <PLib.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
diff --git a/src/Convert/Convert_CompPolynomialToPoles.hxx b/src/Convert/Convert_CompPolynomialToPoles.hxx
index eb813f0cea..8af181c7a3 100644
--- a/src/Convert/Convert_CompPolynomialToPoles.hxx
+++ b/src/Convert/Convert_CompPolynomialToPoles.hxx
@@ -25,7 +25,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfReal.hxx>
diff --git a/src/Convert/Convert_ConeToBSplineSurface.hxx b/src/Convert/Convert_ConeToBSplineSurface.hxx
index 9e382ce475..b7af1a3f52 100644
--- a/src/Convert/Convert_ConeToBSplineSurface.hxx
+++ b/src/Convert/Convert_ConeToBSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ElementarySurfaceToBSplineSurface.hxx>
-#include <Standard_Real.hxx>
 class gp_Cone;
 
 
diff --git a/src/Convert/Convert_ConicToBSplineCurve.cxx b/src/Convert/Convert_ConicToBSplineCurve.cxx
index b4945f7953..01640adbcf 100644
--- a/src/Convert/Convert_ConicToBSplineCurve.cxx
+++ b/src/Convert/Convert_ConicToBSplineCurve.cxx
@@ -21,10 +21,8 @@
 #include <Convert_ConicToBSplineCurve.hxx>
 #include <Convert_CosAndSinEvalFunction.hxx>
 #include <Convert_PolynomialCosAndSin.hxx>
-#include <gp.hxx>
 #include <gp_Pnt2d.hxx>
 #include <PLib.hxx>
-#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
diff --git a/src/Convert/Convert_ConicToBSplineCurve.hxx b/src/Convert/Convert_ConicToBSplineCurve.hxx
index 1483e567cc..88c219be62 100644
--- a/src/Convert/Convert_ConicToBSplineCurve.hxx
+++ b/src/Convert/Convert_ConicToBSplineCurve.hxx
@@ -25,8 +25,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Convert_ParameterisationType.hxx>
 class gp_Pnt2d;
 
diff --git a/src/Convert/Convert_CylinderToBSplineSurface.hxx b/src/Convert/Convert_CylinderToBSplineSurface.hxx
index 590d93e5e1..034ac1642e 100644
--- a/src/Convert/Convert_CylinderToBSplineSurface.hxx
+++ b/src/Convert/Convert_CylinderToBSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ElementarySurfaceToBSplineSurface.hxx>
-#include <Standard_Real.hxx>
 class gp_Cylinder;
 
 
diff --git a/src/Convert/Convert_ElementarySurfaceToBSplineSurface.hxx b/src/Convert/Convert_ElementarySurfaceToBSplineSurface.hxx
index 1259609b58..22b126bd97 100644
--- a/src/Convert/Convert_ElementarySurfaceToBSplineSurface.hxx
+++ b/src/Convert/Convert_ElementarySurfaceToBSplineSurface.hxx
@@ -25,9 +25,7 @@
 #include <TColStd_Array2OfReal.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class gp_Pnt;
 
 
diff --git a/src/Convert/Convert_EllipseToBSplineCurve.cxx b/src/Convert/Convert_EllipseToBSplineCurve.cxx
index 4e8aeb593a..c4e239e632 100644
--- a/src/Convert/Convert_EllipseToBSplineCurve.cxx
+++ b/src/Convert/Convert_EllipseToBSplineCurve.cxx
@@ -22,10 +22,8 @@
 #include <gp_Trsf2d.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
 //Attention :
diff --git a/src/Convert/Convert_EllipseToBSplineCurve.hxx b/src/Convert/Convert_EllipseToBSplineCurve.hxx
index 4d038ba903..3a97ba1403 100644
--- a/src/Convert/Convert_EllipseToBSplineCurve.hxx
+++ b/src/Convert/Convert_EllipseToBSplineCurve.hxx
@@ -23,7 +23,6 @@
 
 #include <Convert_ConicToBSplineCurve.hxx>
 #include <Convert_ParameterisationType.hxx>
-#include <Standard_Real.hxx>
 class gp_Elips2d;
 
 
diff --git a/src/Convert/Convert_GridPolynomialToPoles.hxx b/src/Convert/Convert_GridPolynomialToPoles.hxx
index 71e3a0a564..a7a7c7db09 100644
--- a/src/Convert/Convert_GridPolynomialToPoles.hxx
+++ b/src/Convert/Convert_GridPolynomialToPoles.hxx
@@ -25,7 +25,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColgp_HArray2OfPnt.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
 
 
diff --git a/src/Convert/Convert_HyperbolaToBSplineCurve.cxx b/src/Convert/Convert_HyperbolaToBSplineCurve.cxx
index 5c17d193f4..af6495a765 100644
--- a/src/Convert/Convert_HyperbolaToBSplineCurve.cxx
+++ b/src/Convert/Convert_HyperbolaToBSplineCurve.cxx
@@ -16,11 +16,9 @@
 
 #include <Convert_HyperbolaToBSplineCurve.hxx>
 #include <gp.hxx>
-#include <gp_Ax2d.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Hypr2d.hxx>
 #include <gp_Trsf2d.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
diff --git a/src/Convert/Convert_HyperbolaToBSplineCurve.hxx b/src/Convert/Convert_HyperbolaToBSplineCurve.hxx
index 0b1501a05a..7e503c7044 100644
--- a/src/Convert/Convert_HyperbolaToBSplineCurve.hxx
+++ b/src/Convert/Convert_HyperbolaToBSplineCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ConicToBSplineCurve.hxx>
-#include <Standard_Real.hxx>
 class gp_Hypr2d;
 
 
diff --git a/src/Convert/Convert_ParabolaToBSplineCurve.cxx b/src/Convert/Convert_ParabolaToBSplineCurve.cxx
index fae6ba5698..a3b653caa7 100644
--- a/src/Convert/Convert_ParabolaToBSplineCurve.cxx
+++ b/src/Convert/Convert_ParabolaToBSplineCurve.cxx
@@ -16,11 +16,9 @@
 
 #include <Convert_ParabolaToBSplineCurve.hxx>
 #include <gp.hxx>
-#include <gp_Ax2d.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Parab2d.hxx>
 #include <gp_Trsf2d.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
diff --git a/src/Convert/Convert_ParabolaToBSplineCurve.hxx b/src/Convert/Convert_ParabolaToBSplineCurve.hxx
index ef0cd30af8..ffc915552f 100644
--- a/src/Convert/Convert_ParabolaToBSplineCurve.hxx
+++ b/src/Convert/Convert_ParabolaToBSplineCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ConicToBSplineCurve.hxx>
-#include <Standard_Real.hxx>
 class gp_Parab2d;
 
 
diff --git a/src/Convert/Convert_PolynomialCosAndSin.cxx b/src/Convert/Convert_PolynomialCosAndSin.cxx
index 19147aa09f..a5ea810290 100644
--- a/src/Convert/Convert_PolynomialCosAndSin.cxx
+++ b/src/Convert/Convert_PolynomialCosAndSin.cxx
@@ -16,23 +16,18 @@
 
 #include <Convert_PolynomialCosAndSin.hxx>
 
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <gp_Trsf2d.hxx>
 #include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
 #include <gp_XY.hxx>
 
 #include <gp.hxx>
 #include <Precision.hxx>
-#include <PLib.hxx>
 #include <BSplCLib.hxx>
 
-#include <Standard_ConstructionError.hxx>
-
 static Standard_Real Locate(const Standard_Real Angfin,
-			    const TColgp_Array1OfPnt2d& TPoles,
-			    const Standard_Real Umin,
-			    const Standard_Real Umax)
+                            const TColgp_Array1OfPnt2d& TPoles,
+                            const Standard_Real Umin,
+                            const Standard_Real Umax)
 {
   Standard_Real umin = Umin;
   Standard_Real umax = Umax;
diff --git a/src/Convert/Convert_SphereToBSplineSurface.hxx b/src/Convert/Convert_SphereToBSplineSurface.hxx
index 57b139f632..61ed9af536 100644
--- a/src/Convert/Convert_SphereToBSplineSurface.hxx
+++ b/src/Convert/Convert_SphereToBSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ElementarySurfaceToBSplineSurface.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 class gp_Sphere;
 
diff --git a/src/Convert/Convert_TorusToBSplineSurface.hxx b/src/Convert/Convert_TorusToBSplineSurface.hxx
index bbce8280a6..e2c06a4a81 100644
--- a/src/Convert/Convert_TorusToBSplineSurface.hxx
+++ b/src/Convert/Convert_TorusToBSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Convert_ElementarySurfaceToBSplineSurface.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 class gp_Torus;
 
diff --git a/src/DBRep/DBRep.cxx b/src/DBRep/DBRep.cxx
index 9633b081c9..9fc4e74a2d 100644
--- a/src/DBRep/DBRep.cxx
+++ b/src/DBRep/DBRep.cxx
@@ -24,17 +24,13 @@
 #include <BRepTools_WireExplorer.hxx>
 #include <BinTools.hxx>
 #include <DBRep_DrawableShape.hxx>
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_ProgressIndicator.hxx>
 #include <Message_ProgressRange.hxx>
 #include <Draw_Segment3D.hxx>
-#include <gp_Ax2.hxx>
-#include <GProp.hxx>
 #include <GProp_GProps.hxx>
 #include <NCollection_Vector.hxx>
 #include <OSD_FileSystem.hxx>
-#include <Precision.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TopAbs.hxx>
@@ -44,7 +40,6 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 #include <stdio.h>
diff --git a/src/DBRep/DBRep.hxx b/src/DBRep/DBRep.hxx
index 3d069d0ecb..626b6e0854 100644
--- a/src/DBRep/DBRep.hxx
+++ b/src/DBRep/DBRep.hxx
@@ -19,7 +19,6 @@
 
 #include <DBRep_Params.hxx>
 #include <Draw_Interpretor.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
 //! Used to display BRep objects  using the DrawTrSurf
diff --git a/src/DBRep/DBRep_Debug.cxx b/src/DBRep/DBRep_Debug.cxx
index 672b2f2252..9744aef31a 100644
--- a/src/DBRep/DBRep_Debug.cxx
+++ b/src/DBRep/DBRep_Debug.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <DBRep.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
@@ -23,7 +22,6 @@
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_Array1OfShape.hxx>
 #include <NCollection_Vector.hxx>
-#include <TopoDS_Compound.hxx>
 #include <BRep_Builder.hxx>
 
 // This file defines global functions not declared in any public header,
diff --git a/src/DBRep/DBRep_DrawableShape.cxx b/src/DBRep/DBRep_DrawableShape.cxx
index b5d661fda8..95308e8ee9 100644
--- a/src/DBRep/DBRep_DrawableShape.cxx
+++ b/src/DBRep/DBRep_DrawableShape.cxx
@@ -16,8 +16,6 @@
 
 #include <DBRep_DrawableShape.hxx>
 
-#include <Adaptor3d_Curve.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
@@ -36,9 +34,6 @@
 #include <Draw_Display.hxx>
 #include <Draw_ProgressIndicator.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <GeomAdaptor_Surface.hxx>
-#include <gp_Lin2d.hxx>
 #include <gp_Trsf.hxx>
 #include <Message_ProgressIndicator.hxx>
 #include <HLRBRep.hxx>
@@ -47,12 +42,8 @@
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
 #include <TColStd_DataMapOfIntegerInteger.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -60,7 +51,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DBRep_DrawableShape,Draw_Drawable3D)
 
diff --git a/src/DBRep/DBRep_Edge.hxx b/src/DBRep/DBRep_Edge.hxx
index 44ce120627..b3b594abc3 100644
--- a/src/DBRep/DBRep_Edge.hxx
+++ b/src/DBRep/DBRep_Edge.hxx
@@ -18,7 +18,6 @@
 #define _DBRep_Edge_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopoDS_Edge.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/DBRep/DBRep_Face.hxx b/src/DBRep/DBRep_Face.hxx
index 26f3fe766e..25c9bcbebc 100644
--- a/src/DBRep/DBRep_Face.hxx
+++ b/src/DBRep/DBRep_Face.hxx
@@ -18,7 +18,6 @@
 #define _DBRep_Face_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/DBRep/DBRep_HideData.hxx b/src/DBRep/DBRep_HideData.hxx
index c08f2b863c..707c35e419 100644
--- a/src/DBRep/DBRep_HideData.hxx
+++ b/src/DBRep/DBRep_HideData.hxx
@@ -21,9 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <gp_Trsf.hxx>
-#include <Standard_Real.hxx>
 #include <HLRBRep_ListOfBPoint.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/DBRep/DBRep_IsoBuilder.cxx b/src/DBRep/DBRep_IsoBuilder.cxx
index 0ee9f47059..03e442b574 100644
--- a/src/DBRep/DBRep_IsoBuilder.cxx
+++ b/src/DBRep/DBRep_IsoBuilder.cxx
@@ -36,7 +36,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
 
 #include <NCollection_IndexedDataMap.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>
diff --git a/src/DBRep/DBRep_IsoBuilder.hxx b/src/DBRep/DBRep_IsoBuilder.hxx
index 153dd09c4f..b9a2018d60 100644
--- a/src/DBRep/DBRep_IsoBuilder.hxx
+++ b/src/DBRep/DBRep_IsoBuilder.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/DDF/DDF.cxx b/src/DDF/DDF.cxx
index 90ba1cca81..fe59d15f46 100644
--- a/src/DDF/DDF.cxx
+++ b/src/DDF/DDF.cxx
@@ -23,11 +23,6 @@
 #include <Draw.hxx>
 #include <Standard_GUID.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TColStd_ListOfInteger.hxx>
-#include <TDF_Attribute.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
diff --git a/src/DDF/DDF.hxx b/src/DDF/DDF.hxx
index 993f02760c..dccd812408 100644
--- a/src/DDF/DDF.hxx
+++ b/src/DDF/DDF.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Draw_Interpretor.hxx>
 class TDF_Data;
 class TDF_Label;
diff --git a/src/DDF/DDF_AttributeBrowser.hxx b/src/DDF/DDF_AttributeBrowser.hxx
index 42eae75a66..fe614d35cd 100644
--- a/src/DDF/DDF_AttributeBrowser.hxx
+++ b/src/DDF/DDF_AttributeBrowser.hxx
@@ -24,7 +24,6 @@
 #ifndef DDF_AttributeBrowser_HeaderFile
 #define DDF_AttributeBrowser_HeaderFile
 
-#include <Standard_Boolean.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Attribute.hxx>
 
diff --git a/src/DDF/DDF_BasicCommands.cxx b/src/DDF/DDF_BasicCommands.cxx
index a3994bdedd..bd9201670f 100644
--- a/src/DDF/DDF_BasicCommands.cxx
+++ b/src/DDF/DDF_BasicCommands.cxx
@@ -23,36 +23,20 @@
 #include <DDF.hxx>
 
 #include <TDF_ComparisonTool.hxx>
-#include <TDF_CopyTool.hxx>
-#include <TDF_ClosureMode.hxx>
-#include <TDF_ClosureTool.hxx>
 
 #include <DDF_Data.hxx>
 
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_NotImplemented.hxx>
 
-#include <TColStd_HSequenceOfAsciiString.hxx>
-#include <TColStd_ListOfInteger.hxx>
-#include <TColStd_SequenceOfAsciiString.hxx>
-
 #include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 
-#include <TDF_Attribute.hxx>
-#include <TDF_TagSource.hxx>
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Data.hxx>
-#include <TDF_DataSet.hxx>
-#include <TDF_Delta.hxx>
 #include <TDF_IDFilter.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_DerivedAttribute.hxx>
 
diff --git a/src/DDF/DDF_Browser.cxx b/src/DDF/DDF_Browser.cxx
index d9ee57b68a..af9799913c 100644
--- a/src/DDF/DDF_Browser.cxx
+++ b/src/DDF/DDF_Browser.cxx
@@ -24,9 +24,7 @@
 #include <Draw_Drawable3D.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 #include <TDataStd_Name.hxx>
-#include <TDF.hxx>
 #include <TDF_Attribute.hxx>
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
diff --git a/src/DDF/DDF_BrowserCommands.cxx b/src/DDF/DDF_BrowserCommands.cxx
index 83e187fde1..8a392bd58c 100644
--- a/src/DDF/DDF_BrowserCommands.cxx
+++ b/src/DDF/DDF_BrowserCommands.cxx
@@ -17,27 +17,18 @@
 
 #include <DDF.hxx>
 #include <DDF_Browser.hxx>
-#include <DDF_Data.hxx>
 
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Message.hxx>
 
 #include <TDF_Label.hxx>
 #include <TDF_ChildIterator.hxx>
-#include <TDF_AttributeIterator.hxx>
 #include <TDF_Tool.hxx>
 
 #include <TCollection_AsciiString.hxx>
-#include <TCollection_HAsciiString.hxx>
 #include <OSD_File.hxx>
 
-#ifdef _MSC_VER
-#include <stdio.h>
-#endif
-
 //=======================================================================
 //function : DFBrowse
 //purpose  : 
diff --git a/src/DDF/DDF_Data.cxx b/src/DDF/DDF_Data.cxx
index 3f2af36638..dd973ccfb9 100644
--- a/src/DDF/DDF_Data.cxx
+++ b/src/DDF/DDF_Data.cxx
@@ -22,14 +22,9 @@
 #include <DDF_Data.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TDF_Attribute.hxx>
 #include <TDF_AttributeIterator.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Data.hxx>
-#include <TDF_IDFilter.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
diff --git a/src/DDF/DDF_Data.hxx b/src/DDF/DDF_Data.hxx
index 80fc9f0afa..a7b3795eea 100644
--- a/src/DDF/DDF_Data.hxx
+++ b/src/DDF/DDF_Data.hxx
@@ -17,7 +17,6 @@
 #define _DDF_Data_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Draw_Drawable3D.hxx>
 #include <Standard_OStream.hxx>
diff --git a/src/DDF/DDF_DataCommands.cxx b/src/DDF/DDF_DataCommands.cxx
index 1b78a6bb73..d189c160ed 100644
--- a/src/DDF/DDF_DataCommands.cxx
+++ b/src/DDF/DDF_DataCommands.cxx
@@ -28,25 +28,20 @@
 #include <DDF.hxx>
 #include <DDF_Data.hxx>
 
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Drawable3D.hxx>
 #include <Draw_Interpretor.hxx>
 
 #include <Standard_NotImplemented.hxx>
 
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_DataSet.hxx>
-#include <TDF_IDFilter.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_CopyLabel.hxx>
-#include <TDF_CopyLabel.hxx>
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_AttributeMap.hxx>
-#include <TDF_MapIteratorOfAttributeMap.hxx>
 
 
 //=======================================================================
diff --git a/src/DDF/DDF_Transaction.cxx b/src/DDF/DDF_Transaction.cxx
index 07cedf674a..26946d1d19 100644
--- a/src/DDF/DDF_Transaction.cxx
+++ b/src/DDF/DDF_Transaction.cxx
@@ -19,8 +19,6 @@
 //		0.0	Nov  4 1997	Creation
 
 #include <DDF_Transaction.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Delta.hxx>
diff --git a/src/DDF/DDF_Transaction.hxx b/src/DDF/DDF_Transaction.hxx
index 8a6a47629c..2e33afa2f2 100644
--- a/src/DDF/DDF_Transaction.hxx
+++ b/src/DDF/DDF_Transaction.hxx
@@ -17,12 +17,10 @@
 #define _DDF_Transaction_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TDF_Transaction.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class TDF_Data;
 class TDF_Delta;
 
diff --git a/src/DDF/DDF_TransactionCommands.cxx b/src/DDF/DDF_TransactionCommands.cxx
index 1b1cd0bc07..4359fea098 100644
--- a/src/DDF/DDF_TransactionCommands.cxx
+++ b/src/DDF/DDF_TransactionCommands.cxx
@@ -22,17 +22,13 @@
 
 #include <DDF.hxx>
 #include <DDF_Data.hxx>
-#include <DDF_Transaction.hxx>
 #include <DDF_TransactionStack.hxx>
 
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Interpretor.hxx>
 
 #include <TDF_Data.hxx>
 #include <TDF_Delta.hxx>
-#include <TDF_Transaction.hxx>
 
 static DDF_TransactionStack DDF_TStack;
 static Handle(TDF_Delta)    DDF_LastDelta;
diff --git a/src/DDataStd/DDataStd.cxx b/src/DDataStd/DDataStd.cxx
index 17eed9346e..43c655d098 100644
--- a/src/DDataStd/DDataStd.cxx
+++ b/src/DDataStd/DDataStd.cxx
@@ -16,7 +16,6 @@
 
 
 #include <DDataStd.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TDataStd.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_RealEnum.hxx>
diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx
index 3cc31d1017..03a058eee2 100644
--- a/src/DDataStd/DDataStd_BasicCommands.cxx
+++ b/src/DDataStd/DDataStd_BasicCommands.cxx
@@ -16,44 +16,25 @@
 
 #include <DDataStd.hxx>
 
-#include <Standard_PCharacter.hxx>
-
-#include <DDF.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
-#include <DrawTrSurf.hxx>
 
 #include <DDF.hxx>
 #include <Message.hxx>
 
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_Tool.hxx>
 #include <TDF_AttributeSequence.hxx>
-#include <TDF_AttributeList.hxx>
-#include <TDF_ListIteratorOfAttributeList.hxx>
 
 #include <BRep_Tool.hxx>
 #include <DBRep.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pln.hxx>
-
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
 // LES ATTRIBUTES
-#include <TDataStd.hxx>
 #include <TDataXtd_Triangulation.hxx>
 #include <TDataStd_Comment.hxx>
 #include <TDataStd_Name.hxx>
@@ -74,19 +55,12 @@
 
 #include <TDataStd_NamedData.hxx>
 #include <TColStd_DataMapOfStringInteger.hxx>
-#include <TColStd_DataMapIteratorOfDataMapOfStringInteger.hxx>
 #include <TDataStd_DataMapOfStringReal.hxx>
-#include <TDataStd_DataMapIteratorOfDataMapOfStringReal.hxx>
 #include <TDataStd_DataMapOfStringByte.hxx>
-#include <TDataStd_DataMapIteratorOfDataMapOfStringByte.hxx>
 #include <TDataStd_DataMapOfStringString.hxx>
-#include <TDataStd_DataMapIteratorOfDataMapOfStringString.hxx>
 #include <TDataStd_DataMapOfStringHArray1OfInteger.hxx>
-#include <TDataStd_DataMapIteratorOfDataMapOfStringHArray1OfInteger.hxx>
 #include <TDataStd_DataMapOfStringHArray1OfReal.hxx>
-#include <TDataStd_DataMapIteratorOfDataMapOfStringHArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <TDataStd_AsciiString.hxx>
 #include <TDataStd_IntPackedMap.hxx>
 #include <TColStd_HPackedMapOfInteger.hxx>
@@ -94,12 +68,10 @@
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 #include <TDataStd_ByteArray.hxx>
 #include <TDataStd_ListIteratorOfListOfByte.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 #include <TDataStd_ReferenceArray.hxx>
 #include <TDataStd_ExtStringList.hxx>
 #include <TDataStd_ReferenceList.hxx>
-#include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
 
 #include <algorithm>
diff --git a/src/DDataStd/DDataStd_ConstraintCommands.cxx b/src/DDataStd/DDataStd_ConstraintCommands.cxx
index 4b616c9f59..f205f92d24 100644
--- a/src/DDataStd/DDataStd_ConstraintCommands.cxx
+++ b/src/DDataStd/DDataStd_ConstraintCommands.cxx
@@ -27,7 +27,6 @@
 
 #include <TNaming_NamedShape.hxx>
 
-#include <TDataXtd.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataXtd_Constraint.hxx>
diff --git a/src/DDataStd/DDataStd_DatumCommands.cxx b/src/DDataStd/DDataStd_DatumCommands.cxx
index 407ba64564..9ac1facc15 100644
--- a/src/DDataStd/DDataStd_DatumCommands.cxx
+++ b/src/DDataStd/DDataStd_DatumCommands.cxx
@@ -25,23 +25,13 @@
 #include <DBRep.hxx>
 #include <DrawTrSurf.hxx>
 
-#include <TopAbs.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
 
 #include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 
 #include <gp_Pnt.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Ax3.hxx>
 
 #include <TDataXtd_Geometry.hxx>
 #include <TDataXtd_Point.hxx>
diff --git a/src/DDataStd/DDataStd_DrawDisplayCommands.cxx b/src/DDataStd/DDataStd_DrawDisplayCommands.cxx
index 9fff964810..5917063b9a 100644
--- a/src/DDataStd/DDataStd_DrawDisplayCommands.cxx
+++ b/src/DDataStd/DDataStd_DrawDisplayCommands.cxx
@@ -16,41 +16,16 @@
 
 #include <DDataStd.hxx>
 #include <DDF.hxx>
-#include <Draw.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Viewer.hxx>
-#include <Draw_ColorKind.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <gp_Trsf.hxx>   
 #include <gp_Pnt.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
-#include <Precision.hxx> 
-#include <TopAbs.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Vertex.hxx> 
-#include <TopAbs.hxx>
-#include <TDF_AttributeList.hxx>
-#include <TDF_ListIteratorOfAttributeList.hxx>
 #include <TNaming_Tool.hxx>
 #include <TDF_ChildIterator.hxx>
-#include <TDF_LabelList.hxx>
-#include <TDF_ListIteratorOfLabelList.hxx>
-#include <TDF_Tool.hxx> 
-#include <TNaming_NamedShape.hxx>
 #include <TDataXtd_Point.hxx>
-#include <TDataXtd_Axis.hxx>
-#include <TDataXtd_Geometry.hxx>
-#include <TDataXtd_Constraint.hxx> 
-#include <ElSLib.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Compound.hxx>
 
 #include <DDataStd_DrawPresentation.hxx>
-#include <DDataStd_DrawDriver.hxx>
 #include <Message.hxx>
 
 #ifndef _WIN32
diff --git a/src/DDataStd/DDataStd_DrawDriver.cxx b/src/DDataStd/DDataStd_DrawDriver.cxx
index 2f5654f5e0..65bbcdeaee 100644
--- a/src/DDataStd/DDataStd_DrawDriver.cxx
+++ b/src/DDataStd/DDataStd_DrawDriver.cxx
@@ -16,16 +16,11 @@
 
 
 #include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
-#include <DBRep.hxx>
 #include <DBRep_DrawableShape.hxx>
-#include <DDataStd.hxx>
 #include <DDataStd_DrawDriver.hxx>
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Axis3D.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Draw_Marker3D.hxx>
 #include <DrawDim_Angle.hxx>
 #include <DrawDim_Distance.hxx>
 #include <DrawDim_PlanarAngle.hxx>
@@ -33,15 +28,7 @@
 #include <DrawDim_PlanarDistance.hxx>
 #include <DrawDim_PlanarRadius.hxx>
 #include <DrawDim_Radius.hxx>
-#include <DrawTrSurf_Surface.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <Geom_Plane.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Pln.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TDataStd.hxx>
-#include <TDataStd_Integer.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataXtd_Axis.hxx>
 #include <TDataXtd_Constraint.hxx>
@@ -49,15 +36,10 @@
 #include <TDataXtd_GeometryEnum.hxx>
 #include <TDataXtd_Plane.hxx>
 #include <TDataXtd_Point.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_LabelList.hxx>
-#include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDF_Tool.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Tool.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DDataStd_DrawDriver,Standard_Transient)
diff --git a/src/DDataStd/DDataStd_DrawDriver.hxx b/src/DDataStd/DDataStd_DrawDriver.hxx
index b5cedf4006..cd971be1c3 100644
--- a/src/DDataStd/DDataStd_DrawDriver.hxx
+++ b/src/DDataStd/DDataStd_DrawDriver.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Draw_ColorKind.hxx>
-#include <Standard_Boolean.hxx>
 class Draw_Drawable3D;
 class TDF_Label;
 class TDataXtd_Constraint;
diff --git a/src/DDataStd/DDataStd_DrawPresentation.cxx b/src/DDataStd/DDataStd_DrawPresentation.cxx
index 6f99dac5ad..2a69febaa7 100644
--- a/src/DDataStd/DDataStd_DrawPresentation.cxx
+++ b/src/DDataStd/DDataStd_DrawPresentation.cxx
@@ -18,7 +18,6 @@
 #include <DDataStd_DrawDriver.hxx>
 #include <DDataStd_DrawPresentation.hxx>
 #include <Draw.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Viewer.hxx>
 #include <Standard_GUID.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/DDataStd/DDataStd_DrawPresentation.hxx b/src/DDataStd/DDataStd_DrawPresentation.hxx
index 3261fe45b8..793e2d5a6d 100644
--- a/src/DDataStd/DDataStd_DrawPresentation.hxx
+++ b/src/DDataStd/DDataStd_DrawPresentation.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TDF_Attribute.hxx>
 class Draw_Drawable3D;
 class TDF_Label;
diff --git a/src/DDataStd/DDataStd_NameCommands.cxx b/src/DDataStd/DDataStd_NameCommands.cxx
index 321422749d..4a537a1658 100644
--- a/src/DDataStd/DDataStd_NameCommands.cxx
+++ b/src/DDataStd/DDataStd_NameCommands.cxx
@@ -15,26 +15,18 @@
 // commercial license or contractual agreement.
 
 #include <DDataStd.hxx>
-#include <DDF.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
-#include <DrawTrSurf.hxx>
 
 #include <DDF.hxx>
 
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_Tool.hxx>
-#include <TDF_AttributeSequence.hxx>
-#include <TDF_AttributeList.hxx>
-#include <TDF_ListIteratorOfAttributeList.hxx>
 
 // ATTRIBUTES
 
-#include <TDataStd.hxx>
 #include <TDataStd_Name.hxx>
 
-#include <TCollection_AsciiString.hxx>
 #include <TDataStd_ListOfExtendedString.hxx>
 
 
diff --git a/src/DDataStd/DDataStd_NamedShapeCommands.cxx b/src/DDataStd/DDataStd_NamedShapeCommands.cxx
index 7173f59efe..3c09803752 100644
--- a/src/DDataStd/DDataStd_NamedShapeCommands.cxx
+++ b/src/DDataStd/DDataStd_NamedShapeCommands.cxx
@@ -24,15 +24,12 @@
 #include <TDF_Label.hxx>
 
 #include <DBRep.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS.hxx>
 
 
 // LES ATTRIBUTES
 
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Builder.hxx>
-#include <TNaming_Tool.hxx>
 
 
 //=======================================================================
diff --git a/src/DDataStd/DDataStd_ObjectCommands.cxx b/src/DDataStd/DDataStd_ObjectCommands.cxx
index b5d3d93174..802a99bfd4 100644
--- a/src/DDataStd/DDataStd_ObjectCommands.cxx
+++ b/src/DDataStd/DDataStd_ObjectCommands.cxx
@@ -21,11 +21,8 @@
 #include <Draw_Appli.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Tool.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Label.hxx>
-#include <Standard_GUID.hxx>
 #include <TDataStd_Directory.hxx>
-#include <TDataXtd_Shape.hxx>
 
 
 // LES ATTRIBUTES
@@ -34,7 +31,6 @@
 #include <TDataXtd_Shape.hxx>
 
 
-#include <TopoDS_Shape.hxx>
 #include <DBRep.hxx>
 
 
diff --git a/src/DDataStd/DDataStd_TreeBrowser.cxx b/src/DDataStd/DDataStd_TreeBrowser.cxx
index 11b56ef684..5b6a1afc24 100644
--- a/src/DDataStd/DDataStd_TreeBrowser.cxx
+++ b/src/DDataStd/DDataStd_TreeBrowser.cxx
@@ -24,7 +24,6 @@
 #include <Draw_Drawable3D.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_TreeNode.hxx>
 #include <TDF.hxx>
diff --git a/src/DDataStd/DDataStd_TreeBrowser.hxx b/src/DDataStd/DDataStd_TreeBrowser.hxx
index 7eea491287..db750d62ac 100644
--- a/src/DDataStd/DDataStd_TreeBrowser.hxx
+++ b/src/DDataStd/DDataStd_TreeBrowser.hxx
@@ -17,7 +17,6 @@
 #define _DDataStd_TreeBrowser_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TDF_Label.hxx>
 #include <Draw_Drawable3D.hxx>
diff --git a/src/DDataStd/DDataStd_TreeCommands.cxx b/src/DDataStd/DDataStd_TreeCommands.cxx
index 14c15fd7ae..df300dffd2 100644
--- a/src/DDataStd/DDataStd_TreeCommands.cxx
+++ b/src/DDataStd/DDataStd_TreeCommands.cxx
@@ -18,18 +18,12 @@
 #include <DDataStd.hxx>
 #include <DDataStd_TreeBrowser.hxx>
 #include <DDF.hxx>
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Message.hxx>
-#include <Standard_GUID.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 #include <TDataStd_ChildNodeIterator.hxx>
 #include <TDataStd_TreeNode.hxx>
-#include <TDataXtd_Constraint.hxx>
-#include <TDF.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
diff --git a/src/DDocStd/DDocStd.cxx b/src/DDocStd/DDocStd.cxx
index d517dc716c..a49532ec0a 100644
--- a/src/DDocStd/DDocStd.cxx
+++ b/src/DDocStd/DDocStd.cxx
@@ -15,16 +15,12 @@
 
 #include <DDocStd.hxx>
 
-#include <DBRep.hxx>
 #include <DDocStd_DrawDocument.hxx>
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_GUID.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TDF_Attribute.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_MapIteratorOfLabelMap.hxx>
 #include <TDF_Tool.hxx>
 #include <TDocStd_Application.hxx>
 #include <TDocStd_Document.hxx>
diff --git a/src/DDocStd/DDocStd.hxx b/src/DDocStd/DDocStd.hxx
index b10d783136..a86456d927 100644
--- a/src/DDocStd/DDocStd.hxx
+++ b/src/DDocStd/DDocStd.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Draw_Interpretor.hxx>
 class TDocStd_Application;
 class TDocStd_Document;
diff --git a/src/DDocStd/DDocStd_ApplicationCommands.cxx b/src/DDocStd/DDocStd_ApplicationCommands.cxx
index 35be9fd189..8c131784f8 100644
--- a/src/DDocStd/DDocStd_ApplicationCommands.cxx
+++ b/src/DDocStd/DDocStd_ApplicationCommands.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <DDocStd.hxx>
-#include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_Viewer.hxx>
 #include <Draw_ProgressIndicator.hxx>
@@ -23,20 +22,14 @@
 #include <TDocStd_Document.hxx>
 #include <TDataStd_Name.hxx>
 #include <Draw.hxx>
-#include <Standard_GUID.hxx>
-#include <Standard_ExtString.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
-#include <TDF.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_ChildIterator.hxx>
-#include <TDF_Tool.hxx> 
 #include <PCDM_ReaderFilter.hxx>
 
 #include <OSD_FileSystem.hxx>
-#include <OSD_Path.hxx>
 #include <TDocStd_PathParser.hxx>
-#include <XmlLDrivers.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <TPrsStd_AISViewer.hxx>
diff --git a/src/DDocStd/DDocStd_DocumentCommands.cxx b/src/DDocStd/DDocStd_DocumentCommands.cxx
index 462ae50064..4fc1c9348d 100644
--- a/src/DDocStd/DDocStd_DocumentCommands.cxx
+++ b/src/DDocStd/DDocStd_DocumentCommands.cxx
@@ -17,37 +17,21 @@
 
 #include <BinDrivers_DocumentStorageDriver.hxx>
 #include <DDF.hxx>
-#include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
-#include <TDocStd_XLinkTool.hxx>
 #include <TDF_Reference.hxx>
-#include <TDocStd_Document.hxx>
-#include <CDM_Document.hxx>
 #include <TDocStd_Modified.hxx>
 #include <TDF_Label.hxx>
-#include <DDocStd_DrawDocument.hxx>
-#include <TDocStd_Document.hxx>
 #include <TDocStd_XLink.hxx>
-#include <TDocStd_XLinkRoot.hxx>
 #include <TDocStd_XLinkIterator.hxx>
 #include <TDocStd_Application.hxx>
 #include <Draw.hxx>
-#include <Draw_Interpretor.hxx>
-#include <TDF_MapIteratorOfLabelMap.hxx>
-#include <Plugin.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <TDF_Tool.hxx>
-#include <TDF_ChildIterator.hxx>
-#include <TDF_Tool.hxx>
 #include <TPrsStd_AISViewer.hxx>
 #include <AIS_InteractiveContext.hxx>
 // pour propagate
 #include <TDocStd_XLinkTool.hxx>
 
-#include <OSD_Function.hxx>
-#include <OSD_SharedLibrary.hxx>
-#include <OSD_LoadMode.hxx>
-
 //typedef Standard_Integer (* DFBROWSER_CALL)(const Handle(TDocStd_Document)&);
 //static DFBROWSER_CALL gDFunc = 0;
 
diff --git a/src/DDocStd/DDocStd_DrawDocument.cxx b/src/DDocStd/DDocStd_DrawDocument.cxx
index e8c1bf5293..7e8de054b9 100644
--- a/src/DDocStd/DDocStd_DrawDocument.cxx
+++ b/src/DDocStd/DDocStd_DrawDocument.cxx
@@ -16,7 +16,6 @@
 #include <Draw_Display.hxx>
 #include <Draw_Drawable3D.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
diff --git a/src/DDocStd/DDocStd_MTMCommands.cxx b/src/DDocStd/DDocStd_MTMCommands.cxx
index 50109074c3..f8dfe8f438 100644
--- a/src/DDocStd/DDocStd_MTMCommands.cxx
+++ b/src/DDocStd/DDocStd_MTMCommands.cxx
@@ -16,7 +16,6 @@
 #include <DDocStd.hxx>
 #include <TDocStd_MultiTransactionManager.hxx>
 #include <DDocStd_DrawDocument.hxx>
-#include <TDocStd_Document.hxx>
 #include <Draw.hxx>
 #include <DDF_Browser.hxx>
 #include <TDF_Label.hxx>
@@ -32,7 +31,6 @@
 #include <TDataStd_RealArray.hxx>
 #include <TDataStd_ByteArray.hxx>
 #include <TNaming_NamedShape.hxx>
-#include <TDataStd_UAttribute.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Draw_Interpretor.hxx>
 #include <TDF_Reference.hxx>
diff --git a/src/DDocStd/DDocStd_ShapeSchemaCommands.cxx b/src/DDocStd/DDocStd_ShapeSchemaCommands.cxx
index 438764a1aa..543130f153 100644
--- a/src/DDocStd/DDocStd_ShapeSchemaCommands.cxx
+++ b/src/DDocStd/DDocStd_ShapeSchemaCommands.cxx
@@ -15,7 +15,6 @@
 
 #include <DDocStd.hxx>
 #include <DBRep.hxx>
-#include <FSD_File.hxx>
 #include <FSD_CmpFile.hxx>
 #include <FSD_BinaryFile.hxx>
 #include <BRep_Builder.hxx>
diff --git a/src/DDocStd/DDocStd_ToolsCommands.cxx b/src/DDocStd/DDocStd_ToolsCommands.cxx
index 9d925859c9..4afb2efeeb 100644
--- a/src/DDocStd/DDocStd_ToolsCommands.cxx
+++ b/src/DDocStd/DDocStd_ToolsCommands.cxx
@@ -18,20 +18,16 @@
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
 #include <TDocStd_Document.hxx>
-#include <TDF_Label.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Tool.hxx>
-#include <TDF_ListIteratorOfAttributeDeltaList.hxx>
 #include <TDF_AttributeDelta.hxx>
 #include <TDF_Delta.hxx> 
-#include <TDF_AttributeDelta.hxx> 
 #include <TDF_DeltaOnAddition.hxx> 
 #include <TDF_DeltaOnForget.hxx>
 #include <TDF_DeltaOnResume.hxx>
 #include <TDF_DeltaOnRemoval.hxx>
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_AttributeDeltaList.hxx>
-#include <TDF_ListIteratorOfAttributeDeltaList.hxx> 
 #include <Standard_DomainError.hxx>
 
 
diff --git a/src/DNaming/DNaming.cxx b/src/DNaming/DNaming.cxx
index bdfecc94b3..b6a9dce174 100644
--- a/src/DNaming/DNaming.cxx
+++ b/src/DNaming/DNaming.cxx
@@ -22,7 +22,6 @@
 #include <BRepLib_FindSurface.hxx>
 #include <BRepTools.hxx>
 #include <DDF.hxx>
-#include <DDF_Data.hxx>
 #include <Draw.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
@@ -31,12 +30,8 @@
 #include <Geom_Surface.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Pln.hxx>
-#include <gp_Vec.hxx>
 #include <ModelDefinitions.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TColStd_ListOfInteger.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_Real.hxx>
@@ -45,31 +40,23 @@
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_LabelList.hxx>
-#include <TDF_LabelMap.hxx>
 #include <TDF_Reference.hxx>
 #include <TDF_TagSource.hxx>
 #include <TDF_Tool.hxx>
 #include <TFunction_Function.hxx>
 #include <TNaming_Builder.hxx>
 #include <TNaming_Iterator.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Tool.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.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>
 
 //=======================================================================
diff --git a/src/DNaming/DNaming.hxx b/src/DNaming/DNaming.hxx
index 2cf2f22fac..d5f01e2568 100644
--- a/src/DNaming/DNaming.hxx
+++ b/src/DNaming/DNaming.hxx
@@ -23,9 +23,7 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <Standard_CString.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <Draw_Interpretor.hxx>
 class TDataStd_Real;
diff --git a/src/DNaming/DNaming_BasicCommands.cxx b/src/DNaming/DNaming_BasicCommands.cxx
index c07759e240..6e5c0d431e 100644
--- a/src/DNaming/DNaming_BasicCommands.cxx
+++ b/src/DNaming/DNaming_BasicCommands.cxx
@@ -17,45 +17,23 @@
 #include <DNaming.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_Data.hxx>
-#include <TDF_ListIteratorOfLabelList.hxx>
-#include <TDF_LabelList.hxx>
-#include <TDF_LabelMap.hxx>
 #include <TDF_Tool.hxx>
 #include <DDF.hxx>
-#include <DDF_Data.hxx>
 #include <TNaming.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_NewShapeIterator.hxx>
 #include <TNaming_OldShapeIterator.hxx>
 #include <TNaming_Iterator.hxx>
 #include <TNaming_Tool.hxx>
 #include <TNaming_MapOfNamedShape.hxx>
-#include <TNaming_MapIteratorOfMapOfNamedShape.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <DBRep.hxx>
 
 #include <TNaming_Builder.hxx>
 #include <TDataStd_Name.hxx>
-#include <TDF_TagSource.hxx>
-#include <TopExp_Explorer.hxx>
 
-#include <gp.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Ax1.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_Trsf.hxx>
-
-#include <TColStd_HArray1OfInteger.hxx>
-//#ifdef _MSC_VER
 #include <stdio.h>
-//#endif
 
 // POP : first Wrong Declaration : now it is correct
 //       second not used
diff --git a/src/DNaming/DNaming_BooleanOperationDriver.cxx b/src/DNaming/DNaming_BooleanOperationDriver.cxx
index 3caacfaffd..b5722518f2 100644
--- a/src/DNaming/DNaming_BooleanOperationDriver.cxx
+++ b/src/DNaming/DNaming_BooleanOperationDriver.cxx
@@ -14,15 +14,12 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <BRepAlgoAPI_BooleanOperation.hxx>
 #include <BRepAlgoAPI_Common.hxx>
 #include <BRepAlgoAPI_Cut.hxx>
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepAlgoAPI_Section.hxx>
 #include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
 #include <BRepCheck_ListOfStatus.hxx>
 #include <BRepCheck_Result.hxx>
 #include <BRepLib.hxx>
@@ -31,11 +28,9 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <ModelDefinitions.hxx>
 #include <Precision.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
-#include <TDataStd_Real.hxx>
 #include <TDF_Label.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
@@ -44,13 +39,10 @@
 #include <TNaming_NamedShape.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_BooleanOperationDriver,TFunction_Driver)
diff --git a/src/DNaming/DNaming_BooleanOperationDriver.hxx b/src/DNaming/DNaming_BooleanOperationDriver.hxx
index 37ae917de4..e82c073521 100644
--- a/src/DNaming/DNaming_BooleanOperationDriver.hxx
+++ b/src/DNaming/DNaming_BooleanOperationDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_BoxDriver.cxx b/src/DNaming/DNaming_BoxDriver.cxx
index 9bc6b5cf22..4442562855 100644
--- a/src/DNaming/DNaming_BoxDriver.cxx
+++ b/src/DNaming/DNaming_BoxDriver.cxx
@@ -19,7 +19,6 @@
 #include <DNaming.hxx>
 #include <DNaming_BoxDriver.hxx>
 #include <ModelDefinitions.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
diff --git a/src/DNaming/DNaming_BoxDriver.hxx b/src/DNaming/DNaming_BoxDriver.hxx
index 4b432110fd..6e348e0fd8 100644
--- a/src/DNaming/DNaming_BoxDriver.hxx
+++ b/src/DNaming/DNaming_BoxDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_CylinderDriver.cxx b/src/DNaming/DNaming_CylinderDriver.cxx
index 6824f13697..dab14cb540 100644
--- a/src/DNaming/DNaming_CylinderDriver.cxx
+++ b/src/DNaming/DNaming_CylinderDriver.cxx
@@ -19,11 +19,8 @@
 #include <BRepPrimAPI_MakeCylinder.hxx>
 #include <DNaming.hxx>
 #include <DNaming_CylinderDriver.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <gp_Lin.hxx>
 #include <ModelDefinitions.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
diff --git a/src/DNaming/DNaming_CylinderDriver.hxx b/src/DNaming/DNaming_CylinderDriver.hxx
index c93eae2ee5..11f5650c35 100644
--- a/src/DNaming/DNaming_CylinderDriver.hxx
+++ b/src/DNaming/DNaming_CylinderDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_FilletDriver.cxx b/src/DNaming/DNaming_FilletDriver.cxx
index dc10b47901..bcc9292cbe 100644
--- a/src/DNaming/DNaming_FilletDriver.cxx
+++ b/src/DNaming/DNaming_FilletDriver.cxx
@@ -20,7 +20,6 @@
 #include <DNaming_FilletDriver.hxx>
 #include <ModelDefinitions.hxx>
 #include <Precision.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
@@ -28,15 +27,12 @@
 #include <TDF_Label.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
-#include <TNaming.hxx>
 #include <TNaming_Builder.hxx>
-#include <TNaming_Iterator.hxx>
 #include <TNaming_NamedShape.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/DNaming/DNaming_FilletDriver.hxx b/src/DNaming/DNaming_FilletDriver.hxx
index 78a2524efc..f0cdcf8e99 100644
--- a/src/DNaming/DNaming_FilletDriver.hxx
+++ b/src/DNaming/DNaming_FilletDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_Line3DDriver.cxx b/src/DNaming/DNaming_Line3DDriver.cxx
index 70cfad1050..e86a19c5a1 100644
--- a/src/DNaming/DNaming_Line3DDriver.cxx
+++ b/src/DNaming/DNaming_Line3DDriver.cxx
@@ -21,28 +21,17 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <DNaming.hxx>
 #include <DNaming_Line3DDriver.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <GeomAPI_Interpolate.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Trsf.hxx>
-#include <gp_Vec.hxx>
 #include <ModelDefinitions.hxx>
 #include <Precision.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Type.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
 #include <TDataStd_Integer.hxx>
-#include <TDataStd_Name.hxx>
-#include <TDataStd_Real.hxx>
-#include <TDF_AttributeMap.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_MapIteratorOfAttributeMap.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TNaming.hxx>
 #include <TNaming_Builder.hxx>
 #include <TNaming_NamedShape.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
@@ -51,7 +40,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_Line3DDriver,TFunction_Driver)
 
diff --git a/src/DNaming/DNaming_Line3DDriver.hxx b/src/DNaming/DNaming_Line3DDriver.hxx
index 5092901400..33c9320a21 100644
--- a/src/DNaming/DNaming_Line3DDriver.hxx
+++ b/src/DNaming/DNaming_Line3DDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TopTools_Array1OfShape.hxx>
 class TFunction_Logbook;
diff --git a/src/DNaming/DNaming_ModelingCommands.cxx b/src/DNaming/DNaming_ModelingCommands.cxx
index a8e442a677..b7f6b081c0 100644
--- a/src/DNaming/DNaming_ModelingCommands.cxx
+++ b/src/DNaming/DNaming_ModelingCommands.cxx
@@ -15,36 +15,26 @@
 
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <DNaming.hxx>
 #include <DBRep.hxx>
 
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
-#include <gp_Trsf.hxx>
 #include <Message.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_MapOfShape.hxx>
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfOrientedShape.hxx>
-#include <TopTools_DataMapOfOrientedShapeShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Standard_GUID.hxx>
 
 #include <DDF.hxx>
 #include <DDocStd.hxx>
-#include <TDF_TagSource.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_Reference.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_ChildIDIterator.hxx>
-#include <TDF_MapIteratorOfLabelMap.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_TreeNode.hxx>
@@ -52,9 +42,7 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
-#include <TFunction_Driver.hxx>
 #include <TFunction_DriverTable.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Selector.hxx>
 #include <TNaming_Builder.hxx>
 #include <TNaming_Naming.hxx>
diff --git a/src/DNaming/DNaming_PointDriver.cxx b/src/DNaming/DNaming_PointDriver.cxx
index 5c0f954e87..a2b2ac47f5 100644
--- a/src/DNaming/DNaming_PointDriver.cxx
+++ b/src/DNaming/DNaming_PointDriver.cxx
@@ -20,7 +20,6 @@
 #include <DNaming_PointDriver.hxx>
 #include <gp_Pnt.hxx>
 #include <ModelDefinitions.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDF_Label.hxx>
diff --git a/src/DNaming/DNaming_PointDriver.hxx b/src/DNaming/DNaming_PointDriver.hxx
index e763d68bca..7a901706f2 100644
--- a/src/DNaming/DNaming_PointDriver.hxx
+++ b/src/DNaming/DNaming_PointDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 
diff --git a/src/DNaming/DNaming_PrismDriver.cxx b/src/DNaming/DNaming_PrismDriver.cxx
index dab5cc46a6..82e22359ee 100644
--- a/src/DNaming/DNaming_PrismDriver.cxx
+++ b/src/DNaming/DNaming_PrismDriver.cxx
@@ -25,14 +25,10 @@
 #include <DNaming.hxx>
 #include <DNaming_PrismDriver.hxx>
 #include <Geom_Line.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <GProp_GProps.hxx>
 #include <ModelDefinitions.hxx>
 #include <Precision.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
@@ -47,10 +43,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_PrismDriver,TFunction_Driver)
diff --git a/src/DNaming/DNaming_PrismDriver.hxx b/src/DNaming/DNaming_PrismDriver.hxx
index d72e96bb8b..d312e6d4a7 100644
--- a/src/DNaming/DNaming_PrismDriver.hxx
+++ b/src/DNaming/DNaming_PrismDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_RevolutionDriver.cxx b/src/DNaming/DNaming_RevolutionDriver.cxx
index ed061e825e..4382a61f58 100644
--- a/src/DNaming/DNaming_RevolutionDriver.cxx
+++ b/src/DNaming/DNaming_RevolutionDriver.cxx
@@ -26,14 +26,9 @@
 #include <DNaming.hxx>
 #include <DNaming_RevolutionDriver.hxx>
 #include <Geom_Line.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <GProp_GProps.hxx>
 #include <ModelDefinitions.hxx>
 #include <Precision.hxx>
-#include <Standard_GUID.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
@@ -49,13 +44,8 @@
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_RevolutionDriver,TFunction_Driver)
diff --git a/src/DNaming/DNaming_RevolutionDriver.hxx b/src/DNaming/DNaming_RevolutionDriver.hxx
index 0299431d8f..b401c8ee00 100644
--- a/src/DNaming/DNaming_RevolutionDriver.hxx
+++ b/src/DNaming/DNaming_RevolutionDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_SelectionCommands.cxx b/src/DNaming/DNaming_SelectionCommands.cxx
index 22267189a4..288d827501 100644
--- a/src/DNaming/DNaming_SelectionCommands.cxx
+++ b/src/DNaming/DNaming_SelectionCommands.cxx
@@ -18,34 +18,23 @@
 
 #include <DDF.hxx>
 
-#include <TNaming_NamedShape.hxx>
-#include <TNaming_ListOfNamedShape.hxx>
-#include <TNaming_ListIteratorOfListOfNamedShape.hxx>
 #include <TNaming_Tool.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_AttributeMap.hxx>
-#include <TDF_MapIteratorOfAttributeMap.hxx>
-#include <TDF_ChildIterator.hxx>
 #include <TDF_Tool.hxx>
-#include <TNaming_Name.hxx>
 #include <TNaming.hxx>
 #include <TNaming_Naming.hxx>
 #include <TNaming_NamingTool.hxx>
 #include <TNaming_MapOfNamedShape.hxx>
-#include <TNaming_MapIteratorOfMapOfNamedShape.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TNaming_Selector.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopAbs.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDF_LabelMap.hxx>
-#include <TDF_MapIteratorOfLabelMap.hxx>
 
-#include <DBRep.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <DBRep.hxx>
 #include <DBRep_DrawableShape.hxx>
 #include <stdio.h>
diff --git a/src/DNaming/DNaming_SelectionDriver.cxx b/src/DNaming/DNaming_SelectionDriver.cxx
index ee9e8cab22..71dc6c4cb5 100644
--- a/src/DNaming/DNaming_SelectionDriver.cxx
+++ b/src/DNaming/DNaming_SelectionDriver.cxx
@@ -19,14 +19,11 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_LabelMap.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Selector.hxx>
 #include <TNaming_Tool.hxx>
-#include <TopAbs.hxx>
 #include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_SelectionDriver,TFunction_Driver)
@@ -78,11 +75,7 @@ static void Write(const TopoDS_Shape& shape,
 //=======================================================================
 #include <TNaming_ListOfNamedShape.hxx>
 #include <TDF_AttributeMap.hxx>
-#include <TDF_IDFilter.hxx>
-#include <TDF_Tool.hxx>
-#include <TDF_MapIteratorOfAttributeMap.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TDF_ChildIterator.hxx>
 
 Standard_Integer DNaming_SelectionDriver::Execute(Handle(TFunction_Logbook)& theLog) const
 {
diff --git a/src/DNaming/DNaming_SelectionDriver.hxx b/src/DNaming/DNaming_SelectionDriver.hxx
index 1b4e40dacd..d4d081bf4c 100644
--- a/src/DNaming/DNaming_SelectionDriver.hxx
+++ b/src/DNaming/DNaming_SelectionDriver.hxx
@@ -17,10 +17,8 @@
 #define _DNaming_SelectionDriver_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 
diff --git a/src/DNaming/DNaming_SphereDriver.cxx b/src/DNaming/DNaming_SphereDriver.cxx
index 50959ea9d0..4784fce9dd 100644
--- a/src/DNaming/DNaming_SphereDriver.cxx
+++ b/src/DNaming/DNaming_SphereDriver.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRep_Tool.hxx>
 #include <BRepAlgo.hxx>
 #include <BRepPrimAPI_MakeSphere.hxx>
 #include <DNaming.hxx>
@@ -22,7 +21,6 @@
 #include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <ModelDefinitions.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_ListOfInteger.hxx>
@@ -41,7 +39,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_SphereDriver,TFunction_Driver)
diff --git a/src/DNaming/DNaming_SphereDriver.hxx b/src/DNaming/DNaming_SphereDriver.hxx
index 169292fc6b..1191599740 100644
--- a/src/DNaming/DNaming_SphereDriver.hxx
+++ b/src/DNaming/DNaming_SphereDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DNaming/DNaming_ToolsCommands.cxx b/src/DNaming/DNaming_ToolsCommands.cxx
index 2154ea7412..6e3b02b682 100644
--- a/src/DNaming/DNaming_ToolsCommands.cxx
+++ b/src/DNaming/DNaming_ToolsCommands.cxx
@@ -14,24 +14,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Draw_Interpretor.hxx>
-#include <Draw.hxx>
 #include <DBRep.hxx>
 #include <DNaming.hxx>
 #include <BRepTools.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopLoc_Location.hxx>
 #include <BRep_Builder.hxx>
-#include <gp_Pnt.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TopAbs.hxx>
 #include <TNaming_CopyShape.hxx>
 #include <TNaming_Translator.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <DNaming_DataMapOfShapeOfName.hxx>
 #include <DNaming_DataMapIteratorOfDataMapOfShapeOfName.hxx>
-#include <TopTools_MapOfShape.hxx>
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 //=======================================================================
 //function : DNaming_CheckHasSame 
diff --git a/src/DNaming/DNaming_TransformationDriver.cxx b/src/DNaming/DNaming_TransformationDriver.cxx
index f82e921a54..26e286b58e 100644
--- a/src/DNaming/DNaming_TransformationDriver.cxx
+++ b/src/DNaming/DNaming_TransformationDriver.cxx
@@ -16,7 +16,6 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_MakeShape.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <DNaming.hxx>
 #include <DNaming_TransformationDriver.hxx>
@@ -28,29 +27,20 @@
 #include <gp_Vec.hxx>
 #include <ModelDefinitions.hxx>
 #include <NCollection_Handle.hxx>
-#include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 #include <TDataStd_Real.hxx>
 #include <TDF_Label.hxx>
 #include <TFunction_Function.hxx>
 #include <TFunction_Logbook.hxx>
 #include <TNaming_Builder.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Tool.hxx>
-#include <TopAbs.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeInteger.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DNaming_TransformationDriver,TFunction_Driver)
diff --git a/src/DNaming/DNaming_TransformationDriver.hxx b/src/DNaming/DNaming_TransformationDriver.hxx
index baa0dafe79..7a25f8ee24 100644
--- a/src/DNaming/DNaming_TransformationDriver.hxx
+++ b/src/DNaming/DNaming_TransformationDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TFunction_Driver.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TFunction_Logbook;
 class TDF_Label;
diff --git a/src/DPrsStd/DPrsStd.cxx b/src/DPrsStd/DPrsStd.cxx
index 8ec61476cb..beacb61c0c 100644
--- a/src/DPrsStd/DPrsStd.cxx
+++ b/src/DPrsStd/DPrsStd.cxx
@@ -21,14 +21,8 @@
 #include <DDocStd.hxx>
 #include <DNaming.hxx>
 #include <DPrsStd.hxx>
-#include <Draw.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_PluginMacro.hxx>
-#include <OSD_Directory.hxx>
-#include <OSD_Environment.hxx>
-#include <OSD_File.hxx>
-#include <OSD_Path.hxx>
-#include <TCollection_AsciiString.hxx>
 
 //=======================================================================
 //function : AllComands
diff --git a/src/DPrsStd/DPrsStd.hxx b/src/DPrsStd/DPrsStd.hxx
index 85fa1e2c33..03746938fb 100644
--- a/src/DPrsStd/DPrsStd.hxx
+++ b/src/DPrsStd/DPrsStd.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Draw_Interpretor.hxx>
 
diff --git a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx
index 1a4c02f3b0..78c888d6b9 100644
--- a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx
+++ b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx
@@ -15,30 +15,19 @@
 // commercial license or contractual agreement.
 
 #include <DPrsStd.hxx>
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Draw_ColorKind.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDF_Label.hxx>
-#include <TDF_Data.hxx> 
 #include <DDF.hxx>
 #include <DDocStd.hxx>
-#include <ViewerTest.hxx>
-
-
-#include <V3d_View.hxx>
 
 
 // for AIS
 
 #include <TPrsStd_AISPresentation.hxx>
 #include <TPrsStd_AISViewer.hxx>
-#include <ViewerTest.hxx>
 #include <AIS_InteractiveContext.hxx> 
-#include <AIS_InteractiveObject.hxx>
-#include <ViewerTest.hxx>
 #include <V3d_View.hxx>
 #include <TCollection_ExtendedString.hxx>
 #include <Quantity_NameOfColor.hxx>
diff --git a/src/DPrsStd/DPrsStd_AISViewerCommands.cxx b/src/DPrsStd/DPrsStd_AISViewerCommands.cxx
index 95a8460c42..81c7d8a4c2 100644
--- a/src/DPrsStd/DPrsStd_AISViewerCommands.cxx
+++ b/src/DPrsStd/DPrsStd_AISViewerCommands.cxx
@@ -16,16 +16,12 @@
 
 #include <DPrsStd.hxx>
 
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Interpretor.hxx>
-#include <Draw_ColorKind.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TDocStd_Document.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Data.hxx> 
-#include <TDF_Tool.hxx> 
-#include <TDF_ChildIterator.hxx>
 #include <DDF.hxx>
 #include <DDocStd.hxx>
 #include <ViewerTest.hxx>
diff --git a/src/DRAWEXE/DRAWEXE.cxx b/src/DRAWEXE/DRAWEXE.cxx
index 401e47d09d..6fe12a0c6b 100644
--- a/src/DRAWEXE/DRAWEXE.cxx
+++ b/src/DRAWEXE/DRAWEXE.cxx
@@ -18,7 +18,6 @@
 #include <DrawTrSurf.hxx>
 #include <Message.hxx>
 #include <Message_PrinterOStream.hxx>
-#include <Message_PrinterSystemLog.hxx>
 #include <NCollection_IndexedMap.hxx>
 #include <OSD.hxx>
 #include <OSD_Thread.hxx>
diff --git a/src/Draft/Draft_EdgeInfo.cxx b/src/Draft/Draft_EdgeInfo.cxx
index 9462679cfd..a7dff89e80 100644
--- a/src/Draft/Draft_EdgeInfo.cxx
+++ b/src/Draft/Draft_EdgeInfo.cxx
@@ -20,7 +20,6 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Face.hxx>
 
 //=======================================================================
diff --git a/src/Draft/Draft_EdgeInfo.hxx b/src/Draft/Draft_EdgeInfo.hxx
index 84d4ad7dea..35043d5611 100644
--- a/src/Draft/Draft_EdgeInfo.hxx
+++ b/src/Draft/Draft_EdgeInfo.hxx
@@ -21,10 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Face.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
 class Geom_Curve;
 class Geom2d_Curve;
 
diff --git a/src/Draft/Draft_FaceInfo.cxx b/src/Draft/Draft_FaceInfo.cxx
index 4bb0661e4b..4c7fbe42c7 100644
--- a/src/Draft/Draft_FaceInfo.cxx
+++ b/src/Draft/Draft_FaceInfo.cxx
@@ -16,10 +16,8 @@
 
 
 #include <Draft_FaceInfo.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Standard_DomainError.hxx>
 #include <TopoDS_Face.hxx>
 
 //=======================================================================
diff --git a/src/Draft/Draft_Modification.cxx b/src/Draft/Draft_Modification.cxx
index 81a205a93a..b1574f9194 100644
--- a/src/Draft/Draft_Modification.cxx
+++ b/src/Draft/Draft_Modification.cxx
@@ -18,8 +18,6 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
-#include <Draft_EdgeInfo.hxx>
-#include <Draft_FaceInfo.hxx>
 #include <Draft_Modification.hxx>
 #include <Draft_VertexInfo.hxx>
 #include <Geom2d_Curve.hxx>
@@ -27,7 +25,6 @@
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
@@ -46,14 +43,12 @@
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.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_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Draft_Modification,BRepTools_Modification)
 
diff --git a/src/Draft/Draft_Modification.hxx b/src/Draft/Draft_Modification.hxx
index 22503205b7..82c5b84082 100644
--- a/src/Draft/Draft_Modification.hxx
+++ b/src/Draft/Draft_Modification.hxx
@@ -23,14 +23,12 @@
 #include <Draft_IndexedDataMapOfFaceFaceInfo.hxx>
 #include <Draft_IndexedDataMapOfEdgeEdgeInfo.hxx>
 #include <Draft_IndexedDataMapOfVertexVertexInfo.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Draft_ErrorStatus.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <BRepTools_Modification.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TopAbs_Orientation.hxx>
 class gp_Dir;
diff --git a/src/Draft/Draft_Modification_1.cxx b/src/Draft/Draft_Modification_1.cxx
index b2941a5134..f965a8648e 100644
--- a/src/Draft/Draft_Modification_1.cxx
+++ b/src/Draft/Draft_Modification_1.cxx
@@ -21,22 +21,15 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepExtrema_ExtCF.hxx>
-#include <BRepExtrema_ExtPC.hxx>
-#include <BRepLib_MakeFace.hxx>
 #include <BRepTools.hxx>
-#include <Draft_EdgeInfo.hxx>
-#include <Draft_FaceInfo.hxx>
 #include <Draft_Modification.hxx>
 #include <Draft_VertexInfo.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
-#include <Extrema_ExtPC.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dAPI_ProjectPointOnCurve.hxx>
 #include <Geom2dConvert.hxx>
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
@@ -56,9 +49,6 @@
 #include <Geom_Surface.hxx>
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
@@ -69,9 +59,7 @@
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Elips.hxx>
-#include <gp_Hypr.hxx>
 #include <gp_Lin.hxx>
-#include <gp_Parab.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
@@ -80,14 +68,10 @@
 #include <IntCurveSurface_HInter.hxx>
 #include <IntCurveSurface_IntersectionPoint.hxx>
 #include <Precision.hxx>
-#include <ProjLib_CompProjectedCurve.hxx>
 #include <ProjLib_HCompProjectedCurve.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_Failure.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <StdFail_NotDone.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -97,8 +81,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 static Standard_Boolean Choose(const Draft_IndexedDataMapOfFaceFaceInfo&,
diff --git a/src/Draft/Draft_VertexInfo.cxx b/src/Draft/Draft_VertexInfo.cxx
index 98cb57af6f..87f2dac252 100644
--- a/src/Draft/Draft_VertexInfo.cxx
+++ b/src/Draft/Draft_VertexInfo.cxx
@@ -16,9 +16,7 @@
 
 
 #include <Draft_VertexInfo.hxx>
-#include <gp_Pnt.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_NoMoreObject.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/Draft/Draft_VertexInfo.hxx b/src/Draft/Draft_VertexInfo.hxx
index 7f7348fd63..7665c05e13 100644
--- a/src/Draft/Draft_VertexInfo.hxx
+++ b/src/Draft/Draft_VertexInfo.hxx
@@ -22,10 +22,8 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <TopTools_ListOfShape.hxx>
 #include <TColStd_ListOfReal.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 class TopoDS_Edge;
 
diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx
index cb43f83d8e..8bf5fbf036 100644
--- a/src/Draw/Draw.cxx
+++ b/src/Draw/Draw.cxx
@@ -17,12 +17,10 @@
 
 #include <Draw.hxx>
 #include <Draw_Appli.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_Failure.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Draw_ProgressIndicator.hxx>
 #include <Draw_Window.hxx>
-#include <gp_Pnt2d.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_PrinterOStream.hxx>
@@ -34,7 +32,6 @@
 #include <OSD_Timer.hxx>
 #include <Plugin_MapOfFunctions.hxx>
 #include <Resource_Manager.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Standard_Stream.hxx>
 #include <Standard_Version.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Draw/Draw_Axis2D.cxx b/src/Draw/Draw_Axis2D.cxx
index 27b9af7508..a07098bc1a 100644
--- a/src/Draw/Draw_Axis2D.cxx
+++ b/src/Draw/Draw_Axis2D.cxx
@@ -18,7 +18,6 @@
 #include <Draw_Axis2D.hxx>
 #include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
-#include <gp.hxx>
 #include <gp_Ax22d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
diff --git a/src/Draw/Draw_Axis2D.hxx b/src/Draw/Draw_Axis2D.hxx
index 1449c0199a..b4952b2258 100644
--- a/src/Draw/Draw_Axis2D.hxx
+++ b/src/Draw/Draw_Axis2D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Axis2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Ax22d.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/Draw/Draw_Axis3D.hxx b/src/Draw/Draw_Axis3D.hxx
index 59c5d7343f..562ad092ad 100644
--- a/src/Draw/Draw_Axis3D.hxx
+++ b/src/Draw/Draw_Axis3D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Axis3D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Ax3.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/Draw/Draw_BasicCommands.cxx b/src/Draw/Draw_BasicCommands.cxx
index d8d0bb0c69..9160a871e0 100644
--- a/src/Draw/Draw_BasicCommands.cxx
+++ b/src/Draw/Draw_BasicCommands.cxx
@@ -19,8 +19,6 @@
 #include <Draw_Appli.hxx>
 #include <Draw_Chronometer.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Draw_Printer.hxx>
-#include <Draw_ProgressIndicator.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_PrinterOStream.hxx>
diff --git a/src/Draw/Draw_Box.hxx b/src/Draw/Draw_Box.hxx
index 2e010183c3..09ab5b4344 100644
--- a/src/Draw/Draw_Box.hxx
+++ b/src/Draw/Draw_Box.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Box_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Bnd_OBB.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/Draw/Draw_Chronometer.hxx b/src/Draw/Draw_Chronometer.hxx
index 6fffffcde7..25b7275ebe 100644
--- a/src/Draw/Draw_Chronometer.hxx
+++ b/src/Draw/Draw_Chronometer.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Chronometer_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <OSD_Timer.hxx>
 #include <Draw_Drawable3D.hxx>
diff --git a/src/Draw/Draw_Circle2D.hxx b/src/Draw/Draw_Circle2D.hxx
index ae9ba4ce36..ed7cd8d84e 100644
--- a/src/Draw/Draw_Circle2D.hxx
+++ b/src/Draw/Draw_Circle2D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Circle2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Circ2d.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/Draw/Draw_Circle3D.hxx b/src/Draw/Draw_Circle3D.hxx
index 45c664793d..37fa4d23f0 100644
--- a/src/Draw/Draw_Circle3D.hxx
+++ b/src/Draw/Draw_Circle3D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Circle3D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Circ.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/Draw/Draw_Commands.cxx b/src/Draw/Draw_Commands.cxx
index cf291fb080..a96d209ded 100644
--- a/src/Draw/Draw_Commands.cxx
+++ b/src/Draw/Draw_Commands.cxx
@@ -17,8 +17,6 @@
 
 #include <Draw.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Draw_ProgressIndicator.hxx>
-#include <TCollection_AsciiString.hxx>
 
 void Draw::Commands (Draw_Interpretor& theCommands)
 {
diff --git a/src/Draw/Draw_Display.hxx b/src/Draw/Draw_Display.hxx
index 7fe68ac8b9..ad1098cc98 100644
--- a/src/Draw/Draw_Display.hxx
+++ b/src/Draw/Draw_Display.hxx
@@ -19,13 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Draw_MarkerShape.hxx>
-#include <Standard_CString.hxx>
 class Draw_Color;
 class gp_Pnt;
 class gp_Pnt2d;
diff --git a/src/Draw/Draw_Drawable2D.hxx b/src/Draw/Draw_Drawable2D.hxx
index 6ddab1278d..e8c15acb59 100644
--- a/src/Draw/Draw_Drawable2D.hxx
+++ b/src/Draw/Draw_Drawable2D.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Draw_Drawable3D.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class Draw_Drawable2D;
diff --git a/src/Draw/Draw_GraphicCommands.cxx b/src/Draw/Draw_GraphicCommands.cxx
index d7b7b1b9cf..6f9cd1ef0b 100644
--- a/src/Draw/Draw_GraphicCommands.cxx
+++ b/src/Draw/Draw_GraphicCommands.cxx
@@ -27,7 +27,6 @@
 #include <Draw_Text3D.hxx>
 #include <Message.hxx>
 #include <Standard_Stream.hxx>
-#include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
 #ifdef _WIN32
diff --git a/src/Draw/Draw_Grid.hxx b/src/Draw/Draw_Grid.hxx
index c7ff66a499..cf3177da37 100644
--- a/src/Draw/Draw_Grid.hxx
+++ b/src/Draw/Draw_Grid.hxx
@@ -20,8 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Draw_Drawable3D.hxx>
 class Draw_Display;
 
diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx
index c797aa471e..4fc5d52dd2 100644
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -20,11 +20,8 @@
 #include <Message.hxx>
 #include <Message_PrinterOStream.hxx>
 #include <OSD.hxx>
-#include <OSD_File.hxx>
 #include <OSD_Path.hxx>
-#include <OSD_Process.hxx>
 #include <Standard_SStream.hxx>
-#include <Standard_RangeError.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Macro.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Draw/Draw_Interpretor.hxx b/src/Draw/Draw_Interpretor.hxx
index aa707f971d..68e86775c2 100644
--- a/src/Draw/Draw_Interpretor.hxx
+++ b/src/Draw/Draw_Interpretor.hxx
@@ -23,8 +23,6 @@
 #include <Standard_Boolean.hxx>
 #include <Draw_PInterp.hxx>
 #include <Standard_SStream.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 
 class TCollection_AsciiString;
diff --git a/src/Draw/Draw_Main.cxx b/src/Draw/Draw_Main.cxx
index 783742a8d8..ad0c6cc7e4 100644
--- a/src/Draw/Draw_Main.cxx
+++ b/src/Draw/Draw_Main.cxx
@@ -20,20 +20,13 @@
 
 #include <Draw_Main.hxx>
 #include <stdlib.h>
-#include <string.h>
 #include <Draw_Appli.hxx>
-#include <OSD.hxx>
 #include <TCollection_AsciiString.hxx>
 
 #include <tcl.h>
 
 #ifdef _WIN32
 #include <sys/stat.h>
-#include <Draw_Window.hxx>
-
-#include <stdio.h>
-#include <io.h>
-#include <fcntl.h>
 
 extern Draw_Viewer dout;
 
diff --git a/src/Draw/Draw_Main.hxx b/src/Draw/Draw_Main.hxx
index 2ccb4839f2..714060c855 100644
--- a/src/Draw/Draw_Main.hxx
+++ b/src/Draw/Draw_Main.hxx
@@ -24,7 +24,6 @@
 #ifndef Draw_Main_HeaderFile
 #define Draw_Main_HeaderFile
 
-#include <Standard_TypeDef.hxx>
 #include <Draw_Appli.hxx>
 #include <Standard_PCharacter.hxx>
 
diff --git a/src/Draw/Draw_MapOfAsciiString.hxx b/src/Draw/Draw_MapOfAsciiString.hxx
index 985e0f5f23..1e8504cbeb 100644
--- a/src/Draw/Draw_MapOfAsciiString.hxx
+++ b/src/Draw/Draw_MapOfAsciiString.hxx
@@ -17,7 +17,6 @@
 #ifndef Draw_MapOfAsciiString_HeaderFile
 #define Draw_MapOfAsciiString_HeaderFile
 
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <NCollection_IndexedMap.hxx>
 
diff --git a/src/Draw/Draw_Marker2D.cxx b/src/Draw/Draw_Marker2D.cxx
index dd8a0bbe56..3b67fd4fe5 100644
--- a/src/Draw/Draw_Marker2D.cxx
+++ b/src/Draw/Draw_Marker2D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Marker2D.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/Draw/Draw_Marker2D.hxx b/src/Draw/Draw_Marker2D.hxx
index 2aadeb5c94..f02a34513c 100644
--- a/src/Draw/Draw_Marker2D.hxx
+++ b/src/Draw/Draw_Marker2D.hxx
@@ -18,15 +18,12 @@
 #define _Draw_Marker2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt2d.hxx>
 #include <Draw_Color.hxx>
 #include <Draw_MarkerShape.hxx>
 #include <Standard_Integer.hxx>
 #include <Draw_Drawable2D.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class Draw_Display;
 
 
diff --git a/src/Draw/Draw_Marker3D.cxx b/src/Draw/Draw_Marker3D.cxx
index a72b4ba249..65bebcde61 100644
--- a/src/Draw/Draw_Marker3D.cxx
+++ b/src/Draw/Draw_Marker3D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Marker3D.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/Draw/Draw_Marker3D.hxx b/src/Draw/Draw_Marker3D.hxx
index 26ad1977bc..6bfc2460a1 100644
--- a/src/Draw/Draw_Marker3D.hxx
+++ b/src/Draw/Draw_Marker3D.hxx
@@ -18,14 +18,11 @@
 #define _Draw_Marker3D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt.hxx>
 #include <Draw_Color.hxx>
 #include <Draw_MarkerShape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Draw_Drawable3D.hxx>
 class Draw_Display;
 
diff --git a/src/Draw/Draw_MessageCommands.cxx b/src/Draw/Draw_MessageCommands.cxx
index 1e30955d30..1d4ac34b1c 100644
--- a/src/Draw/Draw_MessageCommands.cxx
+++ b/src/Draw/Draw_MessageCommands.cxx
@@ -14,14 +14,11 @@
 #include <Draw.hxx>
 #include <Draw_Printer.hxx>
 
-#include <Message.hxx>
-#include <Message_Messenger.hxx>
 #include <Message_PrinterOStream.hxx>
 #include <Message_PrinterSystemLog.hxx>
 #include <Message_PrinterToReport.hxx>
 #include <Message_Report.hxx>
 #include <NCollection_Shared.hxx>
-#include <Standard_Dump.hxx>
 
 //==============================================================================
 //function : printerType
diff --git a/src/Draw/Draw_PloadCommands.cxx b/src/Draw/Draw_PloadCommands.cxx
index e34b9167f9..a4dfc746d8 100644
--- a/src/Draw/Draw_PloadCommands.cxx
+++ b/src/Draw/Draw_PloadCommands.cxx
@@ -17,8 +17,6 @@
 #include <Draw_MapOfAsciiString.hxx>
 #include <Draw.hxx>
 #include <Message.hxx>
-#include <OSD_Path.hxx>
-#include <OSD_Directory.hxx>
 #include <OSD_File.hxx>
 #include <OSD_Environment.hxx>
 #include <OSD_SharedLibrary.hxx>
diff --git a/src/Draw/Draw_Segment2D.cxx b/src/Draw/Draw_Segment2D.cxx
index 692c89542e..d7624126a1 100644
--- a/src/Draw/Draw_Segment2D.cxx
+++ b/src/Draw/Draw_Segment2D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Segment2D.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/Draw/Draw_Segment2D.hxx b/src/Draw/Draw_Segment2D.hxx
index 38126a662c..95f7794276 100644
--- a/src/Draw/Draw_Segment2D.hxx
+++ b/src/Draw/Draw_Segment2D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Segment2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt2d.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/Draw/Draw_Segment3D.cxx b/src/Draw/Draw_Segment3D.cxx
index 1efa98564c..4094d150df 100644
--- a/src/Draw/Draw_Segment3D.cxx
+++ b/src/Draw/Draw_Segment3D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Segment3D.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/Draw/Draw_Segment3D.hxx b/src/Draw/Draw_Segment3D.hxx
index 15ad8cd83b..70df5d8556 100644
--- a/src/Draw/Draw_Segment3D.hxx
+++ b/src/Draw/Draw_Segment3D.hxx
@@ -18,7 +18,6 @@
 #define _Draw_Segment3D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt.hxx>
 #include <Draw_Color.hxx>
diff --git a/src/Draw/Draw_Text2D.cxx b/src/Draw/Draw_Text2D.cxx
index 125a1c6edd..35753a2bb5 100644
--- a/src/Draw/Draw_Text2D.cxx
+++ b/src/Draw/Draw_Text2D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Text2D.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/Draw/Draw_Text2D.hxx b/src/Draw/Draw_Text2D.hxx
index 593ad5a2a0..45344680ce 100644
--- a/src/Draw/Draw_Text2D.hxx
+++ b/src/Draw/Draw_Text2D.hxx
@@ -18,14 +18,12 @@
 #define _Draw_Text2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt2d.hxx>
 #include <Draw_Color.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Integer.hxx>
 #include <Draw_Drawable2D.hxx>
-#include <Standard_CString.hxx>
 class Draw_Display;
 
 
diff --git a/src/Draw/Draw_Text3D.cxx b/src/Draw/Draw_Text3D.cxx
index f420a75cbb..69ae0674b3 100644
--- a/src/Draw/Draw_Text3D.cxx
+++ b/src/Draw/Draw_Text3D.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <Draw_Text3D.hxx>
 #include <gp_Pnt.hxx>
diff --git a/src/Draw/Draw_Text3D.hxx b/src/Draw/Draw_Text3D.hxx
index 430534df75..f4528733ef 100644
--- a/src/Draw/Draw_Text3D.hxx
+++ b/src/Draw/Draw_Text3D.hxx
@@ -18,14 +18,11 @@
 #define _Draw_Text3D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <gp_Pnt.hxx>
 #include <Draw_Color.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Standard_Real.hxx>
 #include <Draw_Drawable3D.hxx>
-#include <Standard_CString.hxx>
 class Draw_Display;
 
 
diff --git a/src/Draw/Draw_UnitCommands.cxx b/src/Draw/Draw_UnitCommands.cxx
index 217f9295cf..119ec3e9df 100644
--- a/src/Draw/Draw_UnitCommands.cxx
+++ b/src/Draw/Draw_UnitCommands.cxx
@@ -20,8 +20,6 @@
 #include <Draw_ProgressIndicator.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Units.hxx>
-#include <Units_Token.hxx>
-#include <Units_TokensSequence.hxx>
 #include <Units_UnitsDictionary.hxx>
 #include <Units_UnitSentence.hxx>
 #include <UnitsAPI.hxx>
diff --git a/src/Draw/Draw_Viewer.cxx b/src/Draw/Draw_Viewer.cxx
index 578729cc8b..283c465823 100644
--- a/src/Draw/Draw_Viewer.cxx
+++ b/src/Draw/Draw_Viewer.cxx
@@ -21,7 +21,6 @@
 #include <gp_Pnt2d.hxx>
 #include <Draw_Window.hxx>
 #include <Draw_Display.hxx>
-#include <TCollection_AsciiString.hxx>
 
 #define precpers 0.95
 #define ButtonPress 4
diff --git a/src/Draw/Draw_Viewer.hxx b/src/Draw/Draw_Viewer.hxx
index e8d409994d..89dbac9ed8 100644
--- a/src/Draw/Draw_Viewer.hxx
+++ b/src/Draw/Draw_Viewer.hxx
@@ -17,15 +17,8 @@
 #ifndef Draw_Viewer_HeaderFile
 #define Draw_Viewer_HeaderFile
 
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
-#include <gp_Dir2d.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Ax1.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <Draw_SequenceOfDrawable3D.hxx>
 #include <Draw_Color.hxx>
 
diff --git a/src/Draw/Draw_Window.hxx b/src/Draw/Draw_Window.hxx
index a7c767f04e..8e1f5011a7 100644
--- a/src/Draw/Draw_Window.hxx
+++ b/src/Draw/Draw_Window.hxx
@@ -23,8 +23,6 @@
 
 #include <Aspect_Drawable.hxx>
 #include <NCollection_Vec2.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <TCollection_AsciiString.hxx>
 
 #include <memory>
diff --git a/src/DrawDim/DrawDim.cxx b/src/DrawDim/DrawDim.cxx
index 2a426a3595..dcc9b10f2a 100644
--- a/src/DrawDim/DrawDim.cxx
+++ b/src/DrawDim/DrawDim.cxx
@@ -17,7 +17,6 @@
 #include <DrawDim.hxx>
 
 #include <BRep_Tool.hxx>
-#include <Draw.hxx>
 #include <Draw_Appli.hxx>
 #include <Draw_Text3D.hxx>
 #include <ElCLib.hxx>
@@ -30,7 +29,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
diff --git a/src/DrawDim/DrawDim.hxx b/src/DrawDim/DrawDim.hxx
index b4179db1a1..9c4bb498cc 100644
--- a/src/DrawDim/DrawDim.hxx
+++ b/src/DrawDim/DrawDim.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_CString.hxx>
 #include <Draw_Interpretor.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/DrawDim/DrawDim_Angle.cxx b/src/DrawDim/DrawDim_Angle.cxx
index d2b33629dc..0ae02bad0c 100644
--- a/src/DrawDim/DrawDim_Angle.cxx
+++ b/src/DrawDim/DrawDim_Angle.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <Draw_Display.hxx>
 #include <DrawDim.hxx>
 #include <DrawDim_Angle.hxx>
diff --git a/src/DrawDim/DrawDim_Dimension.cxx b/src/DrawDim/DrawDim_Dimension.cxx
index fb145da483..3d4f51c250 100644
--- a/src/DrawDim/DrawDim_Dimension.cxx
+++ b/src/DrawDim/DrawDim_Dimension.cxx
@@ -15,9 +15,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
-#include <Draw_Interpretor.hxx>
 #include <DrawDim_Dimension.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_DomainError.hxx>
diff --git a/src/DrawDim/DrawDim_Dimension.hxx b/src/DrawDim/DrawDim_Dimension.hxx
index 84c034448e..8f29c0a933 100644
--- a/src/DrawDim/DrawDim_Dimension.hxx
+++ b/src/DrawDim/DrawDim_Dimension.hxx
@@ -18,10 +18,7 @@
 #define _DrawDim_Dimension_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Draw_Color.hxx>
 #include <Draw_Drawable3D.hxx>
 class gp_Pnt;
diff --git a/src/DrawDim/DrawDim_Distance.cxx b/src/DrawDim/DrawDim_Distance.cxx
index fa459d35ae..8873154fb6 100644
--- a/src/DrawDim/DrawDim_Distance.cxx
+++ b/src/DrawDim/DrawDim_Distance.cxx
@@ -21,18 +21,13 @@
 #include <DrawDim.hxx>
 #include <DrawDim_Distance.hxx>
 #include <gp_Ax1.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Vec.hxx>
-#include <Precision.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DrawDim_Distance,DrawDim_Dimension)
 
diff --git a/src/DrawDim/DrawDim_PlanarAngle.cxx b/src/DrawDim/DrawDim_PlanarAngle.cxx
index d88a18689b..6b7e06e48f 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.cxx
+++ b/src/DrawDim/DrawDim_PlanarAngle.cxx
@@ -16,15 +16,12 @@
 
 
 #include <BRep_Tool.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <DBRep_DrawableShape.hxx>
 #include <Draw.hxx>
 #include <Draw_Display.hxx>
-#include <Draw_MarkerShape.hxx>
 #include <DrawDim.hxx>
 #include <DrawDim_PlanarAngle.hxx>
 #include <ElCLib.hxx>
-#include <ElSLib.hxx>
 #include <Geom2d_CartesianPoint.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Curve.hxx>
@@ -36,20 +33,14 @@
 #include <Geom_Line.hxx>
 #include <Geom_Plane.hxx>
 #include <GeomAPI.hxx>
-#include <gp.hxx>
-#include <gp_Ax1.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
-#include <Precision.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/DrawDim/DrawDim_PlanarAngle.hxx b/src/DrawDim/DrawDim_PlanarAngle.hxx
index b03cafe6fd..92c4609eed 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.hxx
+++ b/src/DrawDim/DrawDim_PlanarAngle.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <DrawDim_PlanarDimension.hxx>
 class TopoDS_Face;
 class Draw_Display;
diff --git a/src/DrawDim/DrawDim_PlanarDiameter.cxx b/src/DrawDim/DrawDim_PlanarDiameter.cxx
index a623c3343a..1a862a4079 100644
--- a/src/DrawDim/DrawDim_PlanarDiameter.cxx
+++ b/src/DrawDim/DrawDim_PlanarDiameter.cxx
@@ -16,7 +16,6 @@
 
 
 #include <BRep_Tool.hxx>
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <DrawDim_PlanarDiameter.hxx>
 #include <ElCLib.hxx>
@@ -25,7 +24,6 @@
 #include <gp_Circ.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/DrawDim/DrawDim_PlanarDiameter.hxx b/src/DrawDim/DrawDim_PlanarDiameter.hxx
index ad1e6d0cb5..33ffe9f466 100644
--- a/src/DrawDim/DrawDim_PlanarDiameter.hxx
+++ b/src/DrawDim/DrawDim_PlanarDiameter.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TopoDS_Shape.hxx>
 #include <DrawDim_PlanarDimension.hxx>
 class TopoDS_Face;
 class Draw_Display;
diff --git a/src/DrawDim/DrawDim_PlanarDimension.cxx b/src/DrawDim/DrawDim_PlanarDimension.cxx
index 167262ab5b..9a5b3a5139 100644
--- a/src/DrawDim/DrawDim_PlanarDimension.cxx
+++ b/src/DrawDim/DrawDim_PlanarDimension.cxx
@@ -17,7 +17,6 @@
 
 #include <Draw_Interpretor.hxx>
 #include <DrawDim_PlanarDimension.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 #include <TopoDS_Face.hxx>
 
diff --git a/src/DrawDim/DrawDim_PlanarDimension.hxx b/src/DrawDim/DrawDim_PlanarDimension.hxx
index 9ec7aa3606..17b14a50fe 100644
--- a/src/DrawDim/DrawDim_PlanarDimension.hxx
+++ b/src/DrawDim/DrawDim_PlanarDimension.hxx
@@ -18,7 +18,6 @@
 #define _DrawDim_PlanarDimension_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
 #include <DrawDim_Dimension.hxx>
diff --git a/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx b/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx
index a18884c3b1..154d511b1f 100644
--- a/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx
+++ b/src/DrawDim/DrawDim_PlanarDimensionCommands.cxx
@@ -20,32 +20,23 @@
 
 #include <Draw_Interpretor.hxx>
 #include <Draw_Appli.hxx>
-#include <BRep_Tool.hxx>
-#include <DBRep.hxx> 
 #include <Draw.hxx>
 #include <DBRep.hxx> 
 #include <DrawDim_PlanarDistance.hxx>
 #include <DrawDim_PlanarRadius.hxx>
 #include <DrawDim_PlanarAngle.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_Circle.hxx>
 #include <BRep_Builder.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Circ.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
-#include <gp_Ax3.hxx>
 #include <gp_Pln.hxx>
 #include <DrawTrSurf.hxx>
 
-#ifdef _MSC_VER
-#include <stdio.h>
-#endif
-
 //=======================================================================
 //function : DrawDim_DISTANCE
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarDistance.hxx b/src/DrawDim/DrawDim_PlanarDistance.hxx
index 050495429b..808fcaa95b 100644
--- a/src/DrawDim/DrawDim_PlanarDistance.hxx
+++ b/src/DrawDim/DrawDim_PlanarDistance.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TopoDS_Shape.hxx>
 #include <DrawDim_PlanarDimension.hxx>
 class TopoDS_Face;
 class Draw_Display;
diff --git a/src/DrawDim/DrawDim_PlanarRadius.cxx b/src/DrawDim/DrawDim_PlanarRadius.cxx
index d27f176d42..819fa71ab5 100644
--- a/src/DrawDim/DrawDim_PlanarRadius.cxx
+++ b/src/DrawDim/DrawDim_PlanarRadius.cxx
@@ -16,17 +16,14 @@
 
 
 #include <BRep_Tool.hxx>
-#include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
 #include <DrawDim.hxx>
 #include <DrawDim_PlanarRadius.hxx>
-#include <ElCLib.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/DrawDim/DrawDim_PlanarRadius.hxx b/src/DrawDim/DrawDim_PlanarRadius.hxx
index f16d9b95ef..34ab8c963b 100644
--- a/src/DrawDim/DrawDim_PlanarRadius.hxx
+++ b/src/DrawDim/DrawDim_PlanarRadius.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TopoDS_Shape.hxx>
 #include <DrawDim_PlanarDimension.hxx>
 class TopoDS_Face;
 class Draw_Display;
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cxx b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
index 2083c68d6a..afa2771afa 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.cxx
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
@@ -16,7 +16,6 @@
 
 
 #include <DrawFairCurve_Batten.hxx>
-#include <FairCurve_AnalysisCode.hxx>
 #include <FairCurve_Batten.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <GeomTools_Curve2dSet.hxx>
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.hxx b/src/DrawFairCurve/DrawFairCurve_Batten.hxx
index 35f268fd2a..47157efcdf 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.hxx
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.hxx
@@ -18,7 +18,6 @@
 #define _DrawFairCurve_Batten_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Address.hxx>
 #include <DrawTrSurf_BSplineCurve2d.hxx>
diff --git a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
index 69e228eff4..fe23fd9e24 100644
--- a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
+++ b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
@@ -13,7 +13,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Draw_ColorKind.hxx>
 #include <DrawFairCurve_MinimalVariation.hxx>
 #include <FairCurve_MinimalVariation.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
index 4bb77f6f1c..9a7ee32804 100644
--- a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
+++ b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
@@ -18,7 +18,6 @@
 #define _DrawFairCurve_MinimalVariation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <DrawFairCurve_Batten.hxx>
 #include <Standard_Address.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf.cxx b/src/DrawTrSurf/DrawTrSurf.cxx
index fc629b2e59..cfe5cbdbf7 100644
--- a/src/DrawTrSurf/DrawTrSurf.cxx
+++ b/src/DrawTrSurf/DrawTrSurf.cxx
@@ -46,14 +46,11 @@
 #include <Geom_Surface.hxx>
 #include <GeomTools_Curve2dSet.hxx>
 #include <GeomTools_CurveSet.hxx>
-#include <GeomTools_SurfaceSet.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Ax2d.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Trsf2d.hxx>
-#include <Poly.hxx>
 #include <Poly_Polygon2D.hxx>
 #include <Poly_Polygon3D.hxx>
 #include <Poly_Triangulation.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve.cxx b/src/DrawTrSurf/DrawTrSurf_Curve.cxx
index 3a97655454..826e875ccc 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve.cxx
@@ -16,7 +16,6 @@
 
 #include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
-#include <Geom_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomLProp_CLProps.hxx>
 #include <GeomTools_CurveSet.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx b/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
index af427ff03b..520426b73b 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
@@ -22,8 +22,6 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Hyperbola.hxx>
 #include <Geom2d_Line.hxx>
-#include <Geom2d_OffsetCurve.hxx>
-#include <Geom2d_Parabola.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dLProp_CLProps2d.hxx>
 #include <Geom_Plane.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Debug.cxx b/src/DrawTrSurf/DrawTrSurf_Debug.cxx
index ab1bf497f9..1daa12d677 100644
--- a/src/DrawTrSurf/DrawTrSurf_Debug.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Debug.cxx
@@ -18,7 +18,6 @@
 #include <GeomTools.hxx>
 #include <GeomTools_SurfaceSet.hxx>
 #include <GeomTools_CurveSet.hxx>
-#include <GeomTools_Curve2dSet.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Geom_Geometry.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Drawable.cxx b/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
index fa16a78f09..180d0d3ed6 100644
--- a/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
@@ -16,13 +16,12 @@
 
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_IsoCurve.hxx>
 #include <Draw_Display.hxx>
 #include <DrawTrSurf_Drawable.hxx>
 #include <GCPnts_UniformDeflection.hxx>
-#include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
index 52d4ec45f5..87885b04c8 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
@@ -18,9 +18,7 @@
 
 #include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
-#include <gp_Pnt.hxx>
 #include <Poly.hxx>
-#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Connect.hxx>
 #include <Poly_Triangle.hxx>
 #include <Poly_Triangulation.hxx>
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
index cb92ecfcd9..0fe1b7ea17 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
@@ -17,16 +17,12 @@
 
 #include <Draw_Color.hxx>
 #include <Draw_Display.hxx>
-#include <Draw_Drawable3D.hxx>
 #include <DrawTrSurf_Triangulation2D.hxx>
-#include <gp_Pnt2d.hxx>
 #include <Poly.hxx>
-#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Connect.hxx>
 #include <Poly_Triangle.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Standard_Type.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Triangulation2D,Draw_Drawable2D)
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
index 561213acfe..f66522654e 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
@@ -18,7 +18,6 @@
 #define _DrawTrSurf_Triangulation2D_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
 #include <Draw_Drawable2D.hxx>
diff --git a/src/DsgPrs/DsgPrs.cxx b/src/DsgPrs/DsgPrs.cxx
index ee8b6b451b..63f4e5494e 100644
--- a/src/DsgPrs/DsgPrs.cxx
+++ b/src/DsgPrs/DsgPrs.cxx
@@ -14,14 +14,12 @@
 
 #include <DsgPrs.hxx>
 
-#include <Aspect_TypeOfLine.hxx>
 #include <Aspect_TypeOfMarker.hxx>
 #include <ElCLib.hxx>
 #include <gce_MakeLin.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
-#include <Geom_Surface.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
@@ -38,22 +36,19 @@
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Quantity_Color.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 
 void DsgPrs::ComputeSymbol (const Handle(Prs3d_Presentation)& aPresentation,
-			    const Handle(Prs3d_DimensionAspect)& LA,
-			    const gp_Pnt& pt1,
-			    const gp_Pnt& pt2,
-			    const gp_Dir& dir1,
-			    const gp_Dir& dir2,
-			    const DsgPrs_ArrowSide ArrowSide,
-			    const Standard_Boolean drawFromCenter) 
+                            const Handle(Prs3d_DimensionAspect)& LA,
+                            const gp_Pnt& pt1,
+                            const gp_Pnt& pt2,
+                            const gp_Dir& dir1,
+                            const gp_Dir& dir2,
+                            const DsgPrs_ArrowSide ArrowSide,
+                            const Standard_Boolean drawFromCenter) 
 {
   Handle(Graphic3d_Group) aGroup = aPresentation->NewGroup();
 
diff --git a/src/DsgPrs/DsgPrs.hxx b/src/DsgPrs/DsgPrs.hxx
index 0d8dc44f32..12000abd6c 100644
--- a/src/DsgPrs/DsgPrs.hxx
+++ b/src/DsgPrs/DsgPrs.hxx
@@ -18,8 +18,6 @@
 #define _DsgPrs_HeaderFile
 
 #include <DsgPrs_ArrowSide.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Elips.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_AnglePresentation.cxx b/src/DsgPrs/DsgPrs_AnglePresentation.cxx
index 3d2e0dd8aa..1a8729bf6c 100644
--- a/src/DsgPrs/DsgPrs_AnglePresentation.cxx
+++ b/src/DsgPrs/DsgPrs_AnglePresentation.cxx
@@ -20,21 +20,15 @@
 #include <GC_MakeCircle.hxx>
 #include <gce_MakePln.hxx>
 #include <Geom_Circle.hxx>
-#include <Geom_Line.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_AnglePresentation.hxx b/src/DsgPrs/DsgPrs_AnglePresentation.hxx
index aeb4d2c5d1..f24538b1a6 100644
--- a/src/DsgPrs/DsgPrs_AnglePresentation.hxx
+++ b/src/DsgPrs/DsgPrs_AnglePresentation.hxx
@@ -19,12 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Standard_Real.hxx>
 #include <DsgPrs_ArrowSide.hxx>
-#include <Standard_Boolean.hxx>
 #include <Prs3d_Presentation.hxx>
 
 class TCollection_ExtendedString;
diff --git a/src/DsgPrs/DsgPrs_Chamf2dPresentation.cxx b/src/DsgPrs/DsgPrs_Chamf2dPresentation.cxx
index 884540cd48..5599235485 100644
--- a/src/DsgPrs/DsgPrs_Chamf2dPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_Chamf2dPresentation.cxx
@@ -19,10 +19,8 @@
 #include <DsgPrs_Chamf2dPresentation.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_ConcentricPresentation.hxx b/src/DsgPrs/DsgPrs_ConcentricPresentation.hxx
index 893a56852f..1781a6f235 100644
--- a/src/DsgPrs/DsgPrs_ConcentricPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_ConcentricPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_DatumPrs.cxx b/src/DsgPrs/DsgPrs_DatumPrs.cxx
index c3aefbf702..d40aee4ea3 100644
--- a/src/DsgPrs/DsgPrs_DatumPrs.cxx
+++ b/src/DsgPrs/DsgPrs_DatumPrs.cxx
@@ -17,10 +17,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Ax2.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Prs3d_Arrow.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <Prs3d_ArrowAspect.hxx>
diff --git a/src/DsgPrs/DsgPrs_DatumPrs.hxx b/src/DsgPrs/DsgPrs_DatumPrs.hxx
index d5c154ce69..7b07d3afd1 100644
--- a/src/DsgPrs/DsgPrs_DatumPrs.hxx
+++ b/src/DsgPrs/DsgPrs_DatumPrs.hxx
@@ -14,7 +14,6 @@
 #ifndef DsgPrs_DatumPrs_HeaderFile
 #define DsgPrs_DatumPrs_HeaderFile
 
-#include <gp_Ax2.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Root.hxx>
diff --git a/src/DsgPrs/DsgPrs_DiameterPresentation.cxx b/src/DsgPrs/DsgPrs_DiameterPresentation.cxx
index ce6a1ca575..d6312314b2 100644
--- a/src/DsgPrs/DsgPrs_DiameterPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_DiameterPresentation.cxx
@@ -22,17 +22,12 @@
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <Prs3d_TextAspect.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 //==========================================================================
diff --git a/src/DsgPrs/DsgPrs_DiameterPresentation.hxx b/src/DsgPrs/DsgPrs_DiameterPresentation.hxx
index 5cd24f3400..831e8cfb9f 100644
--- a/src/DsgPrs/DsgPrs_DiameterPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_DiameterPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_ArrowSide.hxx>
diff --git a/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.cxx b/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.cxx
index 8267a21809..85a49ceb81 100644
--- a/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.cxx
@@ -19,27 +19,18 @@
 #include <DsgPrs.hxx>
 #include <ElCLib.hxx>
 #include <Geom_Ellipse.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_OffsetCurve.hxx>
-#include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Elips.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 //=======================================================================
diff --git a/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.hxx b/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.hxx
index bcd3cb15ce..9d63935afd 100644
--- a/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_EllipseRadiusPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_ArrowSide.hxx>
diff --git a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx
index 19c260c761..2627f61395 100644
--- a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.cxx
@@ -19,25 +19,16 @@
 #include <DsgPrs.hxx>
 #include <ElCLib.hxx>
 #include <Geom_Circle.hxx>
-#include <Geom_Line.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI_ExtremaCurveCurve.hxx>
 #include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 #include <stdio.h>
diff --git a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.hxx b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.hxx
index e7ed0b6456..068308fe92 100644
--- a/src/DsgPrs/DsgPrs_FilletRadiusPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_FilletRadiusPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_ArrowSide.hxx>
diff --git a/src/DsgPrs/DsgPrs_FixPresentation.hxx b/src/DsgPrs/DsgPrs_FixPresentation.hxx
index 09a5772515..67f82bb73c 100644
--- a/src/DsgPrs/DsgPrs_FixPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_FixPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_IdenticPresentation.cxx b/src/DsgPrs/DsgPrs_IdenticPresentation.cxx
index a71850ce0a..c5401b1945 100644
--- a/src/DsgPrs/DsgPrs_IdenticPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_IdenticPresentation.cxx
@@ -33,7 +33,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 void DsgPrs_IdenticPresentation::Add( const Handle(Prs3d_Presentation)& aPresentation,
diff --git a/src/DsgPrs/DsgPrs_IdenticPresentation.hxx b/src/DsgPrs/DsgPrs_IdenticPresentation.hxx
index b407744960..87966fabc0 100644
--- a/src/DsgPrs/DsgPrs_IdenticPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_IdenticPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_LengthPresentation.cxx b/src/DsgPrs/DsgPrs_LengthPresentation.cxx
index 933e8ba0c5..09e43f7c20 100644
--- a/src/DsgPrs/DsgPrs_LengthPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_LengthPresentation.cxx
@@ -17,25 +17,19 @@
 #include <DsgPrs.hxx>
 #include <ElCLib.hxx>
 #include <gce_MakeLin.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 void DsgPrs_LengthPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
diff --git a/src/DsgPrs/DsgPrs_LengthPresentation.hxx b/src/DsgPrs/DsgPrs_LengthPresentation.hxx
index 0af13a36e8..8aa94ba10a 100644
--- a/src/DsgPrs/DsgPrs_LengthPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_LengthPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_ArrowSide.hxx>
diff --git a/src/DsgPrs/DsgPrs_MidPointPresentation.cxx b/src/DsgPrs/DsgPrs_MidPointPresentation.cxx
index cd98ec0610..7a8ae0a929 100644
--- a/src/DsgPrs/DsgPrs_MidPointPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_MidPointPresentation.cxx
@@ -16,17 +16,12 @@
 
 #include <DsgPrs_MidPointPresentation.hxx>
 #include <ElCLib.hxx>
-#include <gp_Ax1.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Circ.hxx>
-#include <gp_Dir.hxx>
 #include <gp_Elips.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_DimensionAspect.hxx>
diff --git a/src/DsgPrs/DsgPrs_MidPointPresentation.hxx b/src/DsgPrs/DsgPrs_MidPointPresentation.hxx
index c12af42d88..30e9dd5258 100644
--- a/src/DsgPrs/DsgPrs_MidPointPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_MidPointPresentation.hxx
@@ -18,7 +18,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_OffsetPresentation.cxx b/src/DsgPrs/DsgPrs_OffsetPresentation.cxx
index 22a8c2cd26..54f2a276c3 100644
--- a/src/DsgPrs/DsgPrs_OffsetPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_OffsetPresentation.cxx
@@ -22,18 +22,15 @@
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 void DsgPrs_OffsetPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
diff --git a/src/DsgPrs/DsgPrs_OffsetPresentation.hxx b/src/DsgPrs/DsgPrs_OffsetPresentation.hxx
index 1ff83b6bb5..ea614a7ac5 100644
--- a/src/DsgPrs/DsgPrs_OffsetPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_OffsetPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_ParalPresentation.cxx b/src/DsgPrs/DsgPrs_ParalPresentation.cxx
index 83e3b3c7ae..1ca368be20 100644
--- a/src/DsgPrs/DsgPrs_ParalPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_ParalPresentation.cxx
@@ -22,16 +22,12 @@
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 void DsgPrs_ParalPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
diff --git a/src/DsgPrs/DsgPrs_PerpenPresentation.cxx b/src/DsgPrs/DsgPrs_PerpenPresentation.cxx
index be1028ff2d..f2e3fc7236 100644
--- a/src/DsgPrs/DsgPrs_PerpenPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_PerpenPresentation.cxx
@@ -18,35 +18,24 @@
 #include <DsgPrs_PerpenPresentation.hxx>
 #include <ElCLib.hxx>
 #include <gce_MakeDir.hxx>
-#include <gce_MakeLin.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
-#include <Prs3d_TextAspect.hxx>
-#include <StdPrs_Point.hxx>
-#include <TCollection_AsciiString.hxx>
 
 void DsgPrs_PerpenPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
-				     const Handle(Prs3d_Drawer)& aDrawer,
-				     const gp_Pnt& pAx1,
-				     const gp_Pnt& pAx2,
-				     const gp_Pnt& pnt1,
-				     const gp_Pnt& pnt2,
-				     const gp_Pnt& OffsetPoint,
-				     const Standard_Boolean intOut1,
-				     const Standard_Boolean intOut2)
+                                     const Handle(Prs3d_Drawer)& aDrawer,
+                                     const gp_Pnt& pAx1,
+                                     const gp_Pnt& pAx2,
+                                     const gp_Pnt& pnt1,
+                                     const gp_Pnt& pnt2,
+                                     const gp_Pnt& OffsetPoint,
+                                     const Standard_Boolean intOut1,
+                                     const Standard_Boolean intOut2)
 {
   Handle(Prs3d_DimensionAspect) LA = aDrawer->DimensionAspect();
   LA->LineAspect()->SetTypeOfLine(Aspect_TOL_SOLID); // ou DOT ou DOTDASH
diff --git a/src/DsgPrs/DsgPrs_PerpenPresentation.hxx b/src/DsgPrs/DsgPrs_PerpenPresentation.hxx
index 799363c437..d4e5614a0f 100644
--- a/src/DsgPrs/DsgPrs_PerpenPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_PerpenPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_RadiusPresentation.cxx b/src/DsgPrs/DsgPrs_RadiusPresentation.cxx
index b16d0da39c..12296892a4 100644
--- a/src/DsgPrs/DsgPrs_RadiusPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_RadiusPresentation.cxx
@@ -19,18 +19,12 @@
 #include <DsgPrs.hxx>
 #include <ElCLib.hxx>
 #include <gce_MakeDir.hxx>
-#include <gce_MakeLin.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_RadiusPresentation.hxx b/src/DsgPrs/DsgPrs_RadiusPresentation.hxx
index 15afa61f59..8fbefc5d9c 100644
--- a/src/DsgPrs/DsgPrs_RadiusPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_RadiusPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <DsgPrs_ArrowSide.hxx>
diff --git a/src/DsgPrs/DsgPrs_ShadedPlanePresentation.cxx b/src/DsgPrs/DsgPrs_ShadedPlanePresentation.cxx
index 73c8971459..4a6a90533a 100644
--- a/src/DsgPrs/DsgPrs_ShadedPlanePresentation.cxx
+++ b/src/DsgPrs/DsgPrs_ShadedPlanePresentation.cxx
@@ -19,7 +19,6 @@
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolygons.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
diff --git a/src/DsgPrs/DsgPrs_ShadedPlanePresentation.hxx b/src/DsgPrs/DsgPrs_ShadedPlanePresentation.hxx
index 1e94db7a55..69596372b7 100644
--- a/src/DsgPrs/DsgPrs_ShadedPlanePresentation.hxx
+++ b/src/DsgPrs/DsgPrs_ShadedPlanePresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
index 2e8988ba1f..60071354e9 100644
--- a/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_ShapeDirPresentation.cxx
@@ -18,7 +18,6 @@
 #include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBndLib.hxx>
-#include <BRepClass_Edge.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <DsgPrs_ShapeDirPresentation.hxx>
@@ -29,7 +28,6 @@
 #include <GeomLProp_SLProps.hxx>
 #include <gp.hxx>
 #include <gp_Dir.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
 #include <Prs3d_LineAspect.hxx>
diff --git a/src/DsgPrs/DsgPrs_SymbPresentation.cxx b/src/DsgPrs/DsgPrs_SymbPresentation.cxx
index 39b42cc6bb..07a353007c 100644
--- a/src/DsgPrs/DsgPrs_SymbPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_SymbPresentation.cxx
@@ -15,18 +15,15 @@
 // commercial license or contractual agreement.
 
 
-#include <Aspect_TypeOfMarker.hxx>
 #include <DsgPrs_SymbPresentation.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <gp_Pnt.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_Text.hxx>
 #include <Prs3d_TextAspect.hxx>
 #include <StdPrs_Point.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 void DsgPrs_SymbPresentation::Add (const Handle(Prs3d_Presentation)& aPresentation,
diff --git a/src/DsgPrs/DsgPrs_SymbPresentation.hxx b/src/DsgPrs/DsgPrs_SymbPresentation.hxx
index 34a3d2475a..bd0f540cd1 100644
--- a/src/DsgPrs/DsgPrs_SymbPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_SymbPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx b/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
index 5c1d860895..d8d699143c 100644
--- a/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_SymmetricPresentation.cxx
@@ -17,34 +17,24 @@
 
 #include <DsgPrs_SymmetricPresentation.hxx>
 #include <ElCLib.hxx>
-#include <gce_MakeDir.hxx>
 #include <gce_MakeLin.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Plane.hxx>
-#include <GeomAPI.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
-#include <IntAna2d_AnaIntersection.hxx>
 #include <Precision.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <TCollection_AsciiString.hxx>
 
 //===================================================================
 //Function:Add
diff --git a/src/DsgPrs/DsgPrs_SymmetricPresentation.hxx b/src/DsgPrs/DsgPrs_SymmetricPresentation.hxx
index 854ec89372..10425ea57f 100644
--- a/src/DsgPrs/DsgPrs_SymmetricPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_SymmetricPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_TangentPresentation.cxx b/src/DsgPrs/DsgPrs_TangentPresentation.cxx
index c3d6bbad6f..2c52fba3fe 100644
--- a/src/DsgPrs/DsgPrs_TangentPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_TangentPresentation.cxx
@@ -20,14 +20,10 @@
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <StdPrs_Point.hxx>
 
diff --git a/src/DsgPrs/DsgPrs_TangentPresentation.hxx b/src/DsgPrs/DsgPrs_TangentPresentation.hxx
index 99067d3361..00c534dcab 100644
--- a/src/DsgPrs/DsgPrs_TangentPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_TangentPresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
index fd0b03c9ff..5c994c17a3 100644
--- a/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
+++ b/src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx
@@ -18,7 +18,6 @@
 #include <DsgPrs_XYZAxisPresentation.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Text.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Arrow.hxx>
diff --git a/src/DsgPrs/DsgPrs_XYZAxisPresentation.hxx b/src/DsgPrs/DsgPrs_XYZAxisPresentation.hxx
index b1f3b580c6..a554b04c5d 100644
--- a/src/DsgPrs/DsgPrs_XYZAxisPresentation.hxx
+++ b/src/DsgPrs/DsgPrs_XYZAxisPresentation.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_CString.hxx>
 #include <Prs3d_Presentation.hxx>
 
 class Prs3d_LineAspect;
diff --git a/src/DsgPrs/DsgPrs_XYZPlanePresentation.cxx b/src/DsgPrs/DsgPrs_XYZPlanePresentation.cxx
index 74f48370c4..ae7d72fd5d 100644
--- a/src/DsgPrs/DsgPrs_XYZPlanePresentation.cxx
+++ b/src/DsgPrs/DsgPrs_XYZPlanePresentation.cxx
@@ -19,7 +19,6 @@
 #include <gp_Pnt.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 
diff --git a/src/DsgPrs/DsgPrs_XYZPlanePresentation.hxx b/src/DsgPrs/DsgPrs_XYZPlanePresentation.hxx
index 8becdd159c..a647eda8de 100644
--- a/src/DsgPrs/DsgPrs_XYZPlanePresentation.hxx
+++ b/src/DsgPrs/DsgPrs_XYZPlanePresentation.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
diff --git a/src/ElCLib/ElCLib.hxx b/src/ElCLib/ElCLib.hxx
index 8c527b4ee7..426ad590d1 100644
--- a/src/ElCLib/ElCLib.hxx
+++ b/src/ElCLib/ElCLib.hxx
@@ -21,9 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_Integer.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
diff --git a/src/ElSLib/ElSLib.cxx b/src/ElSLib/ElSLib.cxx
index 86d7f591f5..3b61b31408 100644
--- a/src/ElSLib/ElSLib.cxx
+++ b/src/ElSLib/ElSLib.cxx
@@ -26,13 +26,8 @@
 #include <gp.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
 #include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Torus.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
 #include <gp_XYZ.hxx>
diff --git a/src/ElSLib/ElSLib.hxx b/src/ElSLib/ElSLib.hxx
index a5a91f467f..389cfb38ba 100644
--- a/src/ElSLib/ElSLib.hxx
+++ b/src/ElSLib/ElSLib.hxx
@@ -21,9 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
-#include <Standard_Integer.hxx>
 #include <gp_Vec.hxx>
 class gp_Pnt;
 class gp_Pln;
diff --git a/src/Expr/Expr.cxx b/src/Expr/Expr.cxx
index d7f6a38c44..7ddb8b80b0 100644
--- a/src/Expr/Expr.cxx
+++ b/src/Expr/Expr.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <Expr.hxx>
-#include <Expr_NamedUnknown.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralRelation.hxx>
 #include <Expr_UnknownIterator.hxx>
diff --git a/src/Expr/Expr_Absolute.cxx b/src/Expr/Expr_Absolute.cxx
index 5eb3dbc0ed..de9bf3e656 100644
--- a/src/Expr/Expr_Absolute.cxx
+++ b/src/Expr/Expr_Absolute.cxx
@@ -19,13 +19,10 @@
 #include <Expr_Absolute.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sign.hxx>
 #include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Absolute.hxx b/src/Expr/Expr_Absolute.hxx
index 37e02d5ccb..2f80648265 100644
--- a/src/Expr/Expr_Absolute.hxx
+++ b/src/Expr/Expr_Absolute.hxx
@@ -18,11 +18,8 @@
 #define _Expr_Absolute_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArcCosine.cxx b/src/Expr/Expr_ArcCosine.cxx
index 761d54e7d8..0c8b7d7726 100644
--- a/src/Expr/Expr_ArcCosine.cxx
+++ b/src/Expr/Expr_ArcCosine.cxx
@@ -18,18 +18,13 @@
 #include <Expr.hxx>
 #include <Expr_ArcCosine.hxx>
 #include <Expr_Cosine.hxx>
-#include <Expr_Difference.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
 #include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArcCosine.hxx b/src/Expr/Expr_ArcCosine.hxx
index 66eaa81ca3..3e9caa6de2 100644
--- a/src/Expr/Expr_ArcCosine.hxx
+++ b/src/Expr/Expr_ArcCosine.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArcCosine_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArcSine.cxx b/src/Expr/Expr_ArcSine.cxx
index 3f015d3869..6f93d871f5 100644
--- a/src/Expr/Expr_ArcSine.cxx
+++ b/src/Expr/Expr_ArcSine.cxx
@@ -17,17 +17,12 @@
 
 #include <Expr.hxx>
 #include <Expr_ArcSine.hxx>
-#include <Expr_Difference.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Sine.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArcSine.hxx b/src/Expr/Expr_ArcSine.hxx
index 2c561b647e..cb87cff94c 100644
--- a/src/Expr/Expr_ArcSine.hxx
+++ b/src/Expr/Expr_ArcSine.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArcSine_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArcTangent.cxx b/src/Expr/Expr_ArcTangent.cxx
index 5ac38e040a..149f5385a8 100644
--- a/src/Expr/Expr_ArcTangent.cxx
+++ b/src/Expr/Expr_ArcTangent.cxx
@@ -17,16 +17,12 @@
 
 #include <Expr.hxx>
 #include <Expr_ArcTangent.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_Sum.hxx>
 #include <Expr_Tangent.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArcTangent.hxx b/src/Expr/Expr_ArcTangent.hxx
index b0e3ec33a2..b983d269b2 100644
--- a/src/Expr/Expr_ArcTangent.hxx
+++ b/src/Expr/Expr_ArcTangent.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArcTangent_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArgCosh.cxx b/src/Expr/Expr_ArgCosh.cxx
index ecf8cb5db5..48d6192e24 100644
--- a/src/Expr/Expr_ArgCosh.cxx
+++ b/src/Expr/Expr_ArgCosh.cxx
@@ -18,16 +18,11 @@
 #include <Expr.hxx>
 #include <Expr_ArgCosh.hxx>
 #include <Expr_Cosh.hxx>
-#include <Expr_Difference.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArgCosh.hxx b/src/Expr/Expr_ArgCosh.hxx
index a2b8d76e1c..04563a7dc4 100644
--- a/src/Expr/Expr_ArgCosh.hxx
+++ b/src/Expr/Expr_ArgCosh.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArgCosh_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArgSinh.cxx b/src/Expr/Expr_ArgSinh.cxx
index 7f0c991553..67d1600815 100644
--- a/src/Expr/Expr_ArgSinh.cxx
+++ b/src/Expr/Expr_ArgSinh.cxx
@@ -17,17 +17,13 @@
 
 #include <Expr.hxx>
 #include <Expr_ArgSinh.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Sinh.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
 #include <Expr_Sum.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArgSinh.hxx b/src/Expr/Expr_ArgSinh.hxx
index f97b081a99..04e9a00745 100644
--- a/src/Expr/Expr_ArgSinh.hxx
+++ b/src/Expr/Expr_ArgSinh.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArgSinh_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_ArgTanh.cxx b/src/Expr/Expr_ArgTanh.cxx
index 0889483df1..ffe5e1fd3b 100644
--- a/src/Expr/Expr_ArgTanh.cxx
+++ b/src/Expr/Expr_ArgTanh.cxx
@@ -17,16 +17,11 @@
 
 #include <Expr.hxx>
 #include <Expr_ArgTanh.hxx>
-#include <Expr_Difference.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_Tanh.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_ArgTanh.hxx b/src/Expr/Expr_ArgTanh.hxx
index 490f2245da..45e45dc10f 100644
--- a/src/Expr/Expr_ArgTanh.hxx
+++ b/src/Expr/Expr_ArgTanh.hxx
@@ -18,11 +18,8 @@
 #define _Expr_ArgTanh_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_BinaryExpression.cxx b/src/Expr/Expr_BinaryExpression.cxx
index 43083e8971..037e6c22de 100644
--- a/src/Expr/Expr_BinaryExpression.cxx
+++ b/src/Expr/Expr_BinaryExpression.cxx
@@ -19,7 +19,6 @@
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_InvalidOperand.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
diff --git a/src/Expr/Expr_BinaryExpression.hxx b/src/Expr/Expr_BinaryExpression.hxx
index 017065d84a..3522cba9de 100644
--- a/src/Expr/Expr_BinaryExpression.hxx
+++ b/src/Expr/Expr_BinaryExpression.hxx
@@ -22,7 +22,6 @@
 
 #include <Expr_GeneralExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_NamedUnknown;
 
 
diff --git a/src/Expr/Expr_BinaryFunction.cxx b/src/Expr/Expr_BinaryFunction.cxx
index 1557944ca8..222836d94b 100644
--- a/src/Expr/Expr_BinaryFunction.cxx
+++ b/src/Expr/Expr_BinaryFunction.cxx
@@ -24,17 +24,12 @@
 #include <Expr_Array1OfGeneralExpression.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <Expr_BinaryFunction.hxx>
-#include <Expr_FunctionDerivative.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralFunction.hxx>
 #include <Expr_InvalidFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
-#include <Expr_Product.hxx>
 #include <Expr_Sum.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_BinaryFunction.hxx b/src/Expr/Expr_BinaryFunction.hxx
index 32ebf062be..d2d021159a 100644
--- a/src/Expr/Expr_BinaryFunction.hxx
+++ b/src/Expr/Expr_BinaryFunction.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_BinaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralFunction;
diff --git a/src/Expr/Expr_Cosh.cxx b/src/Expr/Expr_Cosh.cxx
index 68f97981e8..32b9637202 100644
--- a/src/Expr/Expr_Cosh.cxx
+++ b/src/Expr/Expr_Cosh.cxx
@@ -20,12 +20,9 @@
 #include <Expr_Cosh.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sinh.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Cosh.hxx b/src/Expr/Expr_Cosh.hxx
index aa0413e01e..b501fb0797 100644
--- a/src/Expr/Expr_Cosh.hxx
+++ b/src/Expr/Expr_Cosh.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Cosine.cxx b/src/Expr/Expr_Cosine.cxx
index 79f595f63c..6f3e25af0d 100644
--- a/src/Expr/Expr_Cosine.cxx
+++ b/src/Expr/Expr_Cosine.cxx
@@ -20,13 +20,10 @@
 #include <Expr_Cosine.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sine.hxx>
 #include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Cosine.hxx b/src/Expr/Expr_Cosine.hxx
index 63b8166535..7122685310 100644
--- a/src/Expr/Expr_Cosine.hxx
+++ b/src/Expr/Expr_Cosine.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Difference.cxx b/src/Expr/Expr_Difference.cxx
index a4bd9bf4cf..a694f1afd9 100644
--- a/src/Expr/Expr_Difference.cxx
+++ b/src/Expr/Expr_Difference.cxx
@@ -19,12 +19,9 @@
 #include <Expr_Difference.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Sum.hxx>
 #include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_Difference.hxx b/src/Expr/Expr_Difference.hxx
index 527ce3c4ed..696462f5af 100644
--- a/src/Expr/Expr_Difference.hxx
+++ b/src/Expr/Expr_Difference.hxx
@@ -18,12 +18,9 @@
 #define _Expr_Difference_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_BinaryExpression.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Different.cxx b/src/Expr/Expr_Different.cxx
index a2b370577f..c021f6dd5d 100644
--- a/src/Expr/Expr_Different.cxx
+++ b/src/Expr/Expr_Different.cxx
@@ -19,7 +19,6 @@
 #include <Expr_Different.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralRelation.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Different.hxx b/src/Expr/Expr_Different.hxx
index cb27fb4bd3..773ac42da1 100644
--- a/src/Expr/Expr_Different.hxx
+++ b/src/Expr/Expr_Different.hxx
@@ -18,10 +18,8 @@
 #define _Expr_Different_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_Division.cxx b/src/Expr/Expr_Division.cxx
index 8e910b5509..bc9f1a9d6b 100644
--- a/src/Expr/Expr_Division.cxx
+++ b/src/Expr/Expr_Division.cxx
@@ -20,13 +20,9 @@
 #include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Square.hxx>
-#include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Division.hxx b/src/Expr/Expr_Division.hxx
index 3604bc6d29..46e3055f79 100644
--- a/src/Expr/Expr_Division.hxx
+++ b/src/Expr/Expr_Division.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_BinaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Equal.cxx b/src/Expr/Expr_Equal.cxx
index 63bfed4e5f..3cbaeaf7d8 100644
--- a/src/Expr/Expr_Equal.cxx
+++ b/src/Expr/Expr_Equal.cxx
@@ -19,7 +19,6 @@
 #include <Expr_Equal.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralRelation.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Equal.hxx b/src/Expr/Expr_Equal.hxx
index 42b7f14531..c9a909d6da 100644
--- a/src/Expr/Expr_Equal.hxx
+++ b/src/Expr/Expr_Equal.hxx
@@ -18,10 +18,8 @@
 #define _Expr_Equal_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_Exponential.cxx b/src/Expr/Expr_Exponential.cxx
index 461609e52d..c7bc113c2f 100644
--- a/src/Expr/Expr_Exponential.cxx
+++ b/src/Expr/Expr_Exponential.cxx
@@ -20,11 +20,8 @@
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_LogOfe.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Exponential.hxx b/src/Expr/Expr_Exponential.hxx
index 2011b2f9c8..4b1bcfd783 100644
--- a/src/Expr/Expr_Exponential.hxx
+++ b/src/Expr/Expr_Exponential.hxx
@@ -18,11 +18,8 @@
 #define _Expr_Exponential_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Exponentiate.cxx b/src/Expr/Expr_Exponentiate.cxx
index 18854cb3d0..391aae76b0 100644
--- a/src/Expr/Expr_Exponentiate.cxx
+++ b/src/Expr/Expr_Exponentiate.cxx
@@ -21,13 +21,10 @@
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_LogOfe.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_SequenceOfGeneralExpression.hxx>
 #include <Expr_Sum.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Exponentiate.hxx b/src/Expr/Expr_Exponentiate.hxx
index ae29b4d937..ef63bd52a4 100644
--- a/src/Expr/Expr_Exponentiate.hxx
+++ b/src/Expr/Expr_Exponentiate.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_BinaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_FunctionDerivative.cxx b/src/Expr/Expr_FunctionDerivative.cxx
index 86f28e7d28..93c8fa3d1b 100644
--- a/src/Expr/Expr_FunctionDerivative.cxx
+++ b/src/Expr/Expr_FunctionDerivative.cxx
@@ -16,15 +16,10 @@
 
 
 #include <Expr_FunctionDerivative.hxx>
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralFunction.hxx>
 #include <Expr_NamedFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_DimensionMismatch.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_FunctionDerivative.hxx b/src/Expr/Expr_FunctionDerivative.hxx
index 9aaeb76f73..c0f6586f5e 100644
--- a/src/Expr/Expr_FunctionDerivative.hxx
+++ b/src/Expr/Expr_FunctionDerivative.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_GeneralExpression.cxx b/src/Expr/Expr_GeneralExpression.cxx
index a3e52c44fc..f20eb3f486 100644
--- a/src/Expr/Expr_GeneralExpression.cxx
+++ b/src/Expr/Expr_GeneralExpression.cxx
@@ -16,10 +16,8 @@
 
 
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_InvalidOperand.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_NotEvaluable.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_GeneralExpression.hxx b/src/Expr/Expr_GeneralExpression.hxx
index 6858a41544..8b3938782e 100644
--- a/src/Expr/Expr_GeneralExpression.hxx
+++ b/src/Expr/Expr_GeneralExpression.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/Expr/Expr_GeneralFunction.cxx b/src/Expr/Expr_GeneralFunction.cxx
index c16fb28c20..a142136b67 100644
--- a/src/Expr/Expr_GeneralFunction.cxx
+++ b/src/Expr/Expr_GeneralFunction.cxx
@@ -17,10 +17,6 @@
 
 #include <Expr_GeneralFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Standard_DimensionMismatch.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_GeneralFunction.hxx b/src/Expr/Expr_GeneralFunction.hxx
index 3b662fe838..9d7b362e70 100644
--- a/src/Expr/Expr_GeneralFunction.hxx
+++ b/src/Expr/Expr_GeneralFunction.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_NamedUnknown;
 class TCollection_AsciiString;
 
diff --git a/src/Expr/Expr_GeneralRelation.cxx b/src/Expr/Expr_GeneralRelation.cxx
index bace868bfd..c182e90300 100644
--- a/src/Expr/Expr_GeneralRelation.cxx
+++ b/src/Expr/Expr_GeneralRelation.cxx
@@ -15,11 +15,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralRelation.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_GeneralRelation.hxx b/src/Expr/Expr_GeneralRelation.hxx
index 401e437e33..ca1edc87ac 100644
--- a/src/Expr/Expr_GeneralRelation.hxx
+++ b/src/Expr/Expr_GeneralRelation.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
diff --git a/src/Expr/Expr_GreaterThan.cxx b/src/Expr/Expr_GreaterThan.cxx
index b1d8efba88..81c52affc2 100644
--- a/src/Expr/Expr_GreaterThan.cxx
+++ b/src/Expr/Expr_GreaterThan.cxx
@@ -17,10 +17,8 @@
 
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_GreaterThan.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_GreaterThan.hxx b/src/Expr/Expr_GreaterThan.hxx
index 43b3caf87f..6f34785acb 100644
--- a/src/Expr/Expr_GreaterThan.hxx
+++ b/src/Expr/Expr_GreaterThan.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_GreaterThanOrEqual.cxx b/src/Expr/Expr_GreaterThanOrEqual.cxx
index 3f2e526d60..04a640ecf6 100644
--- a/src/Expr/Expr_GreaterThanOrEqual.cxx
+++ b/src/Expr/Expr_GreaterThanOrEqual.cxx
@@ -17,10 +17,8 @@
 
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_GreaterThanOrEqual.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_GreaterThanOrEqual.hxx b/src/Expr/Expr_GreaterThanOrEqual.hxx
index 7744899afa..caf4e7b467 100644
--- a/src/Expr/Expr_GreaterThanOrEqual.hxx
+++ b/src/Expr/Expr_GreaterThanOrEqual.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_LessThan.cxx b/src/Expr/Expr_LessThan.cxx
index b160478a10..f299551548 100644
--- a/src/Expr/Expr_LessThan.cxx
+++ b/src/Expr/Expr_LessThan.cxx
@@ -17,10 +17,8 @@
 
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_LessThan.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_LessThan.hxx b/src/Expr/Expr_LessThan.hxx
index 1ec66e6f6e..6a923563f0 100644
--- a/src/Expr/Expr_LessThan.hxx
+++ b/src/Expr/Expr_LessThan.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_LessThanOrEqual.cxx b/src/Expr/Expr_LessThanOrEqual.cxx
index f97379e63f..08c7fd6ad5 100644
--- a/src/Expr/Expr_LessThanOrEqual.cxx
+++ b/src/Expr/Expr_LessThanOrEqual.cxx
@@ -17,10 +17,8 @@
 
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_LessThanOrEqual.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_LessThanOrEqual.hxx b/src/Expr/Expr_LessThanOrEqual.hxx
index 40aefff65c..8a42e7cefc 100644
--- a/src/Expr/Expr_LessThanOrEqual.hxx
+++ b/src/Expr/Expr_LessThanOrEqual.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_SingleRelation.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_LogOf10.cxx b/src/Expr/Expr_LogOf10.cxx
index 31c7e13419..b469d4c2f6 100644
--- a/src/Expr/Expr_LogOf10.cxx
+++ b/src/Expr/Expr_LogOf10.cxx
@@ -20,11 +20,8 @@
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_LogOf10.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_LogOf10.hxx b/src/Expr/Expr_LogOf10.hxx
index 8c743890be..2d399afd61 100644
--- a/src/Expr/Expr_LogOf10.hxx
+++ b/src/Expr/Expr_LogOf10.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_LogOfe.cxx b/src/Expr/Expr_LogOfe.cxx
index 9595728ff9..1668a3fc52 100644
--- a/src/Expr/Expr_LogOfe.cxx
+++ b/src/Expr/Expr_LogOfe.cxx
@@ -21,10 +21,7 @@
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_LogOfe.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_LogOfe.hxx b/src/Expr/Expr_LogOfe.hxx
index b98e18defd..ae9880662a 100644
--- a/src/Expr/Expr_LogOfe.hxx
+++ b/src/Expr/Expr_LogOfe.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_NamedConstant.hxx b/src/Expr/Expr_NamedConstant.hxx
index f3d32a87cc..4fa5cf1c38 100644
--- a/src/Expr/Expr_NamedConstant.hxx
+++ b/src/Expr/Expr_NamedConstant.hxx
@@ -20,10 +20,8 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Expr_NamedExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class TCollection_AsciiString;
diff --git a/src/Expr/Expr_NamedExpression.cxx b/src/Expr/Expr_NamedExpression.cxx
index 4731c0f52e..7cb228e5b4 100644
--- a/src/Expr/Expr_NamedExpression.cxx
+++ b/src/Expr/Expr_NamedExpression.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedExpression.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_NamedExpression.hxx b/src/Expr/Expr_NamedExpression.hxx
index b6beb67f03..04493898d3 100644
--- a/src/Expr/Expr_NamedExpression.hxx
+++ b/src/Expr/Expr_NamedExpression.hxx
@@ -18,11 +18,9 @@
 #define _Expr_NamedExpression_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <Expr_GeneralExpression.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class Expr_NamedExpression;
diff --git a/src/Expr/Expr_NamedFunction.cxx b/src/Expr/Expr_NamedFunction.cxx
index 78562607ba..4520d90fd2 100644
--- a/src/Expr/Expr_NamedFunction.cxx
+++ b/src/Expr/Expr_NamedFunction.cxx
@@ -17,15 +17,10 @@
 
 #include <Expr.hxx>
 #include <Expr_FunctionDerivative.hxx>
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralFunction.hxx>
-#include <Expr_NamedConstant.hxx>
 #include <Expr_NamedFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_DimensionMismatch.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_NamedFunction.hxx b/src/Expr/Expr_NamedFunction.hxx
index 9c5090ec74..d1c6fb8b71 100644
--- a/src/Expr/Expr_NamedFunction.hxx
+++ b/src/Expr/Expr_NamedFunction.hxx
@@ -24,9 +24,7 @@
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <Expr_GeneralFunction.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
 
diff --git a/src/Expr/Expr_NamedUnknown.cxx b/src/Expr/Expr_NamedUnknown.cxx
index 3aef079ef6..355cd35742 100644
--- a/src/Expr/Expr_NamedUnknown.cxx
+++ b/src/Expr/Expr_NamedUnknown.cxx
@@ -23,7 +23,6 @@
 #include <Expr_NotAssigned.hxx>
 #include <Expr_NotEvaluable.hxx>
 #include <Expr_NumericValue.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_NamedUnknown.hxx b/src/Expr/Expr_NamedUnknown.hxx
index b112b24e53..aae3e7cce3 100644
--- a/src/Expr/Expr_NamedUnknown.hxx
+++ b/src/Expr/Expr_NamedUnknown.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_NamedExpression.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_NumericValue.hxx b/src/Expr/Expr_NumericValue.hxx
index fc987494ab..e77fb1a88d 100644
--- a/src/Expr/Expr_NumericValue.hxx
+++ b/src/Expr/Expr_NumericValue.hxx
@@ -20,10 +20,8 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_NamedUnknown;
diff --git a/src/Expr/Expr_PolyExpression.cxx b/src/Expr/Expr_PolyExpression.cxx
index 3bd37ec993..96fd1d7e9c 100644
--- a/src/Expr/Expr_PolyExpression.cxx
+++ b/src/Expr/Expr_PolyExpression.cxx
@@ -15,13 +15,10 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_InvalidOperand.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_PolyExpression.hxx>
 #include <Standard_DimensionMismatch.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Expr_PolyExpression,Expr_GeneralExpression)
diff --git a/src/Expr/Expr_PolyExpression.hxx b/src/Expr/Expr_PolyExpression.hxx
index faeb02ce42..56e2c1b1d8 100644
--- a/src/Expr/Expr_PolyExpression.hxx
+++ b/src/Expr/Expr_PolyExpression.hxx
@@ -23,7 +23,6 @@
 #include <Expr_SequenceOfGeneralExpression.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_NamedUnknown;
 
 
diff --git a/src/Expr/Expr_PolyFunction.cxx b/src/Expr/Expr_PolyFunction.cxx
index 61f1544a8a..68fc1f996d 100644
--- a/src/Expr/Expr_PolyFunction.cxx
+++ b/src/Expr/Expr_PolyFunction.cxx
@@ -23,18 +23,13 @@
 #include <Expr.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <Expr_FunctionDerivative.hxx>
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_GeneralFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_PolyFunction.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sum.hxx>
-#include <Standard_DimensionError.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_PolyFunction.hxx b/src/Expr/Expr_PolyFunction.hxx
index 294c43168c..4691d52094 100644
--- a/src/Expr/Expr_PolyFunction.hxx
+++ b/src/Expr/Expr_PolyFunction.hxx
@@ -22,8 +22,6 @@
 
 #include <Expr_PolyExpression.hxx>
 #include <Expr_Array1OfGeneralExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralFunction;
diff --git a/src/Expr/Expr_Product.cxx b/src/Expr/Expr_Product.cxx
index 38f4acd02e..547c79e0b9 100644
--- a/src/Expr/Expr_Product.cxx
+++ b/src/Expr/Expr_Product.cxx
@@ -23,13 +23,9 @@
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sum.hxx>
-#include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/Expr/Expr_Product.hxx b/src/Expr/Expr_Product.hxx
index fea3645e4f..54718cd502 100644
--- a/src/Expr/Expr_Product.hxx
+++ b/src/Expr/Expr_Product.hxx
@@ -22,8 +22,6 @@
 
 #include <Expr_PolyExpression.hxx>
 #include <Expr_SequenceOfGeneralExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_RUIterator.cxx b/src/Expr/Expr_RUIterator.cxx
index a8df5a1c09..36b1d3eed7 100644
--- a/src/Expr/Expr_RUIterator.cxx
+++ b/src/Expr/Expr_RUIterator.cxx
@@ -16,14 +16,11 @@
 
 
 #include <Expr.hxx>
-#include <Expr_GeneralRelation.hxx>
-#include <Expr_NamedUnknown.hxx>
 #include <Expr_RelationIterator.hxx>
 #include <Expr_RUIterator.hxx>
 #include <Expr_SingleRelation.hxx>
 #include <Expr_UnknownIterator.hxx>
 #include <Standard_NoMoreObject.hxx>
-#include <Standard_NoSuchObject.hxx>
 
 Expr_RUIterator::Expr_RUIterator (const Handle(Expr_GeneralRelation)& rel)
 {
diff --git a/src/Expr/Expr_RUIterator.hxx b/src/Expr/Expr_RUIterator.hxx
index def5eb7663..77d3c00354 100644
--- a/src/Expr/Expr_RUIterator.hxx
+++ b/src/Expr/Expr_RUIterator.hxx
@@ -23,7 +23,6 @@
 
 #include <Expr_MapOfNamedUnknown.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralRelation;
 class Expr_NamedUnknown;
 
diff --git a/src/Expr/Expr_RelationIterator.cxx b/src/Expr/Expr_RelationIterator.cxx
index 28eb3ed49c..a2b1e08b9a 100644
--- a/src/Expr/Expr_RelationIterator.cxx
+++ b/src/Expr/Expr_RelationIterator.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_RelationIterator.hxx>
 #include <Expr_SingleRelation.hxx>
 #include <Expr_SystemRelation.hxx>
diff --git a/src/Expr/Expr_Sign.cxx b/src/Expr/Expr_Sign.cxx
index 2f18b9b868..a2c54a6382 100644
--- a/src/Expr/Expr_Sign.cxx
+++ b/src/Expr/Expr_Sign.cxx
@@ -18,10 +18,8 @@
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
 #include <Expr_NumericValue.hxx>
 #include <Expr_Sign.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Sign.hxx b/src/Expr/Expr_Sign.hxx
index 4e7bec12ff..ba4ec62c4a 100644
--- a/src/Expr/Expr_Sign.hxx
+++ b/src/Expr/Expr_Sign.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Sine.cxx b/src/Expr/Expr_Sine.cxx
index c05d550304..9cb6fd5073 100644
--- a/src/Expr/Expr_Sine.cxx
+++ b/src/Expr/Expr_Sine.cxx
@@ -20,12 +20,9 @@
 #include <Expr_Cosine.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sine.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Sine.hxx b/src/Expr/Expr_Sine.hxx
index 9d8dbe040a..8cc060e744 100644
--- a/src/Expr/Expr_Sine.hxx
+++ b/src/Expr/Expr_Sine.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_SingleRelation.cxx b/src/Expr/Expr_SingleRelation.cxx
index 7690959249..d1ccfe22a8 100644
--- a/src/Expr/Expr_SingleRelation.cxx
+++ b/src/Expr/Expr_SingleRelation.cxx
@@ -15,8 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_SingleRelation.hxx>
 #include <Standard_OutOfRange.hxx>
diff --git a/src/Expr/Expr_SingleRelation.hxx b/src/Expr/Expr_SingleRelation.hxx
index 4bd31cdf30..6669fc539d 100644
--- a/src/Expr/Expr_SingleRelation.hxx
+++ b/src/Expr/Expr_SingleRelation.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_GeneralRelation.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
diff --git a/src/Expr/Expr_Sinh.cxx b/src/Expr/Expr_Sinh.cxx
index 0e72534e92..b2ad1b33c3 100644
--- a/src/Expr/Expr_Sinh.cxx
+++ b/src/Expr/Expr_Sinh.cxx
@@ -20,12 +20,9 @@
 #include <Expr_Cosh.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Sinh.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Sinh.hxx b/src/Expr/Expr_Sinh.hxx
index b7ee9a4326..8d066dea16 100644
--- a/src/Expr/Expr_Sinh.hxx
+++ b/src/Expr/Expr_Sinh.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Square.cxx b/src/Expr/Expr_Square.cxx
index 5a8e136a95..260e08ec1c 100644
--- a/src/Expr/Expr_Square.cxx
+++ b/src/Expr/Expr_Square.cxx
@@ -19,14 +19,11 @@
 #include <Expr_Exponentiate.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_SequenceOfGeneralExpression.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Square.hxx b/src/Expr/Expr_Square.hxx
index eedd5d1ea0..7585f81753 100644
--- a/src/Expr/Expr_Square.hxx
+++ b/src/Expr/Expr_Square.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_SquareRoot.cxx b/src/Expr/Expr_SquareRoot.cxx
index d99d65d155..24e5ad560a 100644
--- a/src/Expr/Expr_SquareRoot.cxx
+++ b/src/Expr/Expr_SquareRoot.cxx
@@ -19,13 +19,10 @@
 #include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_SquareRoot.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_SquareRoot.hxx b/src/Expr/Expr_SquareRoot.hxx
index 6c3ad7f613..3bf4e404be 100644
--- a/src/Expr/Expr_SquareRoot.hxx
+++ b/src/Expr/Expr_SquareRoot.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Sum.cxx b/src/Expr/Expr_Sum.cxx
index 7c651f4e1e..681634495b 100644
--- a/src/Expr/Expr_Sum.cxx
+++ b/src/Expr/Expr_Sum.cxx
@@ -23,10 +23,8 @@
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
 #include <Expr_NumericValue.hxx>
 #include <Expr_Sum.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_Sum.hxx b/src/Expr/Expr_Sum.hxx
index 51f383d8f0..01080dda6b 100644
--- a/src/Expr/Expr_Sum.hxx
+++ b/src/Expr/Expr_Sum.hxx
@@ -22,9 +22,7 @@
 
 #include <Expr_PolyExpression.hxx>
 #include <Expr_SequenceOfGeneralExpression.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_SystemRelation.cxx b/src/Expr/Expr_SystemRelation.cxx
index 40241b881a..b92aa46fdb 100644
--- a/src/Expr/Expr_SystemRelation.cxx
+++ b/src/Expr/Expr_SystemRelation.cxx
@@ -16,13 +16,10 @@
 
 
 #include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralRelation.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_SystemRelation.hxx>
 #include <Standard_DimensionMismatch.hxx>
 #include <Standard_NoSuchObject.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_SystemRelation.hxx b/src/Expr/Expr_SystemRelation.hxx
index 90e344d817..0af2118e75 100644
--- a/src/Expr/Expr_SystemRelation.hxx
+++ b/src/Expr/Expr_SystemRelation.hxx
@@ -22,7 +22,6 @@
 
 #include <Expr_SequenceOfGeneralRelation.hxx>
 #include <Expr_GeneralRelation.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
diff --git a/src/Expr/Expr_Tangent.cxx b/src/Expr/Expr_Tangent.cxx
index 9ee8572442..52fc71b71b 100644
--- a/src/Expr/Expr_Tangent.cxx
+++ b/src/Expr/Expr_Tangent.cxx
@@ -18,15 +18,11 @@
 #include <Expr.hxx>
 #include <Expr_ArcTangent.hxx>
 #include <Expr_Cosine.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_Tangent.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Tangent.hxx b/src/Expr/Expr_Tangent.hxx
index 1aaae6933f..cdee2399bb 100644
--- a/src/Expr/Expr_Tangent.hxx
+++ b/src/Expr/Expr_Tangent.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_Tanh.cxx b/src/Expr/Expr_Tanh.cxx
index 788f3ffd7e..8b814c184f 100644
--- a/src/Expr/Expr_Tanh.cxx
+++ b/src/Expr/Expr_Tanh.cxx
@@ -18,15 +18,11 @@
 #include <Expr.hxx>
 #include <Expr_ArgTanh.hxx>
 #include <Expr_Cosh.hxx>
-#include <Expr_Division.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Square.hxx>
 #include <Expr_Tanh.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_Tanh.hxx b/src/Expr/Expr_Tanh.hxx
index d4a41db63b..b884bed114 100644
--- a/src/Expr/Expr_Tanh.hxx
+++ b/src/Expr/Expr_Tanh.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_UnaryExpression.cxx b/src/Expr/Expr_UnaryExpression.cxx
index 2dc22f9b26..0b61ba6123 100644
--- a/src/Expr/Expr_UnaryExpression.cxx
+++ b/src/Expr/Expr_UnaryExpression.cxx
@@ -15,11 +15,9 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_GeneralExpression.hxx>
 #include <Expr_InvalidOperand.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
diff --git a/src/Expr/Expr_UnaryExpression.hxx b/src/Expr/Expr_UnaryExpression.hxx
index 80aa97dd22..564087703f 100644
--- a/src/Expr/Expr_UnaryExpression.hxx
+++ b/src/Expr/Expr_UnaryExpression.hxx
@@ -22,7 +22,6 @@
 
 #include <Expr_GeneralExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_NamedUnknown;
 
 
diff --git a/src/Expr/Expr_UnaryFunction.cxx b/src/Expr/Expr_UnaryFunction.cxx
index a484ab175e..48a33d9fc0 100644
--- a/src/Expr/Expr_UnaryFunction.cxx
+++ b/src/Expr/Expr_UnaryFunction.cxx
@@ -28,12 +28,9 @@
 #include <Expr_GeneralFunction.hxx>
 #include <Expr_InvalidFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_Product.hxx>
 #include <Expr_UnaryFunction.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Expr/Expr_UnaryFunction.hxx b/src/Expr/Expr_UnaryFunction.hxx
index 9a310f7b43..5c06f6b847 100644
--- a/src/Expr/Expr_UnaryFunction.hxx
+++ b/src/Expr/Expr_UnaryFunction.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralFunction;
diff --git a/src/Expr/Expr_UnaryMinus.cxx b/src/Expr/Expr_UnaryMinus.cxx
index 9273ca8cad..ace3787661 100644
--- a/src/Expr/Expr_UnaryMinus.cxx
+++ b/src/Expr/Expr_UnaryMinus.cxx
@@ -18,11 +18,8 @@
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
-#include <Expr_NotEvaluable.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_Operators.hxx>
 #include <Expr_UnaryMinus.hxx>
-#include <Standard_NumericError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Expr/Expr_UnaryMinus.hxx b/src/Expr/Expr_UnaryMinus.hxx
index f00155169e..23d563a6c1 100644
--- a/src/Expr/Expr_UnaryMinus.hxx
+++ b/src/Expr/Expr_UnaryMinus.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <Expr_UnaryExpression.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Expr_GeneralExpression;
diff --git a/src/Expr/Expr_UnknownIterator.cxx b/src/Expr/Expr_UnknownIterator.cxx
index 27bbc35a38..d66cbce9e4 100644
--- a/src/Expr/Expr_UnknownIterator.cxx
+++ b/src/Expr/Expr_UnknownIterator.cxx
@@ -16,11 +16,8 @@
 
 
 #include <Expr.hxx>
-#include <Expr_GeneralExpression.hxx>
-#include <Expr_NamedUnknown.hxx>
 #include <Expr_UnknownIterator.hxx>
 #include <Standard_NoMoreObject.hxx>
-#include <Standard_NoSuchObject.hxx>
 
 Expr_UnknownIterator::Expr_UnknownIterator (const Handle(Expr_GeneralExpression)& exp)
 {
diff --git a/src/Expr/Expr_UnknownIterator.hxx b/src/Expr/Expr_UnknownIterator.hxx
index b08b230874..12db74fe2a 100644
--- a/src/Expr/Expr_UnknownIterator.hxx
+++ b/src/Expr/Expr_UnknownIterator.hxx
@@ -23,7 +23,6 @@
 
 #include <Expr_MapOfNamedUnknown.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Expr_GeneralExpression;
 class Expr_NamedUnknown;
 
diff --git a/src/ExprIntrp/ExprIntrp_Analysis.cxx b/src/ExprIntrp/ExprIntrp_Analysis.cxx
index c518424740..ccb40852c6 100644
--- a/src/ExprIntrp/ExprIntrp_Analysis.cxx
+++ b/src/ExprIntrp/ExprIntrp_Analysis.cxx
@@ -17,11 +17,6 @@
 #define _ExprIntrp_Analysis_SourceFile
 
 
-#include <Expr_GeneralExpression.hxx>
-#include <Expr_GeneralFunction.hxx>
-#include <Expr_GeneralRelation.hxx>
-#include <Expr_NamedExpression.hxx>
-#include <Expr_NamedFunction.hxx>
 #include <Expr_NamedUnknown.hxx>
 #include <ExprIntrp_Analysis.hxx>
 #include <ExprIntrp_Generator.hxx>
diff --git a/src/ExprIntrp/ExprIntrp_Analysis.hxx b/src/ExprIntrp/ExprIntrp_Analysis.hxx
index d5511658ae..3d65665142 100644
--- a/src/ExprIntrp/ExprIntrp_Analysis.hxx
+++ b/src/ExprIntrp/ExprIntrp_Analysis.hxx
@@ -29,7 +29,6 @@
 #include <ExprIntrp_SequenceOfNamedFunction.hxx>
 #include <ExprIntrp_SequenceOfNamedExpression.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class ExprIntrp_Generator;
 class Expr_GeneralExpression;
 class Expr_GeneralRelation;
diff --git a/src/ExprIntrp/ExprIntrp_GenExp.hxx b/src/ExprIntrp/ExprIntrp_GenExp.hxx
index 55fa21345c..02478dac01 100644
--- a/src/ExprIntrp/ExprIntrp_GenExp.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenExp.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <ExprIntrp_Generator.hxx>
 class Expr_GeneralExpression;
 class TCollection_AsciiString;
diff --git a/src/ExprIntrp/ExprIntrp_GenFct.cxx b/src/ExprIntrp/ExprIntrp_GenFct.cxx
index 8a6fcf2fd5..410482294f 100644
--- a/src/ExprIntrp/ExprIntrp_GenFct.cxx
+++ b/src/ExprIntrp/ExprIntrp_GenFct.cxx
@@ -18,7 +18,6 @@
 #include <ExprIntrp.hxx>
 #include <ExprIntrp_GenFct.hxx>
 #include <ExprIntrp_yaccanal.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/ExprIntrp/ExprIntrp_GenFct.hxx b/src/ExprIntrp/ExprIntrp_GenFct.hxx
index b8c134a51f..d891e9528e 100644
--- a/src/ExprIntrp/ExprIntrp_GenFct.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenFct.hxx
@@ -18,9 +18,7 @@
 #define _ExprIntrp_GenFct_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <ExprIntrp_Generator.hxx>
 class TCollection_AsciiString;
 
diff --git a/src/ExprIntrp/ExprIntrp_GenRel.hxx b/src/ExprIntrp/ExprIntrp_GenRel.hxx
index 8c27cd42e2..6a9f02b8ba 100644
--- a/src/ExprIntrp/ExprIntrp_GenRel.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenRel.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <ExprIntrp_Generator.hxx>
 class Expr_GeneralRelation;
 class TCollection_AsciiString;
diff --git a/src/ExprIntrp/ExprIntrp_Generator.cxx b/src/ExprIntrp/ExprIntrp_Generator.cxx
index 4d9569102e..be648c936d 100644
--- a/src/ExprIntrp/ExprIntrp_Generator.cxx
+++ b/src/ExprIntrp/ExprIntrp_Generator.cxx
@@ -15,9 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Expr_NamedExpression.hxx>
-#include <Expr_NamedFunction.hxx>
-#include <ExprIntrp_Analysis.hxx>
 #include <ExprIntrp_Generator.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/ExprIntrp/ExprIntrp_Generator.hxx b/src/ExprIntrp/ExprIntrp_Generator.hxx
index 858ba9ae94..cd3ff345a7 100644
--- a/src/ExprIntrp/ExprIntrp_Generator.hxx
+++ b/src/ExprIntrp/ExprIntrp_Generator.hxx
@@ -18,7 +18,6 @@
 #define _ExprIntrp_Generator_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <ExprIntrp_SequenceOfNamedFunction.hxx>
 #include <ExprIntrp_SequenceOfNamedExpression.hxx>
diff --git a/src/ExprIntrp/ExprIntrp_yaccintrf.cxx b/src/ExprIntrp/ExprIntrp_yaccintrf.cxx
index e9f6d3c2b7..2511894316 100644
--- a/src/ExprIntrp/ExprIntrp_yaccintrf.cxx
+++ b/src/ExprIntrp/ExprIntrp_yaccintrf.cxx
@@ -16,10 +16,8 @@
 #include <ExprIntrp_yaccanal.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedExpression.hxx>
-#include <Expr_NamedUnknown.hxx>
 #include <Expr_NamedConstant.hxx>
 #include <Expr_NamedFunction.hxx>
-#include <Expr_NumericValue.hxx>
 #include <Expr_UnaryFunction.hxx>
 #include <Expr_BinaryFunction.hxx>
 #include <Expr_PolyFunction.hxx>
diff --git a/src/Extrema/Extrema_CCLocFOfLocECC.hxx b/src/Extrema/Extrema_CCLocFOfLocECC.hxx
index 75c9dea247..42ab12c751 100644
--- a/src/Extrema/Extrema_CCLocFOfLocECC.hxx
+++ b/src/Extrema/Extrema_CCLocFOfLocECC.hxx
@@ -21,13 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Integer.hxx>
 #include <math_FunctionSetWithDerivatives.hxx>
 #include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
diff --git a/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx b/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx
index feae30e7b8..905325bc91 100644
--- a/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx
+++ b/src/Extrema/Extrema_CCLocFOfLocECC2d.hxx
@@ -21,13 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
-#include <Standard_Integer.hxx>
 #include <math_FunctionSetWithDerivatives.hxx>
 #include <Standard_Boolean.hxx>
 #include <math_Vector.hxx>
diff --git a/src/Extrema/Extrema_Curve2dTool.hxx b/src/Extrema/Extrema_Curve2dTool.hxx
index b4497dcc24..3b6908661d 100644
--- a/src/Extrema/Extrema_Curve2dTool.hxx
+++ b/src/Extrema/Extrema_Curve2dTool.hxx
@@ -27,8 +27,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Standard_Boolean.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Circ2d.hxx>
diff --git a/src/Extrema/Extrema_CurveTool.cxx b/src/Extrema/Extrema_CurveTool.cxx
index 995e311ce0..0f3dd23a02 100644
--- a/src/Extrema/Extrema_CurveTool.cxx
+++ b/src/Extrema/Extrema_CurveTool.cxx
@@ -20,7 +20,6 @@
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 
 //=======================================================================
diff --git a/src/Extrema/Extrema_CurveTool.hxx b/src/Extrema/Extrema_CurveTool.hxx
index 3d7dc48242..55ce1434d2 100644
--- a/src/Extrema/Extrema_CurveTool.hxx
+++ b/src/Extrema/Extrema_CurveTool.hxx
@@ -21,12 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
diff --git a/src/Extrema/Extrema_ECC.hxx b/src/Extrema/Extrema_ECC.hxx
index aecd8220e0..b36cda84ab 100644
--- a/src/Extrema/Extrema_ECC.hxx
+++ b/src/Extrema/Extrema_ECC.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <math_Vector.hxx>
 #include <TColStd_SequenceOfReal.hxx>
-#include <Standard_Address.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
-#include <Standard_Integer.hxx>
 
 class Adaptor3d_Curve;
 class Extrema_CurveTool;
diff --git a/src/Extrema/Extrema_ECC2d.hxx b/src/Extrema/Extrema_ECC2d.hxx
index fd4ad016c6..e2cbb4a5c5 100644
--- a/src/Extrema/Extrema_ECC2d.hxx
+++ b/src/Extrema/Extrema_ECC2d.hxx
@@ -19,15 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <math_Vector.hxx>
 #include <TColStd_SequenceOfReal.hxx>
-#include <Standard_Address.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
-#include <Standard_Integer.hxx>
 
 class Adaptor2d_Curve2d;
 class Extrema_Curve2dTool;
diff --git a/src/Extrema/Extrema_ELPCOfLocateExtPC.hxx b/src/Extrema/Extrema_ELPCOfLocateExtPC.hxx
index 0e87959d20..f7df76f2c4 100644
--- a/src/Extrema/Extrema_ELPCOfLocateExtPC.hxx
+++ b/src/Extrema/Extrema_ELPCOfLocateExtPC.hxx
@@ -19,14 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
 #include <gp_Pnt.hxx>
 #include <Extrema_ExtPElC.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_EPCOfELPCOfLocateExtPC.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_CurveType.hxx>
diff --git a/src/Extrema/Extrema_ELPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_ELPCOfLocateExtPC2d.hxx
index 7dad307b7c..f70ac62c81 100644
--- a/src/Extrema/Extrema_ELPCOfLocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_ELPCOfLocateExtPC2d.hxx
@@ -21,14 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Extrema_ExtPElC2d.hxx>
-#include <Extrema_SequenceOfPOnCurv2d.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_EPCOfELPCOfLocateExtPC2d.hxx>
-#include <Standard_Integer.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <TColStd_SequenceOfBoolean.hxx>
 #include <TColStd_SequenceOfReal.hxx>
diff --git a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC.hxx b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC.hxx
index c1492ef44e..9f10c33889 100644
--- a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC.hxx
+++ b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx>
 class StdFail_NotDone;
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d.hxx
index 50d3e4b07c..e79150cc8f 100644
--- a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx>
 class StdFail_NotDone;
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_EPCOfExtPC.hxx b/src/Extrema/Extrema_EPCOfExtPC.hxx
index 2c0fe3c968..02fe694dac 100644
--- a/src/Extrema/Extrema_EPCOfExtPC.hxx
+++ b/src/Extrema/Extrema_EPCOfExtPC.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCFOfEPCOfExtPC.hxx>
 class StdFail_NotDone;
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_EPCOfExtPC2d.hxx b/src/Extrema/Extrema_EPCOfExtPC2d.hxx
index 0fd47f86ad..6c1404a9d8 100644
--- a/src/Extrema/Extrema_EPCOfExtPC2d.hxx
+++ b/src/Extrema/Extrema_EPCOfExtPC2d.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCFOfEPCOfExtPC2d.hxx>
 class StdFail_NotDone;
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_ExtCC.cxx b/src/Extrema/Extrema_ExtCC.cxx
index e3bfe4a60e..d19c246472 100644
--- a/src/Extrema/Extrema_ExtCC.cxx
+++ b/src/Extrema/Extrema_ExtCC.cxx
@@ -23,19 +23,13 @@
 #include <Bnd_Range.hxx>
 #include <ElCLib.hxx>
 #include <Extrema_CurveTool.hxx>
-#include <Extrema_ECC.hxx>
 #include <Extrema_ExtCC.hxx>
 #include <Extrema_ExtElC.hxx>
 #include <Extrema_ExtPElC.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
 #include <Geom_Circle.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
 #include <Geom_Line.hxx>
-#include <Geom_Parabola.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
@@ -44,9 +38,7 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListIteratorOfListOfTransient.hxx>
-#include <TColStd_SequenceOfReal.hxx>
 
 //=======================================================================
 //function : Extrema_ExtCC
diff --git a/src/Extrema/Extrema_ExtCC.hxx b/src/Extrema/Extrema_ExtCC.hxx
index 25877615bd..e5d2d77306 100644
--- a/src/Extrema/Extrema_ExtCC.hxx
+++ b/src/Extrema/Extrema_ExtCC.hxx
@@ -19,15 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Extrema_ECC.hxx>
-#include <Standard_Boolean.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
 #include <TColStd_SequenceOfReal.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
 
 class Adaptor3d_Curve;
diff --git a/src/Extrema/Extrema_ExtCC2d.cxx b/src/Extrema/Extrema_ExtCC2d.cxx
index 56ec32728f..bc232fac52 100644
--- a/src/Extrema/Extrema_ExtCC2d.cxx
+++ b/src/Extrema/Extrema_ExtCC2d.cxx
@@ -20,17 +20,9 @@
 #include <Extrema_Curve2dTool.hxx>
 #include <Extrema_ECC2d.hxx>
 #include <Extrema_ExtCC2d.hxx>
-#include <Extrema_ExtElC.hxx>
 #include <Extrema_ExtElC2d.hxx>
 #include <Extrema_POnCurv2d.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
-#include <Geom2d_Circle.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2d_Ellipse.hxx>
-#include <Geom2d_Hyperbola.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_Parabola.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Precision.hxx>
diff --git a/src/Extrema/Extrema_ExtCC2d.hxx b/src/Extrema/Extrema_ExtCC2d.hxx
index 4a721ca8d0..c69a189d72 100644
--- a/src/Extrema/Extrema_ExtCC2d.hxx
+++ b/src/Extrema/Extrema_ExtCC2d.hxx
@@ -19,14 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <gp_Pnt2d.hxx>
 
 class Adaptor2d_Curve2d;
diff --git a/src/Extrema/Extrema_ExtCS.cxx b/src/Extrema/Extrema_ExtCS.cxx
index 5f85ef99d1..0f5a233988 100644
--- a/src/Extrema/Extrema_ExtCS.cxx
+++ b/src/Extrema/Extrema_ExtCS.cxx
@@ -16,25 +16,18 @@
 
 //  Modified by skv - Thu Jul  7 12:29:34 2005 OCC9134
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Bnd_Box.hxx>
 #include <BndLib_AddSurface.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
 #include <Extrema_ExtCS.hxx>
-#include <Extrema_ExtPS.hxx>
 #include <Extrema_GenExtCS.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Extrema_POnSurf.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
 #include <gp_Lin.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Torus.hxx>
 #include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
diff --git a/src/Extrema/Extrema_ExtCS.hxx b/src/Extrema/Extrema_ExtCS.hxx
index f0f138f81c..d9110ec5a1 100644
--- a/src/Extrema/Extrema_ExtCS.hxx
+++ b/src/Extrema/Extrema_ExtCS.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Extrema_ExtElCS.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
diff --git a/src/Extrema/Extrema_ExtElC.cxx b/src/Extrema/Extrema_ExtElC.cxx
index e487afb2fe..2da4bf009b 100644
--- a/src/Extrema/Extrema_ExtElC.cxx
+++ b/src/Extrema/Extrema_ExtElC.cxx
@@ -16,11 +16,9 @@
 #include <ElCLib.hxx>
 #include <Extrema_ExtElC.hxx>
 #include <Extrema_ExtElC2d.hxx>
-#include <Extrema_ExtPElC.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Ax2.hxx>
-#include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir.hxx>
@@ -31,7 +29,6 @@
 #include <gp_Parab.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <IntAna_QuadQuadGeo.hxx>
 #include <IntAna2d_AnaIntersection.hxx>
 #include <math_DirectPolynomialRoots.hxx>
 #include <math_TrigonometricFunctionRoots.hxx>
@@ -39,7 +36,6 @@
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 
-#include <stdio.h>
 static
   void RefineDir(gp_Dir& aDir);
 
diff --git a/src/Extrema/Extrema_ExtElC.hxx b/src/Extrema/Extrema_ExtElC.hxx
index 6c88f903be..2a3ab95fa0 100644
--- a/src/Extrema/Extrema_ExtElC.hxx
+++ b/src/Extrema/Extrema_ExtElC.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv.hxx>
 
 class gp_Lin;
diff --git a/src/Extrema/Extrema_ExtElC2d.cxx b/src/Extrema/Extrema_ExtElC2d.cxx
index 967acf41c5..944526c070 100644
--- a/src/Extrema/Extrema_ExtElC2d.cxx
+++ b/src/Extrema/Extrema_ExtElC2d.cxx
@@ -24,8 +24,6 @@
 #include <gp_Hypr2d.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Parab2d.hxx>
-#include <math_DirectPolynomialRoots.hxx>
-#include <math_TrigonometricFunctionRoots.hxx>
 #include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
diff --git a/src/Extrema/Extrema_ExtElC2d.hxx b/src/Extrema/Extrema_ExtElC2d.hxx
index 4baf51d0ea..a9a5bda7fe 100644
--- a/src/Extrema/Extrema_ExtElC2d.hxx
+++ b/src/Extrema/Extrema_ExtElC2d.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv2d.hxx>
 
 class gp_Lin2d;
diff --git a/src/Extrema/Extrema_ExtElCS.hxx b/src/Extrema/Extrema_ExtElCS.hxx
index fe61099cf0..65bd8619f4 100644
--- a/src/Extrema/Extrema_ExtElCS.hxx
+++ b/src/Extrema/Extrema_ExtElCS.hxx
@@ -21,12 +21,10 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Extrema_HArray1OfPOnCurv.hxx>
 #include <Extrema_HArray1OfPOnSurf.hxx>
-#include <Standard_Real.hxx>
 
 class gp_Lin;
 class gp_Pln;
diff --git a/src/Extrema/Extrema_ExtPC.hxx b/src/Extrema/Extrema_ExtPC.hxx
index ef6fe40d27..e878092a18 100644
--- a/src/Extrema/Extrema_ExtPC.hxx
+++ b/src/Extrema/Extrema_ExtPC.hxx
@@ -19,14 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
 #include <gp_Pnt.hxx>
 #include <Extrema_ExtPElC.hxx>
-#include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_EPCOfExtPC.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_CurveType.hxx>
diff --git a/src/Extrema/Extrema_ExtPC2d.hxx b/src/Extrema/Extrema_ExtPC2d.hxx
index ad0bb85dc5..fd68c8b9f0 100644
--- a/src/Extrema/Extrema_ExtPC2d.hxx
+++ b/src/Extrema/Extrema_ExtPC2d.hxx
@@ -19,14 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Address.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Extrema_ExtPElC2d.hxx>
-#include <Extrema_SequenceOfPOnCurv2d.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_EPCOfExtPC2d.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_CurveType.hxx>
diff --git a/src/Extrema/Extrema_ExtPElC.hxx b/src/Extrema/Extrema_ExtPElC.hxx
index 7379d58282..a597b084bb 100644
--- a/src/Extrema/Extrema_ExtPElC.hxx
+++ b/src/Extrema/Extrema_ExtPElC.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv.hxx>
 class gp_Pnt;
 class gp_Lin;
diff --git a/src/Extrema/Extrema_ExtPElC2d.hxx b/src/Extrema/Extrema_ExtPElC2d.hxx
index dea8be5a2d..bba9efbd23 100644
--- a/src/Extrema/Extrema_ExtPElC2d.hxx
+++ b/src/Extrema/Extrema_ExtPElC2d.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv2d.hxx>
 class gp_Pnt2d;
 class gp_Lin2d;
diff --git a/src/Extrema/Extrema_ExtPElS.hxx b/src/Extrema/Extrema_ExtPElS.hxx
index ec00924a51..b3aae2b99a 100644
--- a/src/Extrema/Extrema_ExtPElS.hxx
+++ b/src/Extrema/Extrema_ExtPElS.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnSurf.hxx>
 class gp_Pnt;
 class gp_Cylinder;
diff --git a/src/Extrema/Extrema_ExtPExtS.cxx b/src/Extrema/Extrema_ExtPExtS.cxx
index 73f71a2c7a..1173a5efdb 100644
--- a/src/Extrema/Extrema_ExtPExtS.cxx
+++ b/src/Extrema/Extrema_ExtPExtS.cxx
@@ -15,9 +15,6 @@
 // commercial license or contractual agreement.
 
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
-#include <Adaptor3d_Curve.hxx>
 #include <ElCLib.hxx>
 #include <Extrema_ExtPElC.hxx>
 #include <Extrema_ExtPExtS.hxx>
diff --git a/src/Extrema/Extrema_ExtPRevS.cxx b/src/Extrema/Extrema_ExtPRevS.cxx
index dcf52c1b8c..29764f4c03 100644
--- a/src/Extrema/Extrema_ExtPRevS.cxx
+++ b/src/Extrema/Extrema_ExtPRevS.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Adaptor3d_Curve.hxx>
-#include <GeomAdaptor_SurfaceOfRevolution.hxx>
 #include <ElCLib.hxx>
 #include <Extrema_ExtPElC.hxx>
 #include <Extrema_ExtPRevS.hxx>
diff --git a/src/Extrema/Extrema_ExtPS.cxx b/src/Extrema/Extrema_ExtPS.cxx
index 341758fa28..7a09e25bf9 100644
--- a/src/Extrema/Extrema_ExtPS.cxx
+++ b/src/Extrema/Extrema_ExtPS.cxx
@@ -14,27 +14,17 @@
 
 //-----------------------------------------------------------------
 
-#include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
-#include <GeomAdaptor_SurfaceOfRevolution.hxx>
-#include <Adaptor3d_Surface.hxx>
 #include <ElCLib.hxx>
 #include <Extrema_ExtPExtS.hxx>
 #include <Extrema_ExtPRevS.hxx>
 #include <Extrema_ExtPS.hxx>
 #include <Extrema_GenExtPS.hxx>
 #include <Extrema_POnSurf.hxx>
-#include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_IsoType.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Torus.hxx>
 #include <Precision.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <StdFail_NotDone.hxx>
 
 //=======================================================================
diff --git a/src/Extrema/Extrema_ExtPS.hxx b/src/Extrema/Extrema_ExtPS.hxx
index a149355dee..60c9aadade 100644
--- a/src/Extrema/Extrema_ExtPS.hxx
+++ b/src/Extrema/Extrema_ExtPS.hxx
@@ -24,7 +24,6 @@
 #include <Extrema_ExtPElS.hxx>
 #include <Extrema_GenExtPS.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <GeomAbs_SurfaceType.hxx>
diff --git a/src/Extrema/Extrema_ExtSS.cxx b/src/Extrema/Extrema_ExtSS.cxx
index b6b002c366..0d0162fa35 100644
--- a/src/Extrema/Extrema_ExtSS.cxx
+++ b/src/Extrema/Extrema_ExtSS.cxx
@@ -21,9 +21,6 @@
 #include <Extrema_GenExtSS.hxx>
 #include <Extrema_POnSurf.hxx>
 #include <GeomAbs_SurfaceType.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt.hxx>
-#include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
 
diff --git a/src/Extrema/Extrema_ExtSS.hxx b/src/Extrema/Extrema_ExtSS.hxx
index b26bbcd865..5ec6f7c5fe 100644
--- a/src/Extrema/Extrema_ExtSS.hxx
+++ b/src/Extrema/Extrema_ExtSS.hxx
@@ -19,11 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Extrema_ExtElSS.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/Extrema/Extrema_FuncExtCS.cxx b/src/Extrema/Extrema_FuncExtCS.cxx
index a4889c43b8..78b2146d63 100644
--- a/src/Extrema/Extrema_FuncExtCS.cxx
+++ b/src/Extrema/Extrema_FuncExtCS.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Extrema_FuncExtCS.hxx>
 #include <Extrema_POnCurv.hxx>
@@ -23,7 +22,6 @@
 #include <gp_Vec.hxx>
 #include <math_Matrix.hxx>
 #include <Precision.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_TypeMismatch.hxx>
 
 /*-----------------------------------------------------------------------------
diff --git a/src/Extrema/Extrema_FuncExtCS.hxx b/src/Extrema/Extrema_FuncExtCS.hxx
index c94d729fd7..ef37ca6278 100644
--- a/src/Extrema/Extrema_FuncExtCS.hxx
+++ b/src/Extrema/Extrema_FuncExtCS.hxx
@@ -19,16 +19,12 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
-#include <Standard_Boolean.hxx>
 #include <math_FunctionSetWithDerivatives.hxx>
-#include <Standard_Integer.hxx>
 #include <math_Vector.hxx>
 class Adaptor3d_Curve;
 class Adaptor3d_Surface;
diff --git a/src/Extrema/Extrema_FuncExtSS.cxx b/src/Extrema/Extrema_FuncExtSS.cxx
index 10ac91d078..1657e169e4 100644
--- a/src/Extrema/Extrema_FuncExtSS.cxx
+++ b/src/Extrema/Extrema_FuncExtSS.cxx
@@ -20,7 +20,6 @@
 #include <Extrema_POnSurf.hxx>
 #include <gp_Vec.hxx>
 #include <math_Matrix.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_TypeMismatch.hxx>
 
 /*----------------------------------------------------------------------------
diff --git a/src/Extrema/Extrema_FuncExtSS.hxx b/src/Extrema/Extrema_FuncExtSS.hxx
index 587825ce4e..1c151d664d 100644
--- a/src/Extrema/Extrema_FuncExtSS.hxx
+++ b/src/Extrema/Extrema_FuncExtSS.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Extrema_SequenceOfPOnSurf.hxx>
-#include <Standard_Boolean.hxx>
 #include <math_FunctionSetWithDerivatives.hxx>
-#include <Standard_Integer.hxx>
 #include <math_Vector.hxx>
 class Adaptor3d_Surface;
 class math_Matrix;
diff --git a/src/Extrema/Extrema_FuncPSDist.hxx b/src/Extrema/Extrema_FuncPSDist.hxx
index 42e9d761ea..b29931ce62 100644
--- a/src/Extrema/Extrema_FuncPSDist.hxx
+++ b/src/Extrema/Extrema_FuncPSDist.hxx
@@ -21,12 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 
 #include <math_MultipleVarFunctionWithGradient.hxx>
-#include <gp_Pnt.hxx>
 #include <Adaptor3d_Surface.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 
 class math_Vector;
 
diff --git a/src/Extrema/Extrema_FuncPSNorm.cxx b/src/Extrema/Extrema_FuncPSNorm.cxx
index c234091f97..649d5da027 100644
--- a/src/Extrema/Extrema_FuncPSNorm.cxx
+++ b/src/Extrema/Extrema_FuncPSNorm.cxx
@@ -18,7 +18,6 @@
 #include <Extrema_FuncPSNorm.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Extrema_POnSurf.hxx>
-#include <GeomAbs_IsoType.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <math_Matrix.hxx>
diff --git a/src/Extrema/Extrema_FuncPSNorm.hxx b/src/Extrema/Extrema_FuncPSNorm.hxx
index f11f46e3ed..2a57f835f5 100644
--- a/src/Extrema/Extrema_FuncPSNorm.hxx
+++ b/src/Extrema/Extrema_FuncPSNorm.hxx
@@ -25,7 +25,6 @@
 #include <Extrema_SequenceOfPOnSurf.hxx>
 #include <Standard_Boolean.hxx>
 #include <math_FunctionSetWithDerivatives.hxx>
-#include <Standard_Integer.hxx>
 #include <math_Vector.hxx>
 
 class Adaptor3d_Surface;
diff --git a/src/Extrema/Extrema_GenExtCS.cxx b/src/Extrema/Extrema_GenExtCS.cxx
index bf88033bee..fa17ce9503 100644
--- a/src/Extrema/Extrema_GenExtCS.cxx
+++ b/src/Extrema/Extrema_GenExtCS.cxx
@@ -16,8 +16,6 @@
 
 
 #include <Extrema_GenExtCS.hxx>
-#include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_Surface.hxx>
 #include <Geom_OffsetCurve.hxx>
 #include <Extrema_GlobOptFuncCS.hxx>
 #include <Extrema_GlobOptFuncConicS.hxx>
@@ -31,7 +29,6 @@
 #include <math_Vector.hxx>
 #include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <StdFail_NotDone.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <Geom_TrimmedCurve.hxx>
diff --git a/src/Extrema/Extrema_GenExtPS.cxx b/src/Extrema/Extrema_GenExtPS.cxx
index 43a82c55f7..0f9e57da57 100644
--- a/src/Extrema/Extrema_GenExtPS.cxx
+++ b/src/Extrema/Extrema_GenExtPS.cxx
@@ -18,9 +18,6 @@
 
 #include <Extrema_GenExtPS.hxx>
 
-#include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_Surface.hxx>
-#include <Bnd_Array1OfSphere.hxx>
 #include <Bnd_HArray1OfSphere.hxx>
 #include <Bnd_Sphere.hxx>
 #include <Extrema_ExtFlag.hxx>
@@ -30,21 +27,15 @@
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
-#include <Geom_RectangularTrimmedSurface.hxx>
-#include <GeomAbs_IsoType.hxx>
 #include <gp_Pnt.hxx>
 #include <math_FunctionSetRoot.hxx>
 #include <math_NewtonFunctionSetRoot.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array2OfInteger.hxx>
-#include <TColStd_Array2OfReal.hxx>
 
 //IMPLEMENT_HARRAY1(Extrema_HArray1OfSphere)
 class Bnd_SphereUBTreeSelector : public Extrema_UBTreeOfSphere::Selector
diff --git a/src/Extrema/Extrema_GenExtSS.cxx b/src/Extrema/Extrema_GenExtSS.cxx
index 42dcedd1f8..e8ec2a8e04 100644
--- a/src/Extrema/Extrema_GenExtSS.cxx
+++ b/src/Extrema/Extrema_GenExtSS.cxx
@@ -23,7 +23,6 @@
 #include <math_MultipleVarFunctionWithGradient.hxx>
 #include <math_Vector.hxx>
 #include <Standard_OutOfRange.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <StdFail_NotDone.hxx>
 
 //! This class represents distance objective function for surface / surface.
diff --git a/src/Extrema/Extrema_GenLocateExtCS.cxx b/src/Extrema/Extrema_GenLocateExtCS.cxx
index c043128db7..16e38a32a8 100644
--- a/src/Extrema/Extrema_GenLocateExtCS.cxx
+++ b/src/Extrema/Extrema_GenLocateExtCS.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Extrema_FuncExtCS.hxx>
 #include <Extrema_GenLocateExtCS.hxx>
@@ -24,7 +23,6 @@
 #include <math_FunctionSetRoot.hxx>
 #include <math_NewtonFunctionSetRoot.hxx>
 #include <math_Vector.hxx>
-#include <Standard_DomainError.hxx>
 #include <StdFail_NotDone.hxx>
 
 //=======================================================================
diff --git a/src/Extrema/Extrema_GenLocateExtCS.hxx b/src/Extrema/Extrema_GenLocateExtCS.hxx
index b3fbefbc92..35b1373a56 100644
--- a/src/Extrema/Extrema_GenLocateExtCS.hxx
+++ b/src/Extrema/Extrema_GenLocateExtCS.hxx
@@ -19,10 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Extrema_POnSurf.hxx>
 class Adaptor3d_Curve;
diff --git a/src/Extrema/Extrema_GenLocateExtPS.cxx b/src/Extrema/Extrema_GenLocateExtPS.cxx
index 3e5a8fc65b..fc2035b87c 100644
--- a/src/Extrema/Extrema_GenLocateExtPS.cxx
+++ b/src/Extrema/Extrema_GenLocateExtPS.cxx
@@ -17,7 +17,6 @@
 
 #include <Extrema_GenLocateExtPS.hxx>
 
-#include <Adaptor3d_Surface.hxx>
 #include <Extrema_FuncPSNorm.hxx>
 #include <Extrema_FuncPSDist.hxx>
 #include <Extrema_POnSurf.hxx>
@@ -25,7 +24,6 @@
 #include <math_FunctionSetRoot.hxx>
 #include <math_NewtonFunctionSetRoot.hxx>
 #include <math_BFGS.hxx>
-#include <math_BFGS.hxx>
 #include <math_FRPR.hxx>
 #include <StdFail_NotDone.hxx>
 
diff --git a/src/Extrema/Extrema_GenLocateExtPS.hxx b/src/Extrema/Extrema_GenLocateExtPS.hxx
index 68af4751f8..631384a17b 100644
--- a/src/Extrema/Extrema_GenLocateExtPS.hxx
+++ b/src/Extrema/Extrema_GenLocateExtPS.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnSurf.hxx>
 class gp_Pnt;
 class Adaptor3d_Surface;
diff --git a/src/Extrema/Extrema_GenLocateExtSS.cxx b/src/Extrema/Extrema_GenLocateExtSS.cxx
index f7e8e21048..48a1441f43 100644
--- a/src/Extrema/Extrema_GenLocateExtSS.cxx
+++ b/src/Extrema/Extrema_GenLocateExtSS.cxx
@@ -22,7 +22,6 @@
 #include <math_FunctionSetRoot.hxx>
 #include <math_NewtonFunctionSetRoot.hxx>
 #include <math_Vector.hxx>
-#include <Standard_DomainError.hxx>
 #include <StdFail_NotDone.hxx>
 
 //=======================================================================
diff --git a/src/Extrema/Extrema_GenLocateExtSS.hxx b/src/Extrema/Extrema_GenLocateExtSS.hxx
index d757193b7f..c8ee0429b5 100644
--- a/src/Extrema/Extrema_GenLocateExtSS.hxx
+++ b/src/Extrema/Extrema_GenLocateExtSS.hxx
@@ -19,10 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnSurf.hxx>
 class Adaptor3d_Surface;
 
diff --git a/src/Extrema/Extrema_GlobOptFuncCC.cxx b/src/Extrema/Extrema_GlobOptFuncCC.cxx
index 85126c33e7..099f671e87 100644
--- a/src/Extrema/Extrema_GlobOptFuncCC.cxx
+++ b/src/Extrema/Extrema_GlobOptFuncCC.cxx
@@ -20,8 +20,6 @@
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_OutOfRange.hxx>
 
 static Standard_Integer _NbVariables()
 {
diff --git a/src/Extrema/Extrema_GlobOptFuncCC.hxx b/src/Extrema/Extrema_GlobOptFuncCC.hxx
index 9d52cd00fc..c236c547a0 100644
--- a/src/Extrema/Extrema_GlobOptFuncCC.hxx
+++ b/src/Extrema/Extrema_GlobOptFuncCC.hxx
@@ -20,8 +20,6 @@
 #include <Adaptor3d_Curve.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
-#include <math_MultipleVarFunction.hxx>
-#include <math_MultipleVarFunctionWithGradient.hxx>
 #include <math_MultipleVarFunctionWithHessian.hxx>
 
 //! This class implements function which calculate Eucluidean distance
diff --git a/src/Extrema/Extrema_GlobOptFuncCQuadric.hxx b/src/Extrema/Extrema_GlobOptFuncCQuadric.hxx
index e4cdb8b5f7..cb32bbed1b 100644
--- a/src/Extrema/Extrema_GlobOptFuncCQuadric.hxx
+++ b/src/Extrema/Extrema_GlobOptFuncCQuadric.hxx
@@ -15,10 +15,7 @@
 #define _Extrema_GlobOptFuncCQuadric_HeaderFile
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <math_Matrix.hxx>
-#include <math_Vector.hxx>
 #include <math_MultipleVarFunction.hxx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <gp_Pln.hxx>
diff --git a/src/Extrema/Extrema_GlobOptFuncCS.cxx b/src/Extrema/Extrema_GlobOptFuncCS.cxx
index 29462abe13..8c3ba28287 100644
--- a/src/Extrema/Extrema_GlobOptFuncCS.cxx
+++ b/src/Extrema/Extrema_GlobOptFuncCS.cxx
@@ -18,8 +18,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_OutOfRange.hxx>
 
 //!F(cu, su, sv)=(C^{(x)}(cu)-S^{(x)}(su,sv))^{2}+
 //               (C^{(y)}(cu)-S^{(y)}(su,sv))^{2}+
diff --git a/src/Extrema/Extrema_GlobOptFuncCS.hxx b/src/Extrema/Extrema_GlobOptFuncCS.hxx
index b6f38a9469..2b1d8bc0ed 100644
--- a/src/Extrema/Extrema_GlobOptFuncCS.hxx
+++ b/src/Extrema/Extrema_GlobOptFuncCS.hxx
@@ -17,7 +17,6 @@
 #define _Extrema_GlobOptFuncCS_HeaderFile
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
diff --git a/src/Extrema/Extrema_GlobOptFuncConicS.hxx b/src/Extrema/Extrema_GlobOptFuncConicS.hxx
index 296cb67029..8329a0f699 100644
--- a/src/Extrema/Extrema_GlobOptFuncConicS.hxx
+++ b/src/Extrema/Extrema_GlobOptFuncConicS.hxx
@@ -16,10 +16,7 @@
 #define _Extrema_GlobOptFuncConicS_HeaderFile
 
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <math_Matrix.hxx>
-#include <math_Vector.hxx>
 #include <math_MultipleVarFunction.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <gp_Lin.hxx>
diff --git a/src/Extrema/Extrema_HArray1OfPOnCurv.hxx b/src/Extrema/Extrema_HArray1OfPOnCurv.hxx
index 4c81810cac..6a6224408a 100644
--- a/src/Extrema/Extrema_HArray1OfPOnCurv.hxx
+++ b/src/Extrema/Extrema_HArray1OfPOnCurv.hxx
@@ -17,7 +17,6 @@
 #ifndef Extrema_HArray1OfPOnCurv_HeaderFile
 #define Extrema_HArray1OfPOnCurv_HeaderFile
 
-#include <Extrema_POnCurv.hxx>
 #include <Extrema_Array1OfPOnCurv.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/Extrema/Extrema_HArray1OfPOnSurf.hxx b/src/Extrema/Extrema_HArray1OfPOnSurf.hxx
index 61854e3a7a..e5d2d73cf5 100644
--- a/src/Extrema/Extrema_HArray1OfPOnSurf.hxx
+++ b/src/Extrema/Extrema_HArray1OfPOnSurf.hxx
@@ -17,7 +17,6 @@
 #ifndef Extrema_HArray1OfPOnSurf_HeaderFile
 #define Extrema_HArray1OfPOnSurf_HeaderFile
 
-#include <Extrema_POnSurf.hxx>
 #include <Extrema_Array1OfPOnSurf.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/Extrema/Extrema_HUBTreeOfSphere.hxx b/src/Extrema/Extrema_HUBTreeOfSphere.hxx
index 736ad152d0..f306d80302 100644
--- a/src/Extrema/Extrema_HUBTreeOfSphere.hxx
+++ b/src/Extrema/Extrema_HUBTreeOfSphere.hxx
@@ -16,7 +16,6 @@
 #ifndef _Extrema_HUBTreeOfSphere_HeaderFile
 #define _Extrema_HUBTreeOfSphere_HeaderFile
 
-#include <NCollection_UBTree.hxx>
 #include <NCollection_UBTreeFiller.hxx>
 #include <NCollection_Handle.hxx>
 #include <Bnd_Sphere.hxx>
diff --git a/src/Extrema/Extrema_LocECC.hxx b/src/Extrema/Extrema_LocECC.hxx
index ba9bbbfb86..d4614d12d9 100644
--- a/src/Extrema/Extrema_LocECC.hxx
+++ b/src/Extrema/Extrema_LocECC.hxx
@@ -19,12 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv.hxx>
-#include <Extrema_SequenceOfPOnCurv.hxx>
 
 class Standard_DomainError;
 class StdFail_NotDone;
diff --git a/src/Extrema/Extrema_LocECC2d.hxx b/src/Extrema/Extrema_LocECC2d.hxx
index 1c05252e7b..723111cc49 100644
--- a/src/Extrema/Extrema_LocECC2d.hxx
+++ b/src/Extrema/Extrema_LocECC2d.hxx
@@ -19,12 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv2d.hxx>
-#include <Extrema_SequenceOfPOnCurv2d.hxx>
 
 class Standard_DomainError;
 class StdFail_NotDone;
diff --git a/src/Extrema/Extrema_LocEPCOfLocateExtPC.hxx b/src/Extrema/Extrema_LocEPCOfLocateExtPC.hxx
index 2565f2e683..7a48682718 100644
--- a/src/Extrema/Extrema_LocEPCOfLocateExtPC.hxx
+++ b/src/Extrema/Extrema_LocEPCOfLocateExtPC.hxx
@@ -19,10 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx>
 class Standard_DomainError;
 class Standard_TypeMismatch;
diff --git a/src/Extrema/Extrema_LocEPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_LocEPCOfLocateExtPC2d.hxx
index aafc6afa44..e498df9f12 100644
--- a/src/Extrema/Extrema_LocEPCOfLocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_LocEPCOfLocateExtPC2d.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx>
 class Standard_DomainError;
 class Standard_TypeMismatch;
diff --git a/src/Extrema/Extrema_LocateExtCC.cxx b/src/Extrema/Extrema_LocateExtCC.cxx
index 488a0599bf..075bb2696c 100644
--- a/src/Extrema/Extrema_LocateExtCC.cxx
+++ b/src/Extrema/Extrema_LocateExtCC.cxx
@@ -20,7 +20,6 @@
 #include <Extrema_LocECC.hxx>
 #include <Extrema_POnCurv.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <StdFail_NotDone.hxx>
 
 Extrema_LocateExtCC::Extrema_LocateExtCC (const Adaptor3d_Curve& C1,
diff --git a/src/Extrema/Extrema_LocateExtCC.hxx b/src/Extrema/Extrema_LocateExtCC.hxx
index f9e1a953eb..143600b510 100644
--- a/src/Extrema/Extrema_LocateExtCC.hxx
+++ b/src/Extrema/Extrema_LocateExtCC.hxx
@@ -19,10 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv.hxx>
 class Adaptor3d_Curve;
 
diff --git a/src/Extrema/Extrema_LocateExtCC2d.cxx b/src/Extrema/Extrema_LocateExtCC2d.cxx
index cf7eab8e32..a219d8666a 100644
--- a/src/Extrema/Extrema_LocateExtCC2d.cxx
+++ b/src/Extrema/Extrema_LocateExtCC2d.cxx
@@ -16,12 +16,9 @@
 
 #include <Extrema_LocateExtCC2d.hxx>
 
-#include <GeomAbs_CurveType.hxx>
 #include <StdFail_NotDone.hxx>
 #include <Extrema_POnCurv2d.hxx>
-#include <Precision.hxx>
 
-#include <Adaptor2d_Curve2d.hxx>
 #include <Extrema_Curve2dTool.hxx>
 #include <Extrema_LocECC2d.hxx>
 
diff --git a/src/Extrema/Extrema_LocateExtCC2d.hxx b/src/Extrema/Extrema_LocateExtCC2d.hxx
index 52e6cae3f5..5a2fee58a9 100644
--- a/src/Extrema/Extrema_LocateExtCC2d.hxx
+++ b/src/Extrema/Extrema_LocateExtCC2d.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Extrema_POnCurv2d.hxx>
 class Adaptor2d_Curve2d;
 
diff --git a/src/Extrema/Extrema_LocateExtPC.hxx b/src/Extrema/Extrema_LocateExtPC.hxx
index b646920974..dcee1ca1a8 100644
--- a/src/Extrema/Extrema_LocateExtPC.hxx
+++ b/src/Extrema/Extrema_LocateExtPC.hxx
@@ -19,17 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Extrema_POnCurv.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Extrema_LocEPCOfLocateExtPC.hxx>
 #include <Extrema_ELPCOfLocateExtPC.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <Standard_Integer.hxx>
-#include <Extrema_SequenceOfPOnCurv.hxx>
 class Standard_DomainError;
 class StdFail_NotDone;
 class Adaptor3d_Curve;
diff --git a/src/Extrema/Extrema_LocateExtPC2d.hxx b/src/Extrema/Extrema_LocateExtPC2d.hxx
index 28274c1755..0a87e7a14b 100644
--- a/src/Extrema/Extrema_LocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_LocateExtPC2d.hxx
@@ -22,14 +22,10 @@
 #include <Standard_Handle.hxx>
 
 #include <Extrema_POnCurv2d.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 #include <Extrema_LocEPCOfLocateExtPC2d.hxx>
 #include <Extrema_ELPCOfLocateExtPC2d.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <Standard_Integer.hxx>
-#include <Extrema_SequenceOfPOnCurv2d.hxx>
 class Standard_DomainError;
 class StdFail_NotDone;
 class Adaptor2d_Curve2d;
diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx
index 36d79c45f6..5e6877bfcc 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx
index b2e49b9fea..d0472ef1ce 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx
@@ -22,13 +22,10 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Pnt2d.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
 class Standard_TypeMismatch;
diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx
index 287128dee4..b84254134c 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx
index d8936cb89a..290e25bcbf 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt2d.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx
index b19d3a8fed..7af163ec47 100644
--- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx
+++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx
@@ -19,15 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <gp_Pnt.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx
index e264dc23a2..1598ea18ab 100644
--- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx
+++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx
@@ -22,13 +22,10 @@
 #include <Standard_Handle.hxx>
 
 #include <gp_Pnt2d.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 #include <Extrema_SequenceOfPOnCurv2d.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <math_FunctionWithDerivative.hxx>
 class Standard_OutOfRange;
 class Standard_TypeMismatch;
diff --git a/src/Extrema/Extrema_POnCurv.hxx b/src/Extrema/Extrema_POnCurv.hxx
index 8a1f36610b..777aecfbb6 100644
--- a/src/Extrema/Extrema_POnCurv.hxx
+++ b/src/Extrema/Extrema_POnCurv.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
 class gp_Pnt;
 
diff --git a/src/Extrema/Extrema_POnCurv2d.hxx b/src/Extrema/Extrema_POnCurv2d.hxx
index ed3accf674..2e1f84ff0b 100644
--- a/src/Extrema/Extrema_POnCurv2d.hxx
+++ b/src/Extrema/Extrema_POnCurv2d.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Pnt2d.hxx>
 class gp_Pnt2d;
 
diff --git a/src/Extrema/Extrema_POnSurf.hxx b/src/Extrema/Extrema_POnSurf.hxx
index 56905cec59..714e924aab 100644
--- a/src/Extrema/Extrema_POnSurf.hxx
+++ b/src/Extrema/Extrema_POnSurf.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <gp_Pnt.hxx>
 class gp_Pnt;
 
diff --git a/src/Extrema/Extrema_POnSurfParams.hxx b/src/Extrema/Extrema_POnSurfParams.hxx
index 0ad1aaaa72..7b35d950ab 100644
--- a/src/Extrema/Extrema_POnSurfParams.hxx
+++ b/src/Extrema/Extrema_POnSurfParams.hxx
@@ -18,9 +18,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Extrema_ElementType.hxx>
 #include <Standard_Integer.hxx>
 #include <Extrema_POnSurf.hxx>