diff --git a/src/IGESAppli/IGESAppli.hxx b/src/IGESAppli/IGESAppli.hxx
index 1f544e9645..a908a0b797 100644
--- a/src/IGESAppli/IGESAppli.hxx
+++ b/src/IGESAppli/IGESAppli.hxx
@@ -22,48 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESAppli_Protocol;
-class IGESAppli_Node;
-class IGESAppli_FiniteElement;
-class IGESAppli_NodalDisplAndRot;
-class IGESAppli_NodalResults;
-class IGESAppli_ElementResults;
-class IGESAppli_Flow;
-class IGESAppli_PipingFlow;
-class IGESAppli_RegionRestriction;
-class IGESAppli_LevelFunction;
-class IGESAppli_LineWidening;
-class IGESAppli_DrilledHole;
-class IGESAppli_ReferenceDesignator;
-class IGESAppli_PinNumber;
-class IGESAppli_PartNumber;
-class IGESAppli_FlowLineSpec;
-class IGESAppli_LevelToPWBLayerMap;
-class IGESAppli_PWBArtworkStackup;
-class IGESAppli_PWBDrilledHole;
-class IGESAppli_NodalConstraint;
-class IGESAppli_ToolNode;
-class IGESAppli_ToolFiniteElement;
-class IGESAppli_ToolNodalDisplAndRot;
-class IGESAppli_ToolNodalResults;
-class IGESAppli_ToolElementResults;
-class IGESAppli_ToolFlow;
-class IGESAppli_ToolPipingFlow;
-class IGESAppli_ToolRegionRestriction;
-class IGESAppli_ToolLevelFunction;
-class IGESAppli_ToolLineWidening;
-class IGESAppli_ToolDrilledHole;
-class IGESAppli_ToolReferenceDesignator;
-class IGESAppli_ToolPinNumber;
-class IGESAppli_ToolPartNumber;
-class IGESAppli_ToolFlowLineSpec;
-class IGESAppli_ToolLevelToPWBLayerMap;
-class IGESAppli_ToolPWBArtworkStackup;
-class IGESAppli_ToolPWBDrilledHole;
-class IGESAppli_ToolNodalConstraint;
-class IGESAppli_Protocol;
-class IGESAppli_ReadWriteModule;
-class IGESAppli_GeneralModule;
-class IGESAppli_SpecificModule;
 
 
 //! This package represents collection of miscellaneous
diff --git a/src/IGESAppli/IGESAppli_ElementResults.hxx b/src/IGESAppli/IGESAppli_ElementResults.hxx
index f265002969..030c1cf391 100644
--- a/src/IGESAppli/IGESAppli_ElementResults.hxx
+++ b/src/IGESAppli/IGESAppli_ElementResults.hxx
@@ -29,8 +29,6 @@
 class IGESDimen_GeneralNote;
 class IGESBasic_HArray1OfHArray1OfInteger;
 class IGESBasic_HArray1OfHArray1OfReal;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESAppli_FiniteElement;
 
 
diff --git a/src/IGESAppli/IGESAppli_FiniteElement.hxx b/src/IGESAppli/IGESAppli_FiniteElement.hxx
index 77d59a4ed4..4782f02abb 100644
--- a/src/IGESAppli/IGESAppli_FiniteElement.hxx
+++ b/src/IGESAppli/IGESAppli_FiniteElement.hxx
@@ -24,7 +24,6 @@
 #include <IGESAppli_HArray1OfNode.hxx>
 #include <IGESData_IGESEntity.hxx>
 class TCollection_HAsciiString;
-class Standard_OutOfRange;
 class IGESAppli_Node;
 
 
diff --git a/src/IGESAppli/IGESAppli_Flow.hxx b/src/IGESAppli/IGESAppli_Flow.hxx
index 6d24843dd3..3d479f8852 100644
--- a/src/IGESAppli/IGESAppli_Flow.hxx
+++ b/src/IGESAppli/IGESAppli_Flow.hxx
@@ -27,8 +27,6 @@
 #include <IGESGraph_HArray1OfTextDisplayTemplate.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESDraw_ConnectPoint;
 class TCollection_HAsciiString;
 class IGESGraph_TextDisplayTemplate;
diff --git a/src/IGESAppli/IGESAppli_FlowLineSpec.hxx b/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
index 13f1b6bdd1..97050df9e4 100644
--- a/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
+++ b/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
@@ -23,7 +23,6 @@
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class TCollection_HAsciiString;
 
 
diff --git a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
index 66aaddd1a1..2604d9c991 100644
--- a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
+++ b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
@@ -24,8 +24,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <IGESData_IGESEntity.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class TCollection_HAsciiString;
 
 
diff --git a/src/IGESAppli/IGESAppli_NodalConstraint.hxx b/src/IGESAppli/IGESAppli_NodalConstraint.hxx
index db54f948e7..e67a3b567d 100644
--- a/src/IGESAppli/IGESAppli_NodalConstraint.hxx
+++ b/src/IGESAppli/IGESAppli_NodalConstraint.hxx
@@ -24,7 +24,6 @@
 #include <IGESDefs_HArray1OfTabularData.hxx>
 #include <IGESData_IGESEntity.hxx>
 class IGESAppli_Node;
-class Standard_OutOfRange;
 class IGESDefs_TabularData;
 
 
diff --git a/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx b/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
index 7e9f7e064b..66748c696a 100644
--- a/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
+++ b/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
@@ -26,8 +26,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 class IGESBasic_HArray1OfHArray1OfXYZ;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESDimen_GeneralNote;
 class IGESAppli_Node;
 class gp_XYZ;
diff --git a/src/IGESAppli/IGESAppli_NodalResults.hxx b/src/IGESAppli/IGESAppli_NodalResults.hxx
index 43315cc724..728a9b50ec 100644
--- a/src/IGESAppli/IGESAppli_NodalResults.hxx
+++ b/src/IGESAppli/IGESAppli_NodalResults.hxx
@@ -27,8 +27,6 @@
 #include <TColStd_HArray2OfReal.hxx>
 #include <IGESData_IGESEntity.hxx>
 class IGESDimen_GeneralNote;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESAppli_Node;
 
 
diff --git a/src/IGESAppli/IGESAppli_Node.hxx b/src/IGESAppli/IGESAppli_Node.hxx
index 5cfd9a16af..38d9a348d3 100644
--- a/src/IGESAppli/IGESAppli_Node.hxx
+++ b/src/IGESAppli/IGESAppli_Node.hxx
@@ -24,7 +24,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 class IGESGeom_TransformationMatrix;
-class gp_XYZ;
 class gp_Pnt;
 class IGESData_TransfEntity;
 
diff --git a/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx b/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
index bc97bc7f35..62083d959c 100644
--- a/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
+++ b/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
@@ -24,7 +24,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
 class TCollection_HAsciiString;
-class Standard_OutOfRange;
 
 
 class IGESAppli_PWBArtworkStackup;
diff --git a/src/IGESAppli/IGESAppli_PipingFlow.hxx b/src/IGESAppli/IGESAppli_PipingFlow.hxx
index 46f1f52886..8905e7e0fe 100644
--- a/src/IGESAppli/IGESAppli_PipingFlow.hxx
+++ b/src/IGESAppli/IGESAppli_PipingFlow.hxx
@@ -27,8 +27,6 @@
 #include <IGESGraph_HArray1OfTextDisplayTemplate.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESDraw_ConnectPoint;
 class TCollection_HAsciiString;
 class IGESGraph_TextDisplayTemplate;
diff --git a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
index 31a31bdd77..62f7076cc2 100644
--- a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
+++ b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx b/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx
index 473dfd3056..1150564106 100644
--- a/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx
+++ b/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_DrilledHole;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolElementResults.hxx b/src/IGESAppli/IGESAppli_ToolElementResults.hxx
index e996ebbed9..3029743d52 100644
--- a/src/IGESAppli/IGESAppli_ToolElementResults.hxx
+++ b/src/IGESAppli/IGESAppli_ToolElementResults.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_ElementResults;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx b/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx
index 978ac7ca35..277ba8a2cb 100644
--- a/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx
+++ b/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_FiniteElement;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolFlow.hxx b/src/IGESAppli/IGESAppli_ToolFlow.hxx
index fc35b3984e..c66bf98329 100644
--- a/src/IGESAppli/IGESAppli_ToolFlow.hxx
+++ b/src/IGESAppli/IGESAppli_ToolFlow.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_Flow;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx
index c28a1031d7..97ff631faa 100644
--- a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx
+++ b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_FlowLineSpec;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx b/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx
index 7dae8c9608..89ef3a8e82 100644
--- a/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx
+++ b/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_LevelFunction;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx
index 4b0993b044..9ada97b73f 100644
--- a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx
+++ b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_LevelToPWBLayerMap;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolLineWidening.hxx b/src/IGESAppli/IGESAppli_ToolLineWidening.hxx
index d636db929c..f5b2c2893d 100644
--- a/src/IGESAppli/IGESAppli_ToolLineWidening.hxx
+++ b/src/IGESAppli/IGESAppli_ToolLineWidening.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_LineWidening;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx b/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx
index d863240d3e..1f4d5764ac 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx
+++ b/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_NodalConstraint;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx
index e5caf713a2..9d07f5ea9d 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx
+++ b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_NodalDisplAndRot;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolNodalResults.hxx b/src/IGESAppli/IGESAppli_ToolNodalResults.hxx
index 791c425033..f6a9ab4825 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalResults.hxx
+++ b/src/IGESAppli/IGESAppli_ToolNodalResults.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_NodalResults;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolNode.hxx b/src/IGESAppli/IGESAppli_ToolNode.hxx
index 1248c827eb..2e0fd6ba9f 100644
--- a/src/IGESAppli/IGESAppli_ToolNode.hxx
+++ b/src/IGESAppli/IGESAppli_ToolNode.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_Node;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx
index d0cb039ff3..269745271f 100644
--- a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx
+++ b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_PWBArtworkStackup;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx
index b15c9cecf7..8cc2f9fffb 100644
--- a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx
+++ b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_PWBDrilledHole;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolPartNumber.hxx b/src/IGESAppli/IGESAppli_ToolPartNumber.hxx
index 748f671e83..47f45ee310 100644
--- a/src/IGESAppli/IGESAppli_ToolPartNumber.hxx
+++ b/src/IGESAppli/IGESAppli_ToolPartNumber.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_PartNumber;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolPinNumber.hxx b/src/IGESAppli/IGESAppli_ToolPinNumber.hxx
index f5476a7df6..ab82b96de2 100644
--- a/src/IGESAppli/IGESAppli_ToolPinNumber.hxx
+++ b/src/IGESAppli/IGESAppli_ToolPinNumber.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_PinNumber;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx b/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx
index 7d0c1bf87c..cc0c7ed747 100644
--- a/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx
+++ b/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_PipingFlow;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx
index 1e8b5767f8..21f6ac20fe 100644
--- a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx
+++ b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_ReferenceDesignator;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx b/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx
index cc949d47bf..b9d9d42342 100644
--- a/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx
+++ b/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESAppli_RegionRestriction;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic.hxx b/src/IGESBasic/IGESBasic.hxx
index 349d64f326..b510441f10 100644
--- a/src/IGESBasic/IGESBasic.hxx
+++ b/src/IGESBasic/IGESBasic.hxx
@@ -22,47 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESBasic_Protocol;
-class IGESBasic_SubfigureDef;
-class IGESBasic_Group;
-class IGESBasic_GroupWithoutBackP;
-class IGESBasic_SingleParent;
-class IGESBasic_ExternalRefFileIndex;
-class IGESBasic_OrderedGroup;
-class IGESBasic_OrderedGroupWithoutBackP;
-class IGESBasic_Hierarchy;
-class IGESBasic_ExternalReferenceFile;
-class IGESBasic_Name;
-class IGESBasic_AssocGroupType;
-class IGESBasic_SingularSubfigure;
-class IGESBasic_ExternalRefFileName;
-class IGESBasic_ExternalRefFile;
-class IGESBasic_ExternalRefName;
-class IGESBasic_ExternalRefLibName;
-class IGESBasic_ToolSubfigureDef;
-class IGESBasic_ToolGroup;
-class IGESBasic_ToolGroupWithoutBackP;
-class IGESBasic_ToolSingleParent;
-class IGESBasic_ToolExternalRefFileIndex;
-class IGESBasic_ToolOrderedGroup;
-class IGESBasic_ToolOrderedGroupWithoutBackP;
-class IGESBasic_ToolHierarchy;
-class IGESBasic_ToolExternalReferenceFile;
-class IGESBasic_ToolName;
-class IGESBasic_ToolAssocGroupType;
-class IGESBasic_ToolSingularSubfigure;
-class IGESBasic_ToolExternalRefFileName;
-class IGESBasic_ToolExternalRefFile;
-class IGESBasic_ToolExternalRefName;
-class IGESBasic_ToolExternalRefLibName;
-class IGESBasic_Protocol;
-class IGESBasic_ReadWriteModule;
-class IGESBasic_GeneralModule;
-class IGESBasic_SpecificModule;
-class IGESBasic_HArray1OfHArray1OfInteger;
-class IGESBasic_HArray1OfHArray1OfReal;
-class IGESBasic_HArray1OfHArray1OfXY;
-class IGESBasic_HArray1OfHArray1OfXYZ;
-class IGESBasic_HArray1OfHArray1OfIGESEntity;
 
 
 //! This package represents basic entities from IGES
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
index c024dbe606..33b2eeef48 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
@@ -24,10 +24,7 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class TCollection_HAsciiString;
-class IGESData_IGESEntity;
 
 
 class IGESBasic_ExternalRefFileIndex;
diff --git a/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx b/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
index 8cd328719e..6f91ca8d05 100644
--- a/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
@@ -23,7 +23,6 @@
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class TCollection_HAsciiString;
 
 
diff --git a/src/IGESBasic/IGESBasic_Group.hxx b/src/IGESBasic/IGESBasic_Group.hxx
index fbcd4f3a6a..fe8bb6fb9c 100644
--- a/src/IGESBasic/IGESBasic_Group.hxx
+++ b/src/IGESBasic/IGESBasic_Group.hxx
@@ -24,8 +24,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class Standard_Transient;
 
 
diff --git a/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
index b5c792ada2..3e6c8a6220 100644
--- a/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESBasic_Group.hxx>
-class Standard_OutOfRange;
 
 
 class IGESBasic_GroupWithoutBackP;
diff --git a/src/IGESBasic/IGESBasic_OrderedGroup.hxx b/src/IGESBasic/IGESBasic_OrderedGroup.hxx
index fb34b2f636..0f7202dff4 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroup.hxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroup.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESBasic_Group.hxx>
-class Standard_OutOfRange;
 
 
 class IGESBasic_OrderedGroup;
diff --git a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
index 7945ab1267..c7f65e7a76 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IGESBasic_Group.hxx>
-class Standard_OutOfRange;
 
 
 class IGESBasic_OrderedGroupWithoutBackP;
diff --git a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
index 8075ff2e24..5230add9f8 100644
--- a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
+++ b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_SingleParent.hxx b/src/IGESBasic/IGESBasic_SingleParent.hxx
index a1e3f6bed8..40b24c9022 100644
--- a/src/IGESBasic/IGESBasic_SingleParent.hxx
+++ b/src/IGESBasic/IGESBasic_SingleParent.hxx
@@ -24,7 +24,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_SingleParentEntity.hxx>
 class IGESData_IGESEntity;
-class Standard_OutOfRange;
 
 
 class IGESBasic_SingleParent;
diff --git a/src/IGESBasic/IGESBasic_SingularSubfigure.hxx b/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
index e08f576496..0873c80aef 100644
--- a/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
+++ b/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Boolean.hxx>
 #include <IGESData_IGESEntity.hxx>
 class IGESBasic_SubfigureDef;
-class gp_XYZ;
 
 
 class IGESBasic_SingularSubfigure;
diff --git a/src/IGESBasic/IGESBasic_SubfigureDef.hxx b/src/IGESBasic/IGESBasic_SubfigureDef.hxx
index 8446f7a1ac..7a649d076d 100644
--- a/src/IGESBasic/IGESBasic_SubfigureDef.hxx
+++ b/src/IGESBasic/IGESBasic_SubfigureDef.hxx
@@ -24,8 +24,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
 class TCollection_HAsciiString;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class Standard_Transient;
 
 
diff --git a/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx b/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx
index 0e94b2d3c1..d15030a897 100644
--- a/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx
+++ b/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_AssocGroupType;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx
index c8f39e3668..3880c28145 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalRefFile;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx
index 637b90448b..bf3ea4a328 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalRefFileIndex;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx
index e74c8f38c4..430e5fe853 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalRefFileName;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx
index cf6a1007ec..6309292124 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalRefLibName;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx
index 3afda60316..4dc4140add 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalRefName;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx
index a9fae5b3c5..5d104d0df1 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx
+++ b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_ExternalReferenceFile;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolGroup.hxx b/src/IGESBasic/IGESBasic_ToolGroup.hxx
index 9e0654e8d3..6f9c763823 100644
--- a/src/IGESBasic/IGESBasic_ToolGroup.hxx
+++ b/src/IGESBasic/IGESBasic_ToolGroup.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_Group;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
@@ -34,7 +33,6 @@ class Interface_ShareTool;
 class Interface_Check;
 class Interface_CopyTool;
 class IGESData_IGESDumper;
-class Message_Messenger;
 
 
 //! Tool to work on a Group. Called by various Modules
diff --git a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx
index bb60ec712d..a9851b5841 100644
--- a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_GroupWithoutBackP;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolHierarchy.hxx b/src/IGESBasic/IGESBasic_ToolHierarchy.hxx
index bb45ef6439..cf353edc4a 100644
--- a/src/IGESBasic/IGESBasic_ToolHierarchy.hxx
+++ b/src/IGESBasic/IGESBasic_ToolHierarchy.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_Hierarchy;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolName.hxx b/src/IGESBasic/IGESBasic_ToolName.hxx
index 75e22583a0..9ab40e0ba3 100644
--- a/src/IGESBasic/IGESBasic_ToolName.hxx
+++ b/src/IGESBasic/IGESBasic_ToolName.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_Name;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx b/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx
index 1e688686c2..0a63ce4678 100644
--- a/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx
+++ b/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_OrderedGroup;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx
index b5e4c94d7b..540302f5ea 100644
--- a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_OrderedGroupWithoutBackP;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolSingleParent.hxx b/src/IGESBasic/IGESBasic_ToolSingleParent.hxx
index 7c41f36de1..485b3e523e 100644
--- a/src/IGESBasic/IGESBasic_ToolSingleParent.hxx
+++ b/src/IGESBasic/IGESBasic_ToolSingleParent.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_SingleParent;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx
index 6c4c764e56..73cdba3c13 100644
--- a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx
+++ b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_SingularSubfigure;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx b/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx
index 9cf6b87818..1a56bd4a2d 100644
--- a/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx
+++ b/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESBasic_SubfigureDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESCAFControl/IGESCAFControl.hxx b/src/IGESCAFControl/IGESCAFControl.hxx
index 7fc3072155..a4f2ba1537 100644
--- a/src/IGESCAFControl/IGESCAFControl.hxx
+++ b/src/IGESCAFControl/IGESCAFControl.hxx
@@ -22,8 +22,6 @@
 
 #include <Standard_Integer.hxx>
 class Quantity_Color;
-class IGESCAFControl_Reader;
-class IGESCAFControl_Writer;
 
 
 //! Provides high-level API to translate IGES file
diff --git a/src/IGESConvGeom/IGESConvGeom.hxx b/src/IGESConvGeom/IGESConvGeom.hxx
index 98e1f64969..1aaf695398 100644
--- a/src/IGESConvGeom/IGESConvGeom.hxx
+++ b/src/IGESConvGeom/IGESConvGeom.hxx
@@ -28,7 +28,6 @@ class Geom_BSplineCurve;
 class Geom2d_BSplineCurve;
 class IGESGeom_SplineSurface;
 class Geom_BSplineSurface;
-class IGESConvGeom_GeomBuilder;
 
 
 //! This package is intended to gather geometric conversion which
