diff --git a/src/STEPEdit/STEPEdit.cxx b/src/STEPEdit/STEPEdit.cxx
index 094df77a51..6b55fecb83 100644
--- a/src/STEPEdit/STEPEdit.cxx
+++ b/src/STEPEdit/STEPEdit.cxx
@@ -17,8 +17,6 @@
 #include <IFSelect_SelectModelEntities.hxx>
 #include <IFSelect_SelectModelRoots.hxx>
 #include <IFSelect_SelectSignature.hxx>
-#include <IFSelect_Signature.hxx>
-#include <Interface_Protocol.hxx>
 #include <StepAP214.hxx>
 #include <StepAP214_Protocol.hxx>
 #include <StepData_StepModel.hxx>
diff --git a/src/STEPEdit/STEPEdit_EditContext.cxx b/src/STEPEdit/STEPEdit_EditContext.cxx
index f9cf5c83cb..a91692226a 100644
--- a/src/STEPEdit/STEPEdit_EditContext.cxx
+++ b/src/STEPEdit/STEPEdit_EditContext.cxx
@@ -13,7 +13,6 @@
 
 
 #include <IFSelect_EditForm.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_TypedValue.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/STEPEdit/STEPEdit_EditContext.hxx b/src/STEPEdit/STEPEdit_EditContext.hxx
index 22d3eb76ca..4409ea9805 100644
--- a/src/STEPEdit/STEPEdit_EditContext.hxx
+++ b/src/STEPEdit/STEPEdit_EditContext.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_Editor.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TCollection_AsciiString;
 class IFSelect_EditForm;
diff --git a/src/STEPEdit/STEPEdit_EditSDR.cxx b/src/STEPEdit/STEPEdit_EditSDR.cxx
index 0ef7990146..68d2665787 100644
--- a/src/STEPEdit/STEPEdit_EditSDR.cxx
+++ b/src/STEPEdit/STEPEdit_EditSDR.cxx
@@ -13,7 +13,6 @@
 
 
 #include <IFSelect_EditForm.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_TypedValue.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
diff --git a/src/STEPEdit/STEPEdit_EditSDR.hxx b/src/STEPEdit/STEPEdit_EditSDR.hxx
index f53c15bc31..3b989e3222 100644
--- a/src/STEPEdit/STEPEdit_EditSDR.hxx
+++ b/src/STEPEdit/STEPEdit_EditSDR.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_Editor.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class TCollection_AsciiString;
 class IFSelect_EditForm;
diff --git a/src/STEPSelections/STEPSelections_AssemblyComponent.cxx b/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
index 99a4dfc92a..6bb365da7d 100644
--- a/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
+++ b/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <STEPSelections_AssemblyComponent.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 
diff --git a/src/STEPSelections/STEPSelections_AssemblyExplorer.cxx b/src/STEPSelections/STEPSelections_AssemblyExplorer.cxx
index c40b583ddf..75fc4d189f 100644
--- a/src/STEPSelections/STEPSelections_AssemblyExplorer.cxx
+++ b/src/STEPSelections/STEPSelections_AssemblyExplorer.cxx
@@ -16,8 +16,6 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <Interface_Graph.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
 #include <StepBasic_Product.hxx>
@@ -27,7 +25,6 @@
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
-#include <STEPSelections_AssemblyComponent.hxx>
 #include <STEPSelections_AssemblyExplorer.hxx>
 #include <STEPSelections_AssemblyLink.hxx>
 #include <STEPSelections_HSequenceOfAssemblyLink.hxx>
diff --git a/src/STEPSelections/STEPSelections_AssemblyLink.cxx b/src/STEPSelections/STEPSelections_AssemblyLink.cxx
index 240c878527..7f0820854a 100644
--- a/src/STEPSelections/STEPSelections_AssemblyLink.cxx
+++ b/src/STEPSelections/STEPSelections_AssemblyLink.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <STEPSelections_AssemblyComponent.hxx>
 #include <STEPSelections_AssemblyLink.hxx>
diff --git a/src/STEPSelections/STEPSelections_Counter.cxx b/src/STEPSelections/STEPSelections_Counter.cxx
index 4d08653608..9fe036fb75 100644
--- a/src/STEPSelections/STEPSelections_Counter.cxx
+++ b/src/STEPSelections/STEPSelections_Counter.cxx
@@ -27,7 +27,6 @@
 #include <StepGeom_Surface.hxx>
 #include <StepRepr_MappedItem.hxx>
 #include <StepRepr_RepresentationMap.hxx>
-#include <StepRepr_RepresentationRelationship.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 #include <STEPSelections_Counter.hxx>
 #include <StepShape_BrepWithVoids.hxx>
@@ -37,15 +36,12 @@
 #include <StepShape_FaceSurface.hxx>
 #include <StepShape_FacetedBrep.hxx>
 #include <StepShape_FacetedBrepAndBrepWithVoids.hxx>
-#include <StepShape_GeometricCurveSet.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_GeometricSetSelect.hxx>
 #include <StepShape_ManifoldSolidBrep.hxx>
 #include <StepShape_OpenShell.hxx>
-#include <StepShape_OrientedClosedShell.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
-#include <StepShape_Shell.hxx>
 #include <StepShape_ShellBasedSurfaceModel.hxx>
 
 STEPSelections_Counter::STEPSelections_Counter()
diff --git a/src/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx b/src/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
index 8295e115fc..dd2ddc963c 100644
--- a/src/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
+++ b/src/STEPSelections/STEPSelections_HSequenceOfAssemblyLink.hxx
@@ -17,7 +17,6 @@
 #ifndef STEPSelections_HSequenceOfAssemblyLink_HeaderFile
 #define STEPSelections_HSequenceOfAssemblyLink_HeaderFile
 
-#include <STEPSelections_AssemblyLink.hxx>
 #include <STEPSelections_SequenceOfAssemblyLink.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/STEPSelections/STEPSelections_SelectAssembly.hxx b/src/STEPSelections/STEPSelections_SelectAssembly.hxx
index 5a642b242d..855a1c8723 100644
--- a/src/STEPSelections/STEPSelections_SelectAssembly.hxx
+++ b/src/STEPSelections/STEPSelections_SelectAssembly.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectExplore.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Standard_Transient;
 class Interface_Graph;
diff --git a/src/STEPSelections/STEPSelections_SelectDerived.hxx b/src/STEPSelections/STEPSelections_SelectDerived.hxx
index 434c405bae..92ce3cc0f8 100644
--- a/src/STEPSelections/STEPSelections_SelectDerived.hxx
+++ b/src/STEPSelections/STEPSelections_SelectDerived.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepSelect_StepType.hxx>
-#include <Standard_Boolean.hxx>
 class Standard_Transient;
 class Interface_InterfaceModel;
 class TCollection_AsciiString;
diff --git a/src/STEPSelections/STEPSelections_SelectFaces.hxx b/src/STEPSelections/STEPSelections_SelectFaces.hxx
index b83f10467f..d4f83b449d 100644
--- a/src/STEPSelections/STEPSelections_SelectFaces.hxx
+++ b/src/STEPSelections/STEPSelections_SelectFaces.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectExplore.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Standard_Transient;
 class Interface_Graph;
diff --git a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
index a2b5714d7c..dbe323c641 100644
--- a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
+++ b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectExplore.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Standard_Transient;
 class Interface_Graph;
diff --git a/src/STEPSelections/STEPSelections_SelectInstances.cxx b/src/STEPSelections/STEPSelections_SelectInstances.cxx
index 2dd5d52197..2ce4764542 100644
--- a/src/STEPSelections/STEPSelections_SelectInstances.cxx
+++ b/src/STEPSelections/STEPSelections_SelectInstances.cxx
@@ -16,7 +16,6 @@
 
 
 #include <Interface_EntityIterator.hxx>
-#include <Interface_Graph.hxx>
 #include <Interface_HGraph.hxx>
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/STEPSelections/STEPSelections_SelectInstances.hxx b/src/STEPSelections/STEPSelections_SelectInstances.hxx
index 33ea6e8c21..79edae0f8b 100644
--- a/src/STEPSelections/STEPSelections_SelectInstances.hxx
+++ b/src/STEPSelections/STEPSelections_SelectInstances.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectExplore.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Interface_EntityIterator;
 class Interface_Graph;
diff --git a/src/StepData/StepData_DefaultGeneral.cxx b/src/StepData/StepData_DefaultGeneral.cxx
index 68c9f23ac5..17a5fb63cf 100644
--- a/src/StepData/StepData_DefaultGeneral.cxx
+++ b/src/StepData/StepData_DefaultGeneral.cxx
@@ -17,7 +17,6 @@
 #include <Interface_EntityIterator.hxx>
 #include <Interface_GeneralLib.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_ParamType.hxx>
 #include <Interface_ShareTool.hxx>
 #include <Interface_UndefinedContent.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepData/StepData_DefaultGeneral.hxx b/src/StepData/StepData_DefaultGeneral.hxx
index 7ebe56b15f..2bf5813e0c 100644
--- a/src/StepData/StepData_DefaultGeneral.hxx
+++ b/src/StepData/StepData_DefaultGeneral.hxx
@@ -22,7 +22,6 @@
 
 #include <StepData_GeneralModule.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class Standard_Transient;
 class Interface_EntityIterator;
 class Interface_ShareTool;
diff --git a/src/StepData/StepData_Described.cxx b/src/StepData/StepData_Described.cxx
index e6b51ee1aa..b82a692c2d 100644
--- a/src/StepData/StepData_Described.cxx
+++ b/src/StepData/StepData_Described.cxx
@@ -14,11 +14,9 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_InterfaceMismatch.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_Described.hxx>
 #include <StepData_EDescr.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_Simple.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepData_Described,Standard_Transient)
diff --git a/src/StepData/StepData_Described.hxx b/src/StepData/StepData_Described.hxx
index 7e5c5c35cc..8148e5e055 100644
--- a/src/StepData/StepData_Described.hxx
+++ b/src/StepData/StepData_Described.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 class StepData_EDescr;
 class StepData_Simple;
 class StepData_Field;
diff --git a/src/StepData/StepData_ECDescr.cxx b/src/StepData/StepData_ECDescr.cxx
index 8139a80877..83141f07b5 100644
--- a/src/StepData/StepData_ECDescr.cxx
+++ b/src/StepData/StepData_ECDescr.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepData_Described.hxx>
 #include <StepData_ECDescr.hxx>
 #include <StepData_ESDescr.hxx>
 #include <StepData_Plex.hxx>
diff --git a/src/StepData/StepData_ECDescr.hxx b/src/StepData/StepData_ECDescr.hxx
index 43e9aae78f..f150c7dea6 100644
--- a/src/StepData/StepData_ECDescr.hxx
+++ b/src/StepData/StepData_ECDescr.hxx
@@ -24,7 +24,6 @@
 #include <StepData_EDescr.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 class StepData_ESDescr;
 class StepData_Described;
diff --git a/src/StepData/StepData_EDescr.hxx b/src/StepData/StepData_EDescr.hxx
index b8623b6800..86ea0a4970 100644
--- a/src/StepData/StepData_EDescr.hxx
+++ b/src/StepData/StepData_EDescr.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 class StepData_Described;
 
 
diff --git a/src/StepData/StepData_ESDescr.cxx b/src/StepData/StepData_ESDescr.cxx
index 5f2c8c707a..7084493623 100644
--- a/src/StepData/StepData_ESDescr.cxx
+++ b/src/StepData/StepData_ESDescr.cxx
@@ -14,7 +14,6 @@
 
 #include <Interface_Macros.hxx>
 #include <Standard_Type.hxx>
-#include <StepData_Described.hxx>
 #include <StepData_ESDescr.hxx>
 #include <StepData_PDescr.hxx>
 #include <StepData_Simple.hxx>
diff --git a/src/StepData/StepData_ESDescr.hxx b/src/StepData/StepData_ESDescr.hxx
index 193a582b30..1173e0d093 100644
--- a/src/StepData/StepData_ESDescr.hxx
+++ b/src/StepData/StepData_ESDescr.hxx
@@ -20,12 +20,10 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TCollection_AsciiString.hxx>
 #include <TColStd_HArray1OfTransient.hxx>
 #include <StepData_EDescr.hxx>
 #include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <NCollection_DataMap.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepData/StepData_EnumTool.hxx b/src/StepData/StepData_EnumTool.hxx
index e35894139f..fd96ee6614 100644
--- a/src/StepData/StepData_EnumTool.hxx
+++ b/src/StepData/StepData_EnumTool.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 class TCollection_AsciiString;
 
diff --git a/src/StepData/StepData_Field.hxx b/src/StepData/StepData_Field.hxx
index 25fb7e5278..b5f9c9ace6 100644
--- a/src/StepData/StepData_Field.hxx
+++ b/src/StepData/StepData_Field.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepData_Logical.hxx>
 #include <Standard_CString.hxx>
 class StepData_SelectMember;
diff --git a/src/StepData/StepData_FieldList.hxx b/src/StepData/StepData_FieldList.hxx
index 9d9329ed15..b3c4b8c272 100644
--- a/src/StepData/StepData_FieldList.hxx
+++ b/src/StepData/StepData_FieldList.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
 class StepData_Field;
diff --git a/src/StepData/StepData_FieldList1.cxx b/src/StepData/StepData_FieldList1.cxx
index 2442c31852..882a0e7d28 100644
--- a/src/StepData/StepData_FieldList1.cxx
+++ b/src/StepData/StepData_FieldList1.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_OutOfRange.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FieldList1.hxx>
 
 StepData_FieldList1::StepData_FieldList1  ()    {  }
diff --git a/src/StepData/StepData_FieldList1.hxx b/src/StepData/StepData_FieldList1.hxx
index c779fb23bf..95d339ce51 100644
--- a/src/StepData/StepData_FieldList1.hxx
+++ b/src/StepData/StepData_FieldList1.hxx
@@ -19,7 +19,6 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <StepData_Field.hxx>
 #include <StepData_FieldList.hxx>
diff --git a/src/StepData/StepData_FieldListD.cxx b/src/StepData/StepData_FieldListD.cxx
index d96a76dbb1..be168c63cb 100644
--- a/src/StepData/StepData_FieldListD.cxx
+++ b/src/StepData/StepData_FieldListD.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_OutOfRange.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FieldListD.hxx>
 
 StepData_FieldListD::StepData_FieldListD  (const Standard_Integer nb)
diff --git a/src/StepData/StepData_FieldListN.cxx b/src/StepData/StepData_FieldListN.cxx
index d3f185ee4b..32b9f0b58f 100644
--- a/src/StepData/StepData_FieldListN.cxx
+++ b/src/StepData/StepData_FieldListN.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_OutOfRange.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FieldListN.hxx>
 
 StepData_FieldListN::StepData_FieldListN  (const Standard_Integer nb)
diff --git a/src/StepData/StepData_FieldListN.hxx b/src/StepData/StepData_FieldListN.hxx
index f3d41cf075..ce1faca4c1 100644
--- a/src/StepData/StepData_FieldListN.hxx
+++ b/src/StepData/StepData_FieldListN.hxx
@@ -23,7 +23,6 @@
 
 #include <StepData_Array1OfField.hxx>
 #include <StepData_FieldList.hxx>
-#include <Standard_Integer.hxx>
 class StepData_Field;
 
 
diff --git a/src/StepData/StepData_FileProtocol.cxx b/src/StepData/StepData_FileProtocol.cxx
index 212ac03eee..6a264f7c88 100644
--- a/src/StepData/StepData_FileProtocol.cxx
+++ b/src/StepData/StepData_FileProtocol.cxx
@@ -14,7 +14,6 @@
 
 #include <Interface_Check.hxx>
 #include <Interface_Graph.hxx>
-#include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_FileProtocol.hxx>
 #include <StepData_Protocol.hxx>
diff --git a/src/StepData/StepData_FileProtocol.hxx b/src/StepData/StepData_FileProtocol.hxx
index 2b120d695f..8223f637c7 100644
--- a/src/StepData/StepData_FileProtocol.hxx
+++ b/src/StepData/StepData_FileProtocol.hxx
@@ -23,9 +23,6 @@
 #include <TColStd_SequenceOfTransient.hxx>
 #include <StepData_Protocol.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 class Interface_Protocol;
 class Interface_Graph;
 class Interface_Check;
diff --git a/src/StepData/StepData_FileRecognizer.hxx b/src/StepData/StepData_FileRecognizer.hxx
index ca425986a2..8b87e76e6e 100644
--- a/src/StepData/StepData_FileRecognizer.hxx
+++ b/src/StepData/StepData_FileRecognizer.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class Standard_Transient;
 class Standard_NoSuchObject;
diff --git a/src/StepData/StepData_FreeFormEntity.cxx b/src/StepData/StepData_FreeFormEntity.cxx
index 63ec8e8d41..04acffa1b4 100644
--- a/src/StepData/StepData_FreeFormEntity.cxx
+++ b/src/StepData/StepData_FreeFormEntity.cxx
@@ -14,7 +14,6 @@
 
 #include <Interface_Macros.hxx>
 #include <Standard_Type.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FreeFormEntity.hxx>
 #include <NCollection_DataMap.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepData/StepData_FreeFormEntity.hxx b/src/StepData/StepData_FreeFormEntity.hxx
index 06c5400234..56a460ca90 100644
--- a/src/StepData/StepData_FreeFormEntity.hxx
+++ b/src/StepData/StepData_FreeFormEntity.hxx
@@ -20,11 +20,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TCollection_AsciiString.hxx>
 #include <StepData_HArray1OfField.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <Standard_Integer.hxx>
 class StepData_Field;
diff --git a/src/StepData/StepData_GeneralModule.cxx b/src/StepData/StepData_GeneralModule.cxx
index f6b8d90103..d470d99c79 100644
--- a/src/StepData/StepData_GeneralModule.cxx
+++ b/src/StepData/StepData_GeneralModule.cxx
@@ -15,7 +15,6 @@
 #include <Interface_Check.hxx>
 #include <Interface_CopyTool.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_ShareTool.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_GeneralModule.hxx>
diff --git a/src/StepData/StepData_GlobalFactors.hxx b/src/StepData/StepData_GlobalFactors.hxx
index 90c30e3bba..fbad6079ce 100644
--- a/src/StepData/StepData_GlobalFactors.hxx
+++ b/src/StepData/StepData_GlobalFactors.hxx
@@ -19,7 +19,6 @@
 #include <Standard_Handle.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-#include <Standard_Integer.hxx>
 
 //! Class for using global units variables
 class StepData_GlobalFactors
diff --git a/src/StepData/StepData_HArray1OfField.hxx b/src/StepData/StepData_HArray1OfField.hxx
index addceab8c1..9d14a249f6 100644
--- a/src/StepData/StepData_HArray1OfField.hxx
+++ b/src/StepData/StepData_HArray1OfField.hxx
@@ -17,7 +17,6 @@
 #ifndef StepData_HArray1OfField_HeaderFile
 #define StepData_HArray1OfField_HeaderFile
 
-#include <StepData_Field.hxx>
 #include <StepData_Array1OfField.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepData/StepData_PDescr.hxx b/src/StepData/StepData_PDescr.hxx
index 7c71ab3a95..eeccdbfc7f 100644
--- a/src/StepData/StepData_PDescr.hxx
+++ b/src/StepData/StepData_PDescr.hxx
@@ -23,8 +23,6 @@
 #include <TCollection_AsciiString.hxx>
 #include <Standard_Integer.hxx>
 #include <StepData_EnumTool.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_CString.hxx>
 class StepData_EDescr;
diff --git a/src/StepData/StepData_Plex.cxx b/src/StepData/StepData_Plex.cxx
index 66131f68bc..0c391174b8 100644
--- a/src/StepData/StepData_Plex.cxx
+++ b/src/StepData/StepData_Plex.cxx
@@ -17,7 +17,6 @@
 #include <Interface_InterfaceMismatch.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_ECDescr.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_Plex.hxx>
 #include <StepData_Simple.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/StepData/StepData_Plex.hxx b/src/StepData/StepData_Plex.hxx
index cd42a70fab..3da3c001a5 100644
--- a/src/StepData/StepData_Plex.hxx
+++ b/src/StepData/StepData_Plex.hxx
@@ -22,8 +22,6 @@
 
 #include <TColStd_SequenceOfTransient.hxx>
 #include <StepData_Described.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 class StepData_ECDescr;
diff --git a/src/StepData/StepData_Protocol.cxx b/src/StepData/StepData_Protocol.cxx
index 614fde78a6..330299ccd7 100644
--- a/src/StepData/StepData_Protocol.cxx
+++ b/src/StepData/StepData_Protocol.cxx
@@ -14,8 +14,6 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <Interface_DataMapIteratorOfDataMapOfTransientInteger.hxx>
-#include <Interface_InterfaceModel.hxx>
-#include <Interface_Protocol.hxx>
 #include <StepData_Described.hxx>
 #include <StepData_ECDescr.hxx>
 #include <StepData_EDescr.hxx>
diff --git a/src/StepData/StepData_Protocol.hxx b/src/StepData/StepData_Protocol.hxx
index c617cbb47f..65f975efef 100644
--- a/src/StepData/StepData_Protocol.hxx
+++ b/src/StepData/StepData_Protocol.hxx
@@ -23,9 +23,6 @@
 #include <Interface_DataMapOfTransientInteger.hxx>
 #include <Interface_Protocol.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 class Interface_InterfaceModel;
 class StepData_EDescr;
diff --git a/src/StepData/StepData_ReadWriteModule.cxx b/src/StepData/StepData_ReadWriteModule.cxx
index 3f71c2ab4f..b5968c4b82 100644
--- a/src/StepData/StepData_ReadWriteModule.cxx
+++ b/src/StepData/StepData_ReadWriteModule.cxx
@@ -12,12 +12,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Check.hxx>
-#include <Interface_FileReaderData.hxx>
 #include <Interface_Macros.hxx>
-#include <Standard_DomainError.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_Type.hxx>
 #include <StepData_ReadWriteModule.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <StepData_StepWriter.hxx>
diff --git a/src/StepData/StepData_ReadWriteModule.hxx b/src/StepData/StepData_ReadWriteModule.hxx
index fd24b44b68..80505e1c0a 100644
--- a/src/StepData/StepData_ReadWriteModule.hxx
+++ b/src/StepData/StepData_ReadWriteModule.hxx
@@ -18,12 +18,9 @@
 #define _StepData_ReadWriteModule_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Interface_ReaderModule.hxx>
-#include <Standard_Integer.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <Standard_Boolean.hxx>
 class Interface_FileReaderData;
 class TCollection_AsciiString;
 class Interface_Check;
diff --git a/src/StepData/StepData_SelectArrReal.cxx b/src/StepData/StepData_SelectArrReal.cxx
index e752ef50be..4f26478805 100644
--- a/src/StepData/StepData_SelectArrReal.cxx
+++ b/src/StepData/StepData_SelectArrReal.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepData_SelectArrReal.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectArrReal,StepData_SelectNamed)
diff --git a/src/StepData/StepData_SelectArrReal.hxx b/src/StepData/StepData_SelectArrReal.hxx
index 1101317c07..0a91d4e729 100644
--- a/src/StepData/StepData_SelectArrReal.hxx
+++ b/src/StepData/StepData_SelectArrReal.hxx
@@ -17,7 +17,6 @@
 #define _StepData_SelectArrReal_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfReal.hxx>
 #include <StepData_SelectNamed.hxx>
diff --git a/src/StepData/StepData_SelectMember.hxx b/src/StepData/StepData_SelectMember.hxx
index e50f39733a..6d606ba97f 100644
--- a/src/StepData/StepData_SelectMember.hxx
+++ b/src/StepData/StepData_SelectMember.hxx
@@ -21,12 +21,9 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 #include <Interface_ParamType.hxx>
 #include <StepData_Logical.hxx>
-#include <Standard_Real.hxx>
 
 
 class StepData_SelectMember;
diff --git a/src/StepData/StepData_SelectNamed.cxx b/src/StepData/StepData_SelectNamed.cxx
index 674d15e257..ec8fff6b11 100644
--- a/src/StepData/StepData_SelectNamed.cxx
+++ b/src/StepData/StepData_SelectNamed.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_SelectNamed.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectNamed,StepData_SelectMember)
diff --git a/src/StepData/StepData_SelectNamed.hxx b/src/StepData/StepData_SelectNamed.hxx
index 0bb8ff5232..0fda36863f 100644
--- a/src/StepData/StepData_SelectNamed.hxx
+++ b/src/StepData/StepData_SelectNamed.hxx
@@ -18,12 +18,10 @@
 #define _StepData_SelectNamed_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <StepData_Field.hxx>
 #include <StepData_SelectMember.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/StepData/StepData_SelectReal.hxx b/src/StepData/StepData_SelectReal.hxx
index 912bf63813..b05ba31bce 100644
--- a/src/StepData/StepData_SelectReal.hxx
+++ b/src/StepData/StepData_SelectReal.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepData_SelectMember.hxx>
 #include <Standard_Integer.hxx>
 
diff --git a/src/StepData/StepData_SelectType.hxx b/src/StepData/StepData_SelectType.hxx
index fefd20a3e6..7a4db0b94e 100644
--- a/src/StepData/StepData_SelectType.hxx
+++ b/src/StepData/StepData_SelectType.hxx
@@ -22,11 +22,9 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
 #include <Standard_CString.hxx>
 #include <StepData_Logical.hxx>
-#include <Standard_Real.hxx>
 class Standard_Transient;
 class StepData_PDescr;
 class StepData_SelectMember;
diff --git a/src/StepData/StepData_Simple.cxx b/src/StepData/StepData_Simple.cxx
index 81fa47402b..d66b94e489 100644
--- a/src/StepData/StepData_Simple.cxx
+++ b/src/StepData/StepData_Simple.cxx
@@ -17,8 +17,6 @@
 #include <Interface_InterfaceMismatch.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_ESDescr.hxx>
-#include <StepData_Field.hxx>
-#include <StepData_FieldListN.hxx>
 #include <StepData_Simple.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepData_Simple,StepData_Described)
diff --git a/src/StepData/StepData_Simple.hxx b/src/StepData/StepData_Simple.hxx
index a0a84bc053..dd0d143fb8 100644
--- a/src/StepData/StepData_Simple.hxx
+++ b/src/StepData/StepData_Simple.hxx
@@ -23,7 +23,6 @@
 #include <StepData_FieldListN.hxx>
 #include <StepData_Described.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class StepData_ESDescr;
 class StepData_Field;
diff --git a/src/StepData/StepData_StepDumper.cxx b/src/StepData/StepData_StepDumper.cxx
index d7a9cabe4a..a3533c8034 100644
--- a/src/StepData/StepData_StepDumper.cxx
+++ b/src/StepData/StepData_StepDumper.cxx
@@ -14,9 +14,7 @@
 
 #include <Interface_EntityIterator.hxx>
 #include <Interface_GeneralModule.hxx>
-#include <Interface_InterfaceMismatch.hxx>
 #include <Message.hxx>
-#include <Message_Messenger.hxx>
 #include <Standard_Transient.hxx>
 #include <StepData_Protocol.hxx>
 #include <StepData_ReadWriteModule.hxx>
diff --git a/src/StepData/StepData_StepDumper.hxx b/src/StepData/StepData_StepDumper.hxx
index 4a4d261f64..a7fbfd41bb 100644
--- a/src/StepData/StepData_StepDumper.hxx
+++ b/src/StepData/StepData_StepDumper.hxx
@@ -25,7 +25,6 @@
 #include <StepData_WriterLib.hxx>
 #include <StepData_StepWriter.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class StepData_StepModel;
 class StepData_Protocol;
 
diff --git a/src/StepData/StepData_StepModel.cxx b/src/StepData/StepData_StepModel.cxx
index 2768a85d19..5d86f07835 100644
--- a/src/StepData/StepData_StepModel.cxx
+++ b/src/StepData/StepData_StepModel.cxx
@@ -17,10 +17,8 @@
 #include <Interface_EntityIterator.hxx>
 #include <Interface_GeneralLib.hxx>
 #include <Interface_GeneralModule.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_ShareTool.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepData.hxx>
diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index dfa0ff782e..3221e05d59 100644
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -15,7 +15,6 @@
 //    sln 04,10.2001. BUC61003. Prevent exception which may occur during reading of complex entity (if entity's items are not in alphabetical order)
 
 #include <Interface_Check.hxx>
-#include <Interface_FileParameter.hxx>
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_Static.hxx>
@@ -24,9 +23,7 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
-#include <StepData_EnumTool.hxx>
 #include <StepData_ESDescr.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FieldList.hxx>
 #include <StepData_PDescr.hxx>
 #include <StepData_SelectArrReal.hxx>
@@ -35,7 +32,6 @@
 #include <StepData_SelectNamed.hxx>
 #include <StepData_SelectReal.hxx>
 #include <StepData_SelectType.hxx>
-#include <StepData_StepModel.hxx>
 #include <StepData_StepReaderData.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
diff --git a/src/StepData/StepData_StepReaderData.hxx b/src/StepData/StepData_StepReaderData.hxx
index b46a3013c7..327d2050eb 100644
--- a/src/StepData/StepData_StepReaderData.hxx
+++ b/src/StepData/StepData_StepReaderData.hxx
@@ -21,17 +21,13 @@
 #include <Standard_Type.hxx>
 #include <Resource_FormatType.hxx>
 
-#include <TColStd_Array1OfInteger.hxx>
 #include <Interface_IndexedMapOfAsciiString.hxx>
 #include <TColStd_DataMapOfIntegerInteger.hxx>
 #include <Standard_Integer.hxx>
 #include <Interface_FileReaderData.hxx>
 #include <Standard_CString.hxx>
 #include <Interface_ParamType.hxx>
-#include <Standard_Boolean.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Type.hxx>
 #include <StepData_Logical.hxx>
 class Interface_Check;
 class TCollection_AsciiString;
diff --git a/src/StepData/StepData_StepReaderTool.cxx b/src/StepData/StepData_StepReaderTool.cxx
index 1e8146d9fc..9ece1b80b8 100644
--- a/src/StepData/StepData_StepReaderTool.cxx
+++ b/src/StepData/StepData_StepReaderTool.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Interface_Check.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
diff --git a/src/StepData/StepData_StepReaderTool.hxx b/src/StepData/StepData_StepReaderTool.hxx
index a554777951..3e242279f1 100644
--- a/src/StepData/StepData_StepReaderTool.hxx
+++ b/src/StepData/StepData_StepReaderTool.hxx
@@ -24,7 +24,6 @@
 #include <Interface_GeneralLib.hxx>
 #include <Interface_ReaderLib.hxx>
 #include <Interface_FileReaderTool.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class StepData_FileRecognizer;
 class StepData_StepReaderData;
diff --git a/src/StepData/StepData_StepWriter.cxx b/src/StepData/StepData_StepWriter.cxx
index 4f5114df57..ee04642aa8 100644
--- a/src/StepData/StepData_StepWriter.cxx
+++ b/src/StepData/StepData_StepWriter.cxx
@@ -16,16 +16,12 @@
 //                 of strings from Header Section
 
 #include <Interface_Check.hxx>
-#include <Interface_CheckIterator.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_FloatWriter.hxx>
 #include <Interface_InterfaceMismatch.hxx>
 #include <Interface_Macros.hxx>
 #include <Interface_ReportEntity.hxx>
