diff --git a/src/Graphic3d/Graphic3d_PolygonOffset.hxx b/src/Graphic3d/Graphic3d_PolygonOffset.hxx
index 2b3c97b651..4e0f784844 100644
--- a/src/Graphic3d/Graphic3d_PolygonOffset.hxx
+++ b/src/Graphic3d/Graphic3d_PolygonOffset.hxx
@@ -16,6 +16,7 @@
 
 #include <Aspect_PolygonOffsetMode.hxx>
 #include <Standard_OStream.hxx>
+#include <Standard_Integer.hxx>
 
 //! Polygon offset parameters.
 struct Graphic3d_PolygonOffset
diff --git a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
index 3cc5205d0a..080ffe77b5 100644
--- a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <STEPCAFControl_ActorWrite.hxx>
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx b/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
index c86837eb79..2d0946ca45 100644
--- a/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
@@ -17,7 +17,6 @@
 #define _STEPCAFControl_ActorWrite_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Boolean.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_Controller.hxx b/src/STEPCAFControl/STEPCAFControl_Controller.hxx
index bf5e782e6a..24cada7f3e 100644
--- a/src/STEPCAFControl/STEPCAFControl_Controller.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_Controller.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <STEPControl_Controller.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class STEPCAFControl_Controller;
diff --git a/src/STEPCAFControl/STEPCAFControl_DataMapOfLabelShape.hxx b/src/STEPCAFControl/STEPCAFControl_DataMapOfLabelShape.hxx
index 54496ce928..22e1b2a81e 100644
--- a/src/STEPCAFControl/STEPCAFControl_DataMapOfLabelShape.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_DataMapOfLabelShape.hxx
@@ -16,7 +16,6 @@
 #ifndef STEPCAFControl_DataMapOfLabelShape_HeaderFile
 #define STEPCAFControl_DataMapOfLabelShape_HeaderFile
 
-#include <TDF_Label.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TDF_LabelMapHasher.hxx>
 #include <NCollection_DataMap.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_DataMapOfShapeSDR.hxx b/src/STEPCAFControl/STEPCAFControl_DataMapOfShapeSDR.hxx
index bf9c142eba..688d2db4cd 100644
--- a/src/STEPCAFControl/STEPCAFControl_DataMapOfShapeSDR.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_DataMapOfShapeSDR.hxx
@@ -16,7 +16,6 @@
 #ifndef STEPCAFControl_DataMapOfShapeSDR_HeaderFile
 #define STEPCAFControl_DataMapOfShapeSDR_HeaderFile
 
-#include <TopoDS_Shape.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 #include <NCollection_DataMap.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx b/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
index 3c3c827648..77fd51ded2 100644
--- a/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
@@ -14,9 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <STEPCAFControl_ExternFile.hxx>
-#include <TCollection_HAsciiString.hxx>
 #include <TDF_Label.hxx>
 #include <XSControl_WorkSession.hxx>
 
diff --git a/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx b/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
index 33c89d8e79..8533bccb00 100644
--- a/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
@@ -17,7 +17,6 @@
 #define _STEPCAFControl_ExternFile_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <IFSelect_ReturnStatus.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
index 2287cee59a..86da09c35a 100644
--- a/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_GDTProperty.cxx
@@ -21,7 +21,6 @@
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepGeom_CartesianPoint.hxx>
-#include <StepGeom_Direction.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
@@ -30,7 +29,6 @@
 #include <StepDimTol_StraightnessTolerance.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
-#include <StepVisual_CoordinatesList.hxx>
 #include <StepVisual_TessellatedCurveSet.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx b/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
index cb05d846fd..03631c61ca 100644
--- a/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_GDTProperty.hxx
@@ -20,16 +20,12 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <gp_Ax2.hxx>
 #include <STEPConstruct_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
-#include <StepBasic_Unit.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceModifier.hxx>
 #include <StepDimTol_GeometricToleranceType.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceModifier.hxx>
-#include <StepGeom_Axis2Placement3d.hxx>
 #include <StepRepr_CompoundRepresentationItem.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
 #include <XCAFDimTolObjects_DimensionModifiersSequence.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 753531b91a..300a0c1ce6 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -20,42 +20,32 @@
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Plane.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <StepData_StepModel.hxx>
 #include <HeaderSection_FileSchema.hxx>
 #include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
 #include <NCollection_DataMap.hxx>
 #include <OSD_Path.hxx>
-#include <Quantity_Color.hxx>
 #include <Quantity_ColorRGBA.hxx>
-#include <StepAP214_AppliedExternalIdentificationAssignment.hxx>
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
+#include <StepBasic_DocumentFile.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
-#include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
-#include <StepBasic_Unit.hxx>
-#include <StepBasic_DocumentFile.hxx>
 #include <StepData_GlobalFactors.hxx>
 #include <STEPCAFControl_Controller.hxx>
-#include <STEPCAFControl_DataMapIteratorOfDataMapOfShapePD.hxx>
 #include <STEPCAFControl_DataMapOfPDExternFile.hxx>
-#include <STEPCAFControl_DataMapOfSDRExternFile.hxx>
 #include <STEPCAFControl_DataMapOfShapePD.hxx>
 #include <STEPCAFControl_ExternFile.hxx>
 #include <STEPConstruct.hxx>
-#include <STEPConstruct_Assembly.hxx>
 #include <STEPConstruct_ExternRefs.hxx>
 #include <STEPConstruct_Styles.hxx>
 #include <STEPConstruct_Tool.hxx>
@@ -63,7 +53,6 @@
 #include <STEPConstruct_ValidationProps.hxx>
 #include <STEPControl_ActorRead.hxx>
 #include <STEPControl_Reader.hxx>
-#include <StepGeom_GeometricRepresentationItem.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
@@ -75,13 +64,11 @@
 #include <StepDimTol_DatumFeature.hxx>
 #include <StepDimTol_DatumReference.hxx>
 #include <StepDimTol_DatumReferenceElement.hxx>
-#include <StepDimTol_DatumReferenceCompartment.hxx>
 #include <StepDimTol_DatumSystem.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
-#include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
@@ -100,35 +87,20 @@
 #include <StepDimTol_ToleranceZone.hxx>
 #include <StepDimTol_ToleranceZoneForm.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
-#include <StepDimTol_GeometricToleranceWithModifiers.hxx>
-#include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
-#include <StepGeom_Axis2Placement3d.hxx>
-#include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
-#include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
 #include <StepGeom_Plane.hxx>
-#include <StepGeom_Polyline.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
-#include <StepRepr_AssemblyComponentUsage.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
-#include <StepRepr_CompoundRepresentationItem.hxx>
 #include <StepRepr_DerivedShapeAspect.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_MappedItem.hxx>
 #include <StepRepr_MeasureRepresentationItem.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <StepRepr_PropertyDefinitionRepresentation.hxx>
-#include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_RepresentationMap.hxx>
-#include <StepRepr_RepresentationRelationship.hxx>
-#include <StepRepr_RepresentedDefinition.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx>
 #include <StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx>
@@ -136,9 +108,7 @@
 #include <StepRepr_SequenceOfRepresentationItem.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepRepr_ShapeAspectDerivingRelationship.hxx>
-#include <StepRepr_CompositeShapeAspect.hxx>
 #include <StepRepr_AllAroundShapeAspect.hxx>
-#include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_ShapeAspectRelationship.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 #include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
@@ -146,31 +116,23 @@
 #include <StepRepr_FeatureForDatumTargetRelationship.hxx>
 #include <StepShape_AdvancedFace.hxx>
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
-#include <StepShape_AngleRelator.hxx>
 #include <StepShape_AngularSize.hxx>
 #include <StepShape_AngularLocation.hxx>
 #include <StepShape_ClosedShell.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
-#include <StepShape_ContextDependentShapeRepresentation.hxx>
-#include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepShape_DimensionalCharacteristicRepresentation.hxx>
 #include <StepShape_DimensionalSizeWithPath.hxx>
 #include <StepShape_DimensionalLocationWithPath.hxx>
-#include <StepShape_ShapeDimensionRepresentationItem.hxx>
 #include <StepShape_ShapeRepresentationWithParameters.hxx>
-#include <StepShape_HArray1OfShapeDimensionRepresentationItem.hxx>
 #include <StepShape_DimensionalSize.hxx>
 #include <StepShape_DimensionalLocation.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
-#include <StepShape_GeometricCurveSet.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_HArray1OfFace.hxx>
 #include <StepShape_HArray1OfFaceBound.hxx>
 #include <StepShape_HArray1OfOrientedEdge.hxx>
-#include <StepShape_HArray1OfShell.hxx>
-#include <StepShape_LimitsAndFits.hxx>
 #include <StepShape_Loop.hxx>
 #include <StepShape_ManifoldSolidBrep.hxx>
 #include <StepShape_PlusMinusTolerance.hxx>
@@ -186,21 +148,16 @@
 #include <StepShape_ValueFormatTypeQualifier.hxx>
 #include <StepShape_Vertex.hxx>
 #include <StepToGeom.hxx>
-#include <StepVisual_AnnotationCurveOccurrence.hxx>
-#include <StepVisual_AnnotationFillArea.hxx>
 #include <StepVisual_AnnotationPlane.hxx>
-#include <StepVisual_CameraModelD3.hxx>
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
-#include <StepVisual_CoordinatesList.hxx>
 #include <StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx>
 #include <StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx>
 #include <StepVisual_DraughtingCallout.hxx>
 #include <StepVisual_DraughtingCalloutElement.hxx>
 #include <StepVisual_DraughtingModel.hxx>
 #include <StepVisual_Invisibility.hxx>
-#include <StepVisual_LayeredItem.hxx>
 #include <StepVisual_PlanarBox.hxx>
 #include <StepVisual_PresentationLayerAssignment.hxx>
 #include <StepVisual_PresentationStyleByContext.hxx>
@@ -212,32 +169,24 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray1OfTransient.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
-#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
-#include <TColStd_MapIteratorOfMapOfTransient.hxx>
 #include <TColStd_MapOfTransient.hxx>
 #include <TColStd_SequenceOfHAsciiString.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_TreeNode.hxx>
-#include <TDataStd_UAttribute.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
-#include <TNaming_NamedShape.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_TransientProcess.hxx>
 #include <TransferBRep.hxx>
 #include <UnitsMethods.hxx>
-#include <XCAFDoc.hxx>
 #include <XCAFDoc_Area.hxx>
 #include <XCAFDoc_Centroid.hxx>
 #include <XCAFDoc_ClippingPlaneTool.hxx>
@@ -255,8 +204,6 @@
 #include <XCAFDoc_View.hxx>
 #include <XCAFDoc_ViewTool.hxx>
 #include <XCAFDoc_Volume.hxx>
-#include <XCAFDimTolObjects_DimensionModifiersSequence.hxx>
-#include <XCAFDimTolObjects_GeomToleranceType.hxx>
 #include <XCAFDimTolObjects_DimensionObject.hxx>
 #include <XCAFDimTolObjects_GeomToleranceObject.hxx>
 #include <XCAFDimTolObjects_DatumObject.hxx>
@@ -270,8 +217,6 @@
 #include <StepGeom_CartesianPoint.hxx>
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
-#include <StepVisual_TessellatedAnnotationOccurrence.hxx>
-#include <StepVisual_TessellatedItem.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
 #include <StepVisual_TessellatedCurveSet.hxx>
 #include <StepVisual_CoordinatesList.hxx>
@@ -279,7 +224,6 @@
 
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepTools.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
 #include <Bnd_Box.hxx>
 #include <BRepBndLib.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.hxx b/src/STEPCAFControl/STEPCAFControl_Reader.hxx
index 139df9cdab..35c7632c39 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.hxx
@@ -16,7 +16,6 @@
 #ifndef _STEPCAFControl_Reader_HeaderFile
 #define _STEPCAFControl_Reader_HeaderFile
 
-#include <Resource_FormatType.hxx>
 #include <STEPControl_Reader.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <TDF_LabelSequence.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index cf5b51d149..b5a617282a 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -32,7 +32,6 @@
 #include <Message_ProgressScope.hxx>
 #include <MoniTool_DataMapIteratorOfDataMapOfShapeTransient.hxx>
 #include <OSD_Path.hxx>
-#include <Quantity_TypeOfColor.hxx>
 #include <StepAP214_Protocol.hxx>
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
@@ -41,12 +40,10 @@
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_HArray1OfDerivedUnitElement.hxx>
-#include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
-#include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 #include <StepBasic_SiUnitAndMassUnit.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
@@ -54,8 +51,6 @@
 #include <STEPCAFControl_Controller.hxx>
 #include <STEPCAFControl_ExternFile.hxx>
 #include <STEPConstruct.hxx>
-#include <STEPConstruct_DataMapOfAsciiStringTransient.hxx>
-#include <STEPConstruct_DataMapOfPointTransient.hxx>
 #include <STEPConstruct_ExternRefs.hxx>
 #include <STEPCAFControl_GDTProperty.hxx>
 #include <STEPConstruct_Styles.hxx>
@@ -67,15 +62,11 @@
 #include <StepDimTol_CircularRunoutTolerance.hxx>
 #include <StepDimTol_CoaxialityTolerance.hxx>
 #include <StepDimTol_ConcentricityTolerance.hxx>
-#include <StepDimTol_CylindricityTolerance.hxx>
 #include <StepDimTol_Datum.hxx>
 #include <StepDimTol_DatumFeature.hxx>
 #include <StepDimTol_DatumReference.hxx>
-#include <StepDimTol_DatumReferenceElement.hxx>
 #include <StepDimTol_DatumSystem.hxx>
 #include <StepDimTol_DatumSystemOrReference.hxx>
-#include <StepDimTol_DatumTarget.hxx>
-#include <StepDimTol_FlatnessTolerance.hxx>
 #include <StepDimTol_GeometricToleranceType.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
@@ -89,17 +80,12 @@
 #include <StepDimTol_HArray1OfDatumReferenceElement.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceModifier.hxx>
 #include <StepDimTol_HArray1OfDatumSystemOrReference.hxx>
-#include <StepDimTol_LineProfileTolerance.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
-#include <StepDimTol_PositionTolerance.hxx>
-#include <StepDimTol_RoundnessTolerance.hxx>
 #include <StepDimTol_RunoutZoneDefinition.hxx>
 #include <StepDimTol_RunoutZoneOrientation.hxx>
-#include <StepDimTol_StraightnessTolerance.hxx>
-#include <StepDimTol_SurfaceProfileTolerance.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
 #include <StepDimTol_ToleranceZone.hxx>
 #include <StepDimTol_ToleranceZoneForm.hxx>
@@ -110,7 +96,6 @@
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
 #include <StepGeom_Plane.hxx>
-#include <StepGeom_Surface.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompositeShapeAspect.hxx>
 #include <StepRepr_ConstructiveGeometryRepresentation.hxx>
@@ -123,7 +108,6 @@
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <StepRepr_RepresentedDefinition.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnit.hxx>
@@ -136,12 +120,10 @@
 #include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
 #include <StepRepr_ValueRange.hxx>
 #include <StepShape_AdvancedFace.hxx>
-#include <StepShape_AngleRelator.hxx>
 #include <StepShape_AngularLocation.hxx>
 #include <StepShape_AngularSize.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
-#include <StepShape_DimensionalCharacteristic.hxx>
 #include <StepShape_DimensionalCharacteristicRepresentation.hxx>
 #include <StepShape_DimensionalLocation.hxx>
 #include <StepShape_DimensionalLocationWithPath.hxx>
@@ -165,8 +147,6 @@
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_DraughtingCallout.hxx>
 #include <StepVisual_DraughtingModel.hxx>
-#include <StepVisual_HArray1OfInvisibleItem.hxx>
-#include <StepVisual_HArray1OfLayeredItem.hxx>
 #include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
 #include <StepVisual_HArray1OfPresentationStyleSelect.hxx>
 #include <StepVisual_Invisibility.hxx>
@@ -185,25 +165,19 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <TColStd_HArray1OfTransient.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
 #include <TColStd_MapOfAsciiString.hxx>
 #include <TColStd_MapOfTransient.hxx>
 #include <TDataStd_Name.hxx>
 #include <TDataStd_TreeNode.hxx>
 #include <TDataStd_UAttribute.hxx>
-#include <TDF_AttributeSequence.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_LabelSequence.hxx>
-#include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopTools_MapOfShape.hxx>
-#include <TopTools_SequenceOfShape.hxx>
-#include <Transfer_ActorOfFinderProcess.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_FinderProcess.hxx>
 #include <Transfer_TransientListBinder.hxx>
@@ -230,16 +204,11 @@
 #include <XCAFDoc_GraphNode.hxx>
 #include <XCAFDoc_LengthUnit.hxx>
 #include <XCAFDoc_LayerTool.hxx>
-#include <XCAFDoc_Material.hxx>
 #include <XCAFDoc_MaterialTool.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 #include <XCAFDoc_Volume.hxx>
-#include <XCAFDoc_VisMaterial.hxx>
 #include <XCAFDoc_VisMaterialTool.hxx>
-#include <XCAFPrs.hxx>
-#include <XCAFPrs_DataMapIteratorOfDataMapOfStyleShape.hxx>
 #include <XCAFPrs_IndexedDataMapOfShapeStyle.hxx>
-#include <XCAFPrs_DataMapOfStyleShape.hxx>
 #include <XCAFPrs_Style.hxx>
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.hxx b/src/STEPCAFControl/STEPCAFControl_Writer.hxx
index 30ebc1179a..df6a4545d6 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.hxx
@@ -16,14 +16,12 @@
 #ifndef _STEPCAFControl_Writer_HeaderFile
 #define _STEPCAFControl_Writer_HeaderFile
 
-#include <IFSelect_ReturnStatus.hxx>
 #include <MoniTool_DataMapOfShapeTransient.hxx>
 #include <NCollection_Vector.hxx>
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 #include <STEPCAFControl_DataMapOfLabelShape.hxx>
 #include <STEPCAFControl_DataMapOfLabelExternFile.hxx>
-#include <STEPControl_StepModelType.hxx>
 #include <STEPControl_Writer.hxx>
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepDimTol_Datum.hxx>
diff --git a/src/STEPConstruct/STEPConstruct.cxx b/src/STEPConstruct/STEPConstruct.cxx
index da9eaaf169..91105053b4 100644
--- a/src/STEPConstruct/STEPConstruct.cxx
+++ b/src/STEPConstruct/STEPConstruct.cxx
@@ -22,9 +22,6 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
-#include <TopLoc_Location.hxx>
-#include <TopoDS_Shape.hxx>
-#include <Transfer_Binder.hxx>
 #include <Transfer_FinderProcess.hxx>
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_TransientProcess.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_AP203Context.cxx b/src/STEPConstruct/STEPConstruct_AP203Context.cxx
index bf25416ef9..47f470b90a 100644
--- a/src/STEPConstruct/STEPConstruct_AP203Context.cxx
+++ b/src/STEPConstruct/STEPConstruct_AP203Context.cxx
@@ -38,9 +38,7 @@
 #include <OSD_Process.hxx>
 #include <Quantity_Date.hxx>
 
-#include <TCollection_HAsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <Interface_HArray1OfHAsciiString.hxx>
 
 #include <StepBasic_CalendarDate.hxx>
 #include <StepBasic_LocalTime.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_Assembly.cxx b/src/STEPConstruct/STEPConstruct_Assembly.cxx
index 5bfbed9baa..b6e180155e 100644
--- a/src/STEPConstruct/STEPConstruct_Assembly.cxx
+++ b/src/STEPConstruct/STEPConstruct_Assembly.cxx
@@ -19,21 +19,12 @@
 #include <Interface_Graph.hxx>
 #include <Interface_InterfaceModel.hxx>
 #include <Standard_Transient.hxx>
-#include <StepBasic_ApplicationContext.hxx>
-#include <StepBasic_DesignContext.hxx>
-#include <StepBasic_HArray1OfProductContext.hxx>
-#include <StepBasic_MechanicalContext.hxx>
-#include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
 #include <STEPConstruct_Assembly.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
-#include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
 #include <StepRepr_Transformation.hxx>
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_Assembly.hxx b/src/STEPConstruct/STEPConstruct_Assembly.hxx
index 30e35922f9..4049c5c986 100644
--- a/src/STEPConstruct/STEPConstruct_Assembly.hxx
+++ b/src/STEPConstruct/STEPConstruct_Assembly.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 class StepShape_ShapeDefinitionRepresentation;
 class StepShape_ShapeRepresentation;
 class StepGeom_Axis2Placement3d;
diff --git a/src/STEPConstruct/STEPConstruct_ContextTool.cxx b/src/STEPConstruct/STEPConstruct_ContextTool.cxx
index 0b93e40b9e..873e91cf95 100644
--- a/src/STEPConstruct/STEPConstruct_ContextTool.cxx
+++ b/src/STEPConstruct/STEPConstruct_ContextTool.cxx
@@ -28,23 +28,14 @@
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
 #include <StepBasic_ApprovalDateTime.hxx>
 #include <StepBasic_ApprovalPersonOrganization.hxx>
-#include <StepBasic_HArray1OfProduct.hxx>
-#include <StepBasic_HArray1OfProductContext.hxx>
-#include <StepBasic_Product.hxx>
 #include <StepBasic_ProductCategoryRelationship.hxx>
-#include <StepBasic_ProductContext.hxx>
-#include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductRelatedProductCategory.hxx>
-#include <StepBasic_ProductType.hxx>
-#include <STEPConstruct_AP203Context.hxx>
 #include <STEPConstruct_Assembly.hxx>
 #include <STEPConstruct_ContextTool.hxx>
 #include <STEPConstruct_Part.hxx>
 #include <StepData_StepModel.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/STEPConstruct/STEPConstruct_ContextTool.hxx b/src/STEPConstruct/STEPConstruct_ContextTool.hxx
index 3f5da89e97..732a88aa11 100644
--- a/src/STEPConstruct/STEPConstruct_ContextTool.hxx
+++ b/src/STEPConstruct/STEPConstruct_ContextTool.hxx
@@ -23,7 +23,6 @@
 
 #include <TColStd_SequenceOfInteger.hxx>
 #include <STEPConstruct_AP203Context.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 class StepBasic_ApplicationProtocolDefinition;
diff --git a/src/STEPConstruct/STEPConstruct_DataMapOfAsciiStringTransient.hxx b/src/STEPConstruct/STEPConstruct_DataMapOfAsciiStringTransient.hxx
index 4578cb753c..d4b3fe232b 100644
--- a/src/STEPConstruct/STEPConstruct_DataMapOfAsciiStringTransient.hxx
+++ b/src/STEPConstruct/STEPConstruct_DataMapOfAsciiStringTransient.hxx
@@ -19,7 +19,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Transient.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <NCollection_DataMap.hxx>
 
 typedef NCollection_DataMap<TCollection_AsciiString,Handle(Standard_Transient),TCollection_AsciiString> STEPConstruct_DataMapOfAsciiStringTransient;
diff --git a/src/STEPConstruct/STEPConstruct_ExternRefs.cxx b/src/STEPConstruct/STEPConstruct_ExternRefs.cxx
index 78a469267b..c8624171d4 100644
--- a/src/STEPConstruct/STEPConstruct_ExternRefs.cxx
+++ b/src/STEPConstruct/STEPConstruct_ExternRefs.cxx
@@ -15,7 +15,6 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <StepAP203_ApprovedItem.hxx>
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepAP203_CcDesignDateAndTimeAssignment.hxx>
 #include <StepAP203_CcDesignPersonAndOrganizationAssignment.hxx>
@@ -31,20 +30,13 @@
 #include <StepAP214_HArray1OfExternalIdentificationItem.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
-#include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentFile.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
 #include <StepBasic_DocumentRepresentationType.hxx>
 #include <StepBasic_DocumentType.hxx>
 #include <StepBasic_ExternalSource.hxx>
-#include <StepBasic_HArray1OfDocument.hxx>
-#include <StepBasic_HArray1OfProduct.hxx>
-#include <StepBasic_HArray1OfProductContext.hxx>
 #include <StepBasic_IdentificationRole.hxx>
 #include <StepBasic_ObjectRole.hxx>
-#include <StepBasic_Product.hxx>
-#include <StepBasic_ProductContext.hxx>
-#include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
@@ -54,9 +46,7 @@
 #include <StepBasic_SourceItem.hxx>
 #include <STEPConstruct_ExternRefs.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_ExternRefs.hxx b/src/STEPConstruct/STEPConstruct_ExternRefs.hxx
index 0d759c3718..3a9ba665bc 100644
--- a/src/STEPConstruct/STEPConstruct_ExternRefs.hxx
+++ b/src/STEPConstruct/STEPConstruct_ExternRefs.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Handle.hxx>
 
 #include <TColStd_SequenceOfTransient.hxx>
-#include <TColStd_SequenceOfInteger.hxx>
 #include <STEPConstruct_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
 class StepBasic_ProductRelatedProductCategory;
diff --git a/src/STEPConstruct/STEPConstruct_Part.cxx b/src/STEPConstruct/STEPConstruct_Part.cxx
index 18b9ee1a42..73156f8057 100644
--- a/src/STEPConstruct/STEPConstruct_Part.cxx
+++ b/src/STEPConstruct/STEPConstruct_Part.cxx
@@ -19,16 +19,11 @@
 #include <Interface_Static.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_DesignContext.hxx>
-#include <StepBasic_HArray1OfProduct.hxx>
-#include <StepBasic_HArray1OfProductContext.hxx>
 #include <StepBasic_MechanicalContext.hxx>
-#include <StepBasic_Product.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
-#include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
-#include <StepBasic_ProductRelatedProductCategory.hxx>
 #include <StepBasic_ProductType.hxx>
 #include <STEPConstruct_Part.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_Part.hxx b/src/STEPConstruct/STEPConstruct_Part.hxx
index bf2cee7afa..534a375942 100644
--- a/src/STEPConstruct/STEPConstruct_Part.hxx
+++ b/src/STEPConstruct/STEPConstruct_Part.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 class StepShape_ShapeDefinitionRepresentation;
 class StepBasic_ProductRelatedProductCategory;
 class StepShape_ShapeRepresentation;
diff --git a/src/STEPConstruct/STEPConstruct_PointHasher.hxx b/src/STEPConstruct/STEPConstruct_PointHasher.hxx
index 9fa891b9fc..6713485624 100644
--- a/src/STEPConstruct/STEPConstruct_PointHasher.hxx
+++ b/src/STEPConstruct/STEPConstruct_PointHasher.hxx
@@ -18,10 +18,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class gp_Pnt;
 
 
diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx
index b57aa6e87e..71caf4ca0c 100644
--- a/src/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.cxx
@@ -16,10 +16,7 @@
 
 
 #include <APIHeaderSection_MakeHeader.hxx>
-#include <gp_Pnt.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_Graph.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Static.hxx>
 #include <Quantity_Color.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
@@ -27,10 +24,8 @@
 #include <STEPConstruct_Styles.hxx>
 #include <StepData_StepModel.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
-#include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_RepresentationRelationshipWithTransformation.hxx>
@@ -39,7 +34,6 @@
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
-#include <StepVisual_Colour.hxx>
 #include <StepVisual_ColourRgb.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_DraughtingModel.hxx>
@@ -49,9 +43,6 @@
 #include <StepVisual_FillAreaStyleColour.hxx>
 #include <StepVisual_FillStyleSelect.hxx>
 #include <StepVisual_HArray1OfFillStyleSelect.hxx>
-#include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
-#include <StepVisual_HArray1OfPresentationStyleSelect.hxx>
-#include <StepVisual_HArray1OfSurfaceStyleElementSelect.hxx>
 #include <StepVisual_Invisibility.hxx>
 #include <StepVisual_InvisibleItem.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx>
@@ -66,15 +57,12 @@
 #include <StepVisual_SurfaceStyleBoundary.hxx>
 #include <StepVisual_SurfaceStyleElementSelect.hxx>
 #include <StepVisual_SurfaceStyleFillArea.hxx>
-#include <StepVisual_SurfaceStyleRendering.hxx>
 #include <StepVisual_SurfaceStyleRenderingWithProperties.hxx>
 #include <StepVisual_RenderingPropertiesSelect.hxx>
 #include <StepVisual_SurfaceStyleTransparent.hxx>
 #include <StepVisual_SurfaceStyleUsage.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
-#include <TopoDS_Shape.hxx>
-#include <Transfer_Binder.hxx>
 #include <TransferBRep.hxx>
 #include <TransferBRep_ShapeMapper.hxx>
 #include <XSControl_TransferReader.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_Styles.hxx b/src/STEPConstruct/STEPConstruct_Styles.hxx
index bb2ed58671..722561d51f 100644
--- a/src/STEPConstruct/STEPConstruct_Styles.hxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.hxx
@@ -21,11 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <TColStd_IndexedDataMapOfTransientTransient.hxx>
-#include <TColStd_IndexedMapOfTransient.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 #include <STEPConstruct_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <STEPConstruct_DataMapOfAsciiStringTransient.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_Tool.cxx b/src/STEPConstruct/STEPConstruct_Tool.cxx
index 06f9bfcefc..4085a2ba05 100644
--- a/src/STEPConstruct/STEPConstruct_Tool.cxx
+++ b/src/STEPConstruct/STEPConstruct_Tool.cxx
@@ -14,12 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Graph.hxx>
-#include <Interface_HGraph.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <STEPConstruct_Tool.hxx>
-#include <Transfer_FinderProcess.hxx>
-#include <Transfer_TransientProcess.hxx>
 #include <XSControl_TransferReader.hxx>
 #include <XSControl_TransferWriter.hxx>
 #include <XSControl_WorkSession.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.cxx b/src/STEPConstruct/STEPConstruct_UnitContext.cxx
index cefb2f6f5b..665e80292a 100644
--- a/src/STEPConstruct/STEPConstruct_UnitContext.cxx
+++ b/src/STEPConstruct/STEPConstruct_UnitContext.cxx
@@ -18,32 +18,21 @@
 //abv 30.02.00: ability to write file in units other than MM
 
 #include <Interface_Static.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_HArray1OfNamedUnit.hxx>
-#include <StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
-#include <StepBasic_LengthUnit.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_NamedUnit.hxx>
-#include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
-#include <StepBasic_PlaneAngleUnit.hxx>
-#include <StepBasic_SiPrefix.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndAreaUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_SiUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_SiUnitAndVolumeUnit.hxx>
-#include <StepBasic_SolidAngleMeasureWithUnit.hxx>
-#include <StepBasic_SolidAngleUnit.hxx>
-#include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepData_GlobalFactors.hxx>
 #include <STEPConstruct_UnitContext.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.hxx b/src/STEPConstruct/STEPConstruct_UnitContext.hxx