diff --git a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.hxx b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.hxx
index 04535256d3..57f67d80fc 100644
--- a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.hxx
+++ b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.hxx
@@ -26,11 +26,9 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
-class Standard_DomainError;
 class gp_XY;
 class gp_XYZ;
 class IGESGeom_CopiousData;
-class gp_Trsf;
 class gp_Ax3;
 class gp_Ax2;
 class gp_Ax1;
diff --git a/src/IGESData/IGESData.hxx b/src/IGESData/IGESData.hxx
index 51466e4541..a8bc86e407 100644
--- a/src/IGESData/IGESData.hxx
+++ b/src/IGESData/IGESData.hxx
@@ -22,45 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESData_Protocol;
-class IGESData_Protocol;
-class IGESData_IGESModel;
-class IGESData_IGESEntity;
-class IGESData_LineFontEntity;
-class IGESData_LevelListEntity;
-class IGESData_TransfEntity;
-class IGESData_ViewKindEntity;
-class IGESData_LabelDisplayEntity;
-class IGESData_ColorEntity;
-class IGESData_NameEntity;
-class IGESData_SingleParentEntity;
-class IGESData_UndefinedEntity;
-class IGESData_FreeFormatEntity;
-class IGESData_GlobalSection;
-class IGESData_DefSwitch;
-class IGESData_DirChecker;
-class IGESData_IGESReaderData;
-class IGESData_IGESReaderTool;
-class IGESData_ParamReader;
-class IGESData_ParamCursor;
-class IGESData_DirPart;
-class IGESData_IGESType;
-class IGESData_FileRecognizer;
-class IGESData_IGESWriter;
-class IGESData_IGESDumper;
-class IGESData_BasicEditor;
-class IGESData_ToolLocation;
-class IGESData_GeneralModule;
-class IGESData_DefaultGeneral;
-class IGESData_ReadWriteModule;
-class IGESData_SpecificModule;
-class IGESData_DefaultSpecific;
-class IGESData_FileProtocol;
-class IGESData_WriterLib;
-class IGESData_SpecificLib;
-class IGESData_GlobalNodeOfWriterLib;
-class IGESData_NodeOfWriterLib;
-class IGESData_GlobalNodeOfSpecificLib;
-class IGESData_NodeOfSpecificLib;
 
 
 //! basic description of an IGES Interface
diff --git a/src/IGESData/IGESData_FileProtocol.hxx b/src/IGESData/IGESData_FileProtocol.hxx
index dfe7726808..bff334a142 100644
--- a/src/IGESData/IGESData_FileProtocol.hxx
+++ b/src/IGESData/IGESData_FileProtocol.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_Protocol.hxx>
 #include <Standard_Integer.hxx>
-class IGESData_Protocol;
 class Interface_Protocol;
 
 class IGESData_FileProtocol;
diff --git a/src/IGESData/IGESData_FreeFormatEntity.hxx b/src/IGESData/IGESData_FreeFormatEntity.hxx
index 6436688a17..9f5410431b 100644
--- a/src/IGESData/IGESData_FreeFormatEntity.hxx
+++ b/src/IGESData/IGESData_FreeFormatEntity.hxx
@@ -27,8 +27,6 @@
 #include <Interface_ParamType.hxx>
 #include <Standard_CString.hxx>
 #include <IGESData_HArray1OfIGESEntity.hxx>
-class Standard_OutOfRange;
-class Interface_InterfaceError;
 class IGESData_IGESEntity;
 class TCollection_HAsciiString;
 class IGESData_IGESWriter;
diff --git a/src/IGESData/IGESData_IGESDumper.hxx b/src/IGESData/IGESData_IGESDumper.hxx
index 074b809c19..9709e9effe 100644
--- a/src/IGESData/IGESData_IGESDumper.hxx
+++ b/src/IGESData/IGESData_IGESDumper.hxx
@@ -26,7 +26,6 @@
 #include <Standard_OStream.hxx>
 
 class IGESData_IGESModel;
-class Interface_InterfaceError;
 class IGESData_Protocol;
 class IGESData_IGESEntity;
 
diff --git a/src/IGESData/IGESData_IGESEntity.hxx b/src/IGESData/IGESData_IGESEntity.hxx
index 55d222f025..c754186caf 100644
--- a/src/IGESData/IGESData_IGESEntity.hxx
+++ b/src/IGESData/IGESData_IGESEntity.hxx
@@ -32,11 +32,6 @@
 #include <Standard_CString.hxx>
 #include <Standard_Type.hxx>
 class TCollection_HAsciiString;
-class Interface_InterfaceError;
-class IGESData_ReadWriteModule;
-class IGESData_GeneralModule;
-class IGESData_IGESReaderTool;
-class IGESData_DirChecker;
 class IGESData_IGESType;
 class IGESData_LineFontEntity;
 class IGESData_LevelListEntity;
@@ -46,7 +41,6 @@ class IGESData_LabelDisplayEntity;
 class IGESData_ColorEntity;
 class gp_GTrsf;
 class Interface_EntityIterator;
-class Interface_EntityList;
 
 
 class IGESData_IGESEntity;
diff --git a/src/IGESData/IGESData_IGESModel.hxx b/src/IGESData/IGESData_IGESModel.hxx
index bd893b9d8d..c3224269cb 100644
--- a/src/IGESData/IGESData_IGESModel.hxx
+++ b/src/IGESData/IGESData_IGESModel.hxx
@@ -21,10 +21,7 @@
 #include <IGESData_GlobalSection.hxx>
 #include <Interface_InterfaceModel.hxx>
 
-class Interface_InterfaceError;
-class IGESData_GlobalSection;
 class IGESData_IGESEntity;
-class Interface_InterfaceModel;
 class Interface_Check;
 class Standard_Transient;
 class TCollection_HAsciiString;
diff --git a/src/IGESData/IGESData_IGESReaderData.hxx b/src/IGESData/IGESData_IGESReaderData.hxx
index 4e99fdbd06..84275d955c 100644
--- a/src/IGESData/IGESData_IGESReaderData.hxx
+++ b/src/IGESData/IGESData_IGESReaderData.hxx
@@ -32,9 +32,7 @@
 #include <Interface_ParamType.hxx>
 class Interface_ParamSet;
 class Interface_Check;
-class IGESData_GlobalSection;
 class IGESData_DirPart;
-class IGESData_IGESType;
 
 
 class IGESData_IGESReaderData;
diff --git a/src/IGESData/IGESData_IGESWriter.hxx b/src/IGESData/IGESData_IGESWriter.hxx
index 16518d2253..7cc2107742 100644
--- a/src/IGESData/IGESData_IGESWriter.hxx
+++ b/src/IGESData/IGESData_IGESWriter.hxx
@@ -35,8 +35,6 @@
 #include <Standard_OStream.hxx>
 
 class IGESData_IGESModel;
-class Interface_InterfaceMismatch;
-class Interface_FloatWriter;
 class IGESData_Protocol;
 class IGESData_GlobalSection;
 class IGESData_IGESEntity;
diff --git a/src/IGESData/IGESData_LevelListEntity.hxx b/src/IGESData/IGESData_LevelListEntity.hxx
index 8994e3b19a..8dd88188c5 100644
--- a/src/IGESData/IGESData_LevelListEntity.hxx
+++ b/src/IGESData/IGESData_LevelListEntity.hxx
@@ -23,7 +23,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
 
 
 class IGESData_LevelListEntity;
diff --git a/src/IGESData/IGESData_ParamCursor.hxx b/src/IGESData/IGESData_ParamCursor.hxx
index a14e16f8fe..ae4b0e9ff7 100644
--- a/src/IGESData/IGESData_ParamCursor.hxx
+++ b/src/IGESData/IGESData_ParamCursor.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
 
 
 //! Auxiliary class for ParamReader.
diff --git a/src/IGESData/IGESData_ParamReader.hxx b/src/IGESData/IGESData_ParamReader.hxx
index 1787347d27..16f84c791a 100644
--- a/src/IGESData/IGESData_ParamReader.hxx
+++ b/src/IGESData/IGESData_ParamReader.hxx
@@ -35,7 +35,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 class Interface_ParamList;
 class Interface_Check;
-class Interface_InterfaceError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamCursor;
diff --git a/src/IGESData/IGESData_Protocol.hxx b/src/IGESData/IGESData_Protocol.hxx
index f37de80536..82a9ab1493 100644
--- a/src/IGESData/IGESData_Protocol.hxx
+++ b/src/IGESData/IGESData_Protocol.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Type.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_Protocol;
 class Interface_InterfaceModel;
 class Standard_Transient;
 
diff --git a/src/IGESData/IGESData_ReadWriteModule.hxx b/src/IGESData/IGESData_ReadWriteModule.hxx
index 0cee336436..61afa3c083 100644
--- a/src/IGESData/IGESData_ReadWriteModule.hxx
+++ b/src/IGESData/IGESData_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <Interface_ReaderModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class Interface_FileReaderData;
 class Interface_Check;
 class Standard_Transient;
diff --git a/src/IGESData/IGESData_SingleParentEntity.hxx b/src/IGESData/IGESData_SingleParentEntity.hxx
index 262b58c567..fb881dcdfb 100644
--- a/src/IGESData/IGESData_SingleParentEntity.hxx
+++ b/src/IGESData/IGESData_SingleParentEntity.hxx
@@ -22,8 +22,6 @@
 
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 
 
 class IGESData_SingleParentEntity;
diff --git a/src/IGESData/IGESData_ToolLocation.hxx b/src/IGESData/IGESData_ToolLocation.hxx
index 4192eb2293..e7f4900ee8 100644
--- a/src/IGESData/IGESData_ToolLocation.hxx
+++ b/src/IGESData/IGESData_ToolLocation.hxx
@@ -26,7 +26,6 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
 class IGESData_IGESModel;
-class Standard_DomainError;
 class IGESData_Protocol;
 class IGESData_IGESEntity;
 class gp_GTrsf;
diff --git a/src/IGESData/IGESData_ViewKindEntity.hxx b/src/IGESData/IGESData_ViewKindEntity.hxx
index 06b33521e6..8be4c5c8e9 100644
--- a/src/IGESData/IGESData_ViewKindEntity.hxx
+++ b/src/IGESData/IGESData_ViewKindEntity.hxx
@@ -23,7 +23,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 
 
 class IGESData_ViewKindEntity;
diff --git a/src/IGESDefs/IGESDefs.hxx b/src/IGESDefs/IGESDefs.hxx
index 6490014167..1e648f9e0d 100644
--- a/src/IGESDefs/IGESDefs.hxx
+++ b/src/IGESDefs/IGESDefs.hxx
@@ -22,25 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESDefs_Protocol;
-class IGESDefs_AssociativityDef;
-class IGESDefs_MacroDef;
-class IGESDefs_UnitsData;
-class IGESDefs_AttributeDef;
-class IGESDefs_TabularData;
-class IGESDefs_GenericData;
-class IGESDefs_AttributeTable;
-class IGESDefs_ToolAssociativityDef;
-class IGESDefs_ToolMacroDef;
-class IGESDefs_ToolUnitsData;
-class IGESDefs_ToolAttributeDef;
-class IGESDefs_ToolTabularData;
-class IGESDefs_ToolGenericData;
-class IGESDefs_ToolAttributeTable;
-class IGESDefs_Protocol;
-class IGESDefs_ReadWriteModule;
-class IGESDefs_GeneralModule;
-class IGESDefs_SpecificModule;
-class IGESDefs_HArray1OfHArray1OfTextDisplayTemplate;
 
 
 //! To embody general definitions of Entities
diff --git a/src/IGESDefs/IGESDefs_AssociativityDef.hxx b/src/IGESDefs/IGESDefs_AssociativityDef.hxx
index 905eda05b6..2235919094 100644
--- a/src/IGESDefs/IGESDefs_AssociativityDef.hxx
+++ b/src/IGESDefs/IGESDefs_AssociativityDef.hxx
@@ -25,8 +25,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 class IGESBasic_HArray1OfHArray1OfInteger;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESDefs_AssociativityDef;
diff --git a/src/IGESDefs/IGESDefs_AttributeDef.hxx b/src/IGESDefs/IGESDefs_AttributeDef.hxx
index 0dafcae8ad..5b7468199b 100644
--- a/src/IGESDefs/IGESDefs_AttributeDef.hxx
+++ b/src/IGESDefs/IGESDefs_AttributeDef.hxx
@@ -28,12 +28,8 @@
 #include <Standard_Real.hxx>
 class TCollection_HAsciiString;
 class IGESDefs_HArray1OfHArray1OfTextDisplayTemplate;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class Standard_NullObject;
 class IGESGraph_TextDisplayTemplate;
 class Standard_Transient;
-class IGESData_IGESEntity;
 
 
 class IGESDefs_AttributeDef;
diff --git a/src/IGESDefs/IGESDefs_AttributeTable.hxx b/src/IGESDefs/IGESDefs_AttributeTable.hxx
index 2ae71a9aae..5c0554ef30 100644
--- a/src/IGESDefs/IGESDefs_AttributeTable.hxx
+++ b/src/IGESDefs/IGESDefs_AttributeTable.hxx
@@ -25,12 +25,9 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class Standard_NullObject;
 class IGESDefs_AttributeDef;
 class Standard_Transient;
 class TCollection_HAsciiString;
-class IGESData_IGESEntity;
 
 
 class IGESDefs_AttributeTable;
diff --git a/src/IGESDefs/IGESDefs_GenericData.hxx b/src/IGESDefs/IGESDefs_GenericData.hxx
index a42b6f91d4..b004b7fdd1 100644
--- a/src/IGESDefs/IGESDefs_GenericData.hxx
+++ b/src/IGESDefs/IGESDefs_GenericData.hxx
@@ -27,11 +27,7 @@
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class Standard_NullObject;
 class Standard_Transient;
-class IGESData_IGESEntity;
 
 
 class IGESDefs_GenericData;
diff --git a/src/IGESDefs/IGESDefs_MacroDef.hxx b/src/IGESDefs/IGESDefs_MacroDef.hxx
index afaecc4197..321550aa94 100644
--- a/src/IGESDefs/IGESDefs_MacroDef.hxx
+++ b/src/IGESDefs/IGESDefs_MacroDef.hxx
@@ -24,7 +24,6 @@
 #include <Interface_HArray1OfHAsciiString.hxx>
 #include <IGESData_IGESEntity.hxx>
 class TCollection_HAsciiString;
-class Standard_OutOfRange;
 
 
 class IGESDefs_MacroDef;
diff --git a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
index 6e1617e5a8..3ed668dc2b 100644
--- a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
+++ b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_TabularData.hxx b/src/IGESDefs/IGESDefs_TabularData.hxx
index 577988943c..083971b4f3 100644
--- a/src/IGESDefs/IGESDefs_TabularData.hxx
+++ b/src/IGESDefs/IGESDefs_TabularData.hxx
@@ -27,8 +27,6 @@
 #include <Standard_Real.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 class IGESBasic_HArray1OfHArray1OfReal;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESDefs_TabularData;
diff --git a/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx b/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx
index e00d6fd252..617780e6e5 100644
--- a/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx
+++ b/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_AssociativityDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx b/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx
index 05ea914b44..a5152c9c10 100644
--- a/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx
+++ b/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_AttributeDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx b/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx
index 53c1a547cf..132bfd05d1 100644
--- a/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx
+++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_AttributeTable;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolGenericData.hxx b/src/IGESDefs/IGESDefs_ToolGenericData.hxx
index 4f54ec8b3f..809cd0ca5e 100644
--- a/src/IGESDefs/IGESDefs_ToolGenericData.hxx
+++ b/src/IGESDefs/IGESDefs_ToolGenericData.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_GenericData;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.hxx b/src/IGESDefs/IGESDefs_ToolMacroDef.hxx
index ef9a327c51..3567d23fea 100644
--- a/src/IGESDefs/IGESDefs_ToolMacroDef.hxx
+++ b/src/IGESDefs/IGESDefs_ToolMacroDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_MacroDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolTabularData.hxx b/src/IGESDefs/IGESDefs_ToolTabularData.hxx
index 206de7a6c6..bf82166c19 100644
--- a/src/IGESDefs/IGESDefs_ToolTabularData.hxx
+++ b/src/IGESDefs/IGESDefs_ToolTabularData.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_TabularData;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_ToolUnitsData.hxx b/src/IGESDefs/IGESDefs_ToolUnitsData.hxx
index 7a6c5e9260..3ce44e7af0 100644
--- a/src/IGESDefs/IGESDefs_ToolUnitsData.hxx
+++ b/src/IGESDefs/IGESDefs_ToolUnitsData.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDefs_UnitsData;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDefs/IGESDefs_UnitsData.hxx b/src/IGESDefs/IGESDefs_UnitsData.hxx
index 11300d2a23..9e54babe13 100644
--- a/src/IGESDefs/IGESDefs_UnitsData.hxx
+++ b/src/IGESDefs/IGESDefs_UnitsData.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class TCollection_HAsciiString;
 
 
diff --git a/src/IGESDimen/IGESDimen.hxx b/src/IGESDimen/IGESDimen.hxx
index e53069100a..6dfc7787b1 100644
--- a/src/IGESDimen/IGESDimen.hxx
+++ b/src/IGESDimen/IGESDimen.hxx
@@ -22,56 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESDimen_Protocol;
-class IGESDimen_CenterLine;
-class IGESDimen_Section;
-class IGESDimen_WitnessLine;
-class IGESDimen_AngularDimension;
-class IGESDimen_CurveDimension;
-class IGESDimen_DiameterDimension;
-class IGESDimen_FlagNote;
-class IGESDimen_GeneralLabel;
-class IGESDimen_GeneralNote;
-class IGESDimen_NewGeneralNote;
-class IGESDimen_LeaderArrow;
-class IGESDimen_LinearDimension;
-class IGESDimen_OrdinateDimension;
-class IGESDimen_PointDimension;
-class IGESDimen_RadiusDimension;
-class IGESDimen_GeneralSymbol;
-class IGESDimen_SectionedArea;
-class IGESDimen_DimensionedGeometry;
-class IGESDimen_NewDimensionedGeometry;
-class IGESDimen_DimensionUnits;
-class IGESDimen_DimensionTolerance;
-class IGESDimen_DimensionDisplayData;
-class IGESDimen_BasicDimension;
-class IGESDimen_ToolCenterLine;
-class IGESDimen_ToolSection;
-class IGESDimen_ToolWitnessLine;
-class IGESDimen_ToolAngularDimension;
-class IGESDimen_ToolCurveDimension;
-class IGESDimen_ToolDiameterDimension;
-class IGESDimen_ToolFlagNote;
-class IGESDimen_ToolGeneralLabel;
-class IGESDimen_ToolGeneralNote;
-class IGESDimen_ToolNewGeneralNote;
-class IGESDimen_ToolLeaderArrow;
-class IGESDimen_ToolLinearDimension;
-class IGESDimen_ToolOrdinateDimension;
-class IGESDimen_ToolPointDimension;
-class IGESDimen_ToolRadiusDimension;
-class IGESDimen_ToolGeneralSymbol;
-class IGESDimen_ToolSectionedArea;
-class IGESDimen_ToolDimensionedGeometry;
-class IGESDimen_ToolNewDimensionedGeometry;
-class IGESDimen_ToolDimensionUnits;
-class IGESDimen_ToolDimensionTolerance;
-class IGESDimen_ToolDimensionDisplayData;
-class IGESDimen_ToolBasicDimension;
-class IGESDimen_Protocol;
-class IGESDimen_ReadWriteModule;
-class IGESDimen_GeneralModule;
-class IGESDimen_SpecificModule;
 
 
 //! This package represents Entities applied to Dimensions
diff --git a/src/IGESDimen/IGESDimen_AngularDimension.hxx b/src/IGESDimen/IGESDimen_AngularDimension.hxx
index 7f12af97c2..345d459e7c 100644
--- a/src/IGESDimen/IGESDimen_AngularDimension.hxx
+++ b/src/IGESDimen/IGESDimen_AngularDimension.hxx
@@ -27,7 +27,6 @@
 class IGESDimen_GeneralNote;
 class IGESDimen_WitnessLine;
 class IGESDimen_LeaderArrow;