-#include <Standard_NoSuchObject.hxx>
 #include <Standard_Transient.hxx>
 #include <StepData_ESDescr.hxx>
-#include <StepData_Field.hxx>
 #include <StepData_FieldList.hxx>
 #include <StepData_PDescr.hxx>
 #include <StepData_Protocol.hxx>
diff --git a/src/StepData/StepData_StepWriter.hxx b/src/StepData/StepData_StepWriter.hxx
index 4aa91b3432..34c2fc2ea6 100644
--- a/src/StepData/StepData_StepWriter.hxx
+++ b/src/StepData/StepData_StepWriter.hxx
@@ -23,13 +23,11 @@
 
 #include <TColStd_HSequenceOfHAsciiString.hxx>
 #include <Interface_LineBuffer.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Interface_FloatWriter.hxx>
 #include <Interface_CheckIterator.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Real.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <Standard_OStream.hxx>
diff --git a/src/StepData/StepData_UndefinedEntity.cxx b/src/StepData/StepData_UndefinedEntity.cxx
index 48b8670b51..381ebb81f3 100644
--- a/src/StepData/StepData_UndefinedEntity.cxx
+++ b/src/StepData/StepData_UndefinedEntity.cxx
@@ -16,7 +16,6 @@
 #include <Interface_CopyTool.hxx>
 #include <Interface_EntityIterator.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_ParamType.hxx>
 #include <Interface_UndefinedContent.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_StepReaderData.hxx>
diff --git a/src/StepData/StepData_UndefinedEntity.hxx b/src/StepData/StepData_UndefinedEntity.hxx
index c53febd361..aff886a74d 100644
--- a/src/StepData/StepData_UndefinedEntity.hxx
+++ b/src/StepData/StepData_UndefinedEntity.hxx
@@ -20,9 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
-#include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 class TCollection_HAsciiString;
 class Interface_UndefinedContent;
diff --git a/src/StepData/StepData_WriterLib.hxx b/src/StepData/StepData_WriterLib.hxx
index 6f0501e9ae..8e775eeaf1 100644
--- a/src/StepData/StepData_WriterLib.hxx
+++ b/src/StepData/StepData_WriterLib.hxx
@@ -21,7 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class StepData_NodeOfWriterLib;
 class Standard_NoSuchObject;
diff --git a/src/StepDimTol/StepDimTol_AngularityTolerance.cxx b/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
index c45e240f27..612ae7cc66 100644
--- a/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_AngularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_AngularityTolerance.hxx b/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
index 510f144be5..8bef727c31 100644
--- a/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_AngularityTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_AreaUnitType.hxx b/src/StepDimTol/StepDimTol_AreaUnitType.hxx
index faae1d96ab..3753a06651 100644
--- a/src/StepDimTol/StepDimTol_AreaUnitType.hxx
+++ b/src/StepDimTol/StepDimTol_AreaUnitType.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_AreaUnitType_HeaderFile
 #define _StepDimTol_AreaUnitType_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 enum StepDimTol_AreaUnitType {
   StepDimTol_Circular,
   StepDimTol_Rectangular,
diff --git a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
index 24866c4daa..c111a43a5d 100644
--- a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_CircularRunoutTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CircularRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
index edb83ee445..9cf539b39c 100644
--- a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_CircularRunoutTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx b/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
index f25bc0e5bd..d87f40bcb2 100644
--- a/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_CoaxialityTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CoaxialityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx b/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
index bed36cac44..f5858adc7d 100644
--- a/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_CoaxialityTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_CommonDatum.cxx b/src/StepDimTol/StepDimTol_CommonDatum.cxx
index 1ff71f6cc7..d8827d9c01 100644
--- a/src/StepDimTol/StepDimTol_CommonDatum.cxx
+++ b/src/StepDimTol/StepDimTol_CommonDatum.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_CommonDatum.hxx>
 #include <StepDimTol_Datum.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
diff --git a/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx b/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
index 37d9a52b43..030220c23f 100644
--- a/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_ConcentricityTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ConcentricityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx b/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
index f371ec1f3a..465bb0f40d 100644
--- a/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_ConcentricityTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx b/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
index 145ae061ab..b784e1ec21 100644
--- a/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CylindricityTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx b/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
index be8fa2a397..424e0c8b63 100644
--- a/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_CylindricityTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_Datum.cxx b/src/StepDimTol/StepDimTol_Datum.cxx
index 91b6ce8b98..9148930dfe 100644
--- a/src/StepDimTol/StepDimTol_Datum.cxx
+++ b/src/StepDimTol/StepDimTol_Datum.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_Datum.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
index f241989b10..e5d428afea 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_DatumReferenceCompartment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeneralDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx b/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
index a3b3c8bf88..fc67e33343 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_DatumReferenceElement_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
 #include <Standard_Macro.hxx>
 
 #include <StepDimTol_GeneralDatumReference.hxx>
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceModifier.hxx b/src/StepDimTol/StepDimTol_DatumReferenceModifier.hxx
index b64bb16769..1b0493db2a 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceModifier.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceModifier.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <StepData_SelectType.hxx>
 #include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 #include <StepDimTol_SimpleDatumReferenceModifierMember.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceModifierType.hxx b/src/StepDimTol/StepDimTol_DatumReferenceModifierType.hxx
index 161aaa11b5..1f1086cdbe 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceModifierType.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceModifierType.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_DatumReferenceModifierType_HeaderFile
 #define _StepDimTol_DatumReferenceModifierType_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 enum StepDimTol_DatumReferenceModifierType {
   StepDimTol_CircularOrCylindrical,
   StepDimTol_Distance,
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
index 0614c69c29..dba5ef7e2a 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_DatumReferenceModifierWithValue_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_DefineHandle.hxx>
 #include <Standard_Handle.hxx>
 
 #include <Standard_Transient.hxx>
diff --git a/src/StepDimTol/StepDimTol_DatumSystem.hxx b/src/StepDimTol/StepDimTol_DatumSystem.hxx
index 6f06e7f5cd..71483f0788 100644
--- a/src/StepDimTol/StepDimTol_DatumSystem.hxx
+++ b/src/StepDimTol/StepDimTol_DatumSystem.hxx
@@ -17,10 +17,8 @@
 #define _StepDimTol_DatumSystem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <StepRepr_ShapeAspect.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceCompartment.hxx>
 
 class StepDimTol_DatumSystem;
diff --git a/src/StepDimTol/StepDimTol_DatumTarget.cxx b/src/StepDimTol/StepDimTol_DatumTarget.cxx
index 662147ad07..35acb8449a 100644
--- a/src/StepDimTol/StepDimTol_DatumTarget.cxx
+++ b/src/StepDimTol/StepDimTol_DatumTarget.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_DatumTarget.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx b/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
index b46908458b..295f45217d 100644
--- a/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_FlatnessTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx b/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
index 88bdba8b28..f2770cb472 100644
--- a/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_FlatnessTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx b/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
index a9af7e2684..4ed6e3ad60 100644
--- a/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
+++ b/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_GeneralDatumReference_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
index 9bca2414f4..bd0f5a9c4c 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
@@ -14,9 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRef.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
index ca0d8e29d9..0c302199a6 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
@@ -14,10 +14,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
index 3f56ccfa5e..e84ec6441f 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
@@ -14,9 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
index 1c2eaba55c..1abd684a40 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
index 42272790da..193eae62bc 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
@@ -14,9 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx>
 #include <StepDimTol_UnequallyDisposedGeometricTolerance.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
index 151f056d94..7a53f72e44 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
@@ -14,10 +14,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
index 870f3116f3..b3b18d7d2d 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
@@ -14,9 +14,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMod.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
 #include <StepRepr_ShapeAspect.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
index 39297f9f42..9125c70650 100644
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceModifier.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceModifier.hxx
index ce632cf829..d0c1011ab9 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceModifier.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceModifier.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_GeometricToleranceModifier_HeaderFile
 #define _StepDimTol_GeometricToleranceModifier_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 enum StepDimTol_GeometricToleranceModifier {
   StepDimTol_GTMAnyCrossSection,
   StepDimTol_GTMCommonZone,
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
index 21175988f8..b26d0d2f12 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
index b9635a9546..72cb8848a3 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
@@ -17,7 +17,6 @@
 
 #include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
-#include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
index cacc2069e9..347598f6c1 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_GeometricToleranceWithDefinedAreaUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Boolean.hxx>
 #include <StepDimTol_AreaUnitType.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
index b990cb03ae..b063955f18 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_GeometricToleranceWithDefinedUnit_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
index 79f4ad1ba1..dedc6cbf91 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_GeometricToleranceWithMaximumTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceWithModifiers.hxx>
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
index 1d7a3396a4..94c982c901 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
@@ -17,11 +17,9 @@
 #define _StepDimTol_GeometricToleranceWithModifiers_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
-#include <StepDimTol_GeometricToleranceModifier.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 
 class TCollection_HAsciiString;
diff --git a/src/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx b/src/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
index 8d60f6177f..ffbad57414 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfDatumReference.hxx
@@ -16,7 +16,6 @@
 #ifndef StepDimTol_HArray1OfDatumReference_HeaderFile
 #define StepDimTol_HArray1OfDatumReference_HeaderFile
 
-#include <StepDimTol_DatumReference.hxx>
 #include <StepDimTol_Array1OfDatumReference.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx b/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
index 7facb28bdc..d0c16d5f84 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceCompartment.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile
 #define _StepDimTol_HArray1OfDatumReferenceCompartment_HeaderFile
 
-#include <StepDimTol_DatumReferenceCompartment.hxx>
 #include <StepDimTol_Array1OfDatumReferenceCompartment.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx b/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
index ce27a57420..ab3021e348 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfDatumReferenceElement.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile
 #define _StepDimTol_HArray1OfDatumReferenceElement_HeaderFile
 
-#include <StepDimTol_DatumReferenceElement.hxx>
 #include <StepDimTol_Array1OfDatumReferenceElement.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx b/src/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
index 0be449ed8a..c2aa2694ac 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfDatumSystemOrReference.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile
 #define _StepDimTol_HArray1OfDatumSystemOrReference_HeaderFile
 
-#include <StepDimTol_DatumSystemOrReference.hxx>
 #include <StepDimTol_Array1OfDatumSystemOrReference.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx b/src/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
index c1aeede41d..41fd67c215 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfGeometricToleranceModifier.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile
 #define _StepDimTol_HArray1OfGeometricToleranceModifier_HeaderFile
 
-#include <StepDimTol_GeometricToleranceModifier.hxx>
 #include <StepDimTol_Array1OfGeometricToleranceModifier.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx b/src/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
index 46f4efbf9e..754cae54a6 100644
--- a/src/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
+++ b/src/StepDimTol/StepDimTol_HArray1OfToleranceZoneTarget.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile
 #define _StepDimTol_HArray1OfToleranceZoneTarget_HeaderFile
 
-#include <StepDimTol_ToleranceZoneTarget.hxx>
 #include <StepDimTol_Array1OfToleranceZoneTarget.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx b/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
index 2b7abfc0fc..7fa1c4b9a9 100644
--- a/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_LineProfileTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx b/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
index e21f8e1015..f3314459c7 100644
--- a/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_LineProfileTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
index 15543fb670..99ec6e6bf4 100644
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepDimTol_ModifiedGeometricTolerance.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
diff --git a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
index 07bd75c843..14f079daf8 100644
--- a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_NonUniformZoneDefinition_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx b/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
index b21fb6d27f..dfbaed3942 100644
--- a/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ParallelismTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx b/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
index f9ef11d562..5eb8cd8e02 100644
--- a/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_ParallelismTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
index e7168e2030..a90bba00b2 100644
--- a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_PerpendicularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
index 4ce3b28888..366d6474ab 100644
--- a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_PerpendicularityTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_PositionTolerance.cxx b/src/StepDimTol/StepDimTol_PositionTolerance.cxx
index 75f2889352..90ea35e3cd 100644
--- a/src/StepDimTol/StepDimTol_PositionTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_PositionTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_PositionTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_PositionTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_PositionTolerance.hxx b/src/StepDimTol/StepDimTol_PositionTolerance.hxx
index 345da8872b..887147bff9 100644
--- a/src/StepDimTol/StepDimTol_PositionTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_PositionTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_PositionTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
index e9df3e0a49..3e311190e7 100644
--- a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_ProjectedZoneDefinition_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
diff --git a/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx b/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
index 49c15687d9..1131517230 100644
--- a/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_RoundnessTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_RoundnessTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx b/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
index cc974e9615..8794249f70 100644
--- a/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_RoundnessTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx b/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
index ad917e2a13..1a9ce7c1aa 100644
--- a/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_RunoutZoneDefinition.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_RunoutZoneDefinition_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_RunoutZoneOrientation.hxx>
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
diff --git a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
index 12b989bb6b..99295855c2 100644
--- a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
+++ b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
@@ -20,7 +20,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 
 class StepDimTol_RunoutZoneOrientation;
diff --git a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifier.hxx b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifier.hxx
index 9a5b55c246..2e8ce66d0e 100644
--- a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifier.hxx
+++ b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifier.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepDimTol_SimpleDatumReferenceModifier_HeaderFile
 #define _StepDimTol_SimpleDatumReferenceModifier_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 enum StepDimTol_SimpleDatumReferenceModifier {
   StepDimTol_SDRMAnyCrossSection,
   StepDimTol_SDRMAnyLongitudinalSection,
diff --git a/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx b/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
index 8a29dfca4e..b340fc396c 100644
--- a/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_StraightnessTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_StraightnessTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx b/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
index b11567715b..7dd5fb9dc4 100644
--- a/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_StraightnessTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
index 4865e4b511..1e32d50f6e 100644
--- a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_SurfaceProfileTolerance,StepDimTol_GeometricTolerance)
diff --git a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
index 9740c41c35..d8a40911de 100644
--- a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_SurfaceProfileTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricTolerance.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx b/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
index 15611770bd..0c1cf5e74f 100644
--- a/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_SymmetryTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx b/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
index d107897ca9..89f1b8d1dd 100644
--- a/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_SymmetryTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_ToleranceZone.hxx b/src/StepDimTol/StepDimTol_ToleranceZone.hxx
index 7768873585..418aa03724 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZone.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZone.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_ToleranceZone_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_ShapeAspect.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
index d65bda3d1c..3f23ad47ce 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_ToleranceZoneDefinition_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx b/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
index 9ed229448b..11e8fd4e10 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
@@ -20,7 +20,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 class TCollection_HAsciiString;
diff --git a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
index 89dcc19069..8cc4020a4e 100644
--- a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_TotalRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
diff --git a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
index b5ea090740..bd61b0106c 100644
--- a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_TotalRunoutTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepDimTol_GeometricToleranceWithDatumReference.hxx>
 
diff --git a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
index de9d3d8186..4f53e5fb26 100644
--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepDimTol_UnequallyDisposedGeometricTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepDimTol_GeometricTolerance.hxx>
diff --git a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
index 7b3324e671..6aa7b1b9cf 100644
--- a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
+++ b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/StepElement/StepElement_Curve3dElementDescriptor.cxx b/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
index 571f12ef90..039b49fce0 100644
--- a/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_Curve3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_Curve3dElementDescriptor.hxx b/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
index 6b430afa90..22ef9407e8 100644
--- a/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_Curve3dElementDescriptor_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_HArray1OfHSequenceOfCurveElementPurposeMember.hxx>
 #include <StepElement_ElementDescriptor.hxx>
diff --git a/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx b/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
index c9e3fab030..560862f12c 100644
--- a/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
+++ b/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_CurveElementEndReleasePacket.hxx>
 #include <StepElement_CurveElementFreedom.hxx>
 
diff --git a/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx b/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
index f7017146f3..a48e319fcd 100644
--- a/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
+++ b/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_CurveElementEndReleasePacket_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_CurveElementFreedom.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/StepElement/StepElement_CurveElementFreedomMember.cxx b/src/StepElement/StepElement_CurveElementFreedomMember.cxx
index adf4e83f9d..6f336f4a24 100644
--- a/src/StepElement/StepElement_CurveElementFreedomMember.cxx
+++ b/src/StepElement/StepElement_CurveElementFreedomMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_CurveElementFreedomMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_CurveElementFreedomMember.hxx b/src/StepElement/StepElement_CurveElementFreedomMember.hxx
index b51509bd1e..28be92d19e 100644
--- a/src/StepElement/StepElement_CurveElementFreedomMember.hxx
+++ b/src/StepElement/StepElement_CurveElementFreedomMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_CurveElementFreedomMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepElement/StepElement_CurveElementPurposeMember.cxx b/src/StepElement/StepElement_CurveElementPurposeMember.cxx
index a14e973dbb..a615a00ef9 100644
--- a/src/StepElement/StepElement_CurveElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_CurveElementPurposeMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_CurveElementPurposeMember.hxx b/src/StepElement/StepElement_CurveElementPurposeMember.hxx
index 6b5deb4a98..911634da58 100644
--- a/src/StepElement/StepElement_CurveElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_CurveElementPurposeMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_CurveElementPurposeMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepElement/StepElement_CurveElementSectionDefinition.cxx b/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
index 13ef999ffe..96e4fd0a22 100644
--- a/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
+++ b/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_CurveElementSectionDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
index 4274ae83b4..29b3677444 100644
--- a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
+++ b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_CurveElementSectionDerivedDefinitions.hxx>
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
index 564ae8ff6f..ad35682e92 100644
--- a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
+++ b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_CurveElementSectionDerivedDefinitions_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
 #include <StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx>
diff --git a/src/StepElement/StepElement_ElementAspectMember.cxx b/src/StepElement/StepElement_ElementAspectMember.cxx
index 0661a5d59a..15748e796e 100644
--- a/src/StepElement/StepElement_ElementAspectMember.cxx
+++ b/src/StepElement/StepElement_ElementAspectMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_ElementAspectMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_ElementAspectMember.hxx b/src/StepElement/StepElement_ElementAspectMember.hxx
index 150b872b3d..ac691f2af0 100644
--- a/src/StepElement/StepElement_ElementAspectMember.hxx
+++ b/src/StepElement/StepElement_ElementAspectMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_ElementAspectMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepElement/StepElement_ElementDescriptor.cxx b/src/StepElement/StepElement_ElementDescriptor.cxx
index 22df2a867a..c0136d7a32 100644
--- a/src/StepElement/StepElement_ElementDescriptor.cxx
+++ b/src/StepElement/StepElement_ElementDescriptor.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_ElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_ElementMaterial.cxx b/src/StepElement/StepElement_ElementMaterial.cxx
index 7f68431c35..a5e7449910 100644
--- a/src/StepElement/StepElement_ElementMaterial.cxx
+++ b/src/StepElement/StepElement_ElementMaterial.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_ElementMaterial.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_ElementMaterial.hxx b/src/StepElement/StepElement_ElementMaterial.hxx
index d4264c4853..06b29a2a1e 100644
--- a/src/StepElement/StepElement_ElementMaterial.hxx
+++ b/src/StepElement/StepElement_ElementMaterial.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_ElementMaterial_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_HArray1OfMaterialPropertyRepresentation.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx b/src/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
index 5d437de993..f5759458e0 100644
--- a/src/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
+++ b/src/StepElement/StepElement_HArray1OfCurveElementEndReleasePacket.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfCurveElementEndReleasePacket_HeaderFile
 #define StepElement_HArray1OfCurveElementEndReleasePacket_HeaderFile
 
-#include <StepElement_CurveElementEndReleasePacket.hxx>
 #include <StepElement_Array1OfCurveElementEndReleasePacket.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx b/src/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
index efaac6e4d9..6a78cd75d9 100644
--- a/src/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
+++ b/src/StepElement/StepElement_HArray1OfCurveElementSectionDefinition.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfCurveElementSectionDefinition_HeaderFile
 #define StepElement_HArray1OfCurveElementSectionDefinition_HeaderFile
 
-#include <StepElement_CurveElementSectionDefinition.hxx>
 #include <StepElement_Array1OfCurveElementSectionDefinition.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx b/src/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
index a7e8400e6a..afa90895d2 100644
--- a/src/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember_HeaderFile
 #define StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember_HeaderFile
 
-#include <StepElement_HSequenceOfSurfaceElementPurposeMember.hxx>
 #include <StepElement_Array1OfHSequenceOfSurfaceElementPurposeMember.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx b/src/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
index 6ec235caf3..7ccc4f3390 100644
--- a/src/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
+++ b/src/StepElement/StepElement_HArray1OfMeasureOrUnspecifiedValue.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfMeasureOrUnspecifiedValue_HeaderFile
 #define StepElement_HArray1OfMeasureOrUnspecifiedValue_HeaderFile
 
-#include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_Array1OfMeasureOrUnspecifiedValue.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HArray1OfSurfaceSection.hxx b/src/StepElement/StepElement_HArray1OfSurfaceSection.hxx
index 3b2801ede8..b354553dec 100644
--- a/src/StepElement/StepElement_HArray1OfSurfaceSection.hxx
+++ b/src/StepElement/StepElement_HArray1OfSurfaceSection.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfSurfaceSection_HeaderFile
 #define StepElement_HArray1OfSurfaceSection_HeaderFile
 
-#include <StepElement_SurfaceSection.hxx>
 #include <StepElement_Array1OfSurfaceSection.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx b/src/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
index 6435c3f213..0acc73277c 100644
--- a/src/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_HArray1OfVolumeElementPurposeMember.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HArray1OfVolumeElementPurposeMember_HeaderFile
 #define StepElement_HArray1OfVolumeElementPurposeMember_HeaderFile
 
-#include <StepElement_VolumeElementPurposeMember.hxx>
 #include <StepElement_Array1OfVolumeElementPurposeMember.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx b/src/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
index 3584d57f3e..02d755c3ed 100644
--- a/src/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
+++ b/src/StepElement/StepElement_HSequenceOfCurveElementSectionDefinition.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HSequenceOfCurveElementSectionDefinition_HeaderFile
 #define StepElement_HSequenceOfCurveElementSectionDefinition_HeaderFile
 
-#include <StepElement_CurveElementSectionDefinition.hxx>
 #include <StepElement_SequenceOfCurveElementSectionDefinition.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StepElement/StepElement_HSequenceOfElementMaterial.hxx b/src/StepElement/StepElement_HSequenceOfElementMaterial.hxx
index 00e8a63baa..1e8578db11 100644
--- a/src/StepElement/StepElement_HSequenceOfElementMaterial.hxx
+++ b/src/StepElement/StepElement_HSequenceOfElementMaterial.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HSequenceOfElementMaterial_HeaderFile
 #define StepElement_HSequenceOfElementMaterial_HeaderFile
 
-#include <StepElement_ElementMaterial.hxx>
 #include <StepElement_SequenceOfElementMaterial.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx b/src/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
index b3d71cfc94..4df8da20dc 100644
--- a/src/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_HSequenceOfSurfaceElementPurposeMember.hxx
@@ -14,7 +14,6 @@
 #ifndef StepElement_HSequenceOfSurfaceElementPurposeMember_HeaderFile
 #define StepElement_HSequenceOfSurfaceElementPurposeMember_HeaderFile
 
-#include <StepElement_SurfaceElementPurposeMember.hxx>
 #include <StepElement_SequenceOfSurfaceElementPurposeMember.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx
index 2fff0450ca..5c814834f5 100644
--- a/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx
+++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValue.hxx
@@ -22,7 +22,6 @@
 
 #include <StepData_SelectType.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <StepElement_UnspecifiedValue.hxx>
 class Standard_Transient;
 class StepData_SelectMember;
diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
index ccbea30eea..cc589b46e3 100644
--- a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
+++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_MeasureOrUnspecifiedValueMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
index f1e2c7764e..194d4903bf 100644
--- a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
+++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_MeasureOrUnspecifiedValueMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepElement/StepElement_Surface3dElementDescriptor.cxx b/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
index a8e8effb65..9a288bf771 100644
--- a/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_Surface3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_Surface3dElementDescriptor.hxx b/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
index 56bd054255..e762d756f1 100644
--- a/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_Surface3dElementDescriptor_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_HArray1OfHSequenceOfSurfaceElementPurposeMember.hxx>
 #include <StepElement_Element2dShape.hxx>
diff --git a/src/StepElement/StepElement_SurfaceElementProperty.cxx b/src/StepElement/StepElement_SurfaceElementProperty.cxx
index 4e93f68a2c..f71bfb6160 100644
--- a/src/StepElement/StepElement_SurfaceElementProperty.cxx
+++ b/src/StepElement/StepElement_SurfaceElementProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_SurfaceElementProperty.hxx>
 #include <StepElement_SurfaceSectionField.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx b/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
index e00852104d..3b83ed1ee9 100644
--- a/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_SurfaceElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx b/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
index 3ebb7431fd..c59423425d 100644
--- a/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_SurfaceElementPurposeMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepElement/StepElement_SurfaceSection.cxx b/src/StepElement/StepElement_SurfaceSection.cxx
index b1e783f575..f30f0938e6 100644
--- a/src/StepElement/StepElement_SurfaceSection.cxx
+++ b/src/StepElement/StepElement_SurfaceSection.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
-#include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_SurfaceSection.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSection,Standard_Transient)
diff --git a/src/StepElement/StepElement_SurfaceSection.hxx b/src/StepElement/StepElement_SurfaceSection.hxx
index 3be5255e9e..3d3b1b4425 100644
--- a/src/StepElement/StepElement_SurfaceSection.hxx
+++ b/src/StepElement/StepElement_SurfaceSection.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_SurfaceSection_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx b/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
index b36a3c427c..f7c2e88c63 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_SurfaceSection.hxx>
 #include <StepElement_SurfaceSectionFieldConstant.hxx>
 
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx b/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
index ed276f0327..58cb83035a 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_SurfaceSectionFieldVarying.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSectionFieldVarying,StepElement_SurfaceSectionField)
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx b/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
index f2f870d4ce..caa5fcdc99 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_SurfaceSectionFieldVarying_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_HArray1OfSurfaceSection.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/StepElement/StepElement_UniformSurfaceSection.cxx b/src/StepElement/StepElement_UniformSurfaceSection.cxx
index b7de763609..4511e5e4d9 100644
--- a/src/StepElement/StepElement_UniformSurfaceSection.cxx
+++ b/src/StepElement/StepElement_UniformSurfaceSection.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
-#include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_UniformSurfaceSection.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepElement_UniformSurfaceSection,StepElement_SurfaceSection)
diff --git a/src/StepElement/StepElement_UniformSurfaceSection.hxx b/src/StepElement/StepElement_UniformSurfaceSection.hxx
index 253bbc8f20..eef5f43892 100644
--- a/src/StepElement/StepElement_UniformSurfaceSection.hxx
+++ b/src/StepElement/StepElement_UniformSurfaceSection.hxx
@@ -17,10 +17,8 @@
 #define _StepElement_UniformSurfaceSection_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
-#include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_SurfaceSection.hxx>
 
 
diff --git a/src/StepElement/StepElement_Volume3dElementDescriptor.cxx b/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
index 2659294fb9..1f82c9b74a 100644
--- a/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_Volume3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_Volume3dElementDescriptor.hxx b/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
index fdeb765cf1..52a97a7671 100644
--- a/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
@@ -17,7 +17,6 @@
 #define _StepElement_Volume3dElementDescriptor_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepElement_HArray1OfVolumeElementPurposeMember.hxx>
 #include <StepElement_Volume3dElementShape.hxx>
diff --git a/src/StepElement/StepElement_VolumeElementPurposeMember.cxx b/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
index c3c6e3eec9..02591aba91 100644
--- a/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepElement_VolumeElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepElement/StepElement_VolumeElementPurposeMember.hxx b/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
index 83258f5c0e..d2d72cf24e 100644
--- a/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
@@ -17,11 +17,9 @@
 #define _StepElement_VolumeElementPurposeMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
index 48cbcbcc6f..72576871b0 100644
--- a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_AlignedCurve3dElementCoordinateSystem.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
index 258c28c5f3..619924a2e5 100644
--- a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_AlignedSurface3dElementCoordinateSystem.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
index c9747932a8..6919395b06 100644
--- a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
index c987462e7a..1a1b713353 100644
--- a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ConstantSurface3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_Curve3dElementProperty.cxx b/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
index a4fc993899..5e80026663 100644
--- a/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
+++ b/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_Curve3dElementProperty.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_Curve3dElementProperty.hxx b/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
index dcfa5d90b0..2b0ca820a7 100644
--- a/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
+++ b/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_Curve3dElementProperty_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_HArray1OfCurveElementInterval.hxx>
 #include <StepFEA_HArray1OfCurveElementEndOffset.hxx>
diff --git a/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
index bf7fd092c7..d7015cd27a 100644
--- a/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_Curve3dElementDescriptor.hxx>
 #include <StepElement_ElementMaterial.hxx>
 #include <StepFEA_Curve3dElementProperty.hxx>
diff --git a/src/StepFEA/StepFEA_CurveElementEndOffset.cxx b/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
index a6c9e65bbe..8e7f15073d 100644
--- a/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
+++ b/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
-#include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <StepFEA_CurveElementEndOffset.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementEndOffset,Standard_Transient)
diff --git a/src/StepFEA/StepFEA_CurveElementEndOffset.hxx b/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
index 4f3fcf77be..3b51d0f5d1 100644
--- a/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
+++ b/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_CurveElementEndOffset_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <TColStd_HArray1OfReal.hxx>
diff --git a/src/StepFEA/StepFEA_CurveElementEndRelease.cxx b/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
index 71c13f0de1..25ef6e368f 100644
--- a/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
+++ b/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
-#include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <StepFEA_CurveElementEndRelease.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementEndRelease,Standard_Transient)
diff --git a/src/StepFEA/StepFEA_CurveElementEndRelease.hxx b/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
index 3b55dd7634..17b72d0f67 100644
--- a/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
+++ b/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_CurveElementEndRelease_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <StepElement_HArray1OfCurveElementEndReleasePacket.hxx>
diff --git a/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx b/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
index 8c5e4bb1dd..aabd72c752 100644
--- a/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
+++ b/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepFEA_DegreeOfFreedomMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx b/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
index f31d90cde7..ad6ecde93b 100644
--- a/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
+++ b/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
@@ -17,11 +17,9 @@
 #define _StepFEA_DegreeOfFreedomMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectNamed.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_CString.hxx>
 
 
diff --git a/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx b/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
index b937954b59..92fd723793 100644
--- a/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
+++ b/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
@@ -15,9 +15,7 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
-#include <StepElement_ElementAspect.hxx>
 #include <StepFEA_ElementGeometricRelationship.hxx>
 #include <StepFEA_ElementOrElementGroup.hxx>
 
diff --git a/src/StepFEA/StepFEA_ElementGroup.cxx b/src/StepFEA/StepFEA_ElementGroup.cxx
index 4210367619..a897031fbd 100644
--- a/src/StepFEA/StepFEA_ElementGroup.cxx
+++ b/src/StepFEA/StepFEA_ElementGroup.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ElementGroup.hxx>
 #include <StepFEA_FeaModel.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_ElementRepresentation.cxx b/src/StepFEA/StepFEA_ElementRepresentation.cxx
