diff --git a/src/AIS/AIS_AnimationCamera.cxx b/src/AIS/AIS_AnimationCamera.cxx
index 8ca5e2ea36..5623040dcc 100644
--- a/src/AIS/AIS_AnimationCamera.cxx
+++ b/src/AIS/AIS_AnimationCamera.cxx
@@ -14,8 +14,6 @@
 
 #include <AIS_AnimationCamera.hxx>
 
-#include <Graphic3d_Camera.hxx>
-#include <Precision.hxx>
 #include <V3d_View.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationCamera, AIS_Animation)
diff --git a/src/AIS/AIS_AnimationObject.cxx b/src/AIS/AIS_AnimationObject.cxx
index 74ec0e4040..faff48f054 100644
--- a/src/AIS/AIS_AnimationObject.cxx
+++ b/src/AIS/AIS_AnimationObject.cxx
@@ -15,8 +15,6 @@
 #include <AIS_AnimationObject.hxx>
 
 #include <AIS_InteractiveContext.hxx>
-#include <TopLoc_Location.hxx>
-#include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_Animation)
diff --git a/src/AIS/AIS_AttributeFilter.hxx b/src/AIS/AIS_AttributeFilter.hxx
index 3e492aadff..0d910bed46 100644
--- a/src/AIS/AIS_AttributeFilter.hxx
+++ b/src/AIS/AIS_AttributeFilter.hxx
@@ -22,7 +22,6 @@
 
 #include <Quantity_NameOfColor.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <SelectMgr_Filter.hxx>
 class SelectMgr_EntityOwner;
 
diff --git a/src/AIS/AIS_Axis.cxx b/src/AIS/AIS_Axis.cxx
index e4864120f4..9580e5c223 100644
--- a/src/AIS/AIS_Axis.cxx
+++ b/src/AIS/AIS_Axis.cxx
@@ -36,8 +36,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_NumericError.hxx>
 #include <StdPrs_Curve.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TopoDS.hxx>
 #include <UnitsAPI.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
diff --git a/src/AIS/AIS_BadEdgeFilter.cxx b/src/AIS/AIS_BadEdgeFilter.cxx
index f8ca6055a2..1bdd5b27d8 100644
--- a/src/AIS/AIS_BadEdgeFilter.cxx
+++ b/src/AIS/AIS_BadEdgeFilter.cxx
@@ -17,12 +17,9 @@
 //		<g_design>
 
 #include <AIS_BadEdgeFilter.hxx>
-#include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
diff --git a/src/AIS/AIS_BadEdgeFilter.hxx b/src/AIS/AIS_BadEdgeFilter.hxx
index 89a7e937c1..a9f1ab19a6 100644
--- a/src/AIS/AIS_BadEdgeFilter.hxx
+++ b/src/AIS/AIS_BadEdgeFilter.hxx
@@ -18,12 +18,10 @@
 #define _AIS_BadEdgeFilter_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopTools_DataMapOfIntegerListOfShape.hxx>
 #include <Standard_Integer.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class SelectMgr_EntityOwner;
 class TopoDS_Edge;
diff --git a/src/AIS/AIS_C0RegularityFilter.cxx b/src/AIS/AIS_C0RegularityFilter.cxx
index 7d4c9da7a4..8becc91faa 100644
--- a/src/AIS/AIS_C0RegularityFilter.cxx
+++ b/src/AIS/AIS_C0RegularityFilter.cxx
@@ -18,7 +18,6 @@
 #include <AIS_C0RegularityFilter.hxx>
 #include <BRep_Tool.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopExp.hxx>
diff --git a/src/AIS/AIS_C0RegularityFilter.hxx b/src/AIS/AIS_C0RegularityFilter.hxx
index 9b5e2c3a2d..6da54fe2fe 100644
--- a/src/AIS/AIS_C0RegularityFilter.hxx
+++ b/src/AIS/AIS_C0RegularityFilter.hxx
@@ -18,11 +18,9 @@
 #define _AIS_C0RegularityFilter_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopTools_MapOfShape.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class TopoDS_Shape;
 class SelectMgr_EntityOwner;
diff --git a/src/AIS/AIS_Circle.cxx b/src/AIS/AIS_Circle.cxx
index 9a8371f70f..70c7e7957e 100644
--- a/src/AIS/AIS_Circle.cxx
+++ b/src/AIS/AIS_Circle.cxx
@@ -18,7 +18,6 @@
 
 #include <AIS_GraphicTool.hxx>
 #include <Aspect_TypeOfLine.hxx>
-#include <GC_MakeArcOfCircle.hxx>
 #include <Geom_Circle.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
@@ -32,8 +31,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_Type.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TopoDS.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
 
diff --git a/src/AIS/AIS_ColorScale.cxx b/src/AIS/AIS_ColorScale.cxx
index 70aa1ec75f..08ec0bcf75 100644
--- a/src/AIS/AIS_ColorScale.cxx
+++ b/src/AIS/AIS_ColorScale.cxx
@@ -17,26 +17,18 @@
 #include <AIS_InteractiveContext.hxx>
 #include <Aspect_TypeOfColorScaleData.hxx>
 #include <Aspect_TypeOfColorScalePosition.hxx>
-#include <Aspect_Window.hxx>
 #include <Geom_Line.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <Graphic3d_ArrayOfPolygons.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_Text.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_Text.hxx>
 #include <Prs3d_TextAspect.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-#include <SelectMgr_Selection.hxx>
 #include <Select3D_SensitiveBox.hxx>
-#include <Select3D_SensitiveSegment.hxx>
 #include <StdPrs_Curve.hxx>
-#include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ColorScale, AIS_InteractiveObject)
diff --git a/src/AIS/AIS_ColoredShape.cxx b/src/AIS/AIS_ColoredShape.cxx
index b3bfb64a9a..ec68acf925 100644
--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -19,28 +19,21 @@
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
-#include <gp_Pnt2d.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Precision.hxx>
-#include <Prs3d.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <PrsMgr_PresentationManager.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <StdPrs_ShadedShape.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <StdPrs_WFShape.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 
diff --git a/src/AIS/AIS_ColoredShape.hxx b/src/AIS/AIS_ColoredShape.hxx
index 55a4069311..570b0c65e1 100644
--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@@ -19,7 +19,6 @@
 #include <AIS_DataMapOfShapeDrawer.hxx>
 #include <AIS_Shape.hxx>
 #include <NCollection_IndexedDataMap.hxx>
-#include <StdPrs_Volume.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TColStd_MapTransientHasher.hxx>
diff --git a/src/AIS/AIS_ConnectedInteractive.cxx b/src/AIS/AIS_ConnectedInteractive.cxx
index bf38ac2973..64decc8336 100644
--- a/src/AIS/AIS_ConnectedInteractive.cxx
+++ b/src/AIS/AIS_ConnectedInteractive.cxx
@@ -20,22 +20,16 @@
 #include <AIS_Shape.hxx>
 #include <BRepTools.hxx>
 #include <NCollection_DataMap.hxx>
-#include <Precision.hxx>
-#include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
-#include <Standard_NotImplemented.hxx>
 #include <Standard_ProgramError.hxx>
 #include <Standard_Type.hxx>
 #include <StdPrs_HLRPolyShape.hxx>
-#include <StdPrs_WFShape.hxx>
 #include <StdSelect.hxx>
 #include <StdSelect_BRepOwner.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
diff --git a/src/AIS/AIS_DataMapOfShapeDrawer.hxx b/src/AIS/AIS_DataMapOfShapeDrawer.hxx
index ffa340ea9e..9655723226 100644
--- a/src/AIS/AIS_DataMapOfShapeDrawer.hxx
+++ b/src/AIS/AIS_DataMapOfShapeDrawer.hxx
@@ -16,7 +16,6 @@
 
 #include <AIS_ColoredDrawer.hxx>
 #include <NCollection_DataMap.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 
 typedef NCollection_DataMap<TopoDS_Shape, Handle(AIS_ColoredDrawer), TopTools_ShapeMapHasher> AIS_DataMapOfShapeDrawer;
diff --git a/src/AIS/AIS_ExclusionFilter.cxx b/src/AIS/AIS_ExclusionFilter.cxx
index 46e9878d53..639b226a30 100644
--- a/src/AIS/AIS_ExclusionFilter.cxx
+++ b/src/AIS/AIS_ExclusionFilter.cxx
@@ -20,7 +20,6 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerListOfInteger.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
diff --git a/src/AIS/AIS_ExclusionFilter.hxx b/src/AIS/AIS_ExclusionFilter.hxx
index ca43911f66..f182d43585 100644
--- a/src/AIS/AIS_ExclusionFilter.hxx
+++ b/src/AIS/AIS_ExclusionFilter.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TColStd_DataMapOfIntegerListOfInteger.hxx>
 #include <SelectMgr_Filter.hxx>
 #include <AIS_KindOfInteractive.hxx>
diff --git a/src/AIS/AIS_GlobalStatus.hxx b/src/AIS/AIS_GlobalStatus.hxx
index 9a1585a015..e823e7960e 100644
--- a/src/AIS/AIS_GlobalStatus.hxx
+++ b/src/AIS/AIS_GlobalStatus.hxx
@@ -18,13 +18,10 @@
 #define _AIS_GlobalStatus_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <AIS_DisplayStatus.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <TColStd_ListOfInteger.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 
 DEFINE_STANDARD_HANDLE(AIS_GlobalStatus, Standard_Transient)