-class gp_XY;
 class gp_Pnt2d;
 
 
diff --git a/src/IGESDimen/IGESDimen_BasicDimension.hxx b/src/IGESDimen/IGESDimen_BasicDimension.hxx
index 02142e8e89..d9d85498ab 100644
--- a/src/IGESDimen/IGESDimen_BasicDimension.hxx
+++ b/src/IGESDimen/IGESDimen_BasicDimension.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Integer.hxx>
 #include <gp_XY.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XY;
 class gp_Pnt2d;
 
 
diff --git a/src/IGESDimen/IGESDimen_CenterLine.hxx b/src/IGESDimen/IGESDimen_CenterLine.hxx
index 5610e906ee..b59b6a5e45 100644
--- a/src/IGESDimen/IGESDimen_CenterLine.hxx
+++ b/src/IGESDimen/IGESDimen_CenterLine.hxx
@@ -25,7 +25,6 @@
 #include <TColgp_HArray1OfXY.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESDimen/IGESDimen_CurveDimension.hxx b/src/IGESDimen/IGESDimen_CurveDimension.hxx
index 12f841e8b7..5e53b29fff 100644
--- a/src/IGESDimen/IGESDimen_CurveDimension.hxx
+++ b/src/IGESDimen/IGESDimen_CurveDimension.hxx
@@ -23,7 +23,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 class IGESDimen_GeneralNote;
-class IGESData_IGESEntity;
 class IGESDimen_LeaderArrow;
 class IGESDimen_WitnessLine;
 
diff --git a/src/IGESDimen/IGESDimen_DiameterDimension.hxx b/src/IGESDimen/IGESDimen_DiameterDimension.hxx
index 1fd75ec44b..06d7d0226c 100644
--- a/src/IGESDimen/IGESDimen_DiameterDimension.hxx
+++ b/src/IGESDimen/IGESDimen_DiameterDimension.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Boolean.hxx>
 class IGESDimen_GeneralNote;
 class IGESDimen_LeaderArrow;
-class gp_XY;
 class gp_Pnt2d;
 
 
diff --git a/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx b/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
index 3a15b46482..0a78f38997 100644
--- a/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
@@ -25,8 +25,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
 class TCollection_HAsciiString;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESDimen_DimensionDisplayData;
diff --git a/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
index 6a73318c96..f88721c77e 100644
--- a/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
@@ -23,8 +23,6 @@
 #include <Standard_Integer.hxx>
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
 
 
 class IGESDimen_DimensionedGeometry;
diff --git a/src/IGESDimen/IGESDimen_FlagNote.hxx b/src/IGESDimen/IGESDimen_FlagNote.hxx
index 1ccff311aa..d79b31ef77 100644
--- a/src/IGESDimen/IGESDimen_FlagNote.hxx
+++ b/src/IGESDimen/IGESDimen_FlagNote.hxx
@@ -26,8 +26,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 class IGESDimen_GeneralNote;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 class IGESDimen_LeaderArrow;
 
diff --git a/src/IGESDimen/IGESDimen_GeneralLabel.hxx b/src/IGESDimen/IGESDimen_GeneralLabel.hxx
index 1888d5a6ff..bd33117742 100644
--- a/src/IGESDimen/IGESDimen_GeneralLabel.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralLabel.hxx
@@ -24,7 +24,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 class IGESDimen_GeneralNote;
-class Standard_OutOfRange;
 class IGESDimen_LeaderArrow;
 
 
diff --git a/src/IGESDimen/IGESDimen_GeneralNote.hxx b/src/IGESDimen/IGESDimen_GeneralNote.hxx
index f0b130a0f5..28e50ecb8f 100644
--- a/src/IGESDimen/IGESDimen_GeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralNote.hxx
@@ -29,8 +29,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESGraph_TextFontDef;
 class gp_Pnt;
 class TCollection_HAsciiString;
diff --git a/src/IGESDimen/IGESDimen_GeneralSymbol.hxx b/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
index 03af3f0054..5a1fbf57c0 100644
--- a/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
@@ -26,8 +26,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 class IGESDimen_GeneralNote;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESDimen_LeaderArrow;
 
 
diff --git a/src/IGESDimen/IGESDimen_LeaderArrow.hxx b/src/IGESDimen/IGESDimen_LeaderArrow.hxx
index 8b1fe24a0d..0551cf04d4 100644
--- a/src/IGESDimen/IGESDimen_LeaderArrow.hxx
+++ b/src/IGESDimen/IGESDimen_LeaderArrow.hxx
@@ -25,8 +25,6 @@
 #include <TColgp_HArray1OfXY.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
-class gp_XY;
 class gp_Pnt2d;
 class gp_Pnt;
 
diff --git a/src/IGESDimen/IGESDimen_LinearDimension.hxx b/src/IGESDimen/IGESDimen_LinearDimension.hxx
index 51a081da6a..2ae46e72ae 100644
--- a/src/IGESDimen/IGESDimen_LinearDimension.hxx
+++ b/src/IGESDimen/IGESDimen_LinearDimension.hxx
@@ -26,7 +26,6 @@
 class IGESDimen_GeneralNote;
 class IGESDimen_LeaderArrow;
 class IGESDimen_WitnessLine;
-class Standard_OutOfRange;
 
 
 class IGESDimen_LinearDimension;
diff --git a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
index 3cb4d4a335..962bc828ca 100644
--- a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
@@ -26,9 +26,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESDimen/IGESDimen_NewGeneralNote.hxx b/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
index e1e9bd7217..8ed4c7bcaa 100644
--- a/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
@@ -30,12 +30,8 @@
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 class TCollection_HAsciiString;
-class IGESData_IGESEntity;
 
 
 class IGESDimen_NewGeneralNote;
diff --git a/src/IGESDimen/IGESDimen_PointDimension.hxx b/src/IGESDimen/IGESDimen_PointDimension.hxx
index 6d8617ccf1..69435177d3 100644
--- a/src/IGESDimen/IGESDimen_PointDimension.hxx
+++ b/src/IGESDimen/IGESDimen_PointDimension.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Integer.hxx>
 class IGESDimen_GeneralNote;
 class IGESDimen_LeaderArrow;
-class IGESData_IGESEntity;
 class IGESGeom_CircularArc;
 class IGESGeom_CompositeCurve;
 
diff --git a/src/IGESDimen/IGESDimen_RadiusDimension.hxx b/src/IGESDimen/IGESDimen_RadiusDimension.hxx
index 2fd0eb5ca5..11be872653 100644
--- a/src/IGESDimen/IGESDimen_RadiusDimension.hxx
+++ b/src/IGESDimen/IGESDimen_RadiusDimension.hxx
@@ -26,7 +26,6 @@
 #include <Standard_Boolean.hxx>
 class IGESDimen_GeneralNote;
 class IGESDimen_LeaderArrow;
-class gp_XY;
 class gp_Pnt2d;
 class gp_Pnt;
 
diff --git a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
index 3d27774cac..5c35ef2424 100644
--- a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
+++ b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_Section.hxx b/src/IGESDimen/IGESDimen_Section.hxx
index a56ac36146..a62d5e00cd 100644
--- a/src/IGESDimen/IGESDimen_Section.hxx
+++ b/src/IGESDimen/IGESDimen_Section.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #include <TColgp_HArray1OfXY.hxx>
 #include <IGESData_IGESEntity.hxx>
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESDimen/IGESDimen_SectionedArea.hxx b/src/IGESDimen/IGESDimen_SectionedArea.hxx
index d1e18b9057..116c4da430 100644
--- a/src/IGESDimen/IGESDimen_SectionedArea.hxx
+++ b/src/IGESDimen/IGESDimen_SectionedArea.hxx
@@ -26,9 +26,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx b/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx
index c36a577c77..4c7fb29f29 100644
--- a/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_AngularDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx b/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx
index 98d9529021..980dca08b3 100644
--- a/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_BasicDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolCenterLine.hxx b/src/IGESDimen/IGESDimen_ToolCenterLine.hxx
index 04badadcc6..87221e0bae 100644
--- a/src/IGESDimen/IGESDimen_ToolCenterLine.hxx
+++ b/src/IGESDimen/IGESDimen_ToolCenterLine.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_CenterLine;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx b/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx
index 32c4d14139..55f40ad630 100644
--- a/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_CurveDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx b/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx
index 681f73d09e..dd5c546754 100644
--- a/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_DiameterDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx
index 7d6cdb2b06..8c303d369b 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx
+++ b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_DimensionDisplayData;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx
index b7f675e4e7..f83cfff28f 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx
+++ b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_DimensionTolerance;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx b/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx
index da61ff6d5e..355315afc7 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx
+++ b/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_DimensionUnits;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx
index 62703d8cab..27ddaa9412 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_DimensionedGeometry;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolFlagNote.hxx b/src/IGESDimen/IGESDimen_ToolFlagNote.hxx
index 83ce5b0be8..ef1531f536 100644
--- a/src/IGESDimen/IGESDimen_ToolFlagNote.hxx
+++ b/src/IGESDimen/IGESDimen_ToolFlagNote.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_FlagNote;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx b/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx
index 990e3ef547..5c51d83df0 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx
+++ b/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_GeneralLabel;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx b/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx
index 712c4745a0..db5106e218 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_GeneralNote;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx
index 1e32272e7c..2a77f8da1f 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx
+++ b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_GeneralSymbol;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx b/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx
index 842e37525b..0f898e8eb8 100644
--- a/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx
+++ b/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_LeaderArrow;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx b/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx
index d9b631d597..9ee45b4b61 100644
--- a/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_LinearDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx
index dc09685bcc..91966cad68 100644
--- a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_NewDimensionedGeometry;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx
index d6588ddd6f..b69ebc243b 100644
--- a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_NewGeneralNote;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx
index 770358a62e..3448d12368 100644
--- a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_OrdinateDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolPointDimension.hxx b/src/IGESDimen/IGESDimen_ToolPointDimension.hxx
index 02a2d512ac..b6d01ab93b 100644
--- a/src/IGESDimen/IGESDimen_ToolPointDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolPointDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_PointDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx b/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx
index ecb0ed26b7..e6397d02d7 100644
--- a/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx
+++ b/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_RadiusDimension;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolSection.hxx b/src/IGESDimen/IGESDimen_ToolSection.hxx
index 726dbd369c..4cbd876025 100644
--- a/src/IGESDimen/IGESDimen_ToolSection.hxx
+++ b/src/IGESDimen/IGESDimen_ToolSection.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_Section;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx b/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx
index 98b826fce9..ff796b5853 100644
--- a/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx
+++ b/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_SectionedArea;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx b/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx
index 09a4b34be2..87542f1eba 100644
--- a/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx
+++ b/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDimen_WitnessLine;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDimen/IGESDimen_WitnessLine.hxx b/src/IGESDimen/IGESDimen_WitnessLine.hxx
index 92407ce024..136f2f4845 100644
--- a/src/IGESDimen/IGESDimen_WitnessLine.hxx
+++ b/src/IGESDimen/IGESDimen_WitnessLine.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #include <TColgp_HArray1OfXY.hxx>
 #include <IGESData_IGESEntity.hxx>
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESDraw/IGESDraw.hxx b/src/IGESDraw/IGESDraw.hxx
index ad94d2fccf..273a9763e9 100644
--- a/src/IGESDraw/IGESDraw.hxx
+++ b/src/IGESDraw/IGESDraw.hxx
@@ -22,38 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESDraw_Protocol;
-class IGESDraw_ConnectPoint;
-class IGESDraw_NetworkSubfigureDef;
-class IGESDraw_ViewsVisible;
-class IGESDraw_ViewsVisibleWithAttr;
-class IGESDraw_LabelDisplay;
-class IGESDraw_Planar;
-class IGESDraw_SegmentedViewsVisible;
-class IGESDraw_Drawing;
-class IGESDraw_DrawingWithRotation;
-class IGESDraw_View;
-class IGESDraw_RectArraySubfigure;
-class IGESDraw_CircArraySubfigure;
-class IGESDraw_NetworkSubfigure;
-class IGESDraw_PerspectiveView;
-class IGESDraw_ToolConnectPoint;
-class IGESDraw_ToolNetworkSubfigureDef;
-class IGESDraw_ToolViewsVisible;
-class IGESDraw_ToolViewsVisibleWithAttr;
-class IGESDraw_ToolLabelDisplay;
-class IGESDraw_ToolPlanar;
-class IGESDraw_ToolSegmentedViewsVisible;
-class IGESDraw_ToolDrawing;
-class IGESDraw_ToolDrawingWithRotation;
-class IGESDraw_ToolView;
-class IGESDraw_ToolRectArraySubfigure;
-class IGESDraw_ToolCircArraySubfigure;
-class IGESDraw_ToolNetworkSubfigure;
-class IGESDraw_ToolPerspectiveView;
-class IGESDraw_Protocol;
-class IGESDraw_ReadWriteModule;
-class IGESDraw_GeneralModule;
-class IGESDraw_SpecificModule;
 
 
 //! This package contains the group of classes necessary for
diff --git a/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx b/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
index 80cf0a2d58..ffb8e1ae29 100644
--- a/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
@@ -26,9 +26,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESDraw/IGESDraw_ConnectPoint.hxx b/src/IGESDraw/IGESDraw_ConnectPoint.hxx
index f28547f4f3..5c05bda0a1 100644
--- a/src/IGESDraw/IGESDraw_ConnectPoint.hxx
+++ b/src/IGESDraw/IGESDraw_ConnectPoint.hxx
@@ -24,10 +24,8 @@
 #include <Standard_Integer.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
 class TCollection_HAsciiString;
 class IGESGraph_TextDisplayTemplate;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESDraw/IGESDraw_Drawing.hxx b/src/IGESDraw/IGESDraw_Drawing.hxx
index d51a4313d5..b80f6d8b4e 100644
--- a/src/IGESDraw/IGESDraw_Drawing.hxx
+++ b/src/IGESDraw/IGESDraw_Drawing.hxx
@@ -27,11 +27,8 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESData_ViewKindEntity;
 class gp_Pnt2d;
-class IGESData_IGESEntity;
 class gp_XY;
 class gp_XYZ;
 
diff --git a/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx b/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
index 7faac4c0fb..2a9fc5dc12 100644
--- a/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
+++ b/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
@@ -28,11 +28,8 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESData_ViewKindEntity;
 class gp_Pnt2d;
-class IGESData_IGESEntity;
 class gp_XY;
 class gp_XYZ;
 
diff --git a/src/IGESDraw/IGESDraw_LabelDisplay.hxx b/src/IGESDraw/IGESDraw_LabelDisplay.hxx
index 6f3c2bca83..9204334a52 100644
--- a/src/IGESDraw/IGESDraw_LabelDisplay.hxx
+++ b/src/IGESDraw/IGESDraw_LabelDisplay.hxx
@@ -27,8 +27,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_LabelDisplayEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESData_ViewKindEntity;
 class gp_Pnt;
 class IGESDimen_LeaderArrow;
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx b/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
index 388ab51e9a..8292582a8d 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
@@ -28,8 +28,6 @@
 class IGESDraw_NetworkSubfigureDef;
 class TCollection_HAsciiString;
 class IGESGraph_TextDisplayTemplate;
-class Standard_OutOfRange;
-class gp_XYZ;
 class IGESDraw_ConnectPoint;
 
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
index 503370f64b..497fd7cf19 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
@@ -27,8 +27,6 @@
 #include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
 class IGESGraph_TextDisplayTemplate;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESDraw_ConnectPoint;
 
 
diff --git a/src/IGESDraw/IGESDraw_PerspectiveView.hxx b/src/IGESDraw/IGESDraw_PerspectiveView.hxx
index b6f2ed66e0..ad6e354f3f 100644
--- a/src/IGESDraw/IGESDraw_PerspectiveView.hxx
+++ b/src/IGESDraw/IGESDraw_PerspectiveView.hxx
@@ -26,10 +26,6 @@
 #include <gp_XY.hxx>
 #include <IGESData_ViewKindEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class gp_XYZ;
-class gp_XY;
-class IGESData_ViewKindEntity;
 class gp_Vec;
 class gp_Pnt;
 class gp_Pnt2d;
diff --git a/src/IGESDraw/IGESDraw_Planar.hxx b/src/IGESDraw/IGESDraw_Planar.hxx
index c77a7996cb..415d4d7205 100644
--- a/src/IGESDraw/IGESDraw_Planar.hxx
+++ b/src/IGESDraw/IGESDraw_Planar.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 class IGESGeom_TransformationMatrix;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 
 
 class IGESDraw_Planar;
diff --git a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
index 38a1c6034d..9bf432eda0 100644
--- a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
+++ b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx b/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
index ca3e087888..9e7fa008c0 100644
--- a/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
@@ -26,9 +26,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
index 5b7010d24b..f55a6ffbc1 100644
--- a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
@@ -29,9 +29,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class IGESData_ViewKindEntity;
 class IGESGraph_Color;
 class IGESData_LineFontEntity;
 
diff --git a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx
index f9a0ff744b..65f73a06e5 100644
--- a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_CircArraySubfigure;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx b/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx
index f11c7f4735..a26baab6b6 100644
--- a/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx
+++ b/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_ConnectPoint;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolDrawing.hxx b/src/IGESDraw/IGESDraw_ToolDrawing.hxx
index 1110df7264..7a045226ce 100644
--- a/src/IGESDraw/IGESDraw_ToolDrawing.hxx
+++ b/src/IGESDraw/IGESDraw_ToolDrawing.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_Drawing;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx
index 4dab1a66c7..260f6e72a7 100644
--- a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx
+++ b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_DrawingWithRotation;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx b/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx
index 1660e7e98c..e7897b7ef2 100644
--- a/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx
+++ b/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_LabelDisplay;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx
index 0c014bdda0..69dfe5e5f4 100644
--- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_NetworkSubfigure;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx
index 761f56b9a5..4c5a69d008 100644
--- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx
+++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_NetworkSubfigureDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx b/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx
index 8814f36d66..4063b8dfae 100644
--- a/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx
+++ b/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_PerspectiveView;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolPlanar.hxx b/src/IGESDraw/IGESDraw_ToolPlanar.hxx
index 90c4dcd922..e340ddc38f 100644
--- a/src/IGESDraw/IGESDraw_ToolPlanar.hxx
+++ b/src/IGESDraw/IGESDraw_ToolPlanar.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_Planar;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx
index cbf48c8303..4b0cf3b669 100644
--- a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_RectArraySubfigure;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx
index e835cbf03e..d641a11461 100644
--- a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_SegmentedViewsVisible;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolView.hxx b/src/IGESDraw/IGESDraw_ToolView.hxx
index e53c9f427d..7a02bb2e7d 100644
--- a/src/IGESDraw/IGESDraw_ToolView.hxx
+++ b/src/IGESDraw/IGESDraw_ToolView.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESDraw_View;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx b/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx
index f3099cbab8..f84f87b965 100644
--- a/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
 class IGESDraw_ViewsVisible;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx
index 15ef55e16e..265e5a482d 100644
--- a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx
+++ b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
 class IGESDraw_ViewsVisibleWithAttr;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESDraw/IGESDraw_View.hxx b/src/IGESDraw/IGESDraw_View.hxx
index 615221d3dc..8c22a9ebaf 100644
--- a/src/IGESDraw/IGESDraw_View.hxx
+++ b/src/IGESDraw/IGESDraw_View.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_ViewKindEntity.hxx>
 #include <Standard_Boolean.hxx>
 class IGESGeom_Plane;
-class Standard_OutOfRange;
-class IGESData_ViewKindEntity;
 class IGESData_TransfEntity;
 class gp_XYZ;
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisible.hxx b/src/IGESDraw/IGESDraw_ViewsVisible.hxx
index 8dbeb365d9..b6a7df117e 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisible.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_ViewKindEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
-class IGESData_ViewKindEntity;
 class IGESData_IGESEntity;
 
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
index da8ee9f513..142f868416 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
@@ -28,9 +28,6 @@
 #include <IGESData_ViewKindEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class IGESData_ViewKindEntity;
 class IGESData_LineFontEntity;
 class IGESGraph_Color;
 class IGESData_IGESEntity;