index b58276bfc0..bab86a92ff 100644
--- a/src/StepFEA/StepFEA_ElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_ElementRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ElementRepresentation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaAreaDensity.cxx b/src/StepFEA/StepFEA_FeaAreaDensity.cxx
index 878c4c054d..6c87e8abdd 100644
--- a/src/StepFEA/StepFEA_FeaAreaDensity.cxx
+++ b/src/StepFEA/StepFEA_FeaAreaDensity.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaAreaDensity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx b/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
index 1727aa72c3..a57c9db141 100644
--- a/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
+++ b/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepFEA/StepFEA_FeaGroup.cxx b/src/StepFEA/StepFEA_FeaGroup.cxx
index 9aa28e2cac..9f4a35775c 100644
--- a/src/StepFEA/StepFEA_FeaGroup.cxx
+++ b/src/StepFEA/StepFEA_FeaGroup.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaGroup.hxx>
 #include <StepFEA_FeaModel.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaLinearElasticity.cxx b/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
index b301d93bab..b939984d9f 100644
--- a/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
+++ b/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaLinearElasticity.hxx>
 #include <StepFEA_SymmetricTensor43d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaLinearElasticity.hxx b/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
index 98f749b802..cc2cccad90 100644
--- a/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
+++ b/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaLinearElasticity_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor43d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaMassDensity.cxx b/src/StepFEA/StepFEA_FeaMassDensity.cxx
index b76ee9d3bd..e9ab1bfeec 100644
--- a/src/StepFEA/StepFEA_FeaMassDensity.cxx
+++ b/src/StepFEA/StepFEA_FeaMassDensity.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaMassDensity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
index dff4a25b25..5c9a85f2f7 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentation.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaMaterialPropertyRepresentation,StepRepr_MaterialPropertyRepresentation)
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
index d73ca3c14c..b5cc467d01 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaMaterialPropertyRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_MaterialPropertyRepresentation.hxx>
 
diff --git a/src/StepFEA/StepFEA_FeaModel.cxx b/src/StepFEA/StepFEA_FeaModel.cxx
index 8bfad2ea5a..aa26b0d118 100644
--- a/src/StepFEA/StepFEA_FeaModel.cxx
+++ b/src/StepFEA/StepFEA_FeaModel.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaModel.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaModel.hxx b/src/StepFEA/StepFEA_FeaModel.hxx
index 66b0efcad1..f2988cc778 100644
--- a/src/StepFEA/StepFEA_FeaModel.hxx
+++ b/src/StepFEA/StepFEA_FeaModel.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaModel_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfAsciiString.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/StepFEA/StepFEA_FeaModel3d.cxx b/src/StepFEA/StepFEA_FeaModel3d.cxx
index 10851fb24d..a493c29581 100644
--- a/src/StepFEA/StepFEA_FeaModel3d.cxx
+++ b/src/StepFEA/StepFEA_FeaModel3d.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaModel3d.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaModel3d,StepFEA_FeaModel)
diff --git a/src/StepFEA/StepFEA_FeaModel3d.hxx b/src/StepFEA/StepFEA_FeaModel3d.hxx
index 66916c8185..3798ae9796 100644
--- a/src/StepFEA/StepFEA_FeaModel3d.hxx
+++ b/src/StepFEA/StepFEA_FeaModel3d.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaModel3d_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_FeaModel.hxx>
 
diff --git a/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx b/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
index c92a21d043..4a3888a88a 100644
--- a/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
+++ b/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaMoistureAbsorption.hxx>
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx b/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
index 97f312a765..298601fbc7 100644
--- a/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
+++ b/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaMoistureAbsorption_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaParametricPoint.cxx b/src/StepFEA/StepFEA_FeaParametricPoint.cxx
index f9d7925298..0440837494 100644
--- a/src/StepFEA/StepFEA_FeaParametricPoint.cxx
+++ b/src/StepFEA/StepFEA_FeaParametricPoint.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaParametricPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
index ff5e857619..9ecd8eeec9 100644
--- a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
+++ b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx>
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
index 8640cbe5c5..0c13239ef2 100644
--- a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
+++ b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaSecantCoefficientOfLinearThermalExpansion_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <Standard_Real.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx b/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
index 38d34eef98..17eccdbe78 100644
--- a/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaShellBendingStiffness.hxx>
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx b/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
index 85efc64568..24e44e3f76 100644
--- a/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaShellBendingStiffness_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
index 0e32b65bc2..745fcb6011 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx>
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
index 56372e12a5..09634fb637 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaShellMembraneBendingCouplingStiffness_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
index 5827f59bd5..48b5719647 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaShellMembraneStiffness.hxx>
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
index 77a67a25f6..78342438d3 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaShellMembraneStiffness_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx b/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
index 39449923d9..7dda8abc0a 100644
--- a/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaShellShearStiffness.hxx>
 #include <StepFEA_SymmetricTensor22d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx b/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
index ecd0d7e05c..55ee16891a 100644
--- a/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaShellShearStiffness_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor22d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
index cb266d7513..0e1f4047a3 100644
--- a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
+++ b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_AnalysisItemWithinRepresentation.hxx>
 #include <StepElement_SurfaceSection.hxx>
 #include <StepFEA_FeaSurfaceSectionGeometricRelationship.hxx>
diff --git a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
index 64140ac5d1..f3d96291ab 100644
--- a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
+++ b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx>
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
index c71d6c278d..9f84b32c3e 100644
--- a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
+++ b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
diff --git a/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx b/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
index fc10d83e30..270e87cdab 100644
--- a/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
+++ b/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
@@ -15,9 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
-#include <StepElement_MeasureOrUnspecifiedValue.hxx>
-#include <StepFEA_DegreeOfFreedom.hxx>
 #include <StepFEA_FreedomAndCoefficient.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FreedomAndCoefficient,Standard_Transient)
diff --git a/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx b/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
index ab90ddb78e..07e3fcdd8b 100644
--- a/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
+++ b/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FreedomAndCoefficient_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_DegreeOfFreedom.hxx>
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
diff --git a/src/StepFEA/StepFEA_FreedomsList.cxx b/src/StepFEA/StepFEA_FreedomsList.cxx
index c1b1a8d8d6..5d79653b06 100644
--- a/src/StepFEA/StepFEA_FreedomsList.cxx
+++ b/src/StepFEA/StepFEA_FreedomsList.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FreedomsList.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FreedomsList,Standard_Transient)
diff --git a/src/StepFEA/StepFEA_FreedomsList.hxx b/src/StepFEA/StepFEA_FreedomsList.hxx
index fd366ad5f3..23c350be2a 100644
--- a/src/StepFEA/StepFEA_FreedomsList.hxx
+++ b/src/StepFEA/StepFEA_FreedomsList.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_FreedomsList_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepFEA_HArray1OfDegreeOfFreedom.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx b/src/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
index 136c307a7d..d6b02696e7 100644
--- a/src/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
+++ b/src/StepFEA/StepFEA_HArray1OfCurveElementEndOffset.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HArray1OfCurveElementEndOffset_HeaderFile
 #define StepFEA_HArray1OfCurveElementEndOffset_HeaderFile
 
-#include <StepFEA_CurveElementEndOffset.hxx>
 #include <StepFEA_Array1OfCurveElementEndOffset.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx b/src/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
index b289e69d9c..d9e092ecb9 100644
--- a/src/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
+++ b/src/StepFEA/StepFEA_HArray1OfCurveElementEndRelease.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HArray1OfCurveElementEndRelease_HeaderFile
 #define StepFEA_HArray1OfCurveElementEndRelease_HeaderFile
 
-#include <StepFEA_CurveElementEndRelease.hxx>
 #include <StepFEA_Array1OfCurveElementEndRelease.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx b/src/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
index f4aa94684d..5b2dd2d04a 100644
--- a/src/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
+++ b/src/StepFEA/StepFEA_HArray1OfDegreeOfFreedom.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HArray1OfDegreeOfFreedom_HeaderFile
 #define StepFEA_HArray1OfDegreeOfFreedom_HeaderFile
 
-#include <StepFEA_DegreeOfFreedom.hxx>
 #include <StepFEA_Array1OfDegreeOfFreedom.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx b/src/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
index 8af93c780a..13161712bb 100644
--- a/src/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
+++ b/src/StepFEA/StepFEA_HArray1OfNodeRepresentation.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HArray1OfNodeRepresentation_HeaderFile
 #define StepFEA_HArray1OfNodeRepresentation_HeaderFile
 
-#include <StepFEA_NodeRepresentation.hxx>
 #include <StepFEA_Array1OfNodeRepresentation.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx b/src/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
index 649813067e..171db8c97a 100644
--- a/src/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
+++ b/src/StepFEA/StepFEA_HSequenceOfElementGeometricRelationship.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HSequenceOfElementGeometricRelationship_HeaderFile
 #define StepFEA_HSequenceOfElementGeometricRelationship_HeaderFile
 
-#include <StepFEA_ElementGeometricRelationship.hxx>
 #include <StepFEA_SequenceOfElementGeometricRelationship.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx b/src/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
index 1499b33401..5dd38de25c 100644
--- a/src/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
+++ b/src/StepFEA/StepFEA_HSequenceOfElementRepresentation.hxx
@@ -14,7 +14,6 @@
 #ifndef StepFEA_HSequenceOfElementRepresentation_HeaderFile
 #define StepFEA_HSequenceOfElementRepresentation_HeaderFile
 
-#include <StepFEA_ElementRepresentation.hxx>
 #include <StepFEA_SequenceOfElementRepresentation.hxx>
 #include <NCollection_DefineHSequence.hxx>
 
diff --git a/src/StepFEA/StepFEA_NodeGroup.cxx b/src/StepFEA/StepFEA_NodeGroup.cxx
index dabcafcf16..141a09cc5b 100644
--- a/src/StepFEA/StepFEA_NodeGroup.cxx
+++ b/src/StepFEA/StepFEA_NodeGroup.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaModel.hxx>
 #include <StepFEA_NodeGroup.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_NodeRepresentation.cxx b/src/StepFEA/StepFEA_NodeRepresentation.cxx
index b8062fa8b3..3702bc09d9 100644
--- a/src/StepFEA/StepFEA_NodeRepresentation.cxx
+++ b/src/StepFEA/StepFEA_NodeRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_FeaModel.hxx>
 #include <StepFEA_NodeRepresentation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/StepFEA/StepFEA_NodeSet.cxx b/src/StepFEA/StepFEA_NodeSet.cxx
index 7ebff82b8d..2e7a459232 100644
--- a/src/StepFEA/StepFEA_NodeSet.cxx
+++ b/src/StepFEA/StepFEA_NodeSet.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_NodeSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
index 303b0ac10f..585aac2286 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ParametricCurve3dElementCoordinateDirection.hxx>
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
index d164663e62..d33817bb4a 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ParametricCurve3dElementCoordinateDirection.hxx>
 #include <StepFEA_ParametricCurve3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
index 863d50a02f..5dc1f2db4b 100644
--- a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepFEA_ParametricSurface3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
index 7a3117b033..6522b87572 100644
--- a/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_ElementMaterial.hxx>
 #include <StepElement_Surface3dElementDescriptor.hxx>
 #include <StepElement_SurfaceElementProperty.hxx>
diff --git a/src/StepFEA/StepFEA_SymmetricTensor23d.hxx b/src/StepFEA/StepFEA_SymmetricTensor23d.hxx
index 0eaa8cb97d..de681f56a3 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor23d.hxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor23d.hxx
@@ -22,7 +22,6 @@
 
 #include <StepData_SelectType.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 class Standard_Transient;
 class StepData_SelectMember;
diff --git a/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx b/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
index 897f092be3..f62ccf31d2 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V2.0
 
-#include <Standard_Type.hxx>
 #include <StepFEA_SymmetricTensor23dMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx b/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
index 9f55b8ab14..015af4ccda 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_SymmetricTensor23dMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectArrReal.hxx>
diff --git a/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx b/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
index cbfa9ed78c..25b97a718a 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepFEA_SymmetricTensor43dMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx b/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
index 69c4a4a13d..b7f858eec5 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
@@ -17,7 +17,6 @@
 #define _StepFEA_SymmetricTensor43dMember_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
 #include <StepData_SelectArrReal.hxx>
diff --git a/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
index 05c2cd00b4..2aa255f126 100644
--- a/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepElement_ElementMaterial.hxx>
 #include <StepElement_Volume3dElementDescriptor.hxx>
 #include <StepFEA_FeaModel3d.hxx>
diff --git a/src/StepGeom/StepGeom_Axis1Placement.cxx b/src/StepGeom/StepGeom_Axis1Placement.cxx
index a4a8fc299e..e809bc34af 100644
--- a/src/StepGeom/StepGeom_Axis1Placement.cxx
+++ b/src/StepGeom/StepGeom_Axis1Placement.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepGeom/StepGeom_Axis2Placement2d.cxx b/src/StepGeom/StepGeom_Axis2Placement2d.cxx
index ec5bf504a7..71e7a39280 100644
--- a/src/StepGeom/StepGeom_Axis2Placement2d.cxx
+++ b/src/StepGeom/StepGeom_Axis2Placement2d.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement2d.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepGeom/StepGeom_Axis2Placement3d.cxx b/src/StepGeom/StepGeom_Axis2Placement3d.cxx
index efebd88a14..4ba61524f3 100644
--- a/src/StepGeom/StepGeom_Axis2Placement3d.cxx
+++ b/src/StepGeom/StepGeom_Axis2Placement3d.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepGeom/StepGeom_BSplineCurve.cxx b/src/StepGeom/StepGeom_BSplineCurve.cxx
index 413445cf55..68b96d8ee9 100644
--- a/src/StepGeom/StepGeom_BSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_BSplineCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_BSplineCurve.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
index 3f5cf388f6..53701726a0 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_BSplineCurveWithKnots.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx b/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
index c1e63a64c4..db1ee26057 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <StepGeom_KnotType.hxx>
 #include <StepGeom_BSplineCurve.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
index 712b1182c8..8d167c0d37 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
@@ -28,7 +28,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <StepGeom_KnotType.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_BSplineCurveWithKnots;
 class StepGeom_RationalBSplineCurve;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_BSplineSurface.cxx b/src/StepGeom/StepGeom_BSplineSurface.cxx
index 6f08e27e3d..0562219932 100644
--- a/src/StepGeom/StepGeom_BSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_BSplineSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_BSplineSurface.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
index a27c5ab54d..33c8c28155 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_BSplineSurfaceWithKnots.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
index 268339af81..0d923d2149 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <TColStd_HArray1OfInteger.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 #include <StepGeom_KnotType.hxx>
 #include <StepGeom_BSplineSurface.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
index fa7ba587f7..5dbe612612 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
@@ -29,7 +29,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <StepGeom_KnotType.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_BSplineSurfaceWithKnots;
 class StepGeom_RationalBSplineSurface;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
index a654d9c1a7..db081ee994 100644
--- a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineCurveForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_BezierCurve;
 class StepGeom_RationalBSplineCurve;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
index 2cf727c625..abd61d91eb 100644
--- a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineSurfaceForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_BezierSurface;
 class StepGeom_RationalBSplineSurface;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_CartesianPoint.hxx b/src/StepGeom/StepGeom_CartesianPoint.hxx
index b9e7fd727c..daab1642d6 100644
--- a/src/StepGeom/StepGeom_CartesianPoint.hxx
+++ b/src/StepGeom/StepGeom_CartesianPoint.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 #include <StepGeom_Point.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx b/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
index 1215e6dc02..056b29caa6 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx b/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
index 6795af0e31..054cc2fbd6 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
@@ -20,8 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Direction;
 class StepGeom_CartesianPoint;
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
index f2d7d716e1..d902fded4f 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
index c0706f0102..576b2b1c74 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
@@ -20,9 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_Direction;
 class TCollection_HAsciiString;
 class StepGeom_CartesianPoint;
diff --git a/src/StepGeom/StepGeom_Circle.cxx b/src/StepGeom/StepGeom_Circle.cxx
index ee2070807a..302f314293 100644
--- a/src/StepGeom/StepGeom_Circle.cxx
+++ b/src/StepGeom/StepGeom_Circle.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Circle.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Circle.hxx b/src/StepGeom/StepGeom_Circle.hxx
index b89c745caf..e3dfc58286 100644
--- a/src/StepGeom/StepGeom_Circle.hxx
+++ b/src/StepGeom/StepGeom_Circle.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_Circle_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
 #include <StepGeom_Conic.hxx>
diff --git a/src/StepGeom/StepGeom_CompositeCurve.cxx b/src/StepGeom/StepGeom_CompositeCurve.cxx
index a4fbced5c6..6949ebadd9 100644
--- a/src/StepGeom/StepGeom_CompositeCurve.cxx
+++ b/src/StepGeom/StepGeom_CompositeCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CompositeCurve.hxx>
 #include <StepGeom_CompositeCurveSegment.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_CompositeCurveSegment.hxx b/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
index 7c52ba3377..9db52e3f1f 100644
--- a/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
+++ b/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepGeom_TransitionCode.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class StepGeom_Curve;
 
diff --git a/src/StepGeom/StepGeom_Conic.cxx b/src/StepGeom/StepGeom_Conic.cxx
index b9ab56d6aa..33068a4e4d 100644
--- a/src/StepGeom/StepGeom_Conic.cxx
+++ b/src/StepGeom/StepGeom_Conic.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Conic.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Conic.hxx b/src/StepGeom/StepGeom_Conic.hxx
index 818d93f102..95dd6a8d70 100644
--- a/src/StepGeom/StepGeom_Conic.hxx
+++ b/src/StepGeom/StepGeom_Conic.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_Conic_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Curve.hxx>
diff --git a/src/StepGeom/StepGeom_ConicalSurface.cxx b/src/StepGeom/StepGeom_ConicalSurface.cxx
index 64d7b737bf..6feac1c1af 100644
--- a/src/StepGeom/StepGeom_ConicalSurface.cxx
+++ b/src/StepGeom/StepGeom_ConicalSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_ConicalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_ConicalSurface.hxx b/src/StepGeom/StepGeom_ConicalSurface.hxx
index aff444bbbc..fa98f9846e 100644
--- a/src/StepGeom/StepGeom_ConicalSurface.hxx
+++ b/src/StepGeom/StepGeom_ConicalSurface.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_ElementarySurface.hxx>
 class TCollection_HAsciiString;
 class StepGeom_Axis2Placement3d;
diff --git a/src/StepGeom/StepGeom_CurveBoundedSurface.cxx b/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
index 2b20f09786..65924f4718 100644
--- a/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
+++ b/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_CurveBoundedSurface.hxx b/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
index 5b1336c8c6..b62d74cdd6 100644
--- a/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
+++ b/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_CurveBoundedSurface_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_HArray1OfSurfaceBoundary.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/StepGeom/StepGeom_CurveReplica.cxx b/src/StepGeom/StepGeom_CurveReplica.cxx
index 87d2b03b3c..69b39aacc8 100644
--- a/src/StepGeom/StepGeom_CurveReplica.cxx
+++ b/src/StepGeom/StepGeom_CurveReplica.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
-#include <StepGeom_Curve.hxx>
 #include <StepGeom_CurveReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_CylindricalSurface.cxx b/src/StepGeom/StepGeom_CylindricalSurface.cxx
index bae66c379f..c75b72861b 100644
--- a/src/StepGeom/StepGeom_CylindricalSurface.cxx
+++ b/src/StepGeom/StepGeom_CylindricalSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_CylindricalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_CylindricalSurface.hxx b/src/StepGeom/StepGeom_CylindricalSurface.hxx
index d90f3d1104..36158a8f99 100644
--- a/src/StepGeom/StepGeom_CylindricalSurface.hxx
+++ b/src/StepGeom/StepGeom_CylindricalSurface.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_ElementarySurface.hxx>
 class TCollection_HAsciiString;
 class StepGeom_Axis2Placement3d;
diff --git a/src/StepGeom/StepGeom_DegeneratePcurve.cxx b/src/StepGeom/StepGeom_DegeneratePcurve.cxx
index aa78eb87b3..e3ac718393 100644
--- a/src/StepGeom/StepGeom_DegeneratePcurve.cxx
+++ b/src/StepGeom/StepGeom_DegeneratePcurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_DegeneratePcurve.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
diff --git a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
index 94b8084ac6..3ef047c74d 100644
--- a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
+++ b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_DegenerateToroidalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx b/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
index d1e1334940..2a5674ba12 100644
--- a/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
+++ b/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
@@ -20,9 +20,7 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepGeom_ToroidalSurface.hxx>
-#include <Standard_Real.hxx>
 class TCollection_HAsciiString;
 class StepGeom_Axis2Placement3d;
 
diff --git a/src/StepGeom/StepGeom_Direction.cxx b/src/StepGeom/StepGeom_Direction.cxx
index ef732a7e3c..566a9647ab 100644
--- a/src/StepGeom/StepGeom_Direction.cxx
+++ b/src/StepGeom/StepGeom_Direction.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_ElementarySurface.cxx b/src/StepGeom/StepGeom_ElementarySurface.cxx
index e220a8d5e5..2a4d7f9ed0 100644
--- a/src/StepGeom/StepGeom_ElementarySurface.cxx
+++ b/src/StepGeom/StepGeom_ElementarySurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_ElementarySurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_Ellipse.cxx b/src/StepGeom/StepGeom_Ellipse.cxx
index 72f0ca4de9..360df44b74 100644
--- a/src/StepGeom/StepGeom_Ellipse.cxx
+++ b/src/StepGeom/StepGeom_Ellipse.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Ellipse.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Ellipse.hxx b/src/StepGeom/StepGeom_Ellipse.hxx
index c3088d01ad..5d08511a6c 100644
--- a/src/StepGeom/StepGeom_Ellipse.hxx
+++ b/src/StepGeom/StepGeom_Ellipse.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_Ellipse_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
 #include <StepGeom_Conic.hxx>
diff --git a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
index 6df15e41a6..786ca652ac 100644
--- a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
+++ b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_EvaluatedDegeneratePcurve.hxx>
 #include <StepGeom_Surface.hxx>
diff --git a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
index fa1a7e173d..42d0176ebb 100644
--- a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
+++ b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
@@ -16,8 +16,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_NamedUnit.hxx>
-#include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepGeom_GeometricRepresentationContext.hxx>
 #include <StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx b/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
index 133c5057fc..01f67c82ce 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_GeometricRepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
index 35e5d7f28f..3d30c2ab2a 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
@@ -13,7 +13,6 @@
 
 
 #include <Standard_Type.hxx>
-#include <StepBasic_NamedUnit.hxx>
 #include <StepGeom_GeometricRepresentationContext.hxx>
 #include <StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
diff --git a/src/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx b/src/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
index 2e7a2d8609..c918face82 100644
--- a/src/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
+++ b/src/StepGeom/StepGeom_HArray1OfCartesianPoint.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray1OfCartesianPoint_HeaderFile
 #define StepGeom_HArray1OfCartesianPoint_HeaderFile
 
-#include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Array1OfCartesianPoint.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx b/src/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
index 2a40b2b421..edae104ea8 100644
--- a/src/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
+++ b/src/StepGeom/StepGeom_HArray1OfCompositeCurveSegment.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray1OfCompositeCurveSegment_HeaderFile
 #define StepGeom_HArray1OfCompositeCurveSegment_HeaderFile
 
-#include <StepGeom_CompositeCurveSegment.hxx>
 #include <StepGeom_Array1OfCompositeCurveSegment.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx b/src/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
index eae1eb2386..696c5e21f5 100644
--- a/src/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
+++ b/src/StepGeom/StepGeom_HArray1OfPcurveOrSurface.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray1OfPcurveOrSurface_HeaderFile
 #define StepGeom_HArray1OfPcurveOrSurface_HeaderFile
 
-#include <StepGeom_PcurveOrSurface.hxx>
 #include <StepGeom_Array1OfPcurveOrSurface.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx b/src/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
index a133992740..0f178d7bb3 100644
--- a/src/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
+++ b/src/StepGeom/StepGeom_HArray1OfSurfaceBoundary.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray1OfSurfaceBoundary_HeaderFile
 #define StepGeom_HArray1OfSurfaceBoundary_HeaderFile
 
-#include <StepGeom_SurfaceBoundary.hxx>
 #include <StepGeom_Array1OfSurfaceBoundary.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx b/src/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
index 7bfb40205f..a4c5424123 100644
--- a/src/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
+++ b/src/StepGeom/StepGeom_HArray1OfTrimmingSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray1OfTrimmingSelect_HeaderFile
 #define StepGeom_HArray1OfTrimmingSelect_HeaderFile
 
-#include <StepGeom_TrimmingSelect.hxx>
 #include <StepGeom_Array1OfTrimmingSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx b/src/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
index fb215a2a83..26f185dd3f 100644
--- a/src/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
+++ b/src/StepGeom/StepGeom_HArray2OfCartesianPoint.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray2OfCartesianPoint_HeaderFile
 #define StepGeom_HArray2OfCartesianPoint_HeaderFile
 
-#include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Array2OfCartesianPoint.hxx>
 #include <NCollection_DefineHArray2.hxx>
 
diff --git a/src/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx b/src/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
index 48814f5a7a..8d9e08e21c 100644
--- a/src/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
+++ b/src/StepGeom/StepGeom_HArray2OfSurfacePatch.hxx
@@ -17,7 +17,6 @@
 #ifndef StepGeom_HArray2OfSurfacePatch_HeaderFile
 #define StepGeom_HArray2OfSurfacePatch_HeaderFile
 
-#include <StepGeom_SurfacePatch.hxx>
 #include <StepGeom_Array2OfSurfacePatch.hxx>
 #include <NCollection_DefineHArray2.hxx>
 
diff --git a/src/StepGeom/StepGeom_Hyperbola.cxx b/src/StepGeom/StepGeom_Hyperbola.cxx
index 0b6a80b872..afb1cbf500 100644
--- a/src/StepGeom/StepGeom_Hyperbola.cxx
+++ b/src/StepGeom/StepGeom_Hyperbola.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Hyperbola.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Hyperbola.hxx b/src/StepGeom/StepGeom_Hyperbola.hxx
index 5d0ca0fd80..10f3035112 100644
--- a/src/StepGeom/StepGeom_Hyperbola.hxx
+++ b/src/StepGeom/StepGeom_Hyperbola.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_Hyperbola_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
 #include <StepGeom_Conic.hxx>
diff --git a/src/StepGeom/StepGeom_IntersectionCurve.cxx b/src/StepGeom/StepGeom_IntersectionCurve.cxx
index fcbbe23e46..81b513edae 100644
--- a/src/StepGeom/StepGeom_IntersectionCurve.cxx
+++ b/src/StepGeom/StepGeom_IntersectionCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepGeom_IntersectionCurve,StepGeom_SurfaceCurve)
diff --git a/src/StepGeom/StepGeom_IntersectionCurve.hxx b/src/StepGeom/StepGeom_IntersectionCurve.hxx
index 6a608bd949..d84f833a6c 100644
--- a/src/StepGeom/StepGeom_IntersectionCurve.hxx
+++ b/src/StepGeom/StepGeom_IntersectionCurve.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_IntersectionCurve_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_SurfaceCurve.hxx>
 
diff --git a/src/StepGeom/StepGeom_Line.cxx b/src/StepGeom/StepGeom_Line.cxx
index dab1ad05f5..7aca8dec1b 100644
--- a/src/StepGeom/StepGeom_Line.cxx
+++ b/src/StepGeom/StepGeom_Line.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Line.hxx>
 #include <StepGeom_Vector.hxx>
diff --git a/src/StepGeom/StepGeom_OffsetCurve3d.cxx b/src/StepGeom/StepGeom_OffsetCurve3d.cxx
index 273dab86ff..018629bca8 100644
--- a/src/StepGeom/StepGeom_OffsetCurve3d.cxx
+++ b/src/StepGeom/StepGeom_OffsetCurve3d.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Curve.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepGeom_OffsetCurve3d.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_OffsetCurve3d.hxx b/src/StepGeom/StepGeom_OffsetCurve3d.hxx
index e2af524e55..5b541e3ecb 100644
--- a/src/StepGeom/StepGeom_OffsetCurve3d.hxx
+++ b/src/StepGeom/StepGeom_OffsetCurve3d.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepData_Logical.hxx>
 #include <StepGeom_Curve.hxx>
 class StepGeom_Direction;
diff --git a/src/StepGeom/StepGeom_OffsetSurface.cxx b/src/StepGeom/StepGeom_OffsetSurface.cxx
index 886f84461d..db80f77e55 100644
--- a/src/StepGeom/StepGeom_OffsetSurface.cxx
+++ b/src/StepGeom/StepGeom_OffsetSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_OffsetSurface.hxx>
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_OrientedSurface.cxx b/src/StepGeom/StepGeom_OrientedSurface.cxx
index ab4b07e527..84b7d70e71 100644
--- a/src/StepGeom/StepGeom_OrientedSurface.cxx
+++ b/src/StepGeom/StepGeom_OrientedSurface.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepGeom_OrientedSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Parabola.cxx b/src/StepGeom/StepGeom_Parabola.cxx
index 8dd4f93fdc..6bda1cf962 100644
--- a/src/StepGeom/StepGeom_Parabola.cxx
+++ b/src/StepGeom/StepGeom_Parabola.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepGeom_Parabola.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Parabola.hxx b/src/StepGeom/StepGeom_Parabola.hxx
index efb874f449..1d7d7c7486 100644
--- a/src/StepGeom/StepGeom_Parabola.hxx
+++ b/src/StepGeom/StepGeom_Parabola.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_Parabola_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <Standard_Real.hxx>
 #include <StepGeom_Conic.hxx>
diff --git a/src/StepGeom/StepGeom_Pcurve.cxx b/src/StepGeom/StepGeom_Pcurve.cxx
index b43a74b07b..1edd0dbba9 100644
--- a/src/StepGeom/StepGeom_Pcurve.cxx
+++ b/src/StepGeom/StepGeom_Pcurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Pcurve.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
diff --git a/src/StepGeom/StepGeom_Placement.cxx b/src/StepGeom/StepGeom_Placement.cxx
index 1d635806de..a20d8963e2 100644
--- a/src/StepGeom/StepGeom_Placement.cxx
+++ b/src/StepGeom/StepGeom_Placement.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Placement.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_PointOnCurve.cxx b/src/StepGeom/StepGeom_PointOnCurve.cxx
index 8f8d9e5bad..e1cb115abd 100644
--- a/src/StepGeom/StepGeom_PointOnCurve.cxx
+++ b/src/StepGeom/StepGeom_PointOnCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_PointOnCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_PointOnCurve.hxx b/src/StepGeom/StepGeom_PointOnCurve.hxx
index 470411e0fa..719b22ef5d 100644
--- a/src/StepGeom/StepGeom_PointOnCurve.hxx
+++ b/src/StepGeom/StepGeom_PointOnCurve.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_Point.hxx>
 class StepGeom_Curve;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_PointOnSurface.cxx b/src/StepGeom/StepGeom_PointOnSurface.cxx