diff --git a/src/AIS/AIS_GraphicTool.cxx b/src/AIS/AIS_GraphicTool.cxx
index 0b31453cf1..d0f3128472 100644
--- a/src/AIS/AIS_GraphicTool.cxx
+++ b/src/AIS/AIS_GraphicTool.cxx
@@ -16,9 +16,7 @@
 
 
 #include <AIS_GraphicTool.hxx>
-#include <Aspect_InteriorStyle.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_MaterialAspect.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_DimensionAspect.hxx>
diff --git a/src/AIS/AIS_GraphicTool.hxx b/src/AIS/AIS_GraphicTool.hxx
index 453f22a443..599339ec0b 100644
--- a/src/AIS/AIS_GraphicTool.hxx
+++ b/src/AIS/AIS_GraphicTool.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Quantity_NameOfColor.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <AIS_TypeOfAttribute.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index 427dd5a08e..a2130989ac 100644
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -21,9 +21,7 @@
 #include <AIS_GlobalStatus.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_MultipleConnectedInteractive.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
 #include <Precision.hxx>
-#include <Prs3d_BasicAspect.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
@@ -31,7 +29,6 @@
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_MapIteratorOfMapOfTransient.hxx>
 #include <TopLoc_Location.hxx>
 #include <V3d_View.hxx>
diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx
index 9f2f2647ad..5b9ec24c28 100644
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -42,7 +42,6 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_ListOfInteger.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <Quantity_Color.hxx>
 
 class V3d_Viewer;
diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx
index f11083300f..b1f43ab8bf 100644
--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -17,10 +17,6 @@
 #include <AIS_InteractiveObject.hxx>
 
 #include <AIS_InteractiveContext.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
-#include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_CStructure.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_Structure.hxx>
diff --git a/src/AIS/AIS_LightSource.cxx b/src/AIS/AIS_LightSource.cxx
index 91ae697643..f70f4e70d8 100644
--- a/src/AIS/AIS_LightSource.cxx
+++ b/src/AIS/AIS_LightSource.cxx
@@ -20,7 +20,6 @@
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_CView.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_ArrowAspect.hxx>
diff --git a/src/AIS/AIS_LightSource.hxx b/src/AIS/AIS_LightSource.hxx
index c2da38840c..3816b73a4a 100644
--- a/src/AIS/AIS_LightSource.hxx
+++ b/src/AIS/AIS_LightSource.hxx
@@ -17,7 +17,6 @@
 #define _AIS_LightSource_HeaderFile
 
 #include <AIS_InteractiveObject.hxx>
-#include <Graphic3d_CLight.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 
 class Select3D_SensitiveSphere;
diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx
index db9bf36c55..246d468abe 100644
--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -18,13 +18,11 @@
 
 #include <AIS_GraphicTool.hxx>
 #include <Aspect_TypeOfLine.hxx>
-#include <GC_MakeSegment.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_Point.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Structure.hxx>
-#include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
@@ -34,7 +32,6 @@
 #include <SelectMgr_Selection.hxx>
 #include <Standard_Type.hxx>
 #include <StdPrs_Curve.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
diff --git a/src/AIS/AIS_Manipulator.cxx b/src/AIS/AIS_Manipulator.cxx
index 99a003e93b..05aefddb1f 100644
--- a/src/AIS/AIS_Manipulator.cxx
+++ b/src/AIS/AIS_Manipulator.cxx
@@ -15,6 +15,7 @@
 
 #include <AIS_Manipulator.hxx>
 
+#include <AIS_DisplayMode.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_ManipulatorOwner.hxx>
 #include <Extrema_ExtElC.hxx>
diff --git a/src/AIS/AIS_Manipulator.hxx b/src/AIS/AIS_Manipulator.hxx
index 90dd33097f..84c82ad2ae 100644
--- a/src/AIS/AIS_Manipulator.hxx
+++ b/src/AIS/AIS_Manipulator.hxx
@@ -18,17 +18,14 @@
 
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_ManipulatorMode.hxx>
-#include <gp.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfQuadrangles.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_Group.hxx>
 #include <NCollection_HSequence.hxx>
 #include <Poly_Triangulation.hxx>
 #include <V3d_View.hxx>
-#include <Standard_Version.hxx>
 #include <Standard_DefineHandle.hxx>
 
 NCOLLECTION_HSEQUENCE(AIS_ManipulatorObjectSequence, Handle(AIS_InteractiveObject))
diff --git a/src/AIS/AIS_MediaPlayer.cxx b/src/AIS/AIS_MediaPlayer.cxx
index 8cd1c13f64..f975903b33 100644
--- a/src/AIS/AIS_MediaPlayer.cxx
+++ b/src/AIS/AIS_MediaPlayer.cxx
@@ -16,10 +16,8 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <Media_PlayerContext.hxx>
-#include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
-#include <Graphic3d_MediaTexture.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <Select3D_SensitivePrimitiveArray.hxx>
 #include <V3d_Viewer.hxx>
diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cxx b/src/AIS/AIS_MultipleConnectedInteractive.cxx
index 9531647b9c..90383d0dd3 100644
--- a/src/AIS/AIS_MultipleConnectedInteractive.cxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx
@@ -19,10 +19,7 @@
 #include <AIS_ConnectedInteractive.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
-#include <Select3D_SensitiveEntity.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <TopLoc_Location.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
 
diff --git a/src/AIS/AIS_Plane.cxx b/src/AIS/AIS_Plane.cxx
index 0a754b371c..b04a7a9cec 100644
--- a/src/AIS/AIS_Plane.cxx
+++ b/src/AIS/AIS_Plane.cxx
@@ -17,7 +17,6 @@
 #include <AIS_Plane.hxx>
 
 #include <AIS_InteractiveContext.hxx>
-#include <Aspect_TypeOfLine.hxx>
 #include <DsgPrs_ShadedPlanePresentation.hxx>
 #include <DsgPrs_XYZPlanePresentation.hxx>
 #include <ElSLib.hxx>
@@ -45,11 +44,7 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdPrs_Plane.hxx>
-#include <StdPrs_ShadedShape.hxx>
-#include <StdPrs_ShadedSurface.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TCollection_AsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Plane,AIS_InteractiveObject)
 
diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx
index bafe6a3c3a..2a9bfb8bc6 100644
--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -18,13 +18,10 @@
 // + (-1) selection mode token into account 
 // (SAMTECH specific)
 
-#include <AIS_InteractiveObject.hxx>
 #include <AIS_Line.hxx>
 #include <AIS_PlaneTrihedron.hxx>
 #include <AIS_Point.hxx>
-#include <Aspect_TypeOfLine.hxx>
 #include <DsgPrs_XYZAxisPresentation.hxx>
-#include <Geom_Axis1Placement.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Line.hxx>
@@ -33,9 +30,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_MaterialAspect.hxx>
 #include <Graphic3d_Structure.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_Drawer.hxx>
diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx
index a772b8ce6a..6e6cab6a8f 100644
--- a/src/AIS/AIS_Point.cxx
+++ b/src/AIS/AIS_Point.cxx
@@ -17,15 +17,11 @@
 #include <AIS_Point.hxx>
 
 #include <AIS_InteractiveContext.hxx>
-#include <Aspect_TypeOfLine.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
-#include <Geom_Point.hxx>
-#include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_Structure.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitivePoint.hxx>
diff --git a/src/AIS/AIS_Point.hxx b/src/AIS/AIS_Point.hxx
index d370356e99..4ffa79e7a0 100644
--- a/src/AIS/AIS_Point.hxx
+++ b/src/AIS/AIS_Point.hxx
@@ -17,7 +17,6 @@
 #ifndef _AIS_Point_HeaderFile
 #define _AIS_Point_HeaderFile
 
-#include <Aspect_TypeOfMarker.hxx>
 #include <AIS_InteractiveObject.hxx>
 
 class Geom_Point;
diff --git a/src/AIS/AIS_PointCloud.cxx b/src/AIS/AIS_PointCloud.cxx
index 917bd7f109..cd4933c643 100644
--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@@ -17,13 +17,11 @@
 
 #include <AIS_GraphicTool.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <PrsMgr_Presentations.hxx>
 #include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitivePrimitiveArray.hxx>
 #include <SelectMgr_EntityOwner.hxx>
diff --git a/src/AIS/AIS_RubberBand.cxx b/src/AIS/AIS_RubberBand.cxx
index 8019f714ed..fb74ea7292 100644
--- a/src/AIS/AIS_RubberBand.cxx
+++ b/src/AIS/AIS_RubberBand.cxx
@@ -23,10 +23,7 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_TransModeFlags.hxx>
 #include <Graphic3d_ZLayerId.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_ShadingAspect.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 
 
diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx
index 41ed66f0db..eb9e7f68e7 100644
--- a/src/AIS/AIS_Shape.cxx
+++ b/src/AIS/AIS_Shape.cxx
@@ -18,36 +18,25 @@
 
 #include <AIS_GraphicTool.hxx>
 #include <AIS_InteractiveContext.hxx>