index e1faad8f60..a656e27a2a 100644
--- a/src/STEPConstruct/STEPConstruct_UnitContext.hxx
+++ b/src/STEPConstruct/STEPConstruct_UnitContext.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
 #include <StepBasic_SiPrefix.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
index 2676a871e5..4b100b3a2e 100644
--- a/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
+++ b/src/STEPConstruct/STEPConstruct_ValidationProps.cxx
@@ -21,17 +21,12 @@
 #include <Interface_Macros.hxx>
 #include <Interface_Static.hxx>
 #include <Message.hxx>
-#include <Message_Messenger.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_HArray1OfDerivedUnitElement.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_SiUnitAndAreaUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
-#include <StepBasic_Unit.hxx>
-#include <STEPConstruct.hxx>
 #include <STEPConstruct_UnitContext.hxx>
 #include <STEPConstruct_ValidationProps.hxx>
 #include <StepData_StepModel.hxx>
@@ -39,26 +34,18 @@
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_MeasureRepresentationItem.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <StepRepr_PropertyDefinitionRepresentation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_RepresentationRelationship.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
-#include <StepShape_ContextDependentShapeRepresentation.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
 #include <TCollection_HAsciiString.hxx>
-#include <TopLoc_Location.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_Shape.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <TransferBRep.hxx>
diff --git a/src/STEPConstruct/STEPConstruct_ValidationProps.hxx b/src/STEPConstruct/STEPConstruct_ValidationProps.hxx
index 691a9dbd1b..b25b35eb80 100644
--- a/src/STEPConstruct/STEPConstruct_ValidationProps.hxx
+++ b/src/STEPConstruct/STEPConstruct_ValidationProps.hxx
@@ -23,9 +23,7 @@
 
 #include <StepBasic_Unit.hxx>
 #include <STEPConstruct_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 class StepBasic_ProductDefinition;
 class XSControl_WorkSession;
diff --git a/src/STEPControl/STEPControl_ActorRead.hxx b/src/STEPControl/STEPControl_ActorRead.hxx
index cebac50190..bdbf2d9433 100644
--- a/src/STEPControl/STEPControl_ActorRead.hxx
+++ b/src/STEPControl/STEPControl_ActorRead.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <StepToTopoDS_NMTool.hxx>
-#include <Standard_Real.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx
index a643dc84a3..69dc9db8a3 100644
--- a/src/STEPControl/STEPControl_ActorWrite.cxx
+++ b/src/STEPControl/STEPControl_ActorWrite.cxx
@@ -26,22 +26,16 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomToStep_MakeAxis2Placement3d.hxx>
-#include <gp_Ax2.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_MSG.hxx>
 #include <Interface_Static.hxx>
 #include <Message_ProgressScope.hxx>
-#include <MoniTool_DataMapOfShapeTransient.hxx>
-#include <OSD_Timer.hxx>
 #include <ShapeAnalysis_ShapeTolerance.hxx>
-#include <ShapeExtend_Explorer.hxx>
 #include <ShapeProcess_ShapeContext.hxx>
 #include <Standard_Type.hxx>
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
 #include <StepBasic_HArray1OfProduct.hxx>
-#include <STEPConstruct_AP203Context.hxx>
 #include <STEPConstruct_Assembly.hxx>
-#include <STEPConstruct_ContextTool.hxx>
 #include <STEPConstruct_Part.hxx>
 #include <STEPConstruct_UnitContext.hxx>
 #include <STEPControl_ActorWrite.hxx>
@@ -51,9 +45,6 @@
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
 #include <StepGeom_Point.hxx>
-#include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
-#include <StepRepr_PropertyDefinition.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
 #include <StepShape_BrepWithVoids.hxx>
@@ -70,7 +61,6 @@
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
 #include <StepShape_ShellBasedSurfaceModel.hxx>
-#include <StepShape_TopologicalRepresentationItem.hxx>
 #include <StepShape_VertexPoint.hxx>
 #include <StepVisual_TessellatedItem.hxx>
 #include <StepVisual_TessellatedShapeRepresentation.hxx>
@@ -84,7 +74,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
-#include <TopoDSToStep.hxx>
 #include <TopoDSToStep_FacetedTool.hxx>
 #include <TopoDSToStep_MakeBrepWithVoids.hxx>
 #include <TopoDSToStep_MakeFacetedBrep.hxx>
@@ -96,15 +85,12 @@
 #include <TopoDSToStep_Tool.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 #include <Transfer_Binder.hxx>
 #include <Transfer_Finder.hxx>
 #include <Transfer_FinderProcess.hxx>
 #include <Transfer_SequenceOfBinder.hxx>
 #include <Transfer_SimpleBinderOfTransient.hxx>
-#include <Transfer_TransientProcess.hxx>
 #include <TransferBRep.hxx>
 #include <TransferBRep_ShapeMapper.hxx>
 #include <UnitsMethods.hxx>
diff --git a/src/STEPControl/STEPControl_ActorWrite.hxx b/src/STEPControl/STEPControl_ActorWrite.hxx
index 513e2eab43..accdf962b8 100644
--- a/src/STEPControl/STEPControl_ActorWrite.hxx
+++ b/src/STEPControl/STEPControl_ActorWrite.hxx
@@ -21,10 +21,8 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <STEPConstruct_ContextTool.hxx>
 #include <Transfer_ActorOfFinderProcess.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 #include <STEPControl_StepModelType.hxx>
 class Transfer_Finder;
diff --git a/src/STEPControl/STEPControl_Controller.cxx b/src/STEPControl/STEPControl_Controller.cxx
index 23ed9294da..3e856b1666 100644
--- a/src/STEPControl/STEPControl_Controller.cxx
+++ b/src/STEPControl/STEPControl_Controller.cxx
@@ -16,13 +16,11 @@
 
 #include <APIHeaderSection_EditHeader.hxx>
 #include <APIHeaderSection_MakeHeader.hxx>
-#include <HeaderSection.hxx>
 #include <IFSelect_EditForm.hxx>
 #include <IFSelect_SelectModelRoots.hxx>
 #include <IFSelect_SelectSignature.hxx>
 #include <IFSelect_SignAncestor.hxx>
 #include <IFSelect_SignCounter.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_Static.hxx>
 #include <RWHeaderSection.hxx>
@@ -37,7 +35,6 @@
 #include <STEPEdit.hxx>
 #include <STEPEdit_EditContext.hxx>
 #include <STEPEdit_EditSDR.hxx>
-#include <StepSelect_StepType.hxx>
 #include <StepSelect_WorkLibrary.hxx>
 #include <STEPSelections_SelectAssembly.hxx>
 #include <STEPSelections_SelectDerived.hxx>
@@ -45,10 +42,8 @@
 #include <STEPSelections_SelectForTransfer.hxx>
 #include <STEPSelections_SelectGSCurves.hxx>
 #include <STEPSelections_SelectInstances.hxx>
-#include <TCollection_HAsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Transfer_ActorOfTransientProcess.hxx>
-#include <Transfer_FinderProcess.hxx>
 #include <XSAlgo.hxx>
 #include <XSControl_WorkSession.hxx>
 
diff --git a/src/STEPControl/STEPControl_Controller.hxx b/src/STEPControl/STEPControl_Controller.hxx
index 4a8e050fc2..83e897b31c 100644
--- a/src/STEPControl/STEPControl_Controller.hxx
+++ b/src/STEPControl/STEPControl_Controller.hxx
@@ -23,7 +23,6 @@
 #include <XSControl_Controller.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Interface_InterfaceModel;
 class XSControl_WorkSession;
 class TopoDS_Shape;
diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx
index b7c003bc14..01d992421d 100644
--- a/src/STEPControl/STEPControl_Reader.cxx
+++ b/src/STEPControl/STEPControl_Reader.cxx
@@ -14,29 +14,22 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Graph.hxx>
-#include <Interface_ShareFlags.hxx>
 #include <Interface_Static.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
-#include <StepBasic_HArray1OfNamedUnit.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
-#include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
-#include <StepBasic_ProductDefinitionFormationRelationship.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
-#include <StepBasic_SiPrefix.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_SiUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_SiUnitName.hxx>
 #include <StepBasic_SolidAngleMeasureWithUnit.hxx>
-#include <StepBasic_SolidAngleUnit.hxx>
 #include <STEPConstruct_UnitContext.hxx>
 #include <STEPControl_Controller.hxx>
 #include <STEPControl_Reader.hxx>
@@ -64,7 +57,6 @@
 #include <TColStd_MapOfAsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <Transfer_TransientProcess.hxx>
-#include <XSControl_Controller.hxx>
 #include <XSControl_TransferReader.hxx>
 #include <XSControl_WorkSession.hxx>
 
diff --git a/src/STEPControl/STEPControl_Reader.hxx b/src/STEPControl/STEPControl_Reader.hxx
index 1619174474..5973caa517 100644
--- a/src/STEPControl/STEPControl_Reader.hxx
+++ b/src/STEPControl/STEPControl_Reader.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <XSControl_Reader.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <TColStd_Array1OfAsciiString.hxx>
diff --git a/src/STEPControl/STEPControl_Writer.cxx b/src/STEPControl/STEPControl_Writer.cxx
index 1d74eac7d0..5ab4d6bff1 100644
--- a/src/STEPControl/STEPControl_Writer.cxx
+++ b/src/STEPControl/STEPControl_Writer.cxx
@@ -18,12 +18,9 @@
 #include <STEPControl_ActorWrite.hxx>
 #include <STEPControl_Controller.hxx>
 #include <StepData_StepModel.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Transfer_FinderProcess.hxx>
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
-#include <XSControl_TransferWriter.hxx>
 #include <XSControl_WorkSession.hxx>
 #include <UnitsMethods.hxx>
 
diff --git a/src/STEPControl/STEPControl_Writer.hxx b/src/STEPControl/STEPControl_Writer.hxx
index ab1df694bc..247cd047e6 100644
--- a/src/STEPControl/STEPControl_Writer.hxx
+++ b/src/STEPControl/STEPControl_Writer.hxx
@@ -21,11 +21,9 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <STEPControl_StepModelType.hxx>
-#include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 #include <Message_ProgressRange.hxx>
 
diff --git a/src/ShapeBuild/ShapeBuild_Edge.cxx b/src/ShapeBuild/ShapeBuild_Edge.cxx
index feee4e8224..34b2d5ff52 100644
--- a/src/ShapeBuild/ShapeBuild_Edge.cxx
+++ b/src/ShapeBuild/ShapeBuild_Edge.cxx
@@ -19,14 +19,12 @@
 #include <BRep_Curve3D.hxx>
 #include <BRep_CurveOnSurface.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepLib.hxx>
 #include <ElCLib.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Conic.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
@@ -38,10 +36,8 @@
 #include <Geom_OffsetCurve.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAPI.hxx>
 #include <gp_GTrsf2d.hxx>
 #include <gp_Lin2d.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Trsf2d.hxx>
 #include <Precision.hxx>
diff --git a/src/ShapeBuild/ShapeBuild_Edge.hxx b/src/ShapeBuild/ShapeBuild_Edge.hxx
index fa05914022..3725e969f1 100644
--- a/src/ShapeBuild/ShapeBuild_Edge.hxx
+++ b/src/ShapeBuild/ShapeBuild_Edge.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Edge;
 class TopoDS_Vertex;
 class TopoDS_Face;
diff --git a/src/ShapeBuild/ShapeBuild_ReShape.hxx b/src/ShapeBuild/ShapeBuild_ReShape.hxx
index 9c37ffbcb5..866c2d06a2 100644
--- a/src/ShapeBuild/ShapeBuild_ReShape.hxx
+++ b/src/ShapeBuild/ShapeBuild_ReShape.hxx
@@ -23,7 +23,6 @@
 #include <BRepTools_ReShape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
 class TopoDS_Shape;
 
diff --git a/src/ShapeBuild/ShapeBuild_Vertex.cxx b/src/ShapeBuild/ShapeBuild_Vertex.cxx
index f6107851ee..b053b17126 100644
--- a/src/ShapeBuild/ShapeBuild_Vertex.cxx
+++ b/src/ShapeBuild/ShapeBuild_Vertex.cxx
@@ -17,7 +17,6 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <gp_Pnt.hxx>
-#include <Precision.hxx>
 #include <ShapeBuild_Vertex.hxx>
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/ShapeBuild/ShapeBuild_Vertex.hxx b/src/ShapeBuild/ShapeBuild_Vertex.hxx
index fd30723ea8..912fc5820b 100644
--- a/src/ShapeBuild/ShapeBuild_Vertex.hxx
+++ b/src/ShapeBuild/ShapeBuild_Vertex.hxx
@@ -19,9 +19,7 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 class TopoDS_Vertex;
 class gp_Pnt;
 
diff --git a/src/ShapeConstruct/ShapeConstruct.cxx b/src/ShapeConstruct/ShapeConstruct.cxx
index 4d8e71d1a6..d2a9ae3a34 100644
--- a/src/ShapeConstruct/ShapeConstruct.cxx
+++ b/src/ShapeConstruct/ShapeConstruct.cxx
@@ -17,17 +17,14 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Conic.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2dConvert.hxx>
 #include <Geom2dConvert_ApproxCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom_Conic.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_ElementarySurface.hxx>
 #include <Geom_OffsetCurve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
diff --git a/src/ShapeConstruct/ShapeConstruct.hxx b/src/ShapeConstruct/ShapeConstruct.hxx
index ed085b68ac..d3a51763d9 100644
--- a/src/ShapeConstruct/ShapeConstruct.hxx
+++ b/src/ShapeConstruct/ShapeConstruct.hxx
@@ -21,10 +21,8 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TopAbs_Orientation.hxx>
 class Geom_BSplineCurve;
diff --git a/src/ShapeConstruct/ShapeConstruct_Curve.hxx b/src/ShapeConstruct/ShapeConstruct_Curve.hxx
index a47361bf16..6adffb743a 100644
--- a/src/ShapeConstruct/ShapeConstruct_Curve.hxx
+++ b/src/ShapeConstruct/ShapeConstruct_Curve.hxx
@@ -21,8 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_Array1OfReal.hxx>
 class Geom_Curve;
diff --git a/src/ShapeConstruct/ShapeConstruct_MakeTriangulation.hxx b/src/ShapeConstruct/ShapeConstruct_MakeTriangulation.hxx
index a8cbc5454e..6edad56283 100644
--- a/src/ShapeConstruct/ShapeConstruct_MakeTriangulation.hxx
+++ b/src/ShapeConstruct/ShapeConstruct_MakeTriangulation.hxx
@@ -19,14 +19,10 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <TopoDS_Wire.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <Standard_Boolean.hxx>
-
 
 
 class ShapeConstruct_MakeTriangulation  : public BRepBuilderAPI_MakeShape
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
index 17b6021c62..d37d601ac7 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
@@ -41,9 +41,6 @@
 #include <Geom2dAdaptor.hxx>
 #include <Geom2dAPI_Interpolate.hxx>
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BoundedCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_OffsetSurface.hxx>
 #include <Geom_Plane.hxx>
@@ -61,8 +58,6 @@
 #include <ElCLib.hxx>
 #include <NCollection_Sequence.hxx>
 #include <Precision.hxx>
-#include <ProjLib_CompProjectedCurve.hxx>
-#include <ProjLib_HCompProjectedCurve.hxx>
 #include <ProjLib_ProjectedCurve.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Curve.hxx>
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
index c4cf5ad752..dd8c679e7f 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
@@ -20,8 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
diff --git a/src/ShapeCustom/ShapeCustom.cxx b/src/ShapeCustom/ShapeCustom.cxx
index 757784971b..5e4ab7f82e 100644
--- a/src/ShapeCustom/ShapeCustom.cxx
+++ b/src/ShapeCustom/ShapeCustom.cxx
@@ -28,7 +28,6 @@
 #include <gp_Trsf.hxx>
 #include <GeomAbs_Shape.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepTools_Modifier.hxx>
diff --git a/src/ShapeCustom/ShapeCustom.hxx b/src/ShapeCustom/ShapeCustom.hxx
index 1fcfe0ce11..b4b9ac3584 100644
--- a/src/ShapeCustom/ShapeCustom.hxx
+++ b/src/ShapeCustom/ShapeCustom.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <Message_ProgressRange.hxx>
 
 class TopoDS_Shape;
diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
index 0745e84b1e..ebab162cbe 100644
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
@@ -17,13 +17,11 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_Modifier.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Conic.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
@@ -33,13 +31,10 @@
 #include <Geom2dConvert_ApproxCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Conic.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
-#include <Geom_ElementarySurface.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_OffsetCurve.hxx>
 #include <Geom_OffsetSurface.hxx>
@@ -56,11 +51,9 @@
 #include <GeomConvert.hxx>
 #include <GeomConvert_ApproxCurve.hxx>
 #include <GeomConvert_ApproxSurface.hxx>
-#include <gp_Ax1.hxx>
 #include <gp_Pnt.hxx>
 #include <Message_Msg.hxx>
 #include <Precision.hxx>
-#include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeConstruct.hxx>
 #include <ShapeCustom_BSplineRestriction.hxx>
@@ -70,13 +63,10 @@
 #include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array2OfPnt.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array2OfReal.hxx>
 #include <TopLoc_Location.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
index b4d3d1ecd1..09beeeeff0 100644
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
@@ -22,8 +22,6 @@
 
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeCustom_Modification.hxx>
 class ShapeCustom_RestrictionParameters;
 class TopoDS_Face;
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
index 16bd8e9fbe..ce500b8e32 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
@@ -16,12 +16,10 @@
 
 
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_OffsetSurface.hxx>
 #include <Geom_Plane.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
index 918b1e1d3b..42dea3fb62 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
@@ -20,9 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <ShapeCustom_Modification.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
index 3812257d55..be7eb83ede 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
@@ -14,7 +14,6 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
@@ -34,11 +33,9 @@
 #include <Geom_TrimmedCurve.hxx>
 #include <gp_Pnt.hxx>
 #include <Message_Msg.hxx>
-#include <Precision.hxx>
 #include <ShapeCustom_ConvertToRevolution.hxx>
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
index 3035ccbad1..fb7686b0ca 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <ShapeCustom_Modification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/ShapeCustom/ShapeCustom_Curve.hxx b/src/ShapeCustom/ShapeCustom_Curve.hxx
index 10f92b8e00..4df481391c 100644
--- a/src/ShapeCustom/ShapeCustom_Curve.hxx
+++ b/src/ShapeCustom/ShapeCustom_Curve.hxx
@@ -20,8 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Geom_Curve;
 
 
diff --git a/src/ShapeCustom/ShapeCustom_Curve2d.hxx b/src/ShapeCustom/ShapeCustom_Curve2d.hxx
index 90b8340a55..9e4be30964 100644
--- a/src/ShapeCustom/ShapeCustom_Curve2d.hxx
+++ b/src/ShapeCustom/ShapeCustom_Curve2d.hxx
@@ -20,9 +20,7 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <Standard_Real.hxx>
 class Geom2d_Line;
 class Geom2d_Curve;
 class Geom2d_BSplineCurve;
diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.cxx b/src/ShapeCustom/ShapeCustom_DirectModification.cxx
index 93f569bba2..19ec660ce2 100644
--- a/src/ShapeCustom/ShapeCustom_DirectModification.cxx
+++ b/src/ShapeCustom/ShapeCustom_DirectModification.cxx
@@ -20,7 +20,6 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
@@ -33,7 +32,6 @@
 #include <gp_Mat.hxx>
 #include <gp_Pnt.hxx>
 #include <Message_Msg.hxx>
-#include <Precision.hxx>
 #include <ShapeCustom_DirectModification.hxx>
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.hxx b/src/ShapeCustom/ShapeCustom_DirectModification.hxx
index 537127a2b7..44b9d5769e 100644
--- a/src/ShapeCustom/ShapeCustom_DirectModification.hxx
+++ b/src/ShapeCustom/ShapeCustom_DirectModification.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <ShapeCustom_Modification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/ShapeCustom/ShapeCustom_Modification.cxx b/src/ShapeCustom/ShapeCustom_Modification.cxx
index 9f9fcb3cc8..a7dda61cd5 100644
--- a/src/ShapeCustom/ShapeCustom_Modification.cxx
+++ b/src/ShapeCustom/ShapeCustom_Modification.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Message_Gravity.hxx>
 #include <Message_Msg.hxx>
 #include <ShapeCustom_Modification.hxx>
 #include <ShapeExtend_BasicMsgRegistrator.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx b/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
index f9784612e6..73563c6cc9 100644
--- a/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
+++ b/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 
 
diff --git a/src/ShapeCustom/ShapeCustom_Surface.cxx b/src/ShapeCustom/ShapeCustom_Surface.cxx
index 4cee247e79..b2704aa783 100644
--- a/src/ShapeCustom/ShapeCustom_Surface.cxx
+++ b/src/ShapeCustom/ShapeCustom_Surface.cxx
@@ -26,8 +26,6 @@
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_ToroidalSurface.hxx>
-#include <GeomAbs_SurfaceType.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Cylinder.hxx>
 #include <gp_Pln.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx b/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
index 15d5d0a393..6205e4bd9b 100644
--- a/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
+++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
@@ -16,7 +16,6 @@
 #include <GeomAdaptor_SurfaceOfRevolution.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
@@ -25,7 +24,6 @@
 #include <Geom_Curve.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
-#include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
@@ -34,12 +32,8 @@
 #include <Geom_SweptSurface.hxx>
 #include <Geom_ToroidalSurface.hxx>
 #include <GeomAdaptor_Curve.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 <Message_Msg.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 #include <ShapeCustom_SweptToElementary.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
index a3d8c954ae..8c7a92cead 100644
--- a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
+++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
@@ -20,8 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <ShapeCustom_Modification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.cxx b/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
index c7d064d35a..55c9c25e4e 100644
--- a/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
+++ b/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
@@ -19,7 +19,6 @@
 #include <BRep_TFace.hxx>
 #include <BRep_TVertex.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Trsf.hxx>
diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
index 3f469028cc..9a587a1b96 100644
--- a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
+++ b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <BRepTools_TrsfModification.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class gp_Trsf;
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/ShapeExtend/ShapeExtend.hxx b/src/ShapeExtend/ShapeExtend.hxx
index 7414f34331..ff4d7e8c70 100644
--- a/src/ShapeExtend/ShapeExtend.hxx
+++ b/src/ShapeExtend/ShapeExtend.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
 #include <ShapeExtend_Status.hxx>
 #include <Standard_Boolean.hxx>
 
diff --git a/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx b/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
index 478cac47c0..883334815c 100644
--- a/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
+++ b/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
@@ -16,11 +16,9 @@
 
 //    pdn 13.07.99 Derivatives are scaled in accordance with local/global parameter transition
 
-#include <Geom_Curve.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_Vec.hxx>
-#include <Precision.hxx>
 #include <ShapeExtend_ComplexCurve.hxx>
 #include <Standard_Type.hxx>
 
diff --git a/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx b/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
index 7843c920ed..211078e2a8 100644
--- a/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
+++ b/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
@@ -20,10 +20,8 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Geom_Curve.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class gp_Trsf;
 class gp_Pnt;
diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
index f71bc21a2a..b4994f3c0c 100644
--- a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
+++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
@@ -17,7 +17,6 @@
 
 #include <Geom_Curve.hxx>
 #include <Geom_Geometry.hxx>
-#include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Trsf.hxx>
diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx b/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
index e3f36a385a..032ba50397 100644
--- a/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
+++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
@@ -22,12 +22,10 @@
 
 #include <TColGeom_HArray2OfSurface.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <Standard_Boolean.hxx>
 #include <Geom_Surface.hxx>
 #include <ShapeExtend_Parametrisation.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <GeomAbs_Shape.hxx>
 class gp_Pnt2d;
 class gp_Trsf2d;
diff --git a/src/ShapeExtend/ShapeExtend_Explorer.cxx b/src/ShapeExtend/ShapeExtend_Explorer.cxx
index cb4086abc2..97a99eed4b 100644
--- a/src/ShapeExtend/ShapeExtend_Explorer.cxx
+++ b/src/ShapeExtend/ShapeExtend_Explorer.cxx
@@ -15,7 +15,6 @@
 
 #include <BRep_Builder.hxx>
 #include <ShapeExtend_Explorer.hxx>
-#include <Standard_TypeMismatch.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
diff --git a/src/ShapeExtend/ShapeExtend_Explorer.hxx b/src/ShapeExtend/ShapeExtend_Explorer.hxx
index b86ec48949..08b9f53e03 100644
--- a/src/ShapeExtend/ShapeExtend_Explorer.hxx
+++ b/src/ShapeExtend/ShapeExtend_Explorer.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopTools_HSequenceOfShape.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class TopoDS_Shape;
diff --git a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
index 0e03962597..a88edd5832 100644
--- a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
+++ b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Message_ListOfMsg.hxx>
 #include <Message_Msg.hxx>
 #include <ShapeExtend_MsgRegistrator.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/ShapeExtend/ShapeExtend_WireData.hxx b/src/ShapeExtend/ShapeExtend_WireData.hxx
index 68b9280cac..d4d747552f 100644
--- a/src/ShapeExtend/ShapeExtend_WireData.hxx
+++ b/src/ShapeExtend/ShapeExtend_WireData.hxx
@@ -23,7 +23,6 @@
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TopoDS_Wire;
 class TopoDS_Edge;
diff --git a/src/ShapeFix/ShapeFix.cxx b/src/ShapeFix/ShapeFix.cxx
index 2edf3bee32..6f710fac39 100644
--- a/src/ShapeFix/ShapeFix.cxx
+++ b/src/ShapeFix/ShapeFix.cxx
@@ -29,19 +29,14 @@
 
 #include <Precision.hxx>
 
-#include <Standard_Failure.hxx>
-
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <Geom_Surface.hxx>
 
 //:i2
 #include <gp_Pnt.hxx>
 #include <Geom_Plane.hxx>
-#include <ShapeFix_Edge.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
@@ -56,13 +51,11 @@
 #include <TopTools_MapOfShape.hxx>
 #include <BRepLib.hxx>
 
-#include <ShapeAnalysis_Edge.hxx>
 #include <ShapeBuild_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopExp.hxx>
diff --git a/src/ShapeFix/ShapeFix.hxx b/src/ShapeFix/ShapeFix.hxx
index fb6a1f5ccf..e2d641d683 100644
--- a/src/ShapeFix/ShapeFix.hxx
+++ b/src/ShapeFix/ShapeFix.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 
 #include <ShapeExtend_BasicMsgRegistrator.hxx>
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx
index c518101b8d..af2f722c34 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.cxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx
@@ -19,7 +19,6 @@
 //    svv  10.01.00 porting on DEC
 
 #include <Bnd_Box2d.hxx>
-#include <BndLib_Add2dCurve.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
@@ -31,7 +30,6 @@
 #include <Geom2dInt_GInter.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_ElementarySurface.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <gp_Dir2d.hxx>
 #include <gp_Lin2d.hxx>
 #include <gp_Pnt.hxx>
@@ -44,15 +42,12 @@
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_Surface.hxx>
-#include <ShapeAnalysis_TransferParameters.hxx>
 #include <ShapeAnalysis_TransferParametersProj.hxx>
 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeBuild_Vertex.hxx>
-#include <ShapeExtend.hxx>
 #include <ShapeExtend_CompositeSurface.hxx>
-#include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_ComposeShell.hxx>
 #include <ShapeFix_Edge.hxx>
 #include <ShapeFix_Face.hxx>
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.hxx b/src/ShapeFix/ShapeFix_ComposeShell.hxx
index 83c927c876..a53d8da4c1 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.hxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.hxx
@@ -25,8 +25,6 @@
 #include <TopAbs_Orientation.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeFix_Root.hxx>
 #include <ShapeExtend_Status.hxx>
 #include <ShapeFix_SequenceOfWireSegment.hxx>
diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx
index c33d230813..cebe39c89f 100644
--- a/src/ShapeFix/ShapeFix_Edge.cxx
+++ b/src/ShapeFix/ShapeFix_Edge.cxx
@@ -24,13 +24,10 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BoundedCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
@@ -38,7 +35,6 @@
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
-#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomLib.hxx>
 #include <Precision.hxx>
@@ -53,7 +49,6 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
-#include <TopExp.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/ShapeFix/ShapeFix_Edge.hxx b/src/ShapeFix/ShapeFix_Edge.hxx
index 0edfc35675..538dd92127 100644
--- a/src/ShapeFix/ShapeFix_Edge.hxx
+++ b/src/ShapeFix/ShapeFix_Edge.hxx
@@ -22,8 +22,6 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <ShapeExtend_Status.hxx>
 class ShapeConstruct_ProjectCurveOnSurface;
 class TopoDS_Edge;
diff --git a/src/ShapeFix/ShapeFix_EdgeConnect.cxx b/src/ShapeFix/ShapeFix_EdgeConnect.cxx
index 3d12eac659..fbabd618b0 100644
--- a/src/ShapeFix/ShapeFix_EdgeConnect.cxx
+++ b/src/ShapeFix/ShapeFix_EdgeConnect.cxx
@@ -17,7 +17,6 @@
 
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <gp_Pnt.hxx>
@@ -33,7 +32,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 //#define POSITION_USES_MEAN_POINT
diff --git a/src/ShapeFix/ShapeFix_EdgeConnect.hxx b/src/ShapeFix/ShapeFix_EdgeConnect.hxx
index a8eefc8b42..48e1e36954 100644
--- a/src/ShapeFix/ShapeFix_EdgeConnect.hxx
+++ b/src/ShapeFix/ShapeFix_EdgeConnect.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
index 2c3100198e..1afc7a1a69 100644
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
@@ -20,15 +20,12 @@
 #include <BRep_Tool.hxx>
 #include <ElCLib.hxx>
 #include <Extrema_ExtPC.hxx>
-#include <Geom2d_BoundedCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.hxx b/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
index 875be3e1cf..471f3c6495 100644
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
@@ -18,12 +18,10 @@
 #define _ShapeFix_EdgeProjAux_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
 #include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class Geom2d_Curve;
 
diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index 71b46ebee3..23c3ff338f 100644
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -29,14 +29,12 @@
 // skl,pdn 14.05.2002  OCC55 (correction precision for small faces)
 
 #include <Bnd_Box.hxx>