index 118557ab5a..2a392a0f37 100644
--- a/src/StepGeom/StepGeom_PointOnSurface.cxx
+++ b/src/StepGeom/StepGeom_PointOnSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_PointOnSurface.hxx>
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_PointReplica.cxx b/src/StepGeom/StepGeom_PointReplica.cxx
index 227b105cfd..63f7153dfa 100644
--- a/src/StepGeom/StepGeom_PointReplica.cxx
+++ b/src/StepGeom/StepGeom_PointReplica.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianTransformationOperator.hxx>
-#include <StepGeom_Point.hxx>
 #include <StepGeom_PointReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_Polyline.cxx b/src/StepGeom/StepGeom_Polyline.cxx
index 6075fba684..bf47902970 100644
--- a/src/StepGeom/StepGeom_Polyline.cxx
+++ b/src/StepGeom/StepGeom_Polyline.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Polyline.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
index ef69676293..9b05eeccf9 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineCurveForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_QuasiUniformCurve;
 class StepGeom_RationalBSplineCurve;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
index 690d4d4256..4b9f16cf91 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineSurfaceForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_QuasiUniformSurface;
 class StepGeom_RationalBSplineSurface;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_RationalBSplineCurve.cxx b/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
index 54e55d4f30..10ffb39b2c 100644
--- a/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_RationalBSplineCurve.hxx b/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
index c1774b9105..957729bfa9 100644
--- a/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <TColStd_HArray1OfReal.hxx>
 #include <StepGeom_BSplineCurve.hxx>
 #include <Standard_Integer.hxx>
 #include <StepGeom_HArray1OfCartesianPoint.hxx>
diff --git a/src/StepGeom/StepGeom_RationalBSplineSurface.cxx b/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
index c6e8c98d70..eb43a2ffeb 100644
--- a/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx b/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
index e6f90e11c3..1fee20ea82 100644
--- a/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
+++ b/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_RectangularCompositeSurface.hxx>
 #include <StepGeom_SurfacePatch.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
index 105a538f29..54abd8651e 100644
--- a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
+++ b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_RectangularTrimmedSurface.hxx>
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
index 6dfe347e42..ca3ab39588 100644
--- a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
+++ b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
@@ -20,10 +20,8 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_CompositeCurveSegment.hxx>
 #include <StepGeom_TransitionCode.hxx>
-#include <Standard_Boolean.hxx>
 class StepGeom_Curve;
 
 
diff --git a/src/StepGeom/StepGeom_SeamCurve.cxx b/src/StepGeom/StepGeom_SeamCurve.cxx
index be9d0935e5..cc81ab3d20 100644
--- a/src/StepGeom/StepGeom_SeamCurve.cxx
+++ b/src/StepGeom/StepGeom_SeamCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_SeamCurve.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SeamCurve,StepGeom_SurfaceCurve)
diff --git a/src/StepGeom/StepGeom_SeamCurve.hxx b/src/StepGeom/StepGeom_SeamCurve.hxx
index ddd4d5f13d..49eae46495 100644
--- a/src/StepGeom/StepGeom_SeamCurve.hxx
+++ b/src/StepGeom/StepGeom_SeamCurve.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_SeamCurve_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_SurfaceCurve.hxx>
 
diff --git a/src/StepGeom/StepGeom_SphericalSurface.cxx b/src/StepGeom/StepGeom_SphericalSurface.cxx
index b356c363c8..4504e05172 100644
--- a/src/StepGeom/StepGeom_SphericalSurface.cxx
+++ b/src/StepGeom/StepGeom_SphericalSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_SphericalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_SphericalSurface.hxx b/src/StepGeom/StepGeom_SphericalSurface.hxx
index bfe9062f40..6d23c63331 100644
--- a/src/StepGeom/StepGeom_SphericalSurface.hxx
+++ b/src/StepGeom/StepGeom_SphericalSurface.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_ElementarySurface.hxx>
 class TCollection_HAsciiString;
 class StepGeom_Axis2Placement3d;
diff --git a/src/StepGeom/StepGeom_SuParameters.hxx b/src/StepGeom/StepGeom_SuParameters.hxx
index 1a47dbf9e8..2874a986b0 100644
--- a/src/StepGeom/StepGeom_SuParameters.hxx
+++ b/src/StepGeom/StepGeom_SuParameters.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_SuParameters_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_SurfaceCurve.cxx b/src/StepGeom/StepGeom_SurfaceCurve.cxx
index 171e5eef02..b69c314a2f 100644
--- a/src/StepGeom/StepGeom_SurfaceCurve.cxx
+++ b/src/StepGeom/StepGeom_SurfaceCurve.cxx
@@ -12,9 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Curve.hxx>
-#include <StepGeom_PcurveOrSurface.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_SurfaceCurve.hxx b/src/StepGeom/StepGeom_SurfaceCurve.hxx
index cd72cc246c..4293c690ec 100644
--- a/src/StepGeom/StepGeom_SurfaceCurve.hxx
+++ b/src/StepGeom/StepGeom_SurfaceCurve.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_SurfaceCurve_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_HArray1OfPcurveOrSurface.hxx>
 #include <StepGeom_PreferredSurfaceCurveRepresentation.hxx>
diff --git a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
index 2b3d4ea74c..c72dd99834 100644
--- a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
+++ b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
@@ -15,7 +15,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_BoundedCurve.hxx>
 #include <StepGeom_SurfaceCurveAndBoundedCurve.hxx>
 
diff --git a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
index b3bc4e2acf..4cb930d9d0 100644
--- a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
+++ b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_SurfaceOfLinearExtrusion.hxx>
 #include <StepGeom_Vector.hxx>
diff --git a/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx b/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
index ca4db27e61..e631a5bf4c 100644
--- a/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
+++ b/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_SurfaceOfRevolution.hxx>
diff --git a/src/StepGeom/StepGeom_SurfacePatch.hxx b/src/StepGeom/StepGeom_SurfacePatch.hxx
index 976836432f..2f3d98cdcf 100644
--- a/src/StepGeom/StepGeom_SurfacePatch.hxx
+++ b/src/StepGeom/StepGeom_SurfacePatch.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepGeom_TransitionCode.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class StepGeom_BoundedSurface;
 
diff --git a/src/StepGeom/StepGeom_SurfaceReplica.cxx b/src/StepGeom/StepGeom_SurfaceReplica.cxx
index d8d948d4a3..62563c7fd8 100644
--- a/src/StepGeom/StepGeom_SurfaceReplica.cxx
+++ b/src/StepGeom/StepGeom_SurfaceReplica.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
-#include <StepGeom_Surface.hxx>
 #include <StepGeom_SurfaceReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepGeom/StepGeom_SweptSurface.cxx b/src/StepGeom/StepGeom_SweptSurface.cxx
index 17a321e367..c038b93c17 100644
--- a/src/StepGeom/StepGeom_SweptSurface.cxx
+++ b/src/StepGeom/StepGeom_SweptSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_SweptSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_ToroidalSurface.cxx b/src/StepGeom/StepGeom_ToroidalSurface.cxx
index 7afef25c38..bf9e61f9cf 100644
--- a/src/StepGeom/StepGeom_ToroidalSurface.cxx
+++ b/src/StepGeom/StepGeom_ToroidalSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_ToroidalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_ToroidalSurface.hxx b/src/StepGeom/StepGeom_ToroidalSurface.hxx
index 8eae28d269..f2ade9a217 100644
--- a/src/StepGeom/StepGeom_ToroidalSurface.hxx
+++ b/src/StepGeom/StepGeom_ToroidalSurface.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_ElementarySurface.hxx>
 class TCollection_HAsciiString;
 class StepGeom_Axis2Placement3d;
diff --git a/src/StepGeom/StepGeom_TrimmedCurve.cxx b/src/StepGeom/StepGeom_TrimmedCurve.cxx
index 0513bee4d0..51100c32eb 100644
--- a/src/StepGeom/StepGeom_TrimmedCurve.cxx
+++ b/src/StepGeom/StepGeom_TrimmedCurve.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Curve.hxx>
 #include <StepGeom_TrimmedCurve.hxx>
 #include <StepGeom_TrimmingSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_TrimmedCurve.hxx b/src/StepGeom/StepGeom_TrimmedCurve.hxx
index 15557c5c51..45a186c18b 100644
--- a/src/StepGeom/StepGeom_TrimmedCurve.hxx
+++ b/src/StepGeom/StepGeom_TrimmedCurve.hxx
@@ -18,7 +18,6 @@
 #define _StepGeom_TrimmedCurve_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_HArray1OfTrimmingSelect.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/StepGeom/StepGeom_TrimmingMember.hxx b/src/StepGeom/StepGeom_TrimmingMember.hxx
index 7759986f5d..de7a724baf 100644
--- a/src/StepGeom/StepGeom_TrimmingMember.hxx
+++ b/src/StepGeom/StepGeom_TrimmingMember.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepData_SelectReal.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 
 
 class StepGeom_TrimmingMember;
diff --git a/src/StepGeom/StepGeom_TrimmingSelect.hxx b/src/StepGeom/StepGeom_TrimmingSelect.hxx
index ed2724c2ca..a1f40896a8 100644
--- a/src/StepGeom/StepGeom_TrimmingSelect.hxx
+++ b/src/StepGeom/StepGeom_TrimmingSelect.hxx
@@ -23,7 +23,6 @@
 
 #include <StepData_SelectType.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_Real.hxx>
 class Standard_Transient;
 class StepData_SelectMember;
 class StepGeom_CartesianPoint;
diff --git a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
index 78b1ea5273..c593efa6fd 100644
--- a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineCurveForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray1OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_UniformCurve;
 class StepGeom_RationalBSplineCurve;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
index 75f053947d..abe2fe2d4e 100644
--- a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
@@ -26,7 +26,6 @@
 #include <StepGeom_BSplineSurfaceForm.hxx>
 #include <StepData_Logical.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_UniformSurface;
 class StepGeom_RationalBSplineSurface;
 class TCollection_HAsciiString;
diff --git a/src/StepGeom/StepGeom_Vector.cxx b/src/StepGeom/StepGeom_Vector.cxx
index 00568f2e95..ccdffa8295 100644
--- a/src/StepGeom/StepGeom_Vector.cxx
+++ b/src/StepGeom/StepGeom_Vector.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepGeom_Vector.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepGeom/StepGeom_Vector.hxx b/src/StepGeom/StepGeom_Vector.hxx
index 1da526cbb8..d407840e75 100644
--- a/src/StepGeom/StepGeom_Vector.hxx
+++ b/src/StepGeom/StepGeom_Vector.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Direction;
 class TCollection_HAsciiString;
diff --git a/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.cxx b/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.cxx
index 9b97de8684..2763e2e728 100644
--- a/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.cxx
+++ b/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.cxx
@@ -15,7 +15,6 @@
 
 #include <StepKinematics_ActuatedKinPairAndOrderKinPair.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 #include <StepKinematics_ActuatedKinematicPair.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.hxx b/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.hxx
index e9e8b3ec5b..24be5b9199 100644
--- a/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.hxx
+++ b/src/StepKinematics/StepKinematics_ActuatedKinPairAndOrderKinPair.hxx
@@ -17,9 +17,7 @@
 #define _StepKinematics_ActuatedKinPairAndOrderKinPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
-#include <TCollection_HAsciiString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 class StepRepr_RepresentationItem;
diff --git a/src/StepKinematics/StepKinematics_ActuatedKinematicPair.hxx b/src/StepKinematics/StepKinematics_ActuatedKinematicPair.hxx
index d7360a68b5..b3444dbcc5 100644
--- a/src/StepKinematics/StepKinematics_ActuatedKinematicPair.hxx
+++ b/src/StepKinematics/StepKinematics_ActuatedKinematicPair.hxx
@@ -18,15 +18,12 @@
 #define _StepKinematics_ActuatedKinematicPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepKinematics_ActuatedDirection.hxx>
-#include <StepKinematics_ActuatedDirection.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_ActuatedKinematicPair, StepKinematics_KinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_ContextDependentKinematicLinkRepresentation.hxx b/src/StepKinematics/StepKinematics_ContextDependentKinematicLinkRepresentation.hxx
index fe94b4cb4b..90b2eddf4e 100644
--- a/src/StepKinematics/StepKinematics_ContextDependentKinematicLinkRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_ContextDependentKinematicLinkRepresentation.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_ContextDependentKinematicLinkRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 
 #include <StepKinematics_KinematicLinkRepresentationAssociation.hxx>
diff --git a/src/StepKinematics/StepKinematics_CylindricalPair.hxx b/src/StepKinematics/StepKinematics_CylindricalPair.hxx
index 4c2740855b..f86d205da4 100644
--- a/src/StepKinematics/StepKinematics_CylindricalPair.hxx
+++ b/src/StepKinematics/StepKinematics_CylindricalPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_CylindricalPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_CylindricalPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_CylindricalPairValue.hxx b/src/StepKinematics/StepKinematics_CylindricalPairValue.hxx
index 2222a8750f..9c1f07c8e2 100644
--- a/src/StepKinematics/StepKinematics_CylindricalPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_CylindricalPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_CylindricalPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_CylindricalPairWithRange.hxx b/src/StepKinematics/StepKinematics_CylindricalPairWithRange.hxx
index 74393e425b..b1d9369fe2 100644
--- a/src/StepKinematics/StepKinematics_CylindricalPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_CylindricalPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_CylindricalPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_CylindricalPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_CylindricalPairWithRange, StepKinematics_CylindricalPair)
diff --git a/src/StepKinematics/StepKinematics_FullyConstrainedPair.hxx b/src/StepKinematics/StepKinematics_FullyConstrainedPair.hxx
index 573f7cce74..b9a5581613 100644
--- a/src/StepKinematics/StepKinematics_FullyConstrainedPair.hxx
+++ b/src/StepKinematics/StepKinematics_FullyConstrainedPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_FullyConstrainedPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_FullyConstrainedPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_GearPair.hxx b/src/StepKinematics/StepKinematics_GearPair.hxx
index 493a7d3766..ed70c15545 100644
--- a/src/StepKinematics/StepKinematics_GearPair.hxx
+++ b/src/StepKinematics/StepKinematics_GearPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_GearPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_GearPair, StepKinematics_LowOrderKinematicPairWithMotionCoupling)
diff --git a/src/StepKinematics/StepKinematics_GearPairValue.hxx b/src/StepKinematics/StepKinematics_GearPairValue.hxx
index 8c8a2eb2ec..0e8b800d80 100644
--- a/src/StepKinematics/StepKinematics_GearPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_GearPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_GearPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_GearPairWithRange.hxx b/src/StepKinematics/StepKinematics_GearPairWithRange.hxx
index 8f011aa9ab..c90048fd8c 100644
--- a/src/StepKinematics/StepKinematics_GearPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_GearPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_GearPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_GearPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_GearPairWithRange, StepKinematics_GearPair)
diff --git a/src/StepKinematics/StepKinematics_HighOrderKinematicPair.hxx b/src/StepKinematics/StepKinematics_HighOrderKinematicPair.hxx
index 40930a83fe..36c7cce008 100644
--- a/src/StepKinematics/StepKinematics_HighOrderKinematicPair.hxx
+++ b/src/StepKinematics/StepKinematics_HighOrderKinematicPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_HighOrderKinematicPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_HighOrderKinematicPair, StepKinematics_KinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_HomokineticPair.hxx b/src/StepKinematics/StepKinematics_HomokineticPair.hxx
index fa60e49701..576872c912 100644
--- a/src/StepKinematics/StepKinematics_HomokineticPair.hxx
+++ b/src/StepKinematics/StepKinematics_HomokineticPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_HomokineticPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_UniversalPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_HomokineticPair, StepKinematics_UniversalPair)
 
diff --git a/src/StepKinematics/StepKinematics_KinematicJoint.hxx b/src/StepKinematics/StepKinematics_KinematicJoint.hxx
index be7a2622c6..f91fa3a8de 100644
--- a/src/StepKinematics/StepKinematics_KinematicJoint.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicJoint.hxx
@@ -18,11 +18,9 @@
 #define _StepKinematics_KinematicJoint_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepShape_Edge.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepShape_Vertex.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_KinematicJoint, StepShape_Edge)
 
diff --git a/src/StepKinematics/StepKinematics_KinematicLink.hxx b/src/StepKinematics/StepKinematics_KinematicLink.hxx
index 14ed0dafcf..3e798f520c 100644
--- a/src/StepKinematics/StepKinematics_KinematicLink.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicLink.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_KinematicLink_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepShape_Vertex.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicLinkRepresentation.hxx b/src/StepKinematics/StepKinematics_KinematicLinkRepresentation.hxx
index e042105f1c..44d4cf35e8 100644
--- a/src/StepKinematics/StepKinematics_KinematicLinkRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicLinkRepresentation.hxx
@@ -18,10 +18,8 @@
 #define _StepKinematics_KinematicLinkRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 
-#include <TCollection_HAsciiString.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepKinematics_KinematicLink.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicLinkRepresentationAssociation.hxx b/src/StepKinematics/StepKinematics_KinematicLinkRepresentationAssociation.hxx
index e20ccad9d2..9e006c2261 100644
--- a/src/StepKinematics/StepKinematics_KinematicLinkRepresentationAssociation.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicLinkRepresentationAssociation.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_KinematicLinkRepresentationAssociation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_RepresentationRelationship.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicPair.hxx b/src/StepKinematics/StepKinematics_KinematicPair.hxx
index 8e34b1652a..0087ab2ab5 100644
--- a/src/StepKinematics/StepKinematics_KinematicPair.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicPair.hxx
@@ -18,10 +18,8 @@
 #define _StepKinematics_KinematicPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 
-#include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicPropertyDefinitionRepresentation.hxx b/src/StepKinematics/StepKinematics_KinematicPropertyDefinitionRepresentation.hxx
index d2924497b0..dbfc62586f 100644
--- a/src/StepKinematics/StepKinematics_KinematicPropertyDefinitionRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicPropertyDefinitionRepresentation.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_KinematicPropertyDefinitionRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_PropertyDefinitionRepresentation.hxx>
 
 #include <StepRepr_RepresentedDefinition.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicPropertyMechanismRepresentation.hxx b/src/StepKinematics/StepKinematics_KinematicPropertyMechanismRepresentation.hxx
index 9eb6cc66b9..3aee8a9171 100644
--- a/src/StepKinematics/StepKinematics_KinematicPropertyMechanismRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicPropertyMechanismRepresentation.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_KinematicPropertyMechanismRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicPropertyDefinitionRepresentation.hxx>
 
 #include <StepRepr_RepresentedDefinition.hxx>
diff --git a/src/StepKinematics/StepKinematics_KinematicTopologyDirectedStructure.hxx b/src/StepKinematics/StepKinematics_KinematicTopologyDirectedStructure.hxx
index 1ff25be00a..b5b05b7021 100644
--- a/src/StepKinematics/StepKinematics_KinematicTopologyDirectedStructure.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicTopologyDirectedStructure.hxx
@@ -18,11 +18,7 @@
 #define _StepKinematics_KinematicTopologyDirectedStructure_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
-#include <StepRepr_Representation.hxx>
 
-#include <TCollection_HAsciiString.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepKinematics_KinematicTopologyStructure.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_KinematicTopologyNetworkStructure.hxx b/src/StepKinematics/StepKinematics_KinematicTopologyNetworkStructure.hxx
index 4a2801685a..09cbf0ff71 100644
--- a/src/StepKinematics/StepKinematics_KinematicTopologyNetworkStructure.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicTopologyNetworkStructure.hxx
@@ -18,11 +18,7 @@
 #define _StepKinematics_KinematicTopologyNetworkStructure_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
-#include <StepRepr_Representation.hxx>
 
-#include <TCollection_HAsciiString.hxx>
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepKinematics_KinematicTopologyStructure.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_KinematicTopologyStructure.hxx b/src/StepKinematics/StepKinematics_KinematicTopologyStructure.hxx
index 8359003836..8af98c8b89 100644
--- a/src/StepKinematics/StepKinematics_KinematicTopologyStructure.hxx
+++ b/src/StepKinematics/StepKinematics_KinematicTopologyStructure.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_KinematicTopologyStructure_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
-#include <StepRepr_RepresentationContext.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_KinematicTopologyStructure, StepRepr_Representation)
 
diff --git a/src/StepKinematics/StepKinematics_LinearFlexibleAndPinionPair.hxx b/src/StepKinematics/StepKinematics_LinearFlexibleAndPinionPair.hxx
index 966e2859de..71d12f2a1f 100644
--- a/src/StepKinematics/StepKinematics_LinearFlexibleAndPinionPair.hxx
+++ b/src/StepKinematics/StepKinematics_LinearFlexibleAndPinionPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_LinearFlexibleAndPinionPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_LinearFlexibleAndPinionPair, StepKinematics_LowOrderKinematicPairWithMotionCoupling)
diff --git a/src/StepKinematics/StepKinematics_LinearFlexibleAndPlanarCurvePair.hxx b/src/StepKinematics/StepKinematics_LinearFlexibleAndPlanarCurvePair.hxx
index 22c4b3c346..10c0b7efdb 100644
--- a/src/StepKinematics/StepKinematics_LinearFlexibleAndPlanarCurvePair.hxx
+++ b/src/StepKinematics/StepKinematics_LinearFlexibleAndPlanarCurvePair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_LinearFlexibleAndPlanarCurvePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_HighOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_LinearFlexibleLinkRepresentation.hxx b/src/StepKinematics/StepKinematics_LinearFlexibleLinkRepresentation.hxx
index de0a6c207b..d17528077f 100644
--- a/src/StepKinematics/StepKinematics_LinearFlexibleLinkRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_LinearFlexibleLinkRepresentation.hxx
@@ -18,13 +18,10 @@
 #define _StepKinematics_LinearFlexibleLinkRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicLinkRepresentation.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
-#include <StepRepr_RepresentationContext.hxx>
-#include <StepKinematics_KinematicLink.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_LinearFlexibleLinkRepresentation, StepKinematics_KinematicLinkRepresentation)
 
diff --git a/src/StepKinematics/StepKinematics_LowOrderKinematicPair.hxx b/src/StepKinematics/StepKinematics_LowOrderKinematicPair.hxx
index 55ca99c5aa..f395c16453 100644
--- a/src/StepKinematics/StepKinematics_LowOrderKinematicPair.hxx
+++ b/src/StepKinematics/StepKinematics_LowOrderKinematicPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_LowOrderKinematicPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_LowOrderKinematicPair, StepKinematics_KinematicPair)
diff --git a/src/StepKinematics/StepKinematics_LowOrderKinematicPairValue.hxx b/src/StepKinematics/StepKinematics_LowOrderKinematicPairValue.hxx
index 0591a3a1d6..b5f9c51041 100644
--- a/src/StepKinematics/StepKinematics_LowOrderKinematicPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_LowOrderKinematicPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_LowOrderKinematicPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx b/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx
index d85ecc64fc..f653482781 100644
--- a/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx
+++ b/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_LowOrderKinematicPairWithMotionCoupling_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_LowOrderKinematicPairWithMotionCoupling, StepKinematics_KinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithRange.hxx b/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithRange.hxx
index f715290773..ca4bc55da6 100644
--- a/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_LowOrderKinematicPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_LowOrderKinematicPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_LowOrderKinematicPairWithRange, StepKinematics_LowOrderKinematicPair)
diff --git a/src/StepKinematics/StepKinematics_MechanismRepresentation.hxx b/src/StepKinematics/StepKinematics_MechanismRepresentation.hxx
index cfaa5823da..c57a81d801 100644
--- a/src/StepKinematics/StepKinematics_MechanismRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_MechanismRepresentation.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_MechanismRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_MechanismStateRepresentation.cxx b/src/StepKinematics/StepKinematics_MechanismStateRepresentation.cxx
index f34be4621a..7dca9ea9f7 100644
--- a/src/StepKinematics/StepKinematics_MechanismStateRepresentation.cxx
+++ b/src/StepKinematics/StepKinematics_MechanismStateRepresentation.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepKinematics_MechanismStateRepresentation.hxx>
 #include <StepKinematics_MechanismRepresentation.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_OrientedJoint.hxx b/src/StepKinematics/StepKinematics_OrientedJoint.hxx
index 17ef0fe1c5..a976eaef21 100644
--- a/src/StepKinematics/StepKinematics_OrientedJoint.hxx
+++ b/src/StepKinematics/StepKinematics_OrientedJoint.hxx
@@ -18,12 +18,9 @@
 #define _StepKinematics_OrientedJoint_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepShape_OrientedEdge.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepShape_Vertex.hxx>
-#include <StepShape_Edge.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_OrientedJoint, StepShape_OrientedEdge)
 
diff --git a/src/StepKinematics/StepKinematics_PairRepresentationRelationship.hxx b/src/StepKinematics/StepKinematics_PairRepresentationRelationship.hxx
index 289f133a41..b8b9b587e0 100644
--- a/src/StepKinematics/StepKinematics_PairRepresentationRelationship.hxx
+++ b/src/StepKinematics/StepKinematics_PairRepresentationRelationship.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PairRepresentationRelationship_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationOrRepresentationReference.hxx>
-#include <StepRepr_Transformation.hxx>
 #include <StepRepr_RepresentationRelationshipWithTransformation.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PairRepresentationRelationship, StepGeom_GeometricRepresentationItem)
diff --git a/src/StepKinematics/StepKinematics_PairValue.hxx b/src/StepKinematics/StepKinematics_PairValue.hxx
index ec6e68391f..8fc823762e 100644
--- a/src/StepKinematics/StepKinematics_PairValue.hxx
+++ b/src/StepKinematics/StepKinematics_PairValue.hxx
@@ -18,10 +18,7 @@
 #define _StepKinematics_PairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
-#include <StepGeom_GeometricRepresentationItem.hxx>
 
-#include <TCollection_HAsciiString.hxx>
 #include <StepKinematics_KinematicPair.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PairValue, StepGeom_GeometricRepresentationItem)
diff --git a/src/StepKinematics/StepKinematics_PlanarCurvePair.hxx b/src/StepKinematics/StepKinematics_PlanarCurvePair.hxx
index cf379d3faf..5ee0512fd5 100644
--- a/src/StepKinematics/StepKinematics_PlanarCurvePair.hxx
+++ b/src/StepKinematics/StepKinematics_PlanarCurvePair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PlanarCurvePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_HighOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_PlanarCurvePairRange.hxx b/src/StepKinematics/StepKinematics_PlanarCurvePairRange.hxx
index fd7b526634..553c69507d 100644
--- a/src/StepKinematics/StepKinematics_PlanarCurvePairRange.hxx
+++ b/src/StepKinematics/StepKinematics_PlanarCurvePairRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PlanarCurvePairRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PlanarCurvePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_TrimmedCurve.hxx>
diff --git a/src/StepKinematics/StepKinematics_PlanarPair.hxx b/src/StepKinematics/StepKinematics_PlanarPair.hxx
index f419fca67e..1f800ead85 100644
--- a/src/StepKinematics/StepKinematics_PlanarPair.hxx
+++ b/src/StepKinematics/StepKinematics_PlanarPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_PlanarPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PlanarPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_PlanarPairValue.hxx b/src/StepKinematics/StepKinematics_PlanarPairValue.hxx
index 87c682a769..a6a2560d0a 100644
--- a/src/StepKinematics/StepKinematics_PlanarPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_PlanarPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_PlanarPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_PlanarPairWithRange.hxx b/src/StepKinematics/StepKinematics_PlanarPairWithRange.hxx
index c7e9e9e0c7..3ccff45350 100644
--- a/src/StepKinematics/StepKinematics_PlanarPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_PlanarPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PlanarPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PlanarPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PlanarPairWithRange, StepKinematics_PlanarPair)
diff --git a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePair.hxx b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePair.hxx
index c01368abf2..8fee9cdf32 100644
--- a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePair.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PointOnPlanarCurvePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_HighOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairValue.hxx b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairValue.hxx
index 264620b623..ad1d772f8c 100644
--- a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_PointOnPlanarCurvePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairWithRange.hxx b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairWithRange.hxx
index 0289cfe040..c49ef2fe3c 100644
--- a/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnPlanarCurvePairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PointOnPlanarCurvePairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PointOnPlanarCurvePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_TrimmedCurve.hxx>
diff --git a/src/StepKinematics/StepKinematics_PointOnSurfacePair.hxx b/src/StepKinematics/StepKinematics_PointOnSurfacePair.hxx
index b54396e3c8..181a332483 100644
--- a/src/StepKinematics/StepKinematics_PointOnSurfacePair.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnSurfacePair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PointOnSurfacePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_HighOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Surface.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_PointOnSurfacePairValue.hxx b/src/StepKinematics/StepKinematics_PointOnSurfacePairValue.hxx
index 68a3396e1c..2d1142d828 100644
--- a/src/StepKinematics/StepKinematics_PointOnSurfacePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnSurfacePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_PointOnSurfacePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_PointOnSurfacePairWithRange.hxx b/src/StepKinematics/StepKinematics_PointOnSurfacePairWithRange.hxx
index 390f0ba9f4..bc10b25124 100644
--- a/src/StepKinematics/StepKinematics_PointOnSurfacePairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_PointOnSurfacePairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PointOnSurfacePairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PointOnSurfacePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepGeom_RectangularTrimmedSurface.hxx>
diff --git a/src/StepKinematics/StepKinematics_PrismaticPair.hxx b/src/StepKinematics/StepKinematics_PrismaticPair.hxx
index 5fd51446f3..242eb79838 100644
--- a/src/StepKinematics/StepKinematics_PrismaticPair.hxx
+++ b/src/StepKinematics/StepKinematics_PrismaticPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_PrismaticPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PrismaticPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_PrismaticPairValue.hxx b/src/StepKinematics/StepKinematics_PrismaticPairValue.hxx
index 758288a6ad..dd11337e9a 100644
--- a/src/StepKinematics/StepKinematics_PrismaticPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_PrismaticPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_PrismaticPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_PrismaticPairWithRange.hxx b/src/StepKinematics/StepKinematics_PrismaticPairWithRange.hxx
index 11bb017f28..009df4743e 100644
--- a/src/StepKinematics/StepKinematics_PrismaticPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_PrismaticPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_PrismaticPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PrismaticPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_PrismaticPairWithRange, StepKinematics_PrismaticPair)
diff --git a/src/StepKinematics/StepKinematics_ProductDefinitionKinematics.hxx b/src/StepKinematics/StepKinematics_ProductDefinitionKinematics.hxx
index ed1078166f..a1bad39daa 100644
--- a/src/StepKinematics/StepKinematics_ProductDefinitionKinematics.hxx
+++ b/src/StepKinematics/StepKinematics_ProductDefinitionKinematics.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_ProductDefinitionKinematics_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_ProductDefinitionRelationshipKinematics.hxx b/src/StepKinematics/StepKinematics_ProductDefinitionRelationshipKinematics.hxx
index 1c4717e54c..b2660a9207 100644
--- a/src/StepKinematics/StepKinematics_ProductDefinitionRelationshipKinematics.hxx
+++ b/src/StepKinematics/StepKinematics_ProductDefinitionRelationshipKinematics.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_ProductDefinitionRelationshipKinematics_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_RackAndPinionPair.hxx b/src/StepKinematics/StepKinematics_RackAndPinionPair.hxx
index 35e0996685..02169f79e6 100644
--- a/src/StepKinematics/StepKinematics_RackAndPinionPair.hxx
+++ b/src/StepKinematics/StepKinematics_RackAndPinionPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_RackAndPinionPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RackAndPinionPair, StepKinematics_LowOrderKinematicPairWithMotionCoupling)
diff --git a/src/StepKinematics/StepKinematics_RackAndPinionPairValue.hxx b/src/StepKinematics/StepKinematics_RackAndPinionPairValue.hxx
index 695caceb5b..cd927db9eb 100644
--- a/src/StepKinematics/StepKinematics_RackAndPinionPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_RackAndPinionPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_RackAndPinionPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_RackAndPinionPairWithRange.hxx b/src/StepKinematics/StepKinematics_RackAndPinionPairWithRange.hxx
index 356a0ff038..1ce7e12392 100644
--- a/src/StepKinematics/StepKinematics_RackAndPinionPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_RackAndPinionPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_RackAndPinionPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_RackAndPinionPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RackAndPinionPairWithRange, StepKinematics_RackAndPinionPair)
diff --git a/src/StepKinematics/StepKinematics_RevolutePair.hxx b/src/StepKinematics/StepKinematics_RevolutePair.hxx
index 58da2eecbb..e7803f0559 100644
--- a/src/StepKinematics/StepKinematics_RevolutePair.hxx
+++ b/src/StepKinematics/StepKinematics_RevolutePair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_RevolutePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RevolutePair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_RevolutePairValue.hxx b/src/StepKinematics/StepKinematics_RevolutePairValue.hxx
index eb261a1b96..17374c4628 100644
--- a/src/StepKinematics/StepKinematics_RevolutePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_RevolutePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_RevolutePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_RevolutePairWithRange.hxx b/src/StepKinematics/StepKinematics_RevolutePairWithRange.hxx
index 93a25592ab..98851137bc 100644
--- a/src/StepKinematics/StepKinematics_RevolutePairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_RevolutePairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_RevolutePairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_RevolutePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RevolutePairWithRange, StepKinematics_RevolutePair)
diff --git a/src/StepKinematics/StepKinematics_RigidLinkRepresentation.hxx b/src/StepKinematics/StepKinematics_RigidLinkRepresentation.hxx
index abae00ea4e..1ef41a58f8 100644
--- a/src/StepKinematics/StepKinematics_RigidLinkRepresentation.hxx
+++ b/src/StepKinematics/StepKinematics_RigidLinkRepresentation.hxx
@@ -18,13 +18,10 @@
 #define _StepKinematics_RigidLinkRepresentation_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_KinematicLinkRepresentation.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