-#include <Aspect_TypeOfLine.hxx>
-#include <BRep_Builder.hxx>
 #include <BRepBndLib.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_ShapeSet.hxx>
-#include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
-#include <Graphic3d_AspectText3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_MaterialAspect.hxx>
-#include <Graphic3d_SequenceOfGroup.hxx>
 #include <Graphic3d_Structure.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <HLRBRep.hxx>
 #include <OSD_Timer.hxx>
-#include <Precision.hxx>
-#include <Prs3d.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_BndBox.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <Quantity_Color.hxx>
 #include <Select3D_SensitiveBox.hxx>
-#include <Select3D_SensitiveEntity.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
@@ -56,10 +45,7 @@
 #include <StdPrs_ShadedShape.hxx>
 #include <StdPrs_WFShape.hxx>
 #include <StdSelect.hxx>
-#include <StdSelect_BRepOwner.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-#include <TopExp.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_Shape,AIS_InteractiveObject)
 
diff --git a/src/AIS/AIS_Shape.hxx b/src/AIS/AIS_Shape.hxx
index 8d08eb4311..9c9afc1c40 100644
--- a/src/AIS/AIS_Shape.hxx
+++ b/src/AIS/AIS_Shape.hxx
@@ -17,6 +17,7 @@
 #ifndef _AIS_Shape_HeaderFile
 #define _AIS_Shape_HeaderFile
 
+#include <AIS_DisplayMode.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <Bnd_Box.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/AIS/AIS_SignatureFilter.hxx b/src/AIS/AIS_SignatureFilter.hxx
index 8e977b7dd2..2e87ed10f9 100644
--- a/src/AIS/AIS_SignatureFilter.hxx
+++ b/src/AIS/AIS_SignatureFilter.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Integer.hxx>
 #include <AIS_TypeFilter.hxx>
 #include <AIS_KindOfInteractive.hxx>
-#include <Standard_Boolean.hxx>
 class SelectMgr_EntityOwner;
 
 
diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx
index 80c20d7aed..46e2dc6aa0 100644
--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -25,10 +25,8 @@
 #include <Graphic3d_Texture2Dmanual.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
-#include <Precision.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <PrsMgr_PresentationManager.hxx>
 #include <Standard_ErrorHandler.hxx>
@@ -36,7 +34,6 @@
 #include <StdPrs_ShadedShape.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <StdPrs_WFShape.hxx>
-#include <TopExp_Explorer.hxx>
 
 
 IMPLEMENT_STANDARD_RTTIEXT(AIS_TexturedShape,AIS_Shape)
diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx
index 5c3ece94bb..270470f3a1 100644
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -18,12 +18,10 @@
 
 #include <AIS_Shape.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Graphic3d_NameOfTexture2D.hxx>
 #include <Image_PixMap.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
-#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <PrsMgr_PresentationManager.hxx>
 
diff --git a/src/AIS/AIS_Triangulation.cxx b/src/AIS/AIS_Triangulation.cxx
index 8c179b6286..734d092ef7 100644
--- a/src/AIS/AIS_Triangulation.cxx
+++ b/src/AIS/AIS_Triangulation.cxx
@@ -16,14 +16,10 @@
 #include <AIS_DisplayMode.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <Standard_Type.hxx>
-#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <TShort_Array1OfShortReal.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TShort_HArray1OfShortReal.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx
index a5ea0fb6b3..98191cdd19 100644
--- a/src/AIS/AIS_Trihedron.cxx
+++ b/src/AIS/AIS_Trihedron.cxx
@@ -18,10 +18,9 @@
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_TrihedronOwner.hxx>
+#include <AIS_TrihedronSelectionMode.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_ArrayOfPoints.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
diff --git a/src/AIS/AIS_Trihedron.hxx b/src/AIS/AIS_Trihedron.hxx
index 3d0dd745b3..03cb6f1c29 100644
--- a/src/AIS/AIS_Trihedron.hxx
+++ b/src/AIS/AIS_Trihedron.hxx
@@ -19,17 +19,13 @@
 
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_KindOfInteractive.hxx>
-#include <AIS_TrihedronSelectionMode.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <PrsMgr_PresentationManager.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_DatumMode.hxx>
 #include <Prs3d_DatumParts.hxx>
-#include <Prs3d_ShadingAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_PointAspect.hxx>
 #include <SelectMgr_Selection.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <Quantity_Color.hxx>
 
 class Geom_Axis2Placement;
diff --git a/src/AIS/AIS_TypeFilter.hxx b/src/AIS/AIS_TypeFilter.hxx
index 4fa6230053..1163e24d18 100644
--- a/src/AIS/AIS_TypeFilter.hxx
+++ b/src/AIS/AIS_TypeFilter.hxx
@@ -22,7 +22,6 @@
 
 #include <AIS_KindOfInteractive.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 class SelectMgr_EntityOwner;
 
 
diff --git a/src/AIS/AIS_ViewController.cxx b/src/AIS/AIS_ViewController.cxx
index 2d08659425..b923079fa4 100644
--- a/src/AIS/AIS_ViewController.cxx
+++ b/src/AIS/AIS_ViewController.cxx
@@ -21,10 +21,7 @@
 #include <Aspect_XRSession.hxx>
 #include <Aspect_Grid.hxx>
 #include <Geom_CartesianPoint.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Message.hxx>
-#include <Message_Messenger.hxx>
 #include <gp_Quaternion.hxx>
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
diff --git a/src/AIS/AIS_ViewController.hxx b/src/AIS/AIS_ViewController.hxx
index 8ab8fd23a8..21e9ccdde0 100644
--- a/src/AIS/AIS_ViewController.hxx
+++ b/src/AIS/AIS_ViewController.hxx
@@ -14,8 +14,6 @@
 #ifndef _AIS_ViewController_HeaderFile
 #define _AIS_ViewController_HeaderFile
 
-#include <Aspect_VKeySet.hxx>
-#include <Aspect_TouchMap.hxx>
 #include <Aspect_WindowInputListener.hxx>
 #include <Aspect_XRHapticActionData.hxx>
 #include <Aspect_XRTrackedDeviceRole.hxx>
diff --git a/src/AIS/AIS_ViewCube.cxx b/src/AIS/AIS_ViewCube.cxx
index 1e405cb44f..2af2fef307 100644
--- a/src/AIS/AIS_ViewCube.cxx
+++ b/src/AIS/AIS_ViewCube.cxx
@@ -18,14 +18,12 @@
 #include <AIS_AnimationCamera.hxx>
 #include <AIS_InteractiveContext.hxx>
 #include <gp_Ax2.hxx>
-#include <Graphic3d_ViewAffinity.hxx>
 #include <Graphic3d_Text.hxx>
 #include <NCollection_Lerp.hxx>
 #include <Prs3d.hxx>
 #include <Prs3d_Arrow.hxx>
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_Text.hxx>
-#include <Prs3d_ToolDisk.hxx>
 #include <Prs3d_ToolSphere.hxx>
 #include <SelectMgr_SequenceOfOwner.hxx>
 #include <V3d.hxx>
diff --git a/src/AIS/AIS_XRTrackedDevice.cxx b/src/AIS/AIS_XRTrackedDevice.cxx
index 4c52b61661..af435d50b6 100644
--- a/src/AIS/AIS_XRTrackedDevice.cxx
+++ b/src/AIS/AIS_XRTrackedDevice.cxx
@@ -16,7 +16,6 @@
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Graphic3d_Texture2Dmanual.hxx>
 #include <Image_Texture.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_ShadingAspect.hxx>
diff --git a/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx b/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
index 51adb10c11..2bc59031ef 100644
--- a/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
+++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
@@ -15,7 +15,6 @@
 #include <APIHeaderSection_EditHeader.hxx>
 #include <APIHeaderSection_MakeHeader.hxx>
 #include <IFSelect_EditForm.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_TypedValue.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
index ca5543d907..749528cb48 100644
--- a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
+++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
@@ -18,10 +18,8 @@
 #define _APIHeaderSection_EditHeader_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <IFSelect_Editor.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TCollection_AsciiString;
 class IFSelect_EditForm;
diff --git a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx
index 1ce12440d2..9f90004ff9 100644
--- a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx
+++ b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cxx
@@ -25,7 +25,6 @@
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_MSG.hxx>
-#include <Interface_Protocol.hxx>
 #include <Interface_Version.hxx>
 #include <StepData_Protocol.hxx>
 #include <StepData_StepModel.hxx>
diff --git a/src/APIHeaderSection/APIHeaderSection_MakeHeader.hxx b/src/APIHeaderSection/APIHeaderSection_MakeHeader.hxx
index 30897dec5d..9415693b65 100644
--- a/src/APIHeaderSection/APIHeaderSection_MakeHeader.hxx
+++ b/src/APIHeaderSection/APIHeaderSection_MakeHeader.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_CString.hxx>
 #include <Interface_HArray1OfHAsciiString.hxx>
 class HeaderSection_FileName;
 class HeaderSection_FileSchema;
diff --git a/src/Adaptor2d/Adaptor2d_Curve2d.cxx b/src/Adaptor2d/Adaptor2d_Curve2d.cxx
index 5bcd2eb872..4e29d2b805 100644
--- a/src/Adaptor2d/Adaptor2d_Curve2d.cxx
+++ b/src/Adaptor2d/Adaptor2d_Curve2d.cxx
@@ -25,10 +25,7 @@
 #include <gp_Parab2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Adaptor2d_Curve2d, Standard_Transient)
 