-#include <Bnd_Box2d.hxx>
 #include <BndLib_Add2dCurve.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepGProp.hxx>
 #include <BRepTools.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <Geom2d_BSplineCurve.hxx>
@@ -51,35 +49,23 @@
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GProp_GProps.hxx>
-#include <IntRes2d_Domain.hxx>
-#include <IntRes2d_IntersectionPoint.hxx>
-#include <IntRes2d_IntersectionSegment.hxx>
-#include <IntRes2d_Transition.hxx>
 #include <Message_Msg.hxx>
 #include <NCollection_Array1.hxx>
 #include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_Surface.hxx>
-#include <ShapeAnalysis_Wire.hxx>
 #include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend_BasicMsgRegistrator.hxx>
 #include <ShapeExtend_CompositeSurface.hxx>
-#include <ShapeExtend_WireData.hxx>
 #include <ShapeFix.hxx>
 #include <ShapeFix_ComposeShell.hxx>
-#include <ShapeFix_DataMapOfShapeBox2d.hxx>
 #include <ShapeFix_Edge.hxx>
 #include <ShapeFix_Face.hxx>
 #include <ShapeFix_IntersectionTool.hxx>
 #include <ShapeFix_SplitTool.hxx>
 #include <ShapeFix_Wire.hxx>
-#include <Standard_ErrorHandler.hxx>
-#include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom_HArray2OfSurface.hxx>
 #include <TColgp_SequenceOfPnt2d.hxx>
@@ -91,14 +77,12 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/ShapeFix/ShapeFix_Face.hxx b/src/ShapeFix/ShapeFix_Face.hxx
index 405ed66b7f..2a3eb9cf08 100644
--- a/src/ShapeFix/ShapeFix_Face.hxx
+++ b/src/ShapeFix/ShapeFix_Face.hxx
@@ -22,10 +22,8 @@
 
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeFix_Root.hxx>
-#include <Standard_Real.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <ShapeFix_DataMapOfShapeBox2d.hxx>
diff --git a/src/ShapeFix/ShapeFix_FaceConnect.cxx b/src/ShapeFix/ShapeFix_FaceConnect.cxx
index d679568faf..1d3593a4cd 100644
--- a/src/ShapeFix/ShapeFix_FaceConnect.cxx
+++ b/src/ShapeFix/ShapeFix_FaceConnect.cxx
@@ -38,9 +38,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_Array1OfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
diff --git a/src/ShapeFix/ShapeFix_FaceConnect.hxx b/src/ShapeFix/ShapeFix_FaceConnect.hxx
index 7250ad7fe4..90f0c6a85a 100644
--- a/src/ShapeFix/ShapeFix_FaceConnect.hxx
+++ b/src/ShapeFix/ShapeFix_FaceConnect.hxx
@@ -19,11 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Face;
 class TopoDS_Shell;
 
diff --git a/src/ShapeFix/ShapeFix_FixSmallFace.cxx b/src/ShapeFix/ShapeFix_FixSmallFace.cxx
index 37e457704c..a3365808b1 100644
--- a/src/ShapeFix/ShapeFix_FixSmallFace.cxx
+++ b/src/ShapeFix/ShapeFix_FixSmallFace.cxx
@@ -15,35 +15,23 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
-#include <BRepTools.hxx>
 #include <ElCLib.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_ElementarySurface.hxx>
 #include <Geom_Line.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomLib.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Vec.hxx>
 #include <Message_Msg.hxx>
-#include <Poly_Polygon3D.hxx>
 #include <Precision.hxx>
 #include <ShapeAnalysis_Curve.hxx>
-#include <ShapeAnalysis_DataMapOfShapeListOfReal.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeFix_Edge.hxx>
-#include <ShapeFix_Face.hxx>
 #include <ShapeFix_FixSmallFace.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <Standard_Type.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
 #include <TColgp_SequenceOfXYZ.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
@@ -57,7 +45,6 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
-#include <TopTools_Array1OfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_FixSmallFace,ShapeFix_Root)
diff --git a/src/ShapeFix/ShapeFix_FixSmallFace.hxx b/src/ShapeFix/ShapeFix_FixSmallFace.hxx
index b9d2ee466a..f5babf3c7c 100644
--- a/src/ShapeFix/ShapeFix_FixSmallFace.hxx
+++ b/src/ShapeFix/ShapeFix_FixSmallFace.hxx
@@ -24,8 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <ShapeAnalysis_CheckSmallFace.hxx>
 #include <ShapeFix_Root.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Face;
 class TopoDS_Edge;
 class TopoDS_Compound;
diff --git a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
index 89eef236f4..28ab57fb75 100644
--- a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
+++ b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
@@ -16,7 +16,6 @@
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <Message_Msg.hxx>
-#include <Precision.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeFix_FixSmallSolid.hxx>
 #include <Standard_Type.hxx>
@@ -25,13 +24,10 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeReal.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_FixSmallSolid,ShapeFix_Root)
diff --git a/src/ShapeFix/ShapeFix_FixSmallSolid.hxx b/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
index 4c718156e7..6374331807 100644
--- a/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
+++ b/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
@@ -20,9 +20,7 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <ShapeFix_Root.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Shape;
 class ShapeBuild_ReShape;
 
diff --git a/src/ShapeFix/ShapeFix_FreeBounds.hxx b/src/ShapeFix/ShapeFix_FreeBounds.hxx
index aedf3c47d5..c6da8e3fd2 100644
--- a/src/ShapeFix/ShapeFix_FreeBounds.hxx
+++ b/src/ShapeFix/ShapeFix_FreeBounds.hxx
@@ -19,12 +19,9 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 
 
 //! This class is intended to output free bounds of the shape
diff --git a/src/ShapeFix/ShapeFix_IntersectionTool.cxx b/src/ShapeFix/ShapeFix_IntersectionTool.cxx
index e5f268724a..b98d4bb2c5 100644
--- a/src/ShapeFix/ShapeFix_IntersectionTool.cxx
+++ b/src/ShapeFix/ShapeFix_IntersectionTool.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Bnd_Box2d.hxx>
 #include <BndLib_Add2dCurve.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
@@ -25,22 +24,18 @@
 #include <Geom2dInt_GInter.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <gp_Pnt.hxx>
 #include <IntRes2d_Domain.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
 #include <IntRes2d_Position.hxx>
 #include <NCollection_Sequence.hxx>
-#include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 #include <ShapeAnalysis_TransferParametersProj.hxx>
 #include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeExtend_WireData.hxx>
-#include <ShapeFix_DataMapOfShapeBox2d.hxx>
 #include <ShapeFix_IntersectionTool.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
diff --git a/src/ShapeFix/ShapeFix_IntersectionTool.hxx b/src/ShapeFix/ShapeFix_IntersectionTool.hxx
index 8ec6046884..7b9cdcbab6 100644
--- a/src/ShapeFix/ShapeFix_IntersectionTool.hxx
+++ b/src/ShapeFix/ShapeFix_IntersectionTool.hxx
@@ -20,8 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeFix_DataMapOfShapeBox2d.hxx>
 class ShapeBuild_ReShape;
diff --git a/src/ShapeFix/ShapeFix_Root.cxx b/src/ShapeFix/ShapeFix_Root.cxx
index 97342512ec..5794c9b309 100644
--- a/src/ShapeFix/ShapeFix_Root.cxx
+++ b/src/ShapeFix/ShapeFix_Root.cxx
@@ -14,7 +14,6 @@
 
 #include <Message_Msg.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend_BasicMsgRegistrator.hxx>
 #include <ShapeFix_Root.hxx>
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/ShapeFix/ShapeFix_Root.hxx b/src/ShapeFix/ShapeFix_Root.hxx
index d0a584424e..ee3909a661 100644
--- a/src/ShapeFix/ShapeFix_Root.hxx
+++ b/src/ShapeFix/ShapeFix_Root.hxx
@@ -20,11 +20,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <TopoDS_Shape.hxx>
 #include <Standard_Transient.hxx>
 #include <Message_Gravity.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 
 #include <ShapeExtend_BasicMsgRegistrator.hxx>
diff --git a/src/ShapeFix/ShapeFix_Shape.cxx b/src/ShapeFix/ShapeFix_Shape.cxx
index 55df4bba7e..fc0c89de99 100644
--- a/src/ShapeFix/ShapeFix_Shape.cxx
+++ b/src/ShapeFix/ShapeFix_Shape.cxx
@@ -16,24 +16,18 @@
 
 
 #include <BRep_Builder.hxx>
-#include <BRepTools.hxx>
 #include <Message_ProgressScope.hxx>
-#include <Precision.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend_BasicMsgRegistrator.hxx>
 #include <ShapeFix.hxx>
 #include <ShapeFix_Edge.hxx>
-#include <ShapeFix_Face.hxx>
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_Shell.hxx>
 #include <ShapeFix_Solid.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <Standard_Type.hxx>
-#include <TopAbs.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/ShapeFix/ShapeFix_Shape.hxx b/src/ShapeFix/ShapeFix_Shape.hxx
index c15adc4061..f48a2e3f27 100644
--- a/src/ShapeFix/ShapeFix_Shape.hxx
+++ b/src/ShapeFix/ShapeFix_Shape.hxx
@@ -24,9 +24,7 @@
 #include <TopTools_MapOfShape.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeFix_Root.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
-#include <Standard_Real.hxx>
 #include <Message_ProgressRange.hxx>
 
 class ShapeFix_Solid;
diff --git a/src/ShapeFix/ShapeFix_ShapeTolerance.hxx b/src/ShapeFix/ShapeFix_ShapeTolerance.hxx
index 00e8915d3a..061f43730a 100644
--- a/src/ShapeFix/ShapeFix_ShapeTolerance.hxx
+++ b/src/ShapeFix/ShapeFix_ShapeTolerance.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 <TopAbs_ShapeEnum.hxx>
 class TopoDS_Shape;
 
diff --git a/src/ShapeFix/ShapeFix_Shell.cxx b/src/ShapeFix/ShapeFix_Shell.cxx
index fb8cd9bc64..fe2ba6e754 100644
--- a/src/ShapeFix/ShapeFix_Shell.cxx
+++ b/src/ShapeFix/ShapeFix_Shell.cxx
@@ -23,18 +23,13 @@
 #include <BRepBndLib.hxx>
 #include <Message_Msg.hxx>
 #include <Message_ProgressScope.hxx>
-#include <Precision.hxx>
 #include <ShapeAnalysis_Shell.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend.hxx>
-#include <ShapeExtend_BasicMsgRegistrator.hxx>
 #include <ShapeFix_Face.hxx>
 #include <ShapeFix_Shell.hxx>
 #include <Standard_Type.hxx>
 #include <TColStd_DataMapOfIntegerListOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <TColStd_SequenceOfInteger.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -44,15 +39,12 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/ShapeFix/ShapeFix_Solid.cxx b/src/ShapeFix/ShapeFix_Solid.cxx
index 631c4c936f..7a553995b5 100644
--- a/src/ShapeFix/ShapeFix_Solid.cxx
+++ b/src/ShapeFix/ShapeFix_Solid.cxx
@@ -16,46 +16,33 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
 #include <Message_Msg.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Precision.hxx>
-#include <ShapeAnalysis.hxx>
-#include <ShapeAnalysis_Curve.hxx>
-#include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeExtend.hxx>
-#include <ShapeExtend_BasicMsgRegistrator.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Shell.hxx>
 #include <ShapeFix_Solid.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
-#include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_CompSolid.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/ShapeFix/ShapeFix_Solid.hxx b/src/ShapeFix/ShapeFix_Solid.hxx
index 05afd5fb71..976c761ffc 100644
--- a/src/ShapeFix/ShapeFix_Solid.hxx
+++ b/src/ShapeFix/ShapeFix_Solid.hxx
@@ -22,10 +22,8 @@
 
 #include <TopoDS_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeFix_Root.hxx>
 #include <ShapeExtend_Status.hxx>
-#include <Standard_Real.hxx>
 class ShapeFix_Shell;
 class TopoDS_Solid;
 class TopoDS_Shell;
diff --git a/src/ShapeFix/ShapeFix_SplitTool.hxx b/src/ShapeFix/ShapeFix_SplitTool.hxx
index 9398e57b01..da210fa0fa 100644
--- a/src/ShapeFix/ShapeFix_SplitTool.hxx
+++ b/src/ShapeFix/ShapeFix_SplitTool.hxx
@@ -20,8 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <Standard_Integer.hxx>
 class TopoDS_Edge;
diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx
index 24a8b07cac..f03fd76f01 100644
--- a/src/ShapeFix/ShapeFix_Wire.cxx
+++ b/src/ShapeFix/ShapeFix_Wire.cxx
@@ -45,19 +45,13 @@
 
 #include <ShapeFix_Wire.hxx>
 
-#include <Adaptor3d_CurveOnSurface.hxx>
-#include <Bnd_Array1OfBox2d.hxx>
-#include <Bnd_Box2d.hxx>
-#include <BndLib_Add2dCurve.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepTools.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
@@ -72,11 +66,9 @@
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomAPI.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
-#include <gp_Pln.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_SequenceOfIntersectionPoint.hxx>
 #include <Message_Msg.hxx>
@@ -85,7 +77,6 @@
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_Surface.hxx>
-#include <ShapeAnalysis_TransferParameters.hxx>
 #include <ShapeAnalysis_TransferParametersProj.hxx>
 #include <ShapeAnalysis_Wire.hxx>
 #include <ShapeAnalysis_WireOrder.hxx>
@@ -95,7 +86,6 @@
 #include <ShapeConstruct_ProjectCurveOnSurface.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeExtend_WireData.hxx>
-#include <ShapeFix.hxx>
 #include <ShapeFix_Edge.hxx>
 #include <ShapeFix_IntersectionTool.hxx>
 #include <ShapeFix_SplitTool.hxx>
diff --git a/src/ShapeFix/ShapeFix_Wire.hxx b/src/ShapeFix/ShapeFix_Wire.hxx
index 4539b046b9..e90a0cf659 100644
--- a/src/ShapeFix/ShapeFix_Wire.hxx
+++ b/src/ShapeFix/ShapeFix_Wire.hxx
@@ -18,9 +18,7 @@
 #define _ShapeFix_Wire_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <ShapeFix_Root.hxx>
diff --git a/src/ShapeFix/ShapeFix_WireSegment.cxx b/src/ShapeFix/ShapeFix_WireSegment.cxx
index f90b041c10..3dfef90508 100644
--- a/src/ShapeFix/ShapeFix_WireSegment.cxx
+++ b/src/ShapeFix/ShapeFix_WireSegment.cxx
@@ -20,7 +20,6 @@
 #include <ShapeFix_WireSegment.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
 
 //=======================================================================
 //function : ShapeFix_WireSegment
diff --git a/src/ShapeFix/ShapeFix_WireSegment.hxx b/src/ShapeFix/ShapeFix_WireSegment.hxx
index 7664c650c2..1e01b01f67 100644
--- a/src/ShapeFix/ShapeFix_WireSegment.hxx
+++ b/src/ShapeFix/ShapeFix_WireSegment.hxx
@@ -24,7 +24,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopAbs_Orientation.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class ShapeExtend_WireData;
 class TopoDS_Wire;
diff --git a/src/ShapeFix/ShapeFix_WireVertex.cxx b/src/ShapeFix/ShapeFix_WireVertex.cxx
index 2bce4bf5be..80eca5c760 100644
--- a/src/ShapeFix/ShapeFix_WireVertex.cxx
+++ b/src/ShapeFix/ShapeFix_WireVertex.cxx
@@ -16,7 +16,6 @@
 #include <BRep_Builder.hxx>
 #include <gp_Pnt.hxx>
 #include <ShapeAnalysis_Edge.hxx>
-#include <ShapeAnalysis_WireVertex.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_WireVertex.hxx>
 #include <TColStd_HArray1OfReal.hxx>
diff --git a/src/ShapeFix/ShapeFix_WireVertex.hxx b/src/ShapeFix/ShapeFix_WireVertex.hxx
index b7d05c2dc7..7b26394c84 100644
--- a/src/ShapeFix/ShapeFix_WireVertex.hxx
+++ b/src/ShapeFix/ShapeFix_WireVertex.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <ShapeAnalysis_WireVertex.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class TopoDS_Wire;
 class ShapeExtend_WireData;
diff --git a/src/ShapeFix/ShapeFix_Wire_1.cxx b/src/ShapeFix/ShapeFix_Wire_1.cxx
index c8fb6b3e8a..901cbad65d 100644
--- a/src/ShapeFix/ShapeFix_Wire_1.cxx
+++ b/src/ShapeFix/ShapeFix_Wire_1.cxx
@@ -13,57 +13,30 @@
 
 // szv 19.08.99: new methods for fixing gaps between edges (3d curves and pcurves)
 #include <ShapeFix_Wire.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 
 #include <Precision.hxx>
-#include <Bnd_Box2d.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
 
-#include <IntRes2d_SequenceOfIntersectionPoint.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
 
 #include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
 
-#include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 
 #include <ShapeExtend.hxx>
 #include <ShapeBuild_Edge.hxx>
-#include <ShapeBuild_Vertex.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_Surface.hxx>
-#include <ShapeAnalysis.hxx>
-#include <GeomConvert_CompCurveToBSplineCurve.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <gp_Pln.hxx>
-#include <GeomAPI.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_SphericalSurface.hxx> //S4135
-#include <Geom2d_BSplineCurve.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>  
-#include <TopTools_Array1OfShape.hxx>
 #include <BRepTools.hxx>
-#include <Bnd_Array1OfBox2d.hxx>
-#include <BndLib_Add2dCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <Geom2dConvert.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <ShapeBuild_ReShape.hxx>
 
 //szv
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Ellipse.hxx>
 #include <Geom2d_Parabola.hxx>
diff --git a/src/ShapeFix/ShapeFix_Wireframe.cxx b/src/ShapeFix/ShapeFix_Wireframe.cxx
index 465c5f8941..092d54246b 100644
--- a/src/ShapeFix/ShapeFix_Wireframe.cxx
+++ b/src/ShapeFix/ShapeFix_Wireframe.cxx
@@ -21,17 +21,12 @@
 #include <Geom2d_Curve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_Curve.hxx>
-#include <GeomAPI.hxx>
-#include <GeomConvert_CompCurveToBSplineCurve.hxx>
-#include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <Message_Msg.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_TransferParametersProj.hxx>
-#include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeConstruct.hxx>
-#include <ShapeConstruct_Curve.hxx>
 #include <ShapeFix.hxx>
 #include <ShapeFix_Edge.hxx>
 #include <ShapeFix_Wire.hxx>
@@ -47,11 +42,9 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
@@ -472,8 +465,7 @@ ShapeFix_Wireframe::ShapeFix_Wireframe(const TopoDS_Shape& shape)
 //purpose  : 
 //=======================================================================
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopExp.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+
 Standard_Boolean ShapeFix_Wireframe::CheckSmallEdges(TopTools_MapOfShape& theSmallEdges,
                                                      TopTools_DataMapOfShapeListOfShape& theEdgeToFaces,
                                                      TopTools_DataMapOfShapeListOfShape& theFaceWithSmall,
diff --git a/src/ShapeFix/ShapeFix_Wireframe.hxx b/src/ShapeFix/ShapeFix_Wireframe.hxx
index 197e28a064..f5cbc076b7 100644
--- a/src/ShapeFix/ShapeFix_Wireframe.hxx
+++ b/src/ShapeFix/ShapeFix_Wireframe.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeFix_Root.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/ShapePersistent/ShapePersistent.cxx b/src/ShapePersistent/ShapePersistent.cxx
index e1e2b4209e..76a6a082b3 100644
--- a/src/ShapePersistent/ShapePersistent.cxx
+++ b/src/ShapePersistent/ShapePersistent.cxx
@@ -12,23 +12,13 @@
 // commercial license or contractual agreement.
 
 #include <ShapePersistent.hxx>
-#include <ShapePersistent_Geom.hxx>
-#include <ShapePersistent_Geom2d.hxx>
 #include <StdObjMgt_MapOfInstantiators.hxx>
 
-#include <StdLPersistent_HArray1.hxx>
-#include <StdLPersistent_HArray2.hxx>
-#include <StdPersistent_TopoDS.hxx>
-#include <ShapePersistent_TopoDS.hxx>
-#include <ShapePersistent_HArray1.hxx>
-#include <ShapePersistent_HArray2.hxx>
 #include <ShapePersistent_HSequence.hxx>
-#include <ShapePersistent_Geom2d.hxx>
 #include <ShapePersistent_Geom2d_Curve.hxx>
 #include <ShapePersistent_Geom.hxx>
 #include <ShapePersistent_Geom_Curve.hxx>
 #include <ShapePersistent_Geom_Surface.hxx>
-#include <ShapePersistent_Poly.hxx>
 #include <ShapePersistent_BRep.hxx>
 
 
diff --git a/src/ShapePersistent/ShapePersistent_BRep.cxx b/src/ShapePersistent/ShapePersistent_BRep.cxx
index d23c4ce76d..2470ecc0e3 100644
--- a/src/ShapePersistent/ShapePersistent_BRep.cxx
+++ b/src/ShapePersistent/ShapePersistent_BRep.cxx
@@ -19,12 +19,9 @@
 #include <BRep_PointOnCurveOnSurface.hxx>
 #include <BRep_PointOnSurface.hxx>
 #include <BRep_Curve3D.hxx>
-#include <BRep_CurveOnSurface.hxx>
 #include <BRep_CurveOnClosedSurface.hxx>
 #include <BRep_Polygon3D.hxx>
-#include <BRep_PolygonOnTriangulation.hxx>
 #include <BRep_PolygonOnClosedTriangulation.hxx>
-#include <BRep_PolygonOnSurface.hxx>
 #include <BRep_PolygonOnClosedSurface.hxx>
 #include <BRep_CurveOn2Surfaces.hxx>
 
diff --git a/src/ShapePersistent/ShapePersistent_BRep.hxx b/src/ShapePersistent/ShapePersistent_BRep.hxx
index dc2a1c613f..b2f0111a67 100644
--- a/src/ShapePersistent/ShapePersistent_BRep.hxx
+++ b/src/ShapePersistent/ShapePersistent_BRep.hxx
@@ -16,7 +16,6 @@
 #define _ShapePersistent_BRep_HeaderFile
 
 #include <ShapePersistent_TopoDS.hxx>
-#include <ShapePersistent_Geom.hxx>
 #include <ShapePersistent_Geom2d.hxx>
 #include <ShapePersistent_Poly.hxx>
 #include <StdObjMgt_TransientPersistentMap.hxx>
diff --git a/src/ShapePersistent/ShapePersistent_Geom.cxx b/src/ShapePersistent/ShapePersistent_Geom.cxx
index ef8687e9b5..d20cf0e3bd 100644
--- a/src/ShapePersistent/ShapePersistent_Geom.cxx
+++ b/src/ShapePersistent/ShapePersistent_Geom.cxx
@@ -11,12 +11,9 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Standard_NullObject.hxx>
-
 #include <ShapePersistent_Geom.hxx>
 #include <ShapePersistent_Geom_Curve.hxx>
 #include <ShapePersistent_Geom_Surface.hxx>
-#include <StdObject_gp_Axes.hxx>
 #include <StdObject_gp_Vectors.hxx>
 
 
diff --git a/src/ShapePersistent/ShapePersistent_Geom.hxx b/src/ShapePersistent/ShapePersistent_Geom.hxx
index 415c49f56e..2c451fd8d3 100644
--- a/src/ShapePersistent/ShapePersistent_Geom.hxx
+++ b/src/ShapePersistent/ShapePersistent_Geom.hxx
@@ -18,12 +18,9 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_NullObject.hxx>
 
-#include <StdObjMgt_WriteData.hxx>
 #include <StdObjMgt_SharedObject.hxx>
 #include <StdObjMgt_TransientPersistentMap.hxx>
 
-#include <StdObject_gp_Vectors.hxx>
-#include <StdObject_gp_Axes.hxx>
 #include <StdObject_gp_Curves.hxx>
 #include <StdObject_gp_Surfaces.hxx>
 #include <StdObject_gp_Trsfs.hxx>
@@ -34,7 +31,6 @@
 #include <Geom_Axis1Placement.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_Transformation.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 
 class ShapePersistent_Geom : public StdObjMgt_SharedObject
diff --git a/src/ShapePersistent/ShapePersistent_Geom2d.cxx b/src/ShapePersistent/ShapePersistent_Geom2d.cxx
index d24a036a99..666f59c59b 100644
--- a/src/ShapePersistent/ShapePersistent_Geom2d.cxx
+++ b/src/ShapePersistent/ShapePersistent_Geom2d.cxx
@@ -11,8 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Standard_NullObject.hxx>
-
 #include <ShapePersistent_Geom2d.hxx>
 #include <ShapePersistent_Geom2d_Curve.hxx>
 
diff --git a/src/ShapePersistent/ShapePersistent_Geom2d.hxx b/src/ShapePersistent/ShapePersistent_Geom2d.hxx
index 78315edfd1..cbc8fe23ba 100644
--- a/src/ShapePersistent/ShapePersistent_Geom2d.hxx
+++ b/src/ShapePersistent/ShapePersistent_Geom2d.hxx
@@ -15,7 +15,6 @@
 #ifndef _ShapePersistent_Geom2d_HeaderFile
 #define _ShapePersistent_Geom2d_HeaderFile
 
-#include <StdObjMgt_TransientPersistentMap.hxx>
 #include <ShapePersistent_Geom.hxx>
 
 #include <Geom2d_CartesianPoint.hxx>
diff --git a/src/ShapePersistent/ShapePersistent_Geom2d_Curve.hxx b/src/ShapePersistent/ShapePersistent_Geom2d_Curve.hxx
index 9f0cc8549b..02d8db52ca 100644
--- a/src/ShapePersistent/ShapePersistent_Geom2d_Curve.hxx
+++ b/src/ShapePersistent/ShapePersistent_Geom2d_Curve.hxx
@@ -15,8 +15,6 @@
 #ifndef _ShapePersistent_Geom2d_Curve_HeaderFile
 #define _ShapePersistent_Geom2d_Curve_HeaderFile
 
-#include <StdObjMgt_TransientPersistentMap.hxx>
-
 #include <ShapePersistent_Geom2d.hxx>
 #include <ShapePersistent_HArray1.hxx>
 #include <StdLPersistent_HArray1.hxx>
diff --git a/src/ShapePersistent/ShapePersistent_Geom_Surface.hxx b/src/ShapePersistent/ShapePersistent_Geom_Surface.hxx
index 42dda13db2..5efc457f5f 100644
--- a/src/ShapePersistent/ShapePersistent_Geom_Surface.hxx
+++ b/src/ShapePersistent/ShapePersistent_Geom_Surface.hxx
@@ -15,8 +15,6 @@
 #ifndef _ShapePersistent_Geom_Surface_HeaderFile
 #define _ShapePersistent_Geom_Surface_HeaderFile
 
-#include <StdObjMgt_TransientPersistentMap.hxx>
-
 #include <ShapePersistent_Geom.hxx>
 #include <ShapePersistent_HArray2.hxx>
 #include <StdLPersistent_HArray1.hxx>
@@ -30,7 +28,6 @@
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
 
diff --git a/src/ShapePersistent/ShapePersistent_HSequence.cxx b/src/ShapePersistent/ShapePersistent_HSequence.cxx
index c6e5556b5a..25a67dabfe 100644
--- a/src/ShapePersistent/ShapePersistent_HSequence.cxx
+++ b/src/ShapePersistent/ShapePersistent_HSequence.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 #include <StdObjMgt_ReadData.hxx>
-#include <StdObjMgt_WriteData.hxx>
 #include <ShapePersistent_HSequence.hxx>
 
 
diff --git a/src/ShapePersistent/ShapePersistent_Poly.hxx b/src/ShapePersistent/ShapePersistent_Poly.hxx
index 7076d57b4b..bedf4b0aee 100644
--- a/src/ShapePersistent/ShapePersistent_Poly.hxx
+++ b/src/ShapePersistent/ShapePersistent_Poly.hxx
@@ -17,9 +17,6 @@
 
 #include <StdObjMgt_SharedObject.hxx>
 #include <StdObjMgt_TransientPersistentMap.hxx>
-#include <StdObjMgt_ReadData.hxx>
-#include <StdObjMgt_WriteData.hxx>
-#include <StdLPersistent_HArray1.hxx>
 #include <ShapePersistent_HArray1.hxx>
 
 class Poly_Polygon2D;
diff --git a/src/ShapePersistent/ShapePersistent_TopoDS.cxx b/src/ShapePersistent/ShapePersistent_TopoDS.cxx
index 43e37e4aeb..05335da2de 100644
--- a/src/ShapePersistent/ShapePersistent_TopoDS.cxx
+++ b/src/ShapePersistent/ShapePersistent_TopoDS.cxx
@@ -18,7 +18,6 @@
 
 #include <TopoDS.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <TopoDS_Vertex.hxx>
 
 #include <Standard_Assert.hxx>
 
diff --git a/src/ShapePersistent/ShapePersistent_TopoDS.hxx b/src/ShapePersistent/ShapePersistent_TopoDS.hxx
index f265519c2e..82150a4ac3 100644
--- a/src/ShapePersistent/ShapePersistent_TopoDS.hxx
+++ b/src/ShapePersistent/ShapePersistent_TopoDS.hxx
@@ -17,7 +17,6 @@
 
 #include <ShapePersistent_TriangleMode.hxx>
 
-#include <StdPersistent_TopoDS.hxx>
 #include <StdPersistent_HArray1.hxx>
 #include <StdLPersistent_HArray1.hxx>
 #include <StdObject_Shape.hxx>
diff --git a/src/ShapePersistent/ShapePersistent_TriangleMode.hxx b/src/ShapePersistent/ShapePersistent_TriangleMode.hxx
index c537d4cf34..bf4ef3bf26 100644
--- a/src/ShapePersistent/ShapePersistent_TriangleMode.hxx
+++ b/src/ShapePersistent/ShapePersistent_TriangleMode.hxx
@@ -15,8 +15,6 @@
 #ifndef _ShapePersistent_TriangleMode_HeaderFile
 #define _ShapePersistent_TriangleMode_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 
 enum ShapePersistent_TriangleMode
 {
diff --git a/src/ShapeProcess/ShapeProcess.hxx b/src/ShapeProcess/ShapeProcess.hxx
index b8408d5b20..81e91ea6d8 100644
--- a/src/ShapeProcess/ShapeProcess.hxx
+++ b/src/ShapeProcess/ShapeProcess.hxx
@@ -20,8 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Message_ProgressRange.hxx>
 
 class ShapeProcess_Operator;
diff --git a/src/ShapeProcess/ShapeProcess_Context.hxx b/src/ShapeProcess/ShapeProcess_Context.hxx
index d6e572068c..b1c2168ca7 100644
--- a/src/ShapeProcess/ShapeProcess_Context.hxx
+++ b/src/ShapeProcess/ShapeProcess_Context.hxx
@@ -22,9 +22,6 @@
 #include <TColStd_HSequenceOfHAsciiString.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Resource_Manager;
 class Message_Messenger;
 class TCollection_AsciiString;
diff --git a/src/ShapeProcess/ShapeProcess_OperLibrary.cxx b/src/ShapeProcess/ShapeProcess_OperLibrary.cxx
index ede8305a68..71be9188df 100644
--- a/src/ShapeProcess/ShapeProcess_OperLibrary.cxx
+++ b/src/ShapeProcess/ShapeProcess_OperLibrary.cxx
@@ -16,9 +16,7 @@
 
 #include <BRep_Builder.hxx>
 #include <BRepLib.hxx>
-#include <BRepTools_Modification.hxx>
 #include <BRepTools_Modifier.hxx>
-#include <Message_MsgFile.hxx>
 #include <Message_ProgressScope.hxx>
 #include <Precision.hxx>
 #include <ShapeBuild_ReShape.hxx>
@@ -28,10 +26,8 @@
 #include <ShapeCustom_DirectModification.hxx>
 #include <ShapeCustom_RestrictionParameters.hxx>
 #include <ShapeCustom_SweptToElementary.hxx>
-#include <ShapeExtend.hxx>
 #include <ShapeExtend_MsgRegistrator.hxx>
 #include <ShapeFix.hxx>
-#include <ShapeFix_Face.hxx>
 #include <ShapeFix_FixSmallFace.hxx>
 #include <ShapeFix_FixSmallSolid.hxx>
 #include <ShapeFix_Shape.hxx>
diff --git a/src/ShapeProcess/ShapeProcess_Operator.hxx b/src/ShapeProcess/ShapeProcess_Operator.hxx
index d12586f2dc..bdfa380c4c 100644
--- a/src/ShapeProcess/ShapeProcess_Operator.hxx
+++ b/src/ShapeProcess/ShapeProcess_Operator.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Message_ProgressRange.hxx>
 
 class ShapeProcess_Context;
diff --git a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
index 135f14b36c..e24d82e595 100644
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
@@ -16,19 +16,15 @@
 
 #include <BRep_Builder.hxx>
 #include <BRepTools_Modifier.hxx>
-#include <Message_ListIteratorOfListOfMsg.hxx>
-#include <Message_ListOfMsg.hxx>
 #include <Message_Messenger.hxx>
 #include <Message_Msg.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend_DataMapOfShapeListOfMsg.hxx>
 #include <ShapeExtend_MsgRegistrator.hxx>
 #include <ShapeProcess_ShapeContext.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_ShapeContext,ShapeProcess_Context)
 
diff --git a/src/ShapeProcess/ShapeProcess_ShapeContext.hxx b/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
index e2ccf74015..c1aeaa3a85 100644
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
@@ -23,9 +23,7 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <ShapeProcess_Context.hxx>
-#include <Standard_CString.hxx>
 #include <Message_Gravity.hxx>
-#include <Standard_Boolean.hxx>
 #include <GeomAbs_Shape.hxx>
 class ShapeExtend_MsgRegistrator;
 class ShapeBuild_ReShape;
diff --git a/src/ShapeProcess/ShapeProcess_UOperator.cxx b/src/ShapeProcess/ShapeProcess_UOperator.cxx
index c5c92d01db..bc49fe29a4 100644
--- a/src/ShapeProcess/ShapeProcess_UOperator.cxx
+++ b/src/ShapeProcess/ShapeProcess_UOperator.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <ShapeProcess_Context.hxx>
 #include <ShapeProcess_UOperator.hxx>
 #include <Standard_Type.hxx>
 
diff --git a/src/ShapeProcess/ShapeProcess_UOperator.hxx b/src/ShapeProcess/ShapeProcess_UOperator.hxx
index 9a777cd6b8..865e8de8e5 100644
--- a/src/ShapeProcess/ShapeProcess_UOperator.hxx
+++ b/src/ShapeProcess/ShapeProcess_UOperator.hxx
@@ -17,11 +17,9 @@
 #define _ShapeProcess_UOperator_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <ShapeProcess_OperFunc.hxx>
 #include <ShapeProcess_Operator.hxx>
-#include <Standard_Boolean.hxx>
 class ShapeProcess_Context;
 
 
diff --git a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
index 3c990713ea..bc42326382 100644
--- a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
+++ b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.cxx
@@ -24,7 +24,6 @@
 #include <ShapeProcessAPI_ApplySequence.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 
 //=======================================================================
 //function : ShapeProcessAPI_ApplySequence
diff --git a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.hxx b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.hxx
index f38313b65e..20e2b7fbd4 100644
--- a/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.hxx
+++ b/src/ShapeProcessAPI/ShapeProcessAPI_ApplySequence.hxx
@@ -24,7 +24,6 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <Message_ProgressRange.hxx>
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
index 5d64264cfe..9712a5ca9b 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <ShapeUpgrade_EdgeDivide.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Edge;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
index 07b335441e..332a87e3ea 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
@@ -19,7 +19,6 @@
 #include <BRep_Tool.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
-#include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
index db34cc82dd..71cc375834 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_FaceDivide.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Face;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
index ee833c04c4..cf2aefafdd 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_Conic.hxx>
 #include <Geom2d_Line.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
@@ -24,7 +23,6 @@
 #include <Geom2dConvert_ApproxCurve.hxx>
 #include <Geom2dConvert_BSplineCurveToBezierCurve.hxx>
 #include <Geom_Curve.hxx>
-#include <GeomTools.hxx>
 #include <Precision.hxx>
 #include <ShapeCustom_Curve2d.hxx>
 #include <ShapeExtend.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
index 80e36d2f7e..b15dfc1a64 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
@@ -21,9 +21,7 @@
 #include <Standard_Type.hxx>
 
 #include <TColGeom2d_HSequenceOfCurve.hxx>
-#include <TColStd_HSequenceOfReal.hxx>
 #include <ShapeUpgrade_SplitCurve2d.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class ShapeUpgrade_ConvertCurve2dToBezier;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
index ff37b00514..d7745ed114 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Conic.hxx>
 #include <Geom_Curve.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
index 55946c969f..598244389f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TColGeom_HSequenceOfCurve.hxx>
-#include <TColStd_HSequenceOfReal.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeUpgrade_SplitCurve3d.hxx>
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
index 7da3a3aba1..ff0c54fe2b 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
@@ -17,8 +17,6 @@
 //   svv  10.01.00 porting on DEC
 
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_OffsetCurve.hxx>
 #include <Geom_OffsetSurface.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
index cc35bed8fe..73d61140be 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <ShapeUpgrade_SplitSurface.hxx>
 class ShapeExtend_CompositeSurface;
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
index a4853de025..6198c8d0d6 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 #include <ShapeUpgrade_Tool.hxx>
 class ShapeUpgrade_SplitCurve3d;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
index 15e7093602..e27af14a5f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
@@ -22,8 +22,6 @@
 #include <BRepTools.hxx>
 #include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
-#include <ShapeAnalysis_Edge.hxx>
-#include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeExtend_CompositeSurface.hxx>
@@ -34,7 +32,6 @@
 #include <Standard_Type.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
index 5653bfa294..9db1c50854 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Face.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_Tool.hxx>
 #include <ShapeExtend_Status.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
index 9b04ca60e3..bfb3d1b62f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
@@ -19,9 +19,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <ShapeUpgrade_FaceDivide.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Face;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
index 3c280fc0e4..280556d335 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
@@ -26,8 +26,6 @@
 #include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomConvert_ApproxCurve.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeUpgrade_FixSmallBezierCurves.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
index 2bc19bfcd1..92a984d167 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
@@ -20,8 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <ShapeUpgrade_FixSmallCurves.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class Geom_Curve;
 class Geom2d_Curve;
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
index d678acedf8..16f579355c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
@@ -14,11 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Geom2d_Curve.hxx>
-#include <Geom_Curve.hxx>
 #include <ShapeUpgrade_FixSmallCurves.hxx>
-#include <ShapeUpgrade_SplitCurve2d.hxx>
-#include <ShapeUpgrade_SplitCurve3d.hxx>
 #include <Standard_Type.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
@@ -30,10 +26,6 @@ IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_FixSmallCurves,ShapeUpgrade_Tool)
 #//include <TColGeom2d_HArray1OfCurve.hxx>
 //#include <TColStd_HSequenceOfReal.hxx>
 #include <ShapeExtend.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom2d_Curve.hxx>
 #include <ShapeUpgrade_SplitCurve3d.hxx>
 #include <ShapeUpgrade_SplitCurve2d.hxx>
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
index 6a49e5d3f5..3ad413151f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
@@ -17,13 +17,11 @@
 #define _ShapeUpgrade_FixSmallCurves_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <ShapeUpgrade_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <ShapeExtend_Status.hxx>
 class ShapeUpgrade_SplitCurve3d;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
index d6608f5055..1b000c1366 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
@@ -15,7 +15,6 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis.hxx>
 #include <ShapeBuild_ReShape.hxx>
-#include <ShapeExtend.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeUpgrade_RemoveInternalWires.hxx>
 #include <Standard_Type.hxx>
@@ -29,7 +28,6 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
index ca1c0e35e8..77c0483cc5 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
@@ -20,8 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
index f6b1d62ebb..caba9bfb61 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
@@ -13,9 +13,6 @@
 
 
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_GCurve.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <Geom2d_Curve.hxx>
@@ -24,15 +21,10 @@
 #include <Geom_Plane.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Trsf.hxx>
-#include <ShapeBuild_Edge.hxx>
 #include <ShapeUpgrade_RemoveLocations.hxx>
 #include <Standard_Type.hxx>
-#include <TColStd_ListIteratorOfListOfTransient.hxx>
-#include <TColStd_ListOfTransient.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
@@ -40,7 +32,6 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopTools_DataMapOfShapeShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_RemoveLocations,Standard_Transient)
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
index 85a41306bb..37ed957ba0 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
@@ -23,7 +23,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class ShapeUpgrade_RemoveLocations;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx
index 928df17808..58ef035a1c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.cxx
@@ -30,7 +30,6 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeBuild_Edge.hxx>
-#include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <ShapeUpgrade_ConvertCurve2dToBezier.hxx>
 #include <ShapeUpgrade_ConvertCurve3dToBezier.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.hxx