-#include <StepRepr_RepresentationContext.hxx>
-#include <StepKinematics_KinematicLink.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RigidLinkRepresentation, StepKinematics_KinematicLinkRepresentation)
 
diff --git a/src/StepKinematics/StepKinematics_RollingCurvePair.hxx b/src/StepKinematics/StepKinematics_RollingCurvePair.hxx
index e839cfe602..62b6df5b92 100644
--- a/src/StepKinematics/StepKinematics_RollingCurvePair.hxx
+++ b/src/StepKinematics/StepKinematics_RollingCurvePair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_RollingCurvePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PlanarCurvePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RollingCurvePair, StepKinematics_PlanarCurvePair)
diff --git a/src/StepKinematics/StepKinematics_RollingCurvePairValue.hxx b/src/StepKinematics/StepKinematics_RollingCurvePairValue.hxx
index c00671da3b..e8538a9046 100644
--- a/src/StepKinematics/StepKinematics_RollingCurvePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_RollingCurvePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_RollingCurvePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_RollingSurfacePair.hxx b/src/StepKinematics/StepKinematics_RollingSurfacePair.hxx
index 6a389c7ff1..ef227d854c 100644
--- a/src/StepKinematics/StepKinematics_RollingSurfacePair.hxx
+++ b/src/StepKinematics/StepKinematics_RollingSurfacePair.hxx
@@ -18,14 +18,9 @@
 #define _StepKinematics_RollingSurfacePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_SurfacePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
-#include <StepGeom_Surface.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_RollingSurfacePair, StepKinematics_SurfacePair)
 
diff --git a/src/StepKinematics/StepKinematics_RollingSurfacePairValue.hxx b/src/StepKinematics/StepKinematics_RollingSurfacePairValue.hxx
index ab7ef66bc4..eb0b59ef91 100644
--- a/src/StepKinematics/StepKinematics_RollingSurfacePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_RollingSurfacePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_RollingSurfacePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_RotationAboutDirection.hxx b/src/StepKinematics/StepKinematics_RotationAboutDirection.hxx
index 54e82408fd..409ff71268 100644
--- a/src/StepKinematics/StepKinematics_RotationAboutDirection.hxx
+++ b/src/StepKinematics/StepKinematics_RotationAboutDirection.hxx
@@ -18,8 +18,6 @@
 #define _StepKinematics_RotationAboutDirection_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
-#include <StepGeom_GeometricRepresentationItem.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepGeom_Direction.hxx>
diff --git a/src/StepKinematics/StepKinematics_ScrewPair.hxx b/src/StepKinematics/StepKinematics_ScrewPair.hxx
index ddc6be1e9c..618c553ee7 100644
--- a/src/StepKinematics/StepKinematics_ScrewPair.hxx
+++ b/src/StepKinematics/StepKinematics_ScrewPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_ScrewPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPairWithMotionCoupling.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_ScrewPair, StepKinematics_LowOrderKinematicPairWithMotionCoupling)
diff --git a/src/StepKinematics/StepKinematics_ScrewPairValue.hxx b/src/StepKinematics/StepKinematics_ScrewPairValue.hxx
index eb90500321..7ca723db15 100644
--- a/src/StepKinematics/StepKinematics_ScrewPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_ScrewPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_ScrewPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_ScrewPairWithRange.hxx b/src/StepKinematics/StepKinematics_ScrewPairWithRange.hxx
index da227fa427..0dafd7c0f2 100644
--- a/src/StepKinematics/StepKinematics_ScrewPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_ScrewPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_ScrewPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_ScrewPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_ScrewPairWithRange, StepKinematics_ScrewPair)
diff --git a/src/StepKinematics/StepKinematics_SlidingCurvePair.hxx b/src/StepKinematics/StepKinematics_SlidingCurvePair.hxx
index 93d6112e01..19d8336f47 100644
--- a/src/StepKinematics/StepKinematics_SlidingCurvePair.hxx
+++ b/src/StepKinematics/StepKinematics_SlidingCurvePair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_SlidingCurvePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PlanarCurvePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Curve.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SlidingCurvePair, StepKinematics_PlanarCurvePair)
diff --git a/src/StepKinematics/StepKinematics_SlidingCurvePairValue.hxx b/src/StepKinematics/StepKinematics_SlidingCurvePairValue.hxx
index 1ef135609f..f598607fdc 100644
--- a/src/StepKinematics/StepKinematics_SlidingCurvePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_SlidingCurvePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_SlidingCurvePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_SlidingSurfacePair.hxx b/src/StepKinematics/StepKinematics_SlidingSurfacePair.hxx
index 4130201aa5..802c4c5776 100644
--- a/src/StepKinematics/StepKinematics_SlidingSurfacePair.hxx
+++ b/src/StepKinematics/StepKinematics_SlidingSurfacePair.hxx
@@ -18,14 +18,9 @@
 #define _StepKinematics_SlidingSurfacePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_SurfacePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
-#include <StepGeom_Surface.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SlidingSurfacePair, StepKinematics_SurfacePair)
 
diff --git a/src/StepKinematics/StepKinematics_SlidingSurfacePairValue.hxx b/src/StepKinematics/StepKinematics_SlidingSurfacePairValue.hxx
index 9c54281e33..c1cef284f2 100644
--- a/src/StepKinematics/StepKinematics_SlidingSurfacePairValue.hxx
+++ b/src/StepKinematics/StepKinematics_SlidingSurfacePairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_SlidingSurfacePairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_SphericalPair.hxx b/src/StepKinematics/StepKinematics_SphericalPair.hxx
index 37fa34d3a6..904005f022 100644
--- a/src/StepKinematics/StepKinematics_SphericalPair.hxx
+++ b/src/StepKinematics/StepKinematics_SphericalPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_SphericalPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SphericalPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_SphericalPairValue.hxx b/src/StepKinematics/StepKinematics_SphericalPairValue.hxx
index 4ebd832385..346266b3ee 100644
--- a/src/StepKinematics/StepKinematics_SphericalPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_SphericalPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_SphericalPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_SphericalPairWithPin.hxx b/src/StepKinematics/StepKinematics_SphericalPairWithPin.hxx
index f41db13212..79492c836c 100644
--- a/src/StepKinematics/StepKinematics_SphericalPairWithPin.hxx
+++ b/src/StepKinematics/StepKinematics_SphericalPairWithPin.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_SphericalPairWithPin_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SphericalPairWithPin, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_SphericalPairWithPinAndRange.hxx b/src/StepKinematics/StepKinematics_SphericalPairWithPinAndRange.hxx
index c10e089291..c8e9aa89bc 100644
--- a/src/StepKinematics/StepKinematics_SphericalPairWithPinAndRange.hxx
+++ b/src/StepKinematics/StepKinematics_SphericalPairWithPinAndRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_SphericalPairWithPinAndRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_SphericalPairWithPin.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SphericalPairWithPinAndRange, StepKinematics_SphericalPairWithPin)
diff --git a/src/StepKinematics/StepKinematics_SphericalPairWithRange.hxx b/src/StepKinematics/StepKinematics_SphericalPairWithRange.hxx
index 9e771f913a..43cf7c6bd6 100644
--- a/src/StepKinematics/StepKinematics_SphericalPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_SphericalPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_SphericalPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_SphericalPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_SphericalPairWithRange, StepKinematics_SphericalPair)
diff --git a/src/StepKinematics/StepKinematics_SurfacePair.hxx b/src/StepKinematics/StepKinematics_SurfacePair.hxx
index 54b19045ef..d0164f3653 100644
--- a/src/StepKinematics/StepKinematics_SurfacePair.hxx
+++ b/src/StepKinematics/StepKinematics_SurfacePair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_SurfacePair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_HighOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Surface.hxx>
 
diff --git a/src/StepKinematics/StepKinematics_SurfacePairWithRange.hxx b/src/StepKinematics/StepKinematics_SurfacePairWithRange.hxx
index 3c75f3f903..e948ad48f4 100644
--- a/src/StepKinematics/StepKinematics_SurfacePairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_SurfacePairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_SurfacePairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_SurfacePair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepGeom_RectangularTrimmedSurface.hxx>
diff --git a/src/StepKinematics/StepKinematics_UnconstrainedPair.hxx b/src/StepKinematics/StepKinematics_UnconstrainedPair.hxx
index f3b4f81904..a7facba3e1 100644
--- a/src/StepKinematics/StepKinematics_UnconstrainedPair.hxx
+++ b/src/StepKinematics/StepKinematics_UnconstrainedPair.hxx
@@ -18,13 +18,9 @@
 #define _StepKinematics_UnconstrainedPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
-#include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_UnconstrainedPair, StepKinematics_LowOrderKinematicPair)
 
diff --git a/src/StepKinematics/StepKinematics_UnconstrainedPairValue.hxx b/src/StepKinematics/StepKinematics_UnconstrainedPairValue.hxx
index 359785270b..be9b93a481 100644
--- a/src/StepKinematics/StepKinematics_UnconstrainedPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_UnconstrainedPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_UnconstrainedPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_UniversalPair.hxx b/src/StepKinematics/StepKinematics_UniversalPair.hxx
index af35c66061..becf5ae6ec 100644
--- a/src/StepKinematics/StepKinematics_UniversalPair.hxx
+++ b/src/StepKinematics/StepKinematics_UniversalPair.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_UniversalPair_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_LowOrderKinematicPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_UniversalPair, StepKinematics_LowOrderKinematicPair)
diff --git a/src/StepKinematics/StepKinematics_UniversalPairValue.hxx b/src/StepKinematics/StepKinematics_UniversalPairValue.hxx
index e132930be7..a26ece433e 100644
--- a/src/StepKinematics/StepKinematics_UniversalPairValue.hxx
+++ b/src/StepKinematics/StepKinematics_UniversalPairValue.hxx
@@ -18,7 +18,6 @@
 #define _StepKinematics_UniversalPairValue_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_PairValue.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepKinematics/StepKinematics_UniversalPairWithRange.hxx b/src/StepKinematics/StepKinematics_UniversalPairWithRange.hxx
index 3aa2ee8c1a..7aedf8118a 100644
--- a/src/StepKinematics/StepKinematics_UniversalPairWithRange.hxx
+++ b/src/StepKinematics/StepKinematics_UniversalPairWithRange.hxx
@@ -18,12 +18,10 @@
 #define _StepKinematics_UniversalPairWithRange_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepKinematics_UniversalPair.hxx>
 
 #include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationItem.hxx>
-#include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepKinematics_KinematicJoint.hxx>
 
 DEFINE_STANDARD_HANDLE(StepKinematics_UniversalPairWithRange, StepKinematics_UniversalPair)
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx b/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
index 8a2318c511..374815fadd 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepRepr_AssemblyComponentUsage.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx b/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
index 197068efb6..af1d8a023b 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
@@ -19,7 +19,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepRepr_ProductDefinitionUsage.hxx>
 class TCollection_HAsciiString;
 class StepBasic_ProductDefinition;
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
index 6a26b21eff..a96fe319c1 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_AssemblyComponentUsage.hxx>
 #include <StepRepr_AssemblyComponentUsageSubstitute.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_CharacterizedRepresentation.cxx b/src/StepRepr/StepRepr_CharacterizedRepresentation.cxx
index 999edc4872..12450e3518 100644
--- a/src/StepRepr/StepRepr_CharacterizedRepresentation.cxx
+++ b/src/StepRepr/StepRepr_CharacterizedRepresentation.cxx
@@ -14,10 +14,8 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_CharacterizedRepresentation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
-#include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CharacterizedRepresentation, StepRepr_Representation)
diff --git a/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx b/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
index 638bbfc657..72ae66c3b2 100644
--- a/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_CompoundRepresentationItem.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_ConfigurationDesign.cxx b/src/StepRepr/StepRepr_ConfigurationDesign.cxx
index c377cc9fc4..8d43ffea04 100644
--- a/src/StepRepr/StepRepr_ConfigurationDesign.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationDesign.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ConfigurationDesign.hxx>
 #include <StepRepr_ConfigurationDesignItem.hxx>
 #include <StepRepr_ConfigurationItem.hxx>
diff --git a/src/StepRepr/StepRepr_ConfigurationDesign.hxx b/src/StepRepr/StepRepr_ConfigurationDesign.hxx
index d760b1c613..e957daccdb 100644
--- a/src/StepRepr/StepRepr_ConfigurationDesign.hxx
+++ b/src/StepRepr/StepRepr_ConfigurationDesign.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_ConfigurationDesign_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_ConfigurationDesignItem.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx b/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
index 5d8cef5b6b..c5733e5a01 100644
--- a/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <StepRepr_ConfigurationDesign.hxx>
 #include <StepRepr_ConfigurationEffectivity.hxx>
diff --git a/src/StepRepr/StepRepr_ConfigurationItem.cxx b/src/StepRepr/StepRepr_ConfigurationItem.cxx
index 0d84c938d0..22599123ac 100644
--- a/src/StepRepr/StepRepr_ConfigurationItem.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationItem.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ConfigurationItem.hxx>
 #include <StepRepr_ProductConcept.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_DataEnvironment.cxx b/src/StepRepr/StepRepr_DataEnvironment.cxx
index e4f4fa3260..c7c9ac4d89 100644
--- a/src/StepRepr/StepRepr_DataEnvironment.cxx
+++ b/src/StepRepr/StepRepr_DataEnvironment.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_DataEnvironment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_DataEnvironment.hxx b/src/StepRepr/StepRepr_DataEnvironment.hxx
index 323ae8d918..f5086c2bf5 100644
--- a/src/StepRepr/StepRepr_DataEnvironment.hxx
+++ b/src/StepRepr/StepRepr_DataEnvironment.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_DataEnvironment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
index 07723241c7..ab42098351 100644
--- a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
index efc37f4743..90c53c8aa3 100644
--- a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
+++ b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_FunctionallyDefinedTransformation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
index 6cb88d4464..e168041684 100644
--- a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
+++ b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_UncertaintyMeasureWithUnit.hxx>
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
index e489d0cf8b..222fa928d5 100644
--- a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
+++ b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_GlobalUncertaintyAssignedContext_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_HArray1OfUncertaintyMeasureWithUnit.hxx>
 #include <StepRepr_RepresentationContext.hxx>
diff --git a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
index 8f3eade118..56d5b9c0d3 100644
--- a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
+++ b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_NamedUnit.hxx>
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx b/src/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
index 3d1a8e5fbe..31d563fb44 100644
--- a/src/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
+++ b/src/StepRepr/StepRepr_HArray1OfMaterialPropertyRepresentation.hxx
@@ -17,7 +17,6 @@
 #ifndef StepRepr_HArray1OfMaterialPropertyRepresentation_HeaderFile
 #define StepRepr_HArray1OfMaterialPropertyRepresentation_HeaderFile
 
-#include <StepRepr_MaterialPropertyRepresentation.hxx>
 #include <StepRepr_Array1OfMaterialPropertyRepresentation.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx b/src/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
index f0e9f30f98..b2fbf69e8f 100644
--- a/src/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
+++ b/src/StepRepr/StepRepr_HArray1OfPropertyDefinitionRepresentation.hxx
@@ -17,7 +17,6 @@
 #ifndef StepRepr_HArray1OfPropertyDefinitionRepresentation_HeaderFile
 #define StepRepr_HArray1OfPropertyDefinitionRepresentation_HeaderFile
 
-#include <StepRepr_PropertyDefinitionRepresentation.hxx>
 #include <StepRepr_Array1OfPropertyDefinitionRepresentation.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx b/src/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
index edbba14de0..aea9707a50 100644
--- a/src/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_HArray1OfRepresentationItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepRepr_HArray1OfRepresentationItem_HeaderFile
 #define StepRepr_HArray1OfRepresentationItem_HeaderFile
 
-#include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_Array1OfRepresentationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepRepr/StepRepr_HArray1OfShapeAspect.hxx b/src/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
index e1c9541097..3c3ab0d604 100644
--- a/src/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_HArray1OfShapeAspect.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepRepr_HArray1OfShapeAspect_HeaderFile
 #define _StepRepr_HArray1OfShapeAspect_HeaderFile
 
-#include <StepRepr_ShapeAspect.hxx>
 #include <StepRepr_Array1OfShapeAspect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx b/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx
index 67d50f281d..c9619f5024 100644
--- a/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_IntegerRepresentationItem.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 <StepRepr_IntegerRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx b/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
index 803e00fe0d..0bf3580bb3 100644
--- a/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
+++ b/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
index 2c8b58cc7a..1a7512ef35 100644
--- a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
+++ b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepRepr_MakeFromUsageOption.hxx>
diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
index 04be16c7e7..fae73e1b2f 100644
--- a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
+++ b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
@@ -21,7 +21,6 @@
 
 #include <Standard_Integer.hxx>
 #include <StepRepr_ProductDefinitionUsage.hxx>
-#include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
 class StepBasic_MeasureWithUnit;
 class StepBasic_ProductDefinition;
diff --git a/src/StepRepr/StepRepr_MappedItem.cxx b/src/StepRepr/StepRepr_MappedItem.cxx
index daa7ada307..84e9905a7c 100644
--- a/src/StepRepr/StepRepr_MappedItem.cxx
+++ b/src/StepRepr/StepRepr_MappedItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_MappedItem.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_RepresentationMap.hxx>
diff --git a/src/StepRepr/StepRepr_MaterialDesignation.cxx b/src/StepRepr/StepRepr_MaterialDesignation.cxx
index 1d0922a931..f56d210965 100644
--- a/src/StepRepr/StepRepr_MaterialDesignation.cxx
+++ b/src/StepRepr/StepRepr_MaterialDesignation.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
 #include <StepRepr_MaterialDesignation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_MaterialDesignation.hxx b/src/StepRepr/StepRepr_MaterialDesignation.hxx
index f9d3122006..a00dd80a81 100644
--- a/src/StepRepr/StepRepr_MaterialDesignation.hxx
+++ b/src/StepRepr/StepRepr_MaterialDesignation.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_MaterialDesignation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_CharacterizedDefinition.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepRepr/StepRepr_MaterialProperty.cxx b/src/StepRepr/StepRepr_MaterialProperty.cxx
index 397d452647..31d2e68c6d 100644
--- a/src/StepRepr/StepRepr_MaterialProperty.cxx
+++ b/src/StepRepr/StepRepr_MaterialProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_MaterialProperty.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MaterialProperty,StepRepr_PropertyDefinition)
diff --git a/src/StepRepr/StepRepr_MaterialProperty.hxx b/src/StepRepr/StepRepr_MaterialProperty.hxx
index 5724f8cc9b..2c02fa3be1 100644
--- a/src/StepRepr/StepRepr_MaterialProperty.hxx
+++ b/src/StepRepr/StepRepr_MaterialProperty.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_MaterialProperty_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_PropertyDefinition.hxx>
 
diff --git a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
index 50f023d170..402ad3df14 100644
--- a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
+++ b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_DataEnvironment.hxx>
 #include <StepRepr_MaterialPropertyRepresentation.hxx>
 #include <StepRepr_Representation.hxx>
diff --git a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
index 67ea2766d7..1128bc499c 100644
--- a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_NextAssemblyUsageOccurrence,StepRepr_AssemblyComponentUsage)
diff --git a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
index 3f9c29013b..812ce0ac6f 100644
--- a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_NextAssemblyUsageOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_AssemblyComponentUsage.hxx>
 
diff --git a/src/StepRepr/StepRepr_ProductConcept.cxx b/src/StepRepr/StepRepr_ProductConcept.cxx
index 661ba16453..0848fb0e47 100644
--- a/src/StepRepr/StepRepr_ProductConcept.cxx
+++ b/src/StepRepr/StepRepr_ProductConcept.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductConceptContext.hxx>
 #include <StepRepr_ProductConcept.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_ProductConcept.hxx b/src/StepRepr/StepRepr_ProductConcept.hxx
index cc21eee16e..7901c899da 100644
--- a/src/StepRepr/StepRepr_ProductConcept.hxx
+++ b/src/StepRepr/StepRepr_ProductConcept.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_ProductConceptContext;
diff --git a/src/StepRepr/StepRepr_ProductDefinitionShape.cxx b/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
index d34f919d49..ab80771caa 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ProductDefinitionShape,StepRepr_PropertyDefinition)
diff --git a/src/StepRepr/StepRepr_ProductDefinitionShape.hxx b/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
index 7bb4b0dc9b..f139a09c3e 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_ProductDefinitionShape_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_PropertyDefinition.hxx>
 
diff --git a/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx b/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
index d262a8c10f..511b25c2ad 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionUsage.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ProductDefinitionUsage,StepBasic_ProductDefinitionRelationship)
diff --git a/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx b/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
index 832ebd4e6d..8698e25462 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_ProductDefinitionUsage_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 
diff --git a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
index f5ac809c6f..fce459d885 100644
--- a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_PromissoryUsageOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PromissoryUsageOccurrence,StepRepr_AssemblyComponentUsage)
diff --git a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
index 739871be3c..c750ce803b 100644
--- a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_PromissoryUsageOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_AssemblyComponentUsage.hxx>
 
diff --git a/src/StepRepr/StepRepr_PropertyDefinition.cxx b/src/StepRepr/StepRepr_PropertyDefinition.cxx
index c4ad0b9e50..0064af2275 100644
--- a/src/StepRepr/StepRepr_PropertyDefinition.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinition.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
-#include <StepRepr_CharacterizedDefinition.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_PropertyDefinition.hxx b/src/StepRepr/StepRepr_PropertyDefinition.hxx
index 6d8f800b40..93fcf0ffb2 100644
--- a/src/StepRepr/StepRepr_PropertyDefinition.hxx
+++ b/src/StepRepr/StepRepr_PropertyDefinition.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_PropertyDefinition_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_CharacterizedDefinition.hxx>
 #include <Standard_Boolean.hxx>
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
index 193f0ade7d..b996a4218f 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_PropertyDefinition.hxx>
 #include <StepRepr_PropertyDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
index 195582200d..ba2ca6cb38 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_PropertyDefinitionRepresentation.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentedDefinition.hxx>
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
index 8b5f91b827..f68d5ec7d8 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_PropertyDefinitionRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_RepresentedDefinition.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
index 9e760ea96b..e83d74dabe 100644
--- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
+++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_ProductDefinition.hxx>
 #include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
index 7d93d5ea8d..d3772946a3 100644
--- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
+++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepRepr_AssemblyComponentUsage.hxx>
-#include <Standard_Boolean.hxx>
 class StepBasic_MeasureWithUnit;
 class TCollection_HAsciiString;
 class StepBasic_ProductDefinition;
diff --git a/src/StepRepr/StepRepr_Representation.cxx b/src/StepRepr/StepRepr_Representation.cxx
index 170d211da6..36e3803e32 100644
--- a/src/StepRepr/StepRepr_Representation.cxx
+++ b/src/StepRepr/StepRepr_Representation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/StepRepr/StepRepr_RepresentationContext.cxx b/src/StepRepr/StepRepr_RepresentationContext.cxx
index 49a10a3c49..6cf12eae91 100644
--- a/src/StepRepr/StepRepr_RepresentationContext.cxx
+++ b/src/StepRepr/StepRepr_RepresentationContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_RepresentationContextReference.hxx b/src/StepRepr/StepRepr_RepresentationContextReference.hxx
index 757246542a..ed8e115f69 100644
--- a/src/StepRepr/StepRepr_RepresentationContextReference.hxx
+++ b/src/StepRepr/StepRepr_RepresentationContextReference.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_RepresentationContextReference_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_RepresentationItem.cxx b/src/StepRepr/StepRepr_RepresentationItem.cxx
index f9820d1961..515056ae4c 100644
--- a/src/StepRepr/StepRepr_RepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_RepresentationItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepRepr/StepRepr_RepresentationReference.hxx b/src/StepRepr/StepRepr_RepresentationReference.hxx
index 24088a235e..f3afa2b00f 100644
--- a/src/StepRepr/StepRepr_RepresentationReference.hxx
+++ b/src/StepRepr/StepRepr_RepresentationReference.hxx
@@ -18,10 +18,8 @@
 #define _StepRepr_RepresentationReference_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <Standard_Transient.hxx>
 
-#include <TCollection_HAsciiString.hxx>
 #include <StepRepr_RepresentationContextReference.hxx>
 
 DEFINE_STANDARD_HANDLE(StepRepr_RepresentationReference, Standard_Transient)
diff --git a/src/StepRepr/StepRepr_RepresentationRelationship.cxx b/src/StepRepr/StepRepr_RepresentationRelationship.cxx
index 18530062d2..06072e4846 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationship.cxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationship.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
index 3561603103..4562745a1f 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationRelationshipWithTransformation.hxx>
 #include <StepRepr_Transformation.hxx>
diff --git a/src/StepRepr/StepRepr_ShapeAspect.cxx b/src/StepRepr/StepRepr_ShapeAspect.cxx
index 275d7883d2..75971cdb55 100644
--- a/src/StepRepr/StepRepr_ShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspect.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx b/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
index 2c0942fa58..0d5ce23c34 100644
--- a/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepRepr_ShapeAspectRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx b/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
index ccd508e010..42208c1468 100644
--- a/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
+++ b/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
@@ -19,7 +19,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class TCollection_HAsciiString;
 class StepRepr_ShapeAspect;
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
index 36887e00aa..22a05117b6 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeRepresentationRelationshipWithTransformation,StepRepr_RepresentationRelationshipWithTransformation)
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
index 9659f9fd12..cc415d0d60 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_ShapeRepresentationRelationshipWithTransformation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_RepresentationRelationshipWithTransformation.hxx>
 
diff --git a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
index 26e0d181c4..060533acca 100644
--- a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
@@ -15,9 +15,7 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepBasic_ProductDefinition.hxx>
-#include <StepRepr_AssemblyComponentUsage.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 #include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
index 3bc3754502..1066f70a90 100644
--- a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepRepr_AssemblyComponentUsage.hxx>
-#include <Standard_Boolean.hxx>
 class StepRepr_NextAssemblyUsageOccurrence;
 class TCollection_HAsciiString;
 class StepBasic_ProductDefinition;
diff --git a/src/StepRepr/StepRepr_StructuralResponseProperty.cxx b/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
index 9a54da59ae..1f81be222c 100644
--- a/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
+++ b/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_StructuralResponseProperty.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_StructuralResponseProperty,StepRepr_PropertyDefinition)
diff --git a/src/StepRepr/StepRepr_StructuralResponseProperty.hxx b/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
index 60116ae09e..b06e9c93fd 100644
--- a/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
+++ b/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_StructuralResponseProperty_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_PropertyDefinition.hxx>
 
diff --git a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
index d7c12487dc..318e14a1d9 100644
--- a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
+++ b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.2
 
-#include <Standard_Type.hxx>
 #include <StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_StructuralResponsePropertyDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
diff --git a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
index cba52049b9..2417929998 100644
--- a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
+++ b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
@@ -17,7 +17,6 @@
 #define _StepRepr_StructuralResponsePropertyDefinitionRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_PropertyDefinitionRepresentation.hxx>
 
diff --git a/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx b/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
index e17892d4d4..33fc68204b 100644
--- a/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
+++ b/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_SuppliedPartRelationship.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepRepr_SuppliedPartRelationship,StepBasic_ProductDefinitionRelationship)
diff --git a/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx b/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
index 99ed863bdc..ac85d983f8 100644
--- a/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
+++ b/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
@@ -18,7 +18,6 @@
 #define _StepRepr_SuppliedPartRelationship_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 
diff --git a/src/StepRepr/StepRepr_ValueRepresentationItem.cxx b/src/StepRepr/StepRepr_ValueRepresentationItem.cxx
index 3568187b0e..6c5159fd97 100644
--- a/src/StepRepr/StepRepr_ValueRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_ValueRepresentationItem.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_MeasureValueMember.hxx>
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepSelect/StepSelect_Activator.cxx b/src/StepSelect/StepSelect_Activator.cxx
index fe4697b3ec..e4d1a3cf74 100644
--- a/src/StepSelect/StepSelect_Activator.cxx
+++ b/src/StepSelect/StepSelect_Activator.cxx
@@ -16,7 +16,6 @@
 #include <IFSelect_WorkSession.hxx>
 #include <Interface_Macros.hxx>
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_Failure.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_Plex.hxx>
 #include <StepData_Simple.hxx>
diff --git a/src/StepSelect/StepSelect_Activator.hxx b/src/StepSelect/StepSelect_Activator.hxx
index c915234988..2b21649120 100644
--- a/src/StepSelect/StepSelect_Activator.hxx
+++ b/src/StepSelect/StepSelect_Activator.hxx
@@ -23,7 +23,6 @@
 #include <IFSelect_Activator.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_CString.hxx>
 class IFSelect_SessionPilot;
 
 