diff --git a/src/Adaptor2d/Adaptor2d_Line2d.cxx b/src/Adaptor2d/Adaptor2d_Line2d.cxx
index 16792e654a..900cf4b0ab 100644
--- a/src/Adaptor2d/Adaptor2d_Line2d.cxx
+++ b/src/Adaptor2d/Adaptor2d_Line2d.cxx
@@ -25,7 +25,6 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_OutOfRange.hxx>
 
diff --git a/src/Adaptor2d/Adaptor2d_Line2d.hxx b/src/Adaptor2d/Adaptor2d_Line2d.hxx
index 142263881e..5fe95ce881 100644
--- a/src/Adaptor2d/Adaptor2d_Line2d.hxx
+++ b/src/Adaptor2d/Adaptor2d_Line2d.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Real.hxx>
-#include <gp_Ax2d.hxx>
 #include <Adaptor2d_Curve2d.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx b/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx
index dd1e205e89..7f4d40c21c 100644
--- a/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx
+++ b/src/Adaptor2d/Adaptor2d_OffsetCurve.cxx
@@ -15,8 +15,6 @@
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2dEvaluator.hxx>
-#include <GeomAbs_SurfaceType.hxx>
-#include <gp.hxx>
 #include <gp_Ax22d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -26,7 +24,6 @@
 #include <gp_Parab2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
-#include <gp_VectorWithNullMagnitude.hxx>
 #include <Precision.hxx>
 #include <Standard_DomainError.hxx>
 #include <Standard_NoSuchObject.hxx>
diff --git a/src/Adaptor3d/Adaptor3d_Curve.cxx b/src/Adaptor3d/Adaptor3d_Curve.cxx
index 76b13c5557..09cd950524 100644
--- a/src/Adaptor3d/Adaptor3d_Curve.cxx
+++ b/src/Adaptor3d/Adaptor3d_Curve.cxx
@@ -26,10 +26,7 @@
 #include <gp_Parab.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_Curve, Standard_Transient)
 
diff --git a/src/Adaptor3d/Adaptor3d_Curve.hxx b/src/Adaptor3d/Adaptor3d_Curve.hxx
index e797edea3d..b1fc100868 100644
--- a/src/Adaptor3d/Adaptor3d_Curve.hxx
+++ b/src/Adaptor3d/Adaptor3d_Curve.hxx
@@ -17,7 +17,6 @@
 #ifndef _Adaptor3d_Curve_HeaderFile
 #define _Adaptor3d_Curve_HeaderFile
 
-#include <gp_Lin.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Elips.hxx>
 #include <gp_Hypr.hxx>
diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
index 8480ace335..787af3564e 100644
--- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
+++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
@@ -25,9 +25,7 @@
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <gp_Ax22d.hxx>
 #include <gp_Circ.hxx>
@@ -50,7 +48,6 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx
index 554a7edf39..a1105a4886 100644
--- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx
+++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.hxx
@@ -18,7 +18,6 @@
 #define _Adaptor3d_CurveOnSurface_HeaderFile
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
diff --git a/src/Adaptor3d/Adaptor3d_HSurfaceTool.cxx b/src/Adaptor3d/Adaptor3d_HSurfaceTool.cxx
index 83c6bb2170..9873386075 100644
--- a/src/Adaptor3d/Adaptor3d_HSurfaceTool.cxx
+++ b/src/Adaptor3d/Adaptor3d_HSurfaceTool.cxx
@@ -22,10 +22,6 @@
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_OffsetCurve.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_OutOfRange.hxx>
 
 Standard_Integer Adaptor3d_HSurfaceTool::NbSamplesU(const Handle(Adaptor3d_Surface)& S)
 {
diff --git a/src/Adaptor3d/Adaptor3d_HSurfaceTool.hxx b/src/Adaptor3d/Adaptor3d_HSurfaceTool.hxx
index 57766af1ed..1b3eae0c93 100644
--- a/src/Adaptor3d/Adaptor3d_HSurfaceTool.hxx
+++ b/src/Adaptor3d/Adaptor3d_HSurfaceTool.hxx
@@ -35,7 +35,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 class Adaptor3d_HSurfaceTool 
diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
index 7493df89da..3859809d5b 100644
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
@@ -15,8 +15,6 @@
 
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <BSplCLib.hxx>
-#include <BSplSLib.hxx>
 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
 #include <Geom_BezierCurve.hxx>
@@ -33,12 +31,8 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_IsoCurve, Adaptor3d_Curve)
 
diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.hxx b/src/Adaptor3d/Adaptor3d_IsoCurve.hxx
index 9fa24f5a95..38b6a07aef 100644
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.hxx
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.hxx
@@ -17,7 +17,6 @@
 #ifndef _Adaptor3d_IsoCurve_HeaderFile
 #define _Adaptor3d_IsoCurve_HeaderFile
 
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <GeomAbs_IsoType.hxx>
 
diff --git a/src/Adaptor3d/Adaptor3d_Surface.cxx b/src/Adaptor3d/Adaptor3d_Surface.cxx
index c48bbc5b42..55a7528614 100644
--- a/src/Adaptor3d/Adaptor3d_Surface.cxx
+++ b/src/Adaptor3d/Adaptor3d_Surface.cxx
@@ -28,10 +28,7 @@
 #include <gp_Sphere.hxx>
 #include <gp_Torus.hxx>
 #include <gp_Vec.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_Surface, Standard_Transient)
 
diff --git a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx
index ae47b436e5..f07a63a035 100644
--- a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.cxx
@@ -29,13 +29,10 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
 #include <gp_XY.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Pnt.hxx>
 #include <TColgp_HArray2OfPnt.hxx>
 
 #include <Convert_GridPolynomialToPoles.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx
index e9c79b607f..73e72e7da5 100644
--- a/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_ApproxAFunc2Var.hxx
@@ -23,10 +23,7 @@
 
 #include <Standard_Integer.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray2OfReal.hxx>
 #include <Standard_Real.hxx>
-#include <GeomAbs_IsoType.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <AdvApp2Var_Context.hxx>
 #include <AdvApp2Var_Network.hxx>
 #include <AdvApp2Var_Framework.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_Criterion.cxx b/src/AdvApp2Var/AdvApp2Var_Criterion.cxx
index c65914408d..fa4ee7cead 100644
--- a/src/AdvApp2Var/AdvApp2Var_Criterion.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_Criterion.cxx
@@ -15,9 +15,7 @@
 // commercial license or contractual agreement.
 
 
-#include <AdvApp2Var_Context.hxx>
 #include <AdvApp2Var_Criterion.hxx>
-#include <AdvApp2Var_Patch.hxx>
 
 AdvApp2Var_Criterion::~AdvApp2Var_Criterion()
 {}
diff --git a/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx b/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx
index 46366dc44c..2215281feb 100644
--- a/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_EvaluatorFunc2Var.hxx
@@ -17,8 +17,6 @@
 #ifndef AdvApp2Var_EvaluatorFunc2Var_HeaderFile
 #define AdvApp2Var_EvaluatorFunc2Var_HeaderFile
 
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_PrimitiveTypes.hxx>
 
 // History - the C function pointer converted to a virtual class
diff --git a/src/AdvApp2Var/AdvApp2Var_MathBase_mathinit.cxx b/src/AdvApp2Var/AdvApp2Var_MathBase_mathinit.cxx
index 288c5b19ca..ffa5a2a10a 100644
--- a/src/AdvApp2Var/AdvApp2Var_MathBase_mathinit.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_MathBase_mathinit.cxx
@@ -14,7 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <AdvApp2Var_SysBase.hxx>
 #include <AdvApp2Var_MathBase.hxx>
 
 
diff --git a/src/AdvApp2Var/AdvApp2Var_Network.cxx b/src/AdvApp2Var/AdvApp2Var_Network.cxx
index bef0ef41df..a2476c50c5 100644
--- a/src/AdvApp2Var/AdvApp2Var_Network.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_Network.cxx
@@ -21,7 +21,6 @@
 #include <AdvApp2Var_Network.hxx>
 #include <AdvApp2Var_Patch.hxx>
 #include <AdvApp2Var_SequenceOfPatch.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
 //==========================================================================================
diff --git a/src/AdvApp2Var/AdvApp2Var_Network.hxx b/src/AdvApp2Var/AdvApp2Var_Network.hxx
index 8c5d95d198..1047bbe8b8 100644
--- a/src/AdvApp2Var/AdvApp2Var_Network.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_Network.hxx
@@ -24,8 +24,6 @@
 #include <AdvApp2Var_SequenceOfPatch.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 class AdvApp2Var_Patch;
 
 
diff --git a/src/AdvApp2Var/AdvApp2Var_Node.hxx b/src/AdvApp2Var/AdvApp2Var_Node.hxx
index 9fdd814195..5722d3d5ba 100644
--- a/src/AdvApp2Var/AdvApp2Var_Node.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_Node.hxx
@@ -17,7 +17,6 @@
 #ifndef _AdvApp2Var_Node_HeaderFile
 #define _AdvApp2Var_Node_HeaderFile
 