diff --git a/src/IGESGeom/IGESGeom.hxx b/src/IGESGeom/IGESGeom.hxx
index 22c060b272..86340551cf 100644
--- a/src/IGESGeom/IGESGeom.hxx
+++ b/src/IGESGeom/IGESGeom.hxx
@@ -22,56 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESGeom_Protocol;
-class IGESGeom_CircularArc;
-class IGESGeom_CompositeCurve;
-class IGESGeom_ConicArc;
-class IGESGeom_CopiousData;
-class IGESGeom_Plane;
-class IGESGeom_Line;
-class IGESGeom_SplineCurve;
-class IGESGeom_SplineSurface;
-class IGESGeom_Point;
-class IGESGeom_RuledSurface;
-class IGESGeom_SurfaceOfRevolution;
-class IGESGeom_TabulatedCylinder;
-class IGESGeom_Direction;
-class IGESGeom_TransformationMatrix;
-class IGESGeom_Flash;
-class IGESGeom_BSplineCurve;
-class IGESGeom_BSplineSurface;
-class IGESGeom_OffsetCurve;
-class IGESGeom_OffsetSurface;
-class IGESGeom_Boundary;
-class IGESGeom_CurveOnSurface;
-class IGESGeom_BoundedSurface;
-class IGESGeom_TrimmedSurface;
-class IGESGeom_ToolCircularArc;
-class IGESGeom_ToolCompositeCurve;
-class IGESGeom_ToolConicArc;
-class IGESGeom_ToolCopiousData;
-class IGESGeom_ToolPlane;
-class IGESGeom_ToolLine;
-class IGESGeom_ToolSplineCurve;
-class IGESGeom_ToolSplineSurface;
-class IGESGeom_ToolPoint;
-class IGESGeom_ToolRuledSurface;
-class IGESGeom_ToolSurfaceOfRevolution;
-class IGESGeom_ToolTabulatedCylinder;
-class IGESGeom_ToolDirection;
-class IGESGeom_ToolTransformationMatrix;
-class IGESGeom_ToolFlash;
-class IGESGeom_ToolBSplineCurve;
-class IGESGeom_ToolBSplineSurface;
-class IGESGeom_ToolOffsetCurve;
-class IGESGeom_ToolOffsetSurface;
-class IGESGeom_ToolBoundary;
-class IGESGeom_ToolCurveOnSurface;
-class IGESGeom_ToolBoundedSurface;
-class IGESGeom_ToolTrimmedSurface;
-class IGESGeom_Protocol;
-class IGESGeom_ReadWriteModule;
-class IGESGeom_GeneralModule;
-class IGESGeom_SpecificModule;
 
 
 //! This package consists of B-Rep and CSG Solid entities
diff --git a/src/IGESGeom/IGESGeom_BSplineCurve.hxx b/src/IGESGeom/IGESGeom_BSplineCurve.hxx
index 4349b52d77..fb4eca6147 100644
--- a/src/IGESGeom/IGESGeom_BSplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_BSplineCurve.hxx
@@ -27,9 +27,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_BSplineSurface.hxx b/src/IGESGeom/IGESGeom_BSplineSurface.hxx
index 92fd496d21..b1c9917e71 100644
--- a/src/IGESGeom/IGESGeom_BSplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_BSplineSurface.hxx
@@ -27,8 +27,6 @@
 #include <TColgp_HArray2OfXYZ.hxx>
 #include <Standard_Real.hxx>
 #include <IGESData_IGESEntity.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_Boundary.hxx b/src/IGESGeom/IGESGeom_Boundary.hxx
index f2e5bc3d39..528dfaac33 100644
--- a/src/IGESGeom/IGESGeom_Boundary.hxx
+++ b/src/IGESGeom/IGESGeom_Boundary.hxx
@@ -24,10 +24,7 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
 class IGESBasic_HArray1OfHArray1OfIGESEntity;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESGeom_Boundary;
diff --git a/src/IGESGeom/IGESGeom_BoundedSurface.hxx b/src/IGESGeom/IGESGeom_BoundedSurface.hxx
index bf0b45c2f2..c132e4e9e2 100644
--- a/src/IGESGeom/IGESGeom_BoundedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_BoundedSurface.hxx
@@ -23,8 +23,6 @@
 #include <Standard_Integer.hxx>
 #include <IGESGeom_HArray1OfBoundary.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
 class IGESGeom_Boundary;
 
 
diff --git a/src/IGESGeom/IGESGeom_CircularArc.hxx b/src/IGESGeom/IGESGeom_CircularArc.hxx
index c9066303c6..fad40fd94a 100644
--- a/src/IGESGeom/IGESGeom_CircularArc.hxx
+++ b/src/IGESGeom/IGESGeom_CircularArc.hxx
@@ -24,7 +24,6 @@
 #include <gp_XY.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class gp_XY;
 class gp_Pnt2d;
 class gp_Pnt;
 class gp_Dir;
diff --git a/src/IGESGeom/IGESGeom_CompositeCurve.hxx b/src/IGESGeom/IGESGeom_CompositeCurve.hxx
index 9d8f0321a1..334ecc768b 100644
--- a/src/IGESGeom/IGESGeom_CompositeCurve.hxx
+++ b/src/IGESGeom/IGESGeom_CompositeCurve.hxx
@@ -23,8 +23,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 
 
 class IGESGeom_CompositeCurve;
diff --git a/src/IGESGeom/IGESGeom_ConicArc.hxx b/src/IGESGeom/IGESGeom_ConicArc.hxx
index df39068343..9f6161f4c2 100644
--- a/src/IGESGeom/IGESGeom_ConicArc.hxx
+++ b/src/IGESGeom/IGESGeom_ConicArc.hxx
@@ -25,7 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class gp_XY;
 class gp_Pnt2d;
 class gp_Pnt;
 class gp_Dir;
diff --git a/src/IGESGeom/IGESGeom_CopiousData.hxx b/src/IGESGeom/IGESGeom_CopiousData.hxx
index d05b97ffb2..e928ea9b42 100644
--- a/src/IGESGeom/IGESGeom_CopiousData.hxx
+++ b/src/IGESGeom/IGESGeom_CopiousData.hxx
@@ -25,7 +25,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
 class gp_Pnt;
 class gp_Vec;
 
diff --git a/src/IGESGeom/IGESGeom_CurveOnSurface.hxx b/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
index 444dcefa63..db8faaca9b 100644
--- a/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
+++ b/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Integer.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
 
 
 class IGESGeom_CurveOnSurface;
diff --git a/src/IGESGeom/IGESGeom_Direction.hxx b/src/IGESGeom/IGESGeom_Direction.hxx
index f4687bc6f3..9321418e33 100644
--- a/src/IGESGeom/IGESGeom_Direction.hxx
+++ b/src/IGESGeom/IGESGeom_Direction.hxx
@@ -22,7 +22,6 @@
 
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Vec;
 
 
diff --git a/src/IGESGeom/IGESGeom_Flash.hxx b/src/IGESGeom/IGESGeom_Flash.hxx
index e8f1534101..3d18bb58eb 100644
--- a/src/IGESGeom/IGESGeom_Flash.hxx
+++ b/src/IGESGeom/IGESGeom_Flash.hxx
@@ -25,9 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
-class gp_XY;
 class gp_Pnt2d;
 class gp_Pnt;
 
diff --git a/src/IGESGeom/IGESGeom_Line.hxx b/src/IGESGeom/IGESGeom_Line.hxx
index 9a47cd7018..246be02f3b 100644
--- a/src/IGESGeom/IGESGeom_Line.hxx
+++ b/src/IGESGeom/IGESGeom_Line.hxx
@@ -23,7 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_OffsetCurve.hxx b/src/IGESGeom/IGESGeom_OffsetCurve.hxx
index 74647cc76a..a7cec247b0 100644
--- a/src/IGESGeom/IGESGeom_OffsetCurve.hxx
+++ b/src/IGESGeom/IGESGeom_OffsetCurve.hxx
@@ -25,8 +25,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Vec;
 
 
diff --git a/src/IGESGeom/IGESGeom_OffsetSurface.hxx b/src/IGESGeom/IGESGeom_OffsetSurface.hxx
index 9cff6b7801..5fcd133450 100644
--- a/src/IGESGeom/IGESGeom_OffsetSurface.hxx
+++ b/src/IGESGeom/IGESGeom_OffsetSurface.hxx
@@ -23,8 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <Standard_Real.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Vec;
 
 
diff --git a/src/IGESGeom/IGESGeom_Plane.hxx b/src/IGESGeom/IGESGeom_Plane.hxx
index b294d031fa..dcae18b167 100644
--- a/src/IGESGeom/IGESGeom_Plane.hxx
+++ b/src/IGESGeom/IGESGeom_Plane.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_Point.hxx b/src/IGESGeom/IGESGeom_Point.hxx
index a8ea847c89..5bc47425d1 100644
--- a/src/IGESGeom/IGESGeom_Point.hxx
+++ b/src/IGESGeom/IGESGeom_Point.hxx
@@ -24,7 +24,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 class IGESBasic_SubfigureDef;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
index 2e03a7158a..380ff8781a 100644
--- a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
+++ b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_RuledSurface.hxx b/src/IGESGeom/IGESGeom_RuledSurface.hxx
index 21b468edc9..0f86ca1b51 100644
--- a/src/IGESGeom/IGESGeom_RuledSurface.hxx
+++ b/src/IGESGeom/IGESGeom_RuledSurface.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Integer.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
 
 
 class IGESGeom_RuledSurface;
diff --git a/src/IGESGeom/IGESGeom_SplineCurve.hxx b/src/IGESGeom/IGESGeom_SplineCurve.hxx
index daec4c37fd..db7d0d94ea 100644
--- a/src/IGESGeom/IGESGeom_SplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_SplineCurve.hxx
@@ -25,8 +25,6 @@
 #include <TColStd_HArray2OfReal.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESGeom_SplineCurve;
diff --git a/src/IGESGeom/IGESGeom_SplineSurface.hxx b/src/IGESGeom/IGESGeom_SplineSurface.hxx
index 3df76ae517..4b7953a08d 100644
--- a/src/IGESGeom/IGESGeom_SplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_SplineSurface.hxx
@@ -25,8 +25,6 @@
 #include <IGESBasic_HArray2OfHArray1OfReal.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESGeom_SplineSurface;
diff --git a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
index b67e3a572e..08d2bc84f8 100644
--- a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
+++ b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Real.hxx>
 #include <IGESData_IGESEntity.hxx>
 class IGESGeom_Line;
-class IGESData_IGESEntity;
 
 
 class IGESGeom_SurfaceOfRevolution;
diff --git a/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx b/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
index a9a75f9eef..b11d192736 100644
--- a/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
+++ b/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
@@ -22,8 +22,6 @@
 
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx b/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx
index 5c0e0d8065..dbf35e452c 100644
--- a/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_BSplineCurve;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx b/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx
index a515656cb8..4ebae5d262 100644
--- a/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_BSplineSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolBoundary.hxx b/src/IGESGeom/IGESGeom_ToolBoundary.hxx
index d5b4d78dbf..3aef54a881 100644
--- a/src/IGESGeom/IGESGeom_ToolBoundary.hxx
+++ b/src/IGESGeom/IGESGeom_ToolBoundary.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Boundary;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx b/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx
index 96444b19d7..6db0f5b8cd 100644
--- a/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_BoundedSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolCircularArc.hxx b/src/IGESGeom/IGESGeom_ToolCircularArc.hxx
index 03392da7da..1ad9306134 100644
--- a/src/IGESGeom/IGESGeom_ToolCircularArc.hxx
+++ b/src/IGESGeom/IGESGeom_ToolCircularArc.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_CircularArc;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx b/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx
index 5f4b819f9e..20488f7971 100644
--- a/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx
+++ b/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_CompositeCurve;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolConicArc.hxx b/src/IGESGeom/IGESGeom_ToolConicArc.hxx
index 362e89a6d3..d86bdef9ca 100644
--- a/src/IGESGeom/IGESGeom_ToolConicArc.hxx
+++ b/src/IGESGeom/IGESGeom_ToolConicArc.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_ConicArc;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolCopiousData.hxx b/src/IGESGeom/IGESGeom_ToolCopiousData.hxx
index b043f1f413..e4038b4e15 100644
--- a/src/IGESGeom/IGESGeom_ToolCopiousData.hxx
+++ b/src/IGESGeom/IGESGeom_ToolCopiousData.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_CopiousData;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx
index c794925dfb..f90709b055 100644
--- a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_CurveOnSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolDirection.hxx b/src/IGESGeom/IGESGeom_ToolDirection.hxx
index f0aacec8c8..1329a962c0 100644
--- a/src/IGESGeom/IGESGeom_ToolDirection.hxx
+++ b/src/IGESGeom/IGESGeom_ToolDirection.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Direction;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolFlash.hxx b/src/IGESGeom/IGESGeom_ToolFlash.hxx
index 27b4ea82ef..b99fea440c 100644
--- a/src/IGESGeom/IGESGeom_ToolFlash.hxx
+++ b/src/IGESGeom/IGESGeom_ToolFlash.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Flash;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolLine.hxx b/src/IGESGeom/IGESGeom_ToolLine.hxx
index 9f34451580..ce9fad6359 100644
--- a/src/IGESGeom/IGESGeom_ToolLine.hxx
+++ b/src/IGESGeom/IGESGeom_ToolLine.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Line;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx b/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx
index 3302b15d2e..183c98d8cd 100644
--- a/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx
+++ b/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_OffsetCurve;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx b/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx
index c93ebdd43a..920ebae129 100644
--- a/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_OffsetSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolPlane.hxx b/src/IGESGeom/IGESGeom_ToolPlane.hxx
index 29bf270f13..855a954111 100644
--- a/src/IGESGeom/IGESGeom_ToolPlane.hxx
+++ b/src/IGESGeom/IGESGeom_ToolPlane.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Plane;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolPoint.hxx b/src/IGESGeom/IGESGeom_ToolPoint.hxx
index d8e3c43c2b..5773297ec5 100644
--- a/src/IGESGeom/IGESGeom_ToolPoint.hxx
+++ b/src/IGESGeom/IGESGeom_ToolPoint.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_Point;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx b/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx
index 13e4fd1e12..a5262630af 100644
--- a/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_RuledSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolSplineCurve.hxx b/src/IGESGeom/IGESGeom_ToolSplineCurve.hxx
index 6868faad3e..7ead055e67 100644
--- a/src/IGESGeom/IGESGeom_ToolSplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_ToolSplineCurve.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_SplineCurve;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx b/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx
index ba3eb4a38b..d3f8060eb2 100644
--- a/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_SplineSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx
index dbd8cd95bd..03e46f682b 100644
--- a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx
+++ b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_SurfaceOfRevolution;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx
index 746e5f52c0..f0e4050f14 100644
--- a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx
+++ b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_TabulatedCylinder;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx
index 811d7d8d4e..2de678f61d 100644
--- a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx
+++ b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_TransformationMatrix;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx
index 87eeb9a3cc..264a72f364 100644
--- a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGeom_TrimmedSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
index f52684d266..291c2c5124 100644
--- a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
+++ b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
@@ -24,8 +24,6 @@
 #include <IGESData_TransfEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class gp_GTrsf;
 
 
diff --git a/src/IGESGeom/IGESGeom_TrimmedSurface.hxx b/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
index 0400436c92..37fdd9cf5b 100644
--- a/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
@@ -24,9 +24,7 @@
 #include <IGESGeom_HArray1OfCurveOnSurface.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
 class IGESGeom_CurveOnSurface;
-class Standard_OutOfRange;
 
 
 class IGESGeom_TrimmedSurface;
diff --git a/src/IGESGraph/IGESGraph.hxx b/src/IGESGraph/IGESGraph.hxx
index c3276ab989..50971606cd 100644
--- a/src/IGESGraph/IGESGraph.hxx
+++ b/src/IGESGraph/IGESGraph.hxx
@@ -22,38 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESGraph_Protocol;
-class IGESGraph_LineFontDefTemplate;
-class IGESGraph_LineFontDefPattern;
-class IGESGraph_TextFontDef;
-class IGESGraph_TextDisplayTemplate;
-class IGESGraph_Color;
-class IGESGraph_DefinitionLevel;
-class IGESGraph_NominalSize;
-class IGESGraph_DrawingSize;
-class IGESGraph_DrawingUnits;
-class IGESGraph_IntercharacterSpacing;
-class IGESGraph_LineFontPredefined;
-class IGESGraph_HighLight;
-class IGESGraph_Pick;
-class IGESGraph_UniformRectGrid;
-class IGESGraph_ToolLineFontDefTemplate;
-class IGESGraph_ToolLineFontDefPattern;
-class IGESGraph_ToolTextFontDef;
-class IGESGraph_ToolTextDisplayTemplate;
-class IGESGraph_ToolColor;
-class IGESGraph_ToolDefinitionLevel;
-class IGESGraph_ToolNominalSize;
-class IGESGraph_ToolDrawingSize;
-class IGESGraph_ToolDrawingUnits;
-class IGESGraph_ToolIntercharacterSpacing;
-class IGESGraph_ToolLineFontPredefined;
-class IGESGraph_ToolHighLight;
-class IGESGraph_ToolPick;
-class IGESGraph_ToolUniformRectGrid;
-class IGESGraph_Protocol;
-class IGESGraph_ReadWriteModule;
-class IGESGraph_GeneralModule;
-class IGESGraph_SpecificModule;
 
 
 //! This package contains the group of classes necessary
diff --git a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
index 3e9702f1d6..96ad8bec40 100644
--- a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
+++ b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
@@ -23,7 +23,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_LevelListEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 
 
 class IGESGraph_DefinitionLevel;
diff --git a/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx b/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
index 59c2d2424f..d73be07995 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
+++ b/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
@@ -26,7 +26,6 @@
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
-class Standard_OutOfRange;
 
 
 class IGESGraph_LineFontDefPattern;
diff --git a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
index 2839759638..f05c10fad5 100644
--- a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
+++ b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx b/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
index 133048e7d8..835df461a6 100644
--- a/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
+++ b/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
@@ -26,7 +26,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 class IGESGraph_TextFontDef;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESGraph/IGESGraph_TextFontDef.hxx b/src/IGESGraph/IGESGraph_TextFontDef.hxx
index 04777acfe8..366451b282 100644
--- a/src/IGESGraph/IGESGraph_TextFontDef.hxx
+++ b/src/IGESGraph/IGESGraph_TextFontDef.hxx
@@ -26,8 +26,6 @@
 #include <Standard_Boolean.hxx>
 class TCollection_HAsciiString;
 class IGESBasic_HArray1OfHArray1OfInteger;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESGraph_TextFontDef;