diff --git a/src/StepSelect/StepSelect_FloatFormat.cxx b/src/StepSelect/StepSelect_FloatFormat.cxx
index 1971942f64..f05f4bc79e 100644
--- a/src/StepSelect/StepSelect_FloatFormat.cxx
+++ b/src/StepSelect/StepSelect_FloatFormat.cxx
@@ -13,7 +13,6 @@
 
 
 #include <IFSelect_ContextWrite.hxx>
-#include <Interface_FloatWriter.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_StepWriter.hxx>
 #include <StepSelect_FloatFormat.hxx>
diff --git a/src/StepSelect/StepSelect_FloatFormat.hxx b/src/StepSelect/StepSelect_FloatFormat.hxx
index e25a188792..58ac750576 100644
--- a/src/StepSelect/StepSelect_FloatFormat.hxx
+++ b/src/StepSelect/StepSelect_FloatFormat.hxx
@@ -20,12 +20,9 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Standard_Real.hxx>
 #include <StepSelect_FileModifier.hxx>
 #include <Standard_Integer.hxx>
-#include <Standard_CString.hxx>
 class IFSelect_ContextWrite;
 class StepData_StepWriter;
 
diff --git a/src/StepSelect/StepSelect_StepType.cxx b/src/StepSelect/StepSelect_StepType.cxx
index fd82fee091..69b5397606 100644
--- a/src/StepSelect/StepSelect_StepType.cxx
+++ b/src/StepSelect/StepSelect_StepType.cxx
@@ -15,7 +15,6 @@
 #include <Interface_InterfaceError.hxx>
 #include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_Protocol.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_Protocol.hxx>
diff --git a/src/StepSelect/StepSelect_WorkLibrary.cxx b/src/StepSelect/StepSelect_WorkLibrary.cxx
index 66e8ee006c..a154c7dee9 100644
--- a/src/StepSelect/StepSelect_WorkLibrary.cxx
+++ b/src/StepSelect/StepSelect_WorkLibrary.cxx
@@ -13,17 +13,12 @@
 
 
 #include <IFSelect_ContextWrite.hxx>
-#include <IFSelect_GeneralModifier.hxx>
 #include <Interface_Check.hxx>
 #include <Interface_CheckIterator.hxx>
 #include <Interface_CopyTool.hxx>
 #include <Interface_EntityIterator.hxx>
-#include <Interface_InterfaceModel.hxx>
 #include <Interface_Macros.hxx>
-#include <Interface_ParamType.hxx>
-#include <Interface_Protocol.hxx>
 #include <Interface_ReportEntity.hxx>
-#include <Interface_UndefinedContent.hxx>
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 #include <OSD_FileSystem.hxx>
@@ -33,15 +28,11 @@
 #include <StepData_StepDumper.hxx>
 #include <StepData_StepModel.hxx>
 #include <StepData_StepWriter.hxx>
-#include <StepData_UndefinedEntity.hxx>
 #include <StepFile_Read.hxx>
 #include <StepSelect_FileModifier.hxx>
 #include <StepSelect_WorkLibrary.hxx>
-#include <TCollection_HAsciiString.hxx>
-#include <TColStd_HSequenceOfInteger.hxx>
 
 #include <errno.h>
-#include <sys/stat.h>
 IMPLEMENT_STANDARD_RTTIEXT(StepSelect_WorkLibrary,IFSelect_WorkLibrary)
 
 StepSelect_WorkLibrary::StepSelect_WorkLibrary
diff --git a/src/StepSelect/StepSelect_WorkLibrary.hxx b/src/StepSelect/StepSelect_WorkLibrary.hxx
index 02e5677db8..0395bf235d 100644
--- a/src/StepSelect/StepSelect_WorkLibrary.hxx
+++ b/src/StepSelect/StepSelect_WorkLibrary.hxx
@@ -20,10 +20,8 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <IFSelect_WorkLibrary.hxx>
-#include <Standard_CString.hxx>
 class Interface_InterfaceModel;
 class Interface_Protocol;
 class IFSelect_ContextWrite;
diff --git a/src/StepShape/StepShape_AngularLocation.cxx b/src/StepShape/StepShape_AngularLocation.cxx
index 02451b9e2b..72e720d62e 100644
--- a/src/StepShape/StepShape_AngularLocation.cxx
+++ b/src/StepShape/StepShape_AngularLocation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_AngularLocation.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_AngularLocation.hxx b/src/StepShape/StepShape_AngularLocation.hxx
index 8c34cdb54f..cb7b19e65f 100644
--- a/src/StepShape/StepShape_AngularLocation.hxx
+++ b/src/StepShape/StepShape_AngularLocation.hxx
@@ -21,7 +21,6 @@
 
 #include <StepShape_AngleRelator.hxx>
 #include <StepShape_DimensionalLocation.hxx>
-#include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
 class StepRepr_ShapeAspect;
 
diff --git a/src/StepShape/StepShape_AngularSize.cxx b/src/StepShape/StepShape_AngularSize.cxx
index 98603fe8dc..292c61e1e9 100644
--- a/src/StepShape/StepShape_AngularSize.cxx
+++ b/src/StepShape/StepShape_AngularSize.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_AngularSize.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Block.cxx b/src/StepShape/StepShape_Block.cxx
index a60a1f3508..f6d4082c8d 100644
--- a/src/StepShape/StepShape_Block.cxx
+++ b/src/StepShape/StepShape_Block.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepShape_Block.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Block.hxx b/src/StepShape/StepShape_Block.hxx
index acb469b1ec..5110fb5b4f 100644
--- a/src/StepShape/StepShape_Block.hxx
+++ b/src/StepShape/StepShape_Block.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Axis2Placement3d;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_BooleanOperand.cxx b/src/StepShape/StepShape_BooleanOperand.cxx
index 08446c762b..5eb32033fa 100644
--- a/src/StepShape/StepShape_BooleanOperand.cxx
+++ b/src/StepShape/StepShape_BooleanOperand.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Macros.hxx>
 #include <StepShape_BooleanOperand.hxx>
 #include <StepShape_BooleanResult.hxx>
 #include <StepShape_CsgPrimitive.hxx>
diff --git a/src/StepShape/StepShape_BooleanResult.cxx b/src/StepShape/StepShape_BooleanResult.cxx
index 80826225fb..71b566da47 100644
--- a/src/StepShape/StepShape_BooleanResult.cxx
+++ b/src/StepShape/StepShape_BooleanResult.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_BooleanOperand.hxx>
 #include <StepShape_BooleanResult.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_BooleanResult.hxx b/src/StepShape/StepShape_BooleanResult.hxx
index 7addf227cc..e8c770806b 100644
--- a/src/StepShape/StepShape_BooleanResult.hxx
+++ b/src/StepShape/StepShape_BooleanResult.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_BooleanResult_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_BooleanOperator.hxx>
 #include <StepShape_BooleanOperand.hxx>
diff --git a/src/StepShape/StepShape_BoxDomain.hxx b/src/StepShape/StepShape_BoxDomain.hxx
index 5ddd00a4d7..08e6a1f195 100644
--- a/src/StepShape/StepShape_BoxDomain.hxx
+++ b/src/StepShape/StepShape_BoxDomain.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 class StepGeom_CartesianPoint;
 
diff --git a/src/StepShape/StepShape_BoxedHalfSpace.cxx b/src/StepShape/StepShape_BoxedHalfSpace.cxx
index fbf8f0cd8c..7284ba1ab3 100644
--- a/src/StepShape/StepShape_BoxedHalfSpace.cxx
+++ b/src/StepShape/StepShape_BoxedHalfSpace.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepShape_BoxDomain.hxx>
 #include <StepShape_BoxedHalfSpace.hxx>
diff --git a/src/StepShape/StepShape_BoxedHalfSpace.hxx b/src/StepShape/StepShape_BoxedHalfSpace.hxx
index 49d03356c2..ab01e29ca7 100644
--- a/src/StepShape/StepShape_BoxedHalfSpace.hxx
+++ b/src/StepShape/StepShape_BoxedHalfSpace.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepShape_HalfSpaceSolid.hxx>
-#include <Standard_Boolean.hxx>
 class StepShape_BoxDomain;
 class TCollection_HAsciiString;
 class StepGeom_Surface;
diff --git a/src/StepShape/StepShape_BrepWithVoids.cxx b/src/StepShape/StepShape_BrepWithVoids.cxx
index 1065722e3a..24ba2ebe99 100644
--- a/src/StepShape/StepShape_BrepWithVoids.cxx
+++ b/src/StepShape/StepShape_BrepWithVoids.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_BrepWithVoids.hxx>
 #include <StepShape_ClosedShell.hxx>
 #include <StepShape_OrientedClosedShell.hxx>
diff --git a/src/StepShape/StepShape_ConnectedEdgeSet.cxx b/src/StepShape/StepShape_ConnectedEdgeSet.cxx
index d35202c1be..1c5eb2a4f0 100644
--- a/src/StepShape/StepShape_ConnectedEdgeSet.cxx
+++ b/src/StepShape/StepShape_ConnectedEdgeSet.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepShape_ConnectedEdgeSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_ConnectedFaceSet.cxx b/src/StepShape/StepShape_ConnectedFaceSet.cxx
index 7fd2b05760..e2d6b035b2 100644
--- a/src/StepShape/StepShape_ConnectedFaceSet.cxx
+++ b/src/StepShape/StepShape_ConnectedFaceSet.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
 #include <StepShape_Face.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_ConnectedFaceSubSet.cxx b/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
index c37288a19b..d61a890795 100644
--- a/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
+++ b/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
-#include <StepShape_ConnectedFaceSet.hxx>
 #include <StepShape_ConnectedFaceSubSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
index 38b67f17fd..a7394228af 100644
--- a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
diff --git a/src/StepShape/StepShape_CsgSelect.cxx b/src/StepShape/StepShape_CsgSelect.cxx
index 9091bc2d16..ffde87efc4 100644
--- a/src/StepShape/StepShape_CsgSelect.cxx
+++ b/src/StepShape/StepShape_CsgSelect.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Interface_Macros.hxx>
 #include <StepShape_BooleanResult.hxx>
 #include <StepShape_CsgPrimitive.hxx>
 #include <StepShape_CsgSelect.hxx>
diff --git a/src/StepShape/StepShape_CsgSolid.cxx b/src/StepShape/StepShape_CsgSolid.cxx
index ac0e1cf44a..c66787df22 100644
--- a/src/StepShape/StepShape_CsgSolid.cxx
+++ b/src/StepShape/StepShape_CsgSolid.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_CsgSelect.hxx>
 #include <StepShape_CsgSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_CsgSolid.hxx b/src/StepShape/StepShape_CsgSolid.hxx
index 5bfd8b334c..501422fd6a 100644
--- a/src/StepShape/StepShape_CsgSolid.hxx
+++ b/src/StepShape/StepShape_CsgSolid.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_CsgSolid_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_CsgSelect.hxx>
 #include <StepShape_SolidModel.hxx>
diff --git a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
index 20d35352e0..eb48302675 100644
--- a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
+++ b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
-#include <StepShape_DimensionalCharacteristic.hxx>
 #include <StepShape_DimensionalCharacteristicRepresentation.hxx>
 #include <StepShape_ShapeDimensionRepresentation.hxx>
 
diff --git a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
index e7f1e41e58..2b870050a6 100644
--- a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
+++ b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
@@ -17,7 +17,6 @@
 #define _StepShape_DimensionalCharacteristicRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_DimensionalCharacteristic.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepShape/StepShape_DimensionalLocationWithPath.cxx b/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
index dfa9890ab0..104b73ed95 100644
--- a/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
+++ b/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_DimensionalLocationWithPath.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_DimensionalLocationWithPath.hxx b/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
index 51d27c1ee3..c8d7a91996 100644
--- a/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
+++ b/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepShape_DimensionalLocation.hxx>
-#include <Standard_Boolean.hxx>
 class StepRepr_ShapeAspect;
 class TCollection_HAsciiString;
 
diff --git a/src/StepShape/StepShape_DimensionalSize.cxx b/src/StepShape/StepShape_DimensionalSize.cxx
index b779743b00..699e9b4795 100644
--- a/src/StepShape/StepShape_DimensionalSize.cxx
+++ b/src/StepShape/StepShape_DimensionalSize.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_DimensionalSize.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_DimensionalSizeWithPath.cxx b/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
index 02467870b8..a81c631e25 100644
--- a/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
+++ b/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepShape_DimensionalSizeWithPath.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Edge.cxx b/src/StepShape/StepShape_Edge.cxx
index a956ee931d..49923c3cec 100644
--- a/src/StepShape/StepShape_Edge.cxx
+++ b/src/StepShape/StepShape_Edge.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_Edge.hxx>
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Edge.hxx b/src/StepShape/StepShape_Edge.hxx
index a0108e1838..f8033823c2 100644
--- a/src/StepShape/StepShape_Edge.hxx
+++ b/src/StepShape/StepShape_Edge.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <StepShape_TopologicalRepresentationItem.hxx>
 #include <StepShape_Vertex.hxx>
 
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx b/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
index bfe6e1a5e0..6529b526d7 100644
--- a/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
+++ b/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepShape_EdgeBasedWireframeModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_EdgeCurve.cxx b/src/StepShape/StepShape_EdgeCurve.cxx
index 98defa0b1b..fbf9257989 100644
--- a/src/StepShape/StepShape_EdgeCurve.cxx
+++ b/src/StepShape/StepShape_EdgeCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_Vertex.hxx>
diff --git a/src/StepShape/StepShape_EdgeCurve.hxx b/src/StepShape/StepShape_EdgeCurve.hxx
index 5355f11ee1..0b7fb8b600 100644
--- a/src/StepShape/StepShape_EdgeCurve.hxx
+++ b/src/StepShape/StepShape_EdgeCurve.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepShape_Edge.hxx>
 class StepGeom_Curve;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_EdgeLoop.cxx b/src/StepShape/StepShape_EdgeLoop.cxx
index 898e8c9270..94599c1500 100644
--- a/src/StepShape/StepShape_EdgeLoop.cxx
+++ b/src/StepShape/StepShape_EdgeLoop.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_EdgeLoop.hxx>
 #include <StepShape_OrientedEdge.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_ExtrudedAreaSolid.cxx b/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
index 97bdd6d61c..3a3b53aeb9 100644
--- a/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
+++ b/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepShape_ExtrudedAreaSolid.hxx>
diff --git a/src/StepShape/StepShape_ExtrudedAreaSolid.hxx b/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
index 00d372e774..2dbcfeebbc 100644
--- a/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
+++ b/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepShape_SweptAreaSolid.hxx>
 class StepGeom_Direction;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_ExtrudedFaceSolid.cxx b/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
index 959ad865b1..5fb7c27a93 100644
--- a/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
+++ b/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepShape_ExtrudedFaceSolid.hxx>
 #include <StepShape_FaceSurface.hxx>
diff --git a/src/StepShape/StepShape_ExtrudedFaceSolid.hxx b/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
index adf47cd7e8..e47cce88bc 100644
--- a/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
+++ b/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepShape_SweptFaceSolid.hxx>
 class StepGeom_Direction;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_Face.cxx b/src/StepShape/StepShape_Face.cxx
index 754b1cd60a..9921348637 100644
--- a/src/StepShape/StepShape_Face.cxx
+++ b/src/StepShape/StepShape_Face.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_Face.hxx>
 #include <StepShape_FaceBound.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx b/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
index f929b4637b..a9526a39d9 100644
--- a/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
+++ b/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepShape_FaceBasedSurfaceModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_FaceBound.cxx b/src/StepShape/StepShape_FaceBound.cxx
index 72331b209c..9ebce29848 100644
--- a/src/StepShape/StepShape_FaceBound.cxx
+++ b/src/StepShape/StepShape_FaceBound.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_FaceBound.hxx>
 #include <StepShape_Loop.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_FaceSurface.cxx b/src/StepShape/StepShape_FaceSurface.cxx
index ff8f260c73..cf8eb25f86 100644
--- a/src/StepShape/StepShape_FaceSurface.cxx
+++ b/src/StepShape/StepShape_FaceSurface.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepShape_FaceSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_FaceSurface.hxx b/src/StepShape/StepShape_FaceSurface.hxx
index 044fb6e234..7ef488b805 100644
--- a/src/StepShape/StepShape_FaceSurface.hxx
+++ b/src/StepShape/StepShape_FaceSurface.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepShape_Face.hxx>
 #include <StepShape_HArray1OfFaceBound.hxx>
 class StepGeom_Surface;
diff --git a/src/StepShape/StepShape_GeometricCurveSet.cxx b/src/StepShape/StepShape_GeometricCurveSet.cxx
index 47acbcc69f..5adbec2021 100644
--- a/src/StepShape/StepShape_GeometricCurveSet.cxx
+++ b/src/StepShape/StepShape_GeometricCurveSet.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_GeometricCurveSet.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepShape_GeometricCurveSet,StepShape_GeometricSet)
diff --git a/src/StepShape/StepShape_GeometricCurveSet.hxx b/src/StepShape/StepShape_GeometricCurveSet.hxx
index 13a6bdfe7c..73e27a11ec 100644
--- a/src/StepShape/StepShape_GeometricCurveSet.hxx
+++ b/src/StepShape/StepShape_GeometricCurveSet.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_GeometricCurveSet_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_GeometricSet.hxx>
 
diff --git a/src/StepShape/StepShape_GeometricSet.cxx b/src/StepShape/StepShape_GeometricSet.cxx
index bd76404127..b746165330 100644
--- a/src/StepShape/StepShape_GeometricSet.cxx
+++ b/src/StepShape/StepShape_GeometricSet.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_GeometricSet.hxx>
 #include <StepShape_GeometricSetSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_GeometricSet.hxx b/src/StepShape/StepShape_GeometricSet.hxx
index dd082c80b7..78ecd52fd6 100644
--- a/src/StepShape/StepShape_GeometricSet.hxx
+++ b/src/StepShape/StepShape_GeometricSet.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_GeometricSet_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_HArray1OfGeometricSetSelect.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
diff --git a/src/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx b/src/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
index df9a8c4757..371b2fd9ed 100644
--- a/src/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
+++ b/src/StepShape/StepShape_HArray1OfConnectedEdgeSet.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfConnectedEdgeSet_HeaderFile
 #define StepShape_HArray1OfConnectedEdgeSet_HeaderFile
 
-#include <StepShape_ConnectedEdgeSet.hxx>
 #include <StepShape_Array1OfConnectedEdgeSet.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx b/src/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
index a6c38dd6b4..f277da425d 100644
--- a/src/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
+++ b/src/StepShape/StepShape_HArray1OfConnectedFaceSet.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfConnectedFaceSet_HeaderFile
 #define StepShape_HArray1OfConnectedFaceSet_HeaderFile
 
-#include <StepShape_ConnectedFaceSet.hxx>
 #include <StepShape_Array1OfConnectedFaceSet.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfEdge.hxx b/src/StepShape/StepShape_HArray1OfEdge.hxx
index 51f34c3f6b..50a67b52c1 100644
--- a/src/StepShape/StepShape_HArray1OfEdge.hxx
+++ b/src/StepShape/StepShape_HArray1OfEdge.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfEdge_HeaderFile
 #define StepShape_HArray1OfEdge_HeaderFile
 
-#include <StepShape_Edge.hxx>
 #include <StepShape_Array1OfEdge.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfFace.hxx b/src/StepShape/StepShape_HArray1OfFace.hxx
index 7cea107130..cdc46528d5 100644
--- a/src/StepShape/StepShape_HArray1OfFace.hxx
+++ b/src/StepShape/StepShape_HArray1OfFace.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfFace_HeaderFile
 #define StepShape_HArray1OfFace_HeaderFile
 
-#include <StepShape_Face.hxx>
 #include <StepShape_Array1OfFace.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfFaceBound.hxx b/src/StepShape/StepShape_HArray1OfFaceBound.hxx
index 7236c9292a..b6a4491e9a 100644
--- a/src/StepShape/StepShape_HArray1OfFaceBound.hxx
+++ b/src/StepShape/StepShape_HArray1OfFaceBound.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfFaceBound_HeaderFile
 #define StepShape_HArray1OfFaceBound_HeaderFile
 
-#include <StepShape_FaceBound.hxx>
 #include <StepShape_Array1OfFaceBound.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx b/src/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
index 7cc4a331f3..32c0af0085 100644
--- a/src/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
+++ b/src/StepShape/StepShape_HArray1OfOrientedClosedShell.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfOrientedClosedShell_HeaderFile
 #define StepShape_HArray1OfOrientedClosedShell_HeaderFile
 
-#include <StepShape_OrientedClosedShell.hxx>
 #include <StepShape_Array1OfOrientedClosedShell.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfOrientedEdge.hxx b/src/StepShape/StepShape_HArray1OfOrientedEdge.hxx
index a7288ab05e..02ed744da5 100644
--- a/src/StepShape/StepShape_HArray1OfOrientedEdge.hxx
+++ b/src/StepShape/StepShape_HArray1OfOrientedEdge.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfOrientedEdge_HeaderFile
 #define StepShape_HArray1OfOrientedEdge_HeaderFile
 
-#include <StepShape_OrientedEdge.hxx>
 #include <StepShape_Array1OfOrientedEdge.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx b/src/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
index 03207eec30..dc0b366f72 100644
--- a/src/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
+++ b/src/StepShape/StepShape_HArray1OfShapeDimensionRepresentationItem.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepShape_HArray1OfShapeDimensionRepresentationItem_HeaderFile
 #define _StepShape_HArray1OfShapeDimensionRepresentationItem_HeaderFile
 
-#include <StepShape_ShapeDimensionRepresentationItem.hxx>
 #include <StepShape_Array1OfShapeDimensionRepresentationItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HArray1OfValueQualifier.hxx b/src/StepShape/StepShape_HArray1OfValueQualifier.hxx
index ce1cf027fa..c07ecf5a98 100644
--- a/src/StepShape/StepShape_HArray1OfValueQualifier.hxx
+++ b/src/StepShape/StepShape_HArray1OfValueQualifier.hxx
@@ -17,7 +17,6 @@
 #ifndef StepShape_HArray1OfValueQualifier_HeaderFile
 #define StepShape_HArray1OfValueQualifier_HeaderFile
 
-#include <StepShape_ValueQualifier.hxx>
 #include <StepShape_Array1OfValueQualifier.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepShape/StepShape_HalfSpaceSolid.cxx b/src/StepShape/StepShape_HalfSpaceSolid.cxx
index 4c364dd450..662a80c3db 100644
--- a/src/StepShape/StepShape_HalfSpaceSolid.cxx
+++ b/src/StepShape/StepShape_HalfSpaceSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_HalfSpaceSolid.hxx b/src/StepShape/StepShape_HalfSpaceSolid.hxx
index 0ffdf02b85..b80bba4641 100644
--- a/src/StepShape/StepShape_HalfSpaceSolid.hxx
+++ b/src/StepShape/StepShape_HalfSpaceSolid.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Surface;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_LimitsAndFits.cxx b/src/StepShape/StepShape_LimitsAndFits.cxx
index f8988def95..bfe587b08b 100644
--- a/src/StepShape/StepShape_LimitsAndFits.cxx
+++ b/src/StepShape/StepShape_LimitsAndFits.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_LimitsAndFits.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_ManifoldSolidBrep.cxx b/src/StepShape/StepShape_ManifoldSolidBrep.cxx
index 0b968a8c69..a196812039 100644
--- a/src/StepShape/StepShape_ManifoldSolidBrep.cxx
+++ b/src/StepShape/StepShape_ManifoldSolidBrep.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_ClosedShell.hxx>
 #include <StepShape_ConnectedFaceSet.hxx>
 #include <StepShape_ManifoldSolidBrep.hxx>
diff --git a/src/StepShape/StepShape_MeasureQualification.cxx b/src/StepShape/StepShape_MeasureQualification.cxx
index 5d01a1529b..c61206c621 100644
--- a/src/StepShape/StepShape_MeasureQualification.cxx
+++ b/src/StepShape/StepShape_MeasureQualification.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepShape_MeasureQualification.hxx>
 #include <StepShape_ValueQualifier.hxx>
diff --git a/src/StepShape/StepShape_OrientedClosedShell.cxx b/src/StepShape/StepShape_OrientedClosedShell.cxx
index 2976aec5db..b72f07e98e 100644
--- a/src/StepShape/StepShape_OrientedClosedShell.cxx
+++ b/src/StepShape/StepShape_OrientedClosedShell.cxx
@@ -12,9 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_ClosedShell.hxx>
-#include <StepShape_Face.hxx>
 #include <StepShape_OrientedClosedShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_OrientedEdge.cxx b/src/StepShape/StepShape_OrientedEdge.cxx
index b161597a89..e1ae5d86fe 100644
--- a/src/StepShape/StepShape_OrientedEdge.cxx
+++ b/src/StepShape/StepShape_OrientedEdge.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_OrientedEdge.hxx>
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_OrientedFace.cxx b/src/StepShape/StepShape_OrientedFace.cxx
index 96ea7f4c20..bc1531b477 100644
--- a/src/StepShape/StepShape_OrientedFace.cxx
+++ b/src/StepShape/StepShape_OrientedFace.cxx
@@ -12,9 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_Face.hxx>
-#include <StepShape_FaceBound.hxx>
 #include <StepShape_OrientedFace.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_OrientedOpenShell.cxx b/src/StepShape/StepShape_OrientedOpenShell.cxx
index dfa404ec96..0b1431c992 100644
--- a/src/StepShape/StepShape_OrientedOpenShell.cxx
+++ b/src/StepShape/StepShape_OrientedOpenShell.cxx
@@ -12,9 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_Face.hxx>
-#include <StepShape_OpenShell.hxx>
 #include <StepShape_OrientedOpenShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_OrientedPath.cxx b/src/StepShape/StepShape_OrientedPath.cxx
index 7b67e3719c..924858818c 100644
--- a/src/StepShape/StepShape_OrientedPath.cxx
+++ b/src/StepShape/StepShape_OrientedPath.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_EdgeLoop.hxx>
 #include <StepShape_OrientedEdge.hxx>
 #include <StepShape_OrientedPath.hxx>
diff --git a/src/StepShape/StepShape_OrientedPath.hxx b/src/StepShape/StepShape_OrientedPath.hxx
index b1b1b4513e..29d268d042 100644
--- a/src/StepShape/StepShape_OrientedPath.hxx
+++ b/src/StepShape/StepShape_OrientedPath.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Boolean.hxx>
 #include <StepShape_Path.hxx>
 #include <StepShape_HArray1OfOrientedEdge.hxx>
 #include <Standard_Integer.hxx>
diff --git a/src/StepShape/StepShape_Path.cxx b/src/StepShape/StepShape_Path.cxx
index b1378e74c4..d5849185c6 100644
--- a/src/StepShape/StepShape_Path.cxx
+++ b/src/StepShape/StepShape_Path.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_OrientedEdge.hxx>
 #include <StepShape_Path.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_PlusMinusTolerance.cxx b/src/StepShape/StepShape_PlusMinusTolerance.cxx
index 23f26d0914..096676130a 100644
--- a/src/StepShape/StepShape_PlusMinusTolerance.cxx
+++ b/src/StepShape/StepShape_PlusMinusTolerance.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_DimensionalCharacteristic.hxx>
 #include <StepShape_PlusMinusTolerance.hxx>
 #include <StepShape_ToleranceMethodDefinition.hxx>
 
diff --git a/src/StepShape/StepShape_PlusMinusTolerance.hxx b/src/StepShape/StepShape_PlusMinusTolerance.hxx
index f45118588d..1f3a642a7c 100644
--- a/src/StepShape/StepShape_PlusMinusTolerance.hxx
+++ b/src/StepShape/StepShape_PlusMinusTolerance.hxx
@@ -17,7 +17,6 @@
 #define _StepShape_PlusMinusTolerance_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_ToleranceMethodDefinition.hxx>
 #include <StepShape_DimensionalCharacteristic.hxx>
diff --git a/src/StepShape/StepShape_PolyLoop.cxx b/src/StepShape/StepShape_PolyLoop.cxx
index e6b6c34713..7d19741ddc 100644
--- a/src/StepShape/StepShape_PolyLoop.cxx
+++ b/src/StepShape/StepShape_PolyLoop.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_CartesianPoint.hxx>
 #include <StepShape_PolyLoop.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_QualifiedRepresentationItem.cxx b/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
index 22db354a8e..e8dcd008cf 100644
--- a/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
+++ b/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_QualifiedRepresentationItem.hxx>
 #include <StepShape_ValueQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_QualifiedRepresentationItem.hxx b/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
index eba40b438a..d5b9ca6870 100644
--- a/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
+++ b/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
@@ -17,7 +17,6 @@
 #define _StepShape_QualifiedRepresentationItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_HArray1OfValueQualifier.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/StepShape/StepShape_ReversibleTopologyItem.cxx b/src/StepShape/StepShape_ReversibleTopologyItem.cxx
index 15b7b12d2a..2b2e46134c 100644
--- a/src/StepShape/StepShape_ReversibleTopologyItem.cxx
+++ b/src/StepShape/StepShape_ReversibleTopologyItem.cxx
@@ -15,7 +15,6 @@
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
 #include <StepShape_ClosedShell.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_Face.hxx>
 #include <StepShape_FaceBound.hxx>
 #include <StepShape_OpenShell.hxx>
diff --git a/src/StepShape/StepShape_RevolvedAreaSolid.cxx b/src/StepShape/StepShape_RevolvedAreaSolid.cxx
index f0a432ed05..90dc7fa880 100644
--- a/src/StepShape/StepShape_RevolvedAreaSolid.cxx
+++ b/src/StepShape/StepShape_RevolvedAreaSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
 #include <StepShape_RevolvedAreaSolid.hxx>
diff --git a/src/StepShape/StepShape_RevolvedAreaSolid.hxx b/src/StepShape/StepShape_RevolvedAreaSolid.hxx
index c4c8a7bf6e..2fce9ccf37 100644
--- a/src/StepShape/StepShape_RevolvedAreaSolid.hxx
+++ b/src/StepShape/StepShape_RevolvedAreaSolid.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepShape_SweptAreaSolid.hxx>
 class StepGeom_Axis1Placement;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_RevolvedFaceSolid.cxx b/src/StepShape/StepShape_RevolvedFaceSolid.cxx
index c7de0db790..c45a6ec989 100644
--- a/src/StepShape/StepShape_RevolvedFaceSolid.cxx
+++ b/src/StepShape/StepShape_RevolvedFaceSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepShape_FaceSurface.hxx>
 #include <StepShape_RevolvedFaceSolid.hxx>
diff --git a/src/StepShape/StepShape_RevolvedFaceSolid.hxx b/src/StepShape/StepShape_RevolvedFaceSolid.hxx
index b9d3805af1..5fd4409fdf 100644
--- a/src/StepShape/StepShape_RevolvedFaceSolid.hxx
+++ b/src/StepShape/StepShape_RevolvedFaceSolid.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepShape_SweptFaceSolid.hxx>
 class StepGeom_Axis1Placement;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_RightAngularWedge.cxx b/src/StepShape/StepShape_RightAngularWedge.cxx