-#include <gp_XY.hxx>
 #include <Standard.hxx>
 #include <Standard_Handle.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_Patch.cxx b/src/AdvApp2Var/AdvApp2Var_Patch.cxx
index 49e86f0e8e..1b0bf691c6 100644
--- a/src/AdvApp2Var/AdvApp2Var_Patch.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_Patch.cxx
@@ -33,9 +33,7 @@
 #include <Convert_GridPolynomialToPoles.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <TColgp_Array2OfPnt.hxx>
 #include <TColgp_HArray2OfPnt.hxx>
-#include <TColStd_Array2OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_Patch.hxx b/src/AdvApp2Var/AdvApp2Var_Patch.hxx
index 379a1f777d..1afe83be0c 100644
--- a/src/AdvApp2Var/AdvApp2Var_Patch.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_Patch.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <TColStd_HArray1OfReal.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_SysBase.cxx b/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
index 6d6a283453..7f32dcb631 100644
--- a/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
@@ -14,9 +14,7 @@
 // AdvApp2Var_SysBase.cxx
 #include <assert.h>
 #include <cmath>
-#include <stdlib.h>
 #include <string.h>
-#include <AdvApp2Var_Data_f2c.hxx>
 #include <AdvApp2Var_SysBase.hxx>
 #include <AdvApp2Var_Data.hxx>
 #include <Standard.hxx>
diff --git a/src/AdvApp2Var/AdvApp2Var_SysBase.hxx b/src/AdvApp2Var/AdvApp2Var_SysBase.hxx
index 135ec21fb1..8cf12ccfba 100644
--- a/src/AdvApp2Var/AdvApp2Var_SysBase.hxx
+++ b/src/AdvApp2Var/AdvApp2Var_SysBase.hxx
@@ -15,7 +15,6 @@
 #ifndef AdvApp2Var_SysBase_HeaderFile
 #define AdvApp2Var_SysBase_HeaderFile
 
-#include <Standard_Macro.hxx>
 #include <Standard_TypeDef.hxx>
 #include <AdvApp2Var_Data_f2c.hxx>
 
diff --git a/src/AdvApprox/AdvApprox_ApproxAFunction.cxx b/src/AdvApprox/AdvApprox_ApproxAFunction.cxx
index ffbf4e23c4..388ddf909d 100644
--- a/src/AdvApprox/AdvApprox_ApproxAFunction.cxx
+++ b/src/AdvApprox/AdvApprox_ApproxAFunction.cxx
@@ -22,7 +22,6 @@
 // Modified     PMN 15/04/1997 : Gestion fine de la continuite aux lieux de decoupes 
 
 #include <AdvApprox_ApproxAFunction.hxx>
-#include <AdvApprox_Cutting.hxx>
 #include <AdvApprox_DichoCutting.hxx>
 #include <AdvApprox_EvaluatorFunction.hxx>
 #include <AdvApprox_SimpleApprox.hxx>
@@ -34,7 +33,6 @@
 #include <math_Vector.hxx>
 #include <PLib.hxx>
 #include <PLib_JacobiPolynomial.hxx>
-#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
diff --git a/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx b/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx
index ae76e172e8..3394a2cd42 100644
--- a/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx
+++ b/src/AdvApprox/AdvApprox_EvaluatorFunction.hxx
@@ -17,8 +17,6 @@
 #ifndef _AdvApprox_EvaluatorFunction_HeaderFile
 #define _AdvApprox_EvaluatorFunction_HeaderFile
 
-#include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_PrimitiveTypes.hxx>
 
 // abv 01.04.2009: the C function pointer converted to a virtual class
diff --git a/src/AdvApprox/AdvApprox_PrefAndRec.hxx b/src/AdvApprox/AdvApprox_PrefAndRec.hxx
index 4fcf49116e..baf0aebc39 100644
--- a/src/AdvApprox/AdvApprox_PrefAndRec.hxx
+++ b/src/AdvApprox/AdvApprox_PrefAndRec.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Real.hxx>
 #include <AdvApprox_Cutting.hxx>
 #include <Standard_Boolean.hxx>
 
diff --git a/src/AdvApprox/AdvApprox_PrefCutting.hxx b/src/AdvApprox/AdvApprox_PrefCutting.hxx
index 05285725de..de5661820a 100644
--- a/src/AdvApprox/AdvApprox_PrefCutting.hxx
+++ b/src/AdvApprox/AdvApprox_PrefCutting.hxx
@@ -24,8 +24,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <AdvApprox_Cutting.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
-
 
 
 //! inherits class Cutting; contains a list of preferential points (di)i
diff --git a/src/AdvApprox/AdvApprox_SimpleApprox.cxx b/src/AdvApprox/AdvApprox_SimpleApprox.cxx
index 7bf1be3835..6ffcec798b 100644
--- a/src/AdvApprox/AdvApprox_SimpleApprox.cxx
+++ b/src/AdvApprox/AdvApprox_SimpleApprox.cxx
@@ -22,10 +22,8 @@
 #include <PLib.hxx>
 #include <PLib_JacobiPolynomial.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array2OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
diff --git a/src/AdvApprox/AdvApprox_SimpleApprox.hxx b/src/AdvApprox/AdvApprox_SimpleApprox.hxx
index 629c1b7685..757db18ef7 100644
--- a/src/AdvApprox/AdvApprox_SimpleApprox.hxx
+++ b/src/AdvApprox/AdvApprox_SimpleApprox.hxx
@@ -25,12 +25,10 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 #include <Standard_Address.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <AdvApprox_EvaluatorFunction.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 class PLib_JacobiPolynomial;
 
diff --git a/src/AppBlend/AppBlend_Approx.cxx b/src/AppBlend/AppBlend_Approx.cxx
index 386c4589d7..d71db43360 100644
--- a/src/AppBlend/AppBlend_Approx.cxx
+++ b/src/AppBlend/AppBlend_Approx.cxx
@@ -16,9 +16,6 @@
 
 
 #include <AppBlend_Approx.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
 
 //=======================================================================
 //function : AppBlend_Approx
diff --git a/src/AppBlend/AppBlend_Approx.hxx b/src/AppBlend/AppBlend_Approx.hxx
index 098d269b42..5797cd8f43 100644
--- a/src/AppBlend/AppBlend_Approx.hxx
+++ b/src/AppBlend/AppBlend_Approx.hxx
@@ -22,13 +22,11 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array2OfReal.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <Standard_Real.hxx>
 
 
 //! Bspline approximation of a surface.
diff --git a/src/AppCont/AppCont_ContMatrices.hxx b/src/AppCont/AppCont_ContMatrices.hxx
index b4a51a1138..c136b9459d 100644
--- a/src/AppCont/AppCont_ContMatrices.hxx
+++ b/src/AppCont/AppCont_ContMatrices.hxx
@@ -15,7 +15,6 @@
 #ifndef AppCont_ContMatrices_HeaderFile
 #define AppCont_ContMatrices_HeaderFile
 #include <math_Vector.hxx>
-#include <Standard_Real.hxx>
 
 // Stockage des matrices de resolution d approxiamtion continue.
 // La classe est limitee a 26 pour MMatrix et InvMMatrix, (pas de contraintes)
diff --git a/src/AppCont/AppCont_LeastSquare.cxx b/src/AppCont/AppCont_LeastSquare.cxx
index aca869e65a..01acce62da 100644
--- a/src/AppCont/AppCont_LeastSquare.cxx
+++ b/src/AppCont/AppCont_LeastSquare.cxx
@@ -24,7 +24,6 @@
 #include <AppParCurves_MultiPoint.hxx>
 #include <AppCont_ContMatrices.hxx>
 #include <PLib.hxx>
-#include <Precision.hxx>
 
 
 //=======================================================================
diff --git a/src/AppCont/AppCont_LeastSquare.hxx b/src/AppCont/AppCont_LeastSquare.hxx
index c71ad2af75..51300f2903 100644
--- a/src/AppCont/AppCont_LeastSquare.hxx
+++ b/src/AppCont/AppCont_LeastSquare.hxx
@@ -19,7 +19,6 @@
 
 #include <AppCont_Function.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <math_Vector.hxx>
 #include <math_Matrix.hxx>
 #include <NCollection_Array1.hxx>
 #include <AppParCurves_Constraint.hxx>
diff --git a/src/AppDef/AppDef_BSpGradient_BFGSOfMyBSplGradientOfBSplineCompute.hxx b/src/AppDef/AppDef_BSpGradient_BFGSOfMyBSplGradientOfBSplineCompute.hxx
index 7b54be12d1..f8549c0fd8 100644
--- a/src/AppDef/AppDef_BSpGradient_BFGSOfMyBSplGradientOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_BSpGradient_BFGSOfMyBSplGradientOfBSplineCompute.hxx
@@ -21,11 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <math_BFGS.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class AppDef_MultiLine;
 class AppDef_MyLineTool;
 class AppDef_MyBSplGradientOfBSplineCompute;
diff --git a/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute.hxx b/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute.hxx
index 5e425c210b..0a7ff5db39 100644
--- a/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <AppDef_MultiLine.hxx>
-#include <AppParCurves_MultiBSpCurve.hxx>
 #include <Standard_Integer.hxx>