diff --git a/src/IGESGraph/IGESGraph_ToolColor.hxx b/src/IGESGraph/IGESGraph_ToolColor.hxx
index 8d1bb88195..f9ac09d7c7 100644
--- a/src/IGESGraph/IGESGraph_ToolColor.hxx
+++ b/src/IGESGraph/IGESGraph_ToolColor.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_Color;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx
index a373d6afbf..1f21bc81bb 100644
--- a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx
+++ b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_DefinitionLevel;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx b/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx
index d5437bbcbe..f29e14d865 100644
--- a/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx
+++ b/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_DrawingSize;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx b/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx
index 414cd6bfb3..3b2345ac2a 100644
--- a/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx
+++ b/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_DrawingUnits;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolHighLight.hxx b/src/IGESGraph/IGESGraph_ToolHighLight.hxx
index 4c8828d170..4667727b17 100644
--- a/src/IGESGraph/IGESGraph_ToolHighLight.hxx
+++ b/src/IGESGraph/IGESGraph_ToolHighLight.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_HighLight;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx
index 27884ecddf..4f3ca236b9 100644
--- a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx
+++ b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_IntercharacterSpacing;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx
index 074ceac938..1a73919180 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx
+++ b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_LineFontDefPattern;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx
index 0efe63a97f..3d607847e7 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx
+++ b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_LineFontDefTemplate;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx
index 92ea8df41f..ab55e97c1d 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx
+++ b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_LineFontPredefined;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolNominalSize.hxx b/src/IGESGraph/IGESGraph_ToolNominalSize.hxx
index 388c84ebaa..6de74471b7 100644
--- a/src/IGESGraph/IGESGraph_ToolNominalSize.hxx
+++ b/src/IGESGraph/IGESGraph_ToolNominalSize.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_NominalSize;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolPick.hxx b/src/IGESGraph/IGESGraph_ToolPick.hxx
index 37d299bfc0..8620ef8161 100644
--- a/src/IGESGraph/IGESGraph_ToolPick.hxx
+++ b/src/IGESGraph/IGESGraph_ToolPick.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_Pick;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx
index 67843cd458..d80a196ea5 100644
--- a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx
+++ b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_TextDisplayTemplate;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolTextFontDef.hxx b/src/IGESGraph/IGESGraph_ToolTextFontDef.hxx
index 2eec869d8d..11becc3fb5 100644
--- a/src/IGESGraph/IGESGraph_ToolTextFontDef.hxx
+++ b/src/IGESGraph/IGESGraph_ToolTextFontDef.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_TextFontDef;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx
index ca642abfb8..3217b47bc5 100644
--- a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx
+++ b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESGraph_UniformRectGrid;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESGraph/IGESGraph_UniformRectGrid.hxx b/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
index 999405fdc1..a543ad8921 100644
--- a/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
+++ b/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
@@ -24,7 +24,6 @@
 #include <gp_XY.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class gp_XY;
 class gp_Pnt2d;
 class gp_Vec2d;
 
diff --git a/src/IGESSelect/IGESSelect.hxx b/src/IGESSelect/IGESSelect.hxx
index b62c5fbf7c..1752b12ecc 100644
--- a/src/IGESSelect/IGESSelect.hxx
+++ b/src/IGESSelect/IGESSelect.hxx
@@ -24,52 +24,6 @@
 #include <Standard_Integer.hxx>
 class IGESData_IGESEntity;
 class Interface_Graph;
-class IGESSelect_EditHeader;
-class IGESSelect_EditDirPart;
-class IGESSelect_IGESTypeForm;
-class IGESSelect_IGESName;
-class IGESSelect_SignStatus;
-class IGESSelect_SignLevelNumber;
-class IGESSelect_SignColor;
-class IGESSelect_CounterOfLevelNumber;
-class IGESSelect_ViewSorter;
-class IGESSelect_DispPerSingleView;
-class IGESSelect_DispPerDrawing;
-class IGESSelect_SelectVisibleStatus;
-class IGESSelect_SelectSubordinate;
-class IGESSelect_SelectLevelNumber;
-class IGESSelect_SelectName;
-class IGESSelect_SelectFromSingleView;
-class IGESSelect_SelectFromDrawing;
-class IGESSelect_SelectSingleViewFrom;
-class IGESSelect_SelectDrawingFrom;
-class IGESSelect_SelectBypassGroup;
-class IGESSelect_SelectBypassSubfigure;
-class IGESSelect_SelectBasicGeom;
-class IGESSelect_SelectFaces;
-class IGESSelect_SelectPCurves;
-class IGESSelect_ModelModifier;
-class IGESSelect_FileModifier;
-class IGESSelect_FloatFormat;
-class IGESSelect_AddFileComment;
-class IGESSelect_UpdateFileName;
-class IGESSelect_UpdateCreationDate;
-class IGESSelect_UpdateLastChange;
-class IGESSelect_SetVersion5;
-class IGESSelect_SetGlobalParameter;
-class IGESSelect_AutoCorrect;
-class IGESSelect_ComputeStatus;
-class IGESSelect_RebuildDrawings;
-class IGESSelect_RebuildGroups;
-class IGESSelect_AddGroup;
-class IGESSelect_ChangeLevelNumber;
-class IGESSelect_ChangeLevelList;
-class IGESSelect_SplineToBSpline;
-class IGESSelect_RemoveCurves;
-class IGESSelect_SetLabel;
-class IGESSelect_WorkLibrary;
-class IGESSelect_Activator;
-class IGESSelect_Dumper;
 
 
 //! This package defines the library of the most used tools for
diff --git a/src/IGESSelect/IGESSelect_FloatFormat.hxx b/src/IGESSelect/IGESSelect_FloatFormat.hxx
index ba702ab101..d913ce2039 100644
--- a/src/IGESSelect/IGESSelect_FloatFormat.hxx
+++ b/src/IGESSelect/IGESSelect_FloatFormat.hxx
@@ -26,7 +26,6 @@
 #include <IGESSelect_FileModifier.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_CString.hxx>
-class TCollection_AsciiString;
 class IFSelect_ContextWrite;
 class IGESData_IGESWriter;
 
diff --git a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
index 007b6e5120..169a57ec12 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
@@ -23,7 +23,6 @@
 #include <IFSelect_SelectExplore.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
 class Standard_Transient;
 class Interface_Graph;
 class Interface_EntityIterator;
diff --git a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
index bb86f99a8a..244d7b0b53 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
@@ -23,7 +23,6 @@
 #include <IFSelect_SelectExplore.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
 class Standard_Transient;
 class Interface_Graph;
 class Interface_EntityIterator;
diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
index 0881bfeaf7..b7e9accca7 100644
--- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
+++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
@@ -22,7 +22,6 @@
 
 #include <IFSelect_SelectDeduct.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
 class Interface_EntityIterator;
 class Interface_Graph;
 class TCollection_AsciiString;
diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
index 7bbb8600e0..5c76129c78 100644
--- a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
+++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectDeduct.hxx>
-class Interface_InterfaceError;
 class Interface_EntityIterator;
 class Interface_Graph;
 class TCollection_AsciiString;
diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
index ed6c03d437..cee785e050 100644
--- a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
+++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
@@ -21,7 +21,6 @@
 #include <Standard_Type.hxx>
 
 #include <IFSelect_SelectDeduct.hxx>
-class Interface_InterfaceError;
 class Interface_EntityIterator;
 class Interface_Graph;
 class TCollection_AsciiString;
diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
index a03fe34bd1..fa98053a9a 100644
--- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
+++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
@@ -22,7 +22,6 @@
 
 #include <IFSelect_SelectDeduct.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
 class Interface_EntityIterator;
 class Interface_Graph;
 class TCollection_AsciiString;
diff --git a/src/IGESSelect/IGESSelect_ViewSorter.hxx b/src/IGESSelect/IGESSelect_ViewSorter.hxx
index 001d2affea..093959b764 100644
--- a/src/IGESSelect/IGESSelect_ViewSorter.hxx
+++ b/src/IGESSelect/IGESSelect_ViewSorter.hxx
@@ -27,7 +27,6 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 #include <Standard_Integer.hxx>
 class IGESData_IGESModel;
-class Standard_Transient;
 class IGESData_IGESEntity;
 class Interface_InterfaceModel;
 class Interface_Graph;
diff --git a/src/IGESSolid/IGESSolid.hxx b/src/IGESSolid/IGESSolid.hxx
index b503d20a48..bea960eeac 100644
--- a/src/IGESSolid/IGESSolid.hxx
+++ b/src/IGESSolid/IGESSolid.hxx
@@ -22,59 +22,6 @@
 #include <Standard_Handle.hxx>
 
 class IGESSolid_Protocol;
-class IGESSolid_Block;
-class IGESSolid_RightAngularWedge;
-class IGESSolid_Cylinder;
-class IGESSolid_ConeFrustum;
-class IGESSolid_Sphere;
-class IGESSolid_Torus;
-class IGESSolid_SolidOfRevolution;
-class IGESSolid_SolidOfLinearExtrusion;
-class IGESSolid_Ellipsoid;
-class IGESSolid_BooleanTree;
-class IGESSolid_SelectedComponent;
-class IGESSolid_SolidAssembly;
-class IGESSolid_ManifoldSolid;
-class IGESSolid_PlaneSurface;
-class IGESSolid_CylindricalSurface;
-class IGESSolid_ConicalSurface;
-class IGESSolid_SphericalSurface;
-class IGESSolid_ToroidalSurface;
-class IGESSolid_SolidInstance;
-class IGESSolid_VertexList;
-class IGESSolid_EdgeList;
-class IGESSolid_Loop;
-class IGESSolid_Face;
-class IGESSolid_Shell;
-class IGESSolid_ToolBlock;
-class IGESSolid_ToolRightAngularWedge;
-class IGESSolid_ToolCylinder;
-class IGESSolid_ToolConeFrustum;
-class IGESSolid_ToolSphere;
-class IGESSolid_ToolTorus;
-class IGESSolid_ToolSolidOfRevolution;
-class IGESSolid_ToolSolidOfLinearExtrusion;
-class IGESSolid_ToolEllipsoid;
-class IGESSolid_ToolBooleanTree;
-class IGESSolid_ToolSelectedComponent;
-class IGESSolid_ToolSolidAssembly;
-class IGESSolid_ToolManifoldSolid;
-class IGESSolid_ToolPlaneSurface;
-class IGESSolid_ToolCylindricalSurface;
-class IGESSolid_ToolConicalSurface;
-class IGESSolid_ToolSphericalSurface;
-class IGESSolid_ToolToroidalSurface;
-class IGESSolid_ToolSolidInstance;
-class IGESSolid_ToolVertexList;
-class IGESSolid_ToolEdgeList;
-class IGESSolid_ToolLoop;
-class IGESSolid_ToolFace;
-class IGESSolid_ToolShell;
-class IGESSolid_Protocol;
-class IGESSolid_ReadWriteModule;
-class IGESSolid_GeneralModule;
-class IGESSolid_SpecificModule;
-class IGESSolid_TopoBuilder;
 
 
 //! This package consists of B-Rep and CSG Solid entities
diff --git a/src/IGESSolid/IGESSolid_Block.hxx b/src/IGESSolid/IGESSolid_Block.hxx
index 492ad07f91..9c842f0f08 100644
--- a/src/IGESSolid/IGESSolid_Block.hxx
+++ b/src/IGESSolid/IGESSolid_Block.hxx
@@ -23,7 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Real.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_BooleanTree.hxx b/src/IGESSolid/IGESSolid_BooleanTree.hxx
index 470f9aba2a..a489028222 100644
--- a/src/IGESSolid/IGESSolid_BooleanTree.hxx
+++ b/src/IGESSolid/IGESSolid_BooleanTree.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 
 
 class IGESSolid_BooleanTree;
diff --git a/src/IGESSolid/IGESSolid_ConeFrustum.hxx b/src/IGESSolid/IGESSolid_ConeFrustum.hxx
index ee9e6c19ff..5603a509cc 100644
--- a/src/IGESSolid/IGESSolid_ConeFrustum.hxx
+++ b/src/IGESSolid/IGESSolid_ConeFrustum.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_Cylinder.hxx b/src/IGESSolid/IGESSolid_Cylinder.hxx
index 7b4190dd46..fcd3b920dd 100644
--- a/src/IGESSolid/IGESSolid_Cylinder.hxx
+++ b/src/IGESSolid/IGESSolid_Cylinder.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_EdgeList.hxx b/src/IGESSolid/IGESSolid_EdgeList.hxx
index bfb1e130ea..aabf38acb6 100644
--- a/src/IGESSolid/IGESSolid_EdgeList.hxx
+++ b/src/IGESSolid/IGESSolid_EdgeList.hxx
@@ -25,9 +25,6 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESSolid_VertexList;
 
 
diff --git a/src/IGESSolid/IGESSolid_Ellipsoid.hxx b/src/IGESSolid/IGESSolid_Ellipsoid.hxx
index f5a4881641..5cb1632152 100644
--- a/src/IGESSolid/IGESSolid_Ellipsoid.hxx
+++ b/src/IGESSolid/IGESSolid_Ellipsoid.hxx
@@ -23,7 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Real.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_Face.hxx b/src/IGESSolid/IGESSolid_Face.hxx
index 9d0e6e86ac..c13252e48f 100644
--- a/src/IGESSolid/IGESSolid_Face.hxx
+++ b/src/IGESSolid/IGESSolid_Face.hxx
@@ -24,8 +24,6 @@
 #include <IGESSolid_HArray1OfLoop.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class IGESData_IGESEntity;
-class Standard_OutOfRange;
 class IGESSolid_Loop;
 
 
diff --git a/src/IGESSolid/IGESSolid_Loop.hxx b/src/IGESSolid/IGESSolid_Loop.hxx
index 5c23329f79..730665e06a 100644
--- a/src/IGESSolid/IGESSolid_Loop.hxx
+++ b/src/IGESSolid/IGESSolid_Loop.hxx
@@ -27,9 +27,6 @@
 #include <Standard_Integer.hxx>
 class IGESBasic_HArray1OfHArray1OfInteger;
 class IGESBasic_HArray1OfHArray1OfIGESEntity;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 
 
 class IGESSolid_Loop;
diff --git a/src/IGESSolid/IGESSolid_ManifoldSolid.hxx b/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
index a27cb984e7..28bab7fd18 100644
--- a/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
+++ b/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
@@ -26,8 +26,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
 class IGESSolid_Shell;
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 
 
 class IGESSolid_ManifoldSolid;
diff --git a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
index 0eb551d841..ec0bc376fe 100644
--- a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
+++ b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_ReadWriteModule.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESData_IGESEntity;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_RightAngularWedge.hxx b/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
index 60c28679c7..c56fc59835 100644
--- a/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
+++ b/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
@@ -23,7 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <Standard_Real.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_SelectedComponent.hxx b/src/IGESSolid/IGESSolid_SelectedComponent.hxx
index 71352a0367..c23184f261 100644
--- a/src/IGESSolid/IGESSolid_SelectedComponent.hxx
+++ b/src/IGESSolid/IGESSolid_SelectedComponent.hxx
@@ -23,7 +23,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 class IGESSolid_BooleanTree;
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESSolid/IGESSolid_Shell.hxx b/src/IGESSolid/IGESSolid_Shell.hxx
index b296c18ae2..9351f6284f 100644
--- a/src/IGESSolid/IGESSolid_Shell.hxx
+++ b/src/IGESSolid/IGESSolid_Shell.hxx
@@ -25,8 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
 class IGESSolid_Face;
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidAssembly.hxx b/src/IGESSolid/IGESSolid_SolidAssembly.hxx
index a5fa1266ab..da6d00caa4 100644
--- a/src/IGESSolid/IGESSolid_SolidAssembly.hxx
+++ b/src/IGESSolid/IGESSolid_SolidAssembly.hxx
@@ -25,9 +25,6 @@
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_DimensionMismatch;
-class Standard_OutOfRange;
-class IGESData_IGESEntity;
 class IGESGeom_TransformationMatrix;
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidInstance.hxx b/src/IGESSolid/IGESSolid_SolidInstance.hxx
index b7901a39ed..fad9db1a33 100644
--- a/src/IGESSolid/IGESSolid_SolidInstance.hxx
+++ b/src/IGESSolid/IGESSolid_SolidInstance.hxx
@@ -22,7 +22,6 @@
 
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
 
 
 class IGESSolid_SolidInstance;
diff --git a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
index 00aa5af357..d645739a29 100644
--- a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
+++ b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
@@ -23,8 +23,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Dir;
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx b/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
index d24e6113ab..c0ca8a7234 100644
--- a/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
+++ b/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
@@ -24,8 +24,6 @@
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Boolean.hxx>
-class IGESData_IGESEntity;
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_Sphere.hxx b/src/IGESSolid/IGESSolid_Sphere.hxx
index ae5cedf13f..ee49e4b347 100644
--- a/src/IGESSolid/IGESSolid_Sphere.hxx
+++ b/src/IGESSolid/IGESSolid_Sphere.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Pnt;
 
 
diff --git a/src/IGESSolid/IGESSolid_ToolBlock.hxx b/src/IGESSolid/IGESSolid_ToolBlock.hxx
index 2dd4a0849e..7819da50bb 100644
--- a/src/IGESSolid/IGESSolid_ToolBlock.hxx
+++ b/src/IGESSolid/IGESSolid_ToolBlock.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Block;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx b/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx
index 01d609becd..93d536db87 100644
--- a/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx
+++ b/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_BooleanTree;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx b/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx
index a3b8b8a164..f69d9257e2 100644
--- a/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx
+++ b/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_ConeFrustum;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx b/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx
index 38dd430405..55056c356d 100644
--- a/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_ConicalSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolCylinder.hxx b/src/IGESSolid/IGESSolid_ToolCylinder.hxx
index 951c031277..3bf970f65e 100644
--- a/src/IGESSolid/IGESSolid_ToolCylinder.hxx
+++ b/src/IGESSolid/IGESSolid_ToolCylinder.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Cylinder;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx
index 29024dd09f..ab57ed37d6 100644
--- a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_CylindricalSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolEdgeList.hxx b/src/IGESSolid/IGESSolid_ToolEdgeList.hxx
index 4e3c837c59..c93468af33 100644
--- a/src/IGESSolid/IGESSolid_ToolEdgeList.hxx
+++ b/src/IGESSolid/IGESSolid_ToolEdgeList.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_EdgeList;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx b/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx
index f246fed084..ddc56cef45 100644
--- a/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx
+++ b/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Ellipsoid;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolFace.hxx b/src/IGESSolid/IGESSolid_ToolFace.hxx
index b588c1ec62..6dd23b1040 100644
--- a/src/IGESSolid/IGESSolid_ToolFace.hxx
+++ b/src/IGESSolid/IGESSolid_ToolFace.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Face;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolLoop.hxx b/src/IGESSolid/IGESSolid_ToolLoop.hxx
index 89054688c7..9ffbeba8c9 100644
--- a/src/IGESSolid/IGESSolid_ToolLoop.hxx
+++ b/src/IGESSolid/IGESSolid_ToolLoop.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Loop;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx b/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx
index e2419eefa5..829a18a366 100644
--- a/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx
+++ b/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_ManifoldSolid;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx b/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx
index dc5bf05c37..827e585088 100644
--- a/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_PlaneSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx
index 84015a3227..a674a7e6f4 100644
--- a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx
+++ b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_RightAngularWedge;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx b/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx
index 2ecc4e2b15..3b858115b6 100644
--- a/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SelectedComponent;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolShell.hxx b/src/IGESSolid/IGESSolid_ToolShell.hxx
index 3ff3dca816..49ebdaed9d 100644
--- a/src/IGESSolid/IGESSolid_ToolShell.hxx
+++ b/src/IGESSolid/IGESSolid_ToolShell.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Shell;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx b/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx
index 791c81b486..5b92b30d57 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SolidAssembly;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx b/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx
index a137cedcfb..90963fcc0c 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SolidInstance;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx
index 341838fcd3..306914169a 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SolidOfLinearExtrusion;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx
index e559b335dc..930a95759b 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SolidOfRevolution;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSphere.hxx b/src/IGESSolid/IGESSolid_ToolSphere.hxx
index 03f445b062..33d2cbd794 100644
--- a/src/IGESSolid/IGESSolid_ToolSphere.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSphere.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Sphere;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx b/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx
index 7700f51784..8addfac02e 100644
--- a/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_SphericalSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx b/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx
index f0ea4411ef..24b2939dbb 100644
--- a/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_ToroidalSurface;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolTorus.hxx b/src/IGESSolid/IGESSolid_ToolTorus.hxx
index e698dad6eb..eda1694d37 100644
--- a/src/IGESSolid/IGESSolid_ToolTorus.hxx
+++ b/src/IGESSolid/IGESSolid_ToolTorus.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_Torus;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_ToolVertexList.hxx b/src/IGESSolid/IGESSolid_ToolVertexList.hxx
index eff89aa166..1142a0cb6e 100644
--- a/src/IGESSolid/IGESSolid_ToolVertexList.hxx
+++ b/src/IGESSolid/IGESSolid_ToolVertexList.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <Standard_Integer.hxx>
-class Standard_DomainError;
 class IGESSolid_VertexList;
 class IGESData_IGESReaderData;
 class IGESData_ParamReader;