index c2cdceea65..d3d73bde44 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeConvertToBezier.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_ShapeDivide.hxx>
 class TopoDS_Shape;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx
index b4b4f85e88..464afac5ee 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopoDS_Shape.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Message_Gravity.hxx>
 #include <ShapeExtend_Status.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.hxx
index 16c7d5305e..09db4c187c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideAngle.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <ShapeUpgrade_ShapeDivide.hxx>
-#include <Standard_Real.hxx>
 class TopoDS_Shape;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideArea.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideArea.hxx
index b2ef16af00..cf0b13674b 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideArea.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideArea.hxx
@@ -20,7 +20,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Real.hxx>
 #include <ShapeUpgrade_ShapeDivide.hxx>
 class TopoDS_Shape;
 class ShapeUpgrade_FaceDivide;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.hxx
index 3b588f820a..008fa9bb60 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosed.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <ShapeUpgrade_ShapeDivide.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.hxx
index 8b95ffb356..640c06303d 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideClosedEdges.hxx
@@ -18,7 +18,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <ShapeUpgrade_ShapeDivide.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideContinuity.hxx
index b4901d2ab2..e4bb8a5c46 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivideContinuity.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Real.hxx>
 #include <ShapeUpgrade_ShapeDivide.hxx>
 class TopoDS_Shape;
 class ShapeUpgrade_FaceDivide;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx
index 4cdf3f43ba..73001b62a7 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.cxx
@@ -18,7 +18,6 @@
 #include <ShapeAnalysis_ShapeTolerance.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeUpgrade_ShellSewing.hxx>
-#include <ShapeUpgrade_WireDivide.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.hxx b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.hxx
index 83268d23cf..3790c69f78 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ShellSewing.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 class ShapeBuild_ReShape;
 class TopoDS_Shape;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
index 7d47ecb6a3..a80af8aeac 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
@@ -24,7 +24,6 @@
 #include <Standard_Type.hxx>
 #include <TColGeom_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
-#include <TColStd_ListIteratorOfListOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve,Standard_Transient)
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
index c6f8155469..75cd151cca 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
@@ -23,8 +23,6 @@
 #include <TColStd_HSequenceOfReal.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
 
 // resolve name collisions with X11 headers
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
index 23783b9e5d..e78e550aa3 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
@@ -23,14 +23,12 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeExtend.hxx>
-#include <ShapeUpgrade.hxx>
 #include <ShapeUpgrade_SplitCurve2d.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom2d_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
-#include <TColStd_ListIteratorOfListOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2d,ShapeUpgrade_SplitCurve)
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
index e6a6e180fc..6cf7a2f30f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
@@ -22,8 +22,6 @@
 
 #include <TColGeom2d_HArray1OfCurve.hxx>
 #include <ShapeUpgrade_SplitCurve.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class Geom2d_Curve;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
index 1bc531f978..e58fec2990 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
@@ -25,7 +25,6 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
-#include <TColGeom2d_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2dContinuity,ShapeUpgrade_SplitCurve2d)
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
index 4fdf595ee0..759a2aff43 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
@@ -22,7 +22,6 @@
 
 #include <GeomAbs_Shape.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <ShapeUpgrade_SplitCurve2d.hxx>
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
index fb2a168bdb..d9e1e931cd 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
@@ -23,14 +23,12 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeExtend.hxx>
-#include <ShapeUpgrade.hxx>
 #include <ShapeUpgrade_SplitCurve3d.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
 #include <TColGeom_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
-#include <TColStd_ListIteratorOfListOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3d,ShapeUpgrade_SplitCurve)
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
index c305a048a5..c49d6a50d9 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
@@ -22,8 +22,6 @@
 
 #include <TColGeom_HArray1OfCurve.hxx>
 #include <ShapeUpgrade_SplitCurve.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 class Geom_Curve;
 
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
index a8da8a2158..ebaf87e030 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
@@ -26,7 +26,6 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
-#include <TColGeom_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3dContinuity,ShapeUpgrade_SplitCurve3d)
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
index 58b53e6422..5e8bdf3136 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_SplitCurve3d.hxx>
 class Geom_Curve;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
index 13153ab5ff..f5b5180ac4 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
@@ -17,13 +17,11 @@
 //    gka 30.04.99 S4137: extended for all types of surfaces
 
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
-#include <gp_Ax1.hxx>
 #include <Precision.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeExtend_CompositeSurface.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
index 985f8e3bea..15c8f80f65 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
@@ -23,8 +23,6 @@
 #include <TColStd_HSequenceOfReal.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
 class Geom_Surface;
 class ShapeExtend_CompositeSurface;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
index 134efd1f74..e5dc99c8ad 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
@@ -20,9 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <ShapeUpgrade_SplitSurface.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class ShapeUpgrade_SplitSurfaceAngle;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
index 5681cb4901..96eafcfe24 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
@@ -21,7 +21,6 @@
 
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_SplitSurface.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class ShapeUpgrade_SplitSurfaceArea;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
index e2660fea6d..eb252bddc0 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
@@ -15,22 +15,17 @@
 // commercial license or contractual agreement.
 
 
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_OffsetSurface.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_SweptSurface.hxx>
-#include <gp_Ax1.hxx>
 #include <Precision.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeUpgrade.hxx>
 #include <ShapeUpgrade_SplitCurve3dContinuity.hxx>
 #include <ShapeUpgrade_SplitSurfaceContinuity.hxx>
 #include <Standard_Type.hxx>
-#include <TColGeom_HArray1OfCurve.hxx>
-#include <TColGeom_HArray2OfSurface.hxx>
-#include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceContinuity,ShapeUpgrade_SplitSurface)
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
index 7109639332..bec257a140 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
@@ -21,10 +21,8 @@
 #include <Standard_Type.hxx>
 
 #include <GeomAbs_Shape.hxx>
-#include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_SplitSurface.hxx>
-#include <Standard_Boolean.hxx>
 
 
 class ShapeUpgrade_SplitSurfaceContinuity;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx b/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
index 9052c23037..febdf6116a 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 class ShapeBuild_ReShape;
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
index f48c390f0f..38bf20fbce 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
@@ -18,11 +18,8 @@
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
-#include <BRepLib_MakeEdge.hxx>
-#include <BRepLib_MakeFace.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
 #include <GC_MakeCircle.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom2d_Circle.hxx>
 #include <GCE2d_MakeLine.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
@@ -30,14 +27,12 @@
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_Parabola.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_ElementarySurface.hxx>
 #include <Geom_Line.hxx>
-#include <Geom_OffsetSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
@@ -45,7 +40,6 @@
 #include <Geom_SurfaceOfRevolution.hxx>
 #include <Geom_SweptSurface.hxx>
 #include <Geom_TrimmedCurve.hxx>
-#include <GeomAdaptor_Surface.hxx>
 #include <GeomConvert.hxx>
 #include <GeomConvert_ApproxSurface.hxx>
 #include <GeomConvert_CompCurveToBSplineCurve.hxx>
@@ -57,10 +51,8 @@
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeAnalysis_Surface.hxx>
-#include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
 #include <ShapeConstruct_ProjectCurveOnSurface.hxx>
-#include <ShapeFix_Edge.hxx>
 #include <ShapeFix_Face.hxx>
 #include <ShapeFix_Shell.hxx>
 #include <ShapeFix_Wire.hxx>
@@ -83,7 +75,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <gp_Circ.hxx>
@@ -96,9 +87,6 @@
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <ElCLib.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakeWire.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
 #include <ElSLib.hxx>
 #include <GeomProjLib.hxx>
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
index 714ee5295e..0bd2850378 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
@@ -24,10 +24,8 @@
 #include <BRep_Tool.hxx>
 #include <BRepLib_MakeFace.hxx>
 #include <BRepLib_MakeWire.hxx>
-#include <Geom2d_BoundedCurve.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
-#include <Geom_BoundedCurve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Surface.hxx>
@@ -35,7 +33,6 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
-#include <ShapeAnalysis_TransferParameters.hxx>
 #include <ShapeAnalysis_TransferParametersProj.hxx>
 #include <ShapeBuild_Edge.hxx>
 #include <ShapeBuild_ReShape.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
index 6a200fc314..88d3d4a5ba 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
@@ -24,7 +24,6 @@
 #include <TopoDS_Wire.hxx>
 #include <Standard_Integer.hxx>
 #include <ShapeUpgrade_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <ShapeExtend_Status.hxx>
 class ShapeUpgrade_SplitCurve3d;
 class ShapeUpgrade_SplitCurve2d;
diff --git a/src/Standard/Standard_CString.cxx b/src/Standard/Standard_CString.cxx
index df696d77e1..f73d6b6940 100755
--- a/src/Standard/Standard_CString.cxx
+++ b/src/Standard/Standard_CString.cxx
@@ -18,8 +18,6 @@
 //          resizing of a Map or copying an item from a Map to another Map.
 //        - three methods of HashCoding of strings converted to uppercase.
 
-#include <Standard_Type.hxx>
-
 #include <Standard_CLocaleSentry.hxx>
 #include <Standard_CString.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/Standard/Standard_Character.hxx b/src/Standard/Standard_Character.hxx
index 3d85fe6cbd..e29f1a4c55 100644
--- a/src/Standard/Standard_Character.hxx
+++ b/src/Standard/Standard_Character.hxx
@@ -25,7 +25,6 @@
 
 #include <Standard_TypeDef.hxx>
 
-#include <string.h>
 #include <cctype>
 
 // ------------------------------------------------------------------
diff --git a/src/Standard/Standard_ExtCharacter.hxx b/src/Standard/Standard_ExtCharacter.hxx
index 926bb9e0b7..71563bb185 100644
--- a/src/Standard/Standard_ExtCharacter.hxx
+++ b/src/Standard/Standard_ExtCharacter.hxx
@@ -25,8 +25,6 @@
 
 #include <Standard_TypeDef.hxx>
 
-#include <string.h>
-
 // ===============
 // inline methods 
 // ===============
diff --git a/src/Standard/Standard_GUID.hxx b/src/Standard/Standard_GUID.hxx
index 1e4dac4c05..148e511161 100644
--- a/src/Standard/Standard_GUID.hxx
+++ b/src/Standard/Standard_GUID.hxx
@@ -17,18 +17,13 @@
 #ifndef _Standard_GUID_HeaderFile
 #define _Standard_GUID_HeaderFile
 
-#include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_ExtCharacter.hxx>
-#include <Standard_Byte.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_ExtString.hxx>
 #include <Standard_UUID.hxx>
 #include <Standard_PCharacter.hxx>
 #include <Standard_PExtCharacter.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_OStream.hxx>
 
 #define Standard_GUID_SIZE 36
diff --git a/src/Standard/Standard_IStream.hxx b/src/Standard/Standard_IStream.hxx
index da43649b4d..7867ec6de3 100644
--- a/src/Standard/Standard_IStream.hxx
+++ b/src/Standard/Standard_IStream.hxx
@@ -15,7 +15,6 @@
 #ifndef _Standard_IStream_HeaderFile
 #define _Standard_IStream_HeaderFile
 
-#include <Standard_Macro.hxx>
 #include <Standard_Stream.hxx>
 
 typedef std::istream Standard_IStream;
diff --git a/src/Standard/Standard_JmpBuf.hxx b/src/Standard/Standard_JmpBuf.hxx
index f7d22cc924..ea6b809e8a 100644
--- a/src/Standard/Standard_JmpBuf.hxx
+++ b/src/Standard/Standard_JmpBuf.hxx
@@ -14,7 +14,6 @@
 #ifndef _Standard_JmpBuf_HeaderFile
 #define _Standard_JmpBuf_HeaderFile
 
-#include <stdlib.h>
 #include <setjmp.h>
 
 typedef 
diff --git a/src/Standard/Standard_MMgrRaw.cxx b/src/Standard/Standard_MMgrRaw.cxx
index 302053d5f0..83ec139446 100644
--- a/src/Standard/Standard_MMgrRaw.cxx
+++ b/src/Standard/Standard_MMgrRaw.cxx
@@ -15,7 +15,6 @@
 
 #include <Standard_MMgrRaw.hxx>
 #include <Standard_OutOfMemory.hxx>
-#include <stdlib.h>
 
 //=======================================================================
 //function : Standard_MMgrRaw
diff --git a/src/Standard/Standard_MMgrRoot.cxx b/src/Standard/Standard_MMgrRoot.cxx
index 392685944d..abba3d246b 100644
--- a/src/Standard/Standard_MMgrRoot.cxx
+++ b/src/Standard/Standard_MMgrRoot.cxx
@@ -13,7 +13,6 @@
 // commercial license or contractual agreement.
 
 #include <Standard_MMgrRoot.hxx>
-#include <stdlib.h>
 
 //=======================================================================
 //function : ~Standard_MMgrRoot
diff --git a/src/Standard/Standard_Mutex.cxx b/src/Standard/Standard_Mutex.cxx
index f7bccb85d6..41090571de 100644
--- a/src/Standard/Standard_Mutex.cxx
+++ b/src/Standard/Standard_Mutex.cxx
@@ -15,8 +15,6 @@
 
 #include <Standard_Mutex.hxx>
 
-#include <errno.h>
-
 //=============================================
 // Standard_Mutex::Standard_Mutex
 //=============================================
diff --git a/src/Standard/Standard_OStream.hxx b/src/Standard/Standard_OStream.hxx
index c6ef90942b..b94d0a4627 100644
--- a/src/Standard/Standard_OStream.hxx
+++ b/src/Standard/Standard_OStream.hxx
@@ -15,7 +15,6 @@
 #ifndef _Standard_OStream_HeaderFile
 #define _Standard_OStream_HeaderFile
 
-#include <Standard_TypeDef.hxx>
 #include <Standard_Stream.hxx>
 
 typedef std::ostream Standard_OStream;
diff --git a/src/Standard/Standard_OutOfMemory.hxx b/src/Standard/Standard_OutOfMemory.hxx
index ad81c2674b..0edcc3c366 100644
--- a/src/Standard/Standard_OutOfMemory.hxx
+++ b/src/Standard/Standard_OutOfMemory.hxx
@@ -18,8 +18,6 @@
 #define _Standard_OutOfMemory_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
-#include <Standard_SStream.hxx>
 #include <Standard_ProgramError.hxx>
 
 class Standard_OutOfMemory;
diff --git a/src/Standard/Standard_OutOfRange.hxx b/src/Standard/Standard_OutOfRange.hxx
index 2b81dedd9a..77b6382fdd 100644
--- a/src/Standard/Standard_OutOfRange.hxx
+++ b/src/Standard/Standard_OutOfRange.hxx
@@ -18,7 +18,6 @@
 #define _Standard_OutOfRange_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
 #include <Standard_SStream.hxx>
 #include <Standard_RangeError.hxx>
 
diff --git a/src/Standard/Standard_RangeError.hxx b/src/Standard/Standard_RangeError.hxx
index 2f10deeafb..23a4548645 100644
--- a/src/Standard/Standard_RangeError.hxx
+++ b/src/Standard/Standard_RangeError.hxx
@@ -18,7 +18,6 @@
 #define _Standard_RangeError_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
 #include <Standard_SStream.hxx>
 #include <Standard_DomainError.hxx>
 
diff --git a/src/Standard/Standard_Real.cxx b/src/Standard/Standard_Real.cxx
index 8bf29fb5e5..f43762aeed 100644
--- a/src/Standard/Standard_Real.cxx
+++ b/src/Standard/Standard_Real.cxx
@@ -14,7 +14,6 @@
 
 #include <float.h>
 #include <Standard_Real.hxx>
-#include <Standard_RangeError.hxx>
 #include <Standard_NumericError.hxx>
 #include <Standard_NullValue.hxx>
 #include <Standard_Stream.hxx>
diff --git a/src/Standard/Standard_SStream.hxx b/src/Standard/Standard_SStream.hxx
index d5fb2035aa..ff56aff66c 100644
--- a/src/Standard/Standard_SStream.hxx
+++ b/src/Standard/Standard_SStream.hxx
@@ -15,7 +15,6 @@
 #ifndef _Standard_SStream_HeaderFile
 #define _Standard_SStream_HeaderFile
 
-#include <Standard_Stream.hxx>
 #include <sstream>
 
 //! Defines Standard_SStream as typedef to C++ string stream.
diff --git a/src/Standard/Standard_ShortReal.cxx b/src/Standard/Standard_ShortReal.cxx
index fe42f1adc3..f3c123e13c 100644
--- a/src/Standard/Standard_ShortReal.cxx
+++ b/src/Standard/Standard_ShortReal.cxx
@@ -13,9 +13,7 @@
 // commercial license or contractual agreement.
 
 #include <Standard_ShortReal.hxx>
-#include <Standard_RangeError.hxx>
 #include <Standard_NullValue.hxx>
-#include <Standard_Stream.hxx>
 
 //============================================================================
 // function : HashCode
diff --git a/src/Standard/Standard_TooManyUsers.hxx b/src/Standard/Standard_TooManyUsers.hxx
index 087cfb3346..55af97e910 100644
--- a/src/Standard/Standard_TooManyUsers.hxx
+++ b/src/Standard/Standard_TooManyUsers.hxx
@@ -18,7 +18,6 @@
 #define _Standard_TooManyUsers_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
 #include <Standard_SStream.hxx>
 #include <Standard_LicenseError.hxx>
 
diff --git a/src/Standard/Standard_Type.cxx b/src/Standard/Standard_Type.cxx
index db42bc039d..546cbafa85 100644
--- a/src/Standard/Standard_Type.cxx
+++ b/src/Standard/Standard_Type.cxx
@@ -15,7 +15,6 @@
 
 #include <Standard_Type.hxx>
 #include <Standard_Mutex.hxx>
-#include <Standard_Assert.hxx>
 
 #include <NCollection_DataMap.hxx>
 
diff --git a/src/Standard/Standard_TypeMismatch.hxx b/src/Standard/Standard_TypeMismatch.hxx
index 4c29d4a29c..b16706858d 100644
--- a/src/Standard/Standard_TypeMismatch.hxx
+++ b/src/Standard/Standard_TypeMismatch.hxx
@@ -18,7 +18,6 @@
 #define _Standard_TypeMismatch_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Standard_DefineException.hxx>
 #include <Standard_SStream.hxx>
 #include <Standard_DomainError.hxx>
 
diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx
index ff136e0c99..09b69deb7a 100644
--- a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx
@@ -14,7 +14,6 @@
 #include <StdLDrivers_DocumentRetrievalDriver.hxx>
 #include <StdLDrivers.hxx>
 
-#include <StdObjMgt_Persistent.hxx>
 #include <StdObjMgt_MapOfInstantiators.hxx>
 #include <StdObjMgt_ReadData.hxx>
 
@@ -32,7 +31,6 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <NCollection_Array1.hxx>
-#include <NCollection_Handle.hxx>
 #include <TDocStd_Document.hxx>
 #include <Storage_Schema.hxx>
 
diff --git a/src/StdLPersistent/StdLPersistent.cxx b/src/StdLPersistent/StdLPersistent.cxx
index d4f00d9727..fb61ae64ea 100644
--- a/src/StdLPersistent/StdLPersistent.cxx
+++ b/src/StdLPersistent/StdLPersistent.cxx
@@ -16,9 +16,7 @@
 
 #include <StdLPersistent_Document.hxx>
 #include <StdLPersistent_Data.hxx>
-#include <StdLPersistent_HString.hxx>
 #include <StdLPersistent_HArray1.hxx>
-#include <StdLPersistent_HArray2.hxx>
 #include <StdLPersistent_Void.hxx>
 #include <StdLPersistent_Real.hxx>
 #include <StdLPersistent_Value.hxx>
diff --git a/src/StdLPersistent/StdLPersistent_Data.hxx b/src/StdLPersistent/StdLPersistent_Data.hxx
index 48cca0636f..9224d76e9e 100644
--- a/src/StdLPersistent/StdLPersistent_Data.hxx
+++ b/src/StdLPersistent/StdLPersistent_Data.hxx
@@ -15,7 +15,6 @@
 #ifndef _StdLPersistent_Data_HeaderFile
 #define _StdLPersistent_Data_HeaderFile
 