-#include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <math_Matrix.hxx>
 #include <AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
diff --git a/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx b/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx
index 53d81b0647..1c2bd3d1d4 100644
--- a/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx
@@ -28,9 +28,7 @@
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
 #include <math_IntegerVector.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 class StdFail_NotDone;
diff --git a/src/AppDef/AppDef_BSplineCompute.hxx b/src/AppDef/AppDef_BSplineCompute.hxx
index 9965d783f7..06d5e0620e 100644
--- a/src/AppDef/AppDef_BSplineCompute.hxx
+++ b/src/AppDef/AppDef_BSplineCompute.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <AppParCurves_MultiBSpCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Approx_ParametrizationType.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
diff --git a/src/AppDef/AppDef_Compute.hxx b/src/AppDef/AppDef_Compute.hxx
index 29fe92bc18..2dd4b06d62 100644
--- a/src/AppDef/AppDef_Compute.hxx
+++ b/src/AppDef/AppDef_Compute.hxx
@@ -24,14 +24,12 @@
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 #include <AppParCurves_MultiCurve.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Approx_ParametrizationType.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Approx_SequenceOfHArray1OfReal.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <AppParCurves_Constraint.hxx>
 #include <math_Vector.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx
index 0628b2115c..c3b011b8e4 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx
@@ -21,11 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <math_BFGS.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class AppDef_MultiLine;
 class AppDef_MyLineTool;
 class AppDef_MyGradientOfCompute;
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx
index f9442d93d2..4f45e380d3 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx
@@ -21,11 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <math_BFGS.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class AppDef_MultiLine;
 class AppDef_MyLineTool;
 class AppDef_MyGradientbisOfBSplineCompute;
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfTheGradient.hxx b/src/AppDef/AppDef_Gradient_BFGSOfTheGradient.hxx
index 45476317be..dda9a709d6 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfTheGradient.hxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfTheGradient.hxx
@@ -21,11 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <math_BFGS.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class AppDef_MultiLine;
 class AppDef_MyLineTool;
 class AppDef_TheGradient;
diff --git a/src/AppDef/AppDef_LinearCriteria.cxx b/src/AppDef/AppDef_LinearCriteria.cxx
index e42e5b16d3..ae23fb5090 100644
--- a/src/AppDef/AppDef_LinearCriteria.cxx
+++ b/src/AppDef/AppDef_LinearCriteria.cxx
@@ -19,7 +19,6 @@
 #include <AppDef_MultiLine.hxx>
 #include <AppDef_MyLineTool.hxx>
 #include <FEmTool_Curve.hxx>
-#include <FEmTool_ElementaryCriterion.hxx>
 #include <FEmTool_LinearFlexion.hxx>
 #include <FEmTool_LinearJerk.hxx>
 #include <FEmTool_LinearTension.hxx>
@@ -28,11 +27,8 @@
 #include <gp_Pnt2d.hxx>
 #include <math_Gauss.hxx>
 #include <math_Matrix.hxx>
-#include <PLib_Base.hxx>
 #include <PLib_HermitJacobi.hxx>
-#include <PLib_JacobiPolynomial.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
diff --git a/src/AppDef/AppDef_LinearCriteria.hxx b/src/AppDef/AppDef_LinearCriteria.hxx
index d3e95ce033..7c7d2938b6 100644
--- a/src/AppDef/AppDef_LinearCriteria.hxx
+++ b/src/AppDef/AppDef_LinearCriteria.hxx
@@ -18,12 +18,9 @@
 #define _AppDef_LinearCriteria_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <AppDef_MultiLine.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <Standard_Real.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <Standard_Integer.hxx>
 #include <AppDef_SmoothCriterion.hxx>
 #include <FEmTool_HAssemblyTable.hxx>
diff --git a/src/AppDef/AppDef_MultiLine.cxx b/src/AppDef/AppDef_MultiLine.cxx
index f8715cd172..b53ea7db6d 100644
--- a/src/AppDef/AppDef_MultiLine.cxx
+++ b/src/AppDef/AppDef_MultiLine.cxx
@@ -18,7 +18,6 @@
 #include <AppDef_MultiLine.hxx>
 #include <AppDef_MultiPointConstraint.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_OutOfRange.hxx>
 
 AppDef_MultiLine::AppDef_MultiLine(){}
diff --git a/src/AppDef/AppDef_MultiLine.hxx b/src/AppDef/AppDef_MultiLine.hxx
index 595fc6f9ce..737a73f215 100644
--- a/src/AppDef/AppDef_MultiLine.hxx
+++ b/src/AppDef/AppDef_MultiLine.hxx
@@ -26,7 +26,6 @@
 #include <AppDef_Array1OfMultiPointConstraint.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 class AppDef_MultiPointConstraint;
 
diff --git a/src/AppDef/AppDef_MultiPointConstraint.cxx b/src/AppDef/AppDef_MultiPointConstraint.cxx
index a5f8530059..b35ba67def 100644
--- a/src/AppDef/AppDef_MultiPointConstraint.cxx
+++ b/src/AppDef/AppDef_MultiPointConstraint.cxx
@@ -18,12 +18,9 @@
 #include <AppDef_MultiPointConstraint.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <Standard_Transient.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColgp_HArray1OfVec.hxx>
 #include <TColgp_HArray1OfVec2d.hxx>
 
diff --git a/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute.hxx b/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute.hxx
index cf59263e93..aa0392ed8f 100644
--- a/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute.hxx
@@ -24,7 +24,6 @@
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/AppDef/AppDef_MyGradientOfCompute.hxx b/src/AppDef/AppDef_MyGradientOfCompute.hxx
index 88815d6804..f1b3a67a1f 100644
--- a/src/AppDef/AppDef_MyGradientOfCompute.hxx
+++ b/src/AppDef/AppDef_MyGradientOfCompute.hxx
@@ -24,7 +24,6 @@
 #include <AppParCurves_MultiCurve.hxx>
 #include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 class Standard_OutOfRange;
diff --git a/src/AppDef/AppDef_MyGradientbisOfBSplineCompute.hxx b/src/AppDef/AppDef_MyGradientbisOfBSplineCompute.hxx
index 2606608423..0a5ccfe93a 100644
--- a/src/AppDef/AppDef_MyGradientbisOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_MyGradientbisOfBSplineCompute.hxx
@@ -24,7 +24,6 @@
 #include <AppParCurves_MultiCurve.hxx>
 #include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 class Standard_OutOfRange;
diff --git a/src/AppDef/AppDef_MyLineTool.hxx b/src/AppDef/AppDef_MyLineTool.hxx
index c6e9ce4b20..c9ae70021a 100644
--- a/src/AppDef/AppDef_MyLineTool.hxx
+++ b/src/AppDef/AppDef_MyLineTool.hxx
@@ -19,12 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfVec.hxx>
 #include <TColgp_Array1OfVec2d.hxx>
 #include <Approx_Status.hxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute.hxx b/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute.hxx
index 4363971d9c..0e44666978 100644
--- a/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute.hxx
+++ b/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <AppDef_MultiLine.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <Standard_Integer.hxx>
-#include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <math_Matrix.hxx>
 #include <AppDef_ParLeastSquareOfMyGradientOfCompute.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute.hxx b/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute.hxx
index 5a7686b611..d608f7ed45 100644
--- a/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <AppDef_MultiLine.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <Standard_Integer.hxx>
-#include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <math_Matrix.hxx>
 #include <AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfTheGradient.hxx b/src/AppDef/AppDef_ParFunctionOfTheGradient.hxx
index 1c732a84eb..72d561df27 100644
--- a/src/AppDef/AppDef_ParFunctionOfTheGradient.hxx
+++ b/src/AppDef/AppDef_ParFunctionOfTheGradient.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <AppDef_MultiLine.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <Standard_Integer.hxx>
-#include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <math_Matrix.hxx>
 #include <AppDef_ParLeastSquareOfTheGradient.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
diff --git a/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute.hxx b/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute.hxx
index cab5b55aa9..336499edc6 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute.hxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute.hxx
@@ -30,7 +30,6 @@
 #include <math_IntegerVector.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 class StdFail_NotDone;
diff --git a/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx b/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx
index 4c6ec7636e..463cabc9eb 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx
@@ -30,7 +30,6 @@
 #include <math_IntegerVector.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 class StdFail_NotDone;
diff --git a/src/AppDef/AppDef_ParLeastSquareOfTheGradient.hxx b/src/AppDef/AppDef_ParLeastSquareOfTheGradient.hxx
index 37c1704473..1f1bb56d69 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfTheGradient.hxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfTheGradient.hxx
@@ -30,7 +30,6 @@
 #include <math_IntegerVector.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 class StdFail_NotDone;