diff --git a/src/IGESSolid/IGESSolid_TopoBuilder.hxx b/src/IGESSolid/IGESSolid_TopoBuilder.hxx
index 50456dafbc..0ea7c59983 100644
--- a/src/IGESSolid/IGESSolid_TopoBuilder.hxx
+++ b/src/IGESSolid/IGESSolid_TopoBuilder.hxx
@@ -32,7 +32,6 @@ class IGESData_IGESEntity;
 class IGESSolid_Loop;
 class IGESSolid_EdgeList;
 class IGESSolid_VertexList;
-class Standard_DomainError;
 class gp_XYZ;
 
 
diff --git a/src/IGESSolid/IGESSolid_Torus.hxx b/src/IGESSolid/IGESSolid_Torus.hxx
index a43e359c1a..aed4f63f00 100644
--- a/src/IGESSolid/IGESSolid_Torus.hxx
+++ b/src/IGESSolid/IGESSolid_Torus.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Real.hxx>
 #include <gp_XYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
-class gp_XYZ;
 class gp_Pnt;
 class gp_Dir;
 
diff --git a/src/IGESSolid/IGESSolid_VertexList.hxx b/src/IGESSolid/IGESSolid_VertexList.hxx
index d8f0ed8d94..9a1c82a5e4 100644
--- a/src/IGESSolid/IGESSolid_VertexList.hxx
+++ b/src/IGESSolid/IGESSolid_VertexList.hxx
@@ -23,7 +23,6 @@
 #include <TColgp_HArray1OfXYZ.hxx>
 #include <IGESData_IGESEntity.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class gp_Pnt;
 
 
diff --git a/src/IGESToBRep/IGESToBRep.hxx b/src/IGESToBRep/IGESToBRep.hxx
index b96970c24c..b9dd61e190 100644
--- a/src/IGESToBRep/IGESToBRep.hxx
+++ b/src/IGESToBRep/IGESToBRep.hxx
@@ -26,20 +26,8 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 class IGESToBRep_AlgoContainer;
 class IGESData_IGESEntity;
-class TopoDS_Shape;
 class TopoDS_Edge;
 class TopoDS_Face;
-class IGESToBRep_CurveAndSurface;
-class IGESToBRep_BasicSurface;
-class IGESToBRep_BasicCurve;
-class IGESToBRep_TopoSurface;
-class IGESToBRep_TopoCurve;
-class IGESToBRep_BRepEntity;
-class IGESToBRep_IGESBoundary;
-class IGESToBRep_Reader;
-class IGESToBRep_Actor;
-class IGESToBRep_AlgoContainer;
-class IGESToBRep_ToolContainer;
 
 
 //! Provides tools in order to transfer IGES entities
diff --git a/src/IGESToBRep/IGESToBRep_BRepEntity.hxx b/src/IGESToBRep/IGESToBRep_BRepEntity.hxx
index 3ddc784319..e88fa23199 100644
--- a/src/IGESToBRep/IGESToBRep_BRepEntity.hxx
+++ b/src/IGESToBRep/IGESToBRep_BRepEntity.hxx
@@ -27,7 +27,6 @@
 #include <Standard_Integer.hxx>
 #include <Message_ProgressRange.hxx>
 
-class IGESToBRep_CurveAndSurface;
 class TopoDS_Shape;
 class IGESData_IGESEntity;
 class TopoDS_Vertex;
diff --git a/src/IGESToBRep/IGESToBRep_BasicCurve.hxx b/src/IGESToBRep/IGESToBRep_BasicCurve.hxx
index 7b9d06dbcf..9ec2fa46e3 100644
--- a/src/IGESToBRep/IGESToBRep_BasicCurve.hxx
+++ b/src/IGESToBRep/IGESToBRep_BasicCurve.hxx
@@ -24,7 +24,6 @@
 #include <IGESToBRep_CurveAndSurface.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class IGESToBRep_CurveAndSurface;
 class Geom_Curve;
 class IGESData_IGESEntity;
 class Geom2d_Curve;
diff --git a/src/IGESToBRep/IGESToBRep_BasicSurface.hxx b/src/IGESToBRep/IGESToBRep_BasicSurface.hxx
index ada221b011..95226c1b43 100644
--- a/src/IGESToBRep/IGESToBRep_BasicSurface.hxx
+++ b/src/IGESToBRep/IGESToBRep_BasicSurface.hxx
@@ -24,7 +24,6 @@
 #include <IGESToBRep_CurveAndSurface.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class IGESToBRep_CurveAndSurface;
 class Geom_Surface;
 class IGESData_IGESEntity;
 class Geom_Plane;
diff --git a/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx b/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
index c80fbebc34..d4d3c285fc 100644
--- a/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
+++ b/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
@@ -30,9 +30,6 @@
 #include <IGESData_HArray1OfIGESEntity.hxx>
 class IGESData_IGESEntity;
 class ShapeExtend_WireData;
-class IGESToBRep_CurveAndSurface;
-class TopoDS_Face;
-class gp_Trsf2d;
 
 
 class IGESToBRep_IGESBoundary;
diff --git a/src/IGESToBRep/IGESToBRep_TopoCurve.hxx b/src/IGESToBRep/IGESToBRep_TopoCurve.hxx
index b7cfea0bb8..1bbe6128ca 100644
--- a/src/IGESToBRep/IGESToBRep_TopoCurve.hxx
+++ b/src/IGESToBRep/IGESToBRep_TopoCurve.hxx
@@ -27,7 +27,6 @@
 #include <IGESToBRep_CurveAndSurface.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-class IGESToBRep_CurveAndSurface;
 class TopoDS_Shape;
 class IGESData_IGESEntity;
 class TopoDS_Face;
diff --git a/src/IGESToBRep/IGESToBRep_TopoSurface.hxx b/src/IGESToBRep/IGESToBRep_TopoSurface.hxx
index 3f19a4ad0b..a1d172c88e 100644
--- a/src/IGESToBRep/IGESToBRep_TopoSurface.hxx
+++ b/src/IGESToBRep/IGESToBRep_TopoSurface.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #include <IGESToBRep_CurveAndSurface.hxx>
 #include <Standard_Boolean.hxx>
-class IGESToBRep_CurveAndSurface;
 class TopoDS_Shape;
 class IGESData_IGESEntity;
 class IGESGeom_RuledSurface;
diff --git a/src/IMeshData/IMeshData_Edge.hxx b/src/IMeshData/IMeshData_Edge.hxx
index 21212fbb21..2d4230d181 100644
--- a/src/IMeshData/IMeshData_Edge.hxx
+++ b/src/IMeshData/IMeshData_Edge.hxx
@@ -26,7 +26,6 @@
 #include <IMeshData_Types.hxx>
 #include <BRep_Tool.hxx>
 
-class IMeshData_Face;
 
 //! Interface class representing discrete model of an edge.
 class IMeshData_Edge : public IMeshData_TessellatedShape, public IMeshData_StatusOwner
diff --git a/src/IMeshData/IMeshData_Face.hxx b/src/IMeshData/IMeshData_Face.hxx
index 711da8344d..7ae82c0859 100644
--- a/src/IMeshData/IMeshData_Face.hxx
+++ b/src/IMeshData/IMeshData_Face.hxx
@@ -25,7 +25,6 @@
 #include <IMeshData_Types.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
-class IMeshData_Wire;
 class TopoDS_Wire;
 
 //! Interface class representing discrete model of a face.
diff --git a/src/IMeshData/IMeshData_Model.hxx b/src/IMeshData/IMeshData_Model.hxx
index f87ffc6fb9..422d4cb769 100644
--- a/src/IMeshData/IMeshData_Model.hxx
+++ b/src/IMeshData/IMeshData_Model.hxx
@@ -23,8 +23,6 @@
 
 class TopoDS_Face;
 class TopoDS_Edge;
-class IMeshData_Face;
-class IMeshData_Edge;
 
 //! Interface class representing discrete model of a shape.
 class IMeshData_Model : public IMeshData_Shape
diff --git a/src/IMeshData/IMeshData_Wire.hxx b/src/IMeshData/IMeshData_Wire.hxx
index 6e71e24abc..65e8ba90d4 100644
--- a/src/IMeshData/IMeshData_Wire.hxx
+++ b/src/IMeshData/IMeshData_Wire.hxx
@@ -23,7 +23,6 @@
 #include <TopoDS.hxx>
 #include <IMeshData_Types.hxx>
 
-class IMeshData_Edge;
 
 //! Interface class representing discrete model of a wire.
 //! Wire should represent an ordered set of edges.
diff --git a/src/IntAna/IntAna_Int3Pln.hxx b/src/IntAna/IntAna_Int3Pln.hxx
index aed74af64e..ed5273aa2e 100644
--- a/src/IntAna/IntAna_Int3Pln.hxx
+++ b/src/IntAna/IntAna_Int3Pln.hxx
@@ -23,10 +23,7 @@
 
 #include <Standard_Boolean.hxx>
 #include <gp_Pnt.hxx>
-class StdFail_NotDone;
-class Standard_DomainError;
 class gp_Pln;
-class gp_Pnt;
 
 
 //! Intersection between 3 planes. The algorithm searches
diff --git a/src/IntAna/IntAna_IntConicQuad.hxx b/src/IntAna/IntAna_IntConicQuad.hxx
index 4c7f2a1988..9af3a88091 100644
--- a/src/IntAna/IntAna_IntConicQuad.hxx
+++ b/src/IntAna/IntAna_IntConicQuad.hxx
@@ -25,9 +25,6 @@
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
-class StdFail_NotDone;
-class Standard_OutOfRange;
-class Standard_DomainError;
 class gp_Lin;
 class IntAna_Quadric;
 class gp_Circ;
@@ -35,7 +32,6 @@ class gp_Elips;
 class gp_Parab;
 class gp_Hypr;
 class gp_Pln;
-class gp_Pnt;
 
 
 //! This class provides the analytic intersection between
diff --git a/src/IntAna/IntAna_IntLinTorus.hxx b/src/IntAna/IntAna_IntLinTorus.hxx
index 95fb3c5bdf..145517d4a3 100644
--- a/src/IntAna/IntAna_IntLinTorus.hxx
+++ b/src/IntAna/IntAna_IntLinTorus.hxx
@@ -25,11 +25,8 @@
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
-class StdFail_NotDone;
-class Standard_OutOfRange;
 class gp_Lin;
 class gp_Torus;
-class gp_Pnt;
 
 
 //! Intersection between a line and a torus.
diff --git a/src/IntAna/IntAna_IntQuadQuad.hxx b/src/IntAna/IntAna_IntQuadQuad.hxx
index 5c3dc74116..85e4e83ebf 100644
--- a/src/IntAna/IntAna_IntQuadQuad.hxx
+++ b/src/IntAna/IntAna_IntQuadQuad.hxx
@@ -26,14 +26,9 @@
 #include <Standard_Integer.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
-class Standard_OutOfRange;
-class StdFail_NotDone;
-class Standard_DomainError;
 class gp_Cylinder;
 class IntAna_Quadric;
 class gp_Cone;
-class IntAna_Curve;
-class gp_Pnt;
 
 
 //! This class provides the analytic intersection between a
diff --git a/src/IntAna/IntAna_QuadQuadGeo.hxx b/src/IntAna/IntAna_QuadQuadGeo.hxx
index a784e7276b..70da587c17 100644
--- a/src/IntAna/IntAna_QuadQuadGeo.hxx
+++ b/src/IntAna/IntAna_QuadQuadGeo.hxx
@@ -27,15 +27,11 @@
 #include <gp_Pnt.hxx>
 #include <gp_Dir.hxx>
 #include <Standard_Real.hxx>
-class StdFail_NotDone;
-class Standard_DomainError;
-class Standard_OutOfRange;
 class gp_Pln;
 class gp_Cylinder;
 class gp_Sphere;
 class gp_Cone;
 class gp_Torus;
-class gp_Pnt;
 class gp_Lin;
 class gp_Circ;
 class gp_Elips;
diff --git a/src/IntAna2d/IntAna2d_AnaIntersection.hxx b/src/IntAna2d/IntAna2d_AnaIntersection.hxx
index 102aebc264..d35d9c974a 100644
--- a/src/IntAna2d/IntAna2d_AnaIntersection.hxx
+++ b/src/IntAna2d/IntAna2d_AnaIntersection.hxx
@@ -24,15 +24,12 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <IntAna2d_IntPoint.hxx>
-class StdFail_NotDone;
-class Standard_OutOfRange;
 class gp_Lin2d;
 class gp_Circ2d;
 class IntAna2d_Conic;
 class gp_Elips2d;
 class gp_Parab2d;
 class gp_Hypr2d;
-class IntAna2d_IntPoint;
 
 
 //! Implementation of the analytical intersection between:
diff --git a/src/IntAna2d/IntAna2d_IntPoint.hxx b/src/IntAna2d/IntAna2d_IntPoint.hxx
index b61bb3a4db..216514c3e7 100644
--- a/src/IntAna2d/IntAna2d_IntPoint.hxx
+++ b/src/IntAna2d/IntAna2d_IntPoint.hxx
@@ -24,8 +24,6 @@
 #include <Standard_Real.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
-class gp_Pnt2d;
 
 
 //! Geometrical intersection between two 2d elements.
diff --git a/src/IntCurve/IntCurve_IntConicConic.hxx b/src/IntCurve/IntCurve_IntConicConic.hxx
index 00f3fe99cf..a7483c68e0 100644
--- a/src/IntCurve/IntCurve_IntConicConic.hxx
+++ b/src/IntCurve/IntCurve_IntConicConic.hxx
@@ -24,7 +24,6 @@
 #include <IntCurve_IntImpConicParConic.hxx>
 #include <IntRes2d_Intersection.hxx>
 #include <Standard_Real.hxx>
-class Standard_ConstructionError;
 class gp_Lin2d;
 class IntRes2d_Domain;
 class gp_Circ2d;
diff --git a/src/IntCurve/IntCurve_PConic.hxx b/src/IntCurve/IntCurve_PConic.hxx
index 17d7910c98..ed3d793ca5 100644
--- a/src/IntCurve/IntCurve_PConic.hxx
+++ b/src/IntCurve/IntCurve_PConic.hxx
@@ -30,7 +30,6 @@ class gp_Circ2d;
 class gp_Parab2d;
 class gp_Hypr2d;
 class gp_Lin2d;
-class gp_Ax22d;
 
 
 //! This class represents a conic from gp as a
diff --git a/src/IntCurveSurface/IntCurveSurface_Intersection.hxx b/src/IntCurveSurface/IntCurveSurface_Intersection.hxx
index 7b9f3064f0..2153ae9bce 100644
--- a/src/IntCurveSurface/IntCurveSurface_Intersection.hxx
+++ b/src/IntCurveSurface/IntCurveSurface_Intersection.hxx
@@ -26,8 +26,6 @@
 #include <IntCurveSurface_SequenceOfSeg.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class StdFail_NotDone;
-class Standard_OutOfRange;
 class IntCurveSurface_IntersectionPoint;
 class IntCurveSurface_IntersectionSegment;
 
diff --git a/src/IntCurveSurface/IntCurveSurface_IntersectionPoint.hxx b/src/IntCurveSurface/IntCurveSurface_IntersectionPoint.hxx
index 4156141f80..3521acfe95 100644
--- a/src/IntCurveSurface/IntCurveSurface_IntersectionPoint.hxx
+++ b/src/IntCurveSurface/IntCurveSurface_IntersectionPoint.hxx
@@ -24,7 +24,6 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
 #include <IntCurveSurface_TransitionOnCurve.hxx>
-class gp_Pnt;
 
 
 //! Definition of an interserction point between a
diff --git a/src/IntCurveSurface/IntCurveSurface_IntersectionSegment.hxx b/src/IntCurveSurface/IntCurveSurface_IntersectionSegment.hxx
index d3fef38588..d1feb2cf68 100644
--- a/src/IntCurveSurface/IntCurveSurface_IntersectionSegment.hxx
+++ b/src/IntCurveSurface/IntCurveSurface_IntersectionSegment.hxx
@@ -22,7 +22,6 @@
 #include <Standard_Handle.hxx>
 
 #include <IntCurveSurface_IntersectionPoint.hxx>
-class IntCurveSurface_IntersectionPoint;
 
 
 //! A IntersectionSegment describes a segment of curve
diff --git a/src/IntCurvesFace/IntCurvesFace_Intersector.hxx b/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
index b3b74dd59e..c1af3ff4ea 100644
--- a/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
+++ b/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
@@ -27,7 +27,6 @@
 #include <TopAbs_State.hxx>
 
 class BRepTopAdaptor_TopolTool;
-class TopoDS_Face;
 class gp_Lin;
 class gp_Pnt;
 class IntCurveSurface_HInter;
diff --git a/src/IntImpParGen/IntImpParGen.hxx b/src/IntImpParGen/IntImpParGen.hxx
index f12845da23..d36b28b0e9 100644
--- a/src/IntImpParGen/IntImpParGen.hxx
+++ b/src/IntImpParGen/IntImpParGen.hxx
@@ -28,10 +28,6 @@ class gp_Vec2d;
 class IntRes2d_Transition;
 class IntRes2d_Domain;
 class gp_Pnt2d;
-class IntImpParGen_ImpTool;
-class IntImpParGen_ImpParTool;
-class IntImpParGen_Intersector;
-class IntImpParGen_MyImpParTool;
 
 
 //! Gives a generic algorithm to intersect Implicit Curves
diff --git a/src/IntPatch/IntPatch_ALine.hxx b/src/IntPatch/IntPatch_ALine.hxx
index 5f012306e0..caf51646f8 100644
--- a/src/IntPatch/IntPatch_ALine.hxx
+++ b/src/IntPatch/IntPatch_ALine.hxx
@@ -24,7 +24,6 @@
 #include <IntPatch_SequenceOfPoint.hxx>
 #include <TColStd_ListOfReal.hxx>
 
-class IntAna_Curve;
 class IntPatch_Point;
 class IntPatch_ALine;
 
diff --git a/src/IntPatch/IntPatch_GLine.hxx b/src/IntPatch/IntPatch_GLine.hxx
index 2eb3c92f84..61cc529bbd 100644
--- a/src/IntPatch/IntPatch_GLine.hxx
+++ b/src/IntPatch/IntPatch_GLine.hxx
@@ -33,8 +33,6 @@
 #include <gp_Elips.hxx>
 #include <gp_Parab.hxx>
 #include <gp_Hypr.hxx>
-class Standard_DomainError;
-class Standard_OutOfRange;
 class gp_Lin;
 class gp_Circ;
 class gp_Elips;
diff --git a/src/IntPatch/IntPatch_HCurve2dTool.hxx b/src/IntPatch/IntPatch_HCurve2dTool.hxx
index 496636389c..86f9899b55 100644
--- a/src/IntPatch/IntPatch_HCurve2dTool.hxx
+++ b/src/IntPatch/IntPatch_HCurve2dTool.hxx
@@ -34,9 +34,6 @@
 #include <gp_Elips2d.hxx>
 #include <gp_Hypr2d.hxx>
 #include <gp_Parab2d.hxx>
-class Standard_OutOfRange;
-class Standard_NoSuchObject;
-class Standard_DomainError;
 class gp_Pnt2d;
 class gp_Vec2d;
 class Geom2d_BezierCurve;
diff --git a/src/IntPatch/IntPatch_Line.hxx b/src/IntPatch/IntPatch_Line.hxx
index 8b5c4e8e0a..e92369f5cd 100644
--- a/src/IntPatch/IntPatch_Line.hxx
+++ b/src/IntPatch/IntPatch_Line.hxx
@@ -25,8 +25,6 @@
 #include <IntSurf_TypeTrans.hxx>
 #include <IntSurf_Situation.hxx>
 #include <Standard_Transient.hxx>
-class Standard_DomainError;
-class Standard_OutOfRange;
 
 
 class IntPatch_Line;
diff --git a/src/IntPatch/IntPatch_Point.hxx b/src/IntPatch/IntPatch_Point.hxx
index fcf06f2bcf..b44a1d6c48 100644
--- a/src/IntPatch/IntPatch_Point.hxx
+++ b/src/IntPatch/IntPatch_Point.hxx
@@ -28,10 +28,7 @@
 #include <Adaptor2d_Curve2d.hxx>
 
 class Adaptor3d_HVertex;