index f6bcf4f766..f9ec6fd1e4 100644
--- a/src/StepShape/StepShape_RightAngularWedge.cxx
+++ b/src/StepShape/StepShape_RightAngularWedge.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepShape_RightAngularWedge.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_RightAngularWedge.hxx b/src/StepShape/StepShape_RightAngularWedge.hxx
index 54a3e4d34e..213ff0de19 100644
--- a/src/StepShape/StepShape_RightAngularWedge.hxx
+++ b/src/StepShape/StepShape_RightAngularWedge.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Axis2Placement3d;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_RightCircularCone.cxx b/src/StepShape/StepShape_RightCircularCone.cxx
index 9ce8bd7293..eb2039e91f 100644
--- a/src/StepShape/StepShape_RightCircularCone.cxx
+++ b/src/StepShape/StepShape_RightCircularCone.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepShape_RightCircularCone.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_RightCircularCone.hxx b/src/StepShape/StepShape_RightCircularCone.hxx
index 81628a54c8..c967ca3d81 100644
--- a/src/StepShape/StepShape_RightCircularCone.hxx
+++ b/src/StepShape/StepShape_RightCircularCone.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Axis1Placement;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_RightCircularCylinder.cxx b/src/StepShape/StepShape_RightCircularCylinder.cxx
index 74a2780e8b..08d14068e5 100644
--- a/src/StepShape/StepShape_RightCircularCylinder.cxx
+++ b/src/StepShape/StepShape_RightCircularCylinder.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepShape_RightCircularCylinder.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_RightCircularCylinder.hxx b/src/StepShape/StepShape_RightCircularCylinder.hxx
index ea027e8d7c..c6180d6c24 100644
--- a/src/StepShape/StepShape_RightCircularCylinder.hxx
+++ b/src/StepShape/StepShape_RightCircularCylinder.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Axis1Placement;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_SeamEdge.cxx b/src/StepShape/StepShape_SeamEdge.cxx
index ae8bb9f5dc..b8e34d5475 100644
--- a/src/StepShape/StepShape_SeamEdge.cxx
+++ b/src/StepShape/StepShape_SeamEdge.cxx
@@ -15,9 +15,7 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_SeamEdge.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_SeamEdge.hxx b/src/StepShape/StepShape_SeamEdge.hxx
index c0ee6c5973..daa49da1c1 100644
--- a/src/StepShape/StepShape_SeamEdge.hxx
+++ b/src/StepShape/StepShape_SeamEdge.hxx
@@ -20,7 +20,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepShape_OrientedEdge.hxx>
-#include <Standard_Boolean.hxx>
 class StepGeom_Pcurve;
 class TCollection_HAsciiString;
 class StepShape_Edge;
diff --git a/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx b/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
index ce4b3c789b..7ae35dfebf 100644
--- a/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
+++ b/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
@@ -16,7 +16,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
diff --git a/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx b/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
index cb1c72318f..9458403124 100644
--- a/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
+++ b/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_ShapeDefinitionRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepRepr_PropertyDefinitionRepresentation.hxx>
 
diff --git a/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx b/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
index 2274f9389c..80d8e5361b 100644
--- a/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
+++ b/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.0
 
-#include <Standard_Type.hxx>
 #include <StepShape_ShapeDimensionRepresentation.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeDimensionRepresentation,StepShape_ShapeRepresentation)
diff --git a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
index c488574af8..1d6d5baf43 100644
--- a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
+++ b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
@@ -17,7 +17,6 @@
 #define _StepShape_ShapeDimensionRepresentation_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_HArray1OfShapeDimensionRepresentationItem.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
diff --git a/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx b/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
index 4c05333b2b..a0032dd861 100644
--- a/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
+++ b/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepShape_Shell.hxx>
 #include <StepShape_ShellBasedSurfaceModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx b/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
index 9c2a150a30..9121d42b9c 100644
--- a/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
+++ b/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
@@ -18,7 +18,6 @@
 #define _StepShape_ShellBasedSurfaceModel_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepShape_HArray1OfShell.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
diff --git a/src/StepShape/StepShape_SolidReplica.cxx b/src/StepShape/StepShape_SolidReplica.cxx
index df93ea90ef..1eace0a2bd 100644
--- a/src/StepShape/StepShape_SolidReplica.cxx
+++ b/src/StepShape/StepShape_SolidReplica.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
-#include <StepShape_SolidModel.hxx>
 #include <StepShape_SolidReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_Sphere.cxx b/src/StepShape/StepShape_Sphere.cxx
index 09edb3a88e..62af370102 100644
--- a/src/StepShape/StepShape_Sphere.cxx
+++ b/src/StepShape/StepShape_Sphere.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Point.hxx>
 #include <StepShape_Sphere.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Sphere.hxx b/src/StepShape/StepShape_Sphere.hxx
index f1c7b390f6..445c29dec1 100644
--- a/src/StepShape/StepShape_Sphere.hxx
+++ b/src/StepShape/StepShape_Sphere.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Point;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_Subedge.cxx b/src/StepShape/StepShape_Subedge.cxx
index 5e2fc7b11c..120abe081c 100644
--- a/src/StepShape/StepShape_Subedge.cxx
+++ b/src/StepShape/StepShape_Subedge.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_Subedge.hxx>
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Subface.cxx b/src/StepShape/StepShape_Subface.cxx
index c5b79a7c24..b6192cab19 100644
--- a/src/StepShape/StepShape_Subface.cxx
+++ b/src/StepShape/StepShape_Subface.cxx
@@ -15,8 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
-#include <StepShape_Face.hxx>
 #include <StepShape_Subface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_SweptAreaSolid.cxx b/src/StepShape/StepShape_SweptAreaSolid.cxx
index 30bebe95ce..80f9ddbe5d 100644
--- a/src/StepShape/StepShape_SweptAreaSolid.cxx
+++ b/src/StepShape/StepShape_SweptAreaSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
 #include <StepShape_SweptAreaSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_SweptFaceSolid.cxx b/src/StepShape/StepShape_SweptFaceSolid.cxx
index 04c8091edb..66cb3f4667 100644
--- a/src/StepShape/StepShape_SweptFaceSolid.cxx
+++ b/src/StepShape/StepShape_SweptFaceSolid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_FaceSurface.hxx>
 #include <StepShape_SweptFaceSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_ToleranceValue.cxx b/src/StepShape/StepShape_ToleranceValue.cxx
index dee367d7d8..5fc6fb3c27 100644
--- a/src/StepShape/StepShape_ToleranceValue.cxx
+++ b/src/StepShape/StepShape_ToleranceValue.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepShape_ToleranceValue.hxx>
 
diff --git a/src/StepShape/StepShape_Torus.cxx b/src/StepShape/StepShape_Torus.cxx
index 4262ce1ad8..70a5d10465 100644
--- a/src/StepShape/StepShape_Torus.cxx
+++ b/src/StepShape/StepShape_Torus.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepShape_Torus.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_Torus.hxx b/src/StepShape/StepShape_Torus.hxx
index 4e75cbc415..5014e1f257 100644
--- a/src/StepShape/StepShape_Torus.hxx
+++ b/src/StepShape/StepShape_Torus.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 class StepGeom_Axis1Placement;
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_TypeQualifier.cxx b/src/StepShape/StepShape_TypeQualifier.cxx
index b3f487eef8..42bd4418a2 100644
--- a/src/StepShape/StepShape_TypeQualifier.cxx
+++ b/src/StepShape/StepShape_TypeQualifier.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_TypeQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx b/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
index 6ebd4bde93..35a2e44e04 100644
--- a/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
+++ b/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
@@ -20,7 +20,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
 class TCollection_HAsciiString;
diff --git a/src/StepShape/StepShape_VertexLoop.cxx b/src/StepShape/StepShape_VertexLoop.cxx
index 0c423644d7..d011ce53ab 100644
--- a/src/StepShape/StepShape_VertexLoop.cxx
+++ b/src/StepShape/StepShape_VertexLoop.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepShape_Vertex.hxx>
 #include <StepShape_VertexLoop.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepShape/StepShape_VertexPoint.cxx b/src/StepShape/StepShape_VertexPoint.cxx
index 39ad65a227..faebe1efb2 100644
--- a/src/StepShape/StepShape_VertexPoint.cxx
+++ b/src/StepShape/StepShape_VertexPoint.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Point.hxx>
 #include <StepShape_VertexPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepToGeom/StepToGeom.cxx b/src/StepToGeom/StepToGeom.cxx
index bb28924127..1b365c150e 100644
--- a/src/StepToGeom/StepToGeom.cxx
+++ b/src/StepToGeom/StepToGeom.cxx
@@ -22,10 +22,7 @@
 
 #include <Geom_Axis1Placement.hxx>
 #include <Geom_Axis2Placement.hxx>
-#include <Geom_BoundedCurve.hxx>
-#include <Geom_BoundedSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_Conic.hxx>
@@ -52,8 +49,6 @@
 #include <Geom_VectorWithMagnitude.hxx>
 
 #include <Geom2d_AxisPlacement.hxx>
-#include <Geom2d_BoundedCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_CartesianPoint.hxx>
 #include <Geom2d_Circle.hxx>
 #include <Geom2d_Conic.hxx>
@@ -70,7 +65,6 @@
 #include <gp_Trsf.hxx>
 #include <gp_Trsf2d.hxx>
 #include <gp_Lin.hxx>
-#include <gp_Lin2d.hxx>
 
 #include <ShapeAlgo.hxx>
 #include <ShapeAlgo_AlgoContainer.hxx>
@@ -79,11 +73,6 @@
 #include <StepGeom_Axis1Placement.hxx>
 #include <StepGeom_Axis2Placement2d.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
-#include <StepGeom_BoundedCurve.hxx>
-#include <StepGeom_BoundedSurface.hxx>
-#include <StepGeom_BSplineCurve.hxx>
-#include <StepGeom_CartesianPoint.hxx>
-#include <StepGeom_Direction.hxx>
 
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_Builder.cxx b/src/StepToTopoDS/StepToTopoDS_Builder.cxx
index 40f5114cf7..b502766c3b 100644
--- a/src/StepToTopoDS/StepToTopoDS_Builder.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_Builder.cxx
@@ -25,7 +25,6 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepLib.hxx>
-#include <Geom_BoundedSurface.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
@@ -39,7 +38,6 @@
 #include <Standard_Failure.hxx>
 #include <StdFail_NotDone.hxx>
 #include <STEPControl_ActorRead.hxx>
-#include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_CompositeCurve.hxx>
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_CurveBoundedSurface.hxx>
@@ -49,7 +47,6 @@
 #include <StepGeom_SurfacePatch.hxx>
 #include <StepShape_BrepWithVoids.hxx>
 #include <StepShape_ClosedShell.hxx>
-#include <StepShape_ConnectedEdgeSet.hxx>
 #include <StepShape_EdgeBasedWireframeModel.hxx>
 #include <StepShape_FaceBasedSurfaceModel.hxx>
 #include <StepShape_FaceSurface.hxx>
@@ -64,14 +61,12 @@
 #include <StepShape_ManifoldSolidBrep.hxx>
 #include <StepShape_OpenShell.hxx>
 #include <StepShape_OrientedClosedShell.hxx>
-#include <StepShape_Shell.hxx>
 #include <StepShape_ShellBasedSurfaceModel.hxx>
 #include <StepVisual_TessellatedFace.hxx>
 #include <StepVisual_TessellatedShell.hxx>
 #include <StepVisual_TessellatedSolid.hxx>
 #include <StepToGeom.hxx>
 #include <StepToTopoDS_Builder.hxx>
-#include <StepToTopoDS_DataMapOfTRI.hxx>
 #include <StepToTopoDS_NMTool.hxx>
 #include <StepToTopoDS_Tool.hxx>
 #include <StepToTopoDS_TranslateCompositeCurve.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_Builder.hxx b/src/StepToTopoDS/StepToTopoDS_Builder.hxx
index df3b185271..759d1bc825 100644
--- a/src/StepToTopoDS/StepToTopoDS_Builder.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_Builder.hxx
@@ -24,7 +24,6 @@
 #include <StepToTopoDS_BuilderError.hxx>
 #include <TopoDS_Shape.hxx>
 #include <StepToTopoDS_Root.hxx>
-#include <Standard_Boolean.hxx>
 #include <Message_ProgressRange.hxx>
 
 class StepShape_ManifoldSolidBrep;
diff --git a/src/StepToTopoDS/StepToTopoDS_CartesianPointHasher.hxx b/src/StepToTopoDS/StepToTopoDS_CartesianPointHasher.hxx
index accd92f990..4c8a8bbc22 100644
--- a/src/StepToTopoDS/StepToTopoDS_CartesianPointHasher.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_CartesianPointHasher.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class StepGeom_CartesianPoint;
 
 
diff --git a/src/StepToTopoDS/StepToTopoDS_DataMapOfRINames.hxx b/src/StepToTopoDS/StepToTopoDS_DataMapOfRINames.hxx
index e1a2a60c0f..b9cf814562 100644
--- a/src/StepToTopoDS/StepToTopoDS_DataMapOfRINames.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_DataMapOfRINames.hxx
@@ -19,7 +19,6 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TCollection_AsciiString.hxx>
 #include <NCollection_DataMap.hxx>
 
 typedef NCollection_DataMap<TCollection_AsciiString,TopoDS_Shape,TCollection_AsciiString> StepToTopoDS_DataMapOfRINames;
diff --git a/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx b/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx
index 19e5d18517..e2e6d9d215 100644
--- a/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx
@@ -18,53 +18,27 @@
 //    abv 13.04.99 S4136: eliminate BRepAPI::Precision()
 
 #include <BRep_Builder.hxx>
-#include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
-#include <BRepTools_WireExplorer.hxx>
 #include <ElCLib.hxx>
-#include <ElSLib.hxx>
-#include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dAPI_InterCurveCurve.hxx>
-#include <Geom2dAPI_ProjectPointOnCurve.hxx>
-#include <Geom_BoundedCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_ConicalSurface.hxx>
 #include <Geom_Curve.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <GeomAbs_Shape.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <GeomAPI_ProjectPointOnSurf.hxx>
-#include <gp_Vec2d.hxx>
 #include <Precision.hxx>
-#include <Standard_ErrorHandler.hxx>
-#include <Standard_Failure.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_Direction.hxx>
 #include <StepGeom_Line.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepGeom_PcurveOrSurface.hxx>
 #include <StepGeom_SeamCurve.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
 #include <StepGeom_Vector.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_EdgeLoop.hxx>
 #include <StepShape_OrientedEdge.hxx>
 #include <StepToTopoDS.hxx>
 #include <StepToTopoDS_GeometricTool.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
 #include <Transfer_TransientProcess.hxx>
 
 // ----------------------------------------------------------------------------
diff --git a/src/StepToTopoDS/StepToTopoDS_GeometricTool.hxx b/src/StepToTopoDS/StepToTopoDS_GeometricTool.hxx
index 1a6d972ced..e1de2b5aaf 100644
--- a/src/StepToTopoDS/StepToTopoDS_GeometricTool.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_GeometricTool.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 class StepGeom_SurfaceCurve;
 class StepGeom_Surface;
 class StepGeom_Pcurve;
diff --git a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cxx b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cxx
index 7ba4d04596..bd98590ef3 100644
--- a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cxx
@@ -16,23 +16,18 @@
 
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_CartesianPoint.hxx>
-#include <Geom_Direction.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Trsf.hxx>
 #include <gp_TrsfForm.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepGeom_CartesianTransformationOperator3d.hxx>
-#include <StepGeom_Direction.hxx>
 #include <StepRepr_ItemDefinedTransformation.hxx>
 #include <StepRepr_MappedItem.hxx>
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentationMap.hxx>
 #include <StepToGeom.hxx>
 #include <StepToTopoDS_MakeTransformed.hxx>
-#include <TopLoc_Location.hxx>
-#include <TopoDS_Shape.hxx>
-#include <Transfer_Binder.hxx>
 #include <Transfer_TransientProcess.hxx>
 #include <TransferBRep_ShapeBinder.hxx>
 
diff --git a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.hxx b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.hxx
index e787b8c48f..6df7b9b814 100644
--- a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.hxx
@@ -23,7 +23,6 @@
 
 #include <gp_Trsf.hxx>
 #include <StepToTopoDS_Root.hxx>
-#include <Standard_Boolean.hxx>
 #include <Message_ProgressRange.hxx>
 
 class StepGeom_Axis2Placement3d;
diff --git a/src/StepToTopoDS/StepToTopoDS_PointPairHasher.hxx b/src/StepToTopoDS/StepToTopoDS_PointPairHasher.hxx
index 542e540280..efc515a772 100644
--- a/src/StepToTopoDS/StepToTopoDS_PointPairHasher.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_PointPairHasher.hxx
@@ -19,10 +19,8 @@
 
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-#include <Standard_Boolean.hxx>
 class StepToTopoDS_PointPair;
 
 
diff --git a/src/StepToTopoDS/StepToTopoDS_Root.hxx b/src/StepToTopoDS/StepToTopoDS_Root.hxx
index b2c1f6988b..96637c843d 100644
--- a/src/StepToTopoDS/StepToTopoDS_Root.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_Root.hxx
@@ -21,9 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
-
 
 //! This class implements the common services for
 //! all classes of StepToTopoDS which report error
diff --git a/src/StepToTopoDS/StepToTopoDS_Tool.cxx b/src/StepToTopoDS/StepToTopoDS_Tool.cxx
index 28d0ff600e..2af7bb52b7 100644
--- a/src/StepToTopoDS/StepToTopoDS_Tool.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_Tool.cxx
@@ -18,11 +18,7 @@
 //    (Bind general;  BindVertex ?)
 
 #include <Geom2d_Curve.hxx>
-#include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
-#include <StepGeom_CartesianPoint.hxx>
-#include <StepShape_TopologicalRepresentationItem.hxx>
-#include <StepToTopoDS_PointPair.hxx>
 #include <StepToTopoDS_Tool.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_Tool.hxx b/src/StepToTopoDS/StepToTopoDS_Tool.hxx
index bcfaec1fb1..57f45ab26c 100644
--- a/src/StepToTopoDS/StepToTopoDS_Tool.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_Tool.hxx
@@ -24,7 +24,6 @@
 #include <StepToTopoDS_DataMapOfTRI.hxx>
 #include <StepToTopoDS_PointVertexMap.hxx>
 #include <StepToTopoDS_PointEdgeMap.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Transfer_TransientProcess;
 class StepShape_TopologicalRepresentationItem;
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
index f3660ea1f3..6b7ff8382d 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx
@@ -24,14 +24,12 @@
 #include <Geom_Surface.hxx>
 #include <Interface_Static.hxx>
 #include <Precision.hxx>
-#include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 #include <StepGeom_CompositeCurve.hxx>
 #include <StepGeom_CompositeCurveSegment.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepGeom_PcurveOrSurface.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
 #include <StepToGeom.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.hxx b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.hxx
index 36d4d6c062..74f25802f9 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <TopoDS_Wire.hxx>
-#include <Standard_Boolean.hxx>
 #include <StepToTopoDS_Root.hxx>
 class StepGeom_CompositeCurve;
 class Transfer_TransientProcess;
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx
index be35bdd2d7..4849dda6ca 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.cxx
@@ -30,7 +30,6 @@
 #include <StepToGeom.hxx>
 #include <StepToTopoDS_TranslateCompositeCurve.hxx>
 #include <StepToTopoDS_TranslateCurveBoundedSurface.hxx>
-#include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <Transfer_TransientProcess.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.hxx b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.hxx
index b7d2183bc6..28bf8a26e2 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateCurveBoundedSurface.hxx
@@ -23,7 +23,6 @@
 
 #include <TopoDS_Face.hxx>
 #include <StepToTopoDS_Root.hxx>
-#include <Standard_Boolean.hxx>
 class StepGeom_CurveBoundedSurface;
 class Transfer_TransientProcess;
 
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx
index cd34da906c..3b0e2fca74 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx
@@ -21,13 +21,11 @@
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_MakeEdge.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
 #include <Geom2d_Curve.hxx>
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_Surface.hxx>
-#include <GeomAbs_Shape.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Lin.hxx>
@@ -37,13 +35,9 @@
 #include <ShapeConstruct_Curve.hxx>
 #include <StdFail_NotDone.hxx>
 #include <StepData_GlobalFactors.hxx>
-#include <StepGeom_CartesianPoint.hxx>
-#include <StepGeom_Curve.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepGeom_Polyline.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_OrientedEdge.hxx>
 #include <StepShape_Vertex.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.hxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.hxx
index 3a8117a8b8..fc2c2ace63 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.hxx
@@ -24,7 +24,6 @@
 #include <StepToTopoDS_TranslateEdgeError.hxx>
 #include <TopoDS_Shape.hxx>
 #include <StepToTopoDS_Root.hxx>
-#include <Standard_Real.hxx>
 class StepShape_Edge;
 class StepToTopoDS_Tool;
 class StepToTopoDS_NMTool;
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
index 9de5910cf6..156197a605 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
@@ -23,21 +23,15 @@
 //    smh 31.01.01 BUC60810 : IsNull protection
 
 #include <BRep_Builder.hxx>
-#include <BRep_CurveRepresentation.hxx>
-#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx>
-#include <BRep_ListOfCurveRepresentation.hxx>
 #include <BRep_TEdge.hxx>
 #include <BRep_Tool.hxx>
 #include <ElCLib.hxx>
-#include <Geom2d_BoundedCurve.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_Line.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
 #include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
 #include <Interface_Static.hxx>
 #include <Precision.hxx>
 #include <ShapeAlgo.hxx>
@@ -48,16 +42,11 @@
 #include <ShapeBuild_Edge.hxx>
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeFix_EdgeProjAux.hxx>
-#include <Standard_ErrorHandler.hxx>
 #include <StdFail_NotDone.hxx>
-#include <StepGeom_Curve.hxx>
 #include <StepGeom_Pcurve.hxx>
-#include <StepGeom_PcurveOrSurface.hxx>
-#include <StepGeom_Polyline.hxx>
 #include <StepGeom_Surface.hxx>
 #include <StepGeom_SurfaceCurve.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
-#include <StepShape_Edge.hxx>
 #include <StepShape_EdgeCurve.hxx>
 #include <StepShape_EdgeLoop.hxx>
 #include <StepShape_FaceBound.hxx>
@@ -74,7 +63,6 @@
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.hxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.hxx
index 878a065f58..bcf0891b67 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.hxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.hxx
@@ -24,7 +24,6 @@
 #include <StepToTopoDS_TranslateEdgeLoopError.hxx>
 #include <TopoDS_Shape.hxx>
 #include <StepToTopoDS_Root.hxx>
-#include <Standard_Boolean.hxx>
 class StepShape_FaceBound;
 class TopoDS_Face;
 class Geom_Surface;
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslatePolyLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslatePolyLoop.cxx
index 8ff7483901..2db5e71008 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslatePolyLoop.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslatePolyLoop.cxx
@@ -27,10 +27,8 @@
 #include <Precision.hxx>
 #include <ShapeAnalysis_Surface.hxx>
 #include <StdFail_NotDone.hxx>
-#include <StepGeom_HArray1OfCartesianPoint.hxx>
 #include <StepShape_PolyLoop.hxx>
 #include <StepToGeom.hxx>
-#include <StepToTopoDS_PointPair.hxx>
 #include <StepToTopoDS_Tool.hxx>
 #include <StepToTopoDS_TranslatePolyLoop.hxx>
 #include <TopoDS.hxx>
diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateVertex.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateVertex.cxx
index 81449620fa..7d8a79aff3 100644
--- a/src/StepToTopoDS/StepToTopoDS_TranslateVertex.cxx
+++ b/src/StepToTopoDS/StepToTopoDS_TranslateVertex.cxx
@@ -20,9 +20,6 @@
 #include <Geom_CartesianPoint.hxx>
 #include <Precision.hxx>
 #include <StdFail_NotDone.hxx>
-#include <StepGeom_CartesianPoint.hxx>
-#include <StepGeom_Point.hxx>
-#include <StepShape_Vertex.hxx>
 #include <StepShape_VertexPoint.hxx>
 #include <StepToGeom.hxx>
 #include <StepToTopoDS_NMTool.hxx>
diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrence.cxx
index b4a61da531..9f0ee16fff 100644
--- a/src/StepVisual/StepVisual_AnnotationCurveOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrence.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 <StepVisual_AnnotationCurveOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationCurveOccurrence,StepVisual_AnnotationOccurrence)
diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrence.hxx
index 2cf5f86d78..26d8b94e75 100644
--- a/src/StepVisual/StepVisual_AnnotationCurveOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrence.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_AnnotationCurveOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationOccurrence.hxx>
 
diff --git a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx
index 1bcd06edd0..d664635d8c 100644
--- a/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx
+++ b/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_AnnotationCurveOccurrenceAndGeomReprItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationCurveOccurrence.hxx>
 
diff --git a/src/StepVisual/StepVisual_AnnotationFillArea.cxx b/src/StepVisual/StepVisual_AnnotationFillArea.cxx
index c325d3a469..8c62a27f3f 100644
--- a/src/StepVisual/StepVisual_AnnotationFillArea.cxx
+++ b/src/StepVisual/StepVisual_AnnotationFillArea.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_AnnotationFillArea.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationFillArea, StepShape_GeometricCurveSet)
diff --git a/src/StepVisual/StepVisual_AnnotationFillArea.hxx b/src/StepVisual/StepVisual_AnnotationFillArea.hxx
index c98ed883f3..894c2be477 100644
--- a/src/StepVisual/StepVisual_AnnotationFillArea.hxx
+++ b/src/StepVisual/StepVisual_AnnotationFillArea.hxx
@@ -17,9 +17,7 @@
 #define _StepVisual_AnnotationFillArea_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
-#include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepShape_GeometricCurveSet.hxx>
 #include <Standard_Integer.hxx>
 
diff --git a/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.cxx
index 278b852728..a923383a00 100644
--- a/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.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 <StepVisual_AnnotationFillAreaOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationFillAreaOccurrence, StepVisual_AnnotationOccurrence)
diff --git a/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.hxx
index 088d144ac7..5bab443e5c 100644
--- a/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationFillAreaOccurrence.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_AnnotationFillAreaOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationOccurrence.hxx>
 
diff --git a/src/StepVisual/StepVisual_AnnotationOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
index 449feb997b..1fa6753bc1 100644
--- a/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_AnnotationOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationOccurrence,StepVisual_StyledItem)
diff --git a/src/StepVisual/StepVisual_AnnotationOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
index 6565d1818d..960850cbe9 100644
--- a/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_AnnotationOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_StyledItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_AnnotationPlane.cxx b/src/StepVisual/StepVisual_AnnotationPlane.cxx
index 2a46bf1b50..2df85919d7 100644
--- a/src/StepVisual/StepVisual_AnnotationPlane.cxx
+++ b/src/StepVisual/StepVisual_AnnotationPlane.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 <StepVisual_AnnotationPlane.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationPlane,StepVisual_AnnotationOccurrence)
diff --git a/src/StepVisual/StepVisual_AnnotationPlane.hxx b/src/StepVisual/StepVisual_AnnotationPlane.hxx
index d8dfcf0502..a64e64763b 100644
--- a/src/StepVisual/StepVisual_AnnotationPlane.hxx
+++ b/src/StepVisual/StepVisual_AnnotationPlane.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_AnnotationPlane_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationOccurrence.hxx>
 #include <StepVisual_HArray1OfAnnotationPlaneElement.hxx>
diff --git a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
index b287d89943..8b2348e84f 100644
--- a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_AnnotationTextOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationTextOccurrence,StepVisual_AnnotationOccurrence)
diff --git a/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
index 611b7d01cb..edaa691bf9 100644
--- a/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_AnnotationTextOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationOccurrence.hxx>
 
diff --git a/src/StepVisual/StepVisual_BackgroundColour.cxx b/src/StepVisual/StepVisual_BackgroundColour.cxx
index 3f69e6d95e..68e05026b7 100644
--- a/src/StepVisual/StepVisual_BackgroundColour.cxx
+++ b/src/StepVisual/StepVisual_BackgroundColour.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepVisual_AreaOrView.hxx>
 #include <StepVisual_BackgroundColour.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_BackgroundColour,StepVisual_Colour)
diff --git a/src/StepVisual/StepVisual_BackgroundColour.hxx b/src/StepVisual/StepVisual_BackgroundColour.hxx
index 0bdc13bd96..df300d320e 100644
--- a/src/StepVisual/StepVisual_BackgroundColour.hxx
+++ b/src/StepVisual/StepVisual_BackgroundColour.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_BackgroundColour_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AreaOrView.hxx>
 #include <StepVisual_Colour.hxx>
diff --git a/src/StepVisual/StepVisual_BoxCharacteristicSelect.hxx b/src/StepVisual/StepVisual_BoxCharacteristicSelect.hxx
index 8123bdc659..2a5e5910de 100644
--- a/src/StepVisual/StepVisual_BoxCharacteristicSelect.hxx
+++ b/src/StepVisual/StepVisual_BoxCharacteristicSelect.hxx
@@ -22,8 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
-
 
 
 class StepVisual_BoxCharacteristicSelect 
diff --git a/src/StepVisual/StepVisual_CameraModelD2.cxx b/src/StepVisual/StepVisual_CameraModelD2.cxx
index c08794a2ea..3409e4b941 100644
--- a/src/StepVisual/StepVisual_CameraModelD2.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD2.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CameraModelD2.hxx>
 #include <StepVisual_PlanarBox.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_CameraModelD3.cxx b/src/StepVisual/StepVisual_CameraModelD3.cxx
index 8f9dada7a7..2fe19d47cb 100644
--- a/src/StepVisual/StepVisual_CameraModelD3.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD3.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepVisual_CameraModelD3.hxx>
 #include <StepVisual_ViewVolume.hxx>
diff --git a/src/StepVisual/StepVisual_CameraModelD3MultiClipping.cxx b/src/StepVisual/StepVisual_CameraModelD3MultiClipping.cxx
index 192702a31a..3dde8d9b54 100644
--- a/src/StepVisual/StepVisual_CameraModelD3MultiClipping.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD3MultiClipping.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_Axis2Placement3d.hxx>
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_ViewVolume.hxx>
diff --git a/src/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.cxx b/src/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.cxx
index 10e92918d1..6a49a90c15 100644
--- a/src/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD3MultiClippingIntersection.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.cxx b/src/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.cxx
index 4173a14328..719e344c7f 100644
--- a/src/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD3MultiClippingUnion.cxx
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_ColourRgb.cxx b/src/StepVisual/StepVisual_ColourRgb.cxx
index b60ac7c8db..a2404c861f 100644
--- a/src/StepVisual/StepVisual_ColourRgb.cxx
+++ b/src/StepVisual/StepVisual_ColourRgb.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_ColourRgb.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_ColourSpecification.cxx b/src/StepVisual/StepVisual_ColourSpecification.cxx
index 1456b9f8bc..8a03635c9e 100644
--- a/src/StepVisual/StepVisual_ColourSpecification.cxx
+++ b/src/StepVisual/StepVisual_ColourSpecification.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_ColourSpecification.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_CompositeText.cxx b/src/StepVisual/StepVisual_CompositeText.cxx
index b460bb7d70..48d1f82aaa 100644
--- a/src/StepVisual/StepVisual_CompositeText.cxx
+++ b/src/StepVisual/StepVisual_CompositeText.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CompositeText.hxx>
 #include <StepVisual_TextOrCharacter.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_CompositeText.hxx b/src/StepVisual/StepVisual_CompositeText.hxx