-#include <StdObjMgt_Persistent.hxx>
 #include <StdLPersistent_HArray1.hxx>
 
 class TDF_Data;
diff --git a/src/StdLPersistent/StdLPersistent_Dependency.hxx b/src/StdLPersistent/StdLPersistent_Dependency.hxx
index c427efc6f3..c4cdf0e3ea 100644
--- a/src/StdLPersistent/StdLPersistent_Dependency.hxx
+++ b/src/StdLPersistent/StdLPersistent_Dependency.hxx
@@ -19,7 +19,6 @@
 #include <StdLPersistent_HString.hxx>
 #include <StdLPersistent_HArray1.hxx>
 
-#include <TDataStd_Expression.hxx>
 #include <TDataStd_Relation.hxx>
 
 
diff --git a/src/StdLPersistent/StdLPersistent_HArray1.hxx b/src/StdLPersistent/StdLPersistent_HArray1.hxx
index ed88bf6ea5..dbaf1f898a 100644
--- a/src/StdLPersistent/StdLPersistent_HArray1.hxx
+++ b/src/StdLPersistent/StdLPersistent_HArray1.hxx
@@ -22,8 +22,6 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>
 
-#include <NCollection_DefineHArray1.hxx>
-
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfByte.hxx>
diff --git a/src/StdLPersistent/StdLPersistent_HArray2.cxx b/src/StdLPersistent/StdLPersistent_HArray2.cxx
index dffa7662d5..279b52b703 100644
--- a/src/StdLPersistent/StdLPersistent_HArray2.cxx
+++ b/src/StdLPersistent/StdLPersistent_HArray2.cxx
@@ -13,9 +13,6 @@
 
 #include <StdLPersistent_HArray2.hxx>
 
-#include <TColStd_HArray2OfInteger.hxx>
-#include <TColStd_HArray2OfReal.hxx>
-
 
 //=======================================================================
 //function : Read
diff --git a/src/StdLPersistent/StdLPersistent_HArray2.hxx b/src/StdLPersistent/StdLPersistent_HArray2.hxx
index f88b0281d8..664209efd7 100644
--- a/src/StdLPersistent/StdLPersistent_HArray2.hxx
+++ b/src/StdLPersistent/StdLPersistent_HArray2.hxx
@@ -22,8 +22,6 @@
 #include <StdObjMgt_ReadData.hxx>
 #include <StdObjMgt_WriteData.hxx>
 
-#include <NCollection_DefineHArray2.hxx>
-
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
diff --git a/src/StdObject/StdObject_Shape.cxx b/src/StdObject/StdObject_Shape.cxx
index 5950fb34ae..e5045abb42 100644
--- a/src/StdObject/StdObject_Shape.cxx
+++ b/src/StdObject/StdObject_Shape.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 #include <StdObject_Shape.hxx>
-#include <StdObjMgt_ReadData.hxx>
 
 
 //=======================================================================
diff --git a/src/StdObject/StdObject_Shape.hxx b/src/StdObject/StdObject_Shape.hxx
index 9a53d23b7d..9a9da7da42 100644
--- a/src/StdObject/StdObject_Shape.hxx
+++ b/src/StdObject/StdObject_Shape.hxx
@@ -15,8 +15,6 @@
 #ifndef _StdObject_Shape_HeaderFile
 #define _StdObject_Shape_HeaderFile
 
-#include <StdObjMgt_ReadData.hxx>
-#include <StdObjMgt_WriteData.hxx>
 #include <StdObject_Location.hxx>
 #include <StdPersistent_TopoDS.hxx>
 
diff --git a/src/StdObject/StdObject_gp_Axes.hxx b/src/StdObject/StdObject_gp_Axes.hxx
index 105487e24e..7fd14a1a57 100644
--- a/src/StdObject/StdObject_gp_Axes.hxx
+++ b/src/StdObject/StdObject_gp_Axes.hxx
@@ -20,8 +20,6 @@
 
 #include <gp_Ax2d.hxx>
 #include <gp_Ax22d.hxx>
-#include <gp_Ax1.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 
 
diff --git a/src/StdObject/StdObject_gp_Curves.hxx b/src/StdObject/StdObject_gp_Curves.hxx
index 4ea0132d94..f91b80b365 100644
--- a/src/StdObject/StdObject_gp_Curves.hxx
+++ b/src/StdObject/StdObject_gp_Curves.hxx
@@ -23,7 +23,6 @@
 #include <gp_Elips2d.hxx>
 #include <gp_Hypr2d.hxx>
 #include <gp_Parab2d.hxx>
-#include <gp_Lin.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Elips.hxx>
 #include <gp_Hypr.hxx>
diff --git a/src/StdPersistent/StdPersistent.cxx b/src/StdPersistent/StdPersistent.cxx
index 94cd3c5714..8f2917b608 100644
--- a/src/StdPersistent/StdPersistent.cxx
+++ b/src/StdPersistent/StdPersistent.cxx
@@ -15,7 +15,6 @@
 #include <StdObjMgt_MapOfInstantiators.hxx>
 
 #include <StdPersistent_TopLoc.hxx>
-#include <StdPersistent_TopoDS.hxx>
 #include <StdPersistent_Naming.hxx>
 #include <StdPersistent_HArray1.hxx>
 #include <StdLPersistent_HArray1.hxx>
diff --git a/src/StdPersistent/StdPersistent_DataXtd.hxx b/src/StdPersistent/StdPersistent_DataXtd.hxx
index 925ae55f9f..3a720933e3 100644
--- a/src/StdPersistent/StdPersistent_DataXtd.hxx
+++ b/src/StdPersistent/StdPersistent_DataXtd.hxx
@@ -15,7 +15,6 @@
 #ifndef _StdPersistent_DataXtd_HeaderFile
 #define _StdPersistent_DataXtd_HeaderFile
 
-#include <StdObjMgt_Attribute.hxx>
 #include <StdLPersistent_Void.hxx>
 #include <StdObject_gp_Vectors.hxx>
 
diff --git a/src/StdPersistent/StdPersistent_Naming.hxx b/src/StdPersistent/StdPersistent_Naming.hxx
index 78cf6ecb7e..96a39b10b7 100644
--- a/src/StdPersistent/StdPersistent_Naming.hxx
+++ b/src/StdPersistent/StdPersistent_Naming.hxx
@@ -21,7 +21,6 @@
 #include <StdLPersistent_HArray1.hxx>
 #include <StdLPersistent_HString.hxx>
 
-#include <TNaming_NamedShape.hxx>
 #include <TNaming_Naming.hxx>
 
 class TNaming_Name;
diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
index 2ab855c489..ab2d9b3c9f 100644
--- a/src/StdPrs/StdPrs_BRepFont.cxx
+++ b/src/StdPrs/StdPrs_BRepFont.cxx
@@ -21,22 +21,18 @@
 #include <BRepLib_MakeEdge.hxx>
 #include <Font_FTLibrary.hxx>
 #include <Font_FontMgr.hxx>
-#include <Font_TextFormatter.hxx>
 #include <GCE2d_MakeSegment.hxx>
-#include <GC_MakeSegment.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom2d_TrimmedCurve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
 #include <Geom2d_Line.hxx>
 #include <GeomAPI.hxx>
 #include <GeomAdaptor_Surface.hxx>
 #include <GeomLib.hxx>
 #include <gp_Pln.hxx>
-#include <TColGeom2d_HSequenceOfBoundedCurve.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <TopExp.hxx>
@@ -50,7 +46,6 @@
 #ifdef HAVE_FREETYPE
   #include <ft2build.h>
   #include FT_FREETYPE_H
-  #include FT_OUTLINE_H
 #endif
 
 IMPLEMENT_STANDARD_RTTIEXT(StdPrs_BRepFont, Standard_Transient)
diff --git a/src/StdPrs/StdPrs_BRepFont.hxx b/src/StdPrs/StdPrs_BRepFont.hxx
index 28fd303aa0..8f1f6abac3 100644
--- a/src/StdPrs/StdPrs_BRepFont.hxx
+++ b/src/StdPrs/StdPrs_BRepFont.hxx
@@ -21,15 +21,11 @@
 #include <Font_TextFormatter.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
 #include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
-#include <gp_Ax3.hxx>
-#include <gp_XY.hxx>
-#include <gp_XYZ.hxx>
 #include <NCollection_DataMap.hxx>
 #include <NCollection_String.hxx>
 #include <Standard_Mutex.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
 DEFINE_STANDARD_HANDLE(StdPrs_BRepFont, Standard_Transient)
diff --git a/src/StdPrs/StdPrs_Curve.cxx b/src/StdPrs/StdPrs_Curve.cxx
index d32fee6d14..cde1d4ec4d 100644
--- a/src/StdPrs/StdPrs_Curve.cxx
+++ b/src/StdPrs/StdPrs_Curve.cxx
@@ -18,13 +18,11 @@
 // a point and non-infinite lines passing through this point:
 
 #include <Adaptor3d_Curve.hxx>
-#include <Bnd_Box.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d.hxx>
diff --git a/src/StdPrs/StdPrs_DeflectionCurve.cxx b/src/StdPrs/StdPrs_DeflectionCurve.cxx
index bb4a3caf31..4b16d010a4 100644
--- a/src/StdPrs/StdPrs_DeflectionCurve.cxx
+++ b/src/StdPrs/StdPrs_DeflectionCurve.cxx
@@ -15,17 +15,13 @@
 // Great zoom leads to non-coincidence of
 // a point and non-infinite lines passing through this point:
 
-#include <Adaptor3d_Curve.hxx>
-#include <Bnd_Box.hxx>
 #include <BndLib_Add3dCurve.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <gp_Circ.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d.hxx>
diff --git a/src/StdPrs/StdPrs_HLRPolyShape.cxx b/src/StdPrs/StdPrs_HLRPolyShape.cxx
index 116b34aa02..ef2de23a70 100644
--- a/src/StdPrs/StdPrs_HLRPolyShape.cxx
+++ b/src/StdPrs/StdPrs_HLRPolyShape.cxx
@@ -21,16 +21,11 @@
 #include <Graphic3d_Group.hxx>
 #include <HLRAlgo_EdgeIterator.hxx>
 #include <HLRAlgo_EdgeStatus.hxx>
-#include <HLRBRep_BiPoint.hxx>
-#include <HLRBRep_ListIteratorOfListOfBPoint.hxx>
 #include <HLRBRep_ListOfBPoint.hxx>
 #include <HLRBRep_PolyAlgo.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
 #include <StdPrs_WFShape.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
-#include <TopAbs.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/StdPrs/StdPrs_HLRShape.cxx b/src/StdPrs/StdPrs_HLRShape.cxx
index b00d4288f0..8c10e81bcc 100755
--- a/src/StdPrs/StdPrs_HLRShape.cxx
+++ b/src/StdPrs/StdPrs_HLRShape.cxx
@@ -15,7 +15,6 @@
 
 #include <BRepAdaptor_Curve.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Prs3d_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <StdPrs_HLRToolShape.hxx>
diff --git a/src/StdPrs/StdPrs_HLRToolShape.cxx b/src/StdPrs/StdPrs_HLRToolShape.cxx
index a61238f228..be3b1a47d0 100644
--- a/src/StdPrs/StdPrs_HLRToolShape.cxx
+++ b/src/StdPrs/StdPrs_HLRToolShape.cxx
@@ -13,8 +13,6 @@
 // commercial license or contractual agreement.
 
 
-#include <BRepAdaptor_Curve.hxx>
-#include <HLRAlgo_Projector.hxx>
 #include <HLRBRep_Algo.hxx>
 #include <HLRBRep_Data.hxx>
 #include <StdPrs_HLRToolShape.hxx>
diff --git a/src/StdPrs/StdPrs_HLRToolShape.hxx b/src/StdPrs/StdPrs_HLRToolShape.hxx
index f4633cd29a..726bb5353a 100644
--- a/src/StdPrs/StdPrs_HLRToolShape.hxx
+++ b/src/StdPrs/StdPrs_HLRToolShape.hxx
@@ -23,8 +23,6 @@
 
 #include <HLRAlgo_EdgeIterator.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class HLRBRep_Data;
 class TopoDS_Shape;
 class HLRAlgo_Projector;
diff --git a/src/StdPrs/StdPrs_Isolines.cxx b/src/StdPrs/StdPrs_Isolines.cxx
index d7f1ef7ffc..ca64927abd 100644
--- a/src/StdPrs/StdPrs_Isolines.cxx
+++ b/src/StdPrs/StdPrs_Isolines.cxx
@@ -22,13 +22,7 @@
 #include <GCPnts_AbscissaPoint.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
 #include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_Line.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomLib_Tool.hxx>
 #include <gp_Lin2d.hxx>
 #include <Hatch_Hatcher.hxx>
 #include <NCollection_Shared.hxx>
diff --git a/src/StdPrs/StdPrs_Isolines.hxx b/src/StdPrs/StdPrs_Isolines.hxx
index d3e2cd01fc..c438792533 100644
--- a/src/StdPrs/StdPrs_Isolines.hxx
+++ b/src/StdPrs/StdPrs_Isolines.hxx
@@ -19,16 +19,10 @@
 #include <BRepAdaptor_Surface.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Lin2d.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <Prs3d_LineAspect.hxx>
-#include <Prs3d_Root.hxx>
 #include <Prs3d_NListOfSequenceOfPnt.hxx>
-#include <Poly_Triangulation.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
-#include <TColStd_Array1OfInteger.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
 class TopLoc_Location;
diff --git a/src/StdPrs/StdPrs_Plane.cxx b/src/StdPrs/StdPrs_Plane.cxx
index 455cb4471f..40d1bcc7a5 100644
--- a/src/StdPrs/StdPrs_Plane.cxx
+++ b/src/StdPrs/StdPrs_Plane.cxx
@@ -22,12 +22,8 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_Group.hxx>
-#include <Prs3d.hxx>
 #include <Prs3d_Arrow.hxx>
-#include <Prs3d_ArrowAspect.hxx>
-#include <Prs3d_LineAspect.hxx>
 #include <Prs3d_PlaneAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <StdPrs_Plane.hxx>
diff --git a/src/StdPrs/StdPrs_Point.hxx b/src/StdPrs/StdPrs_Point.hxx
index a6270d1af1..12e4efcff8 100755
--- a/src/StdPrs/StdPrs_Point.hxx
+++ b/src/StdPrs/StdPrs_Point.hxx
@@ -16,8 +16,6 @@
 
 #include <Geom_Point.hxx>
 #include <Prs3d_Point.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <StdPrs_ToolPoint.hxx>
 //computes the presentation of objects to be seen as points.
 typedef Prs3d_Point<Handle(Geom_Point), StdPrs_ToolPoint> StdPrs_Point;
diff --git a/src/StdPrs/StdPrs_ShadedShape.cxx b/src/StdPrs/StdPrs_ShadedShape.cxx
index dde6a7900f..248b11c87c 100644
--- a/src/StdPrs/StdPrs_ShadedShape.cxx
+++ b/src/StdPrs/StdPrs_ShadedShape.cxx
@@ -16,14 +16,11 @@
 
 #include <StdPrs_ShadedShape.hxx>
 
-#include <Bnd_Box.hxx>
 #include <BRepTools.hxx>
-#include <BRepBndLib.hxx>
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <Graphic3d_ArrayOfTriangles.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Vec.hxx>
@@ -37,7 +34,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
-#include <Poly_Connect.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
@@ -49,9 +45,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TColgp_Array1OfDir.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_HArray1OfPnt.hxx>
-#include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 namespace
diff --git a/src/StdPrs/StdPrs_ShadedShape.hxx b/src/StdPrs/StdPrs_ShadedShape.hxx
index 8ee3103279..18efa638b7 100644
--- a/src/StdPrs/StdPrs_ShadedShape.hxx
+++ b/src/StdPrs/StdPrs_ShadedShape.hxx
@@ -17,7 +17,6 @@
 #ifndef _StdPrs_ShadedShape_HeaderFile
 #define _StdPrs_ShadedShape_HeaderFile
 
-#include <GeomAbs_Shape.hxx>
 #include <Prs3d_Root.hxx>
 #include <Prs3d_Drawer.hxx>
 #include <StdPrs_Volume.hxx>
diff --git a/src/StdPrs/StdPrs_ShadedSurface.cxx b/src/StdPrs/StdPrs_ShadedSurface.cxx
index b8ef0d5a29..ab0e9dddcb 100644
--- a/src/StdPrs/StdPrs_ShadedSurface.cxx
+++ b/src/StdPrs/StdPrs_ShadedSurface.cxx
@@ -19,11 +19,9 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
 #include <Graphic3d_ArrayOfTriangleStrips.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <Prs3d_ShadingAspect.hxx>
 #include <StdPrs_ShadedSurface.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/StdPrs/StdPrs_ShapeTool.cxx b/src/StdPrs/StdPrs_ShapeTool.cxx
index 12cdf5cfee..c126baa2ba 100644
--- a/src/StdPrs/StdPrs_ShapeTool.cxx
+++ b/src/StdPrs/StdPrs_ShapeTool.cxx
@@ -16,7 +16,6 @@
 
 #include <StdPrs_ShapeTool.hxx>
 
-#include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
@@ -30,9 +29,7 @@
 #include <Poly_Triangulation.hxx>
 #include <TopExp.hxx>
 #include <TopLoc_Location.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
 
 //=======================================================================
 //function : StdPrs_ShapeTool
diff --git a/src/StdPrs/StdPrs_ShapeTool.hxx b/src/StdPrs/StdPrs_ShapeTool.hxx
index 712514fb65..6411fd6d64 100644
--- a/src/StdPrs/StdPrs_ShapeTool.hxx
+++ b/src/StdPrs/StdPrs_ShapeTool.hxx
@@ -17,12 +17,9 @@
 #ifndef _StdPrs_ShapeTool_HeaderFile
 #define _StdPrs_ShapeTool_HeaderFile
 
-#include <Standard_DefineAlloc.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/StdPrs/StdPrs_ToolRFace.cxx b/src/StdPrs/StdPrs_ToolRFace.cxx
index 9fe1f54ef3..4f40be4844 100644
--- a/src/StdPrs/StdPrs_ToolRFace.cxx
+++ b/src/StdPrs/StdPrs_ToolRFace.cxx
@@ -14,7 +14,6 @@
 
 #include <StdPrs_ToolRFace.hxx>
 
-#include <Adaptor2d_Curve2d.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Surface.hxx>
 #include <TopoDS.hxx>
diff --git a/src/StdPrs/StdPrs_ToolVertex.hxx b/src/StdPrs/StdPrs_ToolVertex.hxx
index ebab5a3f5e..95b26ab35c 100644
--- a/src/StdPrs/StdPrs_ToolVertex.hxx
+++ b/src/StdPrs/StdPrs_ToolVertex.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 class TopoDS_Vertex;
 
diff --git a/src/StdPrs/StdPrs_Vertex.hxx b/src/StdPrs/StdPrs_Vertex.hxx
index 33eb4b3f49..b9c3b8d29c 100755
--- a/src/StdPrs/StdPrs_Vertex.hxx
+++ b/src/StdPrs/StdPrs_Vertex.hxx
@@ -15,10 +15,8 @@
 #define StdPrs_Vertex_HeaderFile
 
 #include <Prs3d_Point.hxx>
-#include <Prs3d_Drawer.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <StdPrs_ToolVertex.hxx>
-#include <Prs3d_Presentation.hxx>
 
 typedef Prs3d_Point<TopoDS_Vertex, StdPrs_ToolVertex> StdPrs_Vertex;
 #endif
diff --git a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx
index 2db50e86d2..4cbe46d26c 100644
--- a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx
+++ b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx
@@ -15,27 +15,19 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor2d_Curve2d.hxx>
 #include <Adaptor3d_IsoCurve.hxx>
-#include <Bnd_Box.hxx>
 #include <Bnd_Box2d.hxx>
-#include <BndLib_Add2dCurve.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_Surface.hxx>
 #include <GeomAbs_SurfaceType.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
-#include <Graphic3d_ArrayOfPolylines.hxx>
-#include <Graphic3d_AspectLine3d.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Hatch_Hatcher.hxx>
 #include <Precision.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
 #include <StdPrs_ToolRFace.hxx>
 #include <StdPrs_WFDeflectionRestrictedFace.hxx>
diff --git a/src/StdPrs/StdPrs_WFDeflectionSurface.cxx b/src/StdPrs/StdPrs_WFDeflectionSurface.cxx
index 4209bcf492..e063112371 100644
--- a/src/StdPrs/StdPrs_WFDeflectionSurface.cxx
+++ b/src/StdPrs/StdPrs_WFDeflectionSurface.cxx
@@ -15,16 +15,12 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_IsoCurve.hxx>
-#include <Bnd_Box.hxx>
 #include <BndLib_AddSurface.hxx>
 #include <GeomAbs_IsoType.hxx>
 #include <gp_Pnt.hxx>
-#include <Graphic3d_Group.hxx>
 #include <Precision.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <StdPrs_DeflectionCurve.hxx>
 #include <StdPrs_WFDeflectionSurface.hxx>
 
diff --git a/src/StdPrs/StdPrs_WFPoleSurface.cxx b/src/StdPrs/StdPrs_WFPoleSurface.cxx
index 5e2e8a0864..1a180a26d1 100644
--- a/src/StdPrs/StdPrs_WFPoleSurface.cxx
+++ b/src/StdPrs/StdPrs_WFPoleSurface.cxx
@@ -21,7 +21,6 @@
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_Group.hxx>
 #include <Prs3d_IsoAspect.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <StdPrs_WFPoleSurface.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 
diff --git a/src/StdPrs/StdPrs_WFRestrictedFace.cxx b/src/StdPrs/StdPrs_WFRestrictedFace.cxx
index 1727e6491e..52f176cf91 100755
--- a/src/StdPrs/StdPrs_WFRestrictedFace.cxx
+++ b/src/StdPrs/StdPrs_WFRestrictedFace.cxx
@@ -13,7 +13,6 @@
 
 #include <Hatch_Hatcher.hxx>
 #include <Graphic3d_Group.hxx>
-#include <gp_Pnt.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Adaptor3d_IsoCurve.hxx>
 #include <Bnd_Box2d.hxx>
@@ -23,7 +22,6 @@
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <GeomAbs_SurfaceType.hxx>
-#include <Geom_Surface.hxx>
 #include <StdPrs_WFRestrictedFace.hxx>
 #include <StdPrs_ToolRFace.hxx>
 #include <StdPrs_Curve.hxx>
diff --git a/src/StdPrs/StdPrs_WFRestrictedFace.hxx b/src/StdPrs/StdPrs_WFRestrictedFace.hxx
index 9e19a9291e..9b2cbba94d 100755
--- a/src/StdPrs/StdPrs_WFRestrictedFace.hxx
+++ b/src/StdPrs/StdPrs_WFRestrictedFace.hxx
@@ -16,7 +16,6 @@
 
 #include <BRepAdaptor_Surface.hxx>
 #include <Prs3d_Drawer.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <Prs3d_Root.hxx>
 #include <Prs3d_NListOfSequenceOfPnt.hxx>
 
diff --git a/src/StdPrs/StdPrs_WFShape.cxx b/src/StdPrs/StdPrs_WFShape.cxx
index 618e508109..9f281e102c 100644
--- a/src/StdPrs/StdPrs_WFShape.cxx
+++ b/src/StdPrs/StdPrs_WFShape.cxx
@@ -17,14 +17,10 @@
 
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepAdaptor_Surface.hxx>
 #include <OSD_Parallel.hxx>
-#include <StdPrs_DeflectionCurve.hxx>
 #include <StdPrs_Isolines.hxx>
 #include <StdPrs_ShapeTool.hxx>
 #include <StdPrs_ToolTriangulatedShape.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
diff --git a/src/StdPrs/StdPrs_WFShape.hxx b/src/StdPrs/StdPrs_WFShape.hxx
index aba08bcae7..694341cb88 100755
--- a/src/StdPrs/StdPrs_WFShape.hxx
+++ b/src/StdPrs/StdPrs_WFShape.hxx
@@ -21,7 +21,6 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_NListOfSequenceOfPnt.hxx>
 #include <TColgp_SequenceOfPnt.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
 class Graphic3d_ArrayOfPoints;
diff --git a/src/StdPrs/StdPrs_WFSurface.cxx b/src/StdPrs/StdPrs_WFSurface.cxx
index a258e39597..d69d2fcfb0 100644
--- a/src/StdPrs/StdPrs_WFSurface.cxx
+++ b/src/StdPrs/StdPrs_WFSurface.cxx
@@ -15,10 +15,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_IsoCurve.hxx>
-#include <Bnd_Box.hxx>
-#include <BndLib_AddSurface.hxx>
 #include <GeomAbs_IsoType.hxx>
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Graphic3d_Group.hxx>
@@ -26,17 +23,15 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_NListIteratorOfListOfSequenceOfPnt.hxx>
 #include <Prs3d_NListOfSequenceOfPnt.hxx>
-#include <Prs3d_Presentation.hxx>
 #include <StdPrs_Curve.hxx>
 #include <StdPrs_WFSurface.hxx>