-class Standard_DomainError;
 class gp_Pnt;
-class IntSurf_Transition;
-class IntSurf_PntOn2S;
 
 
 //! Definition of an intersection point between two surfaces.
diff --git a/src/IntPatch/IntPatch_PolyArc.hxx b/src/IntPatch/IntPatch_PolyArc.hxx
index e4add5697c..920dc8507b 100644
--- a/src/IntPatch/IntPatch_PolyArc.hxx
+++ b/src/IntPatch/IntPatch_PolyArc.hxx
@@ -27,7 +27,6 @@
 #include <Standard_Boolean.hxx>
 #include <IntPatch_Polygo.hxx>
 #include <Standard_Integer.hxx>
-class Standard_ConstructionError;
 class Bnd_Box2d;
 class gp_Pnt2d;
 
diff --git a/src/IntPatch/IntPatch_PolyLine.hxx b/src/IntPatch/IntPatch_PolyLine.hxx
index f14f8a456e..01faed224a 100644
--- a/src/IntPatch/IntPatch_PolyLine.hxx
+++ b/src/IntPatch/IntPatch_PolyLine.hxx
@@ -29,7 +29,6 @@
 #include <Standard_Integer.hxx>
 class IntPatch_WLine;
 class IntPatch_RLine;
-class gp_Pnt2d;
 
 
 
diff --git a/src/IntPatch/IntPatch_Polygo.hxx b/src/IntPatch/IntPatch_Polygo.hxx
index bb7765905c..cf218b17cb 100644
--- a/src/IntPatch/IntPatch_Polygo.hxx
+++ b/src/IntPatch/IntPatch_Polygo.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Real.hxx>
 #include <Intf_Polygon2d.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class gp_Pnt2d;
 
 
diff --git a/src/IntPatch/IntPatch_RLine.hxx b/src/IntPatch/IntPatch_RLine.hxx
index 690fc8bff7..b98bda1c86 100644
--- a/src/IntPatch/IntPatch_RLine.hxx
+++ b/src/IntPatch/IntPatch_RLine.hxx
@@ -29,8 +29,6 @@
 #include <IntSurf_Situation.hxx>
 #include <IntSurf_TypeTrans.hxx>
 
-class Standard_DomainError;
-class Standard_OutOfRange;
 class IntPatch_Point;
 class IntSurf_PntOn2S;
 
diff --git a/src/IntPatch/IntPatch_RstInt.hxx b/src/IntPatch/IntPatch_RstInt.hxx
index 7f3c4ab52a..66a9d8819d 100644
--- a/src/IntPatch/IntPatch_RstInt.hxx
+++ b/src/IntPatch/IntPatch_RstInt.hxx
@@ -19,7 +19,6 @@
 
 #include <Adaptor3d_Surface.hxx>
 
-class Standard_DomainError;
 class IntPatch_Line;
 class Adaptor3d_TopolTool;
 
diff --git a/src/IntPatch/IntPatch_WLine.hxx b/src/IntPatch/IntPatch_WLine.hxx
index 4f26b91ecf..2f68baaff8 100644
--- a/src/IntPatch/IntPatch_WLine.hxx
+++ b/src/IntPatch/IntPatch_WLine.hxx
@@ -29,8 +29,6 @@
 #include <IntSurf_Situation.hxx>
 #include <IntSurf_TypeTrans.hxx>
 
-class Standard_OutOfRange;
-class Standard_DomainError;
 class IntPatch_Point;
 class IntSurf_PntOn2S;
 class gp_Pnt2d;
diff --git a/src/IntPolyh/IntPolyh_MaillageAffinage.hxx b/src/IntPolyh/IntPolyh_MaillageAffinage.hxx
index ee78cc2fd4..0ed38877a6 100644
--- a/src/IntPolyh/IntPolyh_MaillageAffinage.hxx
+++ b/src/IntPolyh/IntPolyh_MaillageAffinage.hxx
@@ -28,7 +28,6 @@
 #include <IntPolyh_ArrayOfSectionLines.hxx>
 #include <IntPolyh_ArrayOfTangentZones.hxx>
 
-class Bnd_Box;
 class IntPolyh_StartPoint;
 
 //! Low-level algorithm to compute intersection of the surfaces
diff --git a/src/IntPolyh/IntPolyh_Triangle.hxx b/src/IntPolyh/IntPolyh_Triangle.hxx
index 1c046104a8..f3cee2b80a 100644
--- a/src/IntPolyh/IntPolyh_Triangle.hxx
+++ b/src/IntPolyh/IntPolyh_Triangle.hxx
@@ -23,7 +23,6 @@
 #include <IntPolyh_ArrayOfTriangles.hxx>
 #include <IntPolyh_ArrayOfEdges.hxx>
 
-class IntPolyh_StartPoint;
 
 //! The class represents the triangle built from three IntPolyh points
 //! and three IntPolyh edges.
diff --git a/src/IntRes2d/IntRes2d_Domain.hxx b/src/IntRes2d/IntRes2d_Domain.hxx
index 3470804b9f..0799227aae 100644
--- a/src/IntRes2d/IntRes2d_Domain.hxx
+++ b/src/IntRes2d/IntRes2d_Domain.hxx
@@ -25,8 +25,6 @@
 #include <Standard_Real.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
-class gp_Pnt2d;
 
 
 //! Definition of the domain of parameter on a 2d-curve.
diff --git a/src/IntRes2d/IntRes2d_Intersection.hxx b/src/IntRes2d/IntRes2d_Intersection.hxx
index 3553054a87..2b28f65c8b 100644
--- a/src/IntRes2d/IntRes2d_Intersection.hxx
+++ b/src/IntRes2d/IntRes2d_Intersection.hxx
@@ -26,8 +26,6 @@
 #include <IntRes2d_SequenceOfIntersectionSegment.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class StdFail_NotDone;
-class Standard_OutOfRange;
 class IntRes2d_IntersectionPoint;
 class IntRes2d_IntersectionSegment;
 
diff --git a/src/IntRes2d/IntRes2d_IntersectionPoint.hxx b/src/IntRes2d/IntRes2d_IntersectionPoint.hxx
index cd7b4b39a5..a78fff7547 100644
--- a/src/IntRes2d/IntRes2d_IntersectionPoint.hxx
+++ b/src/IntRes2d/IntRes2d_IntersectionPoint.hxx
@@ -25,8 +25,6 @@
 #include <Standard_Real.hxx>
 #include <IntRes2d_Transition.hxx>
 #include <Standard_Boolean.hxx>
-class gp_Pnt2d;
-class IntRes2d_Transition;
 
 
 //! Definition of an intersection point between two
diff --git a/src/IntRes2d/IntRes2d_IntersectionSegment.hxx b/src/IntRes2d/IntRes2d_IntersectionSegment.hxx
index fe4b506aa0..79f2cdb730 100644
--- a/src/IntRes2d/IntRes2d_IntersectionSegment.hxx
+++ b/src/IntRes2d/IntRes2d_IntersectionSegment.hxx
@@ -23,8 +23,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
-class Standard_DomainError;
-class IntRes2d_IntersectionPoint;
 
 
 //! Definition of an intersection curve between
diff --git a/src/IntRes2d/IntRes2d_Transition.hxx b/src/IntRes2d/IntRes2d_Transition.hxx
index 89b7c863b1..86ba7f411e 100644
--- a/src/IntRes2d/IntRes2d_Transition.hxx
+++ b/src/IntRes2d/IntRes2d_Transition.hxx
@@ -25,7 +25,6 @@
 #include <IntRes2d_Position.hxx>
 #include <IntRes2d_TypeTrans.hxx>
 #include <IntRes2d_Situation.hxx>
-class Standard_DomainError;
 
 
 //! Definition of    the  type  of   transition    near an
diff --git a/src/IntSurf/IntSurf_InteriorPoint.hxx b/src/IntSurf/IntSurf_InteriorPoint.hxx
index 418948e3f5..63334c7bee 100644
--- a/src/IntSurf/IntSurf_InteriorPoint.hxx
+++ b/src/IntSurf/IntSurf_InteriorPoint.hxx
@@ -25,9 +25,6 @@
 #include <Standard_Real.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
-class gp_Pnt;
-class gp_Vec;
-class gp_Vec2d;
 
 
 //! Definition of a point solution of the
diff --git a/src/IntSurf/IntSurf_LineOn2S.hxx b/src/IntSurf/IntSurf_LineOn2S.hxx
index 1d78429ab4..d9575557e6 100644
--- a/src/IntSurf/IntSurf_LineOn2S.hxx
+++ b/src/IntSurf/IntSurf_LineOn2S.hxx
@@ -28,7 +28,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
-class Standard_OutOfRange;
 class IntSurf_PntOn2S;
 
 
diff --git a/src/IntSurf/IntSurf_PathPoint.hxx b/src/IntSurf/IntSurf_PathPoint.hxx
index e4ac09c051..d8617163ec 100644
--- a/src/IntSurf/IntSurf_PathPoint.hxx
+++ b/src/IntSurf/IntSurf_PathPoint.hxx
@@ -28,11 +28,6 @@
 #include <TColgp_HSequenceOfXY.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-class StdFail_UndefinedDerivative;
-class Standard_OutOfRange;
-class gp_Pnt;
-class gp_Vec;
-class gp_Dir2d;
 
 
 
diff --git a/src/IntSurf/IntSurf_PntOn2S.hxx b/src/IntSurf/IntSurf_PntOn2S.hxx
index 6239fe454a..d9e4bcfeeb 100644
--- a/src/IntSurf/IntSurf_PntOn2S.hxx
+++ b/src/IntSurf/IntSurf_PntOn2S.hxx
@@ -24,7 +24,6 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class gp_Pnt;
 class gp_Pnt2d;
 
 
diff --git a/src/IntSurf/IntSurf_Transition.hxx b/src/IntSurf/IntSurf_Transition.hxx
index b0b462489b..831d47e060 100644
--- a/src/IntSurf/IntSurf_Transition.hxx
+++ b/src/IntSurf/IntSurf_Transition.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <IntSurf_TypeTrans.hxx>
 #include <IntSurf_Situation.hxx>
-class Standard_DomainError;
 
 
 //! Definition of the transition at the intersection
diff --git a/src/IntTools/IntTools_BeanFaceIntersector.hxx b/src/IntTools/IntTools_BeanFaceIntersector.hxx
index 7ee7b6e069..6004773923 100644
--- a/src/IntTools/IntTools_BeanFaceIntersector.hxx
+++ b/src/IntTools/IntTools_BeanFaceIntersector.hxx
@@ -35,8 +35,6 @@ class Geom_Surface;
 class IntTools_Context;
 class TopoDS_Edge;
 class TopoDS_Face;
-class BRepAdaptor_Curve;
-class BRepAdaptor_Surface;
 class IntTools_CurveRangeSample;
 class Bnd_Box;
 class IntTools_SurfaceRangeSample;
diff --git a/src/IntTools/IntTools_CommonPrt.hxx b/src/IntTools/IntTools_CommonPrt.hxx
index ab3a1635ec..3de0603475 100644
--- a/src/IntTools/IntTools_CommonPrt.hxx
+++ b/src/IntTools/IntTools_CommonPrt.hxx
@@ -27,9 +27,6 @@
 #include <IntTools_SequenceOfRanges.hxx>
 #include <Standard_Boolean.hxx>
 #include <gp_Pnt.hxx>
-class TopoDS_Edge;
-class IntTools_Range;
-class gp_Pnt;
 
 
 //! The class  is  to  describe a  common  part
diff --git a/src/IntTools/IntTools_Context.hxx b/src/IntTools/IntTools_Context.hxx
index 2d29989439..d09e6266db 100644
--- a/src/IntTools/IntTools_Context.hxx
+++ b/src/IntTools/IntTools_Context.hxx
@@ -44,7 +44,6 @@ class TopoDS_Vertex;
 class gp_Pnt2d;
 class IntTools_Curve;
 class Bnd_Box;
-class TopoDS_Shape;
 class Bnd_OBB;
 
 //! The intersection Context contains geometrical
diff --git a/src/IntTools/IntTools_EdgeEdge.hxx b/src/IntTools/IntTools_EdgeEdge.hxx
index 9f6086e52c..d7e619e2e5 100644
--- a/src/IntTools/IntTools_EdgeEdge.hxx
+++ b/src/IntTools/IntTools_EdgeEdge.hxx
@@ -29,10 +29,7 @@
 #include <IntTools_SequenceOfRanges.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 class Geom_Curve;
-class TopoDS_Edge;
-class IntTools_Range;
 class Bnd_Box;
-class BRepAdaptor_Curve;
 
 
 
diff --git a/src/IntTools/IntTools_EdgeFace.hxx b/src/IntTools/IntTools_EdgeFace.hxx
index 8acc5c190e..a48500cfd4 100644
--- a/src/IntTools/IntTools_EdgeFace.hxx
+++ b/src/IntTools/IntTools_EdgeFace.hxx
@@ -31,11 +31,7 @@
 #include <IntTools_SequenceOfCommonPrts.hxx>
 #include <IntTools_Range.hxx>
 class IntTools_Context;
-class TopoDS_Edge;
-class TopoDS_Face;
-class IntTools_Range;
 class gp_Pnt;
-class BRepAdaptor_Surface;
 class IntTools_CommonPrt;
 
 //! The class provides Edge/Face intersection algorithm to determine
diff --git a/src/IntTools/IntTools_FClass2d.hxx b/src/IntTools/IntTools_FClass2d.hxx
index bc838fd7fb..c1fe685123 100644
--- a/src/IntTools/IntTools_FClass2d.hxx
+++ b/src/IntTools/IntTools_FClass2d.hxx
@@ -30,7 +30,6 @@
 #include <TopAbs_State.hxx>
 #include <memory>
 
-class TopoDS_Face;
 class gp_Pnt2d;
 
 //! Class provides an algorithm to classify a 2d Point
diff --git a/src/IntTools/IntTools_PntOn2Faces.hxx b/src/IntTools/IntTools_PntOn2Faces.hxx
index 5827209520..798923222d 100644
--- a/src/IntTools/IntTools_PntOn2Faces.hxx
+++ b/src/IntTools/IntTools_PntOn2Faces.hxx
@@ -22,7 +22,6 @@
 
 #include <Standard_Boolean.hxx>
 #include <IntTools_PntOnFace.hxx>
-class IntTools_PntOnFace;
 
 
 //! Contains two points PntOnFace from IntTools and a flag
diff --git a/src/IntTools/IntTools_PntOnFace.hxx b/src/IntTools/IntTools_PntOnFace.hxx
index ad05737cd4..5298a58d1c 100644
--- a/src/IntTools/IntTools_PntOnFace.hxx
+++ b/src/IntTools/IntTools_PntOnFace.hxx
@@ -24,8 +24,6 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Real.hxx>
 #include <TopoDS_Face.hxx>
-class TopoDS_Face;
-class gp_Pnt;
 
 
 //! Contains a Face, a 3d point, corresponded UV parameters and a flag
diff --git a/src/IntTools/IntTools_ShrunkRange.hxx b/src/IntTools/IntTools_ShrunkRange.hxx
index cf3a02c650..90b4ca1d02 100644
--- a/src/IntTools/IntTools_ShrunkRange.hxx
+++ b/src/IntTools/IntTools_ShrunkRange.hxx
@@ -25,9 +25,6 @@
 #include <Bnd_Box.hxx>
 #include <Standard_Integer.hxx>
 class IntTools_Context;
-class TopoDS_Edge;
-class TopoDS_Vertex;
-class Bnd_Box;
 
 
 
diff --git a/src/IntTools/IntTools_SurfaceRangeSample.hxx b/src/IntTools/IntTools_SurfaceRangeSample.hxx
index b59ac38b44..68c698f06f 100644
--- a/src/IntTools/IntTools_SurfaceRangeSample.hxx
+++ b/src/IntTools/IntTools_SurfaceRangeSample.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class IntTools_CurveRangeSample;
 class IntTools_Range;
 
 
diff --git a/src/IntTools/IntTools_WLineTool.hxx b/src/IntTools/IntTools_WLineTool.hxx
index e31207bb1a..89bb5a446a 100644
--- a/src/IntTools/IntTools_WLineTool.hxx
+++ b/src/IntTools/IntTools_WLineTool.hxx
@@ -21,7 +21,6 @@
 class TopoDS_Face;
 class GeomInt_LineConstructor;
 class IntTools_Context;
-class Adaptor3d_TopolTool;
 
 //! IntTools_WLineTool provides set of static methods related to walking lines.
 class IntTools_WLineTool
diff --git a/src/IntWalk/IntWalk_PWalking.hxx b/src/IntWalk/IntWalk_PWalking.hxx
index ccd492f986..d2442ad0ff 100644
--- a/src/IntWalk/IntWalk_PWalking.hxx
+++ b/src/IntWalk/IntWalk_PWalking.hxx
@@ -26,7 +26,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <IntWalk_StatusDeflection.hxx>
 
-class IntSurf_LineOn2S;
 class gp_Pnt;
 
 //! This class implements an algorithm to determine the
diff --git a/src/Interface/Interface_Check.hxx b/src/Interface/Interface_Check.hxx
index e5f5d21d50..5b8d1b4112 100644
--- a/src/Interface/Interface_Check.hxx
+++ b/src/Interface/Interface_Check.hxx
@@ -26,8 +26,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Interface_CheckStatus.hxx>
-class Standard_Transient;
-class Standard_OutOfRange;
 class Message_Msg;
 class TCollection_HAsciiString;
 
diff --git a/src/Interface/Interface_CheckIterator.hxx b/src/Interface/Interface_CheckIterator.hxx
index 021aa25370..a4f46f7172 100644
--- a/src/Interface/Interface_CheckIterator.hxx
+++ b/src/Interface/Interface_CheckIterator.hxx
@@ -31,7 +31,6 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 class Interface_InterfaceModel;
 class Interface_IntVal;
-class Standard_NoSuchObject;
 class Interface_Check;
 class Standard_Transient;
 
diff --git a/src/Interface/Interface_CheckTool.hxx b/src/Interface/Interface_CheckTool.hxx
index 98408c0c80..bf999bc913 100644
--- a/src/Interface/Interface_CheckTool.hxx
+++ b/src/Interface/Interface_CheckTool.hxx
@@ -25,13 +25,11 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 class Interface_GTool;
-class Interface_CheckFailure;
 class Interface_InterfaceModel;
 class Interface_Protocol;
 class Interface_Graph;
 class Interface_HGraph;
 class Standard_Transient;
-class Interface_ShareTool;
 class Interface_Check;
 class Interface_CheckIterator;
 class Interface_EntityIterator;
diff --git a/src/Interface/Interface_CopyControl.hxx b/src/Interface/Interface_CopyControl.hxx
index 9d22f5e705..8d505c2ed9 100644
--- a/src/Interface/Interface_CopyControl.hxx
+++ b/src/Interface/Interface_CopyControl.hxx
@@ -22,8 +22,6 @@
 
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
-class Interface_InterfaceError;
-class Standard_Transient;
 
 
 class Interface_CopyControl;
diff --git a/src/Interface/Interface_CopyMap.hxx b/src/Interface/Interface_CopyMap.hxx
index a3b838f34a..02c3664002 100644
--- a/src/Interface/Interface_CopyMap.hxx
+++ b/src/Interface/Interface_CopyMap.hxx
@@ -24,7 +24,6 @@
 #include <Interface_CopyControl.hxx>
 #include <Standard_Boolean.hxx>
 class Interface_InterfaceModel;
-class Interface_InterfaceError;
 class Standard_Transient;
 
 
diff --git a/src/Interface/Interface_CopyTool.hxx b/src/Interface/Interface_CopyTool.hxx
index 1f5ddf4225..a17758bb25 100644
--- a/src/Interface/Interface_CopyTool.hxx
+++ b/src/Interface/Interface_CopyTool.hxx
@@ -31,8 +31,6 @@ class Interface_CopyControl;
 class Interface_CopyMap;
 class Standard_Transient;
 class Interface_GeneralModule;
-class Interface_InterfaceError;
-class Interface_GeneralLib;
 class Interface_Protocol;
 class Interface_EntityIterator;
 