diff --git a/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute.hxx b/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute.hxx
index 1746bb4c3b..75dfb16d47 100644
--- a/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute.hxx
+++ b/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
diff --git a/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx b/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx
index 064a5efc99..8c5b484a17 100644
--- a/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx
+++ b/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
diff --git a/src/AppDef/AppDef_ResConstraintOfTheGradient.hxx b/src/AppDef/AppDef_ResConstraintOfTheGradient.hxx
index 67fef3b891..fa6aac6842 100644
--- a/src/AppDef/AppDef_ResConstraintOfTheGradient.hxx
+++ b/src/AppDef/AppDef_ResConstraintOfTheGradient.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
diff --git a/src/AppDef/AppDef_SmoothCriterion.cxx b/src/AppDef/AppDef_SmoothCriterion.cxx
index aa29bdad1e..e4dce5b7b2 100644
--- a/src/AppDef/AppDef_SmoothCriterion.cxx
+++ b/src/AppDef/AppDef_SmoothCriterion.cxx
@@ -18,8 +18,6 @@
 #include <AppDef_SmoothCriterion.hxx>
 #include <FEmTool_Curve.hxx>
 #include <math_Matrix.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(AppDef_SmoothCriterion,Standard_Transient)
\ No newline at end of file
diff --git a/src/AppDef/AppDef_SmoothCriterion.hxx b/src/AppDef/AppDef_SmoothCriterion.hxx
index a1b2b60ea0..b1a836526f 100644
--- a/src/AppDef/AppDef_SmoothCriterion.hxx
+++ b/src/AppDef/AppDef_SmoothCriterion.hxx
@@ -18,7 +18,6 @@
 #define _AppDef_SmoothCriterion_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
 #include <TColStd_HArray1OfReal.hxx>
diff --git a/src/AppDef/AppDef_TheFunction.hxx b/src/AppDef/AppDef_TheFunction.hxx
index 48c1284b62..fb7652829f 100644
--- a/src/AppDef/AppDef_TheFunction.hxx
+++ b/src/AppDef/AppDef_TheFunction.hxx
@@ -21,13 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <AppDef_MultiLine.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <Standard_Integer.hxx>
-#include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <math_Matrix.hxx>
 #include <AppDef_TheLeastSquares.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
diff --git a/src/AppDef/AppDef_TheGradient.hxx b/src/AppDef/AppDef_TheGradient.hxx
index a7d2520eac..b37925d40c 100644
--- a/src/AppDef/AppDef_TheGradient.hxx
+++ b/src/AppDef/AppDef_TheGradient.hxx
@@ -24,7 +24,6 @@
 #include <AppParCurves_MultiCurve.hxx>
 #include <math_Vector.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 class Standard_OutOfRange;
diff --git a/src/AppDef/AppDef_TheLeastSquares.hxx b/src/AppDef/AppDef_TheLeastSquares.hxx
index 6570f299f8..7c10ee2ba6 100644
--- a/src/AppDef/AppDef_TheLeastSquares.hxx
+++ b/src/AppDef/AppDef_TheLeastSquares.hxx
@@ -30,7 +30,6 @@
 #include <math_IntegerVector.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 class StdFail_NotDone;
diff --git a/src/AppDef/AppDef_TheResol.hxx b/src/AppDef/AppDef_TheResol.hxx
index 51f60bb1a8..93b13ddadc 100644
--- a/src/AppDef/AppDef_TheResol.hxx
+++ b/src/AppDef/AppDef_TheResol.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>
diff --git a/src/AppDef/AppDef_Variational.cxx b/src/AppDef/AppDef_Variational.cxx
index facdb75e9e..b4604d0e35 100644
--- a/src/AppDef/AppDef_Variational.cxx
+++ b/src/AppDef/AppDef_Variational.cxx
@@ -18,19 +18,10 @@
 // avec criteres variationnels
 
 #include <AppDef_MultiLine.hxx>
-#include <AppDef_SmoothCriterion.hxx>
 #include <AppDef_Variational.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
-#include <FEmTool_Assembly.hxx>
-#include <FEmTool_Curve.hxx>
-#include <gp_VectorWithNullMagnitude.hxx>
-#include <math_Matrix.hxx>
-#include <PLib_Base.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <StdFail_NotDone.hxx>
 
 #define No_Standard_RangeError
 #define No_Standard_OutOfRange
@@ -44,7 +35,6 @@
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
 #include <AppParCurves_Array1OfMultiPoint.hxx>
 #include <AppParCurves_MultiPoint.hxx>
-#include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppDef_LinearCriteria.hxx>
 #include <Convert_CompPolynomialToPoles.hxx>
 #include <gp_Pnt.hxx>
@@ -55,27 +45,19 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfVec.hxx>
 #include <TColgp_Array1OfVec2d.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 #include <StdFail_NotDone.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Precision.hxx>
 #include <AppDef_MyLineTool.hxx>
 
 #include <TColStd_HArray2OfInteger.hxx>
-#include <TColStd_Array2OfInteger.hxx>
 #include <TColStd_Array2OfReal.hxx>
 #include <FEmTool_Assembly.hxx>
-#include <FEmTool_AssemblyTable.hxx>
 #include <FEmTool_Curve.hxx>
-#include <math_Matrix.hxx>
 #include <math_Vector.hxx>
-#include <PLib_Base.hxx>
-#include <PLib_JacobiPolynomial.hxx>
 #include <PLib_HermitJacobi.hxx>
 #include <FEmTool_HAssemblyTable.hxx>
 
@@ -84,7 +66,6 @@
 
 #if defined(_MSC_VER)
 # include <stdio.h>
-# include <stdarg.h>
 #endif  /* _MSC_VER */
 
 //
diff --git a/src/AppDef/AppDef_Variational.hxx b/src/AppDef/AppDef_Variational.hxx
index d9069f1e15..3e2c7465de 100644
--- a/src/AppDef/AppDef_Variational.hxx
+++ b/src/AppDef/AppDef_Variational.hxx
@@ -23,12 +23,8 @@
 
 #include <AppDef_MultiLine.hxx>
 #include <Standard_Integer.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <AppParCurves_HArray1OfConstraintCouple.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <Standard_OStream.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/AppParCurves/AppParCurves.cxx b/src/AppParCurves/AppParCurves.cxx
index f60c640e3a..94c9c18dd1 100644
--- a/src/AppParCurves/AppParCurves.cxx
+++ b/src/AppParCurves/AppParCurves.cxx
@@ -18,8 +18,6 @@
 
 #include <AppParCurves.hxx>
 #include <BSplCLib.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Vec2d.hxx>
 #include <math_Matrix.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/AppParCurves/AppParCurves.hxx b/src/AppParCurves/AppParCurves.hxx
index 3902ecb321..1453a6f582 100644
--- a/src/AppParCurves/AppParCurves.hxx
+++ b/src/AppParCurves/AppParCurves.hxx
@@ -21,9 +21,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <math_Vector.hxx>
-#include <Standard_Real.hxx>
 #include <math_IntegerVector.hxx>
 class math_Matrix;
 
diff --git a/src/AppParCurves/AppParCurves_ConstraintCouple.hxx b/src/AppParCurves/AppParCurves_ConstraintCouple.hxx
index 2d796a1622..911911ee74 100644
--- a/src/AppParCurves/AppParCurves_ConstraintCouple.hxx
+++ b/src/AppParCurves/AppParCurves_ConstraintCouple.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <AppParCurves_Constraint.hxx>
 
 
diff --git a/src/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx b/src/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
index c3012be013..d602cd4a0e 100644
--- a/src/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
+++ b/src/AppParCurves/AppParCurves_HArray1OfConstraintCouple.hxx
@@ -17,7 +17,6 @@
 #ifndef AppParCurves_HArray1OfConstraintCouple_HeaderFile
 #define AppParCurves_HArray1OfConstraintCouple_HeaderFile
 
-#include <AppParCurves_ConstraintCouple.hxx>
 #include <AppParCurves_Array1OfConstraintCouple.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx b/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx
index c42a8428ad..ed0a35993a 100644
--- a/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx
+++ b/src/AppParCurves/AppParCurves_MultiBSpCurve.cxx
@@ -21,8 +21,6 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
diff --git a/src/AppParCurves/AppParCurves_MultiBSpCurve.hxx b/src/AppParCurves/AppParCurves_MultiBSpCurve.hxx
index b1f5a8573a..ce7d30df15 100644
--- a/src/AppParCurves/AppParCurves_MultiBSpCurve.hxx
+++ b/src/AppParCurves/AppParCurves_MultiBSpCurve.hxx
@@ -28,7 +28,6 @@
 #include <AppParCurves_Array1OfMultiPoint.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_OStream.hxx>
 class gp_Pnt;
 class gp_Pnt2d;