-#include <TColgp_SequenceOfPnt.hxx>
 
 static void FindLimits(const Handle(Adaptor3d_Surface)& surf ,
-		       const Standard_Real             aLimit,
-		       Standard_Real&                  UFirst,
-		       Standard_Real&                  ULast,
-		       Standard_Real&                  VFirst,
-		       Standard_Real&                  VLast)
+                       const Standard_Real             aLimit,
+                       Standard_Real&                  UFirst,
+                       Standard_Real&                  ULast,
+                       Standard_Real&                  VFirst,
+                       Standard_Real&                  VLast)
 {
   UFirst = surf->FirstUParameter();
   ULast = surf->LastUParameter();
diff --git a/src/StdSelect/StdSelect_BRepOwner.hxx b/src/StdSelect/StdSelect_BRepOwner.hxx
index 6030d37c10..e71d0f5491 100644
--- a/src/StdSelect/StdSelect_BRepOwner.hxx
+++ b/src/StdSelect/StdSelect_BRepOwner.hxx
@@ -18,15 +18,12 @@
 #define _StdSelect_BRepOwner_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <TopoDS_Shape.hxx>
 #include <SelectMgr_EntityOwner.hxx>
 #include <PrsMgr_PresentationManager.hxx>
-#include <Quantity_NameOfColor.hxx>
-#include <Graphic3d_ZLayerId.hxx>
 class StdSelect_Shape;
 class SelectMgr_SelectableObject;
 class PrsMgr_PresentationManager;
diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.cxx b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
index c62dc54462..630d328d91 100644
--- a/src/StdSelect/StdSelect_BRepSelectionTool.cxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
@@ -16,28 +16,23 @@
 
 #include <StdSelect_BRepSelectionTool.hxx>
 
-#include <Bnd_Box.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Surface.hxx>
-#include <BRepBndLib.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
 #include <GCPnts_TangentialDeflection.hxx>
 #include <GeomAbs_SurfaceType.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <Geom_ConicalSurface.hxx>
 #include <Geom_CylindricalSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_SphericalSurface.hxx>
 #include <gp_Circ.hxx>
-#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Polygon3D.hxx>
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
 #include <Precision.hxx>
-#include <Select3D_SensitiveBox.hxx>
 #include <Select3D_SensitiveCircle.hxx>
 #include <Select3D_SensitiveCurve.hxx>
 #include <Select3D_SensitiveCylinder.hxx>
@@ -47,7 +42,6 @@
 #include <Select3D_SensitivePoint.hxx>
 #include <Select3D_SensitiveSegment.hxx>
 #include <Select3D_SensitiveSphere.hxx>
-#include <Select3D_SensitiveTriangle.hxx>
 #include <Select3D_SensitiveTriangulation.hxx>
 #include <Select3D_SensitiveWire.hxx>
 #include <Select3D_TypeOfSensitivity.hxx>
diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.hxx b/src/StdSelect/StdSelect_BRepSelectionTool.hxx
index 7a762318af..45dd97b5db 100644
--- a/src/StdSelect/StdSelect_BRepSelectionTool.hxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <SelectMgr_Selection.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StdSelect/StdSelect_EdgeFilter.cxx b/src/StdSelect/StdSelect_EdgeFilter.cxx
index 9cc950728e..14bcbc0883 100644
--- a/src/StdSelect/StdSelect_EdgeFilter.cxx
+++ b/src/StdSelect/StdSelect_EdgeFilter.cxx
@@ -16,13 +16,11 @@
 
 
 #include <BRepAdaptor_Curve.hxx>
-#include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <StdSelect_EdgeFilter.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Edge.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StdSelect_EdgeFilter,SelectMgr_Filter)
 
diff --git a/src/StdSelect/StdSelect_EdgeFilter.hxx b/src/StdSelect/StdSelect_EdgeFilter.hxx
index 7116dc9f61..45c16894cd 100644
--- a/src/StdSelect/StdSelect_EdgeFilter.hxx
+++ b/src/StdSelect/StdSelect_EdgeFilter.hxx
@@ -22,7 +22,6 @@
 
 #include <StdSelect_TypeOfEdge.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class SelectMgr_EntityOwner;
 
diff --git a/src/StdSelect/StdSelect_FaceFilter.cxx b/src/StdSelect/StdSelect_FaceFilter.cxx
index dd792610c6..ea90c0a380 100644
--- a/src/StdSelect/StdSelect_FaceFilter.cxx
+++ b/src/StdSelect/StdSelect_FaceFilter.cxx
@@ -16,13 +16,11 @@
 
 
 #include <BRepAdaptor_Surface.hxx>
-#include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <StdSelect_FaceFilter.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StdSelect_FaceFilter,SelectMgr_Filter)
diff --git a/src/StdSelect/StdSelect_FaceFilter.hxx b/src/StdSelect/StdSelect_FaceFilter.hxx
index 307aff939a..82c6974ffd 100644
--- a/src/StdSelect/StdSelect_FaceFilter.hxx
+++ b/src/StdSelect/StdSelect_FaceFilter.hxx
@@ -22,7 +22,6 @@
 
 #include <StdSelect_TypeOfFace.hxx>
 #include <SelectMgr_Filter.hxx>
-#include <Standard_Boolean.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class SelectMgr_EntityOwner;
 
diff --git a/src/StdSelect/StdSelect_Shape.cxx b/src/StdSelect/StdSelect_Shape.cxx
index 09b3d87382..35c0ebb4f5 100644
--- a/src/StdSelect/StdSelect_Shape.cxx
+++ b/src/StdSelect/StdSelect_Shape.cxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 #include <StdPrs_WFShape.hxx>
 #include <StdPrs_ShadedShape.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Shape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StdSelect_Shape,PrsMgr_PresentableObject)
diff --git a/src/StdSelect/StdSelect_Shape.hxx b/src/StdSelect/StdSelect_Shape.hxx
index 74ba6c6e15..b059e6f673 100644
--- a/src/StdSelect/StdSelect_Shape.hxx
+++ b/src/StdSelect/StdSelect_Shape.hxx
@@ -18,7 +18,6 @@
 #define _StdSelect_Shape_HeaderFile
 
 #include <TopoDS_Shape.hxx>
-#include <Prs3d_Drawer.hxx>
 #include <PrsMgr_PresentableObject.hxx>
 
 
diff --git a/src/StdSelect/StdSelect_ShapeTypeFilter.cxx b/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
index 28a6bd9310..cc46628284 100644
--- a/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
+++ b/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <StdSelect_ShapeTypeFilter.hxx>
diff --git a/src/StdStorage/StdStorage.cxx b/src/StdStorage/StdStorage.cxx
index 568397b41a..9707f2d2a8 100644
--- a/src/StdStorage/StdStorage.cxx
+++ b/src/StdStorage/StdStorage.cxx
@@ -14,7 +14,6 @@
 #include <NCollection_Handle.hxx>
 #include <NCollection_Array1.hxx>
 #include <PCDM.hxx>
-#include <PCDM_BaseDriverPointer.hxx>
 #include <PCDM_ReadWriter.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_NullObject.hxx>
@@ -34,7 +33,6 @@
 #include <Storage_StreamFormatError.hxx>
 #include <Storage_StreamWriteError.hxx>
 
-#include <locale.h>
 #include <stdio.h>
 
 //=======================================================================
diff --git a/src/StdStorage/StdStorage_HSequenceOfRoots.hxx b/src/StdStorage/StdStorage_HSequenceOfRoots.hxx
index d457dd77e4..d4a4557103 100644
--- a/src/StdStorage/StdStorage_HSequenceOfRoots.hxx
+++ b/src/StdStorage/StdStorage_HSequenceOfRoots.hxx
@@ -15,7 +15,6 @@
 #ifndef StdStorage_HSequenceOfRoots_HeaderFile
 #define StdStorage_HSequenceOfRoots_HeaderFile
 
-#include <StdStorage_Root.hxx>
 #include <StdStorage_SequenceOfRoots.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StdStorage/StdStorage_HeaderData.hxx b/src/StdStorage/StdStorage_HeaderData.hxx
index 48c3b74e6f..3849495e18 100644
--- a/src/StdStorage/StdStorage_HeaderData.hxx
+++ b/src/StdStorage/StdStorage_HeaderData.hxx
@@ -18,8 +18,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 #include <TColStd_SequenceOfExtendedString.hxx>
 #include <Storage_Error.hxx>
diff --git a/src/StdStorage/StdStorage_MapOfRoots.hxx b/src/StdStorage/StdStorage_MapOfRoots.hxx
index ed0cf6d3ab..89401fd5a7 100644
--- a/src/StdStorage/StdStorage_MapOfRoots.hxx
+++ b/src/StdStorage/StdStorage_MapOfRoots.hxx
@@ -17,8 +17,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <StdStorage_Root.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <NCollection_DataMap.hxx>
 #include <NCollection_IndexedDataMap.hxx>
 
 typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(StdStorage_Root), TCollection_AsciiString> StdStorage_MapOfRoots;
diff --git a/src/StdStorage/StdStorage_MapOfTypes.hxx b/src/StdStorage/StdStorage_MapOfTypes.hxx
index 73f39d1bd5..b6acbe346b 100644
--- a/src/StdStorage/StdStorage_MapOfTypes.hxx
+++ b/src/StdStorage/StdStorage_MapOfTypes.hxx
@@ -19,7 +19,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Integer.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <NCollection_IndexedDataMap.hxx>
 
 typedef NCollection_IndexedDataMap<TCollection_AsciiString, Standard_Integer, TCollection_AsciiString> StdStorage_MapOfTypes;
diff --git a/src/StdStorage/StdStorage_RootData.cxx b/src/StdStorage/StdStorage_RootData.cxx
index 7546cfad48..da01f9dc32 100644
--- a/src/StdStorage/StdStorage_RootData.cxx
+++ b/src/StdStorage/StdStorage_RootData.cxx
@@ -13,12 +13,10 @@
 
 #include <StdObjMgt_Persistent.hxx>
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <StdStorage_RootData.hxx>
 #include <StdStorage_Root.hxx>
 #include <Storage_BaseDriver.hxx>
 #include <Storage_StreamTypeMismatchError.hxx>
-#include <Storage_DataMapIteratorOfMapOfPers.hxx>
 #include <TCollection_AsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StdStorage_RootData, Standard_Transient)
diff --git a/src/StdStorage/StdStorage_RootData.hxx b/src/StdStorage/StdStorage_RootData.hxx
index 2813f9b9ba..296973e43d 100644
--- a/src/StdStorage/StdStorage_RootData.hxx
+++ b/src/StdStorage/StdStorage_RootData.hxx
@@ -20,7 +20,6 @@
 #include <Storage_Error.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <StdStorage_MapOfRoots.hxx>
 #include <StdStorage_HSequenceOfRoots.hxx>
diff --git a/src/StdStorage/StdStorage_TypeData.cxx b/src/StdStorage/StdStorage_TypeData.cxx
index f3ea753df0..037478e5ce 100644
--- a/src/StdStorage/StdStorage_TypeData.cxx
+++ b/src/StdStorage/StdStorage_TypeData.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <StdDrivers.hxx>
 #include <StdStorage_TypeData.hxx>
 #include <Storage_BaseDriver.hxx>
diff --git a/src/StdStorage/StdStorage_TypeData.hxx b/src/StdStorage/StdStorage_TypeData.hxx
index 0d73a271de..4f940383a7 100644
--- a/src/StdStorage/StdStorage_TypeData.hxx
+++ b/src/StdStorage/StdStorage_TypeData.hxx
@@ -22,7 +22,6 @@
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <StdObjMgt_MapOfInstantiators.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 class Storage_BaseDriver;
diff --git a/src/StepAP203/StepAP203_CcDesignApproval.cxx b/src/StepAP203/StepAP203_CcDesignApproval.cxx
index 0bafbc1312..a72100022d 100644
--- a/src/StepAP203/StepAP203_CcDesignApproval.cxx
+++ b/src/StepAP203/StepAP203_CcDesignApproval.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepBasic_Approval.hxx>
 
diff --git a/src/StepAP203/StepAP203_CcDesignApproval.hxx b/src/StepAP203/StepAP203_CcDesignApproval.hxx
index 028338ba49..f4c62f71b9 100644
--- a/src/StepAP203/StepAP203_CcDesignApproval.hxx
+++ b/src/StepAP203/StepAP203_CcDesignApproval.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignApproval_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfApprovedItem.hxx>
 #include <StepBasic_ApprovalAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignCertification.cxx b/src/StepAP203/StepAP203_CcDesignCertification.cxx
index 70ce058036..48c3d77316 100644
--- a/src/StepAP203/StepAP203_CcDesignCertification.cxx
+++ b/src/StepAP203/StepAP203_CcDesignCertification.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignCertification.hxx>
 #include <StepBasic_Certification.hxx>
 
diff --git a/src/StepAP203/StepAP203_CcDesignCertification.hxx b/src/StepAP203/StepAP203_CcDesignCertification.hxx
index f22e58e092..b7aeed7f39 100644
--- a/src/StepAP203/StepAP203_CcDesignCertification.hxx
+++ b/src/StepAP203/StepAP203_CcDesignCertification.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignCertification_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfCertifiedItem.hxx>
 #include <StepBasic_CertificationAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignContract.cxx b/src/StepAP203/StepAP203_CcDesignContract.cxx
index 054f6cb91b..25c115f25c 100644
--- a/src/StepAP203/StepAP203_CcDesignContract.cxx
+++ b/src/StepAP203/StepAP203_CcDesignContract.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignContract.hxx>
 #include <StepBasic_Contract.hxx>
 
diff --git a/src/StepAP203/StepAP203_CcDesignContract.hxx b/src/StepAP203/StepAP203_CcDesignContract.hxx
index dead6a7813..a27f290904 100644
--- a/src/StepAP203/StepAP203_CcDesignContract.hxx
+++ b/src/StepAP203/StepAP203_CcDesignContract.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignContract_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfContractedItem.hxx>
 #include <StepBasic_ContractAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
index 8ec254ddcc..3faf748fdd 100644
--- a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
+++ b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignDateAndTimeAssignment.hxx>
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
index 5c8aafffd6..3859d55720 100644
--- a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
+++ b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignDateAndTimeAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfDateTimeItem.hxx>
 #include <StepBasic_DateAndTimeAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
index c6014be61b..969a9870b1 100644
--- a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignPersonAndOrganizationAssignment.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
index 01f1464504..9d02adaeeb 100644
--- a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignPersonAndOrganizationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfPersonOrganizationItem.hxx>
 #include <StepBasic_PersonAndOrganizationAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx b/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
index d6d61a900f..4dc6493e58 100644
--- a/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
+++ b/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignSecurityClassification.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 
diff --git a/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx b/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
index fa2b33f40b..6f8fb49667 100644
--- a/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
+++ b/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignSecurityClassification_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfClassifiedItem.hxx>
 #include <StepBasic_SecurityClassificationAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx b/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
index 4f8d11f2a1..2cf00f16ce 100644
--- a/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
+++ b/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_CcDesignSpecificationReference.hxx>
 #include <StepBasic_Document.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx b/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
index 713329bed2..222581b8de 100644
--- a/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
+++ b/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_CcDesignSpecificationReference_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfSpecifiedItem.hxx>
 #include <StepBasic_DocumentReference.hxx>
diff --git a/src/StepAP203/StepAP203_Change.cxx b/src/StepAP203/StepAP203_Change.cxx
index 3115d056f7..7668af8747 100644
--- a/src/StepAP203/StepAP203_Change.cxx
+++ b/src/StepAP203/StepAP203_Change.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_Change.hxx>
 #include <StepBasic_Action.hxx>
 
diff --git a/src/StepAP203/StepAP203_Change.hxx b/src/StepAP203/StepAP203_Change.hxx
index 99307bc834..bd2304a845 100644
--- a/src/StepAP203/StepAP203_Change.hxx
+++ b/src/StepAP203/StepAP203_Change.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_Change_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfWorkItem.hxx>
 #include <StepBasic_ActionAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_ChangeRequest.cxx b/src/StepAP203/StepAP203_ChangeRequest.cxx
index 56696dbe7e..a8984982b3 100644
--- a/src/StepAP203/StepAP203_ChangeRequest.cxx
+++ b/src/StepAP203/StepAP203_ChangeRequest.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_ChangeRequest.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
diff --git a/src/StepAP203/StepAP203_ChangeRequest.hxx b/src/StepAP203/StepAP203_ChangeRequest.hxx
index aa640e14a3..4603df1b2d 100644
--- a/src/StepAP203/StepAP203_ChangeRequest.hxx
+++ b/src/StepAP203/StepAP203_ChangeRequest.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_ChangeRequest_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfChangeRequestItem.hxx>
 #include <StepBasic_ActionRequestAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_HArray1OfApprovedItem.hxx b/src/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
index 7b7fa50ffc..43cd704004 100644
--- a/src/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfApprovedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfApprovedItem_HeaderFile
 #define StepAP203_HArray1OfApprovedItem_HeaderFile
 
-#include <StepAP203_ApprovedItem.hxx>
 #include <StepAP203_Array1OfApprovedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx b/src/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
index 50cc5b5646..85cbfc48ec 100644
--- a/src/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfCertifiedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfCertifiedItem_HeaderFile
 #define StepAP203_HArray1OfCertifiedItem_HeaderFile
 
-#include <StepAP203_CertifiedItem.hxx>
 #include <StepAP203_Array1OfCertifiedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx b/src/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
index e36a57240b..21896af69f 100644
--- a/src/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfChangeRequestItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfChangeRequestItem_HeaderFile
 #define StepAP203_HArray1OfChangeRequestItem_HeaderFile
 
-#include <StepAP203_ChangeRequestItem.hxx>
 #include <StepAP203_Array1OfChangeRequestItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx b/src/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
index 94511d08c0..d47fcb094b 100644
--- a/src/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfClassifiedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfClassifiedItem_HeaderFile
 #define StepAP203_HArray1OfClassifiedItem_HeaderFile
 
-#include <StepAP203_ClassifiedItem.hxx>
 #include <StepAP203_Array1OfClassifiedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfContractedItem.hxx b/src/StepAP203/StepAP203_HArray1OfContractedItem.hxx
index ba525dc57b..016804589c 100644
--- a/src/StepAP203/StepAP203_HArray1OfContractedItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfContractedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfContractedItem_HeaderFile
 #define StepAP203_HArray1OfContractedItem_HeaderFile
 
-#include <StepAP203_ContractedItem.hxx>
 #include <StepAP203_Array1OfContractedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx b/src/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
index 52f37a4dfe..3b74ad140c 100644
--- a/src/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfDateTimeItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfDateTimeItem_HeaderFile
 #define StepAP203_HArray1OfDateTimeItem_HeaderFile
 
-#include <StepAP203_DateTimeItem.hxx>
 #include <StepAP203_Array1OfDateTimeItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx b/src/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
index a0be656cf8..416cdf0266 100644
--- a/src/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfPersonOrganizationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfPersonOrganizationItem_HeaderFile
 #define StepAP203_HArray1OfPersonOrganizationItem_HeaderFile
 
-#include <StepAP203_PersonOrganizationItem.hxx>
 #include <StepAP203_Array1OfPersonOrganizationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx b/src/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
index 927dc01b4f..f80613934a 100644
--- a/src/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfSpecifiedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfSpecifiedItem_HeaderFile
 #define StepAP203_HArray1OfSpecifiedItem_HeaderFile
 
-#include <StepAP203_SpecifiedItem.hxx>
 #include <StepAP203_Array1OfSpecifiedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx b/src/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
index 738d38d9be..f1f6b98918 100644
--- a/src/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfStartRequestItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfStartRequestItem_HeaderFile
 #define StepAP203_HArray1OfStartRequestItem_HeaderFile
 
-#include <StepAP203_StartRequestItem.hxx>
 #include <StepAP203_Array1OfStartRequestItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_HArray1OfWorkItem.hxx b/src/StepAP203/StepAP203_HArray1OfWorkItem.hxx
index 825a843513..4e836971c0 100644
--- a/src/StepAP203/StepAP203_HArray1OfWorkItem.hxx
+++ b/src/StepAP203/StepAP203_HArray1OfWorkItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP203_HArray1OfWorkItem_HeaderFile
 #define StepAP203_HArray1OfWorkItem_HeaderFile
 
-#include <StepAP203_WorkItem.hxx>
 #include <StepAP203_Array1OfWorkItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP203/StepAP203_StartRequest.cxx b/src/StepAP203/StepAP203_StartRequest.cxx
index 43a0bb41ca..ffa67edbbe 100644
--- a/src/StepAP203/StepAP203_StartRequest.cxx
+++ b/src/StepAP203/StepAP203_StartRequest.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_StartRequest.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
diff --git a/src/StepAP203/StepAP203_StartRequest.hxx b/src/StepAP203/StepAP203_StartRequest.hxx
index 5c8f08af4d..e02f3fa33a 100644
--- a/src/StepAP203/StepAP203_StartRequest.hxx
+++ b/src/StepAP203/StepAP203_StartRequest.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_StartRequest_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfStartRequestItem.hxx>
 #include <StepBasic_ActionRequestAssignment.hxx>
diff --git a/src/StepAP203/StepAP203_StartWork.cxx b/src/StepAP203/StepAP203_StartWork.cxx
index 3ec36c9bcb..4f2a6eea43 100644
--- a/src/StepAP203/StepAP203_StartWork.cxx
+++ b/src/StepAP203/StepAP203_StartWork.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepAP203_StartWork.hxx>
 #include <StepBasic_Action.hxx>
 
diff --git a/src/StepAP203/StepAP203_StartWork.hxx b/src/StepAP203/StepAP203_StartWork.hxx
index 32956b6c15..c43dcc9c89 100644
--- a/src/StepAP203/StepAP203_StartWork.hxx
+++ b/src/StepAP203/StepAP203_StartWork.hxx
@@ -18,7 +18,6 @@
 #define _StepAP203_StartWork_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP203_HArray1OfWorkItem.hxx>
 #include <StepBasic_ActionAssignment.hxx>
diff --git a/src/StepAP209/StepAP209_Construct.cxx b/src/StepAP209/StepAP209_Construct.cxx
index efe90edeea..c189307ce5 100644
--- a/src/StepAP209/StepAP209_Construct.cxx
+++ b/src/StepAP209/StepAP209_Construct.cxx
@@ -54,10 +54,6 @@
 #include <StepBasic_DateTimeSelect.hxx>
 #include <StepBasic_DesignContext.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_HArray1OfNamedUnit.hxx>
-#include <StepBasic_HArray1OfProduct.hxx>
-#include <StepBasic_HArray1OfProductContext.hxx>
-#include <StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx>
 #include <StepBasic_LocalTime.hxx>
 #include <StepBasic_MechanicalContext.hxx>
 #include <StepBasic_Organization.hxx>
@@ -65,8 +61,6 @@
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 #include <StepBasic_PersonOrganizationSelect.hxx>
-#include <StepBasic_Product.hxx>
-#include <StepBasic_ProductCategory.hxx>
 #include <StepBasic_ProductCategoryRelationship.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <StepBasic_ProductDefinition.hxx>
@@ -82,14 +76,12 @@
 #include <StepData_StepModel.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
 #include <StepElement_ElementMaterial.hxx>
-#include <StepFEA_CoordinateSystemType.hxx>
 #include <StepFEA_Curve3dElementProperty.hxx>
 #include <StepFEA_Curve3dElementRepresentation.hxx>
 #include <StepFEA_CurveElementIntervalConstant.hxx>
 #include <StepFEA_ElementGeometricRelationship.hxx>
 #include <StepFEA_ElementRepresentation.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
-#include <StepFEA_FeaModel.hxx>
 #include <StepFEA_FeaModel3d.hxx>
 #include <StepFEA_FeaModelDefinition.hxx>
 #include <StepFEA_HArray1OfCurveElementInterval.hxx>
@@ -99,7 +91,6 @@
 #include <StepGeom_Direction.hxx>
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
-#include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/StepAP209/StepAP209_Construct.hxx b/src/StepAP209/StepAP209_Construct.hxx
index a0397d206c..e948c74ea5 100644
--- a/src/StepAP209/StepAP209_Construct.hxx
+++ b/src/StepAP209/StepAP209_Construct.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Handle.hxx>
 
 #include <STEPConstruct_Tool.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepElement_HSequenceOfElementMaterial.hxx>
 #include <StepFEA_HSequenceOfElementGeometricRelationship.hxx>
 #include <StepFEA_HSequenceOfElementRepresentation.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
index 4ac9e6ac47..246efc2573 100644
--- a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedApprovalAssignment.hxx>
 #include <StepAP214_ApprovalItem.hxx>
 #include <StepBasic_Approval.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx b/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
index 87550175ec..7b6679c456 100644
--- a/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedApprovalAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfApprovalItem.hxx>
 #include <StepBasic_ApprovalAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
index dfe7e5c0b9..11422640d2 100644
--- a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedDateAndTimeAssignment.hxx>
 #include <StepAP214_DateAndTimeItem.hxx>
 #include <StepBasic_DateAndTime.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
index 49b642fc11..3afab173e3 100644
--- a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedDateAndTimeAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfDateAndTimeItem.hxx>
 #include <StepBasic_DateAndTimeAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDateAssignment.cxx b/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
index 636a3ef4ed..cae53949ff 100644
--- a/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedDateAssignment.hxx>
 #include <StepAP214_DateItem.hxx>
 #include <StepBasic_Date.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDateAssignment.hxx b/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
index fd7c7b7d83..957efdaef8 100644
--- a/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedDateAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfDateItem.hxx>
 #include <StepBasic_DateAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDocumentReference.cxx b/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
index c9b341639c..c92054f4e3 100644
--- a/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
+++ b/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedDocumentReference.hxx>
 #include <StepAP214_DocumentReferenceItem.hxx>
 #include <StepBasic_Document.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedDocumentReference.hxx b/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
index 7ab8ded142..944c39d602 100644
--- a/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
+++ b/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedDocumentReference_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfDocumentReferenceItem.hxx>
 #include <StepBasic_DocumentReference.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
index aec2e166ec..5451d81ec8 100644
--- a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_IdentificationRole.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
index 8c043f05a9..03cf166490 100644
--- a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
@@ -17,7 +17,6 @@
 #define _StepAP214_AppliedExternalIdentificationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfExternalIdentificationItem.hxx>
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx b/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
index 223072b209..f9db0acb1c 100644
--- a/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedGroupAssignment.hxx>
 #include <StepBasic_Group.hxx>
 
diff --git a/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx b/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
index 4f10bada48..524ff43861 100644
--- a/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
@@ -17,7 +17,6 @@
 #define _StepAP214_AppliedGroupAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfGroupItem.hxx>
 #include <StepBasic_GroupAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
index 35af2941ff..47afbcfd0e 100644
--- a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedOrganizationAssignment.hxx>
 #include <StepAP214_OrganizationItem.hxx>
 #include <StepBasic_Organization.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
index 42798b1f55..8b0137c094 100644
--- a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedOrganizationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfOrganizationItem.hxx>
 #include <StepBasic_OrganizationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
index 3a6b8f7e61..67bc4b862f 100644
--- a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedPersonAndOrganizationAssignment.hxx>
 #include <StepAP214_PersonAndOrganizationItem.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
index f31206f9cb..207f8c40b4 100644
--- a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedPersonAndOrganizationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfPersonAndOrganizationItem.hxx>
 #include <StepBasic_PersonAndOrganizationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedPresentedItem.cxx b/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
index af6e2c4bda..036946fb1b 100644
--- a/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
+++ b/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedPresentedItem.hxx>
 #include <StepAP214_PresentedItemSelect.hxx>
 
diff --git a/src/StepAP214/StepAP214_AppliedPresentedItem.hxx b/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
index ae0f6b6591..b4bbd6f939 100644
--- a/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
+++ b/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedPresentedItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfPresentedItemSelect.hxx>
 #include <StepVisual_PresentedItem.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
index b622a65eec..d7796c59b0 100644
--- a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AppliedSecurityClassificationAssignment.hxx>
 #include <StepAP214_SecurityClassificationItem.hxx>
 #include <StepBasic_SecurityClassification.hxx>
diff --git a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
index 3c9e337fc0..89b396cc65 100644
--- a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AppliedSecurityClassificationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfSecurityClassificationItem.hxx>
 #include <StepBasic_SecurityClassificationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_ApprovalItem.cxx b/src/StepAP214/StepAP214_ApprovalItem.cxx
index 08bd0968ba..df20d20a1b 100644
--- a/src/StepAP214/StepAP214_ApprovalItem.cxx
+++ b/src/StepAP214/StepAP214_ApprovalItem.cxx
@@ -16,7 +16,6 @@
 #include <Standard_Transient.hxx>
 #include <StepAP214_ApprovalItem.hxx>
 #include <StepBasic_Date.hxx>
-#include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentFile.hxx>
 #include <StepBasic_Effectivity.hxx>
 #include <StepBasic_Group.hxx>
@@ -31,7 +30,6 @@
 #include <StepRepr_ConfigurationItem.hxx>
 #include <StepRepr_MaterialDesignation.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <StepRepr_Representation.hxx>
 #include <StepRepr_ShapeAspectRelationship.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
index cc423d9956..a8714c40c0 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignActualDateAndTimeAssignment.hxx>
 #include <StepAP214_AutoDesignDateAndTimeItem.hxx>
 #include <StepBasic_DateAndTime.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
index 2550418891..15d3fab68d 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignActualDateAndTimeAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx>
 #include <StepBasic_DateAndTimeAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
index 3d1e251ed6..be4ecc66ff 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignActualDateAssignment.hxx>
 #include <StepAP214_AutoDesignDatedItem.hxx>
 #include <StepBasic_Date.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
index f87be083d0..70b3f948b6 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignActualDateAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignDatedItem.hxx>
 #include <StepBasic_DateAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
index 97bd81c4e0..c45a728dff 100644
--- a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignApprovalAssignment.hxx>
 #include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_Approval.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
index 370f37494b..68a95ea7e4 100644
--- a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignApprovalAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_ApprovalAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
index 292f0a075c..c7923b9030 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignDateAndPersonAssignment.hxx>
 #include <StepAP214_AutoDesignDateAndPersonItem.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
index 8089d9cdf8..851bf8309b 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignDateAndPersonAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx>
 #include <StepBasic_PersonAndOrganizationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonItem.cxx b/src/StepAP214/StepAP214_AutoDesignDateAndPersonItem.cxx
index 1201ba340a..f05b74ce15 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonItem.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonItem.cxx
@@ -18,7 +18,6 @@
 #include <StepAP214_AutoDesignDocumentReference.hxx>
 #include <StepAP214_AutoDesignOrganizationAssignment.hxx>
 #include <StepBasic_Product.hxx>
-#include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx b/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
index 8f505e97fe..aa8895066d 100644
--- a/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignDocumentReference.hxx>
 #include <StepAP214_AutoDesignReferencingItem.hxx>
 #include <StepBasic_Document.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx b/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
index 53e9a922ef..5595544b6e 100644
--- a/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignDocumentReference_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignReferencingItem.hxx>
 #include <StepBasic_DocumentReference.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignGeneralOrgItem.cxx b/src/StepAP214/StepAP214_AutoDesignGeneralOrgItem.cxx
index 97c4ebc0eb..f4d12865a7 100644
--- a/src/StepAP214/StepAP214_AutoDesignGeneralOrgItem.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignGeneralOrgItem.cxx
@@ -17,7 +17,6 @@
 #include <StepAP214_AutoDesignDocumentReference.hxx>
 #include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_Product.hxx>
-#include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
index 250f450818..f9d897b30d 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignGroupAssignment.hxx>
 #include <StepAP214_AutoDesignGroupedItem.hxx>
 #include <StepBasic_Group.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
index a4cdbd33be..39dc6df7e7 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignGroupAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignGroupedItem.hxx>
 #include <StepBasic_GroupAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupedItem.cxx b/src/StepAP214/StepAP214_AutoDesignGroupedItem.cxx
index 0e7c81b46c..e7a6ccd7c4 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupedItem.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupedItem.cxx
@@ -15,7 +15,6 @@
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
 #include <StepAP214_AutoDesignGroupedItem.hxx>
-#include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
index fe66d605bb..4fc4f0576c 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepAP214_AutoDesignDateAndTimeItem.hxx>
 #include <StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx>
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
index c9c01878c5..a957df0126 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignNominalDateAndTimeAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx>
 #include <StepBasic_DateAndTimeAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
index 4f8a079c0e..acb4943852 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepAP214_AutoDesignDatedItem.hxx>
 #include <StepAP214_AutoDesignNominalDateAssignment.hxx>
 #include <StepBasic_Date.hxx>
 #include <StepBasic_DateRole.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
index 34eb0ff581..6381f6497d 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignNominalDateAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignDatedItem.hxx>
 #include <StepBasic_DateAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
index 2c4f11fd5f..39ed351df0 100644
--- a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepAP214_AutoDesignOrganizationAssignment.hxx>
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationRole.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
index 7aaf4fa71f..ed61df54a8 100644
--- a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignOrganizationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_OrganizationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
index c37d8a3e67..a72c27821c 100644
--- a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
index 35be414347..ee61e847bd 100644
--- a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignPersonAndOrganizationAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_PersonAndOrganizationAssignment.hxx>
diff --git a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
index e13cb82a3d..72db110505 100644
--- a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepAP214_AutoDesignPresentedItem.hxx>
 #include <StepAP214_AutoDesignPresentedItemSelect.hxx>
 
diff --git a/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx b/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
index 121a2b9cdc..3ea1a06054 100644
--- a/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_AutoDesignPresentedItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx>
 #include <StepVisual_PresentedItem.hxx>
diff --git a/src/StepAP214/StepAP214_DocumentReferenceItem.cxx b/src/StepAP214/StepAP214_DocumentReferenceItem.cxx
index 96c16afb9c..4920b0a672 100644
--- a/src/StepAP214/StepAP214_DocumentReferenceItem.cxx
+++ b/src/StepAP214/StepAP214_DocumentReferenceItem.cxx
@@ -24,7 +24,6 @@
 #include <StepBasic_ProductCategory.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
-#include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepRepr_AssemblyComponentUsage.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
 #include <StepRepr_MaterialDesignation.hxx>
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx b/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
index 8caefe8236..0ac766fe50 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepAP214_ExternallyDefinedClass.hxx>
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
index 2f23480d54..9a5a5f51e9 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepAP214_ExternallyDefinedGeneralProperty.hxx>
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
diff --git a/src/StepAP214/StepAP214_HArray1OfApprovalItem.hxx b/src/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
index c3311f2e5e..78f771aee9 100644
--- a/src/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfApprovalItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfApprovalItem_HeaderFile
 #define StepAP214_HArray1OfApprovalItem_HeaderFile
 
-#include <StepAP214_ApprovalItem.hxx>
 #include <StepAP214_Array1OfApprovalItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
index 7f8652729b..201a2864ec 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndPersonItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignDateAndPersonItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignDateAndPersonItem_HeaderFile
 
-#include <StepAP214_AutoDesignDateAndPersonItem.hxx>
 #include <StepAP214_Array1OfAutoDesignDateAndPersonItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
index 4dbbca9580..9a583672d7 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignDateAndTimeItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignDateAndTimeItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignDateAndTimeItem_HeaderFile
 
-#include <StepAP214_AutoDesignDateAndTimeItem.hxx>
 #include <StepAP214_Array1OfAutoDesignDateAndTimeItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
index d26e7e5ff8..ce49787fa6 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignDatedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignDatedItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignDatedItem_HeaderFile
 
-#include <StepAP214_AutoDesignDatedItem.hxx>
 #include <StepAP214_Array1OfAutoDesignDatedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
index b57981e4ce..6011bed137 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignGeneralOrgItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignGeneralOrgItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignGeneralOrgItem_HeaderFile
 
-#include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepAP214_Array1OfAutoDesignGeneralOrgItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
index d64b929335..9d95c69526 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignGroupedItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignGroupedItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignGroupedItem_HeaderFile
 
-#include <StepAP214_AutoDesignGroupedItem.hxx>
 #include <StepAP214_Array1OfAutoDesignGroupedItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
index 1d74713d8a..f0056087db 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignPresentedItemSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignPresentedItemSelect_HeaderFile
 #define StepAP214_HArray1OfAutoDesignPresentedItemSelect_HeaderFile
 
-#include <StepAP214_AutoDesignPresentedItemSelect.hxx>
 #include <StepAP214_Array1OfAutoDesignPresentedItemSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx b/src/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
index 1d844fd4d5..f4c956dc09 100644
--- a/src/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfAutoDesignReferencingItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfAutoDesignReferencingItem_HeaderFile
 #define StepAP214_HArray1OfAutoDesignReferencingItem_HeaderFile
 
-#include <StepAP214_AutoDesignReferencingItem.hxx>
 #include <StepAP214_Array1OfAutoDesignReferencingItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx b/src/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
index f98d8ee50b..dc6be6e5f5 100644
--- a/src/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfDateAndTimeItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfDateAndTimeItem_HeaderFile
 #define StepAP214_HArray1OfDateAndTimeItem_HeaderFile
 
-#include <StepAP214_DateAndTimeItem.hxx>
 #include <StepAP214_Array1OfDateAndTimeItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfDateItem.hxx b/src/StepAP214/StepAP214_HArray1OfDateItem.hxx
index 93fdabbf2b..7fa141133a 100644
--- a/src/StepAP214/StepAP214_HArray1OfDateItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfDateItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfDateItem_HeaderFile
 #define StepAP214_HArray1OfDateItem_HeaderFile
 
-#include <StepAP214_DateItem.hxx>
 #include <StepAP214_Array1OfDateItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx b/src/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
index 03672aa213..42f86b7c19 100644
--- a/src/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfDocumentReferenceItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfDocumentReferenceItem_HeaderFile
 #define StepAP214_HArray1OfDocumentReferenceItem_HeaderFile
 
-#include <StepAP214_DocumentReferenceItem.hxx>
 #include <StepAP214_Array1OfDocumentReferenceItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx b/src/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
index fee3a9d8dd..88eec5c490 100644
--- a/src/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfExternalIdentificationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfExternalIdentificationItem_HeaderFile
 #define StepAP214_HArray1OfExternalIdentificationItem_HeaderFile
 
-#include <StepAP214_ExternalIdentificationItem.hxx>
 #include <StepAP214_Array1OfExternalIdentificationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfGroupItem.hxx b/src/StepAP214/StepAP214_HArray1OfGroupItem.hxx
index c1e5216f15..b1d69411a7 100644
--- a/src/StepAP214/StepAP214_HArray1OfGroupItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfGroupItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfGroupItem_HeaderFile
 #define StepAP214_HArray1OfGroupItem_HeaderFile
 
-#include <StepAP214_GroupItem.hxx>
 #include <StepAP214_Array1OfGroupItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx b/src/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
index b2be68d6cc..948d800d44 100644
--- a/src/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfOrganizationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfOrganizationItem_HeaderFile
 #define StepAP214_HArray1OfOrganizationItem_HeaderFile
 
-#include <StepAP214_OrganizationItem.hxx>
 #include <StepAP214_Array1OfOrganizationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx b/src/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
index 9f1990c25f..94818c51f5 100644
--- a/src/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfPersonAndOrganizationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfPersonAndOrganizationItem_HeaderFile
 #define StepAP214_HArray1OfPersonAndOrganizationItem_HeaderFile
 
-#include <StepAP214_PersonAndOrganizationItem.hxx>
 #include <StepAP214_Array1OfPersonAndOrganizationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx b/src/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
index fa9d2fd570..1518709038 100644
--- a/src/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfPresentedItemSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfPresentedItemSelect_HeaderFile
 #define StepAP214_HArray1OfPresentedItemSelect_HeaderFile
 
-#include <StepAP214_PresentedItemSelect.hxx>
 #include <StepAP214_Array1OfPresentedItemSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx b/src/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
index 01dc59576e..c23ec74165 100644
--- a/src/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
+++ b/src/StepAP214/StepAP214_HArray1OfSecurityClassificationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepAP214_HArray1OfSecurityClassificationItem_HeaderFile
 #define StepAP214_HArray1OfSecurityClassificationItem_HeaderFile
 
-#include <StepAP214_SecurityClassificationItem.hxx>
 #include <StepAP214_Array1OfSecurityClassificationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx
index 11646ba0ab..827ef454eb 100644
--- a/src/StepAP214/StepAP214_Protocol.cxx
+++ b/src/StepAP214/StepAP214_Protocol.cxx
@@ -15,8 +15,6 @@
 //:j4 gka 11 Mar 99 S4134 :  added new types for DIS
 //    gka 09.04.99: S4136: new name of parameter write.step.schema 
 
-#include <Interface_Protocol.hxx>
-#include <Standard_Type.hxx>
 #include <StepAP214_Protocol.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepAP214_Protocol,StepData_Protocol)
@@ -29,14 +27,12 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 
 #include <HeaderSection_Protocol.hxx>
 
-#include <StepBasic_Address.hxx>
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
 #include <StepShape_AdvancedFace.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationCurveOccurrence.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationFillArea.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationFillAreaOccurrence.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <StepVisual_AnnotationOccurrence.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationSubfigureOccurrence.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationSymbol.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_AnnotationSymbolOccurrence.hxx>
@@ -45,9 +41,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_AnnotationTextOccurrence.hxx>
 
 #include <StepBasic_ApplicationContext.hxx>
-#include <StepBasic_ApplicationContextElement.hxx>
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
-#include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalPersonOrganization.hxx>
 #include <StepBasic_ApprovalRelationship.hxx>
 #include <StepBasic_ApprovalRole.hxx>
@@ -67,41 +61,29 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 // Removed from CC1-Rev2 to Rev4 : <StepAP214_AutoDesignViewArea.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepGeom_Axis2Placement2d.hxx>
-#include <StepGeom_Axis2Placement3d.hxx>
-#include <StepGeom_BSplineCurve.hxx>
 #include <StepGeom_BSplineCurveWithKnots.hxx>
-#include <StepGeom_BSplineSurface.hxx>
 #include <StepGeom_BSplineSurfaceWithKnots.hxx>
 #include <StepVisual_BackgroundColour.hxx>
 #include <StepGeom_BezierCurve.hxx>
 #include <StepGeom_BezierSurface.hxx>
 #include <StepShape_Block.hxx>
 #include <StepShape_BooleanResult.hxx>
-#include <StepGeom_BoundaryCurve.hxx>
 #include <StepGeom_BoundedCurve.hxx>
 #include <StepGeom_BoundedSurface.hxx>
 #include <StepShape_BoxDomain.hxx>
 #include <StepShape_BoxedHalfSpace.hxx>
 #include <StepShape_BrepWithVoids.hxx>
 #include <StepBasic_CalendarDate.hxx>
-#include <StepVisual_CameraImage.hxx>
-#include <StepVisual_CameraModel.hxx>
 #include <StepVisual_CameraModelD2.hxx>
-#include <StepVisual_CameraModelD3.hxx>
 #include <StepVisual_CameraUsage.hxx>
 #include <StepGeom_CartesianPoint.hxx>
-#include <StepGeom_CartesianTransformationOperator.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
 #include <StepGeom_Circle.hxx>
 #include <StepShape_ClosedShell.hxx>
 #include <StepVisual_Colour.hxx>
 #include <StepVisual_ColourRgb.hxx>
 #include <StepVisual_ColourSpecification.hxx>
-#include <StepGeom_CompositeCurve.hxx>
-#include <StepGeom_CompositeCurveOnSurface.hxx>
-#include <StepGeom_CompositeCurveSegment.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <StepVisual_CompositeText.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_CompositeTextWithAssociatedCurves.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_CompositeTextWithBlankingBox.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
@@ -112,7 +94,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_ConnectedFaceSet.hxx>
 #include <StepVisual_ContextDependentInvisibility.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_CoordinatedUniversalTimeOffset.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepShape_CsgRepresentation.hxx>
 #include <StepShape_CsgShapeRepresentation.hxx>
@@ -129,14 +110,11 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepBasic_DateRole.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DefinedSymbol.hxx>
-#include <StepRepr_DefinitionalRepresentation.hxx>
-#include <StepGeom_DegeneratePcurve.hxx>
 #include <StepGeom_DegenerateToroidalSurface.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DimensionCurve.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DimensionCurveTerminator.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepGeom_Direction.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
 #include <StepVisual_DraughtingAnnotationOccurrence.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DraughtingCallout.hxx>
@@ -147,7 +125,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DraughtingTextLiteralWithDelineation.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DrawingDefinition.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_DrawingRevision.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
 #include <StepGeom_ElementarySurface.hxx>
@@ -175,21 +152,17 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_FillAreaStyleTileSymbolWithStyle.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_FillAreaStyleTiles.hxx>
 #include <StepRepr_FunctionallyDefinedTransformation.hxx>
-#include <StepShape_GeometricCurveSet.hxx>
 #include <StepGeom_GeometricRepresentationContext.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
-#include <StepShape_GeometricSet.hxx>
 #include <StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx>
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
-#include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <StepGeom_Hyperbola.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
 #include <StepVisual_Invisibility.hxx>
-#include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_LengthUnit.hxx>
 #include <StepGeom_Line.hxx>
 #include <StepBasic_LocalTime.hxx>
@@ -206,9 +179,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepGeom_OffsetCurve3d.hxx>
 #include <StepGeom_OffsetSurface.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepAP214_OneDirectionRepeatFactor.hxx>
-#include <StepShape_OpenShell.hxx>
 #include <StepBasic_OrdinalDate.hxx>
-#include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationRole.hxx>
 #include <StepBasic_OrganizationalAddress.hxx>
 #include <StepShape_OrientedClosedShell.hxx>
@@ -222,7 +193,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepRepr_ParametricRepresentationContext.hxx>
 #include <StepShape_Path.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepBasic_Person.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 #include <StepBasic_PersonalAddress.hxx>
@@ -230,11 +200,8 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_PlanarBox.hxx>
 #include <StepVisual_PlanarExtent.hxx>
 #include <StepGeom_Plane.hxx>
-#include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
 #include <StepGeom_Point.hxx>
-#include <StepGeom_PointOnCurve.hxx>
-#include <StepGeom_PointOnSurface.hxx>
 #include <StepGeom_PointReplica.hxx>
 #include <StepVisual_PointStyle.hxx>
 #include <StepShape_PolyLoop.hxx>
@@ -254,34 +221,24 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_PresentationStyleAssignment.hxx>
 #include <StepVisual_PresentationStyleByContext.hxx>
 #include <StepVisual_PresentationView.hxx>
-#include <StepBasic_Product.hxx>
-#include <StepBasic_ProductCategory.hxx>
-#include <StepBasic_ProductContext.hxx>
 #include <StepBasic_MechanicalContext.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_ProductDataRepresentationView.hxx>
-#include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinitionContext.hxx>
-#include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
-#include <StepBasic_ProductRelatedProductCategory.hxx>
 #include <StepBasic_ProductType.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <StepRepr_PropertyDefinitionRepresentation.hxx>
 #include <StepGeom_QuasiUniformCurve.hxx>
 #include <StepGeom_QuasiUniformSurface.hxx>
 #include <StepBasic_RatioMeasureWithUnit.hxx>
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <StepGeom_RectangularCompositeSurface.hxx>
-#include <StepGeom_RectangularTrimmedSurface.hxx>
 #include <StepAP214_RepItemGroup.hxx>
 #include <StepGeom_ReparametrisedCompositeCurveSegment.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_RepresentationMap.hxx>
-#include <StepRepr_RepresentationRelationship.hxx>
 #include <StepShape_RevolvedAreaSolid.hxx>
 #include <StepShape_RightAngularWedge.hxx>
 #include <StepShape_RightCircularCone.hxx>
@@ -289,14 +246,11 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepGeom_SeamCurve.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 #include <StepBasic_SecurityClassificationLevel.hxx>
-#include <StepRepr_ShapeAspect.hxx>
-#include <StepRepr_ShapeAspectRelationship.hxx>
 #include <StepRepr_FeatureForDatumTargetRelationship.hxx>
 #include <StepRepr_ShapeAspectTransition.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
 #include <StepShape_ShellBasedSurfaceModel.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SolidAngleMeasureWithUnit.hxx>
 #include <StepShape_SolidModel.hxx>
 #include <StepShape_SolidReplica.hxx>
@@ -335,7 +289,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_TextLiteralWithDelineation.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_TextLiteralWithExtent.hxx>
 // Removed from CC1-Rev2 to CC1-Rev4, re-added CC2-Rev4 :
-#include <StepVisual_TextStyle.hxx>
 #include <StepVisual_TextStyleForDefinedFont.hxx>
 #include <StepVisual_TextStyleWithBoxCharacteristics.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepVisual_TextStyleWithMirror.hxx>
@@ -343,7 +296,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepGeom_ToroidalSurface.hxx>
 #include <StepShape_Torus.hxx>
 #include <StepShape_TransitionalShapeRepresentation.hxx>
-#include <StepGeom_TrimmedCurve.hxx>
 // Removed from CC1-Rev2 to Rev4 : <StepAP214_TwoDirectionRepeatFactor.hxx>
 #include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepGeom_UniformCurve.hxx>
@@ -394,29 +346,22 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepGeom_CartesianTransformationOperator2d.hxx>
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepVisual_PresentedItemRepresentation.hxx>
 #include <StepVisual_PresentationLayerUsage.hxx>
 
 //  Added by CKY (JUL-1998) for AP214 CC1 -> CC2
 
 #include <StepAP214_AutoDesignDocumentReference.hxx>
-#include <StepBasic_Document.hxx>
 #include <StepBasic_DigitalDocument.hxx>
 #include <StepBasic_DocumentRelationship.hxx>
 #include <StepBasic_DocumentType.hxx>
 #include <StepBasic_DocumentUsageConstraint.hxx>
-#include <StepBasic_Effectivity.hxx>
-#include <StepBasic_ProductDefinitionEffectivity.hxx>
-#include <StepBasic_ProductDefinitionRelationship.hxx>
 
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <StepBasic_PhysicallyModeledProductDefinition.hxx>
 
 
-#include <StepRepr_ProductDefinitionUsage.hxx>
 #include <StepRepr_MakeFromUsageOption.hxx>
-#include <StepRepr_AssemblyComponentUsage.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_PromissoryUsageOccurrence.hxx>
 #include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
@@ -424,8 +369,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepRepr_AssemblyComponentUsageSubstitute.hxx>
 #include <StepRepr_SuppliedPartRelationship.hxx>
 #include <StepRepr_ExternallyDefinedRepresentation.hxx>
-#include <StepRepr_ShapeRepresentationRelationship.hxx>
-#include <StepRepr_RepresentationRelationshipWithTransformation.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
 #include <StepRepr_MaterialDesignation.hxx>
 
@@ -464,9 +407,7 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 
 // Added by ABV 10.11.99 for AP203
 #include <StepBasic_Action.hxx>
-#include <StepBasic_ActionAssignment.hxx>
 #include <StepBasic_ActionMethod.hxx>
-#include <StepBasic_ActionRequestAssignment.hxx>
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepAP203_CcDesignCertification.hxx>
 #include <StepAP203_CcDesignContract.hxx>
@@ -493,7 +434,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepBasic_ActionRequestSolution.hxx>
 
 // Added by ABV 13.01.00 for CAX-IF TRJ3
-#include <StepVisual_DraughtingModel.hxx>
 
 // Added by ABV 18.04.00 for CAX-IF TRJ4 (dimensions)
 #include <StepShape_AngularLocation.hxx>
@@ -510,20 +450,14 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepBasic_ObjectRole.hxx>
 #include <StepBasic_RoleAssociation.hxx>
 #include <StepBasic_IdentificationRole.hxx>
-#include <StepBasic_IdentificationAssignment.hxx>
-#include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_EffectivityAssignment.hxx>
 #include <StepBasic_NameAssignment.hxx>
-#include <StepBasic_GeneralProperty.hxx>
-#include <StepAP214_Class.hxx>
 #include <StepAP214_ExternallyDefinedClass.hxx>
 #include <StepAP214_ExternallyDefinedGeneralProperty.hxx>
 #include <StepAP214_AppliedExternalIdentificationAssignment.hxx>
 #include <StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx>
 
 // Added by CKY , 25 APR 2001 for Dimensional Tolerances (CAX-IF TRJ7)
-#include <StepRepr_CompositeShapeAspect.hxx>
-#include <StepRepr_DerivedShapeAspect.hxx>
 #include <StepRepr_Extension.hxx>
 #include <StepShape_DirectedDimensionalLocation.hxx>
 #include <StepShape_LimitsAndFits.hxx>
@@ -534,13 +468,11 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepShape_TypeQualifier.hxx>
 #include <StepShape_QualifiedRepresentationItem.hxx>
 #include <StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.hxx>
-#include <StepRepr_CompoundRepresentationItem.hxx>
 #include <StepRepr_ValueRange.hxx>
 #include <StepRepr_ShapeAspectDerivingRelationship.hxx>
 
 // Added by ABV 28.12.01 for CAX-IF TRJ9 (edge_based_wireframe_model)
 #include <StepShape_CompoundShapeRepresentation.hxx>
-#include <StepShape_ConnectedEdgeSet.hxx>
 #include <StepShape_ConnectedFaceShapeRepresentation.hxx>
 #include <StepShape_EdgeBasedWireframeModel.hxx>
 #include <StepShape_EdgeBasedWireframeShapeRepresentation.hxx>
@@ -558,15 +490,11 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepBasic_ThermodynamicTemperatureUnit.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
 #include <StepElement_Curve3dElementDescriptor.hxx>
-#include <StepElement_CurveElementEndReleasePacket.hxx>
-#include <StepElement_CurveElementSectionDefinition.hxx>
 #include <StepElement_CurveElementSectionDerivedDefinitions.hxx>
 #include <StepElement_ElementDescriptor.hxx>
 #include <StepElement_ElementMaterial.hxx>
 #include <StepElement_Surface3dElementDescriptor.hxx>
 #include <StepElement_SurfaceElementProperty.hxx>
-#include <StepElement_SurfaceSection.hxx>
-#include <StepElement_SurfaceSectionField.hxx>
 #include <StepElement_SurfaceSectionFieldConstant.hxx>
 #include <StepElement_SurfaceSectionFieldVarying.hxx>
 #include <StepElement_UniformSurfaceSection.hxx>
@@ -575,7 +503,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx>
 #include <StepFEA_Curve3dElementProperty.hxx>
 #include <StepFEA_Curve3dElementRepresentation.hxx>
-#include <StepFEA_Node.hxx>
 #include <StepFEA_CurveElementEndOffset.hxx>
 #include <StepFEA_CurveElementEndRelease.hxx>
 #include <StepFEA_CurveElementInterval.hxx>
@@ -592,7 +519,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepFEA_FeaMassDensity.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentation.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
-#include <StepFEA_FeaModel.hxx>
 #include <StepFEA_FeaModel3d.hxx>
 #include <StepFEA_FeaMoistureAbsorption.hxx>
 #include <StepFEA_FeaParametricPoint.hxx>
@@ -639,12 +565,10 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepFEA_FeaSurfaceSectionGeometricRelationship.hxx>
 
 //added PTV TRJ11 8.02.2003
-#include <StepBasic_DocumentProductAssociation.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
 
 //TR12J 4.06.2003 G&DT entities
 #include <StepShape_ShapeRepresentationWithParameters.hxx>
-#include <StepDimTol_ShapeToleranceSelect.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
 #include <StepDimTol_ConcentricityTolerance.hxx>
 #include <StepDimTol_CircularRunoutTolerance.hxx>
@@ -668,7 +592,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepDimTol_DatumFeature.hxx>
 #include <StepDimTol_DatumReference.hxx>
 #include <StepDimTol_CommonDatum.hxx>
-#include <StepDimTol_DatumTarget.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
 
 #include <StepRepr_ReprItemAndLengthMeasureWithUnit.hxx>
@@ -678,10 +601,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_MassMeasureWithUnit.hxx>
 #include <StepBasic_CharacterizedObject.hxx>
-#include <StepFEA_CurveElementEndCoordinateSystem.hxx>
-#include <StepFEA_SymmetricTensor22d.hxx>
-#include <StepFEA_SymmetricTensor42d.hxx>
-#include <StepFEA_SymmetricTensor43d.hxx>
 
 // Added by ika for GD&T AP242
 #include <StepRepr_Apex.hxx>
@@ -710,7 +629,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
 #include <StepDimTol_ToleranceZoneForm.hxx>
 #include <StepShape_ValueFormatTypeQualifier.hxx>
-#include <StepDimTol_DatumReferenceCompartment.hxx>
 #include <StepDimTol_DatumReferenceElement.hxx>
 #include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 #include <StepDimTol_DatumSystem.hxx>
@@ -718,9 +636,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx>
 #include <StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx>
-#include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
-#include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
-#include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
@@ -729,13 +644,11 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepAP242_DraughtingModelItemAssociation.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
-#include <StepVisual_AnnotationCurveOccurrence.hxx>
 #include <StepVisual_AnnotationPlane.hxx>
 #include <StepVisual_DraughtingCallout.hxx>
 
 
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
-#include <StepVisual_TessellatedItem.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
 #include <StepVisual_TessellatedCurveSet.hxx>
 #include <StepVisual_RepositionedTessellatedGeometricSet.hxx>
@@ -753,22 +666,17 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
 
 // Added for kinematics implementation
-#include <StepRepr_RepresentationContextReference.hxx>
 #include <StepRepr_RepresentationReference.hxx>
 #include <StepGeom_SuParameters.hxx>
 #include <StepKinematics_RotationAboutDirection.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 #include <StepKinematics_ActuatedKinematicPair.hxx>
 #include <StepKinematics_ContextDependentKinematicLinkRepresentation.hxx>
-#include <StepKinematics_CylindricalPair.hxx>
 #include <StepKinematics_CylindricalPairValue.hxx>
 #include <StepKinematics_CylindricalPairWithRange.hxx>
 #include <StepKinematics_FullyConstrainedPair.hxx>
-#include <StepKinematics_GearPair.hxx>
 #include <StepKinematics_GearPairValue.hxx>
 #include <StepKinematics_GearPairWithRange.hxx>
 #include <StepKinematics_HomokineticPair.hxx>
-#include <StepKinematics_KinematicLink.hxx>
 #include <StepKinematics_KinematicLinkRepresentationAssociation.hxx>
 #include <StepKinematics_KinematicPropertyMechanismRepresentation.hxx>
 #include <StepKinematics_KinematicTopologyDirectedStructure.hxx>
@@ -783,26 +691,19 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepKinematics_MechanismRepresentation.hxx>
 #include <StepKinematics_OrientedJoint.hxx>
 #include <StepKinematics_PairRepresentationRelationship.hxx>
-#include <StepKinematics_PlanarCurvePair.hxx>
 #include <StepKinematics_PlanarCurvePairRange.hxx>
-#include <StepKinematics_PlanarPair.hxx>
 #include <StepKinematics_PlanarPairValue.hxx>
 #include <StepKinematics_PlanarPairWithRange.hxx>
-#include <StepKinematics_PointOnPlanarCurvePair.hxx>
 #include <StepKinematics_PointOnPlanarCurvePairValue.hxx>
 #include <StepKinematics_PointOnPlanarCurvePairWithRange.hxx>
-#include <StepKinematics_PointOnSurfacePair.hxx>
 #include <StepKinematics_PointOnSurfacePairValue.hxx>
 #include <StepKinematics_PointOnSurfacePairWithRange.hxx>
-#include <StepKinematics_PrismaticPair.hxx>
 #include <StepKinematics_PrismaticPairValue.hxx>
 #include <StepKinematics_PrismaticPairWithRange.hxx>
 #include <StepKinematics_ProductDefinitionKinematics.hxx>
 #include <StepKinematics_ProductDefinitionRelationshipKinematics.hxx>
-#include <StepKinematics_RackAndPinionPair.hxx>
 #include <StepKinematics_RackAndPinionPairValue.hxx>
 #include <StepKinematics_RackAndPinionPairWithRange.hxx>
-#include <StepKinematics_RevolutePair.hxx>
 #include <StepKinematics_RevolutePairValue.hxx>
 #include <StepKinematics_RevolutePairWithRange.hxx>
 #include <StepKinematics_RigidLinkRepresentation.hxx>
@@ -810,16 +711,13 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepKinematics_RollingCurvePairValue.hxx>
 #include <StepKinematics_RollingSurfacePair.hxx>
 #include <StepKinematics_RollingSurfacePairValue.hxx>
-#include <StepKinematics_ScrewPair.hxx>
 #include <StepKinematics_ScrewPairValue.hxx>
 #include <StepKinematics_ScrewPairWithRange.hxx>
 #include <StepKinematics_SlidingCurvePair.hxx>
 #include <StepKinematics_SlidingCurvePairValue.hxx>
 #include <StepKinematics_SlidingSurfacePair.hxx>
 #include <StepKinematics_SlidingSurfacePairValue.hxx>
-#include <StepKinematics_SphericalPair.hxx>
 #include <StepKinematics_SphericalPairValue.hxx>
-#include <StepKinematics_SphericalPairWithPin.hxx>
 #include <StepKinematics_SphericalPairWithPinAndRange.hxx>
 #include <StepKinematics_SphericalPairWithRange.hxx>
 #include <StepKinematics_SurfacePairWithRange.hxx>
@@ -833,7 +731,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 
 #include <StepVisual_SurfaceStyleTransparent.hxx>
 #include <StepVisual_SurfaceStyleReflectanceAmbient.hxx>
-#include <StepVisual_SurfaceStyleRendering.hxx>
 #include <StepVisual_SurfaceStyleRenderingWithProperties.hxx>
 
 #include <StepVisual_TessellatedConnectingEdge.hxx>
diff --git a/src/StepAP214/StepAP214_Protocol.hxx b/src/StepAP214/StepAP214_Protocol.hxx
index ab13ff90e8..988c55c8b5 100644
--- a/src/StepAP214/StepAP214_Protocol.hxx
+++ b/src/StepAP214/StepAP214_Protocol.hxx
@@ -18,7 +18,6 @@
 #define _StepAP214_Protocol_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepData_Protocol.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepAP214/StepAP214_RepItemGroup.cxx b/src/StepAP214/StepAP214_RepItemGroup.cxx
index 5c4f458a92..b2734e6589 100644
--- a/src/StepAP214/StepAP214_RepItemGroup.cxx
+++ b/src/StepAP214/StepAP214_RepItemGroup.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepAP214_RepItemGroup.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepAP214/StepAP214_SecurityClassificationItem.cxx b/src/StepAP214/StepAP214_SecurityClassificationItem.cxx
index bcf9d971f0..82221cde83 100644
--- a/src/StepAP214/StepAP214_SecurityClassificationItem.cxx
+++ b/src/StepAP214/StepAP214_SecurityClassificationItem.cxx
@@ -15,12 +15,10 @@
 #include <Interface_Macros.hxx>
 #include <StepAP214_SecurityClassificationItem.hxx>
 #include <StepBasic_Action.hxx>
-#include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentFile.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
-#include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <StepBasic_GeneralProperty.hxx>
 #include <StepRepr_ProductConcept.hxx>
diff --git a/src/StepAP242/StepAP242_DraughtingModelItemAssociation.hxx b/src/StepAP242/StepAP242_DraughtingModelItemAssociation.hxx
index 5e13b661ad..b8587df599 100644
--- a/src/StepAP242/StepAP242_DraughtingModelItemAssociation.hxx
+++ b/src/StepAP242/StepAP242_DraughtingModelItemAssociation.hxx
@@ -17,7 +17,6 @@
 #define _StepAP242_DraughtingModelItemAssociation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP242_ItemIdentifiedRepresentationUsage.hxx>
 
diff --git a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
index 8acfa00e92..ec6c6349de 100644
--- a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
+++ b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
@@ -17,7 +17,6 @@
 #define _StepAP242_GeometricItemSpecificUsage_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP242_ItemIdentifiedRepresentationUsage.hxx>
 
diff --git a/src/StepAP242/StepAP242_IdAttribute.hxx b/src/StepAP242/StepAP242_IdAttribute.hxx
index 34732f1f41..c1cbb2c514 100644
--- a/src/StepAP242/StepAP242_IdAttribute.hxx
+++ b/src/StepAP242/StepAP242_IdAttribute.hxx
@@ -17,7 +17,6 @@
 #define _StepAP242_IdAttribute_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepAP242_IdAttributeSelect.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
index d6e8d48edd..54cff3c614 100644
--- a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
+++ b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
@@ -17,7 +17,6 @@
 #define _StepAP242_ItemIdentifiedRepresentationUsage_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
 #include <StepAP242_ItemIdentifiedRepresentationUsageDefinition.hxx>
diff --git a/src/StepBasic/StepBasic_Action.cxx b/src/StepBasic/StepBasic_Action.cxx
index 1c348ef993..bd3ed79ace 100644
--- a/src/StepBasic/StepBasic_Action.cxx
+++ b/src/StepBasic/StepBasic_Action.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Action.hxx>
 #include <StepBasic_ActionMethod.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ActionMethod.cxx b/src/StepBasic/StepBasic_ActionMethod.cxx
index eedea72815..01a8d4e0a4 100644
--- a/src/StepBasic/StepBasic_ActionMethod.cxx
+++ b/src/StepBasic/StepBasic_ActionMethod.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ActionMethod.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Address.cxx b/src/StepBasic/StepBasic_Address.cxx
index 87f92c9cd7..7296d9fc8b 100644
--- a/src/StepBasic/StepBasic_Address.cxx
+++ b/src/StepBasic/StepBasic_Address.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Address.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ApplicationContext.cxx b/src/StepBasic/StepBasic_ApplicationContext.cxx
index ced644a0d0..13ac1bc4b6 100644
--- a/src/StepBasic/StepBasic_ApplicationContext.cxx
+++ b/src/StepBasic/StepBasic_ApplicationContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ApplicationContextElement.cxx b/src/StepBasic/StepBasic_ApplicationContextElement.cxx
index 030d011eea..eaa7361874 100644
--- a/src/StepBasic/StepBasic_ApplicationContextElement.cxx
+++ b/src/StepBasic/StepBasic_ApplicationContextElement.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ApplicationContextElement.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
index 2f45aa2460..a34699a72d 100644
--- a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
+++ b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_Approval.cxx b/src/StepBasic/StepBasic_Approval.cxx
index 6b0a55fca7..9a5aba8019 100644
--- a/src/StepBasic/StepBasic_Approval.cxx
+++ b/src/StepBasic/StepBasic_Approval.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalStatus.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ApprovalDateTime.cxx b/src/StepBasic/StepBasic_ApprovalDateTime.cxx
index 311a1a7fe1..33fea3e5d0 100644
--- a/src/StepBasic/StepBasic_ApprovalDateTime.cxx
+++ b/src/StepBasic/StepBasic_ApprovalDateTime.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalDateTime.hxx>
 #include <StepBasic_DateTimeSelect.hxx>
diff --git a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
index cd3fd4a1c7..74cc7a868b 100644
--- a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
+++ b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalPersonOrganization.hxx>
 #include <StepBasic_ApprovalRole.hxx>
diff --git a/src/StepBasic/StepBasic_ApprovalRelationship.cxx b/src/StepBasic/StepBasic_ApprovalRelationship.cxx
index 12b13a552e..57a19e3a8d 100644
--- a/src/StepBasic/StepBasic_ApprovalRelationship.cxx
+++ b/src/StepBasic/StepBasic_ApprovalRelationship.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ApprovalRole.cxx b/src/StepBasic/StepBasic_ApprovalRole.cxx
index 3a1a25c7c5..76745a1148 100644
--- a/src/StepBasic/StepBasic_ApprovalRole.cxx
+++ b/src/StepBasic/StepBasic_ApprovalRole.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApprovalRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ApprovalStatus.cxx b/src/StepBasic/StepBasic_ApprovalStatus.cxx
index 7ada499860..b59113bee5 100644
--- a/src/StepBasic/StepBasic_ApprovalStatus.cxx
+++ b/src/StepBasic/StepBasic_ApprovalStatus.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApprovalStatus.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Certification.cxx b/src/StepBasic/StepBasic_Certification.cxx
index 352728773c..bc85cbe50a 100644
--- a/src/StepBasic/StepBasic_Certification.cxx
+++ b/src/StepBasic/StepBasic_Certification.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Certification.hxx>
 #include <StepBasic_CertificationType.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_CertificationType.cxx b/src/StepBasic/StepBasic_CertificationType.cxx
index 5ccb8656f4..979c739438 100644
--- a/src/StepBasic/StepBasic_CertificationType.cxx
+++ b/src/StepBasic/StepBasic_CertificationType.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_CertificationType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_CharacterizedObject.cxx b/src/StepBasic/StepBasic_CharacterizedObject.cxx
index 25c9504288..f13065c0e3 100644
--- a/src/StepBasic/StepBasic_CharacterizedObject.cxx
+++ b/src/StepBasic/StepBasic_CharacterizedObject.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_CharacterizedObject.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Contract.cxx b/src/StepBasic/StepBasic_Contract.cxx
index ef789b6630..8613f35ee5 100644
--- a/src/StepBasic/StepBasic_Contract.cxx
+++ b/src/StepBasic/StepBasic_Contract.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Contract.hxx>
 #include <StepBasic_ContractType.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ContractType.cxx b/src/StepBasic/StepBasic_ContractType.cxx
index 3b914122cc..8caad733ae 100644
--- a/src/StepBasic/StepBasic_ContractType.cxx
+++ b/src/StepBasic/StepBasic_ContractType.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ContractType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
index c04c73da17..1dcf9e64ee 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
index 1e2d129188..0b35323dbd 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndLengthUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
index 8353815bc8..e42d902b60 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndMassUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
index d9f51bb269..9d29ff2afa 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
index 2f8fe48d3b..da4ddea937 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndRatioUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
index 641aa0f667..81a5154fa8 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
index c68948703a..9be92c8270 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_ConversionBasedUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndTimeUnit.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
diff --git a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
index a7d0c3de9e..4cbd412583 100644
--- a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
+++ b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Integer.hxx>
 #include <StepBasic_AheadOrBehind.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 
 
diff --git a/src/StepBasic/StepBasic_DateRole.cxx b/src/StepBasic/StepBasic_DateRole.cxx
index 20776d542e..c5c4fe7b15 100644
--- a/src/StepBasic/StepBasic_DateRole.cxx
+++ b/src/StepBasic/StepBasic_DateRole.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_DateRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_DateTimeRole.cxx b/src/StepBasic/StepBasic_DateTimeRole.cxx
index 981729c713..f29e5c1a1c 100644
--- a/src/StepBasic/StepBasic_DateTimeRole.cxx
+++ b/src/StepBasic/StepBasic_DateTimeRole.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_DerivedUnitElement.hxx b/src/StepBasic/StepBasic_DerivedUnitElement.hxx
index 3cc80cec6a..016986861f 100644
--- a/src/StepBasic/StepBasic_DerivedUnitElement.hxx
+++ b/src/StepBasic/StepBasic_DerivedUnitElement.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 class StepBasic_NamedUnit;
 
diff --git a/src/StepBasic/StepBasic_DimensionalExponents.hxx b/src/StepBasic/StepBasic_DimensionalExponents.hxx
index 4bebb8c5d4..7a21dc8ef4 100644
--- a/src/StepBasic/StepBasic_DimensionalExponents.hxx
+++ b/src/StepBasic/StepBasic_DimensionalExponents.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 
 
diff --git a/src/StepBasic/StepBasic_Document.cxx b/src/StepBasic/StepBasic_Document.cxx
index b3ed0bf461..7a827763fa 100644
--- a/src/StepBasic/StepBasic_Document.cxx
+++ b/src/StepBasic/StepBasic_Document.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentType.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_DocumentFile.hxx b/src/StepBasic/StepBasic_DocumentFile.hxx
index 420679f181..2cc60a861f 100644
--- a/src/StepBasic/StepBasic_DocumentFile.hxx
+++ b/src/StepBasic/StepBasic_DocumentFile.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_Document.hxx>
-#include <Standard_Boolean.hxx>
 class StepBasic_CharacterizedObject;
 class TCollection_HAsciiString;
 class StepBasic_DocumentType;
diff --git a/src/StepBasic/StepBasic_DocumentProductAssociation.cxx b/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
index dd16db300b..acefef1ad8 100644
--- a/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
+++ b/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentProductAssociation.hxx>
 #include <StepBasic_ProductOrFormationOrDefinition.hxx>
diff --git a/src/StepBasic/StepBasic_DocumentProductAssociation.hxx b/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
index d81248ddca..9fe7bc1aac 100644
--- a/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
+++ b/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_ProductOrFormationOrDefinition.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TCollection_HAsciiString;
 class StepBasic_Document;
diff --git a/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx b/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
index 72773a7cd3..80d5d345e6 100644
--- a/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
+++ b/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentProductEquivalence,StepBasic_DocumentProductAssociation)
diff --git a/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx b/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
index e684ef08b6..2ec53b28a2 100644
--- a/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
+++ b/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
@@ -17,7 +17,6 @@
 #define _StepBasic_DocumentProductEquivalence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_DocumentProductAssociation.hxx>
 