diff --git a/src/Interface/Interface_EntityCluster.hxx b/src/Interface/Interface_EntityCluster.hxx
index 15bc444311..6b16440423 100644
--- a/src/Interface/Interface_EntityCluster.hxx
+++ b/src/Interface/Interface_EntityCluster.hxx
@@ -23,10 +23,6 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_Transient;
-class Standard_OutOfRange;
-class Standard_NullObject;
-class Interface_EntityList;
 class Interface_EntityIterator;
 
 
diff --git a/src/Interface/Interface_EntityIterator.hxx b/src/Interface/Interface_EntityIterator.hxx
index 48beaf7ad3..7937688f46 100644
--- a/src/Interface/Interface_EntityIterator.hxx
+++ b/src/Interface/Interface_EntityIterator.hxx
@@ -26,8 +26,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Interface_IntVal;
-class Standard_NoMoreObject;
-class Standard_NoSuchObject;
 class Standard_Transient;
 
 
diff --git a/src/Interface/Interface_EntityList.hxx b/src/Interface/Interface_EntityList.hxx
index 1ba4a3ce9c..ef2c037fdc 100644
--- a/src/Interface/Interface_EntityList.hxx
+++ b/src/Interface/Interface_EntityList.hxx
@@ -24,10 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
-class Standard_Transient;
-class Standard_OutOfRange;
-class Interface_InterfaceError;
-class Standard_NullObject;
 class Interface_EntityIterator;
 
 
diff --git a/src/Interface/Interface_FileReaderData.hxx b/src/Interface/Interface_FileReaderData.hxx
index c8caeaffc8..2cd9e2f741 100644
--- a/src/Interface/Interface_FileReaderData.hxx
+++ b/src/Interface/Interface_FileReaderData.hxx
@@ -29,11 +29,9 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 class Interface_ParamSet;
-class Standard_NoSuchObject;
 class TCollection_AsciiString;
 class Interface_FileParameter;
 class Interface_ParamList;
-class Standard_Transient;
 
 
 class Interface_FileReaderData;
diff --git a/src/Interface/Interface_FileReaderTool.hxx b/src/Interface/Interface_FileReaderTool.hxx
index 3f78edab8b..d870332370 100644
--- a/src/Interface/Interface_FileReaderTool.hxx
+++ b/src/Interface/Interface_FileReaderTool.hxx
@@ -28,8 +28,6 @@ class Interface_Protocol;
 class Interface_FileReaderData;
 class Interface_InterfaceModel;
 class Message_Messenger;
-class Standard_DomainError;
-class Standard_NoSuchObject;
 class Interface_Check;
 class Standard_Transient;
 class Interface_GeneralLib;
diff --git a/src/Interface/Interface_GTool.hxx b/src/Interface/Interface_GTool.hxx
index fe61cddff8..4e63498dcf 100644
--- a/src/Interface/Interface_GTool.hxx
+++ b/src/Interface/Interface_GTool.hxx
@@ -29,9 +29,7 @@
 #include <Standard_Boolean.hxx>
 class Interface_Protocol;
 class Interface_SignType;
-class Standard_Transient;
 class Interface_InterfaceModel;
-class Interface_GeneralLib;
 class Interface_GeneralModule;
 
 
diff --git a/src/Interface/Interface_GeneralModule.hxx b/src/Interface/Interface_GeneralModule.hxx
index ba69bba5b0..cc37b6b997 100644
--- a/src/Interface/Interface_GeneralModule.hxx
+++ b/src/Interface/Interface_GeneralModule.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 class Interface_InterfaceModel;
-class Standard_Transient;
 class Interface_EntityIterator;
 class Interface_ShareTool;
 class Interface_Check;
diff --git a/src/Interface/Interface_Graph.hxx b/src/Interface/Interface_Graph.hxx
index b7e6d8d3f1..b4115aa0ee 100644
--- a/src/Interface/Interface_Graph.hxx
+++ b/src/Interface/Interface_Graph.hxx
@@ -29,7 +29,6 @@
 #include <TColStd_HArray1OfListOfInteger.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 
-class Standard_DomainError;
 class Interface_GeneralLib;
 class Interface_Protocol;
 class Interface_GTool;
diff --git a/src/Interface/Interface_GraphContent.hxx b/src/Interface/Interface_GraphContent.hxx
index f50a280dcc..e15fa1f272 100644
--- a/src/Interface/Interface_GraphContent.hxx
+++ b/src/Interface/Interface_GraphContent.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Integer.hxx>
 class Interface_Graph;
 class Standard_Transient;
-class Interface_EntityIterator;
 
 
 //! Defines general form for classes of graph algorithms on
diff --git a/src/Interface/Interface_HGraph.hxx b/src/Interface/Interface_HGraph.hxx
index 7f88b46f93..b4c9fd14bc 100644
--- a/src/Interface/Interface_HGraph.hxx
+++ b/src/Interface/Interface_HGraph.hxx
@@ -23,8 +23,6 @@
 #include <Interface_Graph.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
-class Interface_Graph;
 class Interface_InterfaceModel;
 class Interface_GeneralLib;
 class Interface_Protocol;
diff --git a/src/Interface/Interface_InterfaceModel.hxx b/src/Interface/Interface_InterfaceModel.hxx
index 583fbbf46c..9f01c67464 100644
--- a/src/Interface/Interface_InterfaceModel.hxx
+++ b/src/Interface/Interface_InterfaceModel.hxx
@@ -31,11 +31,7 @@
 class Interface_Check;
 class TCollection_HAsciiString;
 class Interface_GTool;
-class Standard_OutOfRange;
-class Standard_NoSuchObject;
-class Interface_InterfaceMismatch;
 class Interface_Protocol;
-class Standard_Transient;
 class Interface_ReportEntity;
 class Interface_CheckIterator;
 class Interface_GeneralLib;
diff --git a/src/Interface/Interface_MSG.hxx b/src/Interface/Interface_MSG.hxx
index 6d6032b735..d78b81f1fe 100644
--- a/src/Interface/Interface_MSG.hxx
+++ b/src/Interface/Interface_MSG.hxx
@@ -28,7 +28,6 @@
 #include <Standard_IStream.hxx>
 #include <Standard_OStream.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
 
 
 //! This class gives a set of functions to manage and use a list
diff --git a/src/Interface/Interface_ParamList.hxx b/src/Interface/Interface_ParamList.hxx
index 8f1bd6441e..47d15f2ad3 100644
--- a/src/Interface/Interface_ParamList.hxx
+++ b/src/Interface/Interface_ParamList.hxx
@@ -22,9 +22,6 @@
 #include <Interface_VectorOfFileParameter.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
-class Standard_RangeError;
-class Standard_OutOfRange;
-class Standard_OutOfMemory;
 class Interface_FileParameter;
 
 
diff --git a/src/Interface/Interface_ParamSet.hxx b/src/Interface/Interface_ParamSet.hxx
index ae12e83d34..f31aade24c 100644
--- a/src/Interface/Interface_ParamSet.hxx
+++ b/src/Interface/Interface_ParamSet.hxx
@@ -26,7 +26,6 @@
 #include <Standard_CString.hxx>
 #include <Interface_ParamType.hxx>
 class Interface_ParamList;
-class Standard_OutOfRange;
 class Interface_FileParameter;
 
 
diff --git a/src/Interface/Interface_Protocol.hxx b/src/Interface/Interface_Protocol.hxx
index 6e7d0d9612..f12a73ea2a 100644
--- a/src/Interface/Interface_Protocol.hxx
+++ b/src/Interface/Interface_Protocol.hxx
@@ -24,8 +24,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
-class Interface_InterfaceError;
-class Standard_Transient;
 class Interface_Graph;
 class Interface_Check;
 class Interface_InterfaceModel;
diff --git a/src/Interface/Interface_ReaderModule.hxx b/src/Interface/Interface_ReaderModule.hxx
index f322d7e683..73d15e706d 100644
--- a/src/Interface/Interface_ReaderModule.hxx
+++ b/src/Interface/Interface_ReaderModule.hxx
@@ -23,10 +23,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_DomainError;
 class Interface_FileReaderData;
 class Interface_Check;
-class Standard_Transient;
 
 
 class Interface_ReaderModule;
diff --git a/src/Interface/Interface_ReportEntity.hxx b/src/Interface/Interface_ReportEntity.hxx
index 9b4d520a9a..dac7ceda16 100644
--- a/src/Interface/Interface_ReportEntity.hxx
+++ b/src/Interface/Interface_ReportEntity.hxx
@@ -23,7 +23,6 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
 class Interface_Check;
-class Standard_Transient;
 
 
 class Interface_ReportEntity;
diff --git a/src/Interface/Interface_ShareFlags.hxx b/src/Interface/Interface_ShareFlags.hxx
index e7993be3b5..288a314b1f 100644
--- a/src/Interface/Interface_ShareFlags.hxx
+++ b/src/Interface/Interface_ShareFlags.hxx
@@ -26,8 +26,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 class Interface_InterfaceModel;
-class Standard_DomainError;
-class Standard_OutOfRange;
 class Interface_GeneralLib;
 class Interface_GTool;
 class Interface_Protocol;
diff --git a/src/Interface/Interface_ShareTool.hxx b/src/Interface/Interface_ShareTool.hxx
index 5664cefbfb..97190f2b4f 100644
--- a/src/Interface/Interface_ShareTool.hxx
+++ b/src/Interface/Interface_ShareTool.hxx
@@ -20,8 +20,6 @@
 #include <Standard_Type.hxx>
 
 class Interface_HGraph;
-class Standard_DomainError;
-class Interface_InterfaceError;
 class Interface_InterfaceModel;
 class Interface_GeneralLib;
 class Interface_GTool;
diff --git a/src/Interface/Interface_Static.hxx b/src/Interface/Interface_Static.hxx
index 32df5b64b2..6a325a0014 100644
--- a/src/Interface/Interface_Static.hxx
+++ b/src/Interface/Interface_Static.hxx
@@ -33,8 +33,6 @@
 #include <Standard_Character.hxx>
 #include <TColStd_HSequenceOfHAsciiString.hxx>
 class TCollection_HAsciiString;
-class Standard_Transient;
-class Interface_InterfaceError;
 
 class Interface_Static;
 DEFINE_STANDARD_HANDLE(Interface_Static, Interface_TypedValue)
diff --git a/src/Interface/Interface_TypedValue.hxx b/src/Interface/Interface_TypedValue.hxx
index 153d4cfd78..8f86e4840b 100644
--- a/src/Interface/Interface_TypedValue.hxx
+++ b/src/Interface/Interface_TypedValue.hxx
@@ -28,8 +28,6 @@
 #include <Interface_ParamType.hxx>
 #include <MoniTool_ValueType.hxx>
 class TCollection_HAsciiString;
-class Standard_Transient;
-class Interface_InterfaceError;
 
 
 class Interface_TypedValue;
diff --git a/src/Interface/Interface_UndefinedContent.hxx b/src/Interface/Interface_UndefinedContent.hxx
index d2f69418da..f3b578df3d 100644
--- a/src/Interface/Interface_UndefinedContent.hxx
+++ b/src/Interface/Interface_UndefinedContent.hxx
@@ -27,13 +27,7 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Boolean.hxx>
 #include <Interface_ParamType.hxx>
-class Standard_OutOfRange;
-class Standard_NoSuchObject;
-class Interface_InterfaceMismatch;
-class Interface_InterfaceError;
-class Standard_Transient;
 class TCollection_HAsciiString;
-class Interface_EntityList;
 class Interface_CopyTool;
 
 
diff --git a/src/Intf/Intf.hxx b/src/Intf/Intf.hxx
index dc7e5b7991..f52e7db24d 100644
--- a/src/Intf/Intf.hxx
+++ b/src/Intf/Intf.hxx
@@ -25,14 +25,6 @@
 #include <Standard_Boolean.hxx>
 class gp_Pnt;
 class gp_XYZ;
-class Intf_Polygon2d;
-class Intf_SectionPoint;
-class Intf_SectionLine;
-class Intf_TangentZone;
-class Intf_Interference;
-class Intf_Tool;
-class Intf_InterferencePolygon2d;
-class Intf_InterferencePolygonPolyhedron;
 
 
 //! Interference computation  between polygons, lines  and
diff --git a/src/Intf/Intf_Interference.hxx b/src/Intf/Intf_Interference.hxx
index 5231de61d0..bd1eddaa49 100644
--- a/src/Intf/Intf_Interference.hxx
+++ b/src/Intf/Intf_Interference.hxx
@@ -27,7 +27,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class Intf_SectionPoint;
 class Intf_SectionLine;
 class Intf_TangentZone;
diff --git a/src/Intf/Intf_InterferencePolygon2d.hxx b/src/Intf/Intf_InterferencePolygon2d.hxx
index 064b8ad347..52bfcd5ebe 100644
--- a/src/Intf/Intf_InterferencePolygon2d.hxx
+++ b/src/Intf/Intf_InterferencePolygon2d.hxx
@@ -24,7 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
 #include <Intf_Interference.hxx>
-class Standard_OutOfRange;
 class Intf_Polygon2d;
 class gp_Pnt2d;
 
diff --git a/src/Intf/Intf_Polygon2d.hxx b/src/Intf/Intf_Polygon2d.hxx
index dcfcc11149..7f36ae5cae 100644
--- a/src/Intf/Intf_Polygon2d.hxx
+++ b/src/Intf/Intf_Polygon2d.hxx
@@ -24,8 +24,6 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
-class Bnd_Box2d;
 class gp_Pnt2d;
 
 
diff --git a/src/Intf/Intf_SectionLine.hxx b/src/Intf/Intf_SectionLine.hxx
index c6a182a447..1cf90641ae 100644
--- a/src/Intf/Intf_SectionLine.hxx
+++ b/src/Intf/Intf_SectionLine.hxx
@@ -24,7 +24,6 @@
 #include <Intf_SeqOfSectionPoint.hxx>
 #include <Standard_Boolean.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class Intf_SectionPoint;
 
 
diff --git a/src/Intf/Intf_SectionPoint.hxx b/src/Intf/Intf_SectionPoint.hxx
index d0164c109e..85e09626a5 100644
--- a/src/Intf/Intf_SectionPoint.hxx
+++ b/src/Intf/Intf_SectionPoint.hxx
@@ -26,7 +26,6 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
 #include <Standard_Boolean.hxx>
-class gp_Pnt;
 class gp_Pnt2d;
 
 
diff --git a/src/Intf/Intf_TangentZone.hxx b/src/Intf/Intf_TangentZone.hxx
index 204aaa118d..df01486988 100644
--- a/src/Intf/Intf_TangentZone.hxx
+++ b/src/Intf/Intf_TangentZone.hxx
@@ -25,7 +25,6 @@
 #include <Standard_Real.hxx>
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
-class Standard_OutOfRange;
 class Intf_SectionPoint;
 
 
diff --git a/src/Intf/Intf_Tool.hxx b/src/Intf/Intf_Tool.hxx
index 5742298802..e8179a3f64 100644
--- a/src/Intf/Intf_Tool.hxx
+++ b/src/Intf/Intf_Tool.hxx
@@ -23,7 +23,6 @@
 
 #include <Standard_Integer.hxx>
 #include <Standard_Real.hxx>
-class Standard_OutOfRange;
 class gp_Lin2d;
 class Bnd_Box2d;
 class gp_Hypr2d;
diff --git a/src/Intrv/Intrv_Intervals.hxx b/src/Intrv/Intrv_Intervals.hxx
index 9841ccead9..640f0dce6c 100644
--- a/src/Intrv/Intrv_Intervals.hxx
+++ b/src/Intrv/Intrv_Intervals.hxx
@@ -23,7 +23,6 @@
 
 #include <Intrv_SequenceOfInterval.hxx>
 #include <Standard_Integer.hxx>
-class Standard_OutOfRange;
 class Intrv_Interval;
 
 
diff --git a/src/LDOM/LDOM_Attr.hxx b/src/LDOM/LDOM_Attr.hxx
index 00495f30ca..fe247b1b97 100644
--- a/src/LDOM/LDOM_Attr.hxx
+++ b/src/LDOM/LDOM_Attr.hxx
@@ -19,7 +19,6 @@
 #include <LDOM_Node.hxx>
 
 class LDOM_BasicAttribute;
-class LDOM_Element;
 
 //  Class LDOM_Attr
 //
diff --git a/src/LDOM/LDOM_BasicAttribute.hxx b/src/LDOM/LDOM_BasicAttribute.hxx
index 07f592b5e6..28d69c451b 100644
--- a/src/LDOM/LDOM_BasicAttribute.hxx
+++ b/src/LDOM/LDOM_BasicAttribute.hxx
@@ -19,10 +19,7 @@
 #include <LDOM_BasicNode.hxx>
 #include <LDOMBasicString.hxx>
 
-class LDOM_XmlReader;
-class LDOM_Element;
 class LDOM_Attr;
-class LDOM_Node;
 
 //  Class LDOM_BasicAttribute
 //
diff --git a/src/LDOM/LDOM_BasicElement.hxx b/src/LDOM/LDOM_BasicElement.hxx
index 274b91344a..f6254d2461 100644
--- a/src/LDOM/LDOM_BasicElement.hxx
+++ b/src/LDOM/LDOM_BasicElement.hxx
@@ -22,10 +22,7 @@
 #include <LDOMBasicString.hxx>
 #include <LDOM_Node.hxx>
 
-class LDOM_XmlReader;
-class LDOMParser;
 class LDOM_NodeList;
-class LDOM_Element;
 class LDOM_BasicAttribute;
 
 //  Class LDOM_BasicElement
diff --git a/src/LDOM/LDOM_BasicNode.hxx b/src/LDOM/LDOM_BasicNode.hxx
index d41cf08a12..e4b928e8a2 100644
--- a/src/LDOM/LDOM_BasicNode.hxx
+++ b/src/LDOM/LDOM_BasicNode.hxx
@@ -18,9 +18,7 @@
 
 #include <LDOM_Node.hxx>
 
-class LDOM_BasicElement;
 class LDOM_NullPtr;
-class LDOMParser;
 
 //  Block of comments describing class LDOM_BasicNode
 //
diff --git a/src/LDOM/LDOM_BasicText.hxx b/src/LDOM/LDOM_BasicText.hxx
index 29d152ee19..bb900accec 100644
--- a/src/LDOM/LDOM_BasicText.hxx
+++ b/src/LDOM/LDOM_BasicText.hxx
@@ -19,10 +19,7 @@
 #include <LDOM_BasicNode.hxx>
 #include <LDOMBasicString.hxx>
 
-class LDOM_Node;
 class LDOM_CharacterData;
-class LDOMParser;
-class LDOM_BasicElement;
 
 //  Class LDOM_BasicText
 //
diff --git a/src/LDOM/LDOM_Document.hxx b/src/LDOM/LDOM_Document.hxx
index fbe48a9f49..ae7a920ece 100644
--- a/src/LDOM/LDOM_Document.hxx
+++ b/src/LDOM/LDOM_Document.hxx
@@ -21,7 +21,6 @@
 #include <LDOM_CDATASection.hxx>
 #include <LDOM_Comment.hxx>
 
-class LDOM_MemManager;
 
 //  Class LDOM_Document
 
diff --git a/src/LDOM/LDOM_Element.hxx b/src/LDOM/LDOM_Element.hxx
index 790feb3840..2e385565de 100644
--- a/src/LDOM/LDOM_Element.hxx
+++ b/src/LDOM/LDOM_Element.hxx
@@ -19,7 +19,6 @@
 #include <LDOM_Attr.hxx>
 #include <LDOM_NodeList.hxx>
 
-class LDOMParser;
 class LDOM_BasicElement;
 
 //  Class LDOM_Element
diff --git a/src/LDOM/LDOM_MemManager.hxx b/src/LDOM/LDOM_MemManager.hxx
index 2c4640e557..273e62f937 100644
--- a/src/LDOM/LDOM_MemManager.hxx
+++ b/src/LDOM/LDOM_MemManager.hxx
@@ -19,7 +19,6 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
-class LDOM_Document;
 class LDOM_BasicElement;
 class LDOM_MemManager;
 class LDOMBasicString;