index 5e3d1ab692..8d460ec7b1 100644
--- a/src/StepVisual/StepVisual_CompositeText.hxx
+++ b/src/StepVisual/StepVisual_CompositeText.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_CompositeText_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfTextOrCharacter.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
diff --git a/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx b/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
index 41272de0f1..f1c2e6108f 100644
--- a/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
+++ b/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CompositeTextWithExtent.hxx>
 #include <StepVisual_PlanarExtent.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx b/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
index 52023d3bac..fe35d57785 100644
--- a/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
+++ b/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_CompositeTextWithExtent_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_CompositeText.hxx>
 #include <StepVisual_HArray1OfTextOrCharacter.hxx>
diff --git a/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx b/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
index 4c5fb9a2b0..b3f0e73b0b 100644
--- a/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
+++ b/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_ContextDependentInvisibility.hxx>
 #include <StepVisual_InvisibilityContext.hxx>
 
diff --git a/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx b/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
index eeb582eb3f..4bed257649 100644
--- a/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
+++ b/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_ContextDependentInvisibility_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_InvisibilityContext.hxx>
 #include <StepVisual_Invisibility.hxx>
diff --git a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
index 4f18aa9d6b..17d8106721 100644
--- a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
+++ b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepRepr_RepresentationItem.hxx>
 #include <StepVisual_ContextDependentOverRidingStyledItem.hxx>
 #include <StepVisual_StyleContextSelect.hxx>
 #include <StepVisual_StyledItem.hxx>
diff --git a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
index 591ae6ad41..5b8177a96f 100644
--- a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
+++ b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_ContextDependentOverRidingStyledItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfStyleContextSelect.hxx>
 #include <StepVisual_OverRidingStyledItem.hxx>
diff --git a/src/StepVisual/StepVisual_CoordinatesList.cxx b/src/StepVisual/StepVisual_CoordinatesList.cxx
index c339d8d3c6..7caab6b96c 100644
--- a/src/StepVisual/StepVisual_CoordinatesList.cxx
+++ b/src/StepVisual/StepVisual_CoordinatesList.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CoordinatesList.hxx>
 #include <StepVisual_TessellatedItem.hxx>
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CoordinatesList,StepGeom_TessellatedItem)
diff --git a/src/StepVisual/StepVisual_CurveStyle.cxx b/src/StepVisual/StepVisual_CurveStyle.cxx
index f276f54f59..5a1f64c905 100644
--- a/src/StepVisual/StepVisual_CurveStyle.cxx
+++ b/src/StepVisual/StepVisual_CurveStyle.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_SizeSelect.hxx>
 #include <StepVisual_Colour.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_CurveStyleFontSelect.hxx>
diff --git a/src/StepVisual/StepVisual_CurveStyleFont.cxx b/src/StepVisual/StepVisual_CurveStyleFont.cxx
index ef56db0115..00910837de 100644
--- a/src/StepVisual/StepVisual_CurveStyleFont.cxx
+++ b/src/StepVisual/StepVisual_CurveStyleFont.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyleFont.hxx>
 #include <StepVisual_CurveStyleFontPattern.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx b/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
index ea40e93450..eeca58dc00 100644
--- a/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
+++ b/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_Type.hxx>
 
-#include <Standard_Real.hxx>
 #include <Standard_Transient.hxx>
 
 
diff --git a/src/StepVisual/StepVisual_DirectionCountSelect.hxx b/src/StepVisual/StepVisual_DirectionCountSelect.hxx
index 3256cec85e..2c15e0f92e 100644
--- a/src/StepVisual/StepVisual_DirectionCountSelect.hxx
+++ b/src/StepVisual/StepVisual_DirectionCountSelect.hxx
@@ -21,9 +21,6 @@
 #include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
 
-#include <Standard_Integer.hxx>
-
-
 
 class StepVisual_DirectionCountSelect 
 {
diff --git a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
index 62f052e59c..c6186d81fe 100644
--- a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
+++ b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_DraughtingAnnotationOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingAnnotationOccurrence,StepVisual_AnnotationOccurrence)
diff --git a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
index 071a8a9df2..b4dbc0091e 100644
--- a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
+++ b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_DraughtingAnnotationOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_AnnotationOccurrence.hxx>
 
diff --git a/src/StepVisual/StepVisual_DraughtingCallout.cxx b/src/StepVisual/StepVisual_DraughtingCallout.cxx
index 78af2e3d61..8576620d88 100644
--- a/src/StepVisual/StepVisual_DraughtingCallout.cxx
+++ b/src/StepVisual/StepVisual_DraughtingCallout.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 <StepVisual_DraughtingCallout.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingCallout,StepGeom_GeometricRepresentationItem)
diff --git a/src/StepVisual/StepVisual_DraughtingCallout.hxx b/src/StepVisual/StepVisual_DraughtingCallout.hxx
index ef39ef48a2..22ee5de04e 100644
--- a/src/StepVisual/StepVisual_DraughtingCallout.hxx
+++ b/src/StepVisual/StepVisual_DraughtingCallout.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_DraughtingCallout_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_GeometricRepresentationItem.hxx>
 #include <StepVisual_HArray1OfDraughtingCalloutElement.hxx>
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
index 4ba14177c4..624d5a02c7 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepVisual_ExternallyDefinedCurveFont.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedCurveFont,StepBasic_ExternallyDefinedItem)
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
index 847cfbdd39..5b1b504ff6 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_ExternallyDefinedCurveFont_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_ExternallyDefinedItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
index 53790405ce..260474a3d8 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
@@ -15,7 +15,6 @@
 
 // Generator:	ExpToCas (EXPRESS -> CASCADE/XSTEP Translator) V1.1
 
-#include <Standard_Type.hxx>
 #include <StepVisual_ExternallyDefinedTextFont.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedTextFont,StepBasic_ExternallyDefinedItem)
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
index 09f45724f9..7f99c5714b 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_ExternallyDefinedTextFont_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepBasic_ExternallyDefinedItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_FillAreaStyle.cxx b/src/StepVisual/StepVisual_FillAreaStyle.cxx
index f6030eea4d..d02e223245 100644
--- a/src/StepVisual/StepVisual_FillAreaStyle.cxx
+++ b/src/StepVisual/StepVisual_FillAreaStyle.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_FillAreaStyle.hxx>
 #include <StepVisual_FillStyleSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_FillAreaStyle.hxx b/src/StepVisual/StepVisual_FillAreaStyle.hxx
index 465f4c3a79..6b9e30251d 100644
--- a/src/StepVisual/StepVisual_FillAreaStyle.hxx
+++ b/src/StepVisual/StepVisual_FillAreaStyle.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_FillAreaStyle_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfFillStyleSelect.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepVisual/StepVisual_FillAreaStyleColour.cxx b/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
index 2f142abe4d..4073eacc1a 100644
--- a/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
+++ b/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_Colour.hxx>
 #include <StepVisual_FillAreaStyleColour.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx b/src/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
index 543bff2d45..7bc5928521 100644
--- a/src/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfAnnotationPlaneElement.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepVisual_HArray1OfAnnotationPlaneElement_HeaderFile
 #define _StepVisual_HArray1OfAnnotationPlaneElement_HeaderFile
 
-#include <StepVisual_AnnotationPlaneElement.hxx>
 #include <StepVisual_Array1OfAnnotationPlaneElement.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx b/src/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
index 252375fb66..a07c17d7f3 100644
--- a/src/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfBoxCharacteristicSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfBoxCharacteristicSelect_HeaderFile
 #define StepVisual_HArray1OfBoxCharacteristicSelect_HeaderFile
 
-#include <StepVisual_BoxCharacteristicSelect.hxx>
 #include <StepVisual_Array1OfBoxCharacteristicSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx b/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
index 24597001eb..4e713a43aa 100644
--- a/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect_HeaderFile
 #define _StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect_HeaderFile
 
-#include <StepVisual_CameraModelD3MultiClippingInterectionSelect.hxx>
 #include <StepVisual_Array1OfCameraModelD3MultiClippingInterectionSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx b/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
index 6ff1fb1994..6b9715f7fe 100644
--- a/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect_HeaderFile
 #define _StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect_HeaderFile
 
-#include <StepVisual_CameraModelD3MultiClippingUnionSelect.hxx>
 #include <StepVisual_Array1OfCameraModelD3MultiClippingUnionSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx b/src/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
index edb6712152..2cd5df2ec9 100644
--- a/src/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfCurveStyleFontPattern.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfCurveStyleFontPattern_HeaderFile
 #define StepVisual_HArray1OfCurveStyleFontPattern_HeaderFile
 
-#include <StepVisual_CurveStyleFontPattern.hxx>
 #include <StepVisual_Array1OfCurveStyleFontPattern.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx b/src/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
index ffebae5350..3cf48b555a 100644
--- a/src/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfDirectionCountSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfDirectionCountSelect_HeaderFile
 #define StepVisual_HArray1OfDirectionCountSelect_HeaderFile
 
-#include <StepVisual_DirectionCountSelect.hxx>
 #include <StepVisual_Array1OfDirectionCountSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx b/src/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
index f8c23f4e07..dc53378dd1 100644
--- a/src/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfDraughtingCalloutElement.hxx
@@ -16,7 +16,6 @@
 #ifndef _StepVisual_HArray1OfDraughtingCalloutElement_HeaderFile
 #define _StepVisual_HArray1OfDraughtingCalloutElement_HeaderFile
 
-#include <StepVisual_DraughtingCalloutElement.hxx>
 #include <StepVisual_Array1OfDraughtingCalloutElement.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx b/src/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
index 8c491e79c3..c0ae336614 100644
--- a/src/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfFillStyleSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfFillStyleSelect_HeaderFile
 #define StepVisual_HArray1OfFillStyleSelect_HeaderFile
 
-#include <StepVisual_FillStyleSelect.hxx>
 #include <StepVisual_Array1OfFillStyleSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx b/src/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
index 0fbc286119..1c9fa5a653 100644
--- a/src/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfInvisibleItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfInvisibleItem_HeaderFile
 #define StepVisual_HArray1OfInvisibleItem_HeaderFile
 
-#include <StepVisual_InvisibleItem.hxx>
 #include <StepVisual_Array1OfInvisibleItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfLayeredItem.hxx b/src/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
index 587d490ccf..e4eb5b5e6b 100644
--- a/src/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfLayeredItem.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfLayeredItem_HeaderFile
 #define StepVisual_HArray1OfLayeredItem_HeaderFile
 
-#include <StepVisual_LayeredItem.hxx>
 #include <StepVisual_Array1OfLayeredItem.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx b/src/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
index a3cf9f0cc0..70a919d589 100644
--- a/src/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfPresentationStyleAssignment.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfPresentationStyleAssignment_HeaderFile
 #define StepVisual_HArray1OfPresentationStyleAssignment_HeaderFile
 
-#include <StepVisual_PresentationStyleAssignment.hxx>
 #include <StepVisual_Array1OfPresentationStyleAssignment.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx b/src/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
index d81ed4948a..c94886f641 100644
--- a/src/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfPresentationStyleSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfPresentationStyleSelect_HeaderFile
 #define StepVisual_HArray1OfPresentationStyleSelect_HeaderFile
 
-#include <StepVisual_PresentationStyleSelect.hxx>
 #include <StepVisual_Array1OfPresentationStyleSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx b/src/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
index 62f713725f..421541797a 100644
--- a/src/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfRenderingPropertiesSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfRenderingPropertiesSelect_HeaderFile
 #define StepVisual_HArray1OfRenderingPropertiesSelect_HeaderFile
 
-#include <StepVisual_RenderingPropertiesSelect.hxx>
 #include <StepVisual_Array1OfRenderingPropertiesSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx b/src/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
index 5f05e9dce7..bf9a2dd2d3 100644
--- a/src/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfStyleContextSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfStyleContextSelect_HeaderFile
 #define StepVisual_HArray1OfStyleContextSelect_HeaderFile
 
-#include <StepVisual_StyleContextSelect.hxx>
 #include <StepVisual_Array1OfStyleContextSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx b/src/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
index 192de0ea91..756502f409 100644
--- a/src/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
+++ b/src/StepVisual/StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
@@ -17,7 +17,6 @@
 #ifndef StepVisual_HArray1OfSurfaceStyleElementSelect_HeaderFile
 #define StepVisual_HArray1OfSurfaceStyleElementSelect_HeaderFile
 
-#include <StepVisual_SurfaceStyleElementSelect.hxx>
 #include <StepVisual_Array1OfSurfaceStyleElementSelect.hxx>
 #include <NCollection_DefineHArray1.hxx>
 
diff --git a/src/StepVisual/StepVisual_Invisibility.cxx b/src/StepVisual/StepVisual_Invisibility.cxx
index 3b0b24e75b..2167bb8d95 100644
--- a/src/StepVisual/StepVisual_Invisibility.cxx
+++ b/src/StepVisual/StepVisual_Invisibility.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_Invisibility.hxx>
 #include <StepVisual_InvisibleItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_Invisibility.hxx b/src/StepVisual/StepVisual_Invisibility.hxx
index 77ba3a17c9..fc0f1b38d7 100644
--- a/src/StepVisual/StepVisual_Invisibility.hxx
+++ b/src/StepVisual/StepVisual_Invisibility.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_Invisibility_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfInvisibleItem.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepVisual/StepVisual_LayeredItem.cxx b/src/StepVisual/StepVisual_LayeredItem.cxx
index d5c8d00706..be6fbcb3ba 100644
--- a/src/StepVisual/StepVisual_LayeredItem.cxx
+++ b/src/StepVisual/StepVisual_LayeredItem.cxx
@@ -14,7 +14,6 @@
 
 #include <Interface_Macros.hxx>
 #include <Standard_Transient.hxx>
-#include <StepRepr_RepresentationItem.hxx>
 #include <StepVisual_LayeredItem.hxx>
 #include <StepVisual_PresentationRepresentation.hxx>
 
diff --git a/src/StepVisual/StepVisual_MarkerMember.cxx b/src/StepVisual/StepVisual_MarkerMember.cxx
index 6efe172bd9..54382f31f7 100644
--- a/src/StepVisual/StepVisual_MarkerMember.cxx
+++ b/src/StepVisual/StepVisual_MarkerMember.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepData_EnumTool.hxx>
 #include <StepVisual_MarkerMember.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_MarkerMember.hxx b/src/StepVisual/StepVisual_MarkerMember.hxx
index af0facabdc..0e6dfd5aa2 100644
--- a/src/StepVisual/StepVisual_MarkerMember.hxx
+++ b/src/StepVisual/StepVisual_MarkerMember.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepData_SelectInt.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
 #include <Standard_Integer.hxx>
 #include <StepVisual_MarkerType.hxx>
 
diff --git a/src/StepVisual/StepVisual_NullStyle.hxx b/src/StepVisual/StepVisual_NullStyle.hxx
index 6eff163166..1eb9583e94 100644
--- a/src/StepVisual/StepVisual_NullStyle.hxx
+++ b/src/StepVisual/StepVisual_NullStyle.hxx
@@ -16,8 +16,6 @@
 #ifndef _StepVisual_NullStyle_HeaderFile
 #define _StepVisual_NullStyle_HeaderFile
 
-#include <Standard_PrimitiveTypes.hxx>
-
 enum StepVisual_NullStyle {
   StepVisual_Null
 };
diff --git a/src/StepVisual/StepVisual_OverRidingStyledItem.cxx b/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
index 445dafc17e..88e4597b3e 100644
--- a/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
+++ b/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepRepr_RepresentationItem.hxx>
 #include <StepVisual_OverRidingStyledItem.hxx>
 #include <StepVisual_StyledItem.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_OverRidingStyledItem.hxx b/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
index 87657c926d..cc3dfda5f6 100644
--- a/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
+++ b/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_OverRidingStyledItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_StyledItem.hxx>
 #include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
diff --git a/src/StepVisual/StepVisual_PlanarBox.cxx b/src/StepVisual/StepVisual_PlanarBox.cxx
index 1756007d17..7eb2e72a81 100644
--- a/src/StepVisual/StepVisual_PlanarBox.cxx
+++ b/src/StepVisual/StepVisual_PlanarBox.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
 #include <StepVisual_PlanarBox.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_PlanarBox.hxx b/src/StepVisual/StepVisual_PlanarBox.hxx
index 1f0b5bdee6..0422a35323 100644
--- a/src/StepVisual/StepVisual_PlanarBox.hxx
+++ b/src/StepVisual/StepVisual_PlanarBox.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_PlanarBox_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_Axis2Placement.hxx>
 #include <StepVisual_PlanarExtent.hxx>
diff --git a/src/StepVisual/StepVisual_PlanarExtent.cxx b/src/StepVisual/StepVisual_PlanarExtent.cxx
index 6df0eb6961..3ecd84df85 100644
--- a/src/StepVisual/StepVisual_PlanarExtent.cxx
+++ b/src/StepVisual/StepVisual_PlanarExtent.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PlanarExtent.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_PointStyle.cxx b/src/StepVisual/StepVisual_PointStyle.cxx
index 824113b13d..93cb10a525 100644
--- a/src/StepVisual/StepVisual_PointStyle.cxx
+++ b/src/StepVisual/StepVisual_PointStyle.cxx
@@ -12,10 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepBasic_SizeSelect.hxx>
 #include <StepVisual_Colour.hxx>
-#include <StepVisual_MarkerSelect.hxx>
 #include <StepVisual_PointStyle.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_PreDefinedItem.cxx b/src/StepVisual/StepVisual_PreDefinedItem.cxx
index 412d5a7fd8..63632c5790 100644
--- a/src/StepVisual/StepVisual_PreDefinedItem.cxx
+++ b/src/StepVisual/StepVisual_PreDefinedItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PreDefinedItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
index 4b7a7378bc..b29fe21014 100644
--- a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
+++ b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepVisual_LayeredItem.hxx>
 #include <StepVisual_PresentationLayerAssignment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_PresentationLayerUsage.cxx b/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
index 424986cd33..6d422996aa 100644
--- a/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
+++ b/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PresentationLayerAssignment.hxx>
 #include <StepVisual_PresentationLayerUsage.hxx>
 #include <StepVisual_PresentationRepresentation.hxx>
diff --git a/src/StepVisual/StepVisual_PresentationSize.cxx b/src/StepVisual/StepVisual_PresentationSize.cxx
index 0559ceceab..57cab2552a 100644
--- a/src/StepVisual/StepVisual_PresentationSize.cxx
+++ b/src/StepVisual/StepVisual_PresentationSize.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PlanarBox.hxx>
 #include <StepVisual_PresentationSize.hxx>
 #include <StepVisual_PresentationSizeAssignmentSelect.hxx>
diff --git a/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx b/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
index 50a71fb7d7..52ca6c8328 100644
--- a/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
+++ b/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PresentationStyleAssignment.hxx>
 #include <StepVisual_PresentationStyleSelect.hxx>
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx b/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
index 86374428bc..d9a28b1f79 100644
--- a/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
+++ b/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_PresentationStyleAssignment_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfPresentationStyleSelect.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepVisual/StepVisual_PresentationStyleByContext.cxx b/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
index 73c82f43f4..c20511f242 100644
--- a/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
+++ b/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_PresentationStyleByContext.hxx>
 #include <StepVisual_StyleContextSelect.hxx>
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleByContext.hxx b/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
index 84ad0f4a3b..dbc53fd5bc 100644
--- a/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
+++ b/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_PresentationStyleByContext_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_StyleContextSelect.hxx>
 #include <StepVisual_PresentationStyleAssignment.hxx>
diff --git a/src/StepVisual/StepVisual_PresentationStyleSelect.cxx b/src/StepVisual/StepVisual_PresentationStyleSelect.cxx
index 3e67e19c3e..080bfc3c9d 100644
--- a/src/StepVisual/StepVisual_PresentationStyleSelect.cxx
+++ b/src/StepVisual/StepVisual_PresentationStyleSelect.cxx
@@ -20,7 +20,6 @@
 #include <StepVisual_PointStyle.hxx>
 #include <StepVisual_PresentationStyleSelect.hxx>
 #include <StepVisual_SurfaceStyleUsage.hxx>
-#include <StepVisual_TextStyle.hxx>
 
 StepVisual_PresentationStyleSelect::StepVisual_PresentationStyleSelect () {  }
 
diff --git a/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx b/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
index 75a629f8f8..bb057ed467 100644
--- a/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
+++ b/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepVisual_PresentationRepresentationSelect.hxx>
 #include <StepVisual_PresentedItem.hxx>
 #include <StepVisual_PresentedItemRepresentation.hxx>
 
diff --git a/src/StepVisual/StepVisual_StyledItem.cxx b/src/StepVisual/StepVisual_StyledItem.cxx
index 781cb180ab..7dc714e919 100644
--- a/src/StepVisual/StepVisual_StyledItem.cxx
+++ b/src/StepVisual/StepVisual_StyledItem.cxx
@@ -11,9 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Standard_Type.hxx>
-#include <StepRepr_RepresentationItem.hxx>
-#include <StepVisual_PresentationStyleAssignment.hxx>
 #include <StepVisual_StyledItem.hxx>
 #include <StepVisual_StyledItemTarget.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_StyledItem.hxx b/src/StepVisual/StepVisual_StyledItem.hxx
index dac69fc50c..b02fbf5586 100644
--- a/src/StepVisual/StepVisual_StyledItem.hxx
+++ b/src/StepVisual/StepVisual_StyledItem.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_StyledItem_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfPresentationStyleAssignment.hxx>
 #include <StepRepr_RepresentationItem.hxx>
diff --git a/src/StepVisual/StepVisual_SurfaceSideStyle.cxx b/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
index a345ff7545..6e004ffb4d 100644
--- a/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
+++ b/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_SurfaceSideStyle.hxx>
 #include <StepVisual_SurfaceStyleElementSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_SurfaceSideStyle.hxx b/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
index e64d8c216b..57ac86d34c 100644
--- a/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
+++ b/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_SurfaceSideStyle_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_HArray1OfSurfaceStyleElementSelect.hxx>
 #include <Standard_Transient.hxx>
diff --git a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
index 3cf70039e9..68a621201e 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleBoundary.hxx>
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
index 45697e255f..a7545e057f 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleControlGrid.hxx>
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleElementSelect.cxx b/src/StepVisual/StepVisual_SurfaceStyleElementSelect.cxx
index a004d195cc..74d7a7c820 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleElementSelect.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleElementSelect.cxx
@@ -19,8 +19,6 @@
 #include <StepVisual_SurfaceStyleElementSelect.hxx>
 #include <StepVisual_SurfaceStyleFillArea.hxx>
 #include <StepVisual_SurfaceStyleParameterLine.hxx>
-#include <StepVisual_SurfaceStyleSegmentationCurve.hxx>
-#include <StepVisual_SurfaceStyleSilhouette.hxx>
 #include <StepVisual_SurfaceStyleRendering.hxx>
 
 StepVisual_SurfaceStyleElementSelect::StepVisual_SurfaceStyleElementSelect () {  }
diff --git a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
index 69266065d0..467a2bf921 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_FillAreaStyle.hxx>
 #include <StepVisual_SurfaceStyleFillArea.hxx>
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
index ea20644250..cad5b4fc52 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
@@ -12,9 +12,7 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyle.hxx>
-#include <StepVisual_DirectionCountSelect.hxx>
 #include <StepVisual_SurfaceStyleParameterLine.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleParameterLine,Standard_Transient)
diff --git a/src/StepVisual/StepVisual_SurfaceStyleRenderingWithProperties.hxx b/src/StepVisual/StepVisual_SurfaceStyleRenderingWithProperties.hxx
index df4106b992..0ce0f2b8d6 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleRenderingWithProperties.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleRenderingWithProperties.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_SurfaceStyleRenderingWithProperties_HeaderFile_
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 #include <StepVisual_SurfaceStyleRendering.hxx>
 
 #include <StepVisual_ShadingSurfaceMethod.hxx>
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
index 7a91387694..e38f7bbb26 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleSegmentationCurve.hxx>
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
index ac50203c43..b9343992b7 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleSilhouette.hxx>
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx b/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
index 2b0be499b7..4aa246f015 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_SurfaceSideStyle.hxx>
 #include <StepVisual_SurfaceStyleUsage.hxx>
 
diff --git a/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.cxx b/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.cxx
index 0435ec692a..405ce5cfe7 100644
--- a/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.cxx
+++ b/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.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 <StepVisual_TessellatedAnnotationOccurrence.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedAnnotationOccurrence,StepVisual_StyledItem);
diff --git a/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.hxx b/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.hxx
index 1656db6b14..ca7f4f1b60 100644
--- a/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.hxx
+++ b/src/StepVisual/StepVisual_TessellatedAnnotationOccurrence.hxx
@@ -17,7 +17,6 @@
 #define _StepVisual_TessellatedAnnotationOccurrence_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepVisual_StyledItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_TessellatedCurveSet.cxx b/src/StepVisual/StepVisual_TessellatedCurveSet.cxx
index f6d6e25b80..ce5faf86c7 100644
--- a/src/StepVisual/StepVisual_TessellatedCurveSet.cxx
+++ b/src/StepVisual/StepVisual_TessellatedCurveSet.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_TessellatedCurveSet.hxx>
 #include <StepVisual_TessellatedItem.hxx>
 
diff --git a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
index 8cad96a91d..da4f391e21 100644
--- a/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
+++ b/src/StepVisual/StepVisual_TessellatedGeometricSet.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_TessellatedGeometricSet.hxx>
 
 
diff --git a/src/StepVisual/StepVisual_TessellatedItem.cxx b/src/StepVisual/StepVisual_TessellatedItem.cxx
index 734b9f38da..29f7c8b7d0 100644
--- a/src/StepVisual/StepVisual_TessellatedItem.cxx
+++ b/src/StepVisual/StepVisual_TessellatedItem.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_TessellatedItem.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TessellatedItem,StepGeom_GeometricRepresentationItem)
diff --git a/src/StepVisual/StepVisual_TextLiteral.cxx b/src/StepVisual/StepVisual_TextLiteral.cxx
index 3e365722c8..f021ecd6fb 100644
--- a/src/StepVisual/StepVisual_TextLiteral.cxx
+++ b/src/StepVisual/StepVisual_TextLiteral.cxx
@@ -12,9 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepGeom_Axis2Placement.hxx>
-#include <StepVisual_FontSelect.hxx>
 #include <StepVisual_TextLiteral.hxx>
 #include <TCollection_HAsciiString.hxx>
 
diff --git a/src/StepVisual/StepVisual_TextLiteral.hxx b/src/StepVisual/StepVisual_TextLiteral.hxx
index 5084dd0eb1..1755364e1f 100644
--- a/src/StepVisual/StepVisual_TextLiteral.hxx
+++ b/src/StepVisual/StepVisual_TextLiteral.hxx
@@ -18,7 +18,6 @@
 #define _StepVisual_TextLiteral_HeaderFile
 
 #include <Standard.hxx>
-#include <Standard_Type.hxx>
 
 #include <StepGeom_Axis2Placement.hxx>
 #include <StepVisual_TextPath.hxx>
diff --git a/src/StepVisual/StepVisual_TextStyle.cxx b/src/StepVisual/StepVisual_TextStyle.cxx
index eaf28c0964..3159c8ff54 100644
--- a/src/StepVisual/StepVisual_TextStyle.cxx
+++ b/src/StepVisual/StepVisual_TextStyle.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepVisual_TextStyle.hxx>
 #include <StepVisual_TextStyleForDefinedFont.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
index 73ccc3e809..9333f9593e 100644
--- a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
+++ b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
@@ -12,8 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
-#include <StepVisual_BoxCharacteristicSelect.hxx>
 #include <StepVisual_TextStyleForDefinedFont.hxx>
 #include <StepVisual_TextStyleWithBoxCharacteristics.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/StepVisual/StepVisual_ViewVolume.cxx b/src/StepVisual/StepVisual_ViewVolume.cxx
index 66b75c3967..39800415a9 100644
--- a/src/StepVisual/StepVisual_ViewVolume.cxx
+++ b/src/StepVisual/StepVisual_ViewVolume.cxx
@@ -12,7 +12,6 @@
 // commercial license or contractual agreement.
 
 
-#include <Standard_Type.hxx>
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepVisual_PlanarBox.hxx>
 #include <StepVisual_ViewVolume.hxx>
diff --git a/src/StepVisual/StepVisual_ViewVolume.hxx b/src/StepVisual/StepVisual_ViewVolume.hxx
index 5ccbfb1c0d..56d8de03d6 100644
--- a/src/StepVisual/StepVisual_ViewVolume.hxx
+++ b/src/StepVisual/StepVisual_ViewVolume.hxx
@@ -21,8 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <StepVisual_CentralOrParallel.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Boolean.hxx>
 #include <Standard_Transient.hxx>
 class StepGeom_CartesianPoint;
 class StepVisual_PlanarBox;
diff --git a/src/StlAPI/StlAPI.hxx b/src/StlAPI/StlAPI.hxx
index cdf33f1087..e54264e039 100644
--- a/src/StlAPI/StlAPI.hxx
+++ b/src/StlAPI/StlAPI.hxx
@@ -20,9 +20,7 @@
 #include <Poly_Triangulation.hxx>
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
 #include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
 class TopoDS_Shape;
 
 //! Offers the API for STL data manipulation.
diff --git a/src/StlAPI/StlAPI_Reader.cxx b/src/StlAPI/StlAPI_Reader.cxx
index e64f2db15a..748d6557eb 100644
--- a/src/StlAPI/StlAPI_Reader.cxx
+++ b/src/StlAPI/StlAPI_Reader.cxx
@@ -19,13 +19,10 @@
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
 #include <gp_Pnt.hxx>
-#include <OSD_Path.hxx>
 #include <RWStl.hxx>
 #include <TopoDS_Compound.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Shell.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
diff --git a/src/StlAPI/StlAPI_Reader.hxx b/src/StlAPI/StlAPI_Reader.hxx
index a7b6459e75..4e0b2005ce 100644
--- a/src/StlAPI/StlAPI_Reader.hxx
+++ b/src/StlAPI/StlAPI_Reader.hxx
@@ -16,10 +16,7 @@
 #ifndef _StlAPI_Reader_HeaderFile
 #define _StlAPI_Reader_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
 #include <Standard_Handle.hxx>
-#include <Standard_CString.hxx>
 
 class TopoDS_Shape;
 
diff --git a/src/StlAPI/StlAPI_Writer.cxx b/src/StlAPI/StlAPI_Writer.cxx
index 34d02207a3..ef9d1fc09e 100644
--- a/src/StlAPI/StlAPI_Writer.cxx
+++ b/src/StlAPI/StlAPI_Writer.cxx
@@ -14,10 +14,7 @@
 #include <StlAPI_Writer.hxx>
 
 #include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
 #include <Message.hxx>
-#include <Message_Messenger.hxx>
-#include <OSD_Path.hxx>
 #include <OSD_OpenFile.hxx>
 #include <RWStl.hxx>
 #include <BRep_Tool.hxx>