diff --git a/src/StepBasic/StepBasic_DocumentReference.cxx b/src/StepBasic/StepBasic_DocumentReference.cxx
index 6e22ac342c..24476b9580 100644
--- a/src/StepBasic/StepBasic_DocumentReference.cxx
+++ b/src/StepBasic/StepBasic_DocumentReference.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentReference.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_DocumentRelationship.cxx b/src/StepBasic/StepBasic_DocumentRelationship.cxx
index 1718fdc089..94288cfa2c 100644
--- a/src/StepBasic/StepBasic_DocumentRelationship.cxx
+++ b/src/StepBasic/StepBasic_DocumentRelationship.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_DocumentRepresentationType.cxx b/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
index 154646823c..0488a4a177 100644
--- a/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
+++ b/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentRepresentationType.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_DocumentType.cxx b/src/StepBasic/StepBasic_DocumentType.cxx
index 04934f78c4..de3fdbbdae 100644
--- a/src/StepBasic/StepBasic_DocumentType.cxx
+++ b/src/StepBasic/StepBasic_DocumentType.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_DocumentType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx b/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
index 9977e0db41..a9c08da6e7 100644
--- a/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
+++ b/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Document.hxx>
 #include <StepBasic_DocumentUsageConstraint.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_Effectivity.cxx b/src/StepBasic/StepBasic_Effectivity.cxx