diff --git a/src/AppParCurves/AppParCurves_MultiCurve.cxx b/src/AppParCurves/AppParCurves_MultiCurve.cxx
index 8228a96b05..e9fd509252 100644
--- a/src/AppParCurves/AppParCurves_MultiCurve.cxx
+++ b/src/AppParCurves/AppParCurves_MultiCurve.cxx
@@ -20,9 +20,6 @@
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-#include <PLib.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
diff --git a/src/AppParCurves/AppParCurves_MultiPoint.cxx b/src/AppParCurves/AppParCurves_MultiPoint.cxx
index 67d667b97a..faf2c490d8 100644
--- a/src/AppParCurves/AppParCurves_MultiPoint.cxx
+++ b/src/AppParCurves/AppParCurves_MultiPoint.cxx
@@ -17,7 +17,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_DimensionError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <TColgp_HArray1OfPnt2d.hxx>
diff --git a/src/Approx/Approx_Curve3d.cxx b/src/Approx/Approx_Curve3d.cxx
index 830ef39610..ccbab07868 100644
--- a/src/Approx/Approx_Curve3d.cxx
+++ b/src/Approx/Approx_Curve3d.cxx
@@ -24,8 +24,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
diff --git a/src/Approx/Approx_CurveOnSurface.cxx b/src/Approx/Approx_CurveOnSurface.cxx
index bf3d1b05dd..1899d0eb82 100644
--- a/src/Approx/Approx_CurveOnSurface.cxx
+++ b/src/Approx/Approx_CurveOnSurface.cxx
@@ -17,7 +17,6 @@
 #include <Approx_CurveOnSurface.hxx>
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_HSurfaceTool.hxx>
@@ -28,7 +27,6 @@
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
@@ -39,7 +37,6 @@
 #include <gp_Vec.hxx>
 #include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/Approx/Approx_CurvilinearParameter.cxx b/src/Approx/Approx_CurvilinearParameter.cxx
index b5ca21c518..77ca7f8e2c 100644
--- a/src/Approx/Approx_CurvilinearParameter.cxx
+++ b/src/Approx/Approx_CurvilinearParameter.cxx
@@ -18,13 +18,10 @@
 
 #include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_Curve.hxx>
-#include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <AdvApprox_ApproxAFunction.hxx>
 #include <AdvApprox_PrefAndRec.hxx>
 #include <Approx_CurvlinFunc.hxx>
-#include <CPnts_AbscissaPoint.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <GeomAbs_Shape.hxx>
@@ -33,11 +30,8 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
 #include <math_Vector.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/Approx/Approx_CurvlinFunc.cxx b/src/Approx/Approx_CurvlinFunc.cxx
index 9bb8c5a5a9..ba82388e95 100644
--- a/src/Approx/Approx_CurvlinFunc.cxx
+++ b/src/Approx/Approx_CurvlinFunc.cxx
@@ -22,9 +22,7 @@
 #include <Adaptor3d_Surface.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
 #include <GeomLib.hxx>
-#include <Precision.hxx>
 #include <Standard_ConstructionError.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_SequenceOfReal.hxx>
diff --git a/src/Approx/Approx_CurvlinFunc.hxx b/src/Approx/Approx_CurvlinFunc.hxx
index 6a9f6bd02d..c97e46146b 100644
--- a/src/Approx/Approx_CurvlinFunc.hxx
+++ b/src/Approx/Approx_CurvlinFunc.hxx
@@ -18,7 +18,6 @@
 #define _Approx_CurvlinFunc_HeaderFile
 
 #include <Adaptor2d_Curve2d.hxx>
-#include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/Approx/Approx_FitAndDivide.hxx b/src/Approx/Approx_FitAndDivide.hxx
index 70443fdeaa..f5a4b24f81 100644
--- a/src/Approx/Approx_FitAndDivide.hxx
+++ b/src/Approx/Approx_FitAndDivide.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <AppParCurves_Constraint.hxx>
 #include <AppCont_Function.hxx>
 class AppParCurves_MultiCurve;
diff --git a/src/Approx/Approx_FitAndDivide2d.hxx b/src/Approx/Approx_FitAndDivide2d.hxx
index 2a334ce597..e98a013e5d 100644
--- a/src/Approx/Approx_FitAndDivide2d.hxx
+++ b/src/Approx/Approx_FitAndDivide2d.hxx
@@ -19,14 +19,11 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <AppParCurves_Constraint.hxx>
 #include <AppCont_Function.hxx>
 class AppParCurves_MultiCurve;
diff --git a/src/Approx/Approx_HArray1OfGTrsf2d.hxx b/src/Approx/Approx_HArray1OfGTrsf2d.hxx
index af7da670a3..1938e310c2 100644
--- a/src/Approx/Approx_HArray1OfGTrsf2d.hxx
+++ b/src/Approx/Approx_HArray1OfGTrsf2d.hxx
@@ -17,7 +17,6 @@
 #ifndef Approx_HArray1OfGTrsf2d_HeaderFile
 #define Approx_HArray1OfGTrsf2d_HeaderFile
 
-#include <gp_GTrsf2d.hxx>
 #include <Approx_Array1OfGTrsf2d.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/Approx/Approx_MCurvesToBSpCurve.cxx b/src/Approx/Approx_MCurvesToBSpCurve.cxx
index ab324f7787..f929166f90 100644
--- a/src/Approx/Approx_MCurvesToBSpCurve.cxx
+++ b/src/Approx/Approx_MCurvesToBSpCurve.cxx
@@ -13,15 +13,11 @@
 // commercial license or contractual agreement.
 
 
-#include <AppParCurves_Array1OfMultiPoint.hxx>
-#include <AppParCurves_MultiBSpCurve.hxx>
-#include <AppParCurves_MultiCurve.hxx>
 #include <AppParCurves_MultiPoint.hxx>
 #include <Approx_MCurvesToBSpCurve.hxx>
 #include <BSplCLib.hxx>
 #include <Convert_CompBezierCurves2dToBSplineCurve2d.hxx>
 #include <Convert_CompBezierCurvesToBSplineCurve.hxx>
-#include <PLib.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/Approx/Approx_MCurvesToBSpCurve.hxx b/src/Approx/Approx_MCurvesToBSpCurve.hxx
index a1875efadd..294e4bf607 100644
--- a/src/Approx/Approx_MCurvesToBSpCurve.hxx
+++ b/src/Approx/Approx_MCurvesToBSpCurve.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <AppParCurves_MultiBSpCurve.hxx>
-#include <Standard_Boolean.hxx>
 #include <AppParCurves_SequenceOfMultiCurve.hxx>
 class AppParCurves_MultiCurve;
 
diff --git a/src/Approx/Approx_SameParameter.cxx b/src/Approx/Approx_SameParameter.cxx
index b4c282710b..5e9c451d85 100644
--- a/src/Approx/Approx_SameParameter.cxx
+++ b/src/Approx/Approx_SameParameter.cxx
@@ -20,22 +20,15 @@
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_Surface.hxx>
-#include <AdvApprox_ApproxAFunction.hxx>
-#include <BSplCLib.hxx>
 #include <Extrema_ExtPC.hxx>
 #include <Extrema_LocateExtPC.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomLib_MakeCurvefromApprox.hxx>
 #include <Precision.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <Geom2dAdaptor.hxx>
 
diff --git a/src/Approx/Approx_SweepApproximation.cxx b/src/Approx/Approx_SweepApproximation.cxx
index b5cc429a78..5e136d2fc9 100644
--- a/src/Approx/Approx_SweepApproximation.cxx
+++ b/src/Approx/Approx_SweepApproximation.cxx
@@ -16,7 +16,6 @@
 
 
 #include <AdvApprox_ApproxAFunction.hxx>
-#include <AdvApprox_Cutting.hxx>
 #include <AdvApprox_DichoCutting.hxx>
 #include <AdvApprox_PrefAndRec.hxx>
 #include <Approx_SweepApproximation.hxx>
@@ -24,12 +23,8 @@
 #include <BSplCLib.hxx>
 #include <gp_XYZ.hxx>
 #include <Standard_DomainError.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>
-#include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_Array1OfVec.hxx>
-#include <TColgp_Array1OfVec2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 //=======================================================================
diff --git a/src/Approx/Approx_SweepApproximation.hxx b/src/Approx/Approx_SweepApproximation.hxx
index 7b67b0380f..bc37483456 100644
--- a/src/Approx/Approx_SweepApproximation.hxx
+++ b/src/Approx/Approx_SweepApproximation.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColgp_HArray2OfPnt.hxx>
 #include <TColStd_HArray2OfReal.hxx>
@@ -34,7 +33,6 @@
 #include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColgp_HArray1OfVec.hxx>
 #include <TColgp_HArray1OfVec2d.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <AdvApprox_EvaluatorFunction.hxx>
 #include <TColgp_Array2OfPnt.hxx>
diff --git a/src/Approx/Approx_SweepFunction.cxx b/src/Approx/Approx_SweepFunction.cxx
index d8caf9b9bb..66dba62da3 100644
--- a/src/Approx/Approx_SweepFunction.cxx
+++ b/src/Approx/Approx_SweepFunction.cxx
@@ -18,7 +18,6 @@
 #include <Approx_SweepFunction.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_NotImplemented.hxx>
-#include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Approx_SweepFunction,Standard_Transient)
diff --git a/src/Approx/Approx_SweepFunction.hxx b/src/Approx/Approx_SweepFunction.hxx
index 52eddb118b..56c0334bc4 100644
--- a/src/Approx/Approx_SweepFunction.hxx
+++ b/src/Approx/Approx_SweepFunction.hxx
@@ -18,10 +18,8 @@
 #define _Approx_SweepFunction_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
diff --git a/tools/View/View_Widget.cxx b/tools/View/View_Widget.cxx
index 6954e56654..a9b7406d25 100644
--- a/tools/View/View_Widget.cxx
+++ b/tools/View/View_Widget.cxx
@@ -19,6 +19,7 @@
 
 #include <inspector/View_Widget.hxx>
 
+#include <AIS_DisplayMode.hxx>
 #include <AIS_ViewController.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Graphic3d_GraphicDriver.hxx>