index 4652c68561..d31c6f3268 100644
--- a/src/StepBasic/StepBasic_Effectivity.cxx
+++ b/src/StepBasic/StepBasic_Effectivity.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Effectivity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
index 50385882e2..9238882830 100644
--- a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ExternalIdentificationAssignment.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_IdentificationRole.hxx>
diff --git a/src/StepBasic/StepBasic_ExternalSource.cxx b/src/StepBasic/StepBasic_ExternalSource.cxx
index 21d5698600..ce5880bc8e 100644
--- a/src/StepBasic/StepBasic_ExternalSource.cxx
+++ b/src/StepBasic/StepBasic_ExternalSource.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_SourceItem.hxx>
 
diff --git a/src/StepBasic/StepBasic_ExternalSource.hxx b/src/StepBasic/StepBasic_ExternalSource.hxx
index 044f19985b..9b820f0291 100644
--- a/src/StepBasic/StepBasic_ExternalSource.hxx
+++ b/src/StepBasic/StepBasic_ExternalSource.hxx
@@ -17,7 +17,6 @@
 #define _StepBasic_ExternalSource_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_SourceItem.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx b/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
index 8123669e3b..fd084326f2 100644
--- a/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
+++ b/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ExternallyDefinedItem.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_SourceItem.hxx>
diff --git a/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx b/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
index 03fe80a5da..c283b78bd0 100644
--- a/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
+++ b/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
@@ -17,7 +17,6 @@
 #define _StepBasic_ExternallyDefinedItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_SourceItem.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepBasic/StepBasic_GeneralProperty.cxx b/src/StepBasic/StepBasic_GeneralProperty.cxx
index 49de78c888..037df4b366 100644
--- a/src/StepBasic/StepBasic_GeneralProperty.cxx
+++ b/src/StepBasic/StepBasic_GeneralProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_GeneralProperty.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Group.cxx b/src/StepBasic/StepBasic_Group.cxx
index f3473e421d..ab65434ebf 100644
--- a/src/StepBasic/StepBasic_Group.cxx
+++ b/src/StepBasic/StepBasic_Group.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Group.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_GroupRelationship.cxx b/src/StepBasic/StepBasic_GroupRelationship.cxx
index 19e27a75d2..8e907e2f8b 100644
--- a/src/StepBasic/StepBasic_GroupRelationship.cxx
+++ b/src/StepBasic/StepBasic_GroupRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_GroupRelationship.hxx b/src/StepBasic/StepBasic_GroupRelationship.hxx
index 2ff998b558..cea0f41855 100644
--- a/src/StepBasic/StepBasic_GroupRelationship.hxx
+++ b/src/StepBasic/StepBasic_GroupRelationship.hxx
@@ -19,7 +19,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TCollection_HAsciiString;
 class StepBasic_Group;
diff --git a/src/StepBasic/StepBasic_HArray1OfApproval.hxx b/src/StepBasic/StepBasic_HArray1OfApproval.hxx
index 6e0d9b2ae8..a5379ad532 100644
--- a/src/StepBasic/StepBasic_HArray1OfApproval.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfApproval.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfApproval_HeaderFile
 #define StepBasic_HArray1OfApproval_HeaderFile
 
-#include <StepBasic_Approval.hxx>
 #include <StepBasic_Array1OfApproval.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx b/src/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
index 5813bdfe19..a6c31a0e25 100644
--- a/src/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfDerivedUnitElement.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfDerivedUnitElement_HeaderFile
 #define StepBasic_HArray1OfDerivedUnitElement_HeaderFile
 
-#include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_Array1OfDerivedUnitElement.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfDocument.hxx b/src/StepBasic/StepBasic_HArray1OfDocument.hxx
index 20767e1573..7746282813 100644
--- a/src/StepBasic/StepBasic_HArray1OfDocument.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfDocument.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfDocument_HeaderFile
 #define StepBasic_HArray1OfDocument_HeaderFile
 
-#include <StepBasic_Document.hxx>
 #include <StepBasic_Array1OfDocument.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfNamedUnit.hxx b/src/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
index 96380a154d..eba347a004 100644
--- a/src/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfNamedUnit.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfNamedUnit_HeaderFile
 #define StepBasic_HArray1OfNamedUnit_HeaderFile
 
-#include <StepBasic_NamedUnit.hxx>
 #include <StepBasic_Array1OfNamedUnit.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfOrganization.hxx b/src/StepBasic/StepBasic_HArray1OfOrganization.hxx
index 728dc66a88..fd3490f190 100644
--- a/src/StepBasic/StepBasic_HArray1OfOrganization.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfOrganization.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfOrganization_HeaderFile
 #define StepBasic_HArray1OfOrganization_HeaderFile
 
-#include <StepBasic_Organization.hxx>
 #include <StepBasic_Array1OfOrganization.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfPerson.hxx b/src/StepBasic/StepBasic_HArray1OfPerson.hxx
index 6665438952..9b2971c7ab 100644
--- a/src/StepBasic/StepBasic_HArray1OfPerson.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfPerson.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfPerson_HeaderFile
 #define StepBasic_HArray1OfPerson_HeaderFile
 
-#include <StepBasic_Person.hxx>
 #include <StepBasic_Array1OfPerson.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfProduct.hxx b/src/StepBasic/StepBasic_HArray1OfProduct.hxx
index ec48333703..3eafff0082 100644
--- a/src/StepBasic/StepBasic_HArray1OfProduct.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfProduct.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfProduct_HeaderFile
 #define StepBasic_HArray1OfProduct_HeaderFile
 
-#include <StepBasic_Product.hxx>
 #include <StepBasic_Array1OfProduct.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfProductContext.hxx b/src/StepBasic/StepBasic_HArray1OfProductContext.hxx
index fb7464d44d..de78710744 100644
--- a/src/StepBasic/StepBasic_HArray1OfProductContext.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfProductContext.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfProductContext_HeaderFile
 #define StepBasic_HArray1OfProductContext_HeaderFile
 
-#include <StepBasic_ProductContext.hxx>
 #include <StepBasic_Array1OfProductContext.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx b/src/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
index a784b8eeab..3f8ad2138f 100644
--- a/src/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx
@@ -17,7 +17,6 @@
 #ifndef StepBasic_HArray1OfUncertaintyMeasureWithUnit_HeaderFile
 #define StepBasic_HArray1OfUncertaintyMeasureWithUnit_HeaderFile
 
-#include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepBasic_Array1OfUncertaintyMeasureWithUnit.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepBasic/StepBasic_IdentificationAssignment.cxx b/src/StepBasic/StepBasic_IdentificationAssignment.cxx
index 0586ed92bd..87e68c3ac5 100644
--- a/src/StepBasic/StepBasic_IdentificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_IdentificationAssignment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_IdentificationAssignment.hxx>
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_IdentificationRole.cxx b/src/StepBasic/StepBasic_IdentificationRole.cxx
index b207772bfc..58a3e8b241 100644
--- a/src/StepBasic/StepBasic_IdentificationRole.cxx
+++ b/src/StepBasic/StepBasic_IdentificationRole.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
index c932e08e3d..4928902bda 100644
--- a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_LengthMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx b/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
index 43df031300..bca634b897 100644
--- a/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_LengthMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_LocalTime.hxx b/src/StepBasic/StepBasic_LocalTime.hxx
index e2ade64dff..970da885c1 100644
--- a/src/StepBasic/StepBasic_LocalTime.hxx
+++ b/src/StepBasic/StepBasic_LocalTime.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class StepBasic_CoordinatedUniversalTimeOffset;
 
diff --git a/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx b/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
index 7a0732cf89..b8367a8a0b 100644
--- a/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MassMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MassMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx b/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
index b9b61ae4cb..a99ea387b4 100644
--- a/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
@@ -17,7 +17,6 @@
 #define _StepBasic_MassMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_MeasureValueMember.hxx b/src/StepBasic/StepBasic_MeasureValueMember.hxx
index 3722d4fa1d..f28bd42b6e 100644
--- a/src/StepBasic/StepBasic_MeasureValueMember.hxx
+++ b/src/StepBasic/StepBasic_MeasureValueMember.hxx
@@ -22,8 +22,6 @@
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectReal.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 
 
 class StepBasic_MeasureValueMember;
diff --git a/src/StepBasic/StepBasic_MeasureWithUnit.hxx b/src/StepBasic/StepBasic_MeasureWithUnit.hxx
index 41b7153ee1..919ed1f136 100644
--- a/src/StepBasic/StepBasic_MeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_MeasureWithUnit.hxx
@@ -22,7 +22,6 @@
 
 #include <StepBasic_Unit.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Real.hxx>
 class StepBasic_MeasureValueMember;
 
 
diff --git a/src/StepBasic/StepBasic_NameAssignment.cxx b/src/StepBasic/StepBasic_NameAssignment.cxx
index 088dd0620f..1a2d0f9bed 100644
--- a/src/StepBasic/StepBasic_NameAssignment.cxx
+++ b/src/StepBasic/StepBasic_NameAssignment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_NameAssignment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ObjectRole.cxx b/src/StepBasic/StepBasic_ObjectRole.cxx
index 44bd32fae8..ae405707c7 100644
--- a/src/StepBasic/StepBasic_ObjectRole.cxx
+++ b/src/StepBasic/StepBasic_ObjectRole.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ObjectRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Organization.cxx b/src/StepBasic/StepBasic_Organization.cxx
index dd627752ed..36e66773f7 100644
--- a/src/StepBasic/StepBasic_Organization.cxx
+++ b/src/StepBasic/StepBasic_Organization.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Organization.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_OrganizationRole.cxx b/src/StepBasic/StepBasic_OrganizationRole.cxx
index ee60ce4be6..e3cfb0fe79 100644
--- a/src/StepBasic/StepBasic_OrganizationRole.cxx
+++ b/src/StepBasic/StepBasic_OrganizationRole.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_OrganizationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_OrganizationalAddress.cxx b/src/StepBasic/StepBasic_OrganizationalAddress.cxx
index 5af43a3e4f..fade29e416 100644
--- a/src/StepBasic/StepBasic_OrganizationalAddress.cxx
+++ b/src/StepBasic/StepBasic_OrganizationalAddress.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationalAddress.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Person.cxx b/src/StepBasic/StepBasic_Person.cxx
index 44b2b1176a..a90fd0c1b5 100644
--- a/src/StepBasic/StepBasic_Person.cxx
+++ b/src/StepBasic/StepBasic_Person.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Person.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_Person.hxx b/src/StepBasic/StepBasic_Person.hxx
index a9ab2fca0c..9eb5de333b 100644
--- a/src/StepBasic/StepBasic_Person.hxx
+++ b/src/StepBasic/StepBasic_Person.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_Person_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/StepBasic/StepBasic_PersonAndOrganization.cxx b/src/StepBasic/StepBasic_PersonAndOrganization.cxx
index 8b96d4adc4..a71c6e4eae 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganization.cxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganization.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_Person.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
index bfb39bcaf5..94a9569204 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_PersonalAddress.cxx b/src/StepBasic/StepBasic_PersonalAddress.cxx
index 8ac843113c..b469fa9f1e 100644
--- a/src/StepBasic/StepBasic_PersonalAddress.cxx
+++ b/src/StepBasic/StepBasic_PersonalAddress.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_Person.hxx>
 #include <StepBasic_PersonalAddress.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_PersonalAddress.hxx b/src/StepBasic/StepBasic_PersonalAddress.hxx
index 280f5c635c..17836b13ba 100644
--- a/src/StepBasic/StepBasic_PersonalAddress.hxx
+++ b/src/StepBasic/StepBasic_PersonalAddress.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_PersonalAddress_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_HArray1OfPerson.hxx>
 #include <StepBasic_Address.hxx>
diff --git a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
index 4a9f99af3a..76bfc0a3cb 100644
--- a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PlaneAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
index 4971ca5f65..3c4cc51f51 100644
--- a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_PlaneAngleMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_Product.cxx b/src/StepBasic/StepBasic_Product.cxx
index 4e90722bd5..5f33c35221 100644
--- a/src/StepBasic/StepBasic_Product.cxx
+++ b/src/StepBasic/StepBasic_Product.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductCategory.cxx b/src/StepBasic/StepBasic_ProductCategory.cxx
index 839050f93e..d162c858c8 100644
--- a/src/StepBasic/StepBasic_ProductCategory.cxx
+++ b/src/StepBasic/StepBasic_ProductCategory.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductCategory.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx b/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
index bb849b21b3..75168c9915 100644
--- a/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductCategory.hxx>
 #include <StepBasic_ProductCategoryRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx b/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
index 185a740765..7e0e07fb8e 100644
--- a/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
+++ b/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TCollection_HAsciiString;
 class StepBasic_ProductCategory;
diff --git a/src/StepBasic/StepBasic_ProductConceptContext.cxx b/src/StepBasic/StepBasic_ProductConceptContext.cxx
index 57db27ca25..909d857aed 100644
--- a/src/StepBasic/StepBasic_ProductConceptContext.cxx
+++ b/src/StepBasic/StepBasic_ProductConceptContext.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductConceptContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductContext.cxx b/src/StepBasic/StepBasic_ProductContext.cxx
index 3e419c506e..6c37a0756e 100644
--- a/src/StepBasic/StepBasic_ProductContext.cxx
+++ b/src/StepBasic/StepBasic_ProductContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinition.cxx b/src/StepBasic/StepBasic_ProductDefinition.cxx
index 7cdc7a64a9..7ae54bb896 100644
--- a/src/StepBasic/StepBasic_ProductDefinition.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinition.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionContext.cxx b/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
index 3a38b0b9c8..cbfda33fcf 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ApplicationContext.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
index 15ea1b9539..19f008a10b 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinitionEffectivity.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
index 14258d2b90..fd74e96f80 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
index db34db5261..97ecf2a1f4 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionFormationRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
index 51f1223a2f..c3d9841c6f 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_Product.hxx>
 #include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionOrReference.cxx b/src/StepBasic/StepBasic_ProductDefinitionOrReference.cxx
index ff295ec07c..a21e9a783d 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionOrReference.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionOrReference.cxx
@@ -16,7 +16,6 @@
 
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
-#include <StepBasic_ProductDefinition.hxx>
 #include <StepBasic_ProductDefinitionOrReference.hxx>
 #include <StepBasic_ProductDefinitionReference.hxx>
 #include <StepBasic_ProductDefinitionReferenceWithLocalRepresentation.hxx>
diff --git a/src/StepBasic/StepBasic_ProductDefinitionReference.cxx b/src/StepBasic/StepBasic_ProductDefinitionReference.cxx
index e928186cb5..23e050dd5f 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionReference.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionReference.cxx
@@ -13,7 +13,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_ProductDefinitionReference.hxx>
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionReference.hxx b/src/StepBasic/StepBasic_ProductDefinitionReference.hxx
index 846e0bc769..df986ef3e9 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionReference.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionReference.hxx
@@ -19,7 +19,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TCollection_HAsciiString;
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionReferenceWithLocalRepresentation.cxx b/src/StepBasic/StepBasic_ProductDefinitionReferenceWithLocalRepresentation.cxx
index 7260722b29..5d33d4a319 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionReferenceWithLocalRepresentation.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionReferenceWithLocalRepresentation.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_ProductDefinitionReferenceWithLocalRepresentation.hxx>
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx b/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
index 0eae32307f..7406fa04fb 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
@@ -15,9 +15,7 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinition.hxx>
-#include <StepBasic_ProductDefinitionOrReference.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx b/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
index 46f5c11edb..ec18a3e7f3 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
@@ -19,7 +19,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 #include <StepBasic_ProductDefinitionOrReference.hxx>
 class TCollection_HAsciiString;
diff --git a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
index 9a3f2221dd..40f1bd596c 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_Document.hxx>
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
diff --git a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
index 5ddf88cbb5..e259169985 100644
--- a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
+++ b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_Product.hxx>
 #include <StepBasic_ProductRelatedProductCategory.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
index f44de4af19..ac3f77f79f 100644
--- a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_RatioMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_RatioMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx b/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
index 512164ecc2..07d69fb208 100644
--- a/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_RatioMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_RoleAssociation.cxx b/src/StepBasic/StepBasic_RoleAssociation.cxx
index b40837b528..cc19182799 100644
--- a/src/StepBasic/StepBasic_RoleAssociation.cxx
+++ b/src/StepBasic/StepBasic_RoleAssociation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ObjectRole.hxx>
 #include <StepBasic_RoleAssociation.hxx>
 #include <StepBasic_RoleSelect.hxx>
diff --git a/src/StepBasic/StepBasic_SecurityClassification.cxx b/src/StepBasic/StepBasic_SecurityClassification.cxx
index f4006822d2..693da7b8d8 100644
--- a/src/StepBasic/StepBasic_SecurityClassification.cxx
+++ b/src/StepBasic/StepBasic_SecurityClassification.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx b/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
index 5bfa210389..c3159756b3 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
+++ b/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_SiUnit.hxx b/src/StepBasic/StepBasic_SiUnit.hxx
index 6e88e2a99f..a9c676aa5f 100644
--- a/src/StepBasic/StepBasic_SiUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnit.hxx
@@ -22,7 +22,6 @@
 
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_NamedUnit.hxx>
 class StepBasic_DimensionalExponents;
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
index 14b98bb81c..8ac2b4ccb6 100644
--- a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_LengthUnit.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndLengthUnit,StepBasic_SiUnit)
diff --git a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
index d0409186fa..584c56ed93 100644
--- a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_LengthUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
index 71b8b4d7d7..0efc9d0cef 100644
--- a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_MassUnit.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndMassUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndMassUnit,StepBasic_SiUnit)
diff --git a/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
index ea2343cbc1..6cf72fb601 100644
--- a/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_MassUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
index 9ea9ef4f76..28cdf363b8 100644
--- a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndPlaneAngleUnit,StepBasic_SiUnit)
diff --git a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
index 8bb80a5ea6..ab906c5845 100644
--- a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_PlaneAngleUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
index 80259c2cd3..2992ae54b0 100644
--- a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
@@ -15,7 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_RatioUnit.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndRatioUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndRatioUnit,StepBasic_SiUnit)
diff --git a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
index a6fce9cf3c..8238aa6519 100644
--- a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_RatioUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
index 14b144e9e4..347303135e 100644
--- a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
@@ -14,7 +14,6 @@
 
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
index 4722d4c3ef..43c0392821 100644
--- a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_SolidAngleUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
index 1c97e2b573..35fa5e9572 100644
--- a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
@@ -14,7 +14,6 @@
 
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
 #include <StepBasic_ThermodynamicTemperatureUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
index 5ae21a871a..631afd98e0 100644
--- a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_ThermodynamicTemperatureUnit;
diff --git a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
index ac50f3a49c..5febfb43ae 100644
--- a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
@@ -14,7 +14,6 @@
 
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
-#include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndTimeUnit.hxx>
 #include <StepBasic_TimeUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
index d3e7db5230..43cebdf265 100644
--- a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepBasic_SiUnit.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_SiPrefix.hxx>
 #include <StepBasic_SiUnitName.hxx>
 class StepBasic_TimeUnit;
diff --git a/src/StepBasic/StepBasic_SizeMember.hxx b/src/StepBasic/StepBasic_SizeMember.hxx
index 6c444db3a4..e823b98861 100644
--- a/src/StepBasic/StepBasic_SizeMember.hxx
+++ b/src/StepBasic/StepBasic_SizeMember.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepData_SelectReal.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 
 
 class StepBasic_SizeMember;
diff --git a/src/StepBasic/StepBasic_SizeSelect.cxx b/src/StepBasic/StepBasic_SizeSelect.cxx
index 74c4f4bef8..39fbf62f5f 100644
--- a/src/StepBasic/StepBasic_SizeSelect.cxx
+++ b/src/StepBasic/StepBasic_SizeSelect.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
 #include <StepBasic_SizeMember.hxx>
 #include <StepBasic_SizeSelect.hxx>
diff --git a/src/StepBasic/StepBasic_SizeSelect.hxx b/src/StepBasic/StepBasic_SizeSelect.hxx
index c2007a4927..62cc3dea35 100644
--- a/src/StepBasic/StepBasic_SizeSelect.hxx
+++ b/src/StepBasic/StepBasic_SizeSelect.hxx
@@ -23,7 +23,6 @@
 
 #include <StepData_SelectType.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 class Standard_Transient;
 class StepData_SelectMember;
 
diff --git a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
index 7d9926ea3d..b04a10e813 100644
--- a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_SolidAngleMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SolidAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
index 7063882b71..8a23bf0578 100644
--- a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_SolidAngleMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_SourceItem.cxx b/src/StepBasic/StepBasic_SourceItem.cxx
index 367cd8ff53..11baa5315f 100644
--- a/src/StepBasic/StepBasic_SourceItem.cxx
+++ b/src/StepBasic/StepBasic_SourceItem.cxx
@@ -17,7 +17,6 @@
 
 #include <Standard_Transient.hxx>
 #include <StepBasic_SourceItem.hxx>
-#include <StepData_SelectMember.hxx>
 #include <StepData_SelectNamed.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
index b91b1c6121..f2015d13bd 100644
--- a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_TimeMeasureWithUnit.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepBasic_TimeMeasureWithUnit,StepBasic_MeasureWithUnit)
diff --git a/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx b/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
index 90d9077d77..7cec3644f8 100644
--- a/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
@@ -18,7 +18,6 @@
 #define _StepBasic_TimeMeasureWithUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_MeasureWithUnit.hxx>
 
diff --git a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
index e98ea70866..6425c1c9e5 100644
--- a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 #include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
diff --git a/src/StepBasic/StepBasic_VersionedActionRequest.cxx b/src/StepBasic/StepBasic_VersionedActionRequest.cxx
index 098440abe3..f6cd25dba1 100644
--- a/src/StepBasic/StepBasic_VersionedActionRequest.cxx
+++ b/src/StepBasic/StepBasic_VersionedActionRequest.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
index a98f433c05..444896f558 100644
--- a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
+++ b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepBasic_Date.hxx>