diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.cpp b/samples/CSharp/OCCTProxy/OCCTProxy.cpp
index 222ffbdd1f..1888521696 100644
--- a/samples/CSharp/OCCTProxy/OCCTProxy.cpp
+++ b/samples/CSharp/OCCTProxy/OCCTProxy.cpp
@@ -530,7 +530,7 @@ public:
     theRed=255;
     theGreen=255;
     theBlue=255;
-    Handle_AIS_InteractiveObject aCurrent ;
+    Handle(AIS_InteractiveObject) aCurrent ;
     Quantity_Color anObjCol;
     myAISContext()->InitCurrent();
     if (!myAISContext()->MoreCurrent())
@@ -716,7 +716,7 @@ public:
   /// <summary>
   ///Get AISContext
   /// </summary>
-  Handle_AIS_InteractiveContext GetContext(void)
+  Handle(AIS_InteractiveContext) GetContext(void)
   {
     return myAISContext();
   }
@@ -841,8 +841,8 @@ public:
       return false;
     }
 
-    Handle_AIS_InteractiveObject anIO = myAISContext()->Current();
-    Handle_AIS_Shape anIS = Handle_AIS_Shape::DownCast(anIO);
+    Handle(AIS_InteractiveObject) anIO = myAISContext()->Current();
+    Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast(anIO);
     return BRepTools::Write (anIS->Shape(), (Standard_CString)theFileName) != Standard_False;
   }
 
@@ -857,8 +857,8 @@ public:
     STEPControl_Writer aWriter;
     for ( myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent() )
     {
-      Handle_AIS_InteractiveObject anIO = myAISContext()->Current();
-      Handle_AIS_Shape anIS=Handle_AIS_Shape::DownCast(anIO);
+      Handle(AIS_InteractiveObject) anIO = myAISContext()->Current();
+      Handle(AIS_Shape) anIS=Handle(AIS_Shape)::DownCast(anIO);
       TopoDS_Shape aShape = anIS->Shape();
       aStatus = aWriter.Transfer( aShape , aType );
       if ( aStatus != IFSelect_RetDone )
@@ -888,8 +888,8 @@ public:
 
     for ( myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent() )
     {
-      Handle_AIS_InteractiveObject anIO = myAISContext()->Current();
-      Handle_AIS_Shape anIS=Handle_AIS_Shape::DownCast(anIO);
+      Handle(AIS_InteractiveObject) anIO = myAISContext()->Current();
+      Handle(AIS_Shape) anIS=Handle(AIS_Shape)::DownCast(anIO);
       TopoDS_Shape aShape = anIS->Shape();
       aWriter.AddShape ( aShape );
     }
@@ -910,8 +910,8 @@ public:
 
     for ( myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent() )
     {
-      Handle_AIS_InteractiveObject anIO = myAISContext()->Current();
-      Handle_AIS_Shape anIS=Handle_AIS_Shape::DownCast(anIO);
+      Handle(AIS_InteractiveObject) anIO = myAISContext()->Current();
+      Handle(AIS_Shape) anIS=Handle(AIS_Shape)::DownCast(anIO);
       TopoDS_Shape aShape = anIS->Shape();
       if ( aShape.IsNull() )
       {
@@ -939,8 +939,8 @@ public:
 
     for ( myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent() )
     {
-      Handle_AIS_InteractiveObject anIO = myAISContext()->Current();
-      Handle_AIS_Shape anIS=Handle_AIS_Shape::DownCast(anIO);
+      Handle(AIS_InteractiveObject) anIO = myAISContext()->Current();
+      Handle(AIS_Shape) anIS=Handle(AIS_Shape)::DownCast(anIO);
       TopoDS_Shape aShape = anIS->Shape();
       if ( aShape.IsNull() ) 
       {
@@ -1030,8 +1030,8 @@ public:
 
 private:
   // fields
-  NCollection_Haft<Handle_V3d_Viewer> myViewer;
-  NCollection_Haft<Handle_V3d_View> myView;
-  NCollection_Haft<Handle_AIS_InteractiveContext> myAISContext;
-  NCollection_Haft<Handle_OpenGl_GraphicDriver> myGraphicDriver;
+  NCollection_Haft<Handle(V3d_Viewer)> myViewer;
+  NCollection_Haft<Handle(V3d_View)> myView;
+  NCollection_Haft<Handle(AIS_InteractiveContext)> myAISContext;
+  NCollection_Haft<Handle(OpenGl_GraphicDriver)> myGraphicDriver;
 };
diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp b/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp
index a1a237a356..f3beaee7be 100644
--- a/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp
+++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp
@@ -693,7 +693,7 @@ public:
   /// <summary>
   ///Get AISContext
   /// </summary>
-  Handle_AIS_InteractiveContext GetContext()
+  Handle(AIS_InteractiveContext) GetContext()
   {
     return myAISContext();
   }
@@ -965,9 +965,9 @@ public:
 
 private:
 
-  NCollection_Haft<Handle_V3d_Viewer>             myViewer;
-  NCollection_Haft<Handle_V3d_View>               myView;
-  NCollection_Haft<Handle_AIS_InteractiveContext> myAISContext;
-  NCollection_Haft<Handle_D3DHost_GraphicDriver>  myGraphicDriver;
+  NCollection_Haft<Handle(V3d_Viewer)>             myViewer;
+  NCollection_Haft<Handle(V3d_View)>               myView;
+  NCollection_Haft<Handle(AIS_InteractiveContext)> myAISContext;
+  NCollection_Haft<Handle(D3DHost_GraphicDriver)>  myGraphicDriver;
 
 };
diff --git a/samples/java/jniviewer/jni/OcctJni_MsgPrinter.cxx b/samples/java/jniviewer/jni/OcctJni_MsgPrinter.cxx
index 8eef25f58c..da559a4027 100644
--- a/samples/java/jniviewer/jni/OcctJni_MsgPrinter.cxx
+++ b/samples/java/jniviewer/jni/OcctJni_MsgPrinter.cxx
@@ -18,7 +18,6 @@
 
 #include <android/log.h>
 
-IMPLEMENT_STANDARD_HANDLE (OcctJni_MsgPrinter, Message_Printer)
 IMPLEMENT_STANDARD_RTTIEXT(OcctJni_MsgPrinter, Message_Printer)
 
 // =======================================================================
diff --git a/samples/java/jniviewer/jni/OcctJni_MsgPrinter.hxx b/samples/java/jniviewer/jni/OcctJni_MsgPrinter.hxx
index 0735033b4d..5f2fa0c733 100644
--- a/samples/java/jniviewer/jni/OcctJni_MsgPrinter.hxx
+++ b/samples/java/jniviewer/jni/OcctJni_MsgPrinter.hxx
@@ -53,7 +53,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OcctJni_MsgPrinter)
+  DEFINE_STANDARD_RTTIEXT(OcctJni_MsgPrinter,Message_Printer)
 
 };
 
diff --git a/samples/java/jniviewer/jni/OcctJni_Window.cxx b/samples/java/jniviewer/jni/OcctJni_Window.cxx
index 8f50abde3b..9202411135 100644
--- a/samples/java/jniviewer/jni/OcctJni_Window.cxx
+++ b/samples/java/jniviewer/jni/OcctJni_Window.cxx
@@ -13,5 +13,4 @@
 
 #include <OcctJni_Window.hxx>
 
-IMPLEMENT_STANDARD_HANDLE (OcctJni_Window, Aspect_Window)
 IMPLEMENT_STANDARD_RTTIEXT(OcctJni_Window, Aspect_Window)
diff --git a/samples/java/jniviewer/jni/OcctJni_Window.hxx b/samples/java/jniviewer/jni/OcctJni_Window.hxx
index d73c4a6629..a8e38c96a1 100644
--- a/samples/java/jniviewer/jni/OcctJni_Window.hxx
+++ b/samples/java/jniviewer/jni/OcctJni_Window.hxx
@@ -97,7 +97,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OcctJni_Window)
+  DEFINE_STANDARD_RTTIEXT(OcctJni_Window,Aspect_Window)
 
 };
 
diff --git a/samples/mfc/occtdemo/Approx/Approx_Presentation.cpp b/samples/mfc/occtdemo/Approx/Approx_Presentation.cpp
index 1f8015a2f7..28a81916ff 100755
--- a/samples/mfc/occtdemo/Approx/Approx_Presentation.cpp
+++ b/samples/mfc/occtdemo/Approx/Approx_Presentation.cpp
@@ -153,7 +153,7 @@ static TCollection_AsciiString  Comment(Standard_Real Step,
       "GeomAPI_PointsToBSplineSurface aPTBS;" EOL
       "aPTBS.Init(aZPoints,aX0,aXStep,aY0,aYStep," EOL
       "           DegMin,DegMax,Continuity,Tolerance);" EOL
-      "Handle_Geom_BSplineSurface aSurface = aPTBS.Surface();" EOL EOL EOL
+      "Handle(Geom_BSplineSurface) aSurface = aPTBS.Surface();" EOL EOL EOL
     );
 
   return aText;
@@ -165,7 +165,7 @@ static TCollection_AsciiString  Comment(Standard_Real Step,
 // Purpose  : 
 //================================================================
 
-Handle_Geom_BSplineSurface Approx_Presentation::CreateBSplineSurface(TColStd_Array2OfReal& aZPoints,
+Handle(Geom_BSplineSurface) Approx_Presentation::CreateBSplineSurface(TColStd_Array2OfReal& aZPoints,
                                                                Standard_Real theXStep,
                                                                Standard_Real theYStep,
                                                                Standard_Integer Count)
@@ -175,7 +175,7 @@ Handle_Geom_BSplineSurface Approx_Presentation::CreateBSplineSurface(TColStd_Arr
   GeomAPI_PointsToBSplineSurface aPTBS;
   aPTBS.Init(aZPoints,aX0,theXStep,aY0,theYStep,
     DegMin[Count],DegMax[Count],Continuity[Count],Tol[Count]);
-  Handle_Geom_BSplineSurface aSurface = aPTBS.Surface();
+  Handle(Geom_BSplineSurface) aSurface = aPTBS.Surface();
 
   return aSurface;
 }
@@ -192,12 +192,12 @@ Standard_Boolean Approx_Presentation::DrawModifyBSplineSurface(TColStd_Array2OfR
                                                                Standard_Integer theIndexX,
                                                                Standard_Integer theIndexY,
                                                                Standard_Real theDeflection,
-                                                               Handle_AIS_InteractiveObject& aMovePnt,
-                                                               Handle_AIS_InteractiveObject& aObj,
+                                                               Handle(AIS_InteractiveObject)& aMovePnt,
+                                                               Handle(AIS_InteractiveObject)& aObj,
                                                                Standard_Integer Count)
                            
 { 
-  Handle_AIS_InteractiveObject auxObj;
+  Handle(AIS_InteractiveObject) auxObj;
   Standard_Real aX0 = -300, aY0 = -200;
   Standard_Real aLastZ = aZPoints(theIndexX,theIndexY);
   aZPoints(theIndexX,theIndexY) += 100*theDeflection; 
@@ -216,7 +216,7 @@ Standard_Boolean Approx_Presentation::DrawModifyBSplineSurface(TColStd_Array2OfR
 
   aZPoints(theIndexX,theIndexY) = aLastZ;
 
-  Handle_Geom_BSplineSurface aSurface = aPTBS.Surface();
+  Handle(Geom_BSplineSurface) aSurface = aPTBS.Surface();
 
   auxObj = drawSurface(aSurface);
   getAISContext()->Erase(aObj);
@@ -275,7 +275,7 @@ void Approx_Presentation::sample1()
 
   aText += (
     "aPTB.Init(aCurvePoint,DegMin,DegMax,Continuity,Tolerance);" EOL
-    "Handle_Geom_BSplineCurve aCurve = aPTB.Curve();" EOL
+    "Handle(Geom_BSplineCurve) aCurve = aPTB.Curve();" EOL
   );
 
   setResultTitle("Creating approximations of curves");
@@ -295,7 +295,7 @@ void Approx_Presentation::sample1()
 
   GeomAPI_PointsToBSpline aPTB;
 
-  Handle_AIS_InteractiveObject aIndexPnt [2],aObj;
+  Handle(AIS_InteractiveObject) aIndexPnt [2],aObj;
   Standard_Integer aIndex[2] = {9,13};
   Standard_Real aDeflection[2] = {-1.5,2};
   
@@ -313,7 +313,7 @@ void Approx_Presentation::sample1()
   if(WAIT_A_LITTLE) return;
 
   aPTB.Init(aCurvePoint,DegMin[Count],DegMax[Count],Continuity[Count],Tol[Count]);
-  Handle_Geom_BSplineCurve aCurve = aPTB.Curve();
+  Handle(Geom_BSplineCurve) aCurve = aPTB.Curve();
   aObj = drawCurve(aCurve);
 
   for( i = 0 ; i < 2 ; i++)
@@ -367,7 +367,7 @@ void Approx_Presentation::sample2()
 
   
   TColgp_Array2OfPnt aPnt(1,4,1,4);
-  Handle_AIS_InteractiveObject aShowPnt[4][4],aObj,aMovePnt;
+  Handle(AIS_InteractiveObject) aShowPnt[4][4],aObj,aMovePnt;
    
   Standard_Integer aColLength = aZPoints.ColLength();
   Standard_Integer aRowLength = aZPoints.RowLength();
@@ -404,7 +404,7 @@ void Approx_Presentation::sample2()
   aText = Comment(aXStep,anUpper,DegMin[Count],DegMax[Count],Count+1,Tol[Count]);
   setResultText(aText.ToCString());
 
-  Handle_Geom_BSplineSurface aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
+  Handle(Geom_BSplineSurface) aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
   aObj = drawSurface(aSurface);
   Standard_Boolean aBool;
   if(WAIT_A_LITTLE) return ;
@@ -452,7 +452,7 @@ void Approx_Presentation::sample3()
 
   
   TColgp_Array2OfPnt aPnt(1,4,1,4);
-  Handle_AIS_InteractiveObject aShowPnt[4][4],aObj,aMovePnt;
+  Handle(AIS_InteractiveObject) aShowPnt[4][4],aObj,aMovePnt;
    
   Standard_Integer aColLength = aZPoints.ColLength();
   Standard_Integer aRowLength = aZPoints.RowLength();
@@ -491,7 +491,7 @@ void Approx_Presentation::sample3()
   aText += Comment(aXStep,anUpper,DegMin[Count],DegMax[Count],Count+1,Tol[Count]);
   setResultText(aText.ToCString());
 
-  Handle_Geom_BSplineSurface aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
+  Handle(Geom_BSplineSurface) aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
   aObj = drawSurface(aSurface);
   Standard_Boolean aBool;
   if(WAIT_A_LITTLE) return ;
@@ -540,7 +540,7 @@ void Approx_Presentation::sample4()
 
   
   TColgp_Array2OfPnt aPnt(1,5,1,5);
-  Handle_AIS_InteractiveObject aShowPnt[5][5],aObj,aMovePnt;
+  Handle(AIS_InteractiveObject) aShowPnt[5][5],aObj,aMovePnt;
    
   Standard_Integer aColLength = aZPoints.ColLength();
   Standard_Integer aRowLength = aZPoints.RowLength();
@@ -579,7 +579,7 @@ void Approx_Presentation::sample4()
   aText += Comment(aXStep,anUpper,DegMin[Count],DegMax[Count],Count+1,Tol[Count]);
   setResultText(aText.ToCString());
 
-  Handle_Geom_BSplineSurface aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
+  Handle(Geom_BSplineSurface) aSurface = CreateBSplineSurface(aZPoints,aXStep,aYStep,Count);
   aObj = drawSurface(aSurface);
   Standard_Boolean aBool;
   if(WAIT_A_LITTLE) return ;
diff --git a/samples/mfc/occtdemo/Approx/Approx_Presentation.h b/samples/mfc/occtdemo/Approx/Approx_Presentation.h
index db3f736cba..34eb3a6a02 100755
--- a/samples/mfc/occtdemo/Approx/Approx_Presentation.h
+++ b/samples/mfc/occtdemo/Approx/Approx_Presentation.h
@@ -32,11 +32,11 @@ private:
   Standard_Boolean DrawModifyBSplineSurface(TColStd_Array2OfReal& ,
                                             Standard_Real ,Standard_Real ,
                                             Standard_Integer ,Standard_Integer ,
-                                            Standard_Real,Handle_AIS_InteractiveObject&,
-                                            Handle_AIS_InteractiveObject&,
+                                            Standard_Real,Handle(AIS_InteractiveObject)&,
+                                            Handle(AIS_InteractiveObject)&,
                                             Standard_Integer);
 
-  Handle_Geom_BSplineSurface CreateBSplineSurface(TColStd_Array2OfReal& ,
+  Handle(Geom_BSplineSurface) CreateBSplineSurface(TColStd_Array2OfReal& ,
                                                   Standard_Real ,Standard_Real,
                                                   Standard_Integer);
 
diff --git a/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.cpp b/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.cpp
index 4b6dd08da1..5a4ac7ce79 100755
--- a/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.cpp
+++ b/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.cpp
@@ -84,7 +84,7 @@ Standard_Boolean Chamfers_Presentation::createDiverseChamferOnBox(
                          Standard_Real d1, // chamfer on edge 1
                          Standard_Real d2, // chamfer on edge 2
                          Standard_Real d3, // chamfer on edge 3
-                         Handle_AIS_InteractiveObject& thePrevShape)// for smoth drawing
+                         Handle(AIS_InteractiveObject)& thePrevShape)// for smoth drawing
                          // we display the new shape first, then erase the previous one
 {
   // initializing a class that builds chamfer
@@ -202,7 +202,7 @@ Standard_Boolean Chamfers_Presentation::createChamferOnBox(
                          TopoDS_Solid& aBox, 
                          Standard_Real theDistA, // distance along first face 
                          Standard_Real theDistB, // distance along second face
-                         Handle_AIS_InteractiveObject& thePrevShape)// for smoth drawing
+                         Handle(AIS_InteractiveObject)& thePrevShape)// for smoth drawing
                          // we display the new shape first, then erase the previous one
 {
   // initializing a class that builds chamfer
@@ -287,7 +287,7 @@ Standard_Boolean Chamfers_Presentation::createFilletOnBox(
                        TopoDS_Solid& aBox,
                        Standard_Real theRad, // radius of fillet
                        ChFi3d_FilletShape theFShape, // shape of fillet
-                       Handle_AIS_InteractiveObject& thePrevObj) // to erase 
+                       Handle(AIS_InteractiveObject)& thePrevObj) // to erase 
                        // the previous shape
 {
   // initializing a class that builds fillet
@@ -612,7 +612,7 @@ void Chamfers_Presentation::sampleBoxFillet()
   Standard_Real a = BOX_SIDE_LEN;
   TopoDS_Solid aBox = BRepPrimAPI_MakeBox(gp_Pnt(-a/2, -a/2, -a/2), a, a, a);
 
-  Handle_AIS_InteractiveObject aPrevObj = new AIS_Shape(aBox);
+  Handle(AIS_InteractiveObject) aPrevObj = new AIS_Shape(aBox);
   getAISContext()->Display(aPrevObj, Standard_False);
   COCCDemoDoc::Fit();
 
diff --git a/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.h b/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.h
index 156dc45b6e..bfcc8fe026 100755
--- a/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.h
+++ b/samples/mfc/occtdemo/Chamfers/Chamfers_Presentation.h
@@ -12,7 +12,7 @@
 #include <OCCDemo_Presentation.h>
 #include <ChFi3d_FilletShape.hxx>
 
-class Handle_AIS_InteractiveObject;
+class AIS_InteractiveObject;
 class TopoDS_Solid;
 
 class Chamfers_Presentation : public OCCDemo_Presentation
@@ -29,15 +29,15 @@ public:
 private:
   Standard_Boolean createChamferOnBox(
     TopoDS_Solid&, Standard_Real, Standard_Real, 
-    Handle_AIS_InteractiveObject&);
+    Handle(AIS_InteractiveObject)&);
 
   Standard_Boolean createDiverseChamferOnBox(
     TopoDS_Solid&, Standard_Real, Standard_Real, 
-    Standard_Real, Handle_AIS_InteractiveObject&);
+    Standard_Real, Handle(AIS_InteractiveObject)&);
 
   Standard_Boolean createFilletOnBox(
     TopoDS_Solid&, Standard_Real, ChFi3d_FilletShape, 
-    Handle_AIS_InteractiveObject&);
+    Handle(AIS_InteractiveObject)&);
 
   // Sample functions
   void sampleBoxChamfer();
diff --git a/samples/mfc/occtdemo/Common/ISession/ISession_Curve.cpp b/samples/mfc/occtdemo/Common/ISession/ISession_Curve.cpp
index 814474a9b5..52e9ea23dd 100755
--- a/samples/mfc/occtdemo/Common/ISession/ISession_Curve.cpp
+++ b/samples/mfc/occtdemo/Common/ISession/ISession_Curve.cpp
@@ -11,28 +11,25 @@
 #include <Prs3d_ArrowAspect.hxx>
 
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
-IMPLEMENT_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
 //
 // Foreach ancestors, we add a IMPLEMENT_STANDARD_SUPERTYPE and 
 // a IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY macro.
 // We must respect the order: from the direct ancestor class
 // to the base class.
 //
-IMPLEMENT_STANDARD_TYPE(ISession_Curve)
-        IMPLEMENT_STANDARD_SUPERTYPE(AIS_InteractiveObject)
-        IMPLEMENT_STANDARD_SUPERTYPE(SelectMgr_SelectableObject)
-        IMPLEMENT_STANDARD_SUPERTYPE(PrsMgr_PresentableObject)
-        IMPLEMENT_STANDARD_SUPERTYPE(MMgt_TShared)
-        IMPLEMENT_STANDARD_SUPERTYPE(Standard_Transient)
-        IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
-                IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY(AIS_InteractiveObject)
-                IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY(SelectMgr_SelectableObject)
-                IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY(PrsMgr_PresentableObject)
-                IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY(MMgt_TShared)
-                IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_ENTRY(Standard_Transient)
-        IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
-IMPLEMENT_STANDARD_TYPE_END(ISession_Curve)
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #ifdef _DEBUG
 #undef THIS_FILE
diff --git a/samples/mfc/occtdemo/Common/ISession/ISession_Curve.h b/samples/mfc/occtdemo/Common/ISession/ISession_Curve.h
index 940b9adc7f..4198ffd96a 100755
--- a/samples/mfc/occtdemo/Common/ISession/ISession_Curve.h
+++ b/samples/mfc/occtdemo/Common/ISession/ISession_Curve.h
@@ -20,7 +20,7 @@ class ISession_Curve : public AIS_InteractiveObject
 public:
 	ISession_Curve(const Handle(Geom_Curve)& aCurve);
 	virtual ~ISession_Curve();
-DEFINE_STANDARD_RTTI(ISession_Curve)
+DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
diff --git a/samples/mfc/occtdemo/Common/OCCDemo_Presentation.cpp b/samples/mfc/occtdemo/Common/OCCDemo_Presentation.cpp
index 091c20c413..2e9da863f5 100755
--- a/samples/mfc/occtdemo/Common/OCCDemo_Presentation.cpp
+++ b/samples/mfc/occtdemo/Common/OCCDemo_Presentation.cpp
@@ -77,8 +77,8 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
 // Purpose  : displays a given geometric surface in 3d viewer
 //            (creates a finite face and displays it)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
-                                  (const Handle_Geom_Surface& theSurface,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawSurface
+                                  (const Handle(Geom_Surface)& theSurface,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -89,7 +89,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
   fixParam(v1);
   fixParam(v2);
 
-  Handle_AIS_Shape aGraphicSurface = 
+  Handle(AIS_Shape) aGraphicSurface = 
     new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2));
 
   getAISContext()->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -110,8 +110,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 3d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -135,8 +135,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 2d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom2d_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom2d_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay,
                                    const gp_Ax2& aPosition)
@@ -163,7 +163,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : drawPoint
 // Purpose  : displays a given point
 //================================================================
-Handle_AIS_Point OCCDemo_Presentation::drawPoint
+Handle(AIS_Point) OCCDemo_Presentation::drawPoint
                                   (const gp_Pnt& aPnt,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
@@ -185,7 +185,7 @@ Handle_AIS_Point OCCDemo_Presentation::drawPoint
 //            (segment of line starting at thePnt with the arrow at the end,
 //             the length of segment is the length of the vector)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector 
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawVector 
                                   (const gp_Pnt& thePnt,
                                    const gp_Vec& theVec,
                                    const Quantity_Color& theColor,
@@ -217,11 +217,11 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
 }
 
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape 
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape 
          (const TopoDS_Shape& theShape,const Quantity_Color& theColor,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, Graphic3d_NOM_PLASTIC, toDisplay);
   getAISContext()->SetColor (aGraphicShape, theColor, toDisplay);
@@ -237,12 +237,12 @@ Handle_AIS_Shape OCCDemo_Presentation::drawShape
   return aGraphicShape;
 }
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape
          (const TopoDS_Shape& theShape,
           const Graphic3d_NameOfMaterial theMaterial,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, theMaterial, toDisplay);
   if (toDisplay) {
diff --git a/samples/mfc/occtdemo/Common/OCCDemo_Presentation.h b/samples/mfc/occtdemo/Common/OCCDemo_Presentation.h
index 959846e83f..1ac3299835 100755
--- a/samples/mfc/occtdemo/Common/OCCDemo_Presentation.h
+++ b/samples/mfc/occtdemo/Common/OCCDemo_Presentation.h
@@ -14,10 +14,10 @@
 #define WAIT_A_SECOND WaitForInput(1000)
 
 #include <OCCDemoDoc.h>
-class Handle_AIS_InteractiveObject;
-class Handle_Geom_Surface;
-class Handle_Geom_Curve;
-class Handle_Geom2d_Curve;
+class AIS_InteractiveObject;
+class Geom_Surface;
+class Geom_Curve;
+class Geom2d_Curve;
 class Quantity_Color;
 
 class OCCDemo_Presentation
@@ -63,8 +63,8 @@ public:
 protected:
   // Methods to call from a derivable class
   void setName (const char* theName) {myName = CString(theName);}
-  Handle_AIS_InteractiveContext getAISContext() const {return myDoc->GetAISContext();}
-  Handle_V3d_Viewer getViewer() const {return myDoc->GetViewer();}
+  Handle(AIS_InteractiveContext) getAISContext() const {return myDoc->GetAISContext();}
+  Handle(V3d_Viewer) getViewer() const {return myDoc->GetViewer();}
   void setResultTitle (const char* theTitle) {myDoc->GetResultDialog()->SetTitle(theTitle);}
   void setResultText (const char* theText) {myDoc->GetResultDialog()->SetText(theText);}
   Standard_CString GetDataDir() {return myDoc->GetDataDir();}
@@ -72,45 +72,45 @@ protected:
   Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
   // Waits for a user input or a period of time has been elapsed
 
-  Handle_AIS_InteractiveObject drawSurface (const Handle_Geom_Surface& theSurface,
+  Handle(AIS_InteractiveObject) drawSurface (const Handle(Geom_Surface)& theSurface,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_LEMONCHIFFON3),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a finite face based on the given geometric surface 
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True);
   // creates an ISession_Curve based on the given geometric curve
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom2d_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom2d_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True,
          const gp_Ax2& aPosition = gp::XOY());
   // converts a given curve to 3d using aPosition and calls the previous method
 
-  Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
+  Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given point
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawVector (const gp_Pnt& thePnt,
+  Handle(AIS_InteractiveObject) drawVector (const gp_Pnt& thePnt,
                                            const gp_Vec& theVec,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_YELLOW),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given vector
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Quantity_Color& theColor,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape
   // with material PLASTIC and a given color
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape with the given material
diff --git a/samples/mfc/occtdemo/Common/WNT/OCCDemo.h b/samples/mfc/occtdemo/Common/WNT/OCCDemo.h
index f8fb58d63e..5d13f1dde1 100755
--- a/samples/mfc/occtdemo/Common/WNT/OCCDemo.h
+++ b/samples/mfc/occtdemo/Common/WNT/OCCDemo.h
@@ -23,7 +23,7 @@ class COCCDemoApp : public CWinApp
 {
 public:
   COCCDemoApp();
-  Handle_Graphic3d_WNTGraphicDevice	  GetGraphicDevice() const 
+  Handle(Graphic3d_WNTGraphicDevice)	  GetGraphicDevice() const 
   { return myGraphicDevice; } ;
 
 // Overrides
@@ -42,7 +42,7 @@ public:
 	DECLARE_MESSAGE_MAP()
 
 private:
-  Handle_Graphic3d_WNTGraphicDevice myGraphicDevice;
+  Handle(Graphic3d_WNTGraphicDevice) myGraphicDevice;
 
 };
 
diff --git a/samples/mfc/occtdemo/Common/WNT/OCCDemoDoc.h b/samples/mfc/occtdemo/Common/WNT/OCCDemoDoc.h
index 612d5e01eb..bb184c70a9 100755
--- a/samples/mfc/occtdemo/Common/WNT/OCCDemoDoc.h
+++ b/samples/mfc/occtdemo/Common/WNT/OCCDemoDoc.h
@@ -15,8 +15,8 @@ class OCCDemo_Presentation;
 class COCCDemoDoc : public CDocument
 {
 public:
-  Handle_V3d_Viewer GetViewer() const { return myViewer; };
-  Handle_AIS_InteractiveContext GetAISContext() const { return myAISContext; };
+  Handle(V3d_Viewer) GetViewer() const { return myViewer; };
+  Handle(AIS_InteractiveContext) GetAISContext() const { return myAISContext; };
   CResultDialog* GetResultDialog () {return &myCResultDialog;}
   Standard_CString GetDataDir() {return myDataDir;}
 
@@ -71,8 +71,8 @@ protected:
 	DECLARE_MESSAGE_MAP()
 
 private:
-  Handle_V3d_Viewer myViewer;
-  Handle_AIS_InteractiveContext myAISContext;
+  Handle(V3d_Viewer) myViewer;
+  Handle(AIS_InteractiveContext) myAISContext;
   OCCDemo_Presentation *myPresentation;
   CResultDialog myCResultDialog;
   BOOL myShowResult;
diff --git a/samples/mfc/occtdemo/Common/WNT/OCCDemoView.h b/samples/mfc/occtdemo/Common/WNT/OCCDemoView.h
index c77c2b317e..cf8ea1bfb6 100755
--- a/samples/mfc/occtdemo/Common/WNT/OCCDemoView.h
+++ b/samples/mfc/occtdemo/Common/WNT/OCCDemoView.h
@@ -103,8 +103,8 @@ private:
 
 private:
   enum VisMode { VIS_WIREFRAME, VIS_SHADE, VIS_HLR };
-  Handle_V3d_View     myView;
-  Handle_Graphic3d_GraphicDriver myGraphicDriver;
+  Handle(V3d_View)     myView;
+  Handle(Graphic3d_GraphicDriver) myGraphicDriver;
   View3D_CurrentAction myCurrentMode;
   VisMode              myVisMode;
   Standard_Integer     myXmin;
diff --git a/samples/mfc/occtdemo/Convert/Convert_Presentation.cpp b/samples/mfc/occtdemo/Convert/Convert_Presentation.cpp
index 7571488895..5d65553496 100755
--- a/samples/mfc/occtdemo/Convert/Convert_Presentation.cpp
+++ b/samples/mfc/occtdemo/Convert/Convert_Presentation.cpp
@@ -88,7 +88,7 @@ void Convert_Presentation::DoSample()
 // Function : Convert_Presentation::drawSurfaceAndItsBSpline
 // Purpose  : 
 //================================================================
-void Convert_Presentation::drawSurfaceAndItsBSpline(Handle_Geom_Surface theSurface, 
+void Convert_Presentation::drawSurfaceAndItsBSpline(Handle(Geom_Surface) theSurface, 
                                                     const Standard_CString theName, 
                                                     TCollection_AsciiString& theText)
 {
@@ -97,7 +97,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(Handle_Geom_Surface theSurfa
   aTitle += " to BSpline surface";
 
   theText += EOL
-    "  Handle_Geom_BSplineSurface aBSplineSurface = " EOL
+    "  Handle(Geom_BSplineSurface) aBSplineSurface = " EOL
     "    GeomConvert::SurfaceToBSplineSurface(aSurface);" EOL;
 
   setResultTitle (aTitle.ToCString());
@@ -107,7 +107,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(Handle_Geom_Surface theSurfa
 
   if (WAIT_A_LITTLE) return;
 
-  Handle_Geom_BSplineSurface aBSplineSurface = GeomConvert::SurfaceToBSplineSurface(theSurface);
+  Handle(Geom_BSplineSurface) aBSplineSurface = GeomConvert::SurfaceToBSplineSurface(theSurface);
 
   _ASSERTE(!aBSplineSurface.IsNull());
 
@@ -118,7 +118,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(Handle_Geom_Surface theSurfa
 // Function : Convert_Presentation::drawCurveAndItsBSpline
 // Purpose  : 
 //================================================================
-void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve, 
+void Convert_Presentation::drawCurveAndItsBSpline(Handle(Geom_Curve) theCurve, 
                                                   const Standard_CString theName, 
                                                   TCollection_AsciiString& theText)
 {
@@ -127,7 +127,7 @@ void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve,
   aTitle += " to BSpline curve";
 
   theText += EOL
-    "  Handle_Geom_BSplineCurve aBSpline = " EOL
+    "  Handle(Geom_BSplineCurve) aBSpline = " EOL
     "    GeomConvert::CurveToBSplineCurve(aCurve);" EOL;
 
   setResultTitle (aTitle.ToCString());
@@ -137,7 +137,7 @@ void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve,
   
   if (WAIT_A_LITTLE) return;
 
-  Handle_Geom_BSplineCurve aBSpline = GeomConvert::CurveToBSplineCurve(theCurve);
+  Handle(Geom_BSplineCurve) aBSpline = GeomConvert::CurveToBSplineCurve(theCurve);
 
   drawCurve (aBSpline, BSplineColor);
 }
@@ -157,7 +157,7 @@ void Convert_Presentation::sampleCircle()
   gp_Dir aDir (1,0,0);
   gp_Ax2 aAxis (aOrigin, aDir);
   Standard_Real aRadius = 300;
-  Handle_Geom_Circle aCurve = new Geom_Circle (aAxis, aRadius);
+  Handle(Geom_Circle) aCurve = new Geom_Circle (aAxis, aRadius);
 
   TCollection_AsciiString aText (
     "  gp_Pnt aOrigin (0,0,0);" EOL
diff --git a/samples/mfc/occtdemo/Convert/Convert_Presentation.h b/samples/mfc/occtdemo/Convert/Convert_Presentation.h
index 3715ae336f..ffb991b987 100755
--- a/samples/mfc/occtdemo/Convert/Convert_Presentation.h
+++ b/samples/mfc/occtdemo/Convert/Convert_Presentation.h
@@ -10,8 +10,8 @@
 #endif // _MSC_VER > 1000
 
 #include <OCCDemo_Presentation.h>
-class Handle_Geom_Curve;
-class Handle_Geom_Surface;
+class Geom_Curve;
+class Geom_Surface;
 
 class Quantity_Color;
 
@@ -38,10 +38,10 @@ private:
   void sampleConicalSurface(); 
   void sampleSphericalSurface(); 
 
-  void drawCurveAndItsBSpline (Handle_Geom_Curve theCurve, 
+  void drawCurveAndItsBSpline (Handle(Geom_Curve) theCurve, 
     const Standard_CString theName, TCollection_AsciiString& theText);
 
-  void drawSurfaceAndItsBSpline (Handle_Geom_Surface theSurface, 
+  void drawSurfaceAndItsBSpline (Handle(Geom_Surface) theSurface, 
     const Standard_CString theName, TCollection_AsciiString& theText);
 
 private:
diff --git a/samples/mfc/occtdemo/DCA/DCA_Presentation.cpp b/samples/mfc/occtdemo/DCA/DCA_Presentation.cpp
index bc225eeedd..aee15feb67 100755
--- a/samples/mfc/occtdemo/DCA/DCA_Presentation.cpp
+++ b/samples/mfc/occtdemo/DCA/DCA_Presentation.cpp
@@ -196,14 +196,14 @@ void DCA_Presentation::sampleParabola()
 
   if(WAIT_A_LITTLE) return;
 
-  Handle_Geom_Line aFocalLenLin = new Geom_Line(gce_MakeLin(aPointParab, gp_Dir(0,0,1)));
-  Handle_Geom_TrimmedCurve aTrim = new Geom_TrimmedCurve(aFocalLenLin, -aFocalLength/2, aFocalLength/2);
+  Handle(Geom_Line) aFocalLenLin = new Geom_Line(gce_MakeLin(aPointParab, gp_Dir(0,0,1)));
+  Handle(Geom_TrimmedCurve) aTrim = new Geom_TrimmedCurve(aFocalLenLin, -aFocalLength/2, aFocalLength/2);
   drawCurve(aTrim);
 
   if(WAIT_A_LITTLE) return;
   
-  Handle_Geom_Parabola aParabola = new Geom_Parabola(aParab);
-  Handle_Geom_TrimmedCurve aParabTrimmed = 
+  Handle(Geom_Parabola) aParabola = new Geom_Parabola(aParab);
+  Handle(Geom_TrimmedCurve) aParabTrimmed = 
     new Geom_TrimmedCurve(aParabola,-300,300,Standard_True);
   drawCurve(aParabTrimmed);
 
@@ -218,8 +218,8 @@ void DCA_Presentation::sampleParabola()
 
   if(WAIT_A_LITTLE) return;
 
-  Handle_Geom_Parabola aParabola1 = new Geom_Parabola(aParab1);
-  Handle_Geom_TrimmedCurve aParabTrimmed1 = new Geom_TrimmedCurve(aParabola1,-300,300,Standard_True);
+  Handle(Geom_Parabola) aParabola1 = new Geom_Parabola(aParab1);
+  Handle(Geom_TrimmedCurve) aParabTrimmed1 = new Geom_TrimmedCurve(aParabola1,-300,300,Standard_True);
   drawCurve(aParabTrimmed1);
 }
 //================================================================
@@ -283,8 +283,8 @@ void DCA_Presentation::sampleHyperbola()
 
   if(WAIT_A_LITTLE) return;
 
-  Handle_Geom_Hyperbola aHyperbola1 = new Geom_Hyperbola(aHypr1);
-  Handle_Geom_TrimmedCurve aHyprTrimmed =
+  Handle(Geom_Hyperbola) aHyperbola1 = new Geom_Hyperbola(aHypr1);
+  Handle(Geom_TrimmedCurve) aHyprTrimmed =
     new Geom_TrimmedCurve(aHyperbola1,-3,4,Standard_True);
   drawCurve(aHyprTrimmed);
 
@@ -305,23 +305,23 @@ void DCA_Presentation::sampleHyperbola()
   if(WAIT_A_LITTLE) return;
 
   //output of display MajorRadius (yellow color)
-  Handle_Geom_Line aLine = new Geom_Line(gce_MakeLin(aPointHypr1,aPointHypr2));
-  Handle_Geom_TrimmedCurve aTrimmed1 = 
+  Handle(Geom_Line) aLine = new Geom_Line(gce_MakeLin(aPointHypr1,aPointHypr2));
+  Handle(Geom_TrimmedCurve) aTrimmed1 = 
     new Geom_TrimmedCurve(aLine, 0, aPointHypr1.Distance(aPointHypr2));
   drawCurve(aTrimmed1,Quantity_Color(Quantity_NOC_YELLOW));
 
   if(WAIT_A_LITTLE) return;
 
   //output of display MinorRadius (yellow color)
-  Handle_Geom_Line aLine1 = new Geom_Line(gce_MakeLin(aPointHypr3, gp_Dir(0,-1,0)));
-  Handle_Geom_TrimmedCurve aTrimmed2 = new Geom_TrimmedCurve(aLine1, 0,100);
+  Handle(Geom_Line) aLine1 = new Geom_Line(gce_MakeLin(aPointHypr3, gp_Dir(0,-1,0)));
+  Handle(Geom_TrimmedCurve) aTrimmed2 = new Geom_TrimmedCurve(aLine1, 0,100);
   drawCurve(aTrimmed2,Quantity_Color(Quantity_NOC_YELLOW)); 
 
   if(WAIT_A_LITTLE) return;
 
   //output hyperbola
-  Handle_Geom_Hyperbola aHyperbola2 = new Geom_Hyperbola(aHypr2);
-  Handle_Geom_TrimmedCurve aHyprTrimmed1 = 
+  Handle(Geom_Hyperbola) aHyperbola2 = new Geom_Hyperbola(aHypr2);
+  Handle(Geom_TrimmedCurve) aHyprTrimmed1 = 
     new Geom_TrimmedCurve(aHyperbola2,-2,2,Standard_True);
   drawCurve(aHyprTrimmed1);
 }
@@ -396,8 +396,8 @@ void DCA_Presentation::sampleCircle()
   if(WAIT_A_LITTLE) return;
 
   //output radius
-  Handle_Geom_Line aLine = new Geom_Line(gce_MakeLin (aCenterPoint,gp_Dir(0,0,1)));
-  Handle_Geom_TrimmedCurve aTrimmed = new Geom_TrimmedCurve(aLine,0,300);
+  Handle(Geom_Line) aLine = new Geom_Line(gce_MakeLin (aCenterPoint,gp_Dir(0,0,1)));
+  Handle(Geom_TrimmedCurve) aTrimmed = new Geom_TrimmedCurve(aLine,0,300);
   drawCurve(aTrimmed,Quantity_Color(Quantity_NOC_WHITE));
 
   if(WAIT_A_LITTLE) return;
@@ -519,16 +519,16 @@ void DCA_Presentation::sampleEllipse()
   gp_Lin aLine1 = aMakeLin1.Value();
 
   //output MajorRadius
-  Handle_Geom_Line aLineMajorRadius = new Geom_Line(aLine);
-  Handle_Geom_TrimmedCurve aTrimmed = 
+  Handle(Geom_Line) aLineMajorRadius = new Geom_Line(aLine);
+  Handle(Geom_TrimmedCurve) aTrimmed = 
     new Geom_TrimmedCurve(aLineMajorRadius,0,120);
   drawCurve(aTrimmed,Quantity_Color(Quantity_NOC_WHITE));
 
   if(WAIT_A_LITTLE) return;
 
   //output MinorRadius
-  Handle_Geom_Line aLineMinorrRadius = new Geom_Line(aLine1);
-  Handle_Geom_TrimmedCurve aTrimmed1 = 
+  Handle(Geom_Line) aLineMinorrRadius = new Geom_Line(aLine1);
+  Handle(Geom_TrimmedCurve) aTrimmed1 = 
     new Geom_TrimmedCurve(aLineMinorrRadius,0,300);
   drawCurve(aTrimmed1,Quantity_Color(Quantity_NOC_WHITE));
 
@@ -588,8 +588,8 @@ void DCA_Presentation::samplePlane()
 
   if(WAIT_A_LITTLE) return;
     
-  Handle_Geom_Plane aPln = new Geom_Plane(aPlane);
-  Handle_Geom_RectangularTrimmedSurface aPlnTrimmed = 
+  Handle(Geom_Plane) aPln = new Geom_Plane(aPlane);
+  Handle(Geom_RectangularTrimmedSurface) aPlnTrimmed = 
     new Geom_RectangularTrimmedSurface(aPln,-300,300,-300,300,Standard_True,Standard_True);
   drawSurface(aPlnTrimmed);
 
@@ -604,8 +604,8 @@ void DCA_Presentation::samplePlane()
 
   if(WAIT_A_LITTLE) return;
 
-  Handle_Geom_Plane aPln1 = new Geom_Plane(aPlane1);
-  Handle_Geom_RectangularTrimmedSurface aPlnTrimmed1 = 
+  Handle(Geom_Plane) aPln1 = new Geom_Plane(aPlane1);
+  Handle(Geom_RectangularTrimmedSurface) aPlnTrimmed1 = 
     new Geom_RectangularTrimmedSurface(aPln1,-200,300,-200,300,Standard_True,Standard_True);
   drawSurface(aPlnTrimmed1);
 
@@ -693,14 +693,14 @@ void DCA_Presentation::sampleCylindricalSurface()
   gp_Dir aDir1(0,0,1);
   gce_MakeLin aMakeLin(aCenterPoint,aDir1);
   gp_Lin aLin = aMakeLin.Value();
-  Handle_Geom_Line aLine = new Geom_Line(aLin);
-  Handle_Geom_TrimmedCurve aTrimmed = new Geom_TrimmedCurve(aLine,-100,0);
+  Handle(Geom_Line) aLine = new Geom_Line(aLin);
+  Handle(Geom_TrimmedCurve) aTrimmed = new Geom_TrimmedCurve(aLine,-100,0);
   drawCurve(aTrimmed,Quantity_Color(Quantity_NOC_WHITE));
   if(WAIT_A_LITTLE) return;
   // output cylinder
-  Handle_Geom_CylindricalSurface aCylSurface =
+  Handle(Geom_CylindricalSurface) aCylSurface =
     new Geom_CylindricalSurface(aCyl);
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed = 
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed = 
     new Geom_RectangularTrimmedSurface(aCylSurface,0,2*PI,-200,300,Standard_True,Standard_True);
   drawSurface(aCylTrimmed);
   if(WAIT_A_LITTLE) return;
@@ -716,14 +716,14 @@ void DCA_Presentation::sampleCylindricalSurface()
   drawVector(aCylinderPoint2,gp_Vec(aCylinderPoint2,aCylinderPoint3)*3,Quantity_Color(Quantity_NOC_WHITE));
    if(WAIT_A_LITTLE) return;
   //output radius
-  Handle_Geom_Line aLine1 = new Geom_Line(gce_MakeLin(aCylinderPoint1,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed1 = new Geom_TrimmedCurve(aLine1,-80,0);
+  Handle(Geom_Line) aLine1 = new Geom_Line(gce_MakeLin(aCylinderPoint1,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed1 = new Geom_TrimmedCurve(aLine1,-80,0);
   drawCurve(aTrimmed1,Quantity_Color(Quantity_NOC_WHITE));
   if(WAIT_A_LITTLE) return;
   //output cylinder
-  Handle_Geom_CylindricalSurface aCylSurface1 = 
+  Handle(Geom_CylindricalSurface) aCylSurface1 = 
     new Geom_CylindricalSurface(aCyl1);
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed1 = 
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed1 = 
     new Geom_RectangularTrimmedSurface(aCylSurface1,0,2*PI,-300,100,Standard_True,Standard_True);
   drawSurface(aCylTrimmed1);
   if(WAIT_A_LITTLE) return;
@@ -731,17 +731,17 @@ void DCA_Presentation::sampleCylindricalSurface()
 
   //METHOD 3.(output of dispay)
   //output base cylinder  
-  Handle_Geom_CylindricalSurface aCylSurf = new Geom_CylindricalSurface(aCylinder);
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed2 = 
+  Handle(Geom_CylindricalSurface) aCylSurf = new Geom_CylindricalSurface(aCylinder);
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed2 = 
     new Geom_RectangularTrimmedSurface(aCylSurf,0,2*PI,-200,200,Standard_True,Standard_True);
   drawSurface(aCylTrimmed2 ,Quantity_Color(Quantity_NOC_WHITE));
   //output point
   drawPoint(aCylinderPoint4);
   if(WAIT_A_LITTLE) return;
   //output cylinder
-  Handle_Geom_CylindricalSurface aCylSurface2 = 
+  Handle(Geom_CylindricalSurface) aCylSurface2 = 
     new Geom_CylindricalSurface(aCyl2);
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed3 =
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed3 =
     new Geom_RectangularTrimmedSurface(aCylSurface2,0,2*PI,-200,200,Standard_True,Standard_True);
   drawSurface(aCylTrimmed3);
   if(WAIT_A_LITTLE) return;
@@ -753,9 +753,9 @@ void DCA_Presentation::sampleCylindricalSurface()
   drawCurve(new Geom_Circle(aCirc),Quantity_Color(Quantity_NOC_WHITE));
   if(WAIT_A_LITTLE)  return;
   //output cylinder
-  Handle_Geom_CylindricalSurface aCylSurface3 = 
+  Handle(Geom_CylindricalSurface) aCylSurface3 = 
     new Geom_CylindricalSurface(aCyl3);
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed4 =
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed4 =
     new Geom_RectangularTrimmedSurface(aCylSurface3,0,2*PI,-200,200,Standard_True,Standard_True);
   drawSurface(aCylTrimmed4);
   }
@@ -800,8 +800,8 @@ void DCA_Presentation::sampleToroidalSurface()
   if(WAIT_A_LITTLE) return;
 
   //output MajorRadius
-  Handle_Geom_Line R1 = new Geom_Line(gce_MakeLin(aCenterPoint, gp_Dir(0,1,0)));
-  Handle_Geom_TrimmedCurve aTrimmedR1 = new Geom_TrimmedCurve(R1,0,MajorRadius);
+  Handle(Geom_Line) R1 = new Geom_Line(gce_MakeLin(aCenterPoint, gp_Dir(0,1,0)));
+  Handle(Geom_TrimmedCurve) aTrimmedR1 = new Geom_TrimmedCurve(R1,0,MajorRadius);
   drawCurve(aTrimmedR1, Quantity_Color(Quantity_NOC_WHITE));
   drawCurve(new Geom_Circle(anAx3.Ax2(), MajorRadius));
 
@@ -809,7 +809,7 @@ void DCA_Presentation::sampleToroidalSurface()
   
   // output MinorRadius as a circle
   gp_Ax2 aMinorRadAx(aTrimmedR1->EndPoint(), gp_Dir(0,0,1));
-  Handle_Geom_Circle aMinorRadCirc = new Geom_Circle(aMinorRadAx, MinorRadius);
+  Handle(Geom_Circle) aMinorRadCirc = new Geom_Circle(aMinorRadAx, MinorRadius);
   drawCurve(aMinorRadCirc);
 
   if(WAIT_A_LITTLE) return;
@@ -915,28 +915,28 @@ void DCA_Presentation::sampleConicalSurface()
 
   gp_Dir aDir1(0,1,0);
   //output first radius 
-  Handle_Geom_Line aLine = new Geom_Line(gce_MakeLin(aConePnt,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed = new Geom_TrimmedCurve(aLine,0,100);
+  Handle(Geom_Line) aLine = new Geom_Line(gce_MakeLin(aConePnt,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed = new Geom_TrimmedCurve(aLine,0,100);
   drawCurve(aTrimmed,Quantity_Color(Quantity_NOC_WHITE));
 
   //output second radius
-  Handle_Geom_Line aLine1 = new Geom_Line(gce_MakeLin(aConePnt1,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed1 = new Geom_TrimmedCurve(aLine1,0,50);
+  Handle(Geom_Line) aLine1 = new Geom_Line(gce_MakeLin(aConePnt1,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed1 = new Geom_TrimmedCurve(aLine1,0,50);
   drawCurve(aTrimmed1,Quantity_Color(Quantity_NOC_WHITE));
 
   if(WAIT_A_LITTLE) return;
 
   //output ruling of cone
-  Handle_Geom_Line aLine2 = new Geom_Line(gce_MakeLin(aConePnt,aConePnt1));
-  Handle_Geom_TrimmedCurve aTrimmed2 = 
+  Handle(Geom_Line) aLine2 = new Geom_Line(gce_MakeLin(aConePnt,aConePnt1));
+  Handle(Geom_TrimmedCurve) aTrimmed2 = 
     new Geom_TrimmedCurve(aLine2,0,aConePnt.Distance(aConePnt1));
   drawCurve(aTrimmed2,Quantity_Color(Quantity_NOC_RED));
 
   if(WAIT_A_LITTLE) return;
 
   //output cone
-  Handle_Geom_ConicalSurface aConSurface1 = new Geom_ConicalSurface(aCone1);
-  Handle_Geom_RectangularTrimmedSurface aConTrimmed1 = 
+  Handle(Geom_ConicalSurface) aConSurface1 = new Geom_ConicalSurface(aCone1);
+  Handle(Geom_RectangularTrimmedSurface) aConTrimmed1 = 
     new Geom_RectangularTrimmedSurface(aConSurface1,0,2*PI,-50,450,Standard_True,Standard_True);
   drawSurface(aConTrimmed1);
 
@@ -955,18 +955,18 @@ void DCA_Presentation::sampleConicalSurface()
   if(WAIT_A_LITTLE) return;
 
   //output of first radius 
-  Handle_Geom_Line aLineR1 = new Geom_Line(gce_MakeLin (aConePnt,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmedR1 = new Geom_TrimmedCurve(aLineR1,0,Radius1);
+  Handle(Geom_Line) aLineR1 = new Geom_Line(gce_MakeLin (aConePnt,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmedR1 = new Geom_TrimmedCurve(aLineR1,0,Radius1);
   drawCurve(aTrimmedR1,Quantity_Color(Quantity_NOC_WHITE));
 
   //output of second radius 
-  Handle_Geom_Line aLineR2 = new Geom_Line(gce_MakeLin (aConePnt2,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmedR2 = new Geom_TrimmedCurve(aLineR2,0,Radius2);
+  Handle(Geom_Line) aLineR2 = new Geom_Line(gce_MakeLin (aConePnt2,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmedR2 = new Geom_TrimmedCurve(aLineR2,0,Radius2);
   drawCurve(aTrimmedR2,Quantity_Color(Quantity_NOC_WHITE));
 
   //output cone
-  Handle_Geom_ConicalSurface aConSurface2 = new Geom_ConicalSurface(aCone2);
-  Handle_Geom_RectangularTrimmedSurface aConTrimmed2 =
+  Handle(Geom_ConicalSurface) aConSurface2 = new Geom_ConicalSurface(aCone2);
+  Handle(Geom_RectangularTrimmedSurface) aConTrimmed2 =
     new Geom_RectangularTrimmedSurface(aConSurface2,0,2*PI,-120,400,Standard_True,Standard_True);
   drawSurface(aConTrimmed2);
 
@@ -981,13 +981,13 @@ void DCA_Presentation::sampleConicalSurface()
   if(WAIT_A_LITTLE) return;
 
   //output radius
-  Handle_Geom_Line aLine3 = new Geom_Line(gce_MakeLin (aCenterPoint,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed3 = new Geom_TrimmedCurve(aLine3,0,70);
+  Handle(Geom_Line) aLine3 = new Geom_Line(gce_MakeLin (aCenterPoint,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed3 = new Geom_TrimmedCurve(aLine3,0,70);
   drawCurve(aTrimmed3 ,Quantity_Color(Quantity_NOC_WHITE));
 
   //output cone
-  Handle_Geom_ConicalSurface aConSurface3 = new Geom_ConicalSurface(aCone3);
-  Handle_Geom_RectangularTrimmedSurface aConTrimmed = 
+  Handle(Geom_ConicalSurface) aConSurface3 = new Geom_ConicalSurface(aCone3);
+  Handle(Geom_RectangularTrimmedSurface) aConTrimmed = 
     new Geom_RectangularTrimmedSurface(aConSurface3,0,2*PI,-300,300,Standard_True,Standard_True);
   drawSurface(aConTrimmed);
 
@@ -1011,30 +1011,30 @@ void DCA_Presentation::sampleConicalSurface()
   if(WAIT_A_LITTLE) return;
 
   //output ruling of cone
-  Handle_Geom_Line aLine4 = new Geom_Line(gce_MakeLin (aPoint_3,aPoint_4));
-  Handle_Geom_TrimmedCurve aTrimmed4 = 
+  Handle(Geom_Line) aLine4 = new Geom_Line(gce_MakeLin (aPoint_3,aPoint_4));
+  Handle(Geom_TrimmedCurve) aTrimmed4 = 
     new Geom_TrimmedCurve(aLine4,0,aPoint_3.Distance(aPoint_4));
   drawCurve(aTrimmed4 ,Quantity_Color(Quantity_NOC_RED));
 
   if(WAIT_A_LITTLE) return;
 
   //output first radius
-  Handle_Geom_Line aLine5 = new Geom_Line(gce_MakeLin (aPoint_3,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed5 = new Geom_TrimmedCurve(aLine5,0,50);
+  Handle(Geom_Line) aLine5 = new Geom_Line(gce_MakeLin (aPoint_3,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed5 = new Geom_TrimmedCurve(aLine5,0,50);
   drawCurve(aTrimmed5 ,Quantity_Color(Quantity_NOC_WHITE));
 
   if(WAIT_A_LITTLE) return;
 
   //output second radius
-  Handle_Geom_Line aLine6 = new Geom_Line(gce_MakeLin (aPoint_4,aDir1));
-  Handle_Geom_TrimmedCurve aTrimmed6 = new Geom_TrimmedCurve(aLine6,0,60);
+  Handle(Geom_Line) aLine6 = new Geom_Line(gce_MakeLin (aPoint_4,aDir1));
+  Handle(Geom_TrimmedCurve) aTrimmed6 = new Geom_TrimmedCurve(aLine6,0,60);
   drawCurve(aTrimmed6 ,Quantity_Color(Quantity_NOC_WHITE));
 
   if(WAIT_A_LITTLE) return;
 
   //output cone
-  Handle_Geom_ConicalSurface aConSurface4 = new Geom_ConicalSurface(aCone4);
-  Handle_Geom_RectangularTrimmedSurface aConTrimmed4 = 
+  Handle(Geom_ConicalSurface) aConSurface4 = new Geom_ConicalSurface(aCone4);
+  Handle(Geom_RectangularTrimmedSurface) aConTrimmed4 = 
     new Geom_RectangularTrimmedSurface(aConSurface4,0,2*PI,-300,300,Standard_True,Standard_True);
   drawSurface(aConTrimmed4);
 
diff --git a/samples/mfc/occtdemo/Extrema/Extrema_Presentation.cpp b/samples/mfc/occtdemo/Extrema/Extrema_Presentation.cpp
index 24dd10a1a6..3ca5f0cd69 100755
--- a/samples/mfc/occtdemo/Extrema/Extrema_Presentation.cpp
+++ b/samples/mfc/occtdemo/Extrema/Extrema_Presentation.cpp
@@ -199,7 +199,7 @@ void Extrema_Presentation::sampleCurveSur()
   TCollection_AsciiString aText(
     "  // the curve - first object for finding the extrema." EOL
     "  Handle(Geom_Curve) aCurve;" EOL
-    "  Handle_TColgp_HArray1OfPnt aPoles = new TColgp_HArray1OfPnt(1, 4);" EOL EOL
+    "  Handle(TColgp_HArray1OfPnt) aPoles = new TColgp_HArray1OfPnt(1, 4);" EOL EOL
 
     "  // points to build the curves" EOL
     "  Standard_Real a[][3] = {{2,1,10},{0,12,0},{5,6,0},{0,10,11}};  " EOL EOL
@@ -239,7 +239,7 @@ void Extrema_Presentation::sampleCurveSur()
   
   // the curve - first object for finding the extrema.
   Handle(Geom_Curve) aCurve;
-  Handle_TColgp_HArray1OfPnt aPoles = new TColgp_HArray1OfPnt(1, 4); 
+  Handle(TColgp_HArray1OfPnt) aPoles = new TColgp_HArray1OfPnt(1, 4); 
 
   // points to build the curves
   Standard_Real a[][3] = {{2,1,10},{0,12,0},{5,6,0},{0,10,11}};  
@@ -429,7 +429,7 @@ void Extrema_Presentation::sampleShellShell()
     "    for (Standard_Integer j=0; j < 3; j++)" EOL
     "      aSurPoles(i+1,j+1) = gp_Pnt (aSurCoords[i*3+j][0]*10-250, aSurCoords[i*3+j][1]*10-250, aSurCoords[i*3+j][2]*10-350);" EOL EOL
 
-    "  Handle_Geom_BezierSurface aSurface = new Geom_BezierSurface(aSurPoles);" EOL EOL
+    "  Handle(Geom_BezierSurface) aSurface = new Geom_BezierSurface(aSurPoles);" EOL EOL
 
     "  // creating a TopoDS_Shell from Geom_Surface" EOL 
     "  TopoDS_Shell aShape2 = BRepBuilderAPI_MakeShell(aSurface);" EOL EOL
@@ -473,7 +473,7 @@ void Extrema_Presentation::sampleShellShell()
     for (Standard_Integer j=0; j < 3; j++)
       aSurPoles(i+1,j+1) = gp_Pnt (aSurCoords[i*3+j][0]*10-250, aSurCoords[i*3+j][1]*10-250, aSurCoords[i*3+j][2]*10-350);
 
-  Handle_Geom_BezierSurface aSurface = new Geom_BezierSurface(aSurPoles);
+  Handle(Geom_BezierSurface) aSurface = new Geom_BezierSurface(aSurPoles);
 
   // creating a TopoDS_Shell from Geom_Surface
   TopoDS_Shell aShape2 = BRepBuilderAPI_MakeShell(aSurface);
@@ -535,10 +535,10 @@ void Extrema_Presentation::doShapeShapeExtrema(const TopoDS_Shape& theShape1,
     {
       displayExtemaEdge(anExtrema.PointOnShape1(i), anExtrema.PointOnShape2(i));
 
-      Handle_AIS_Shape aSupportShape1 = new AIS_Shape(anExtrema.SupportOnShape1(i));
+      Handle(AIS_Shape) aSupportShape1 = new AIS_Shape(anExtrema.SupportOnShape1(i));
       aSupportShape1->SetMaterial(Graphic3d_NOM_PLASTIC);
       aSupportShape1->SetColor(Quantity_NOC_GRAY97);
-      Handle_AIS_Shape aSupportShape2 = new AIS_Shape(anExtrema.SupportOnShape2(i));
+      Handle(AIS_Shape) aSupportShape2 = new AIS_Shape(anExtrema.SupportOnShape2(i));
       aSupportShape2->SetMaterial(Graphic3d_NOM_PLASTIC);
       aSupportShape2->SetColor(Quantity_NOC_GRAY97);
       getAISContext()->Display(aSupportShape1, Standard_False);
diff --git a/samples/mfc/occtdemo/GProps/GProps_Presentation.cpp b/samples/mfc/occtdemo/GProps/GProps_Presentation.cpp
index 2b3627f5a3..55c4c9dab7 100755
--- a/samples/mfc/occtdemo/GProps/GProps_Presentation.cpp
+++ b/samples/mfc/occtdemo/GProps/GProps_Presentation.cpp
@@ -241,7 +241,7 @@ Standard_Boolean GProps_Presentation::GProps(GProp_GProps& aProps,
 
   if (WAIT_A_SECOND) return Standard_False;
 
-  Handle_AIS_Point aPointIO = drawPoint(
+  Handle(AIS_Point) aPointIO = drawPoint(
     aCenterOfMass, MAIN_ELEMS_COLOR, Standard_False);
   aPointIO->UnsetMarker();
   aPointIO->SetMarker(Aspect_TOM_O);
@@ -265,7 +265,7 @@ Standard_Boolean GProps_Presentation::GProps(GProp_GProps& aProps,
   }
 
   // display the cirle with radius = aRadiusOfGyration
-  Handle_Geom_Circle aCirc = new Geom_Circle(anInertialCoordSys, aRadiusOfGyration);
+  Handle(Geom_Circle) aCirc = new Geom_Circle(anInertialCoordSys, aRadiusOfGyration);
   drawCurve(aCirc, CUSTOM_INERTIAL_ELEMS_COLOR);
 
   return Standard_True;
@@ -327,7 +327,7 @@ void GProps_Presentation::samplePoints()
 
   //if (WAIT_A_SECOND) return;
 
-  Handle_AIS_Point aPointIO = drawPoint(
+  Handle(AIS_Point) aPointIO = drawPoint(
     aBaryCentre, MAIN_ELEMS_COLOR, Standard_False);
   aPointIO->SetMarker(Aspect_TOM_STAR);
   getAISContext()->Display(aPointIO);
@@ -373,7 +373,7 @@ void GProps_Presentation::sampleCurves()
     aPoints(i+1) = gp_Pnt (aCoords[i][0]*k, aCoords[i][1]*k, aCoords[i][2]*k);
 
   // edge 2 is a bezier curve that starts in edge1's end point
-  Handle_Geom_BezierCurve aCurve = new Geom_BezierCurve(aPoints);
+  Handle(Geom_BezierCurve) aCurve = new Geom_BezierCurve(aPoints);
   TopoDS_Edge anEdge2 = BRepBuilderAPI_MakeEdge(aCurve);
 
   // edge 1 is a linear edge between 2 points
@@ -575,9 +575,9 @@ void GProps_Presentation::sampleSystem()
   for (Standard_Integer i=0; i < nPoints; i++)
     aPoints(i+1) = gp_Pnt (aCoords[i][0]*k, aCoords[i][1]*k, aCoords[i][2]*k);
 
-  Handle_Geom_BezierCurve aCurve = new Geom_BezierCurve(aPoints);
+  Handle(Geom_BezierCurve) aCurve = new Geom_BezierCurve(aPoints);
   gp_Ax1 anAxis(aPoints(1), gp_Dir(0,1,0));
-  Handle_Geom_SurfaceOfRevolution aSurface = new Geom_SurfaceOfRevolution(aCurve, anAxis);
+  Handle(Geom_SurfaceOfRevolution) aSurface = new Geom_SurfaceOfRevolution(aCurve, anAxis);
   TopoDS_Solid aSolid = BRepBuilderAPI_MakeSolid(BRepBuilderAPI_MakeShell(aSurface));
 
   TopoDS_Edge e1 = BRepBuilderAPI_MakeEdge(gp_Pnt(5*k, 2*k, 0), gp_Pnt(12*k, 7*k, 0));
@@ -595,8 +595,8 @@ void GProps_Presentation::sampleSystem()
   aBuilder.Perform(aWing1, Standard_True);
   TopoDS_Face aWing2 = TopoDS::Face(aBuilder.Shape());
 
-  Handle_Geom_Circle aCirc = new Geom_Circle(gp_Ax2(gp_Pnt(3*k, 11*k, 0), gp_Dir(0,-0.2,0.8)), (12-3)*k);
-  Handle_Geom_TrimmedCurve aTrimCirc = new Geom_TrimmedCurve(aCirc, -PI/2, PI/2);
+  Handle(Geom_Circle) aCirc = new Geom_Circle(gp_Ax2(gp_Pnt(3*k, 11*k, 0), gp_Dir(0,-0.2,0.8)), (12-3)*k);
+  Handle(Geom_TrimmedCurve) aTrimCirc = new Geom_TrimmedCurve(aCirc, -PI/2, PI/2);
   TopoDS_Edge aSpoiler = BRepBuilderAPI_MakeEdge(aTrimCirc);
 
   TopoDS_Edge anArrow = BRepBuilderAPI_MakeEdge(gp_Pnt(3*k, 0, 0), gp_Pnt(3*k, -5*k, 0));
diff --git a/samples/mfc/occtdemo/GeomConstraints/GeomConstraints_Presentation.cpp b/samples/mfc/occtdemo/GeomConstraints/GeomConstraints_Presentation.cpp
index df5d66a2f0..b3dc89401e 100755
--- a/samples/mfc/occtdemo/GeomConstraints/GeomConstraints_Presentation.cpp
+++ b/samples/mfc/occtdemo/GeomConstraints/GeomConstraints_Presentation.cpp
@@ -95,7 +95,7 @@ void GeomConstraints_Presentation::DoSample()
 // Function creating Surface,BSPline,Bezier and 2dBSpline Curves
 //=========================================================================================
 
-static Handle_Geom_BSplineCurve createBSplineCurve(const Standard_Integer nPoles,
+static Handle(Geom_BSplineCurve) createBSplineCurve(const Standard_Integer nPoles,
                                  const Standard_Real theCoords[][3])
 {
   TColgp_Array1OfPnt aCurvePoint (1, nPoles);
@@ -111,7 +111,7 @@ static Handle_Geom_BSplineCurve createBSplineCurve(const Standard_Integer nPoles
 }
 
 
-static Handle_Geom_BezierCurve createBezierCurve(const Standard_Integer nPoles,
+static Handle(Geom_BezierCurve) createBezierCurve(const Standard_Integer nPoles,
                                  const Standard_Real theCoords[][3])
 {
   TColgp_Array1OfPnt aCurvePoint (1, nPoles);
@@ -123,7 +123,7 @@ static Handle_Geom_BezierCurve createBezierCurve(const Standard_Integer nPoles,
   return aBCurve;
 }
 
-static Handle_Geom2d_BSplineCurve battenCurve(const Standard_Real& theAngle1,
+static Handle(Geom2d_BSplineCurve) battenCurve(const Standard_Real& theAngle1,
                                                 const Standard_Real& theAngle2)
 {
    //define points
@@ -149,10 +149,10 @@ static Handle_Geom2d_BSplineCurve battenCurve(const Standard_Real& theAngle1,
 }
 
 
-static Handle_Geom_Surface createSurface(
+static Handle(Geom_Surface) createSurface(
                                  const Standard_Integer endBound,
                                  TColgp_Array1OfPnt& thePoint,
-                                 const Handle_Geom_Plane& thePlane)
+                                 const Handle(Geom_Plane)& thePlane)
 {
   Standard_Integer Degree = 3;
   Standard_Integer NbPtsOnCur = 10;
@@ -630,7 +630,7 @@ void GeomConstraints_Presentation::sample3()
   }  
   aFile.close();
 
-  Handle_AIS_InteractiveObject anIO,aNewIO;
+  Handle(AIS_InteractiveObject) anIO,aNewIO;
  
   for(Standard_Integer j = 1; j <= int(aSize / 20); j++)
   {
diff --git a/samples/mfc/occtdemo/Glue/Glue_Presentation.cpp b/samples/mfc/occtdemo/Glue/Glue_Presentation.cpp
index a1f3321cd0..e476b230d3 100755
--- a/samples/mfc/occtdemo/Glue/Glue_Presentation.cpp
+++ b/samples/mfc/occtdemo/Glue/Glue_Presentation.cpp
@@ -168,9 +168,9 @@ void Glue_Presentation::sampleCylinder()
   TopoDS_Edge e4 = BRepBuilderAPI_MakeEdge(gp_Pnt(24,0,0),gp_Pnt(24,15,0));
   TopoDS_Edge e5 = BRepBuilderAPI_MakeEdge(gp_Pnt(24,15,0),gp_Pnt(0,15,0));
   TopoDS_Edge e6 = BRepBuilderAPI_MakeEdge(gp_Pnt(0,15,0),gp_Pnt(0,0,0));
-  Handle_Geom_Circle e2C = new Geom_Circle(gp_Ax2(gp_Pnt(12,0,0), gp_Dir(0,0,1)), 7);
+  Handle(Geom_Circle) e2C = new Geom_Circle(gp_Ax2(gp_Pnt(12,0,0), gp_Dir(0,0,1)), 7);
   e2C->Rotate(gp_Ax1(gp_Pnt(12,0,0),gp_Dir(0,0,1)),PI);
-  Handle_Geom_TrimmedCurve e2A = new Geom_TrimmedCurve(e2C, PI, 2*PI);
+  Handle(Geom_TrimmedCurve) e2A = new Geom_TrimmedCurve(e2C, PI, 2*PI);
   TopoDS_Edge e2 = BRepBuilderAPI_MakeEdge(e2A);
 
   BRepBuilderAPI_MakeWire wireMaker(e1,e2,e3,e4);
@@ -311,7 +311,7 @@ void Glue_Presentation::sampleMoreBoxes()
 // Purpose  : display a shape in wire frame mode
 //================================================================
 Standard_Boolean Glue_Presentation::drawShapeWf(TopoDS_Shape& aShape, 
-                                                Handle_AIS_InteractiveObject& io)
+                                                Handle(AIS_InteractiveObject)& io)
 {
   io = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(io, AIS_WireFrame, Standard_False);
@@ -325,7 +325,7 @@ Standard_Boolean Glue_Presentation::drawShapeWf(TopoDS_Shape& aShape,
 // Purpose  : display a shape in shaded mode
 //================================================================
 Standard_Boolean Glue_Presentation::drawShapeSh(TopoDS_Shape& aShape, 
-                                                Handle_AIS_InteractiveObject& io)
+                                                Handle(AIS_InteractiveObject)& io)
 {
   io = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(io, AIS_Shaded, Standard_False);
@@ -346,7 +346,7 @@ Standard_Boolean Glue_Presentation::displayShapesFaces(TopoDS_Shape& aShape1,
                                            TopTools_ListOfShape& aEdges1,
                                            TopTools_ListOfShape& aEdges2)
 {
-  Handle_AIS_Shape io1,io2,io3,io4,io5,io6;
+  Handle(AIS_Shape) io1,io2,io3,io4,io5,io6;
   if (!drawShapeSh(aShape1, io1)) return Standard_False;
   if (!drawShapeSh(aShape2, io2)) return Standard_False;
 
diff --git a/samples/mfc/occtdemo/Glue/Glue_Presentation.h b/samples/mfc/occtdemo/Glue/Glue_Presentation.h
index d1c2dd1ce2..d1a9d24971 100755
--- a/samples/mfc/occtdemo/Glue/Glue_Presentation.h
+++ b/samples/mfc/occtdemo/Glue/Glue_Presentation.h
@@ -13,8 +13,8 @@
 class GProp_Glue;
 class TCollection_AsciiString;
 class TopoDS_Shape;
-class Handle_AIS_InteractiveObject;
-class TopTools_ListOfShape;
+class AIS_InteractiveObject;
+#include <TopTools_ListOfShape.hxx>
 
 class Glue_Presentation : public OCCDemo_Presentation
 {
@@ -37,10 +37,10 @@ private:
     TopTools_ListOfShape&, TopTools_ListOfShape&);
 
   // display a given shape in wire frame mode
-  Standard_Boolean drawShapeWf(TopoDS_Shape&,Handle_AIS_InteractiveObject&);
+  Standard_Boolean drawShapeWf(TopoDS_Shape&,Handle(AIS_InteractiveObject)&);
 
   // display a given shape in shaded mode
-  Standard_Boolean drawShapeSh(TopoDS_Shape&,Handle_AIS_InteractiveObject&);
+  Standard_Boolean drawShapeSh(TopoDS_Shape&,Handle(AIS_InteractiveObject)&);
 
   void sampleBoxes();
   void sampleCylinder();
diff --git a/samples/mfc/occtdemo/HLR/HLR_Presentation.cpp b/samples/mfc/occtdemo/HLR/HLR_Presentation.cpp
index d27724fd0e..99677786ce 100755
--- a/samples/mfc/occtdemo/HLR/HLR_Presentation.cpp
+++ b/samples/mfc/occtdemo/HLR/HLR_Presentation.cpp
@@ -78,11 +78,11 @@ void HLR_Presentation::DoSample()
 // Purpose  : returns Prs3d_Projector object created corresponding 
 //            to the current view parameters
 //================================================================
-Handle_Prs3d_Projector HLR_Presentation::Projector(gp_Trsf& theTrsf)
+Handle(Prs3d_Projector) HLR_Presentation::Projector(gp_Trsf& theTrsf)
 {
   // retrieve view parameters for creation of Prs3d_Projector object
   getViewer()->InitActiveViews();
-  Handle_V3d_View aView = getViewer()->ActiveView();
+  Handle(V3d_View) aView = getViewer()->ActiveView();
   
   Standard_Real aProjVecX, aProjVecY, aProjVecZ;
   aView->Proj(aProjVecX, aProjVecY, aProjVecZ);
@@ -93,7 +93,7 @@ Handle_Prs3d_Projector HLR_Presentation::Projector(gp_Trsf& theTrsf)
   Standard_Real aPntX = 0.0, aPntY = 0.0, aPntZ = 0.0;
 
   // create a projector object
-  Handle_Prs3d_Projector aProjector = new Prs3d_Projector(Standard_False, 0.0, 
+  Handle(Prs3d_Projector) aProjector = new Prs3d_Projector(Standard_False, 0.0, 
     aProjVecX, aProjVecY, aProjVecZ, aPntX, aPntY, aPntZ, aUpX, aUpY, aUpZ);
 
   gp_Pnt At (aPntX,aPntY,aPntZ);
@@ -122,14 +122,14 @@ Standard_Boolean HLR_Presentation::HLR(const TopoDS_Shape& aShape, const Standar
     "  // initializing aShape ..." EOL
     "" EOL
     "  // Build The algorithm object" EOL
-    "  Handle_HLRBRep_Algo myAlgo = new HLRBRep_Algo();" EOL
+    "  Handle(HLRBRep_Algo) myAlgo = new HLRBRep_Algo();" EOL
     "  " EOL
     "  // Add Shapes into the algorithm" EOL
     "  Standard_Real nbIso = 5; // number of isolines to display" EOL
     "  myAlgo->Add(aShape, nbIso);" EOL
     "" EOL
     "  // create a projector object" EOL
-    "  Handle_V3d_View aView;" EOL
+    "  Handle(V3d_View) aView;" EOL
     "  // initializing V3d_View ..." EOL
     "  " EOL
     "  Standard_Real aProjVecX, aProjVecY, aProjVecZ;" EOL
@@ -141,7 +141,7 @@ Standard_Boolean HLR_Presentation::HLR(const TopoDS_Shape& aShape, const Standar
     "  Standard_Real aPntX = 0.0, aPntY = 0.0, aPntZ = 0.0;" EOL
     "" EOL
     "  // create a projector object" EOL
-    "  Handle_Prs3d_Projector aProjector = new Prs3d_Projector(Standard_False, 0.0, " EOL
+    "  Handle(Prs3d_Projector) aProjector = new Prs3d_Projector(Standard_False, 0.0, " EOL
     "    aProjVecX, aProjVecY, aProjVecZ, aPntX, aPntY, aPntZ, aUpX, aUpY, aUpZ);" EOL
     "  " EOL
     "  // Set The Projector" EOL
@@ -189,7 +189,7 @@ Standard_Boolean HLR_Presentation::HLR(const TopoDS_Shape& aShape, const Standar
     "  Isolines     - YELLOW" EOL);
 
   // Build The algorithm object
-  Handle_HLRBRep_Algo myAlgo = new HLRBRep_Algo();
+  Handle(HLRBRep_Algo) myAlgo = new HLRBRep_Algo();
   
   // Add Shapes into the algorithm
   myAlgo->Add(aShape, nbIso);
@@ -234,7 +234,7 @@ Standard_Boolean HLR_Presentation::HLR(const TopoDS_Shape& aShape, const Standar
   TopoDS_Shape OutLineHCompound = aHLRToShape.OutLineHCompound();
   TopoDS_Shape IsoLineHCompound = aHLRToShape.IsoLineHCompound();
 
-  Handle_AIS_Shape aShapeIO = drawShape(aShape);
+  Handle(AIS_Shape) aShapeIO = drawShape(aShape);
 
   if (WAIT_A_SECOND) return Standard_False;
 
@@ -268,13 +268,13 @@ Standard_Boolean HLR_Presentation::PolyHLR(const TopoDS_Shape& aShape)
     "  // triangulating aShape with BRepMesh::Mesh" EOL
     "" EOL
     "  // Build The algorithm object" EOL
-    "  Handle_HLRBRep_PolyAlgo myPolyAlgo = new HLRBRep_PolyAlgo();" EOL
+    "  Handle(HLRBRep_PolyAlgo) myPolyAlgo = new HLRBRep_PolyAlgo();" EOL
     "  " EOL
     "  // Add Shapes into the algorithm" EOL
     "  myPolyAlgo->Load(aShape);" EOL
     "" EOL
     "  // create a projector object" EOL
-    "  Handle_V3d_View aView;" EOL
+    "  Handle(V3d_View) aView;" EOL
     "  // initializing V3d_View ..." EOL
     "  " EOL
     "  Standard_Real aProjVecX, aProjVecY, aProjVecZ;" EOL
@@ -286,7 +286,7 @@ Standard_Boolean HLR_Presentation::PolyHLR(const TopoDS_Shape& aShape)
     "  Standard_Real aPntX = 0.0, aPntY = 0.0, aPntZ = 0.0;" EOL
     "" EOL
     "  // create a projector object" EOL
-    "  Handle_Prs3d_Projector aProjector = new Prs3d_Projector(Standard_False, 0.0, " EOL
+    "  Handle(Prs3d_Projector) aProjector = new Prs3d_Projector(Standard_False, 0.0, " EOL
     "    aProjVecX, aProjVecY, aProjVecZ, aPntX, aPntY, aPntZ, aUpX, aUpY, aUpZ);" EOL
     "  " EOL
     "  // Set The Projector" EOL
@@ -328,7 +328,7 @@ Standard_Boolean HLR_Presentation::PolyHLR(const TopoDS_Shape& aShape)
     "  Isolines     - YELLOW" EOL);
 
   // Build The algorithm object
-  Handle_HLRBRep_PolyAlgo myPolyAlgo = new HLRBRep_PolyAlgo();
+  Handle(HLRBRep_PolyAlgo) myPolyAlgo = new HLRBRep_PolyAlgo();
   
   // Add Shapes into the algorithm
   myPolyAlgo->Load(aShape);
@@ -367,7 +367,7 @@ Standard_Boolean HLR_Presentation::PolyHLR(const TopoDS_Shape& aShape)
   TopoDS_Shape RgNLineHCompound = aPolyHLRToShape.RgNLineHCompound();
   TopoDS_Shape OutLineHCompound = aPolyHLRToShape.OutLineHCompound();
 
-  Handle_AIS_Shape aShapeIO = drawShape(aShape);
+  Handle(AIS_Shape) aShapeIO = drawShape(aShape);
 
   if (WAIT_A_SECOND) return Standard_False;
 
@@ -409,7 +409,7 @@ Standard_Boolean HLR_Presentation::drawHLR(TopoDS_Shape& aVShape,
     aVShape.Location(aLoc);
 
     // create a look for a line according to aColor and aLineType
-    Handle_AIS_Shape anIO = drawShape(aVShape, aColor, Standard_False);
+    Handle(AIS_Shape) anIO = drawShape(aVShape, aColor, Standard_False);
     anIO->Attributes()->WireAspect()->SetTypeOfLine(Aspect_TOL_SOLID);
     
     getAISContext()->Display(anIO, HShapeIsNull);
@@ -420,7 +420,7 @@ Standard_Boolean HLR_Presentation::drawHLR(TopoDS_Shape& aVShape,
     aHShape.Location(aLoc);
 
     // create a look for a line according to aColor and aLineType
-    Handle_AIS_Shape anIO = drawShape(aHShape, aColor, Standard_False);
+    Handle(AIS_Shape) anIO = drawShape(aHShape, aColor, Standard_False);
     anIO->Attributes()->WireAspect()->SetTypeOfLine(Aspect_TOL_DASH);
 
     getAISContext()->Display(anIO);
@@ -464,7 +464,7 @@ void HLR_Presentation::sampleTorus()
   Standard_Real MinorRadius = 10;
   
   //make torus
-  Handle_Geom_ToroidalSurface aTorSurface = new Geom_ToroidalSurface(anAx3, MajorRadius, MinorRadius);
+  Handle(Geom_ToroidalSurface) aTorSurface = new Geom_ToroidalSurface(anAx3, MajorRadius, MinorRadius);
   TopoDS_Shell aShape = BRepBuilderAPI_MakeShell(aTorSurface);
 
   Standard_Integer nbIso = 3;
diff --git a/samples/mfc/occtdemo/HLR/HLR_Presentation.h b/samples/mfc/occtdemo/HLR/HLR_Presentation.h
index a37082c955..e88180414d 100755
--- a/samples/mfc/occtdemo/HLR/HLR_Presentation.h
+++ b/samples/mfc/occtdemo/HLR/HLR_Presentation.h
@@ -11,7 +11,7 @@
 
 #include <OCCDemo_Presentation.h>
 class TopoDS_Shape;
-class Handle_Prs3d_Projector;
+class Prs3d_Projector;
 class gp_Trsf;
 class TopLoc_Location;
 
@@ -28,7 +28,7 @@ public:
   // one phase of iterations
 
 private:
-  Handle_Prs3d_Projector Projector(gp_Trsf& theTrsf);
+  Handle(Prs3d_Projector) Projector(gp_Trsf& theTrsf);
   Standard_Boolean HLR(const TopoDS_Shape&, const Standard_Integer nbIso);
   Standard_Boolean PolyHLR(const TopoDS_Shape&);
   Standard_Boolean drawHLR(TopoDS_Shape&, TopoDS_Shape&, const TopLoc_Location&, 
diff --git a/samples/mfc/occtdemo/Interpol/Interpol_Presentation.cpp b/samples/mfc/occtdemo/Interpol/Interpol_Presentation.cpp
index bd947afeeb..19b7ff75a0 100755
--- a/samples/mfc/occtdemo/Interpol/Interpol_Presentation.cpp
+++ b/samples/mfc/occtdemo/Interpol/Interpol_Presentation.cpp
@@ -70,7 +70,7 @@ void Interpol_Presentation::DoSample()
 // Output   : vectors theTan, theNewTan.
 // Returns  : false if failed, true if ok.
 //================================================================
-static Standard_Boolean calculateNewTangent(const Handle_Geom_BSplineCurve& anInterpolationCurve, 
+static Standard_Boolean calculateNewTangent(const Handle(Geom_BSplineCurve)& anInterpolationCurve, 
                                             gp_Pnt aPointOnCurve, gp_Vec& theTan, gp_Vec& theNewTan,
                                             Standard_Real angle)
 {
@@ -128,7 +128,7 @@ void Interpol_Presentation::interpolate (Standard_Real aCoords[][3],
     "  aNoPeriodInterpolate.Perform();" EOL
     "  // check results" EOL
     "  if (!aNoPeriodInterpolate.IsDone()) return;" EOL
-    "  Handle_Geom_BSplineCurve anInterpolationCurve = aNoPeriodInterpolate.Curve();" EOL EOL
+    "  Handle(Geom_BSplineCurve) anInterpolationCurve = aNoPeriodInterpolate.Curve();" EOL EOL
 
     "  //===================================" EOL
     "  // Creating a constrained interpolation curve" EOL
@@ -183,9 +183,9 @@ void Interpol_Presentation::interpolate (Standard_Real aCoords[][3],
   aNoPeriodInterpolate.Perform();
   // check results
   if (!aNoPeriodInterpolate.IsDone()) return;
-  Handle_Geom_BSplineCurve anInterpolationCurve = aNoPeriodInterpolate.Curve();
+  Handle(Geom_BSplineCurve) anInterpolationCurve = aNoPeriodInterpolate.Curve();
 
-  Handle_AIS_InteractiveObject aShowCurve = drawCurve(anInterpolationCurve);
+  Handle(AIS_InteractiveObject) aShowCurve = drawCurve(anInterpolationCurve);
   if (WAIT_A_SECOND) return;
      
   //===================================
@@ -197,7 +197,7 @@ void Interpol_Presentation::interpolate (Standard_Real aCoords[][3],
   Standard_Real scaleVec = 1;
   aCopyFlags->Init(Standard_False);
 
-  Handle_AIS_InteractiveObject aShowTan;
+  Handle(AIS_InteractiveObject) aShowTan;
   for (i = indexes.Lower(); i <= indexes.Upper(); i++)
   {
     gp_Pnt aPoint = aPnts->Value(indexes(i));
diff --git a/samples/mfc/occtdemo/Interpol/Interpol_Presentation.h b/samples/mfc/occtdemo/Interpol/Interpol_Presentation.h
index da6ed63de1..ceb5053e41 100755
--- a/samples/mfc/occtdemo/Interpol/Interpol_Presentation.h
+++ b/samples/mfc/occtdemo/Interpol/Interpol_Presentation.h
@@ -11,10 +11,10 @@
 
 #include <OCCDemo_Presentation.h>
 
-class Handle_Geom_BSplineCurve;
-class Handle_TColgp_HArray1OfPnt;
-class TColStd_Array1OfInteger;
-class TColStd_Array1OfReal;
+class Geom_BSplineCurve;
+#include <TColgp_HArray1OfPnt.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
 
 class Interpol_Presentation : public OCCDemo_Presentation
 {
diff --git a/samples/mfc/occtdemo/Intersections/Intersections_Presentation.cpp b/samples/mfc/occtdemo/Intersections/Intersections_Presentation.cpp
index d5d259efe3..86b9ce8b2f 100755
--- a/samples/mfc/occtdemo/Intersections/Intersections_Presentation.cpp
+++ b/samples/mfc/occtdemo/Intersections/Intersections_Presentation.cpp
@@ -70,7 +70,7 @@ void Intersections_Presentation::DoSample()
 //////////////////////////////////////////////////////////////////////
 
 
-static Handle_Geom2d_BSplineCurve create2dBSplineCurve(const Standard_Integer thePoles,
+static Handle(Geom2d_BSplineCurve) create2dBSplineCurve(const Standard_Integer thePoles,
                                  const Standard_Real theCoords[][2])
 {
   TColgp_Array1OfPnt2d thePoints(1, thePoles);
@@ -86,7 +86,7 @@ static Handle_Geom2d_BSplineCurve create2dBSplineCurve(const Standard_Integer th
 }
 
 
-static Handle_Geom_BSplineSurface createBSplineSurface(const Standard_Real theZCoords[],
+static Handle(Geom_BSplineSurface) createBSplineSurface(const Standard_Real theZCoords[],
                                                        const Standard_Real theXStep,
                                                        const Standard_Real theYStep,
                                                        const Standard_Real theXBound,
diff --git a/samples/mfc/occtdemo/LProps/LProps_Presentation.cpp b/samples/mfc/occtdemo/LProps/LProps_Presentation.cpp
index fd46f8179f..ec58a54c61 100755
--- a/samples/mfc/occtdemo/LProps/LProps_Presentation.cpp
+++ b/samples/mfc/occtdemo/LProps/LProps_Presentation.cpp
@@ -145,7 +145,7 @@ void LProps_Presentation::sampleBezierSurface()
     sizeof(aPoints)/(sizeof(Standard_Real)*2), aPoints);
 }
 
-void LProps_Presentation::showCurveLProps (Handle_Geom_Curve theCurve,
+void LProps_Presentation::showCurveLProps (Handle(Geom_Curve) theCurve,
                                            const Standard_CString theName,
                                            const Standard_Integer theNbPoints,
                                            const Standard_Real thePoints[])
@@ -283,7 +283,7 @@ void LProps_Presentation::showCurveLProps (Handle_Geom_Curve theCurve,
   }
 }
 
-void LProps_Presentation::showSurfaceLProps (Handle_Geom_Surface theSurface,
+void LProps_Presentation::showSurfaceLProps (Handle(Geom_Surface) theSurface,
                                              const Standard_CString theName,
                                              const Standard_Integer theNbPoints,
                                              const Standard_Real thePoints[][2])
diff --git a/samples/mfc/occtdemo/LProps/LProps_Presentation.h b/samples/mfc/occtdemo/LProps/LProps_Presentation.h
index bbb281d033..b88575864f 100755
--- a/samples/mfc/occtdemo/LProps/LProps_Presentation.h
+++ b/samples/mfc/occtdemo/LProps/LProps_Presentation.h
@@ -31,13 +31,13 @@ private:
   void samplePBSpline();
   void sampleBezierSurface();
 
-  void showCurveLProps (Handle_Geom_Curve theCurve,
+  void showCurveLProps (Handle(Geom_Curve) theCurve,
     const Standard_CString theName,
     const Standard_Integer theNbPoints,
     const Standard_Real thePoints[]);
   // Draws the curve, shows local properties and updates the result dialog
 
-  void showSurfaceLProps (Handle_Geom_Surface theSurface,
+  void showSurfaceLProps (Handle(Geom_Surface) theSurface,
     const Standard_CString theName,
     const Standard_Integer theNbPoints,
     const Standard_Real thePoints[][2]);
diff --git a/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.cpp b/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.cpp
index 669ec43a58..74dce7d872 100755
--- a/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.cpp
+++ b/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.cpp
@@ -316,7 +316,7 @@ void Offset2d_Presentation::sampleWire2()
   drawAndOffsetWire (aWire, aName, aText);
 }
 
-void Offset2d_Presentation::drawAndOffsetCurve2d (Handle_Geom2d_Curve theCurve,
+void Offset2d_Presentation::drawAndOffsetCurve2d (Handle(Geom2d_Curve) theCurve,
                                                 const Standard_CString theName,
                                                 TCollection_AsciiString& theText)
 {
@@ -339,7 +339,7 @@ void Offset2d_Presentation::drawAndOffsetCurve2d (Handle_Geom2d_Curve theCurve,
   getViewer()->ActiveView()->Update();
 
   // Make offset curves
-  Handle_AIS_InteractiveObject aObj;
+  Handle(AIS_InteractiveObject) aObj;
   for (int i=1; i <= SampleDescrs[myIndex].nNeg; i++)
   {
     if (WAIT_A_LITTLE)
@@ -381,7 +381,7 @@ void Offset2d_Presentation::drawAndOffsetWire(const TopoDS_Wire& theWire,
   setResultText (theText.ToCString());
 
   // Display theWire
-  Handle_AIS_InteractiveObject aObj = new AIS_Shape (theWire);
+  Handle(AIS_InteractiveObject) aObj = new AIS_Shape (theWire);
   getAISContext()->SetColor (aObj, CurveColor);
   getAISContext()->Display (aObj);
   getViewer()->InitActiveViews();
diff --git a/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.h b/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.h
index 07d1349b87..eae0f7fb3e 100755
--- a/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.h
+++ b/samples/mfc/occtdemo/Offset2d/Offset2d_Presentation.h
@@ -36,7 +36,7 @@ private:
   void sampleWire1();
   void sampleWire2();
 
-  void drawAndOffsetCurve2d (Handle_Geom2d_Curve theCurve,
+  void drawAndOffsetCurve2d (Handle(Geom2d_Curve) theCurve,
     const Standard_CString theName,
     TCollection_AsciiString& theText);
   void drawAndOffsetWire (const TopoDS_Wire& theWire,
diff --git a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.cpp b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.cpp
index 8a3db940af..550c83f51c 100755
--- a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.cpp
+++ b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.cpp
@@ -78,7 +78,7 @@ void PointOnCurve_Presentation::DoSample()
 // Purpose  : creating a BSpline Curve 
 //================================================================
 
-static Handle_Geom_BSplineCurve CreateCurve()                     
+static Handle(Geom_BSplineCurve) CreateCurve()                     
 {
   Standard_Real aCoords[][3] = 
   {
@@ -196,7 +196,7 @@ void PointOnCurve_Presentation::sample1()
           gce_MakeLin aLin(aPoint1, aPoint2);
 
           Standard_Real aParam = aPoint1.Distance(aPoint2);
-          Handle_Geom_TrimmedCurve aSeg = new Geom_TrimmedCurve(new Geom_Line(aLin), 0, aParam);
+          Handle(Geom_TrimmedCurve) aSeg = new Geom_TrimmedCurve(new Geom_Line(aLin), 0, aParam);
           drawCurve(aSeg, Quantity_NOC_GREEN1);
         }
         if (WAIT_A_LITTLE) return;
diff --git a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.h b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.h
index 5a9bb8a7d6..e2fe31f7a9 100755
--- a/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.h
+++ b/samples/mfc/occtdemo/PointOnCurve/PointOnCurve_Presentation.h
@@ -10,7 +10,7 @@
 #endif // _MSC_VER > 1000
 
 #include <OCCDemo_Presentation.h>
-class Handle_Geom_Curve;
+class Geom_Curve;
 
 class PointOnCurve_Presentation : public OCCDemo_Presentation
 {
@@ -18,8 +18,8 @@ public:
   // Construction
   PointOnCurve_Presentation();
 private:
-  Handle_AIS_InteractiveObject PointOnCurve_Presentation::DrawCurve (
-             Handle_Geom_Curve theCurve, Quantity_NameOfColor theColor);
+  Handle(AIS_InteractiveObject) PointOnCurve_Presentation::DrawCurve (
+             Handle(Geom_Curve) theCurve, Quantity_NameOfColor theColor);
 
 public:
   // Iteration on samples
diff --git a/samples/mfc/occtdemo/Projection/Projection_Presentation.cpp b/samples/mfc/occtdemo/Projection/Projection_Presentation.cpp
index 3ca87dd7dd..2a211d7798 100755
--- a/samples/mfc/occtdemo/Projection/Projection_Presentation.cpp
+++ b/samples/mfc/occtdemo/Projection/Projection_Presentation.cpp
@@ -73,7 +73,7 @@ Projection_Presentation::Projection_Presentation()
 // Function : createCurve
 // Purpose  : returns a BSpline curve with 10 poles
 //================================================================
-static Handle_Geom_BSplineCurve createCurve()
+static Handle(Geom_BSplineCurve) createCurve()
 {
   Standard_Real aCoords[][3] = {{-6,3,0},{-5,1,0},{-4,0,0},{-2,1,0},{-1,-1,0},
                                 {0,-1,0},{1,0,0},{2,2,0},{3,1,0},{4,0,0}};
@@ -95,7 +95,7 @@ static Handle_Geom_BSplineCurve createCurve()
 // Function : createSurface
 // Purpose  : returns a BSpline Surface with 8 poles
 //================================================================
-static Handle_Geom_BSplineSurface createSurface()
+static Handle(Geom_BSplineSurface) createSurface()
 {
   // define points array
   TColgp_Array2OfPnt aPoints (1,2,1,4);
@@ -244,7 +244,7 @@ void Projection_Presentation::sample2()
     "  gp_Dir aDir(0,0,1);" EOL
     "  gp_Ax3 anAx3(aCenterPoint, aDir);" EOL
     "  Standard_Real Radius = 300;" EOL
-    "  Handle_Geom_CylindricalSurface aCylSurface =" EOL
+    "  Handle(Geom_CylindricalSurface) aCylSurface =" EOL
     "    new Geom_CylindricalSurface(anAx3, Radius);" EOL
     "" EOL
     "  // projection of a point onto a surface" EOL
@@ -277,7 +277,7 @@ void Projection_Presentation::sample2()
   gp_Dir aDir(0,0,1);
   gp_Ax3 anAx3(aCenterPoint, aDir);
   Standard_Real Radius = 300;
-  Handle_Geom_CylindricalSurface aCylSurface =
+  Handle(Geom_CylindricalSurface) aCylSurface =
     new Geom_CylindricalSurface(anAx3, Radius);
 
   // projection of a point onto a surface
@@ -314,7 +314,7 @@ void Projection_Presentation::sample2()
   if(WAIT_A_LITTLE) return;
 
   // output cylindrical surface
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed = 
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed = 
     new Geom_RectangularTrimmedSurface(aCylSurface,0,2*PI,-200,300,Standard_True,Standard_True);
   
   drawSurface(aCylTrimmed);
@@ -352,21 +352,21 @@ void Projection_Presentation::sample3()
     "  // define a planar surface" EOL
     "  gp_Pnt aPlanePnt(0,0,-100);" EOL
     "  gp_Dir aPlaneDir(0,0,1);" EOL
-    "  Handle_Geom_Plane aPlane = new Geom_Plane(aPlanePnt, aPlaneDir);" EOL
+    "  Handle(Geom_Plane) aPlane = new Geom_Plane(aPlanePnt, aPlaneDir);" EOL
     "" EOL
     "  // create a cylindrical surface" EOL
     "  gp_Pnt aCylPnt(-100,0,550);" EOL
     "  gp_Dir aCylDir(0,1,0);" EOL
     "  gp_Ax3 anAx3(aCylPnt, aCylDir);" EOL
     "  Standard_Real aRadius = 800;" EOL
-    "  Handle_Geom_CylindricalSurface aCylSurface = " EOL
+    "  Handle(Geom_CylindricalSurface) aCylSurface = " EOL
     "    new Geom_CylindricalSurface(anAx3, aRadius);" EOL
     "" EOL
     "  // Projection of a curve onto a planar surface" EOL
-    "  Handle_Geom_Curve aPlaneProjCurve = GeomProjLib::Project(aCurve, aPlane);" EOL
+    "  Handle(Geom_Curve) aPlaneProjCurve = GeomProjLib::Project(aCurve, aPlane);" EOL
     "" EOL
     "  // Projection of a curve onto a cylindrical surface" EOL
-    "  Handle_Geom_Curve aCylProjCurve = GeomProjLib::Project(aCurve, aCylSurface);" EOL
+    "  Handle(Geom_Curve) aCylProjCurve = GeomProjLib::Project(aCurve, aCylSurface);" EOL
   );
   
   // create BSpline curve
@@ -378,21 +378,21 @@ void Projection_Presentation::sample3()
   // define a planar surface
   gp_Pnt aPlanePnt(0,0,-100);
   gp_Dir aPlaneDir(0,0,1);
-  Handle_Geom_Plane aPlane = new Geom_Plane(aPlanePnt, aPlaneDir);
+  Handle(Geom_Plane) aPlane = new Geom_Plane(aPlanePnt, aPlaneDir);
 
   // create a cylindrical surface
   gp_Pnt aCylPnt(-100,0,550);
   gp_Dir aCylDir(0,1,0);
   gp_Ax3 anAx3(aCylPnt, aCylDir);
   Standard_Real aRadius = 800;
-  Handle_Geom_CylindricalSurface aCylSurface = 
+  Handle(Geom_CylindricalSurface) aCylSurface = 
     new Geom_CylindricalSurface(anAx3, aRadius);
 
   // Projection of a curve onto a planar surface
-  Handle_Geom_Curve aPlaneProjCurve = GeomProjLib::Project(aCurve, aPlane);
+  Handle(Geom_Curve) aPlaneProjCurve = GeomProjLib::Project(aCurve, aPlane);
 
   // Projection of a curve onto a cylindrical surface
-  Handle_Geom_Curve aCylProjCurve = GeomProjLib::Project(aCurve, aCylSurface);
+  Handle(Geom_Curve) aCylProjCurve = GeomProjLib::Project(aCurve, aCylSurface);
 
   // ===== output ===========
   // output original curve
@@ -417,7 +417,7 @@ void Projection_Presentation::sample3()
   getAISContext()->Erase(aProjCurveIO, Standard_False);
 
   // output the second surface - cylindrical surface
-  Handle_Geom_RectangularTrimmedSurface aCylTrimmed = 
+  Handle(Geom_RectangularTrimmedSurface) aCylTrimmed = 
    new Geom_RectangularTrimmedSurface(aCylSurface,PI/2,-PI/2,-450,550,Standard_True,Standard_True);
   Handle(AIS_InteractiveObject) aCylIO = drawSurface(
     aCylTrimmed, Quantity_Color(Quantity_NOC_YELLOW), Standard_False);
diff --git a/samples/mfc/occtdemo/Simplify/Simplify_Presentation.cpp b/samples/mfc/occtdemo/Simplify/Simplify_Presentation.cpp
index 321f531e4c..05e931d81f 100755
--- a/samples/mfc/occtdemo/Simplify/Simplify_Presentation.cpp
+++ b/samples/mfc/occtdemo/Simplify/Simplify_Presentation.cpp
@@ -98,7 +98,7 @@ void Simplify_Presentation::simplify(const TopoDS_Shape& aShape)
     "    TopLoc_Location aLocation;" EOL
     "" EOL
     "    // takes the triangulation of the face aFace" EOL
-    "    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL
+    "    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL
     "" EOL
     "    if(!aTr.IsNull())" EOL
     "    { " EOL
@@ -224,7 +224,7 @@ void Simplify_Presentation::simplify(const TopoDS_Shape& aShape)
     "  TopoDS_Face aFace;" EOL
     "  B.MakeFace(aFace, aSurf, Precision::Confusion());" EOL
     "  B.Add(aFace, aWire);" EOL
-    "  Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);" EOL
+    "  Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape(aFace);" EOL
     "  sfs->Perform();" EOL
     "  TopoDS_Shape aFixedFace = sfs->Shape();" EOL
     "  if (aFixedFace.IsNull()) " EOL
@@ -251,7 +251,7 @@ void Simplify_Presentation::simplify(const TopoDS_Shape& aShape)
     TopLoc_Location aLocation;
 
     // takes the triangulation of the face aFace
-    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);
+    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);
 
     if(!aTr.IsNull())
     { 
@@ -377,14 +377,14 @@ void Simplify_Presentation::simplify(const TopoDS_Shape& aShape)
   TopoDS_Face aFace;
   B.MakeFace(aFace, aSurf, Precision::Confusion());
   B.Add(aFace, aWire);
-  Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);
+  Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape(aFace);
   sfs->Perform();
   TopoDS_Shape aFixedFace = sfs->Shape();
   if (aFixedFace.IsNull()) 
     return;
 
   // output surface, make it half transparent
-  Handle_AIS_InteractiveObject aSurfIO = drawSurface(
+  Handle(AIS_InteractiveObject) aSurfIO = drawSurface(
     aSurf, Quantity_NOC_LEMONCHIFFON3, Standard_False);
   aSurfIO->SetTransparency(0.5);
   getAISContext()->Display(aSurfIO, Standard_False);
diff --git a/samples/mfc/occtdemo/Sweep/Sweep_Presentation.cpp b/samples/mfc/occtdemo/Sweep/Sweep_Presentation.cpp
index ff5db5328b..6b1676adc7 100755
--- a/samples/mfc/occtdemo/Sweep/Sweep_Presentation.cpp
+++ b/samples/mfc/occtdemo/Sweep/Sweep_Presentation.cpp
@@ -76,7 +76,7 @@ void Sweep_Presentation::DoSample()
 // Auxiliary functions
 //////////////////////////////////////////////////////////////////////
 
-static Handle_Geom_Curve mkBezierCurve(const Standard_Integer nPoles,
+static Handle(Geom_Curve) mkBezierCurve(const Standard_Integer nPoles,
                                  const Standard_Real theCoords[][3],
                                  const Standard_Real aScale = 1,
                                  const gp_XYZ& aShift = gp_XYZ(0,0,0))
@@ -90,7 +90,7 @@ static Handle_Geom_Curve mkBezierCurve(const Standard_Integer nPoles,
   return new Geom_BezierCurve (aPoles);
 }
 
-static Handle_Geom_Curve mkPBSplineCurve(const Standard_Integer nPoles,
+static Handle(Geom_Curve) mkPBSplineCurve(const Standard_Integer nPoles,
                                  const Standard_Real theCoords[][3],
                                  const Standard_Real aScale = 1,
                                  const gp_XYZ& aShift = gp_XYZ(0,0,0))
@@ -111,7 +111,7 @@ static Handle_Geom_Curve mkPBSplineCurve(const Standard_Integer nPoles,
   return new Geom_BSplineCurve (aPoles, aKnots, aMults, 3, Standard_True);
 }
 
-static Handle_Geom2d_Curve mk2dBezierCurve(const Standard_Integer nPoles,
+static Handle(Geom2d_Curve) mk2dBezierCurve(const Standard_Integer nPoles,
                                      const Standard_Real theCoords[][2],
                                      const Standard_Real aScale = 1,
                                      const gp_XY& aShift = gp_XY(0,0))
@@ -139,7 +139,7 @@ static TopoDS_Wire mkPolygonWire(const Standard_Integer nPoints,
   return aPol.Wire();
 }
 
-static Handle_Geom_Curve mkCurve1()
+static Handle(Geom_Curve) mkCurve1()
 {
   Standard_Real aCoords[][3] = {
     {0,0,0},{0,0,10},{0,10,10},{0,10,20}
@@ -148,7 +148,7 @@ static Handle_Geom_Curve mkCurve1()
   return mkBezierCurve (nPoles, aCoords);
 }
 
-static Handle_Geom_Curve mkCurve2()
+static Handle(Geom_Curve) mkCurve2()
 {
   Standard_Real aCoords[][3] = {
     {0,0,0},{10,0,0},{20,10,12},{25,30,20},{50,40,50}
@@ -157,7 +157,7 @@ static Handle_Geom_Curve mkCurve2()
   return mkBezierCurve (nPoles, aCoords);
 }
 
-static Handle_Geom_Curve mkCurve3()
+static Handle(Geom_Curve) mkCurve3()
 {
   Standard_Real aCoords[][3] = {
     {50,40,50},{70,30,30},{90,20,20},{100,50,0}
@@ -166,7 +166,7 @@ static Handle_Geom_Curve mkCurve3()
   return mkBezierCurve (nPoles, aCoords);
 }
 
-static Handle_Geom2d_Curve mk2dCurve1()
+static Handle(Geom2d_Curve) mk2dCurve1()
 {
   Standard_Real aCoords[][2] = {
     {0,0},{0.3,0},{0.1,0.5},{0.3,0.6},{0.6,0.5}
@@ -175,7 +175,7 @@ static Handle_Geom2d_Curve mk2dCurve1()
   return mk2dBezierCurve (nPoles, aCoords);
 }
 
-static Handle_Geom_Surface mkSurface1()
+static Handle(Geom_Surface) mkSurface1()
 {
   Standard_Real aCoords[3][3][3] = {
     {{-10,-10,-30},{-10,50,40},{-10,70,-20}},
@@ -292,9 +292,9 @@ static TopoDS_Wire mkWire9()
 }
 
 
-Handle_AIS_InteractiveObject Sweep_Presentation::drawCurveOnSurface 
-    (const Handle_Geom2d_Curve& aC2d,
-     const Handle_Geom_Surface& aSurf,
+Handle(AIS_InteractiveObject) Sweep_Presentation::drawCurveOnSurface 
+    (const Handle(Geom2d_Curve)& aC2d,
+     const Handle(Geom_Surface)& aSurf,
      const Quantity_Color& aColor)
 {
   Handle(Geom2dAdaptor_HCurve) aHC = new Geom2dAdaptor_HCurve(aC2d);
diff --git a/samples/mfc/occtdemo/Sweep/Sweep_Presentation.h b/samples/mfc/occtdemo/Sweep/Sweep_Presentation.h
index 349b3f1c93..8cf9c997af 100755
--- a/samples/mfc/occtdemo/Sweep/Sweep_Presentation.h
+++ b/samples/mfc/occtdemo/Sweep/Sweep_Presentation.h
@@ -10,8 +10,8 @@
 #endif // _MSC_VER > 1000
 
 #include <OCCDemo_Presentation.h>
-class Handle_Geom2d_Curve;
-class Handle_Geom_Surface;
+class Geom2d_Curve;
+class Geom_Surface;
 
 class Sweep_Presentation : public OCCDemo_Presentation
 {
@@ -24,9 +24,9 @@ public:
   virtual void DoSample();
   // one phase of iterations
 
-  Handle_AIS_InteractiveObject drawCurveOnSurface
-    (const Handle_Geom2d_Curve& aC2d,
-     const Handle_Geom_Surface& aSurf,
+  Handle(AIS_InteractiveObject) drawCurveOnSurface
+    (const Handle(Geom2d_Curve)& aC2d,
+     const Handle(Geom_Surface)& aSurf,
      const Quantity_Color& aColor);
 
 private:
diff --git a/samples/mfc/occtdemo/Tesselate/Tesselate_Presentation.cpp b/samples/mfc/occtdemo/Tesselate/Tesselate_Presentation.cpp
index 40c16ae241..dbb6eb931b 100755
--- a/samples/mfc/occtdemo/Tesselate/Tesselate_Presentation.cpp
+++ b/samples/mfc/occtdemo/Tesselate/Tesselate_Presentation.cpp
@@ -123,7 +123,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     "  TopLoc_Location aLocation;" EOL EOL
     
     "  // takes the triangulation of the face aFace:" EOL
-    "  Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL EOL
+    "  Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL EOL
     
     "  if(!aTr.IsNull()) // if this triangulation is not NULL" EOL
     "  { " EOL
@@ -161,7 +161,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     "    if(!aEdge.IsNull()) // if this edge is not NULL" EOL
     "    {" EOL
     "      // takes the polygon associated to the edge aEdge:" EOL
-    "      Handle_Poly_PolygonOnTriangulation aPol = " EOL
+    "      Handle(Poly_PolygonOnTriangulation) aPol = " EOL
     "        BRep_Tool::PolygonOnTriangulation(aEdge,aTr,aEdge.Location());" EOL EOL
     
     "      if(!aPol.IsNull()) // if this polygon is not NULL" EOL
@@ -197,7 +197,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
   Standard_Integer aNumOfNodes = 0;
   Standard_Integer aNumOfTriangles = 0;
   
-  Handle_AIS_InteractiveObject aShowEdge,aShowFace,aShowShape;
+  Handle(AIS_InteractiveObject) aShowEdge,aShowFace,aShowShape;
   
   TopExp_Explorer aExpFace,aExpEdge;
 
@@ -208,7 +208,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     TopoDS_Face aFace = TopoDS::Face(aExpFace.Current());
     TopLoc_Location aLocation;
 
-    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);
+    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);
 
     if(!aTr.IsNull())
     { 
@@ -232,7 +232,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
 
         if(!aEdge.IsNull())
         {
-          Handle_Poly_PolygonOnTriangulation aPol = 
+          Handle(Poly_PolygonOnTriangulation) aPol = 
             BRep_Tool::PolygonOnTriangulation(aEdge,aTr,aEdge.Location());
 
           if(!aPol.IsNull())
diff --git a/samples/mfc/occtdemo/Textures/Textures_Presentation.cpp b/samples/mfc/occtdemo/Textures/Textures_Presentation.cpp
index ccbbe01023..c43f9e1232 100755
--- a/samples/mfc/occtdemo/Textures/Textures_Presentation.cpp
+++ b/samples/mfc/occtdemo/Textures/Textures_Presentation.cpp
@@ -83,7 +83,7 @@ void Textures_Presentation::Init()
 {
   // initialize v3d_view so it displays textures well
   getViewer()->InitActiveViews();
-  Handle_V3d_View aView = getViewer()->ActiveView();
+  Handle(V3d_View) aView = getViewer()->ActiveView();
   aView->SetSurfaceDetail(V3d_TEX_ALL);
   aView->SetSize(ZVIEW_SIZE);
 
@@ -95,7 +95,7 @@ void Textures_Presentation::Init()
     "  // aShape = ..." EOL
     "" EOL
     "  // create a textured presentation object for aShape" EOL
-    "  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);" EOL
+    "  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);" EOL
     "" EOL
     "  TCollection_AsciiString aTFileName;" EOL
     "" EOL
@@ -142,12 +142,12 @@ void Textures_Presentation::Init()
 //================================================================
 void Textures_Presentation::lightsOnOff(Standard_Boolean isOn)
 {
-  static Handle_V3d_Light aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
-  static Handle_V3d_Light aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
-  static Handle_V3d_Light aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
-  static Handle_V3d_Light aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
-  static Handle_V3d_Light aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
-  static Handle_V3d_Light aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
+  static Handle(V3d_Light) aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
+  static Handle(V3d_Light) aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
+  static Handle(V3d_Light) aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
+  static Handle(V3d_Light) aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
+  static Handle(V3d_Light) aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
+  static Handle(V3d_Light) aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
 
   if (isOn)
   {
@@ -184,7 +184,7 @@ Standard_Boolean Textures_Presentation::displayTextured(const TopoDS_Shape& aSha
                                                         Standard_Integer nRepeat)
 {
   // create a textured presentation object for aShape
-  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);
+  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);
 
   // load texture from file if it is not an integer value
   // integer value indicates a number of texture in predefined textures enumeration
@@ -209,7 +209,7 @@ Standard_Boolean Textures_Presentation::displayTextured(const TopoDS_Shape& aSha
   {
     lightsOnOff(Standard_False);
 
-    Handle_AIS_Shape aAisShape = drawShape(aShape/*, Quantity_NOC_WHITE*/);
+    Handle(AIS_Shape) aAisShape = drawShape(aShape/*, Quantity_NOC_WHITE*/);
     if (WAIT_A_SECOND) return Standard_False;
     getAISContext()->Erase(aAisShape, Standard_False);
   }
@@ -391,7 +391,7 @@ void Textures_Presentation::samplePredefTexture2()
   Standard_Real aXStep = 250, aYStep = 250;
   Standard_Real aXBound = -450, aYBound = -300;
 
-  Handle_Geom_BSplineSurface aSurface = 
+  Handle(Geom_BSplineSurface) aSurface = 
     GeomAPI_PointsToBSplineSurface(aZPoints,aXBound,aXStep,aYBound,aYStep,3,8);
 
   TopoDS_Face aShape = BRepBuilderAPI_MakeFace(aSurface);
diff --git a/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.cpp b/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.cpp
index 9472ae57dd..d9dcf5504b 100755
--- a/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.cpp
+++ b/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.cpp
@@ -70,7 +70,7 @@ void TexturesExt_Presentation::Init()
 {
   // initialize v3d_view so it displays TexturesExt well
   getViewer()->InitActiveViews();
-  Handle_V3d_View aView = getViewer()->ActiveView();
+  Handle(V3d_View) aView = getViewer()->ActiveView();
   aView->SetSurfaceDetail(V3d_TEX_ALL);
   aView->SetSize(ZVIEW_SIZE);
 
@@ -82,7 +82,7 @@ void TexturesExt_Presentation::Init()
     "  // aShape = ..." EOL
     "" EOL
     "  // create a textured presentation object for aShape" EOL
-    "  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);" EOL
+    "  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);" EOL
     "" EOL
     "  TCollection_AsciiString aTFileName;" EOL
     "" EOL
@@ -124,7 +124,7 @@ void TexturesExt_Presentation::Init()
 // a predefined texture from Graphic3d_NameOfTexture2D with number = this value
 // is loaded.
 //================================================================
-Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
+Handle(AIS_TexturedShape) TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
                                                         TCollection_AsciiString aTFileName,
                                                         Standard_Real toScaleU,
                                                         Standard_Real toScaleV,
@@ -134,7 +134,7 @@ Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape&
                                                         Standard_Real originV)
 {
   // create a textured presentation object for aShape
-  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);
+  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);
 
   // load texture from file if it is not an integer value
   // integer value indicates a number of texture in predefined TexturesExt enumeration
@@ -190,12 +190,12 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
 //================================================================
 void TexturesExt_Presentation::lightsOnOff(Standard_Boolean isOn)
 {
-  static Handle_V3d_Light aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
-  static Handle_V3d_Light aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
-  static Handle_V3d_Light aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
-  static Handle_V3d_Light aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
-  static Handle_V3d_Light aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
-  static Handle_V3d_Light aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
+  static Handle(V3d_Light) aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
+  static Handle(V3d_Light) aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
+  static Handle(V3d_Light) aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
+  static Handle(V3d_Light) aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
+  static Handle(V3d_Light) aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
+  static Handle(V3d_Light) aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
 
   if (isOn)
   {
@@ -238,14 +238,14 @@ void TexturesExt_Presentation::sampleBottle()
   TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
 
   // display original shape in shaded display mode
-  Handle_AIS_Shape aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
+  Handle(AIS_Shape) aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(aShapeIO, AIS_Shaded, Standard_False);
   DISP(aShapeIO);
 
-  Handle_AIS_TexturedShape aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
+  Handle(AIS_TexturedShape) aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
   DISP(aTFace1);
 
-  Handle_AIS_TexturedShape aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
+  Handle(AIS_TexturedShape) aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
   DISP(aTFace2);
 
   getViewer()->Update();
@@ -267,7 +267,7 @@ void TexturesExt_Presentation::sampleTerrain()
   TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
 
 //  TopLoc_Location aLoc;
-//  Handle_Geom_Surface aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
+//  Handle(Geom_Surface) aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
 //  Standard_Real u1,u2,v1,v2;
 //  aSur->Bounds(u1,u2,v1,v2);
 //  gp_Pnt aPnt = aSur->Value(u1, v1);
diff --git a/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.h b/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.h
index 882d2ee08f..12c60462e3 100755
--- a/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.h
+++ b/samples/mfc/occtdemo/TexturesExt/TexturesExt_Presentation.h
@@ -12,7 +12,7 @@
 #include <OCCDemo_Presentation.h>
 class TopoDS_Shape;
 class TCollection_AsciiString;
-class Handle_AIS_TexturedShape;
+class AIS_TexturedShape;
 
 class TexturesExt_Presentation : public OCCDemo_Presentation
 {
@@ -32,7 +32,7 @@ private:
   // filename can also be an integer value ("2", "5", etc.), in this case
   // a predefined texture from Graphic3d_NameOfTexture2D with number = this value
   // is loaded.
-  Handle_AIS_TexturedShape Texturize(
+  Handle(AIS_TexturedShape) Texturize(
     const TopoDS_Shape& aShape, TCollection_AsciiString aTFileName, 
     Standard_Real toScaleU=1.0, Standard_Real toScaleV=1.0, 
     Standard_Real toRepeatU=1.0, Standard_Real toRepeatV=1.0,
diff --git a/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.cpp b/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.cpp
index cec0e65912..381ea4d9a7 100755
--- a/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.cpp
+++ b/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.cpp
@@ -77,7 +77,7 @@ void ThruSections_Presentation::DoSample()
 // purpose:
 //////////////////////////////////////////////////////////////////////
 
-static Handle_Geom_BSplineCurve CreateCurve(Standard_Real aCoords[][3],Standard_Integer nPoles)                     
+static Handle(Geom_BSplineCurve) CreateCurve(Standard_Real aCoords[][3],Standard_Integer nPoles)                     
 {
   TColgp_Array1OfPnt aCurvePoint (1, nPoles);
 
@@ -192,7 +192,7 @@ void ThruSections_Presentation::sample1()
 
 //====================================================================
 
-  Handle_AIS_InteractiveObject aShow1,aShow2,aShowWire;
+  Handle(AIS_InteractiveObject) aShow1,aShow2,aShowWire;
 
   // this data used for building a shape through sections:
   Standard_Boolean IsSolid,IsRuled;
@@ -374,7 +374,7 @@ void ThruSections_Presentation::sample2()
 
 //====================================================================
 
-  Handle_AIS_InteractiveObject aShow1,aShow2,aShowWire1,aShowWire2,aShowWire3;
+  Handle(AIS_InteractiveObject) aShow1,aShow2,aShowWire1,aShowWire2,aShowWire3;
 
   // this data used for building a shape through sections:
   const Standard_Boolean IsSolid = Standard_False;
@@ -403,8 +403,8 @@ void ThruSections_Presentation::sample2()
   Standard_Integer aSize3 = sizeof(aCoords3)/(sizeof(Standard_Real)*3);
 
   // creates curves:
-  Handle_Geom_BSplineCurve aCurve1 = CreateCurve(aCoords1,aSize1);
-  Handle_Geom_BSplineCurve aCurve2 = CreateCurve(aCoords2,aSize2);
+  Handle(Geom_BSplineCurve) aCurve1 = CreateCurve(aCoords1,aSize1);
+  Handle(Geom_BSplineCurve) aCurve2 = CreateCurve(aCoords2,aSize2);
 
   // creates wires based on the curves:
   TopoDS_Wire aW1 = BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(aCurve1));
diff --git a/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.h b/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.h
index d81ab0c82e..38416caa31 100755
--- a/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.h
+++ b/samples/mfc/occtdemo/ThruSections/ThruSections_Presentation.h
@@ -10,7 +10,7 @@
 #endif // _MSC_VER > 1000
 
 #include <OCCDemo_Presentation.h>
-class TopTools_SequenceOfShape;
+#include <TopTools_SequenceOfShape.hxx>
 //class TCollection_AsciiString;
 
 class ThruSections_Presentation : public OCCDemo_Presentation
diff --git a/samples/mfc/occtdemo/TopLProps/TopLProps_Presentation.cpp b/samples/mfc/occtdemo/TopLProps/TopLProps_Presentation.cpp
index dd39cc8036..bcd14d652f 100755
--- a/samples/mfc/occtdemo/TopLProps/TopLProps_Presentation.cpp
+++ b/samples/mfc/occtdemo/TopLProps/TopLProps_Presentation.cpp
@@ -126,10 +126,10 @@ static TopoDS_Shape CreateRevolShape()
 
   gp_Ax1 anAxis = gp_Ax1(gp_Pnt(0,0,0),gp::DY());
   GC_MakeSegment aSegment(gp_Pnt(0,-8*SCALE,0),gp_Pnt(0,-8*SCALE,2*SCALE));
-  Handle_Geom_TrimmedCurve aLine = aSegment.Value();
-  Handle_Geom_SurfaceOfRevolution aSurface1 = new Geom_SurfaceOfRevolution(aLine, anAxis);
-  Handle_Geom_SurfaceOfRevolution aSurface2 = new Geom_SurfaceOfRevolution(aCurve1, anAxis);
-  Handle_Geom_SurfaceOfRevolution aSurface3 = new Geom_SurfaceOfRevolution(aCurve2, anAxis);
+  Handle(Geom_TrimmedCurve) aLine = aSegment.Value();
+  Handle(Geom_SurfaceOfRevolution) aSurface1 = new Geom_SurfaceOfRevolution(aLine, anAxis);
+  Handle(Geom_SurfaceOfRevolution) aSurface2 = new Geom_SurfaceOfRevolution(aCurve1, anAxis);
+  Handle(Geom_SurfaceOfRevolution) aSurface3 = new Geom_SurfaceOfRevolution(aCurve2, anAxis);
   
   BRep_Builder aBuilder;
   TopoDS_Compound aShape;
@@ -214,10 +214,10 @@ static TopoDS_Shape CreateBSplnShape()
 
   GeomAPI_PointsToBSplineSurface aPTBS;
   aPTBS.Init(aZPoints1,aX0,aXStep,aY0,aYStep,3,10,GeomAbs_C3,0.3*SCALE);
-  Handle_Geom_BSplineSurface aSurface1 = aPTBS.Surface();
+  Handle(Geom_BSplineSurface) aSurface1 = aPTBS.Surface();
   
   aPTBS.Init(aZPoints2,aX0,aXStep,aY0,aYStep,3,10,GeomAbs_C3,0.3*SCALE);
-  Handle_Geom_BSplineSurface aSurface2 = aPTBS.Surface();
+  Handle(Geom_BSplineSurface) aSurface2 = aPTBS.Surface();
 
   TopoDS_Face aFace1,aFace2;
   aFace1 = BRepBuilderAPI_MakeFace (aSurface1);
@@ -251,7 +251,7 @@ void TopLProps_Presentation::sample1()
   if (aEdge.IsNull()) return;
   
   //show:
-  Handle_AIS_InteractiveObject aShowShape = drawShape(aShape);
+  Handle(AIS_InteractiveObject) aShowShape = drawShape(aShape);
   if(WAIT_A_SECOND) return;
   drawShape(aEdge,Quantity_NOC_RED);
   if(WAIT_A_SECOND) return;
@@ -281,9 +281,9 @@ void TopLProps_Presentation::sample2()
   if (aFace.IsNull()) return;
 
   //show:
-  Handle_AIS_InteractiveObject aShowShape = drawShape(aShape);
+  Handle(AIS_InteractiveObject) aShowShape = drawShape(aShape);
   if(WAIT_A_SECOND) return;
-  Handle_AIS_InteractiveObject aShowFace = drawShape(aFace,Graphic3d_NOM_BRASS,Standard_False);
+  Handle(AIS_InteractiveObject) aShowFace = drawShape(aFace,Graphic3d_NOM_BRASS,Standard_False);
   getAISContext()->SetDisplayMode(aShowFace,AIS_WireFrame);
   getAISContext()->Display(aShowFace);
   if(WAIT_A_SECOND) return;
@@ -324,7 +324,7 @@ void TopLProps_Presentation::sample3()
   Standard_Integer aNbPoints = sizeof(aPoints)/sizeof(Standard_Real);
 
   //show:
-  Handle_AIS_InteractiveObject aShowShape = drawShape(aShape);
+  Handle(AIS_InteractiveObject) aShowShape = drawShape(aShape);
   if(WAIT_A_SECOND) return;
 
   drawShape(aEdge,Quantity_NOC_RED);
@@ -367,9 +367,9 @@ void TopLProps_Presentation::sample4()
   Standard_Integer aNbPoints = sizeof(aPoints)/(sizeof(Standard_Real)*2);
 
   //show:
-  Handle_AIS_InteractiveObject aShowShape = drawShape(aShape);
+  Handle(AIS_InteractiveObject) aShowShape = drawShape(aShape);
   if(WAIT_A_SECOND) return;
-  Handle_AIS_InteractiveObject aShowFace = drawShape(aFace,Graphic3d_NOM_BRASS,Standard_False);
+  Handle(AIS_InteractiveObject) aShowFace = drawShape(aFace,Graphic3d_NOM_BRASS,Standard_False);
   getAISContext()->SetDisplayMode(aShowFace,AIS_WireFrame);
   getAISContext()->Display(aShowFace);
   if(WAIT_A_SECOND) return;
@@ -439,7 +439,7 @@ void TopLProps_Presentation::showEdgeLProps(TopoDS_Edge& theEdge,
   setResultText (aText.ToCString());
 
   BRepAdaptor_Curve anAdapCurve (theEdge) ;
-  Handle_AIS_InteractiveObject aObjs[7];
+  Handle(AIS_InteractiveObject) aObjs[7];
   Standard_Integer maxOrder = 3;
   Standard_Real aResol = gp::Resolution();
   BRepLProp_CLProps aLProps (anAdapCurve,maxOrder,aResol);
diff --git a/samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.hxx b/samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.hxx
index 11de70ac81..16d57a2d63 100755
--- a/samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.hxx
+++ b/samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.hxx
@@ -44,18 +44,18 @@ public:
   Standard_EXPORT GeoAlgo_Sol(const Standard_CString aGroundName);
   Standard_EXPORT void Build(const Standard_CString aGroundName) ;
   Standard_EXPORT void Build(const TColgp_SequenceOfXYZ& aSeqofPoints) ;
-  Standard_EXPORT Handle_Geom_BSplineSurface Surface() const;
+  Standard_EXPORT Handle(Geom_BSplineSurface) Surface() const;
   Standard_EXPORT Standard_Boolean IsDone() const;
 
 private: 
 
  // Methods PRIVATE
  // 
-Standard_EXPORT   Handle_Geom_BSplineSurface Read(const Standard_CString aGroundName) ;
+Standard_EXPORT   Handle(Geom_BSplineSurface) Read(const Standard_CString aGroundName) ;
 
  // Fields PRIVATE
  //
-Handle_Geom_BSplineSurface myGround;
+Handle(Geom_BSplineSurface) myGround;
 Standard_Boolean myIsDone;
 
 };
diff --git a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
index 715a76636a..8d4514d9a9 100755
--- a/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
+++ b/samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
@@ -1119,7 +1119,7 @@ void CGeometryDoc::OnCreateSol()
       TopoDS_Face aface = BRepBuilderAPI_MakeFace(GeomSol, Precision::Confusion());
       if (!BRepAlgo::IsValid(aface))
         MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate surface is not valid!", L"CasCade Error", MB_ICONERROR);
-      Handle_AIS_Shape anAISShape=new AIS_Shape(aface);
+      Handle(AIS_Shape) anAISShape=new AIS_Shape(aface);
       myAISContext->Display(anAISShape, Standard_False);
       Fit();
     }   
@@ -1211,7 +1211,7 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
     "    TopLoc_Location aLocation;\n"
     "\n"
     "    // takes the triangulation of the face aFace\n"
-    "    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);\n"
+    "    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);\n"
     "\n"
     "    if(!aTr.IsNull())\n"
     "    { \n"
@@ -1337,7 +1337,7 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
     "  TopoDS_Face aFace;\n"
     "  B.MakeFace(aFace, aSurf, Precision::Confusion());\n"
     "  B.Add(aFace, aWire);\n"
-    "  Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);\n"
+    "  Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape(aFace);\n"
     "  sfs->Perform();\n"
     "  TopoDS_Shape aFixedFace = sfs->Shape();\n"
     "  if (aFixedFace.IsNull()) \n"
@@ -1364,7 +1364,7 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
       TopLoc_Location aLocation;
 
       // takes the triangulation of the face aFace
-      Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);
+      Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);
 
       if(!aTr.IsNull())
       { 
@@ -1492,14 +1492,14 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
     TopoDS_Face aFace;
     B.MakeFace(aFace, aSurf, Precision::Confusion());
     B.Add(aFace, aWire);
-    Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);
+    Handle(ShapeFix_Shape) sfs = new ShapeFix_Shape(aFace);
     sfs->Perform();
     TopoDS_Shape aFixedFace = sfs->Shape();
     if (aFixedFace.IsNull()) 
       return;
 
     // output surface, make it half transparent
-    Handle_AIS_InteractiveObject aSurfIO = drawSurface(
+    Handle(AIS_InteractiveObject) aSurfIO = drawSurface(
       aSurf, Quantity_NOC_LEMONCHIFFON3, Standard_False);
     aSurfIO->SetTransparency(0.5);
     myAISContext->Display(aSurfIO,Standard_False);
@@ -1517,8 +1517,8 @@ void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
     drawShape(aFixedFace);
 }
 
-Handle_AIS_InteractiveObject CGeometryDoc::drawSurface
-                                  (const Handle_Geom_Surface& theSurface,
+Handle(AIS_InteractiveObject) CGeometryDoc::drawSurface
+                                  (const Handle(Geom_Surface)& theSurface,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -1529,7 +1529,7 @@ Handle_AIS_InteractiveObject CGeometryDoc::drawSurface
   fixParam(v1);
   fixParam(v2);
 
-  Handle_AIS_Shape aGraphicSurface = 
+  Handle(AIS_Shape) aGraphicSurface = 
     new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2, Precision::Confusion()));
 
   myAISContext->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -1569,7 +1569,7 @@ Standard_Boolean CGeometryDoc::WaitForInput (unsigned long aMilliSeconds)
   return Standard_False;
 }
 
-Handle_AIS_Point CGeometryDoc::drawPoint
+Handle(AIS_Point) CGeometryDoc::drawPoint
                                   (const gp_Pnt& aPnt,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
@@ -1586,12 +1586,12 @@ Handle_AIS_Point CGeometryDoc::drawPoint
   return aGraphicPoint;
 }
 
-Handle_AIS_Shape CGeometryDoc::drawShape
+Handle(AIS_Shape) CGeometryDoc::drawShape
          (const TopoDS_Shape& theShape,
           const Graphic3d_NameOfMaterial theMaterial,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   myAISContext->SetMaterial(aGraphicShape, theMaterial, toDisplay);
   if (toDisplay)
diff --git a/samples/mfc/standard/01_Geometry/src/GeometryDoc.h b/samples/mfc/standard/01_Geometry/src/GeometryDoc.h
index 3d19cc75ee..d2f2a7f64c 100755
--- a/samples/mfc/standard/01_Geometry/src/GeometryDoc.h
+++ b/samples/mfc/standard/01_Geometry/src/GeometryDoc.h
@@ -30,26 +30,26 @@ public:
   void DragEvent2D       (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
                           const Standard_Integer  TheState,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void InputEvent2D      (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void MoveEvent2D       (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void ShiftMoveEvent2D  (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void ShiftDragEvent2D  (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
                           const Standard_Integer  TheState,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void ShiftInputEvent2D (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
   void Popup2D           (const Standard_Integer  x       ,
                           const Standard_Integer  y       ,
-                          const Handle_V3d_View& aView   );
+                          const Handle(V3d_View)& aView   );
 
   //-------------------- 3D -------------------//
 
@@ -61,21 +61,21 @@ public:
                           const Standard_Integer theMouseY,
                           const Handle(V3d_View)& theView);
 
-  Handle_AIS_InteractiveObject drawSurface
-    (const Handle_Geom_Surface& theSurface,
+  Handle(AIS_InteractiveObject) drawSurface
+    (const Handle(Geom_Surface)& theSurface,
     const Quantity_Color& theColor,
     const Standard_Boolean toDisplay);
 
   Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
   // Waits for a user input or a period of time has been elapsed
 
-  Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
+  Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
                               const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
                               const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given point
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
                               const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
                               const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape with the given material
@@ -224,16 +224,16 @@ public:
   int Current;
   void Minimize3D();
   void Minimize2D();
-  Handle_V3d_Viewer GetViewer2D() { return myViewer2D; };
-  Handle_AIS_InteractiveContext& GetISessionContext() { return myAISContext2D; };
+  Handle(V3d_Viewer) GetViewer2D() { return myViewer2D; };
+  Handle(AIS_InteractiveContext)& GetISessionContext() { return myAISContext2D; };
   BOOL FitMode;
 
 public:
   CResultDialog myCResultDialog;
 
 private:
-  Handle_V3d_Viewer myViewer2D;
-  Handle_AIS_InteractiveContext myAISContext2D;
+  Handle(V3d_Viewer) myViewer2D;
+  Handle(AIS_InteractiveContext) myAISContext2D;
 
 
 };
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
index 853f5cb1b6..5f8bd1e5af 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
@@ -8,11 +8,10 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession2D_Curve,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
 
 
-ISession2D_Curve::ISession2D_Curve(const Handle_Geom2d_Curve aGeom2dCurve,
+ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve,
                                    const Aspect_TypeOfLine aTypeOfLine,
                                    const Aspect_WidthOfLine aWidthOfLine,
                                    const Standard_Integer aColorIndex)
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
index 6db825d481..6fee7daa61 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
@@ -15,7 +15,7 @@
 #include <Standard_IStream.hxx>
 #include <Standard_CString.hxx>
 
-class TColGeom2d_HSequenceOfCurve;
+#include <TColGeom2d_HSequenceOfCurve.hxx>
 class PrsMgr_PresentationManager2d;
 class Graphic2d_GraphicObject;
 class SelectMgr_Selection;
@@ -33,7 +33,7 @@ public:
   // 
 
   ISession2D_Curve
-    (const Handle_Geom2d_Curve aGeom2dCurve,
+    (const Handle(Geom2d_Curve) aGeom2dCurve,
     const Aspect_TypeOfLine aTypeOfline = Aspect_TOL_SOLID,
     const Aspect_WidthOfLine aWidthOfLine = Aspect_WOL_MEDIUM,
     const Standard_Integer aColorIndex = 4);
@@ -59,7 +59,7 @@ public:
   inline   Standard_Real GetDiscretisation() const;
   inline   void SetDiscretisation(const Standard_Real aNewDiscretisation) ;
 
-  DEFINE_STANDARD_RTTI(ISession2D_Curve,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
 
 private: 
 
@@ -70,7 +70,7 @@ private:
 
   // Fields PRIVATE
   //
-  Handle_Geom2d_Curve myGeom2dCurve;
+  Handle(Geom2d_Curve) myGeom2dCurve;
   Aspect_TypeOfLine   myTypeOfLine;
   Aspect_WidthOfLine  myWidthOfLine;
   Standard_Integer    myColorIndex;
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
index 1a25812aa9..cd4d879469 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
@@ -7,7 +7,6 @@
 #include "ISession_Curve.h"
 #include <StdPrs_PoleCurve.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 
 #ifdef _DEBUG
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
index 2d3b7ff183..0c95380a25 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
@@ -20,7 +20,7 @@ public:
   ISession_Curve(Handle(Geom_Curve)& aCurve);
   virtual ~ISession_Curve();
 
-  DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 
 private:
 
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
index fe4c5403b3..94b21f1d95 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
@@ -13,7 +13,6 @@
 static char THIS_FILE[]=__FILE__;
 #endif
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Direction,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
 
 //////////////////////////////////////////////////////////////////////
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
index 21689f0687..f31bc9d790 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
@@ -26,7 +26,7 @@ public:
   ISession_Direction (const gp_Pnt2d& aPnt2d,const gp_Vec2d& aVec2d);
 
   virtual ~ISession_Direction();
-  DEFINE_STANDARD_RTTI(ISession_Direction,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
 
 private:
 
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
index d533b9cac8..4464c6652e 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
@@ -12,7 +12,7 @@
 static char THIS_FILE[]=__FILE__;
 //#define new DEBUG_NEW
 #endif
-IMPLEMENT_STANDARD_HANDLE(ISession_Point,AIS_InteractiveObject)
+
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Point,AIS_InteractiveObject)
 
 //////////////////////////////////////////////////////////////////////
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
index f192687729..f12831a0ee 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
@@ -22,7 +22,7 @@ public:
   ISession_Point(const gp_Pnt2d& aPoint,Standard_Real Elevation = 0);
   ISession_Point(const gp_Pnt& aPoint);
   virtual ~ISession_Point();
-  DEFINE_STANDARD_RTTI(ISession_Point,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession_Point,AIS_InteractiveObject)
 
 private :
 
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
index 2c4a106340..73eb1da913 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
@@ -15,7 +15,7 @@
 static char THIS_FILE[]=__FILE__;
 //#define new DEBUG_NEW
 #endif
-IMPLEMENT_STANDARD_HANDLE(ISession_Surface,AIS_InteractiveObject)
+
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
 
 //////////////////////////////////////////////////////////////////////
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
index 858a05df83..4cab1ba9fb 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
@@ -20,7 +20,7 @@ public:
 	ISession_Surface(Handle(Geom_Surface)& aSurface);
 	virtual ~ISession_Surface();
 
-DEFINE_STANDARD_RTTI(ISession_Surface,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
index 80cfbfc527..f12e597dd2 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
@@ -11,7 +11,7 @@
 static char THIS_FILE[]=__FILE__;
 //#define new DEBUG_NEW
 #endif
-IMPLEMENT_STANDARD_HANDLE(ISession_Text,AIS_InteractiveObject)
+
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
 
 //////////////////////////////////////////////////////////////////////
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h
index e5065b49ac..aa8fc5956a 100755
--- a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h
+++ b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h
@@ -69,7 +69,7 @@ inline   Quantity_Factor         GetScale() const;
 inline   void                    SetScale  (const Quantity_Factor aNewScale) ;
 
 
-DEFINE_STANDARD_RTTI(ISession_Text,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
 
 private: 
 
diff --git a/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp b/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp
index 97a5c53709..6743c63f92 100755
--- a/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp
+++ b/samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp
@@ -10,7 +10,6 @@
 static char THIS_FILE[]=__FILE__;
 #endif
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Direction,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
 
 #include "DsgPrs_LengthPresentation.hxx"
diff --git a/samples/mfc/standard/02_Modeling/src/ISession_Direction.h b/samples/mfc/standard/02_Modeling/src/ISession_Direction.h
index 7142009bbb..00e13efcaa 100755
--- a/samples/mfc/standard/02_Modeling/src/ISession_Direction.h
+++ b/samples/mfc/standard/02_Modeling/src/ISession_Direction.h
@@ -24,7 +24,7 @@ public:
     ISession_Direction(const gp_Pnt& aPnt,const gp_Pnt& aPnt2);
     ISession_Direction(const gp_Pnt& aPnt,const gp_Vec& aVec);
 
-  DEFINE_STANDARD_RTTI(ISession_Direction,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
 
 private:
 
diff --git a/samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp b/samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
index a6d03bd10e..9932bf0b68 100755
--- a/samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
+++ b/samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
@@ -4721,7 +4721,7 @@ void CModelingDoc::OnStopStop()
 			MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate face is not valid!", L"CasCade Error", MB_ICONERROR);
 		myAISContext->CloseLocalContext();
 		myState = -1;
-		Handle_AIS_Shape anAISShape = new AIS_Shape(aface);
+		Handle(AIS_Shape) anAISShape = new AIS_Shape(aface);
 		myAISContext->SetColor(anAISShape,Quantity_NOC_AZURE); 
 		myAISContext->SetMaterial(anAISShape,Graphic3d_NOM_SILVER);                                  
         myAISContext->SetDisplayMode(anAISShape,1);                                    
@@ -5017,7 +5017,7 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
 					MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate surface is not valid!!!", L"CasCade Error", MB_ICONERROR);
 			}
 
-			Handle_AIS_Shape anAISShape=new AIS_Shape(theFace);
+			Handle(AIS_Shape) anAISShape=new AIS_Shape(theFace);
 			myAISContext->SetColor(anAISShape,Quantity_NOC_BLUE1); 
 			myAISContext->SetMaterial(anAISShape,Graphic3d_NOM_SILVER);                                  
 			myAISContext->SetDisplayMode(anAISShape,1);                     
diff --git a/samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp b/samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
index 6a72e7f757..bc7165925c 100755
--- a/samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
+++ b/samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
@@ -195,7 +195,7 @@ void CViewer2dDoc::OnBUTTONTestLine()
       TopoDS_Edge E4 = BRepBuilderAPI_MakeEdge(gp_Pnt(10*i,10*j+5,0.), gp_Pnt(10*i,10*j,0.));
       TopoDS_Wire W = BRepBuilderAPI_MakeWire(E1,E2,E3,E4);
       TopoDS_Face F = BRepBuilderAPI_MakeFace(W);
-      Handle_AIS_Shape aRect = new AIS_Shape(F);
+      Handle(AIS_Shape) aRect = new AIS_Shape(F);
       //set attributes of boundaries
       Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer();
       Handle(Prs3d_LineAspect) aLineAttrib = 
@@ -280,7 +280,7 @@ void CViewer2dDoc::OnBUTTONTestRect()
 	TopoDS_Edge E13 = BRepBuilderAPI_MakeEdge(gp_Pnt(42.5,93.,0.), gp_Pnt(0.,68.,0.));
   TopoDS_Edge E14 = BRepBuilderAPI_MakeEdge(gp_Pnt(0.,68.,0.), gp_Pnt(40.,0.,0.));
 	TopoDS_Wire W1 = BRepBuilderAPI_MakeWire(E11,E12,E13,E14);
-  Handle_AIS_Shape aRect1 = new AIS_Shape(W1); 
+  Handle(AIS_Shape) aRect1 = new AIS_Shape(W1); 
   myAISContext->Display(aRect1);
   myAISContext->SetColor(aRect1,Quantity_NOC_YELLOW);
   
@@ -290,7 +290,7 @@ void CViewer2dDoc::OnBUTTONTestRect()
 	TopoDS_Edge E23 = BRepBuilderAPI_MakeEdge(gp_Pnt(112.5,93.,0.), gp_Pnt(70.,68.,0.));
   TopoDS_Edge E24 = BRepBuilderAPI_MakeEdge(gp_Pnt(70.,68.,0.), gp_Pnt(110.,0.,0.));
 	TopoDS_Wire W2 = BRepBuilderAPI_MakeWire(E21,E22,E23,E24);
-  Handle_AIS_Shape aRect2 = new AIS_Shape(W2); 
+  Handle(AIS_Shape) aRect2 = new AIS_Shape(W2); 
   myAISContext->Display(aRect2);
   myAISContext->SetColor(aRect2,Quantity_NOC_YELLOW);
   myAISContext->Activate(aRect2,2);
diff --git a/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.cpp b/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.cpp
index 35fa44a021..3c527fd5dd 100755
--- a/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.cpp
@@ -76,7 +76,7 @@ END_MESSAGE_MAP()
 
 void DlgAttributes::OnColor() 
 {
-	Handle_AIS_InteractiveObject Current ;
+	Handle(AIS_InteractiveObject) Current ;
 	Quantity_Color CSFColor ;
 	COLORREF MSColor ;
 
diff --git a/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.h b/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.h
index 4ff3a247a6..8d8669325c 100755
--- a/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.h
+++ b/samples/mfc/standard/04_Viewer3d/src/DlgAttributes.h
@@ -73,7 +73,7 @@ protected:
 	void SetMaterial (Graphic3d_NameOfMaterial Material);
 
 private:
-	Handle_AIS_InteractiveContext myAISContext;
+	Handle(AIS_InteractiveContext) myAISContext;
 	CResultDialog* myCResultDialog;
 };
 
diff --git a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
index 97a4326955..839a7a7aee 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
@@ -10,7 +10,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 
 #ifdef _DEBUG
diff --git a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h
index b89cba6b68..fa99e1e5ae 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h
+++ b/samples/mfc/standard/04_Viewer3d/src/ISession_Curve.h
@@ -20,7 +20,7 @@ class ISession_Curve : public AIS_InteractiveObject
 public:
 	ISession_Curve(const Handle(Geom_Curve)& aCurve);
 	virtual ~ISession_Curve();
-DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
diff --git a/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.cpp b/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.cpp
index 0abe4a7000..86e49efdfc 100755
--- a/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.cpp
@@ -77,8 +77,8 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
 // Purpose  : displays a given geometric surface in 3d viewer
 //            (creates a finite face and displays it)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
-                                  (const Handle_Geom_Surface& theSurface,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawSurface
+                                  (const Handle(Geom_Surface)& theSurface,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -89,7 +89,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
   fixParam(v1);
   fixParam(v2);
 
-  Handle_AIS_Shape aGraphicSurface = 
+  Handle(AIS_Shape) aGraphicSurface = 
     new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2, Precision::Confusion()));
 
   getAISContext()->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -110,8 +110,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 3d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -135,8 +135,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 2d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom2d_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom2d_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay,
                                    const gp_Ax2& aPosition)
@@ -163,7 +163,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : drawPoint
 // Purpose  : displays a given point
 //================================================================
-Handle_AIS_Point OCCDemo_Presentation::drawPoint
+Handle(AIS_Point) OCCDemo_Presentation::drawPoint
                                   (const gp_Pnt& aPnt,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
@@ -185,7 +185,7 @@ Handle_AIS_Point OCCDemo_Presentation::drawPoint
 //            (segment of line starting at thePnt with the arrow at the end,
 //             the length of segment is the length of the vector)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector 
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawVector 
                                   (const gp_Pnt& thePnt,
                                    const gp_Vec& theVec,
                                    const Quantity_Color& theColor,
@@ -217,11 +217,11 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
 }
 
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape 
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape 
          (const TopoDS_Shape& theShape,const Quantity_Color& theColor,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, Graphic3d_NOM_PLASTIC, toDisplay);
   getAISContext()->SetColor (aGraphicShape, theColor, toDisplay);
@@ -237,12 +237,12 @@ Handle_AIS_Shape OCCDemo_Presentation::drawShape
   return aGraphicShape;
 }
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape
          (const TopoDS_Shape& theShape,
           const Graphic3d_NameOfMaterial theMaterial,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, theMaterial, toDisplay);
   if (toDisplay) {
@@ -313,12 +313,12 @@ void OCCDemo_Presentation::ResetView()
 	pView->Reset();
 }
 
-Handle_AIS_InteractiveContext OCCDemo_Presentation::getAISContext() const 
+Handle(AIS_InteractiveContext) OCCDemo_Presentation::getAISContext() const 
 {
 	return myDoc->GetAISContext();
 }
 
-Handle_V3d_Viewer OCCDemo_Presentation::getViewer() const
+Handle(V3d_Viewer) OCCDemo_Presentation::getViewer() const
 {
 	return myDoc->GetViewer();
 }
diff --git a/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.h b/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.h
index 0ea90bd6b3..d1ffb0a166 100755
--- a/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.h
+++ b/samples/mfc/standard/04_Viewer3d/src/OCCDemo_Presentation.h
@@ -66,8 +66,8 @@ public:
 protected:
   // Methods to call from a derivable class
   void setName (const char* theName) {myName = CString(theName);}
-  Handle_AIS_InteractiveContext getAISContext() const;
-  Handle_V3d_Viewer getViewer() const;
+  Handle(AIS_InteractiveContext) getAISContext() const;
+  Handle(V3d_Viewer) getViewer() const;
 //  void setResultTitle (const char* theTitle) {myDoc->GetResultDialog()->SetTitle(theTitle);}
 //  void setResultText (const char* theText) {myDoc->GetResultDialog()->SetText(theText);}
   Standard_CString GetDataDir();
@@ -75,45 +75,45 @@ protected:
   Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
   // Waits for a user input or a period of time has been elapsed
 
-  Handle_AIS_InteractiveObject drawSurface (const Handle_Geom_Surface& theSurface,
+  Handle(AIS_InteractiveObject) drawSurface (const Handle(Geom_Surface)& theSurface,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_LEMONCHIFFON3),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a finite face based on the given geometric surface 
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True);
   // creates an ISession_Curve based on the given geometric curve
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom2d_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom2d_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True,
          const gp_Ax2& aPosition = gp::XOY());
   // converts a given curve to 3d using aPosition and calls the previous method
 
-  Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
+  Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given point
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawVector (const gp_Pnt& thePnt,
+  Handle(AIS_InteractiveObject) drawVector (const gp_Pnt& thePnt,
                                            const gp_Vec& theVec,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_YELLOW),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given vector
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Quantity_Color& theColor,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape
   // with material PLASTIC and a given color
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape with the given material
diff --git a/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.cpp
index 939093ada4..65d39f2c14 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.cpp
@@ -14,7 +14,7 @@ static char THIS_FILE[] = __FILE__;
 // ScaleDlg dialog
 
 
-ScaleDlg::ScaleDlg(Handle_V3d_View Current_V3d_View, CViewer3dView* pView, CWnd* pParent /*=NULL*/)
+ScaleDlg::ScaleDlg(Handle(V3d_View) Current_V3d_View, CViewer3dView* pView, CWnd* pParent /*=NULL*/)
 	: CDialog(ScaleDlg::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(ScaleDlg)
diff --git a/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.h b/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.h
index 652dfef0e4..2353a9ff92 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.h
+++ b/samples/mfc/standard/04_Viewer3d/src/ScaleDlg.h
@@ -17,7 +17,7 @@ class ScaleDlg : public CDialog
 {
 // Construction
 public:
-	ScaleDlg(Handle_V3d_View Current_V3d_View, CViewer3dView* pView, CWnd* pParent = NULL); 
+	ScaleDlg(Handle(V3d_View) Current_V3d_View, CViewer3dView* pView, CWnd* pParent = NULL); 
 
 // Dialog Data
 	//{{AFX_DATA(ScaleDlg)
@@ -53,7 +53,7 @@ protected:
 
 private:
 
-	Handle_V3d_View myCurrent_V3d_View;
+	Handle(V3d_View) myCurrent_V3d_View;
 	CViewer3dView* myView;
 };
 
diff --git a/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.cpp
index c053f450d8..77ecb4860e 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.cpp
@@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
 // CShadingModelDlg dialog
 
 
-CShadingModelDlg::CShadingModelDlg(Handle_V3d_View Current_V3d_View, CWnd* pParent /*=NULL*/)
+CShadingModelDlg::CShadingModelDlg(Handle(V3d_View) Current_V3d_View, CWnd* pParent /*=NULL*/)
 	: CDialog(CShadingModelDlg::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(CShadingModelDlg)
diff --git a/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.h b/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.h
index 48b6e87d0f..30f38ab23e 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.h
+++ b/samples/mfc/standard/04_Viewer3d/src/ShadingModelDlg.h
@@ -16,7 +16,7 @@ class CShadingModelDlg : public CDialog
 {
 // Construction
 public:
-	CShadingModelDlg(Handle_V3d_View Current_V3d_View, CWnd* pParent = NULL);   // standard constructor
+	CShadingModelDlg(Handle(V3d_View) Current_V3d_View, CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
 	//{{AFX_DATA(CShadingModelDlg)
@@ -44,7 +44,7 @@ protected:
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
-	Handle_V3d_View	myCurrent_V3d_View;
+	Handle(V3d_View)	myCurrent_V3d_View;
 };
 
 //{{AFX_INSERT_LOCATION}}
diff --git a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
index a04536a347..cf8c5721b8 100755
--- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
@@ -69,7 +69,7 @@ void TexturesExt_Presentation::Init()
 {
   // initialize v3d_view so it displays TexturesExt well
   getViewer()->InitActiveViews();
-  Handle_V3d_View aView = getViewer()->ActiveView();
+  Handle(V3d_View) aView = getViewer()->ActiveView();
   aView->SetSurfaceDetail(V3d_TEX_ALL);
   aView->SetSize(ZVIEW_SIZE);
 
@@ -81,7 +81,7 @@ void TexturesExt_Presentation::Init()
     "  // aShape = ..." EOL
     "" EOL
     "  // create a textured presentation object for aShape" EOL
-    "  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);" EOL
+    "  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);" EOL
     "" EOL
     "  TCollection_AsciiString aTFileName;" EOL
     "" EOL
@@ -127,7 +127,7 @@ void TexturesExt_Presentation::Init()
 // a predefined texture from Graphic3d_NameOfTexture2D with number = this value
 // is loaded.
 //================================================================
-Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
+Handle(AIS_TexturedShape) TexturesExt_Presentation::Texturize(const TopoDS_Shape& aShape,
                                                         TCollection_AsciiString aTFileName,
                                                         Standard_Real toScaleU,
                                                         Standard_Real toScaleV,
@@ -137,7 +137,7 @@ Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape&
                                                         Standard_Real originV)
 {
   // create a textured presentation object for aShape
-  Handle_AIS_TexturedShape aTShape = new AIS_TexturedShape(aShape);
+  Handle(AIS_TexturedShape) aTShape = new AIS_TexturedShape(aShape);
   TCollection_AsciiString TFileName;
   // load texture from file if it is not an integer value
   // integer value indicates a number of texture in predefined TexturesExt enumeration
@@ -204,12 +204,12 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
 //================================================================
 void TexturesExt_Presentation::lightsOnOff(Standard_Boolean isOn)
 {
-  static Handle_V3d_Light aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
-  static Handle_V3d_Light aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
-  static Handle_V3d_Light aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
-  static Handle_V3d_Light aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
-  static Handle_V3d_Light aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
-  static Handle_V3d_Light aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
+  static Handle(V3d_Light) aLight1 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZneg);
+  static Handle(V3d_Light) aLight2 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZpos);
+  static Handle(V3d_Light) aLight3 = new V3d_DirectionalLight(getViewer(), V3d_XposYnegZpos);
+  static Handle(V3d_Light) aLight4 = new V3d_DirectionalLight(getViewer(), V3d_XnegYnegZneg);
+  static Handle(V3d_Light) aLight5 = new V3d_DirectionalLight(getViewer(), V3d_XnegYposZpos);
+  static Handle(V3d_Light) aLight6 = new V3d_DirectionalLight(getViewer(), V3d_XposYposZpos);
 
   if (isOn)
   {
@@ -254,16 +254,16 @@ aShape = Transformer.Shape();
   TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
 
   // display original shape in shaded display mode
-  Handle_AIS_Shape aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
+  Handle(AIS_Shape) aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(aShapeIO, AIS_Shaded, Standard_False);
   // Set increased polygon offset for the main shape to avoid depth collision with textured faces
   aShapeIO->SetPolygonOffsets(Aspect_POM_Fill, 1.5, 0.5);
   DISP(aShapeIO);
 
-  Handle_AIS_TexturedShape aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
+  Handle(AIS_TexturedShape) aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
   DISP(aTFace1);
 
-  Handle_AIS_TexturedShape aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
+  Handle(AIS_TexturedShape) aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
   DISP(aTFace2);
 
   getViewer()->Update();
@@ -285,7 +285,7 @@ void TexturesExt_Presentation::sampleTerrain()
   TopExp::MapShapes(aShape, TopAbs_FACE, aFaces);
 
 //  TopLoc_Location aLoc;
-//  Handle_Geom_Surface aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
+//  Handle(Geom_Surface) aSur = BRep_Tool::Surface(TopoDS::Face(aFaces(1)), aLoc);
 //  Standard_Real u1,u2,v1,v2;
 //  aSur->Bounds(u1,u2,v1,v2);
 //  gp_Pnt aPnt = aSur->Value(u1, v1);
diff --git a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.h b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.h
index 63d3f3a7a1..3157c29de7 100755
--- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.h
+++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.h
@@ -32,7 +32,7 @@ private:
   // filename can also be an integer value ("2", "5", etc.), in this case
   // a predefined texture from Graphic3d_NameOfTexture2D with number = this value
   // is loaded.
-  Handle_AIS_TexturedShape Texturize(
+  Handle(AIS_TexturedShape) Texturize(
     const TopoDS_Shape& aShape, TCollection_AsciiString aTFileName, 
     Standard_Real toScaleU=1.0, Standard_Real toScaleV=1.0, 
     Standard_Real toRepeatU=1.0, Standard_Real toRepeatV=1.0,
diff --git a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp
index db12fde046..6db2006ab1 100755
--- a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.cpp
@@ -35,7 +35,7 @@ value = (value*neg)/inc;
 //CTrihedronDlg::CTrihedronDlg(CWnd* pParent /*=NULL*/)
 	//: CDialog(CTrihedronDlg::IDD, pParent)
 
-CTrihedronDlg::CTrihedronDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
+CTrihedronDlg::CTrihedronDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
 	: CDialog(CTrihedronDlg::IDD, pParent)
 
 {
diff --git a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.h b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.h
index 56dbfb25bf..bfe4056f9d 100755
--- a/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.h
+++ b/samples/mfc/standard/04_Viewer3d/src/TrihedronDlg.h
@@ -21,7 +21,7 @@ class CTrihedronDlg : public CDialog
 // Construction
 public:
 	CTrihedronDlg(CWnd* pParent = NULL);   // standard constructor
-	CTrihedronDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);   // standard constructor
+	CTrihedronDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);   // standard constructor
 
 
 // Dialog Data
@@ -63,7 +63,7 @@ protected:
 
 private:
 
-	Handle_V3d_View myCurrent_V3d_View;
+	Handle(V3d_View) myCurrent_V3d_View;
 	CViewer3dDoc* myDoc;
 	Quantity_NameOfColor Color ;
 	Aspect_TypeOfTriedronPosition Position;
diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
index 3974ab181c..15d44fc49d 100755
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
@@ -445,34 +445,34 @@ void CViewer3dDoc::OnObjectDisplayall()
     myOffsetDlg->UpdateValues();
 }
 
-Handle_User_Cylinder CViewer3dDoc::GetCylinder()
+Handle(User_Cylinder) CViewer3dDoc::GetCylinder()
 {
   return myCylinder;
 }
 
 
-Handle_AIS_Shape CViewer3dDoc::GetSphere()
+Handle(AIS_Shape) CViewer3dDoc::GetSphere()
 {
   return mySphere;
 }
 
-Handle_AIS_Shape CViewer3dDoc::GetBox()
+Handle(AIS_Shape) CViewer3dDoc::GetBox()
 {
   return myBox;
 }
 
-Handle_AIS_Shape CViewer3dDoc::GetOverlappedCylinder()
+Handle(AIS_Shape) CViewer3dDoc::GetOverlappedCylinder()
 {
   return myOverlappedCylinder;
 }
 
 
-Handle_AIS_Shape CViewer3dDoc::GetOverlappedSphere()
+Handle(AIS_Shape) CViewer3dDoc::GetOverlappedSphere()
 {
   return myOverlappedSphere;
 }
 
-Handle_AIS_Shape CViewer3dDoc::GetOverlappedBox()
+Handle(AIS_Shape) CViewer3dDoc::GetOverlappedBox()
 {
   return myOverlappedBox;
 }
@@ -507,7 +507,7 @@ void CViewer3dDoc::InputEvent(const Standard_Integer /*x*/,
     myAISContext->InitSelected();
     if (myAISContext->MoreSelected())
     {
-      Handle_AIS_InteractiveObject Current = myAISContext->SelectedInteractive();
+      Handle(AIS_InteractiveObject) Current = myAISContext->SelectedInteractive();
       if (Current->HasColor())
       {
         CSFColor = myAISContext->Color (Current);
@@ -770,7 +770,7 @@ void CViewer3dDoc::OnFillet3d()
   myAISContext->InitSelected();
   if (myAISContext->MoreSelected()) 
   {
-    const Handle(AIS_Shape)& aSelInteractive = Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive());
+    Handle(AIS_Shape) aSelInteractive (Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive()));
     if (aSelInteractive.IsNull())
     {
       AfxMessageBox (L"It is necessary to activate the edges selection mode\n"
diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h
index af369bbbe9..69a4a708a4 100755
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.h
@@ -34,12 +34,12 @@ protected: // create from serialization only
 
 public:
   void SetMyStaticTrihedronAxisIsDisplayed(BOOL IsDisplayed);
-  Handle_AIS_Shape GetBox();
-  Handle_AIS_Shape GetSphere();
-  Handle_User_Cylinder GetCylinder();
-  Handle_AIS_Shape GetOverlappedBox();
-  Handle_AIS_Shape GetOverlappedSphere();
-  Handle_AIS_Shape GetOverlappedCylinder();
+  Handle(AIS_Shape) GetBox();
+  Handle(AIS_Shape) GetSphere();
+  Handle(User_Cylinder) GetCylinder();
+  Handle(AIS_Shape) GetOverlappedBox();
+  Handle(AIS_Shape) GetOverlappedSphere();
+  Handle(AIS_Shape) GetOverlappedCylinder();
   void Start();
   Standard_CString GetDataDir() {return myDataDir;}
   static void Fit();
@@ -137,13 +137,13 @@ protected:
 private:
   COffsetDlg* myOffsetDlg;
 
-  Handle_User_Cylinder myCylinder;
-  Handle_AIS_Shape mySphere;
-  Handle_AIS_Shape myBox;
-  Handle_AIS_Shape myOverlappedCylinder;
-  Handle_AIS_Shape myOverlappedSphere;
-  Handle_AIS_Shape myOverlappedBox;
-  Handle_AIS_Trihedron myTrihedron;
+  Handle(User_Cylinder) myCylinder;
+  Handle(AIS_Shape) mySphere;
+  Handle(AIS_Shape) myBox;
+  Handle(AIS_Shape) myOverlappedCylinder;
+  Handle(AIS_Shape) myOverlappedSphere;
+  Handle(AIS_Shape) myOverlappedBox;
+  Handle(AIS_Trihedron) myTrihedron;
 
   OCCDemo_Presentation *myPresentation;
   char myDataDir[5];         // for "Data\0"
diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.h b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.h
index bcf2543205..8aeb8239ca 100755
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.h
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.h
@@ -130,8 +130,8 @@ private:
 	enum VisMode { VIS_WIREFRAME, VIS_SHADE, VIS_HLR };
 	VisMode                        myVisMode;
 	
-  Handle_V3d_View                myView;
-  Handle_Graphic3d_GraphicDriver myGraphicDriver;
+  Handle(V3d_View)                myView;
+  Handle(Graphic3d_GraphicDriver) myGraphicDriver;
   View3D_CurrentAction           myCurrentMode;
   Standard_Integer               myXmin;
   Standard_Integer               myYmin;
diff --git a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp
index 273a3c3684..14e2e355e4 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.cpp
@@ -15,7 +15,7 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 // ZClippingDlg dialog
 
-ZClippingDlg::ZClippingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
+ZClippingDlg::ZClippingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
 	: CDialog(ZClippingDlg::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(ZClippingDlg)
diff --git a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.h b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.h
index 08c3fbfcab..7b83f5136d 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.h
+++ b/samples/mfc/standard/04_Viewer3d/src/ZClippingDlg.h
@@ -14,7 +14,7 @@ class ZClippingDlg : public CDialog
 {
 // Construction
 public:
-	ZClippingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);   // standard constructor
+	ZClippingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
 	//{{AFX_DATA(ZClippingDlg)
diff --git a/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.cpp b/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.cpp
index 186a697132..3edbc0045f 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.cpp
@@ -16,7 +16,7 @@ static char THIS_FILE[] = __FILE__;
 // ZCueingDlg dialog
 
 
-ZCueingDlg::ZCueingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
+ZCueingDlg::ZCueingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent /*=NULL*/)
 	: CDialog(ZCueingDlg::IDD, pParent)
 {
 	//{{AFX_DATA_INIT(ZCueingDlg)
diff --git a/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.h b/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.h
index 60e9d884ee..55e98623ce 100755
--- a/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.h
+++ b/samples/mfc/standard/04_Viewer3d/src/ZCueingDlg.h
@@ -14,7 +14,7 @@ class ZCueingDlg : public CDialog
 {
 // Construction
 public:
-	ZCueingDlg(Handle_V3d_View Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); 
+	ZCueingDlg(Handle(V3d_View) Current_V3d_View, CViewer3dDoc* pDoc, CWnd* pParent = NULL); 
 // Dialog Data
 	//{{AFX_DATA(ZCueingDlg)
 	enum { IDD = IDD_ZCUEING };
@@ -48,7 +48,7 @@ protected:
 
 private:
 
-	Handle_V3d_View myCurrent_V3d_View;
+	Handle(V3d_View) myCurrent_V3d_View;
 	CViewer3dDoc* myDoc;
 };
 
diff --git a/samples/mfc/standard/06_Ocaf/src/OCAFSample_CommonDriver.hxx b/samples/mfc/standard/06_Ocaf/src/OCAFSample_CommonDriver.hxx
index 7a2d8607c1..b5d983af9e 100755
--- a/samples/mfc/standard/06_Ocaf/src/OCAFSample_CommonDriver.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/OCAFSample_CommonDriver.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_OCAFSample_CommonDriver_HeaderFile
-#include <Handle_OCAFSample_CommonDriver.hxx>
 #endif
 
 #ifndef _OCAFSample_Driver_HeaderFile
@@ -63,7 +62,7 @@ Standard_EXPORT ~OCAFSample_CommonDriver();
 
  // Type management
  //
- Standard_EXPORT friend Handle_Standard_Type& OCAFSample_CommonDriver_Type_();
+ Standard_EXPORT friend Handle(Standard_Type)& OCAFSample_CommonDriver_Type_();
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
  Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
 
diff --git a/samples/mfc/standard/06_Ocaf/src/OCAFSample_Driver.hxx b/samples/mfc/standard/06_Ocaf/src/OCAFSample_Driver.hxx
index 704f37b307..ffeea09a7d 100755
--- a/samples/mfc/standard/06_Ocaf/src/OCAFSample_Driver.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/OCAFSample_Driver.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_OCAFSample_Driver_HeaderFile
-#include <Handle_OCAFSample_Driver.hxx>
 #endif
 
 #ifndef _TFunction_Driver_HeaderFile
@@ -33,7 +32,7 @@
 #include <Standard_Integer.hxx>
 #endif
 class TFunction_Logbook;
-class TDF_LabelMap;
+#include <TDF_LabelMap.hxx>
 
 
 class OCAFSample_Driver : public TFunction_Driver {
@@ -70,7 +69,7 @@ Standard_EXPORT ~OCAFSample_Driver();
 
  // Type management
  //
- Standard_EXPORT friend Handle_Standard_Type& OCAFSample_Driver_Type_();
+ Standard_EXPORT friend Handle(Standard_Type)& OCAFSample_Driver_Type_();
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
  Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
 
diff --git a/samples/mfc/standard/06_Ocaf/src/OcafDoc.h b/samples/mfc/standard/06_Ocaf/src/OcafDoc.h
index 3a93ded714..d1704d215e 100755
--- a/samples/mfc/standard/06_Ocaf/src/OcafDoc.h
+++ b/samples/mfc/standard/06_Ocaf/src/OcafDoc.h
@@ -63,11 +63,11 @@ protected:
 	DECLARE_MESSAGE_MAP()
 public :
 void ActivateFrame(CRuntimeClass* pViewClass, int nCmdShow = SW_RESTORE  );
-  Handle_TDocStd_Document GetOcafDoc() {return myOcafDoc;};
+  Handle(TDocStd_Document) GetOcafDoc() {return myOcafDoc;};
 	CString PathName;
 
 private:
-  Handle_TDocStd_Document myOcafDoc;
+  Handle(TDocStd_Document) myOcafDoc;
 
 public :
 	void EraseAll();
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_BoxDriver.cxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_BoxDriver.cxx
index 3a2c35d657..09f0069268 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_BoxDriver.cxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_BoxDriver.cxx
@@ -130,7 +130,7 @@ const Handle(TOcafFunction_BoxDriver) TOcafFunction_BoxDriver::DownCast(const Ha
 
   if (!AnObject.IsNull()) {
      if (AnObject->IsKind(STANDARD_TYPE(TOcafFunction_BoxDriver))) {
-       _anOtherObject = Handle(TOcafFunction_BoxDriver)((Handle(TOcafFunction_BoxDriver)&)AnObject);
+       _anOtherObject = Handle(TOcafFunction_BoxDriver)::DownCast (AnObject);
      }
   }
 
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx
index 88fa765ccf..5e49dec393 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx
@@ -151,7 +151,7 @@ const Handle(TOcafFunction_CutDriver) TOcafFunction_CutDriver::DownCast(const Ha
 
   if (!AnObject.IsNull()) {
      if (AnObject->IsKind(STANDARD_TYPE(TOcafFunction_CutDriver))) {
-       _anOtherObject = Handle(TOcafFunction_CutDriver)((Handle(TOcafFunction_CutDriver)&)AnObject);
+       _anOtherObject = Handle(TOcafFunction_CutDriver)::DownCast (AnObject);
      }
   }
 
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.hxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.hxx
index da7ab59021..da01087dc8 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.hxx
@@ -66,7 +66,7 @@ Standard_EXPORT ~TOcafFunction_CutDriver();
 
  // Type management
  //
- //Standard_EXPORT friend Handle_Standard_Type& TOcafFunction_CutDriver_Type_();
+ //Standard_EXPORT friend Handle(Standard_Type)& TOcafFunction_CutDriver_Type_();
  Standard_EXPORT const Handle(TOcafFunction_CutDriver) DownCast(const Handle(Standard_Transient)& AnObject); 
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
  Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.cxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.cxx
index 467f149f35..fb2ef18813 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.cxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.cxx
@@ -125,7 +125,7 @@ const Handle(TOcafFunction_CylDriver) TOcafFunction_CylDriver::DownCast(const Ha
 
   if (!AnObject.IsNull()) {
      if (AnObject->IsKind(STANDARD_TYPE(TOcafFunction_CylDriver))) {
-       _anOtherObject = Handle(TOcafFunction_CylDriver)((Handle(TOcafFunction_CylDriver)&)AnObject);
+       _anOtherObject = Handle(TOcafFunction_CylDriver)::DownCast (AnObject);
      }
   }
 
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.hxx b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.hxx
index 07b5f5624f..6b656e0ca5 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.hxx
@@ -66,7 +66,7 @@ Standard_EXPORT ~TOcafFunction_CylDriver();
 
  // Type management
  //
- //Standard_EXPORT friend Handle_Standard_Type& TOcafFunction_CylDriver_Type_();
+ //Standard_EXPORT friend Handle(Standard_Type)& TOcafFunction_CylDriver_Type_();
  Standard_EXPORT const Handle(TOcafFunction_CylDriver) DownCast(const Handle(Standard_Transient)& AnObject);
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
  Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
index 697c281ad8..34eefd436e 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
@@ -42,7 +42,7 @@ Standard_EXPORT ~TOcaf_Application();
 
  // Type management
  //
- //Standard_EXPORT friend Handle_Standard_Type& TOcaf_Application_Type_();
+ //Standard_EXPORT friend Handle(Standard_Type)& TOcaf_Application_Type_();
  Standard_EXPORT const Handle(TOcaf_Application) DownCast(const Handle(Standard_Transient)& AnObject);
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
  Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.hxx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.hxx
index 694922418c..bf85d5df81 100755
--- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Commands.hxx
@@ -51,7 +51,7 @@ public:
  // Methods PUBLIC
  // 
 Standard_EXPORT TOcaf_Commands(const TDF_Label& Main);
-//Standard_EXPORT   Handle_TDataStd_TreeNode Graph() ;
+//Standard_EXPORT   Handle(TDataStd_TreeNode) Graph() ;
 
 protected:
 
diff --git a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp
index 97a4326955..839a7a7aee 100755
--- a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp
+++ b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp
@@ -10,7 +10,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 
 #ifdef _DEBUG
diff --git a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h
index b89cba6b68..fa99e1e5ae 100755
--- a/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h
+++ b/samples/mfc/standard/07_Triangulation/src/ISession_Curve.h
@@ -20,7 +20,7 @@ class ISession_Curve : public AIS_InteractiveObject
 public:
 	ISession_Curve(const Handle(Geom_Curve)& aCurve);
 	virtual ~ISession_Curve();
-DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
diff --git a/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.cpp b/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.cpp
index 9ec17d72c9..3b3d5dd157 100755
--- a/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.cpp
+++ b/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.cpp
@@ -78,8 +78,8 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
 // Purpose  : displays a given geometric surface in 3d viewer
 //            (creates a finite face and displays it)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
-                                  (const Handle_Geom_Surface& theSurface,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawSurface
+                                  (const Handle(Geom_Surface)& theSurface,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -90,7 +90,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
   fixParam(v1);
   fixParam(v2);
 
-  Handle_AIS_Shape aGraphicSurface = 
+  Handle(AIS_Shape) aGraphicSurface = 
     new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2, Precision::Confusion()));
 
   getAISContext()->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -111,8 +111,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 3d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -136,8 +136,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 2d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom2d_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom2d_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay,
                                    const gp_Ax2& aPosition)
@@ -164,7 +164,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : drawPoint
 // Purpose  : displays a given point
 //================================================================
-Handle_AIS_Point OCCDemo_Presentation::drawPoint
+Handle(AIS_Point) OCCDemo_Presentation::drawPoint
                                   (const gp_Pnt& aPnt,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
@@ -186,7 +186,7 @@ Handle_AIS_Point OCCDemo_Presentation::drawPoint
 //            (segment of line starting at thePnt with the arrow at the end,
 //             the length of segment is the length of the vector)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector 
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawVector 
                                   (const gp_Pnt& thePnt,
                                    const gp_Vec& theVec,
                                    const Quantity_Color& theColor,
@@ -218,11 +218,11 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
 }
 
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape 
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape 
          (const TopoDS_Shape& theShape,const Quantity_Color& theColor,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, Graphic3d_NOM_PLASTIC, toDisplay);
   getAISContext()->SetColor (aGraphicShape, theColor, toDisplay);
@@ -238,12 +238,12 @@ Handle_AIS_Shape OCCDemo_Presentation::drawShape
   return aGraphicShape;
 }
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape
          (const TopoDS_Shape& theShape,
           const Graphic3d_NameOfMaterial theMaterial,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, theMaterial, toDisplay);
   if (toDisplay) {
@@ -314,12 +314,12 @@ void OCCDemo_Presentation::ResetView()
 	pView->Reset();
 }
 */
-Handle_AIS_InteractiveContext OCCDemo_Presentation::getAISContext() const
+Handle(AIS_InteractiveContext) OCCDemo_Presentation::getAISContext() const
 {
 	return myDoc->GetAISContext();
 }
 
-Handle_V3d_Viewer OCCDemo_Presentation::getViewer() const
+Handle(V3d_Viewer) OCCDemo_Presentation::getViewer() const
 {
 	return myDoc->GetViewer();
 }
diff --git a/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.h b/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.h
index f29fa0d40d..5b685d6851 100755
--- a/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.h
+++ b/samples/mfc/standard/07_Triangulation/src/OCCDemo_Presentation.h
@@ -68,52 +68,52 @@ public:
 protected:
   // Methods to call from a derivable class
   void setName (const char* theName) {myName = CString(theName);}
-  Handle_AIS_InteractiveContext getAISContext() const;
-  Handle_V3d_Viewer getViewer() const;
+  Handle(AIS_InteractiveContext) getAISContext() const;
+  Handle(V3d_Viewer) getViewer() const;
   Standard_CString GetDataDir();
 
   Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
   // Waits for a user input or a period of time has been elapsed
 
-  Handle_AIS_InteractiveObject drawSurface (const Handle_Geom_Surface& theSurface,
+  Handle(AIS_InteractiveObject) drawSurface (const Handle(Geom_Surface)& theSurface,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_LEMONCHIFFON3),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a finite face based on the given geometric surface 
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True);
   // creates an ISession_Curve based on the given geometric curve
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom2d_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom2d_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True,
          const gp_Ax2& aPosition = gp::XOY());
   // converts a given curve to 3d using aPosition and calls the previous method
 
-  Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
+  Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given point
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawVector (const gp_Pnt& thePnt,
+  Handle(AIS_InteractiveObject) drawVector (const gp_Pnt& thePnt,
                                            const gp_Vec& theVec,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_YELLOW),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given vector
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Quantity_Color& theColor,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape
   // with material PLASTIC and a given color
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape with the given material
diff --git a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
index 0e5b8f6dfa..d835ec877f 100755
--- a/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
+++ b/samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
@@ -122,7 +122,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     "  TopLoc_Location aLocation;" EOL EOL
     
     "  // takes the triangulation of the face aFace:" EOL
-    "  Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL EOL
+    "  Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL EOL
     
     "  if(!aTr.IsNull()) // if this triangulation is not NULL" EOL
     "  { " EOL
@@ -160,7 +160,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     "    if(!aEdge.IsNull()) // if this edge is not NULL" EOL
     "    {" EOL
     "      // takes the polygon associated to the edge aEdge:" EOL
-    "      Handle_Poly_PolygonOnTriangulation aPol = " EOL
+    "      Handle(Poly_PolygonOnTriangulation) aPol = " EOL
     "        BRep_Tool::PolygonOnTriangulation(aEdge,aTr,aEdge.Location());" EOL EOL
     
     "      if(!aPol.IsNull()) // if this polygon is not NULL" EOL
@@ -197,7 +197,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
   Standard_Integer aNumOfNodes = 0;
   Standard_Integer aNumOfTriangles = 0;
   
-  Handle_AIS_InteractiveObject aShowEdge,aShowFace,aShowShape;
+  Handle(AIS_InteractiveObject) aShowEdge,aShowFace,aShowShape;
   
   TopExp_Explorer aExpFace,aExpEdge;
 
@@ -208,7 +208,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
     TopoDS_Face aFace = TopoDS::Face(aExpFace.Current());
     TopLoc_Location aLocation;
 
-    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);
+    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation(aFace,aLocation);
 
     if(!aTr.IsNull())
     { 
@@ -232,7 +232,7 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
 
         if(!aEdge.IsNull())
         {
-          Handle_Poly_PolygonOnTriangulation aPol = 
+          Handle(Poly_PolygonOnTriangulation) aPol = 
             BRep_Tool::PolygonOnTriangulation(aEdge,aTr,aEdge.Location());
 
           if(!aPol.IsNull())
diff --git a/samples/mfc/standard/08_HLR/src/HLRDoc.h b/samples/mfc/standard/08_HLR/src/HLRDoc.h
index 85c9768e1e..ff8382f24e 100755
--- a/samples/mfc/standard/08_HLR/src/HLRDoc.h
+++ b/samples/mfc/standard/08_HLR/src/HLRDoc.h
@@ -47,11 +47,11 @@ public :
   void ActivateFrame(CRuntimeClass* pViewClass, int nCmdShow = SW_RESTORE  );
 
 private:
-  Handle_V3d_Viewer my2DViewer;
-  Handle_AIS_InteractiveContext myInteractiveContext2D;
+  Handle(V3d_Viewer) my2DViewer;
+  Handle(AIS_InteractiveContext) myInteractiveContext2D;
 public :
-  Handle_V3d_Viewer GetViewer2D()  { return my2DViewer; };
-  Handle_AIS_InteractiveContext& GetInteractiveContext2D(){ return myInteractiveContext2D; };
+  Handle(V3d_Viewer) GetViewer2D()  { return my2DViewer; };
+  Handle(AIS_InteractiveContext)& GetInteractiveContext2D(){ return myInteractiveContext2D; };
   void FitAll2DViews(Standard_Boolean UpdateViewer=Standard_False);
 
 public :
diff --git a/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp b/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
index fe20d311d7..0545d44950 100755
--- a/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
+++ b/samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
@@ -380,7 +380,7 @@ void CAnimationDoc::OnFileLoadgrid()
       CString C = dlg.GetPathName();
       SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
 
-      Handle_Geom_BSplineSurface mySurface;
+      Handle(Geom_BSplineSurface) mySurface;
 
       if(grid2surf(C,mySurface ))
 	{
diff --git a/samples/mfc/standard/09_Animation/src/AnimationDoc.h b/samples/mfc/standard/09_Animation/src/AnimationDoc.h
index c847d79411..fa5c4cd85d 100755
--- a/samples/mfc/standard/09_Animation/src/AnimationDoc.h
+++ b/samples/mfc/standard/09_Animation/src/AnimationDoc.h
@@ -71,11 +71,11 @@ protected:
   DECLARE_MESSAGE_MAP()
 
 private:
-  Handle_AIS_Shape myAisCrankArm     ;
-  Handle_AIS_Shape myAisCylinderHead ;
-  Handle_AIS_Shape myAisPropeller    ;
-  Handle_AIS_Shape myAisPiston       ;
-  Handle_AIS_Shape myAisEngineBlock  ;
+  Handle(AIS_Shape) myAisCrankArm     ;
+  Handle(AIS_Shape) myAisCylinderHead ;
+  Handle(AIS_Shape) myAisPropeller    ;
+  Handle(AIS_Shape) myAisPiston       ;
+  Handle(AIS_Shape) myAisEngineBlock  ;
 
   Standard_Real     myDeviation;
   Standard_Integer  myAngle;
diff --git a/samples/mfc/standard/09_Animation/src/AnimationView3D.h b/samples/mfc/standard/09_Animation/src/AnimationView3D.h
index 19822c8c8e..ae7dfa452f 100755
--- a/samples/mfc/standard/09_Animation/src/AnimationView3D.h
+++ b/samples/mfc/standard/09_Animation/src/AnimationView3D.h
@@ -126,9 +126,9 @@ protected:
 
 	DECLARE_MESSAGE_MAP()
 private:
-	Handle_V3d_View     myView;
+	Handle(V3d_View)     myView;
 public:
-	Handle_V3d_View&    GetView() { return myView;};
+	Handle(V3d_View)&    GetView() { return myView;};
 	void                DisplayTuneDialog();
 private:
   Standard_Integer     myXmin;
diff --git a/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp b/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp
index e91b20612f..2724bb9b82 100755
--- a/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp
+++ b/samples/mfc/standard/10_Convert/src/Convert_Presentation.cpp
@@ -86,7 +86,7 @@ void Convert_Presentation::DoSample()
 // Function : Convert_Presentation::drawSurfaceAndItsBSpline
 // Purpose  : 
 //================================================================
-void Convert_Presentation::drawSurfaceAndItsBSpline(const Handle_Geom_Surface & theSurface, 
+void Convert_Presentation::drawSurfaceAndItsBSpline(const Handle(Geom_Surface) & theSurface, 
                                                     const Standard_CString theName, 
                                                     TCollection_AsciiString& theText)
 {
@@ -95,7 +95,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(const Handle_Geom_Surface &
   aTitle += " to BSpline surface";
 
   theText += EOL
-    "  Handle_Geom_BSplineSurface aBSplineSurface = " EOL
+    "  Handle(Geom_BSplineSurface) aBSplineSurface = " EOL
     "    GeomConvert::SurfaceToBSplineSurface(aSurface);" EOL;
 
   setResultTitle (aTitle.ToCString());
@@ -105,7 +105,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(const Handle_Geom_Surface &
 
   if (WAIT_A_LITTLE) return;
 
-  Handle_Geom_BSplineSurface aBSplineSurface = GeomConvert::SurfaceToBSplineSurface(theSurface);
+  Handle(Geom_BSplineSurface) aBSplineSurface = GeomConvert::SurfaceToBSplineSurface(theSurface);
 
   _ASSERTE(!aBSplineSurface.IsNull());
 
@@ -116,7 +116,7 @@ void Convert_Presentation::drawSurfaceAndItsBSpline(const Handle_Geom_Surface &
 // Function : Convert_Presentation::drawCurveAndItsBSpline
 // Purpose  : 
 //================================================================
-void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve, 
+void Convert_Presentation::drawCurveAndItsBSpline(Handle(Geom_Curve) theCurve, 
                                                   const Standard_CString theName, 
                                                   TCollection_AsciiString& theText)
 {
@@ -125,7 +125,7 @@ void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve,
   aTitle += " to BSpline curve";
 
   theText += EOL
-    "  Handle_Geom_BSplineCurve aBSpline = " EOL
+    "  Handle(Geom_BSplineCurve) aBSpline = " EOL
     "    GeomConvert::CurveToBSplineCurve(aCurve);" EOL;
 
   setResultTitle (aTitle.ToCString());
@@ -135,7 +135,7 @@ void Convert_Presentation::drawCurveAndItsBSpline(Handle_Geom_Curve theCurve,
   
   if (WAIT_A_LITTLE) return;
 
-  Handle_Geom_BSplineCurve aBSpline = GeomConvert::CurveToBSplineCurve(theCurve);
+  Handle(Geom_BSplineCurve) aBSpline = GeomConvert::CurveToBSplineCurve(theCurve);
 
   drawCurve (Handle(Geom_Curve)::DownCast(aBSpline), BSplineColor);
 }
@@ -155,7 +155,7 @@ void Convert_Presentation::sampleCircle()
   gp_Dir aDir (1,0,0);
   gp_Ax2 aAxis (aOrigin, aDir);
   Standard_Real aRadius = 300;
-  Handle_Geom_Circle aCurve = new Geom_Circle (aAxis, aRadius);
+  Handle(Geom_Circle) aCurve = new Geom_Circle (aAxis, aRadius);
 
   TCollection_AsciiString aText (
     "  gp_Pnt aOrigin (0,0,0);" EOL
diff --git a/samples/mfc/standard/10_Convert/src/Convert_Presentation.h b/samples/mfc/standard/10_Convert/src/Convert_Presentation.h
index 24cc9b6cd5..1652113044 100755
--- a/samples/mfc/standard/10_Convert/src/Convert_Presentation.h
+++ b/samples/mfc/standard/10_Convert/src/Convert_Presentation.h
@@ -38,10 +38,10 @@ private:
   void sampleConicalSurface(); 
   void sampleSphericalSurface(); 
 
-  void drawCurveAndItsBSpline (Handle_Geom_Curve theCurve, 
+  void drawCurveAndItsBSpline (Handle(Geom_Curve) theCurve, 
     const Standard_CString theName, TCollection_AsciiString& theText);
 
-  void drawSurfaceAndItsBSpline (const Handle_Geom_Surface & theSurface, 
+  void drawSurfaceAndItsBSpline (const Handle(Geom_Surface) & theSurface, 
     const Standard_CString theName, TCollection_AsciiString& theText);
 
 private:
diff --git a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp
index 97a4326955..839a7a7aee 100755
--- a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp
+++ b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp
@@ -10,7 +10,6 @@
 #include <Prs3d_Drawer.hxx>
 #include <Prs3d_ArrowAspect.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 
 #ifdef _DEBUG
diff --git a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h
index b89cba6b68..fa99e1e5ae 100755
--- a/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h
+++ b/samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.h
@@ -20,7 +20,7 @@ class ISession_Curve : public AIS_InteractiveObject
 public:
 	ISession_Curve(const Handle(Geom_Curve)& aCurve);
 	virtual ~ISession_Curve();
-DEFINE_STANDARD_RTTI(ISession_Curve,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 private:
 
 Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
diff --git a/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.cpp b/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.cpp
index 89ceabb9d6..4b3554b31a 100755
--- a/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.cpp
+++ b/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.cpp
@@ -77,8 +77,8 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
 // Purpose  : displays a given geometric surface in 3d viewer
 //            (creates a finite face and displays it)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
-                                  (const Handle_Geom_Surface& theSurface,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawSurface
+                                  (const Handle(Geom_Surface)& theSurface,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -89,7 +89,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
   fixParam(v1);
   fixParam(v2);
 
-  Handle_AIS_Shape aGraphicSurface = 
+  Handle(AIS_Shape) aGraphicSurface = 
     new AIS_Shape(BRepBuilderAPI_MakeFace (theSurface, u1, u2, v1, v2, Precision::Confusion()));
 
   getAISContext()->SetMaterial(aGraphicSurface, Graphic3d_NOM_PLASTIC, toDisplay);
@@ -110,8 +110,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawSurface
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 3d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
 {
@@ -135,8 +135,8 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : DrawCurve                                 
 // Purpose  : displays a given curve 2d
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
-                                  (const Handle_Geom2d_Curve& theCurve,
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawCurve
+                                  (const Handle(Geom2d_Curve)& theCurve,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay,
                                    const gp_Ax2& aPosition)
@@ -163,7 +163,7 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawCurve
 // Function : drawPoint
 // Purpose  : displays a given point
 //================================================================
-Handle_AIS_Point OCCDemo_Presentation::drawPoint
+Handle(AIS_Point) OCCDemo_Presentation::drawPoint
                                   (const gp_Pnt& aPnt,
                                    const Quantity_Color& theColor,
                                    const Standard_Boolean toDisplay)
@@ -185,7 +185,7 @@ Handle_AIS_Point OCCDemo_Presentation::drawPoint
 //            (segment of line starting at thePnt with the arrow at the end,
 //             the length of segment is the length of the vector)
 //================================================================
-Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector 
+Handle(AIS_InteractiveObject) OCCDemo_Presentation::drawVector 
                                   (const gp_Pnt& thePnt,
                                    const gp_Vec& theVec,
                                    const Quantity_Color& theColor,
@@ -217,11 +217,11 @@ Handle_AIS_InteractiveObject OCCDemo_Presentation::drawVector
 }
 
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape 
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape 
          (const TopoDS_Shape& theShape,const Quantity_Color& theColor,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, Graphic3d_NOM_PLASTIC, toDisplay);
   getAISContext()->SetColor (aGraphicShape, theColor, toDisplay);
@@ -237,12 +237,12 @@ Handle_AIS_Shape OCCDemo_Presentation::drawShape
   return aGraphicShape;
 }
 
-Handle_AIS_Shape OCCDemo_Presentation::drawShape
+Handle(AIS_Shape) OCCDemo_Presentation::drawShape
          (const TopoDS_Shape& theShape,
           const Graphic3d_NameOfMaterial theMaterial,
           const Standard_Boolean toDisplay)
 {
-  Handle_AIS_Shape aGraphicShape = new AIS_Shape(theShape);
+  Handle(AIS_Shape) aGraphicShape = new AIS_Shape(theShape);
 
   getAISContext()->SetMaterial(aGraphicShape, theMaterial, toDisplay);
   if (toDisplay) {
diff --git a/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.h b/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.h
index 8f14f0bdb2..89b1f18aee 100755
--- a/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.h
+++ b/samples/mfc/standard/10_Convert/src/OCCDemo_Presentation.h
@@ -65,8 +65,8 @@ public:
 protected:
   // Methods to call from a derivable class
   void setName (const char* theName) {myName = CString(theName);}
-  Handle_AIS_InteractiveContext getAISContext() const {return myDoc->GetAISContext();}
-  Handle_V3d_Viewer getViewer() const {return myDoc->GetViewer();}
+  Handle(AIS_InteractiveContext) getAISContext() const {return myDoc->GetAISContext();}
+  Handle(V3d_Viewer) getViewer() const {return myDoc->GetViewer();}
   void setResultTitle (const char* theTitle) {myDoc->GetResultDialog()->SetTitle(theTitle);}
   void setResultText (const char* theText) {myDoc->GetResultDialog()->SetText(theText);}
   Standard_CString GetDataDir() {return myDoc->GetDataDir();}
@@ -74,45 +74,45 @@ protected:
   Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
   // Waits for a user input or a period of time has been elapsed
 
-  Handle_AIS_InteractiveObject drawSurface (const Handle_Geom_Surface& theSurface,
+  Handle(AIS_InteractiveObject) drawSurface (const Handle(Geom_Surface)& theSurface,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_LEMONCHIFFON3),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a finite face based on the given geometric surface 
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True);
   // creates an ISession_Curve based on the given geometric curve
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawCurve (const Handle_Geom2d_Curve& theCurve,
+  Handle(AIS_InteractiveObject) drawCurve (const Handle(Geom2d_Curve)& theCurve,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_RED),
          const Standard_Boolean toDisplay = Standard_True,
          const gp_Ax2& aPosition = gp::XOY());
   // converts a given curve to 3d using aPosition and calls the previous method
 
-  Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
+  Handle(AIS_Point) drawPoint (const gp_Pnt& thePnt,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given point
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_InteractiveObject drawVector (const gp_Pnt& thePnt,
+  Handle(AIS_InteractiveObject) drawVector (const gp_Pnt& thePnt,
                                            const gp_Vec& theVec,
          const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_YELLOW),
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given vector
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Quantity_Color& theColor,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape
   // with material PLASTIC and a given color
   // and displays it in the viewer if toDisplay = Standard_True
 
-  Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
+  Handle(AIS_Shape) drawShape (const TopoDS_Shape& theShape,
          const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
          const Standard_Boolean toDisplay = Standard_True);
   // creates a presentation of the given shape with the given material
diff --git a/samples/mfc/standard/10_Convert/src/WNT/OCCDemoView.h b/samples/mfc/standard/10_Convert/src/WNT/OCCDemoView.h
index 6bfa56e5f9..63a930be01 100755
--- a/samples/mfc/standard/10_Convert/src/WNT/OCCDemoView.h
+++ b/samples/mfc/standard/10_Convert/src/WNT/OCCDemoView.h
@@ -108,8 +108,8 @@ private:
 
 private:
   enum VisMode { VIS_WIREFRAME, VIS_SHADE, VIS_HLR };
-  Handle_V3d_View     myView;
-  Handle_Graphic3d_GraphicDriver myGraphicDriver;
+  Handle(V3d_View)     myView;
+  Handle(Graphic3d_GraphicDriver) myGraphicDriver;
   View3D_CurrentAction myCurrentMode;
   VisMode              myVisMode;
   Standard_Integer     myXmin;
diff --git a/samples/mfc/standard/Common/AISDialogs.cpp b/samples/mfc/standard/Common/AISDialogs.cpp
index 969561b0f7..944c506d3a 100755
--- a/samples/mfc/standard/Common/AISDialogs.cpp
+++ b/samples/mfc/standard/Common/AISDialogs.cpp
@@ -19,7 +19,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CAISNbrIsosDialog dialog
 
-//CAISNbrIsosDialog::CAISNbrIsosDialog(Handle_AIS_InteractiveContext CurrentIC,
+//CAISNbrIsosDialog::CAISNbrIsosDialog(Handle(AIS_InteractiveContext) CurrentIC,
 //									 CWnd* pParent /*=NULL*/)
 //	: CDialog(CAISNbrIsosDialog::IDD, pParent)
 /*
@@ -120,7 +120,7 @@ void CAISNbrIsosDialog::UpdateIsos ()
 // CDevCoeffDialog dialog
 
 
-//CDevCoeffDialog::CDevCoeffDialog(Handle_AIS_InteractiveContext CurrentIC,
+//CDevCoeffDialog::CDevCoeffDialog(Handle(AIS_InteractiveContext) CurrentIC,
 //								 CWnd* pParent /*=NULL*/)
 //	: CDialog(CDevCoeffDialog::IDD, pParent)
 /*
@@ -247,7 +247,7 @@ void CDevCoeffDialog::RedisplaySelected ()
 // CDialogMaterial dialog
 
 
-CDialogMaterial::CDialogMaterial(Handle_AIS_InteractiveContext CurrentIC,
+CDialogMaterial::CDialogMaterial(Handle(AIS_InteractiveContext) CurrentIC,
 								 CWnd* pParent /*=NULL*/)
 	: CDialog(CDialogMaterial::IDD, pParent)
 {
@@ -344,7 +344,7 @@ void CDialogMaterial::OnObjectMaterialDefault    () { SetMaterial ( Graphic3d_NO
 /////////////////////////////////////////////////////////////////////////////
 // CDialogTransparency dialog
 
-CDialogTransparency::CDialogTransparency(Handle_AIS_InteractiveContext CurrentIC,
+CDialogTransparency::CDialogTransparency(Handle(AIS_InteractiveContext) CurrentIC,
 										 CWnd* pParent /*=NULL*/)
 	: CDialog(CDialogTransparency::IDD, pParent)
 {
diff --git a/samples/mfc/standard/Common/AISDialogs.h b/samples/mfc/standard/Common/AISDialogs.h
index 2ef3eacf7c..4487f03698 100755
--- a/samples/mfc/standard/Common/AISDialogs.h
+++ b/samples/mfc/standard/Common/AISDialogs.h
@@ -20,7 +20,7 @@ class CAISNbrIsosDialog : public CDialog
 {
 // Construction
 public:
-	CAISNbrIsosDialog(Handle_AIS_InteractiveContext CurrentIC,
+	CAISNbrIsosDialog(Handle(AIS_InteractiveContext) CurrentIC,
 					  CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
@@ -103,7 +103,7 @@ protected:
 private:
     void RedisplaySelected ();
 
-	Handle_AIS_InteractiveContext myCurrentIC;
+	Handle(AIS_InteractiveContext) myCurrentIC;
 };
 
 */
@@ -160,7 +160,7 @@ protected:
 private:
 	void SetMaterial (Graphic3d_NameOfMaterial Material);
 
-	Handle_AIS_InteractiveContext myCurrentIC;
+	Handle(AIS_InteractiveContext) myCurrentIC;
 
 };
 
@@ -168,7 +168,7 @@ class Standard_EXPORT CDialogTransparency : public CDialog
 {
 // Construction
 public:
-	CDialogTransparency(Handle_AIS_InteractiveContext CurrentIC, 
+	CDialogTransparency(Handle(AIS_InteractiveContext) CurrentIC, 
 		                CWnd* pParent = NULL);   // standard constructor
 
 // Dialog Data
@@ -196,7 +196,7 @@ protected:
 	DECLARE_MESSAGE_MAP()
 
 private:
-	Handle_AIS_InteractiveContext myCurrentIC;
+	Handle(AIS_InteractiveContext) myCurrentIC;
 
 };
 
diff --git a/samples/mfc/standard/Common/DimensionDlg.cpp b/samples/mfc/standard/Common/DimensionDlg.cpp
index 317132c234..8fd754f60a 100644
--- a/samples/mfc/standard/Common/DimensionDlg.cpp
+++ b/samples/mfc/standard/Common/DimensionDlg.cpp
@@ -767,7 +767,7 @@ void CDimensionDlg::OnClose()
 TopoDS_Shape CDimensionDlg::SelectedShape()
 {
   Handle(Standard_Transient) aSelection = AIS_Selection::CurrentSelection()->Value();
-  Handle(SelectMgr_EntityOwner) anOwner = *((Handle(SelectMgr_EntityOwner)*)&aSelection);
+  Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (aSelection);
   Handle(StdSelect_BRepOwner) aBrepOwner = Handle(StdSelect_BRepOwner)::DownCast(anOwner);
   return aBrepOwner->Shape().Located (aBrepOwner->Location() * aBrepOwner->Shape().Location());
 }
diff --git a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
index f95256a033..cba3ecf2e2 100755
--- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
+++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
@@ -6,7 +6,6 @@
 #include <HLRBRep_HLRToShape.hxx>
 #include <TopExp.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ISession2D_Shape,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Shape,AIS_InteractiveObject)
 
 ISession2D_Shape::ISession2D_Shape ()
diff --git a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
index 0c4c53c3b0..47f9ecd3e8 100755
--- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
+++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
@@ -41,7 +41,7 @@ public:
   { return Standard_True; }
 
 public:
-  DEFINE_STANDARD_RTTI(ISession2D_Shape,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(ISession2D_Shape,AIS_InteractiveObject)
 
 private:
   void BuildAlgo();
diff --git a/samples/mfc/standard/Common/ImportExport/ImportExport.cpp b/samples/mfc/standard/Common/ImportExport/ImportExport.cpp
index 4efa0cabc8..0b239fd97b 100755
--- a/samples/mfc/standard/Common/ImportExport/ImportExport.cpp
+++ b/samples/mfc/standard/Common/ImportExport/ImportExport.cpp
@@ -92,12 +92,12 @@ Handle(TopTools_HSequenceOfShape) CImportExport::BuildSequenceFromContext(const
 //=                                                                    =
 //======================================================================
 
-int CImportExport::ReadBREP (const Handle_AIS_InteractiveContext& anInteractiveContext)
+int CImportExport::ReadBREP (const Handle(AIS_InteractiveContext)& anInteractiveContext)
 {
     Handle(TopTools_HSequenceOfShape) aSequence = CImportExport::ReadBREP();
 	if(aSequence->IsEmpty())
 		return 1;
-	Handle_AIS_Shape aShape;
+	Handle(AIS_Shape) aShape;
     for(int i=1;i<= aSequence->Length();i++){
 		aShape = new AIS_Shape(aSequence->Value(i));
 		anInteractiveContext->SetDisplayMode(aShape, 1, Standard_False);
@@ -164,7 +164,7 @@ Standard_Boolean CImportExport::ReadBREP(CString      aFileName,
   return !aShape.IsNull();
 }
 
-void CImportExport::SaveBREP(const Handle_AIS_InteractiveContext& anInteractiveContext)
+void CImportExport::SaveBREP(const Handle(AIS_InteractiveContext)& anInteractiveContext)
 {
 	anInteractiveContext->InitCurrent();
 	if (anInteractiveContext->NbCurrents() == 0){
diff --git a/samples/mfc/standard/Common/ImportExport/ImportExport.h b/samples/mfc/standard/Common/ImportExport/ImportExport.h
index df38b44d3c..92f35c3a7e 100755
--- a/samples/mfc/standard/Common/ImportExport/ImportExport.h
+++ b/samples/mfc/standard/Common/ImportExport/ImportExport.h
@@ -34,13 +34,13 @@ public :
 
     //======================================================================
     // return is HSequence to be able to select a set of files
-    static int ReadBREP(const Handle_AIS_InteractiveContext& anInteractiveContext);
-    static Handle_TopTools_HSequenceOfShape ReadBREP();
+    static int ReadBREP(const Handle(AIS_InteractiveContext)& anInteractiveContext);
+    static Handle(TopTools_HSequenceOfShape) ReadBREP();
     static Standard_Boolean ReadBREP(CString      aFileName,
                                     TopoDS_Shape& aShape);
 
     //----------------------------------------------------------------------
-    static void SaveBREP(const Handle_AIS_InteractiveContext& anInteractiveContext);
+    static void SaveBREP(const Handle(AIS_InteractiveContext)& anInteractiveContext);
     static Standard_Boolean SaveBREP(const TopoDS_Shape& aShape);
     static Standard_Boolean SaveBREP(CString aFileName,
                                     const TopoDS_Shape& aShape);
diff --git a/samples/mfc/standard/Common/OCC_2dDoc.h b/samples/mfc/standard/Common/OCC_2dDoc.h
index a788792a71..7186c1ebc7 100755
--- a/samples/mfc/standard/Common/OCC_2dDoc.h
+++ b/samples/mfc/standard/Common/OCC_2dDoc.h
@@ -30,7 +30,7 @@ public: // New operations
 
 public: // getters
 
-  Handle_V3d_Viewer GetViewer2D () { return myViewer; };
+  Handle(V3d_Viewer) GetViewer2D () { return myViewer; };
 
   Handle(AIS_InteractiveContext)& GetInteractiveContext() { return myAISContext; };
 
diff --git a/samples/mfc/standard/Common/OCC_2dView.h b/samples/mfc/standard/Common/OCC_2dView.h
index 904cbae868..eaa03d6c94 100755
--- a/samples/mfc/standard/Common/OCC_2dView.h
+++ b/samples/mfc/standard/Common/OCC_2dView.h
@@ -138,7 +138,7 @@ protected:
 
   CRectangularGrid TheRectangularGridDialog;
   CCircularGrid    TheCircularGridDialog;
-  Handle_V3d_View myV2dView;
+  Handle(V3d_View) myV2dView;
 };
 
 #ifndef _DEBUG  // debug version in 2DDisplayView.cpp
diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
index 0655c57d37..fd8a98f3eb 100755
--- a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
+++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
@@ -257,7 +257,7 @@ void OCC_3dBaseDoc::OnFileExportBrep()
 
 void OCC_3dBaseDoc::OnObjectColor() 
 {
-	Handle_AIS_InteractiveObject Current ;
+	Handle(AIS_InteractiveObject) Current ;
 	COLORREF MSColor ;
 	Quantity_Color CSFColor ;
 
diff --git a/samples/mfc/standard/Common/OCC_3dView.h b/samples/mfc/standard/Common/OCC_3dView.h
index 8bcbb2c586..dfe79291de 100755
--- a/samples/mfc/standard/Common/OCC_3dView.h
+++ b/samples/mfc/standard/Common/OCC_3dView.h
@@ -36,7 +36,7 @@ public:
 
 	void SetZoom ( const Quantity_Factor& Coef  ) {   myView->SetZoom ( Coef  );  };
 
-  Handle_V3d_View& GetView() { return myView; }
+  Handle(V3d_View)& GetView() { return myView; }
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(OCC_3dView)
@@ -94,7 +94,7 @@ protected:
 
 protected:
 
-  Handle_V3d_View  myView;
+  Handle(V3d_View)  myView;
   CurAction3d      myCurrentMode;
   Standard_Integer myXmin;
   Standard_Integer myYmin;
diff --git a/samples/mfc/standard/Common/OCC_App.h b/samples/mfc/standard/Common/OCC_App.h
index b3e402cb6d..c5a4155864 100755
--- a/samples/mfc/standard/Common/OCC_App.h
+++ b/samples/mfc/standard/Common/OCC_App.h
@@ -21,7 +21,7 @@ public:
 	const wchar_t* GetInitDataDir() const;
   void SetSamplePath (const wchar_t* thePath);
 	OCC_App();
-  Handle_Graphic3d_GraphicDriver GetGraphicDriver() const
+  Handle(Graphic3d_GraphicDriver) GetGraphicDriver() const
   {
     return myGraphicDriver;
   }
@@ -36,7 +36,7 @@ public:
    //}}AFX_MSG
    DECLARE_MESSAGE_MAP()
 protected:
-  Handle_Graphic3d_GraphicDriver myGraphicDriver;
+  Handle(Graphic3d_GraphicDriver) myGraphicDriver;
 public:
 	CString SampleName;
 	CString SamplePath;
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
index f34f293337..d2e227a9f0 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
@@ -2,7 +2,6 @@
 
 #include "Sample2D_Face.h"
 
-IMPLEMENT_STANDARD_HANDLE(Sample2D_Face,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Face,AIS_InteractiveObject)
 
 Sample2D_Face::Sample2D_Face (const TopoDS_Shape& theFace)
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Face.h b/samples/mfc/standard/Common/Primitive/Sample2D_Face.h
index 08420fe182..e511d7d449 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Face.h
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Face.h
@@ -21,7 +21,7 @@ public:
  // 
 Standard_EXPORT Sample2D_Face (const TopoDS_Shape& theFace);
 
-DEFINE_STANDARD_RTTI(Sample2D_Face,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(Sample2D_Face,AIS_InteractiveObject)
 
 private:
 
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Image.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Image.cpp
index 1bd5164d02..f28eae1dd7 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Image.cpp
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Image.cpp
@@ -2,7 +2,6 @@
 
 #include "Sample2D_Image.h"
 
-IMPLEMENT_STANDARD_HANDLE(Sample2D_Image,AIS_TexturedShape)
 IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Image,AIS_TexturedShape)
 
 Sample2D_Image::Sample2D_Image(TCollection_AsciiString& aFileName,
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Image.h b/samples/mfc/standard/Common/Primitive/Sample2D_Image.h
index ce6cb76dd5..c828f0516d 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Image.h
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Image.h
@@ -28,7 +28,7 @@ Standard_EXPORT inline   Quantity_Factor GetScale() const;
 Standard_EXPORT inline   void SetScale(const Quantity_Factor aNewScale) ;
 Standard_EXPORT virtual void SetContext(const Handle(AIS_InteractiveContext)& theContext) ;
 
-DEFINE_STANDARD_RTTI(Sample2D_Image,AIS_TexturedShape)
+DEFINE_STANDARD_RTTIEXT(Sample2D_Image,AIS_TexturedShape)
 private:
   void MakeShape();
 protected:
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
index f712192ffb..1057b1d01f 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
@@ -2,7 +2,6 @@
 
 #include "Sample2D_Markers.h"
 
-IMPLEMENT_STANDARD_HANDLE(Sample2D_Markers,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Markers,AIS_InteractiveObject)
 
 // generic marker
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
index db40295f91..007f027744 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
@@ -34,7 +34,7 @@ public:
                    const Standard_Real theScaleOrId=2.0);
 
 
-DEFINE_STANDARD_RTTI(Sample2D_Markers,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(Sample2D_Markers,AIS_InteractiveObject)
 
 private: 
 
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
index 98d812b7ff..774ab2cac0 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
@@ -2,7 +2,6 @@
 
 #include "Sample2D_Text.h"
 
-IMPLEMENT_STANDARD_HANDLE(Sample2D_Text,AIS_InteractiveObject)
 IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Text,AIS_InteractiveObject)
 
 Sample2D_Text::Sample2D_Text   (const TCollection_AsciiString& theText,
@@ -36,7 +35,7 @@ void Sample2D_Text::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPres
 {
   aPresentation->Clear();
 
-  Handle_Prs3d_TextAspect asp = myDrawer->TextAspect();
+  Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect();
 
   asp->SetFont(myFont);
   asp->SetColor(myColor);
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Text.h b/samples/mfc/standard/Common/Primitive/Sample2D_Text.h
index e6c33d40ee..53376aa8e8 100755
--- a/samples/mfc/standard/Common/Primitive/Sample2D_Text.h
+++ b/samples/mfc/standard/Common/Primitive/Sample2D_Text.h
@@ -38,7 +38,7 @@ inline   Standard_Boolean        GetIsZoomable() const { return myIsZoomable; }
 inline   void                    SetIsZoomable(const Standard_Boolean theIsZoomable) { myIsZoomable = theIsZoomable;}
 
 
-DEFINE_STANDARD_RTTI(Sample2D_Text,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(Sample2D_Text,AIS_InteractiveObject)
 
 private: 
  
diff --git a/samples/mfc/standard/Common/User_Cylinder.cxx b/samples/mfc/standard/Common/User_Cylinder.cxx
index 0982dd1753..6803bc7542 100755
--- a/samples/mfc/standard/Common/User_Cylinder.cxx
+++ b/samples/mfc/standard/Common/User_Cylinder.cxx
@@ -4,7 +4,7 @@
 
 // Implementation of Handle and type mgt
 //
-IMPLEMENT_STANDARD_HANDLE(User_Cylinder,AIS_InteractiveObject)
+
 IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 
 #include "ColoredMeshDlg.h"
@@ -52,8 +52,8 @@ AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant)
   myCylindricalFaceColor = Quantity_NOC_KHAKI4;
 }
 
-void User_Cylinder::Compute(const Handle_PrsMgr_PresentationManager3d& /*aPresentationManager*/,
-                            const Handle_Prs3d_Presentation& aPresentation,
+void User_Cylinder::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+                            const Handle(Prs3d_Presentation)& aPresentation,
                             const Standard_Integer aMode ) 
 {
   switch (aMode) {
@@ -308,14 +308,14 @@ case 6: //color
   }
 }
 
-void User_Cylinder::Compute(const Handle_Prs3d_Projector& aProjector,
-                            const Handle_Prs3d_Presentation& aPresentation)
+void User_Cylinder::Compute(const Handle(Prs3d_Projector)& aProjector,
+                            const Handle(Prs3d_Presentation)& aPresentation)
 {
   myDrawer->EnableDrawHiddenLine();
   StdPrs_HLRPolyShape::Add(aPresentation,myShape,myDrawer,aProjector);
 }
 
-void User_Cylinder::ComputeSelection(const Handle_SelectMgr_Selection& aSelection,
+void User_Cylinder::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
                                     const Standard_Integer aMode)
 {
   switch(aMode)
diff --git a/samples/mfc/standard/Common/User_Cylinder.hxx b/samples/mfc/standard/Common/User_Cylinder.hxx
index 00ec669a3c..807444537b 100755
--- a/samples/mfc/standard/Common/User_Cylinder.hxx
+++ b/samples/mfc/standard/Common/User_Cylinder.hxx
@@ -28,18 +28,18 @@ public:
 	void SetColor(const Quantity_Color &aColor);
 
 private:
-	void Compute(const Handle_PrsMgr_PresentationManager3d& aPresentationManager,
-				 const Handle_Prs3d_Presentation& aPresentation,
+	void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+				 const Handle(Prs3d_Presentation)& aPresentation,
 				 const Standard_Integer aMode = 0) ;
-	void ComputeSelection(const Handle_SelectMgr_Selection& aSelection,
+	void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
 						  const Standard_Integer aMode) ;
-	void Compute(const Handle_Prs3d_Projector& aProjector,const Handle_Prs3d_Presentation& aPresentation);
+	void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation);
 	Standard_Boolean TriangleIsValid(const gp_Pnt& P1,const gp_Pnt& P2,const gp_Pnt& P3) const;
 	Quantity_Color Color(gp_Pnt& thePoint,Standard_Real AltMin,Standard_Real AltMax, const Standard_Integer ColorizationMode) ;
 						
 // some methods like DynamicType() or IsKind()
 //
-DEFINE_STANDARD_RTTI(User_Cylinder,AIS_InteractiveObject)
+DEFINE_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject)
 private:
 //	Quantity_NameOfColor myCylindricalFaceColor;
 //	Quantity_NameOfColor myPlanarFaceColor;
@@ -47,7 +47,7 @@ private:
 	Quantity_Color myPlanarFaceColor;
 	TopoDS_Shape myShape;
 
-	Handle_Graphic3d_AspectFillArea3d myAspect;
+	Handle(Graphic3d_AspectFillArea3d) myAspect;
 	Standard_Real myDeflection;
 
 	Standard_Boolean myX1OnOff;
@@ -78,7 +78,7 @@ private:
 
 
 
-//Handle_Graphic3d_Texture2Dmanual mytexture;
+//Handle(Graphic3d_Texture2Dmanual) mytexture;
 
 };
 #endif
diff --git a/samples/qt/AndroidQt/AndroidQt_Window.cxx b/samples/qt/AndroidQt/AndroidQt_Window.cxx
index 5fc200c952..024b74dc75 100644
--- a/samples/qt/AndroidQt/AndroidQt_Window.cxx
+++ b/samples/qt/AndroidQt/AndroidQt_Window.cxx
@@ -13,7 +13,6 @@
 
 #include <AndroidQt_Window.h>
 
-IMPLEMENT_STANDARD_HANDLE (AndroidQt_Window, Aspect_Window)
 IMPLEMENT_STANDARD_RTTIEXT(AndroidQt_Window, Aspect_Window)
 
 // =======================================================================
diff --git a/samples/qt/AndroidQt/AndroidQt_Window.h b/samples/qt/AndroidQt/AndroidQt_Window.h
index 575b1940ea..a152c1f4e9 100644
--- a/samples/qt/AndroidQt/AndroidQt_Window.h
+++ b/samples/qt/AndroidQt/AndroidQt_Window.h
@@ -86,7 +86,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AndroidQt_Window)
+  DEFINE_STANDARD_RTTIEXT(AndroidQt_Window,Aspect_Window)
 
 };
 
diff --git a/samples/qt/Common/src/DocumentCommon.cxx b/samples/qt/Common/src/DocumentCommon.cxx
index 1c567615df..bccf024ec4 100755
--- a/samples/qt/Common/src/DocumentCommon.cxx
+++ b/samples/qt/Common/src/DocumentCommon.cxx
@@ -187,7 +187,7 @@ void DocumentCommon::onColor()
     QColor aColor ;
     Quantity_Color aShapeColor;
     myContext->InitCurrent();
-    Handle_AIS_InteractiveObject Current = myContext->Current() ;
+    Handle(AIS_InteractiveObject) Current = myContext->Current() ;
     if ( Current->HasColor () )
     {
         aShapeColor = myContext->Color( Current );
diff --git a/samples/qt/Common/src/OcctWindow.cxx b/samples/qt/Common/src/OcctWindow.cxx
index c9bc3cad44..d0af32dbf5 100644
--- a/samples/qt/Common/src/OcctWindow.cxx
+++ b/samples/qt/Common/src/OcctWindow.cxx
@@ -1,5 +1,7 @@
 #include <OcctWindow.h>
 
+IMPLEMENT_STANDARD_RTTIEXT(OcctWindow,Aspect_Window)
+
 // =======================================================================
 // function : OcctWindow
 // purpose  :
diff --git a/samples/qt/Common/src/OcctWindow.h b/samples/qt/Common/src/OcctWindow.h
index 80c9668ee8..5d82e41be4 100644
--- a/samples/qt/Common/src/OcctWindow.h
+++ b/samples/qt/Common/src/OcctWindow.h
@@ -75,7 +75,7 @@ public:
   
   virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return NULL; }
 
-  DEFINE_STANDARD_RTTI( OcctWindow, Aspect_Window )
+  DEFINE_STANDARD_RTTIEXT(OcctWindow,Aspect_Window)
 
 protected:
   Standard_Integer myXLeft;
diff --git a/src/AIS/AIS_AngleDimension.cxx b/src/AIS/AIS_AngleDimension.cxx
index 216c932f5d..a5be546ae8 100644
--- a/src/AIS/AIS_AngleDimension.cxx
+++ b/src/AIS/AIS_AngleDimension.cxx
@@ -53,6 +53,8 @@
 #include <Geom_Plane.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AngleDimension,AIS_Dimension)
+
 namespace
 {
   static const TCollection_ExtendedString THE_EMPTY_LABEL_STRING;
diff --git a/src/AIS/AIS_AngleDimension.hxx b/src/AIS/AIS_AngleDimension.hxx
index 071a485dc7..3e2278c27e 100755
--- a/src/AIS/AIS_AngleDimension.hxx
+++ b/src/AIS/AIS_AngleDimension.hxx
@@ -210,7 +210,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI (AIS_AngleDimension, AIS_Dimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_AngleDimension,AIS_Dimension)
 
 protected:
 
diff --git a/src/AIS/AIS_AttributeFilter.cxx b/src/AIS/AIS_AttributeFilter.cxx
index f889abbc46..e19e8a7c51 100644
--- a/src/AIS/AIS_AttributeFilter.cxx
+++ b/src/AIS/AIS_AttributeFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)
+
 AIS_AttributeFilter::AIS_AttributeFilter():
 hasC(Standard_False),
 hasW(Standard_False){}
diff --git a/src/AIS/AIS_AttributeFilter.hxx b/src/AIS/AIS_AttributeFilter.hxx
index 1709bf716e..54a38090b2 100644
--- a/src/AIS/AIS_AttributeFilter.hxx
+++ b/src/AIS/AIS_AttributeFilter.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_AttributeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/AIS/AIS_Axis.cxx b/src/AIS/AIS_Axis.cxx
index a1300ba373..ee9601d29f 100644
--- a/src/AIS/AIS_Axis.cxx
+++ b/src/AIS/AIS_Axis.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS.hxx>
 #include <UnitsAPI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Axis
 //purpose  :
diff --git a/src/AIS/AIS_Axis.hxx b/src/AIS/AIS_Axis.hxx
index e4efb06eaf..11db6d5cae 100644
--- a/src/AIS/AIS_Axis.hxx
+++ b/src/AIS/AIS_Axis.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Axis,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_BadEdgeFilter.cxx b/src/AIS/AIS_BadEdgeFilter.cxx
index a13b4301b7..f8ca6055a2 100644
--- a/src/AIS/AIS_BadEdgeFilter.cxx
+++ b/src/AIS/AIS_BadEdgeFilter.cxx
@@ -25,6 +25,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_BadEdgeFilter
 //purpose  : 
diff --git a/src/AIS/AIS_BadEdgeFilter.hxx b/src/AIS/AIS_BadEdgeFilter.hxx
index e83f8d4e6b..89a7e937c1 100644
--- a/src/AIS/AIS_BadEdgeFilter.hxx
+++ b/src/AIS/AIS_BadEdgeFilter.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_BadEdgeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/AIS/AIS_C0RegularityFilter.cxx b/src/AIS/AIS_C0RegularityFilter.cxx
index e0a85e0bb5..7d4c9da7a4 100644
--- a/src/AIS/AIS_C0RegularityFilter.cxx
+++ b/src/AIS/AIS_C0RegularityFilter.cxx
@@ -28,6 +28,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_C0RegularityFilter
 //purpose  : 
diff --git a/src/AIS/AIS_C0RegularityFilter.hxx b/src/AIS/AIS_C0RegularityFilter.hxx
index a43e53e50f..9b5e2c3a2d 100644
--- a/src/AIS/AIS_C0RegularityFilter.hxx
+++ b/src/AIS/AIS_C0RegularityFilter.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_C0RegularityFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/AIS/AIS_Chamf2dDimension.cxx b/src/AIS/AIS_Chamf2dDimension.cxx
index f6d79207cd..3b87603070 100644
--- a/src/AIS/AIS_Chamf2dDimension.cxx
+++ b/src/AIS/AIS_Chamf2dDimension.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/AIS/AIS_Chamf2dDimension.hxx b/src/AIS/AIS_Chamf2dDimension.hxx
index bc184d40e7..d7adc215db 100644
--- a/src/AIS/AIS_Chamf2dDimension.hxx
+++ b/src/AIS/AIS_Chamf2dDimension.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Chamf2dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_Chamf3dDimension.cxx b/src/AIS/AIS_Chamf3dDimension.cxx
index 58adb7ad9d..50d3a615f8 100644
--- a/src/AIS/AIS_Chamf3dDimension.cxx
+++ b/src/AIS/AIS_Chamf3dDimension.cxx
@@ -49,6 +49,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/AIS/AIS_Chamf3dDimension.hxx b/src/AIS/AIS_Chamf3dDimension.hxx
index 876a87e615..50d4ebf70e 100644
--- a/src/AIS/AIS_Chamf3dDimension.hxx
+++ b/src/AIS/AIS_Chamf3dDimension.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Chamf3dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_Circle.cxx b/src/AIS/AIS_Circle.cxx
index b24feb215a..b33789431b 100644
--- a/src/AIS/AIS_Circle.cxx
+++ b/src/AIS/AIS_Circle.cxx
@@ -37,6 +37,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Circle
 //purpose  : 
diff --git a/src/AIS/AIS_Circle.hxx b/src/AIS/AIS_Circle.hxx
index 57a5a4e3c3..327bf01f4c 100644
--- a/src/AIS/AIS_Circle.hxx
+++ b/src/AIS/AIS_Circle.hxx
@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Circle,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_ColorScale.cxx b/src/AIS/AIS_ColorScale.cxx
index e0edfa6ddb..d773051874 100644
--- a/src/AIS/AIS_ColorScale.cxx
+++ b/src/AIS/AIS_ColorScale.cxx
@@ -39,6 +39,8 @@
 #include <V3d_View.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_ColorScale
 //purpose  :
diff --git a/src/AIS/AIS_ColorScale.hxx b/src/AIS/AIS_ColorScale.hxx
index acb6022da9..2cd703dfeb 100644
--- a/src/AIS/AIS_ColorScale.hxx
+++ b/src/AIS/AIS_ColorScale.hxx
@@ -211,7 +211,7 @@ public:
   Standard_EXPORT void TextSize (const TCollection_ExtendedString& theText, const Standard_Integer theHeight, Standard_Integer& theWidth, Standard_Integer& theAscent, Standard_Integer& theDescent) const;
 
 
-  DEFINE_STANDARD_RTTI(AIS_ColorScale,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_ColoredShape.cxx b/src/AIS/AIS_ColoredShape.cxx
index 19af280b99..4d312437fc 100644
--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -44,6 +44,9 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape)
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer)
+
 //=======================================================================
 //function : AIS_ColoredShape
 //purpose  :
diff --git a/src/AIS/AIS_ColoredShape.hxx b/src/AIS/AIS_ColoredShape.hxx
index bd10c3ab32..1c74296eec 100644
--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@@ -54,7 +54,7 @@ public:  //! @name list of overridden properties
   Standard_Boolean myHasOwnWidth;
 
 public:
-  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer, Prs3d_Drawer);
+  DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer);
 
 };
 
@@ -175,7 +175,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AIS_ColoredShape, AIS_Shape);
+  DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape);
 
 };
 
diff --git a/src/AIS/AIS_ConcentricRelation.cxx b/src/AIS/AIS_ConcentricRelation.cxx
index b1e5c6fc09..aa11bcebbd 100644
--- a/src/AIS/AIS_ConcentricRelation.cxx
+++ b/src/AIS/AIS_ConcentricRelation.cxx
@@ -41,6 +41,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/AIS/AIS_ConcentricRelation.hxx b/src/AIS/AIS_ConcentricRelation.hxx
index 086a18b13d..620381a40f 100644
--- a/src/AIS/AIS_ConcentricRelation.hxx
+++ b/src/AIS/AIS_ConcentricRelation.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_ConcentricRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_ConnectedInteractive.cxx b/src/AIS/AIS_ConnectedInteractive.cxx
index 6a3cbb2dd3..4f74b25e80 100644
--- a/src/AIS/AIS_ConnectedInteractive.cxx
+++ b/src/AIS/AIS_ConnectedInteractive.cxx
@@ -44,6 +44,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_ConnectedInteractive
 //purpose  : 
diff --git a/src/AIS/AIS_ConnectedInteractive.hxx b/src/AIS/AIS_ConnectedInteractive.hxx
index fa1c99f42f..f7ac4c39ea 100644
--- a/src/AIS/AIS_ConnectedInteractive.hxx
+++ b/src/AIS/AIS_ConnectedInteractive.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_ConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_DiameterDimension.cxx b/src/AIS/AIS_DiameterDimension.cxx
index 69f2d13b59..495a82c733 100644
--- a/src/AIS/AIS_DiameterDimension.cxx
+++ b/src/AIS/AIS_DiameterDimension.cxx
@@ -26,6 +26,8 @@
 #include <Standard_ProgramError.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension)
+
 namespace
 {
   static const Standard_ExtCharacter THE_DIAMETER_SYMBOL (0x00D8);
diff --git a/src/AIS/AIS_DiameterDimension.hxx b/src/AIS/AIS_DiameterDimension.hxx
index b76e1db042..6c8dcac050 100644
--- a/src/AIS/AIS_DiameterDimension.hxx
+++ b/src/AIS/AIS_DiameterDimension.hxx
@@ -130,7 +130,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AIS_DiameterDimension, AIS_Dimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension)
 
 protected:
 
diff --git a/src/AIS/AIS_Dimension.cxx b/src/AIS/AIS_Dimension.cxx
index 6dff6bab65..6c808dcb8a 100755
--- a/src/AIS/AIS_Dimension.cxx
+++ b/src/AIS/AIS_Dimension.cxx
@@ -75,6 +75,8 @@
 #include <UnitsAPI_SystemUnits.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension,AIS_InteractiveObject)
+
 namespace
 {
   // default text strings
diff --git a/src/AIS/AIS_Dimension.hxx b/src/AIS/AIS_Dimension.hxx
index bdc7a12355..15c6f00c6c 100755
--- a/src/AIS/AIS_Dimension.hxx
+++ b/src/AIS/AIS_Dimension.hxx
@@ -378,7 +378,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AIS_Dimension, AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Dimension,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_DimensionOwner.cxx b/src/AIS/AIS_DimensionOwner.cxx
index 849ad18674..81094b684a 100755
--- a/src/AIS/AIS_DimensionOwner.cxx
+++ b/src/AIS/AIS_DimensionOwner.cxx
@@ -24,6 +24,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)
+
 namespace
 {
   //=======================================================================
diff --git a/src/AIS/AIS_DimensionOwner.hxx b/src/AIS/AIS_DimensionOwner.hxx
index b3b45d1d7a..c32b4edfa8 100644
--- a/src/AIS/AIS_DimensionOwner.hxx
+++ b/src/AIS/AIS_DimensionOwner.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_DimensionOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)
 
 protected:
 
diff --git a/src/AIS/AIS_EllipseRadiusDimension.cxx b/src/AIS/AIS_EllipseRadiusDimension.cxx
index 7f88c818c2..9bc9b0d94c 100644
--- a/src/AIS/AIS_EllipseRadiusDimension.cxx
+++ b/src/AIS/AIS_EllipseRadiusDimension.cxx
@@ -46,6 +46,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EllipseRadiusDimension
 //purpose  : 
diff --git a/src/AIS/AIS_EllipseRadiusDimension.hxx b/src/AIS/AIS_EllipseRadiusDimension.hxx
index ff522087b6..cb04856c3b 100644
--- a/src/AIS/AIS_EllipseRadiusDimension.hxx
+++ b/src/AIS/AIS_EllipseRadiusDimension.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_EllipseRadiusDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_EqualDistanceRelation.cxx b/src/AIS/AIS_EqualDistanceRelation.cxx
index a66c0a507a..f999dc37b2 100644
--- a/src/AIS/AIS_EqualDistanceRelation.cxx
+++ b/src/AIS/AIS_EqualDistanceRelation.cxx
@@ -48,6 +48,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EqualDistanceRelation
 //purpose  : 
diff --git a/src/AIS/AIS_EqualDistanceRelation.hxx b/src/AIS/AIS_EqualDistanceRelation.hxx
index 7ab7e0b7c2..ab21457501 100644
--- a/src/AIS/AIS_EqualDistanceRelation.hxx
+++ b/src/AIS/AIS_EqualDistanceRelation.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_EqualDistanceRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_EqualRadiusRelation.cxx b/src/AIS/AIS_EqualRadiusRelation.cxx
index 08921b1f4a..e055dad667 100644
--- a/src/AIS/AIS_EqualRadiusRelation.cxx
+++ b/src/AIS/AIS_EqualRadiusRelation.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_EqualRadiusRelation
 //purpose  : 
diff --git a/src/AIS/AIS_EqualRadiusRelation.hxx b/src/AIS/AIS_EqualRadiusRelation.hxx
index fd9b7f6f04..ae22ff8482 100644
--- a/src/AIS/AIS_EqualRadiusRelation.hxx
+++ b/src/AIS/AIS_EqualRadiusRelation.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_EqualRadiusRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_ExclusionFilter.cxx b/src/AIS/AIS_ExclusionFilter.cxx
index 00b65f5304..46e9878d53 100644
--- a/src/AIS/AIS_ExclusionFilter.cxx
+++ b/src/AIS/AIS_ExclusionFilter.cxx
@@ -23,6 +23,8 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
+
 //=======================================================================
 //function : AIS_ExclusionFilter
 //purpose  : Constructors
diff --git a/src/AIS/AIS_ExclusionFilter.hxx b/src/AIS/AIS_ExclusionFilter.hxx
index 7aeef5a939..163865bc2e 100644
--- a/src/AIS/AIS_ExclusionFilter.hxx
+++ b/src/AIS/AIS_ExclusionFilter.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_ExclusionFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/AIS/AIS_FixRelation.cxx b/src/AIS/AIS_FixRelation.cxx
index f6583f140c..4497926a63 100644
--- a/src/AIS/AIS_FixRelation.cxx
+++ b/src/AIS/AIS_FixRelation.cxx
@@ -57,6 +57,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
+
 static Standard_Boolean InDomain(const Standard_Real fpar,
 					const Standard_Real lpar,
 					const Standard_Real para) 
diff --git a/src/AIS/AIS_FixRelation.hxx b/src/AIS/AIS_FixRelation.hxx
index 5d1a6d495e..39e118381e 100644
--- a/src/AIS/AIS_FixRelation.hxx
+++ b/src/AIS/AIS_FixRelation.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_FixRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_GlobalStatus.cxx b/src/AIS/AIS_GlobalStatus.cxx
index 36481e1c58..ee999f73f0 100644
--- a/src/AIS/AIS_GlobalStatus.cxx
+++ b/src/AIS/AIS_GlobalStatus.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_GlobalStatus,MMgt_TShared)
+
 AIS_GlobalStatus::AIS_GlobalStatus():
 myStatus(AIS_DS_None),
 myLayerIndex(0),
diff --git a/src/AIS/AIS_GlobalStatus.hxx b/src/AIS/AIS_GlobalStatus.hxx
index a91abab14c..faec81e7a4 100644
--- a/src/AIS/AIS_GlobalStatus.hxx
+++ b/src/AIS/AIS_GlobalStatus.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_GlobalStatus,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AIS_GlobalStatus,MMgt_TShared)
 
 protected:
 
diff --git a/src/AIS/AIS_IdenticRelation.cxx b/src/AIS/AIS_IdenticRelation.cxx
index 1fabed9483..ad243462a4 100644
--- a/src/AIS/AIS_IdenticRelation.cxx
+++ b/src/AIS/AIS_IdenticRelation.cxx
@@ -55,6 +55,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
+
 // jfa 15/10/2000
 static Standard_Real Modulo2PI(const Standard_Real ANGLE)
 {
diff --git a/src/AIS/AIS_IdenticRelation.hxx b/src/AIS/AIS_IdenticRelation.hxx
index a010ecc13f..8d06e37bf2 100644
--- a/src/AIS/AIS_IdenticRelation.hxx
+++ b/src/AIS/AIS_IdenticRelation.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_IdenticRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index 85b873fe52..a8c9cd4160 100644
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -62,6 +62,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveContext,MMgt_TShared)
+
 //#include <AIS_DataMapIteratorOfDataMapOfInteractiveInteger.hxx>
 namespace
 {
diff --git a/src/AIS/AIS_InteractiveContext.hxx b/src/AIS/AIS_InteractiveContext.hxx
index 27b8311154..e407076461 100644
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -1566,7 +1566,7 @@ public:
 friend class AIS_LocalContext;
 
 
-  DEFINE_STANDARD_RTTI(AIS_InteractiveContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AIS_InteractiveContext,MMgt_TShared)
 
 protected:
 
diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx
index 696b06ac25..80a9e793bc 100644
--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -44,6 +44,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
+
 //=======================================================================
 //function : AIS_InteractiveObject
 //purpose  : 
diff --git a/src/AIS/AIS_InteractiveObject.hxx b/src/AIS/AIS_InteractiveObject.hxx
index bd6551faf5..b21994bf0b 100644
--- a/src/AIS/AIS_InteractiveObject.hxx
+++ b/src/AIS/AIS_InteractiveObject.hxx
@@ -460,7 +460,7 @@ public:
 friend class AIS_InteractiveContext;
 
 
-  DEFINE_STANDARD_RTTI(AIS_InteractiveObject,SelectMgr_SelectableObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
 
 protected:
 
diff --git a/src/AIS/AIS_LengthDimension.cxx b/src/AIS/AIS_LengthDimension.cxx
index f941818883..ad63207696 100755
--- a/src/AIS/AIS_LengthDimension.cxx
+++ b/src/AIS/AIS_LengthDimension.cxx
@@ -36,6 +36,8 @@
 #include <TopExp_Explorer.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
+
 //=======================================================================
 //function : Constructor
 //purpose  : Dimension between two faces
diff --git a/src/AIS/AIS_LengthDimension.hxx b/src/AIS/AIS_LengthDimension.hxx
index 3416df3e69..c5cbfce2ae 100755
--- a/src/AIS/AIS_LengthDimension.hxx
+++ b/src/AIS/AIS_LengthDimension.hxx
@@ -196,7 +196,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AIS_LengthDimension, AIS_Dimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
 
 protected:
 
diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx
index cf10bd6c00..93422d02db 100644
--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -39,6 +39,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
+
 //==================================================================
 // function: FindLimits
 // purpose:
diff --git a/src/AIS/AIS_Line.hxx b/src/AIS/AIS_Line.hxx
index 6f09b8520e..b0afd0a25c 100644
--- a/src/AIS/AIS_Line.hxx
+++ b/src/AIS/AIS_Line.hxx
@@ -103,7 +103,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Line,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_LocalContext.cxx b/src/AIS/AIS_LocalContext.cxx
index 1d992a8a3e..6e64c8bdac 100644
--- a/src/AIS/AIS_LocalContext.cxx
+++ b/src/AIS/AIS_LocalContext.cxx
@@ -49,6 +49,8 @@
 #include <V3d_Viewer.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalContext,MMgt_TShared)
+
 static TCollection_AsciiString AIS_Local_SelName(const Standard_Address address,
                                                  const Standard_Integer anIndex)
 {
diff --git a/src/AIS/AIS_LocalContext.hxx b/src/AIS/AIS_LocalContext.hxx
index 02972a28e6..bf5eeeb549 100644
--- a/src/AIS/AIS_LocalContext.hxx
+++ b/src/AIS/AIS_LocalContext.hxx
@@ -359,7 +359,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_LocalContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AIS_LocalContext,MMgt_TShared)
 
 protected:
 
diff --git a/src/AIS/AIS_LocalStatus.cxx b/src/AIS/AIS_LocalStatus.cxx
index aa4389280f..9423020f60 100644
--- a/src/AIS/AIS_LocalStatus.cxx
+++ b/src/AIS/AIS_LocalStatus.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalStatus,MMgt_TShared)
+
 AIS_LocalStatus::AIS_LocalStatus(const Standard_Boolean IsTemp,
 				 const Standard_Boolean Decomp,
 				 const Standard_Integer DMode,
diff --git a/src/AIS/AIS_LocalStatus.hxx b/src/AIS/AIS_LocalStatus.hxx
index 255db73e10..8586690c8a 100644
--- a/src/AIS/AIS_LocalStatus.hxx
+++ b/src/AIS/AIS_LocalStatus.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_LocalStatus,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AIS_LocalStatus,MMgt_TShared)
 
 protected:
 
diff --git a/src/AIS/AIS_MaxRadiusDimension.cxx b/src/AIS/AIS_MaxRadiusDimension.cxx
index 00f3110fcf..44eeb6d532 100644
--- a/src/AIS/AIS_MaxRadiusDimension.cxx
+++ b/src/AIS/AIS_MaxRadiusDimension.cxx
@@ -58,6 +58,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
+
 //=======================================================================
 //function : AIS_MaxRadiusDimension
 //purpose  : 
diff --git a/src/AIS/AIS_MaxRadiusDimension.hxx b/src/AIS/AIS_MaxRadiusDimension.hxx
index 42b8e7f66b..435e58b424 100644
--- a/src/AIS/AIS_MaxRadiusDimension.hxx
+++ b/src/AIS/AIS_MaxRadiusDimension.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
 
 protected:
 
diff --git a/src/AIS/AIS_MidPointRelation.cxx b/src/AIS/AIS_MidPointRelation.cxx
index 6145474ec3..c64c5ad68c 100644
--- a/src/AIS/AIS_MidPointRelation.cxx
+++ b/src/AIS/AIS_MidPointRelation.cxx
@@ -53,6 +53,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_MidPointRelation
 //purpose  : 
diff --git a/src/AIS/AIS_MidPointRelation.hxx b/src/AIS/AIS_MidPointRelation.hxx
index 545f15f500..e2f814f287 100644
--- a/src/AIS/AIS_MidPointRelation.hxx
+++ b/src/AIS/AIS_MidPointRelation.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_MidPointRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_MinRadiusDimension.cxx b/src/AIS/AIS_MinRadiusDimension.cxx
index 5ee9dfd646..3263f01da0 100644
--- a/src/AIS/AIS_MinRadiusDimension.cxx
+++ b/src/AIS/AIS_MinRadiusDimension.cxx
@@ -58,6 +58,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
+
 //=======================================================================
 //function : AIS_MinRadiusDimension
 //purpose  : 
diff --git a/src/AIS/AIS_MinRadiusDimension.hxx b/src/AIS/AIS_MinRadiusDimension.hxx
index 09aaf80188..dafc902942 100644
--- a/src/AIS/AIS_MinRadiusDimension.hxx
+++ b/src/AIS/AIS_MinRadiusDimension.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
 
 protected:
 
diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cxx b/src/AIS/AIS_MultipleConnectedInteractive.cxx
index 07cacceaaa..64da42d126 100644
--- a/src/AIS/AIS_MultipleConnectedInteractive.cxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
+
 namespace
 {
   //! SelectMgr_AssemblyEntityOwner replaces original owners in sensitive entities
diff --git a/src/AIS/AIS_MultipleConnectedInteractive.hxx b/src/AIS/AIS_MultipleConnectedInteractive.hxx
index da91330ecb..137010c8f2 100644
--- a/src/AIS/AIS_MultipleConnectedInteractive.hxx
+++ b/src/AIS/AIS_MultipleConnectedInteractive.hxx
@@ -100,7 +100,7 @@ public:
   Standard_EXPORT virtual Handle(SelectMgr_EntityOwner) GlobalSelOwner() const Standard_OVERRIDE;
 
 
-  DEFINE_STANDARD_RTTI(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_OffsetDimension.cxx b/src/AIS/AIS_OffsetDimension.cxx
index bd8d8fa4e4..f41cbaa86b 100644
--- a/src/AIS/AIS_OffsetDimension.cxx
+++ b/src/AIS/AIS_OffsetDimension.cxx
@@ -56,6 +56,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)
+
 //=======================================================================
 //function : AIS_OffsetDimension
 //purpose  : 
diff --git a/src/AIS/AIS_OffsetDimension.hxx b/src/AIS/AIS_OffsetDimension.hxx
index 23e2690051..5230255a2f 100644
--- a/src/AIS/AIS_OffsetDimension.hxx
+++ b/src/AIS/AIS_OffsetDimension.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_OffsetDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_ParallelRelation.cxx b/src/AIS/AIS_ParallelRelation.cxx
index d3a594c8d4..7ad88331f4 100644
--- a/src/AIS/AIS_ParallelRelation.cxx
+++ b/src/AIS/AIS_ParallelRelation.cxx
@@ -52,6 +52,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/AIS/AIS_ParallelRelation.hxx b/src/AIS/AIS_ParallelRelation.hxx
index f1a65f58cc..0f821bbf7d 100644
--- a/src/AIS/AIS_ParallelRelation.hxx
+++ b/src/AIS/AIS_ParallelRelation.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_ParallelRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_PerpendicularRelation.cxx b/src/AIS/AIS_PerpendicularRelation.cxx
index 26610923f0..8d9f90e48c 100644
--- a/src/AIS/AIS_PerpendicularRelation.cxx
+++ b/src/AIS/AIS_PerpendicularRelation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_PerpendicularRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : TwoEdgesPerpendicular
diff --git a/src/AIS/AIS_PerpendicularRelation.hxx b/src/AIS/AIS_PerpendicularRelation.hxx
index e1b0b1f81d..83de38c925 100644
--- a/src/AIS/AIS_PerpendicularRelation.hxx
+++ b/src/AIS/AIS_PerpendicularRelation.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_PerpendicularRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_PerpendicularRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_Plane.cxx b/src/AIS/AIS_Plane.cxx
index 64fd3e1f69..9566f5f735 100644
--- a/src/AIS/AIS_Plane.cxx
+++ b/src/AIS/AIS_Plane.cxx
@@ -54,6 +54,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <UnitsAPI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Plane,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Plane
 //purpose  : 
diff --git a/src/AIS/AIS_Plane.hxx b/src/AIS/AIS_Plane.hxx
index f1eef41cf6..b5419082de 100644
--- a/src/AIS/AIS_Plane.hxx
+++ b/src/AIS/AIS_Plane.hxx
@@ -173,7 +173,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Plane,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Plane,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx
index 469fb70b40..9f6ae8ea2f 100644
--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -54,6 +54,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <UnitsAPI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_PlaneTrihedron,AIS_InteractiveObject)
+
 void  ExtremityPoints(TColgp_Array1OfPnt& PP,const Handle(Geom_Plane)& myPlane,const Handle(Prs3d_Drawer)& myDrawer);
 
 //=======================================================================
diff --git a/src/AIS/AIS_PlaneTrihedron.hxx b/src/AIS/AIS_PlaneTrihedron.hxx
index 8440f99be5..99277fd50f 100644
--- a/src/AIS/AIS_PlaneTrihedron.hxx
+++ b/src/AIS/AIS_PlaneTrihedron.hxx
@@ -120,7 +120,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_PlaneTrihedron,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_PlaneTrihedron,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx
index f974357849..93325280c6 100644
--- a/src/AIS/AIS_Point.cxx
+++ b/src/AIS/AIS_Point.cxx
@@ -37,6 +37,8 @@
 #include <StdPrs_Point.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Point,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Point
 //purpose  : 
diff --git a/src/AIS/AIS_Point.hxx b/src/AIS/AIS_Point.hxx
index de86803338..db994a0742 100644
--- a/src/AIS/AIS_Point.hxx
+++ b/src/AIS/AIS_Point.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Point,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Point,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_PointCloud.cxx b/src/AIS/AIS_PointCloud.cxx
index f055a5f143..efefed73a2 100644
--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@@ -32,6 +32,8 @@
 #include <StdPrs_BndBox.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_PointCloud,AIS_InteractiveObject)
+
 //==================================================
 // Function: AIS_PointCloud
 // Purpose : Constructor
diff --git a/src/AIS/AIS_PointCloud.hxx b/src/AIS/AIS_PointCloud.hxx
index c762880c64..f9a31486ea 100644
--- a/src/AIS/AIS_PointCloud.hxx
+++ b/src/AIS/AIS_PointCloud.hxx
@@ -122,7 +122,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(AIS_PointCloud, AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_PointCloud,AIS_InteractiveObject)
 
 };
 
diff --git a/src/AIS/AIS_RadiusDimension.cxx b/src/AIS/AIS_RadiusDimension.cxx
index b51601fb07..016bee560b 100644
--- a/src/AIS/AIS_RadiusDimension.cxx
+++ b/src/AIS/AIS_RadiusDimension.cxx
@@ -22,6 +22,8 @@
 #include <gce_MakeDir.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_RadiusDimension,AIS_Dimension)
+
 namespace
 {
   static const Standard_ExtCharacter THE_RADIUS_SYMBOL ('R');
diff --git a/src/AIS/AIS_RadiusDimension.hxx b/src/AIS/AIS_RadiusDimension.hxx
index 8e97dbb8aa..913aa08ba5 100644
--- a/src/AIS/AIS_RadiusDimension.hxx
+++ b/src/AIS/AIS_RadiusDimension.hxx
@@ -118,7 +118,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI (AIS_RadiusDimension, AIS_Dimension)
+  DEFINE_STANDARD_RTTIEXT(AIS_RadiusDimension,AIS_Dimension)
 
 protected:
 
diff --git a/src/AIS/AIS_Relation.cxx b/src/AIS/AIS_Relation.cxx
index 9498018e83..a3b64ee789 100644
--- a/src/AIS/AIS_Relation.cxx
+++ b/src/AIS/AIS_Relation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Relation,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Relation
 //purpose  : 
diff --git a/src/AIS/AIS_Relation.hxx b/src/AIS/AIS_Relation.hxx
index 28e7e7e043..594f2f9ed7 100644
--- a/src/AIS/AIS_Relation.hxx
+++ b/src/AIS/AIS_Relation.hxx
@@ -193,7 +193,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Relation,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Relation,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx
index fadca41ba6..5e05506a0b 100644
--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Selection,MMgt_TShared)
+
 #define MaxSizeOfResult 100000
 
 //current selection (handle)
diff --git a/src/AIS/AIS_Selection.hxx b/src/AIS/AIS_Selection.hxx
index 61884ee66e..19c8bb96ac 100644
--- a/src/AIS/AIS_Selection.hxx
+++ b/src/AIS/AIS_Selection.hxx
@@ -120,7 +120,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Selection,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AIS_Selection,MMgt_TShared)
 
 protected:
 
diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx
index 05d4e451cc..f25df9cdc8 100644
--- a/src/AIS/AIS_Shape.cxx
+++ b/src/AIS/AIS_Shape.cxx
@@ -68,6 +68,8 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Shape,AIS_InteractiveObject)
+
 static Standard_Boolean myFirstCompute;
 
 static Standard_Boolean IsInList(const TColStd_ListOfInteger& LL, const Standard_Integer aMode)
diff --git a/src/AIS/AIS_Shape.hxx b/src/AIS/AIS_Shape.hxx
index 4ba1b1d91c..9fdf9212a4 100644
--- a/src/AIS/AIS_Shape.hxx
+++ b/src/AIS/AIS_Shape.hxx
@@ -241,7 +241,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Shape,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Shape,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_SignatureFilter.cxx b/src/AIS/AIS_SignatureFilter.cxx
index 228b01f5df..d5d82e57ba 100644
--- a/src/AIS/AIS_SignatureFilter.cxx
+++ b/src/AIS/AIS_SignatureFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_SignatureFilter,AIS_TypeFilter)
+
 AIS_SignatureFilter::AIS_SignatureFilter(const AIS_KindOfInteractive TheKind,
 					 const Standard_Integer      TheSignature):
 AIS_TypeFilter(TheKind),
diff --git a/src/AIS/AIS_SignatureFilter.hxx b/src/AIS/AIS_SignatureFilter.hxx
index d77b1710e2..8e977b7dd2 100644
--- a/src/AIS/AIS_SignatureFilter.hxx
+++ b/src/AIS/AIS_SignatureFilter.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_SignatureFilter,AIS_TypeFilter)
+  DEFINE_STANDARD_RTTIEXT(AIS_SignatureFilter,AIS_TypeFilter)
 
 protected:
 
diff --git a/src/AIS/AIS_SymmetricRelation.cxx b/src/AIS/AIS_SymmetricRelation.cxx
index fc48372a28..633c9f9d64 100644
--- a/src/AIS/AIS_SymmetricRelation.cxx
+++ b/src/AIS/AIS_SymmetricRelation.cxx
@@ -50,6 +50,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_SymmetricRelation,AIS_Relation)
+
 //=======================================================================
 //function : AIS_SymmetricRelation
 //purpose  : 
diff --git a/src/AIS/AIS_SymmetricRelation.hxx b/src/AIS/AIS_SymmetricRelation.hxx
index 0bac468466..e0487ba28a 100644
--- a/src/AIS/AIS_SymmetricRelation.hxx
+++ b/src/AIS/AIS_SymmetricRelation.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_SymmetricRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_SymmetricRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_TangentRelation.cxx b/src/AIS/AIS_TangentRelation.cxx
index 31ef2882c5..9660554006 100644
--- a/src/AIS/AIS_TangentRelation.cxx
+++ b/src/AIS/AIS_TangentRelation.cxx
@@ -52,6 +52,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_TangentRelation,AIS_Relation)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/AIS/AIS_TangentRelation.hxx b/src/AIS/AIS_TangentRelation.hxx
index 280c0d9dca..032d5ede81 100644
--- a/src/AIS/AIS_TangentRelation.hxx
+++ b/src/AIS/AIS_TangentRelation.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_TangentRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTIEXT(AIS_TangentRelation,AIS_Relation)
 
 protected:
 
diff --git a/src/AIS/AIS_TextLabel.cxx b/src/AIS/AIS_TextLabel.cxx
index 3f2ae73f7e..94462acdfc 100644
--- a/src/AIS/AIS_TextLabel.cxx
+++ b/src/AIS/AIS_TextLabel.cxx
@@ -24,6 +24,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_TextLabel
 //purpose  :
diff --git a/src/AIS/AIS_TextLabel.hxx b/src/AIS/AIS_TextLabel.hxx
index f4dedc9ff3..5289c6c9fa 100644
--- a/src/AIS/AIS_TextLabel.hxx
+++ b/src/AIS/AIS_TextLabel.hxx
@@ -115,7 +115,7 @@ protected:
 public:
 
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(AIS_TextLabel, AIS_InteractiveObject);
+  DEFINE_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject);
 
 };
 
diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx
index cb5bc279f4..b370b76ea4 100644
--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -41,6 +41,8 @@
 #include <TopExp_Explorer.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_TexturedShape,AIS_Shape)
+
 //=======================================================================
 //function : AIS_TexturedShape
 //purpose  :
diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx
index 34b7d44684..5f82dfea69 100644
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -206,7 +206,7 @@ protected: //! @name texture mapping properties
 
 public:
 
-  DEFINE_STANDARD_RTTI (AIS_TexturedShape, AIS_Shape)
+  DEFINE_STANDARD_RTTIEXT(AIS_TexturedShape,AIS_Shape)
 
 };
 
diff --git a/src/AIS/AIS_Triangulation.cxx b/src/AIS/AIS_Triangulation.cxx
index c1dc81253d..f0656b6074 100644
--- a/src/AIS/AIS_Triangulation.cxx
+++ b/src/AIS/AIS_Triangulation.cxx
@@ -28,6 +28,8 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Triangulation,AIS_InteractiveObject)
+
 AIS_Triangulation::AIS_Triangulation(const Handle(Poly_Triangulation)& Triangulation)
 {
   myTriangulation = Triangulation;
diff --git a/src/AIS/AIS_Triangulation.hxx b/src/AIS/AIS_Triangulation.hxx
index fe28387316..2f86b21368 100644
--- a/src/AIS/AIS_Triangulation.hxx
+++ b/src/AIS/AIS_Triangulation.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_Triangulation,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Triangulation,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx
index a966a4424c..62e4c4d1bb 100644
--- a/src/AIS/AIS_Trihedron.cxx
+++ b/src/AIS/AIS_Trihedron.cxx
@@ -57,6 +57,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_Trihedron,AIS_InteractiveObject)
+
 //=======================================================================
 //function : AIS_Trihedron
 //purpose  : 
diff --git a/src/AIS/AIS_Trihedron.hxx b/src/AIS/AIS_Trihedron.hxx
index b89e105770..03887c81ba 100644
--- a/src/AIS/AIS_Trihedron.hxx
+++ b/src/AIS/AIS_Trihedron.hxx
@@ -168,7 +168,7 @@ public:
   //! Removes the non-default settings for width set in SetWidth.
   Standard_EXPORT void UnsetWidth() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(AIS_Trihedron,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_Trihedron,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/AIS/AIS_TypeFilter.cxx b/src/AIS/AIS_TypeFilter.cxx
index a537006187..4d8221d18b 100644
--- a/src/AIS/AIS_TypeFilter.cxx
+++ b/src/AIS/AIS_TypeFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AIS_TypeFilter,SelectMgr_Filter)
+
 AIS_TypeFilter::AIS_TypeFilter(const AIS_KindOfInteractive TheKind):
 myKind(TheKind){}
 
diff --git a/src/AIS/AIS_TypeFilter.hxx b/src/AIS/AIS_TypeFilter.hxx
index a0ddfb44d4..4fa6230053 100644
--- a/src/AIS/AIS_TypeFilter.hxx
+++ b/src/AIS/AIS_TypeFilter.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AIS_TypeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(AIS_TypeFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx b/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
index 9bbdca62a1..0dd3bfa111 100644
--- a/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
+++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(APIHeaderSection_EditHeader,IFSelect_Editor)
+
 static Standard_Boolean IsTimeStamp
   (const Handle(TCollection_HAsciiString)& val)
 {
diff --git a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
index 6b54e28eed..ca5543d907 100644
--- a/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
+++ b/src/APIHeaderSection/APIHeaderSection_EditHeader.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(APIHeaderSection_EditHeader,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(APIHeaderSection_EditHeader,IFSelect_Editor)
 
 protected:
 
diff --git a/src/Adaptor2d/Adaptor2d_HCurve2d.cxx b/src/Adaptor2d/Adaptor2d_HCurve2d.cxx
index b4a7e3b40b..4b57119cdf 100644
--- a/src/Adaptor2d/Adaptor2d_HCurve2d.cxx
+++ b/src/Adaptor2d/Adaptor2d_HCurve2d.cxx
@@ -23,3 +23,5 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Adaptor2d_HCurve2d,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Adaptor2d/Adaptor2d_HCurve2d.hxx b/src/Adaptor2d/Adaptor2d_HCurve2d.hxx
index 4923873f8f..c8e6838556 100644
--- a/src/Adaptor2d/Adaptor2d_HCurve2d.hxx
+++ b/src/Adaptor2d/Adaptor2d_HCurve2d.hxx
@@ -119,7 +119,7 @@ public:
     virtual Handle(Geom2d_BSplineCurve) BSpline() const;
 
 
-  DEFINE_STANDARD_RTTI(Adaptor2d_HCurve2d,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Adaptor2d_HCurve2d,MMgt_TShared)
 };
 
 #include <Adaptor2d_HCurve2d.lxx>
diff --git a/src/Adaptor2d/Adaptor2d_HLine2d.hxx b/src/Adaptor2d/Adaptor2d_HLine2d.hxx
index ed7aaf5dcd..de28c8d272 100644
--- a/src/Adaptor2d/Adaptor2d_HLine2d.hxx
+++ b/src/Adaptor2d/Adaptor2d_HLine2d.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor2d_HLine2d,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(Adaptor2d_HLine2d,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx b/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx
index 52e942ccd2..082d6718db 100644
--- a/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx
+++ b/src/Adaptor2d/Adaptor2d_HOffsetCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor2d_HOffsetCurve,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(Adaptor2d_HOffsetCurve,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_HCurve.cxx b/src/Adaptor3d/Adaptor3d_HCurve.cxx
index ce006dfe39..160c1ecba2 100644
--- a/src/Adaptor3d/Adaptor3d_HCurve.cxx
+++ b/src/Adaptor3d/Adaptor3d_HCurve.cxx
@@ -22,3 +22,5 @@
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_HCurve,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Adaptor3d/Adaptor3d_HCurve.hxx b/src/Adaptor3d/Adaptor3d_HCurve.hxx
index 4b8e51806e..2ca8d2522d 100644
--- a/src/Adaptor3d/Adaptor3d_HCurve.hxx
+++ b/src/Adaptor3d/Adaptor3d_HCurve.hxx
@@ -137,7 +137,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_HCurve,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Adaptor3d_HCurve,MMgt_TShared)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx b/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx
index 832a7016e0..4ccc7d0e0d 100644
--- a/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx
+++ b/src/Adaptor3d/Adaptor3d_HCurveOnSurface.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_HCurveOnSurface,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(Adaptor3d_HCurveOnSurface,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx b/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx
index 8d2cbc83e8..56da57daf7 100644
--- a/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx
+++ b/src/Adaptor3d/Adaptor3d_HIsoCurve.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_HIsoCurve,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(Adaptor3d_HIsoCurve,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_HSurface.cxx b/src/Adaptor3d/Adaptor3d_HSurface.cxx
index 9cbdd327cb..f49e1cc1d6 100644
--- a/src/Adaptor3d/Adaptor3d_HSurface.cxx
+++ b/src/Adaptor3d/Adaptor3d_HSurface.cxx
@@ -24,3 +24,5 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_HSurface,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Adaptor3d/Adaptor3d_HSurface.hxx b/src/Adaptor3d/Adaptor3d_HSurface.hxx
index 86ee29f54b..bd3d63258e 100644
--- a/src/Adaptor3d/Adaptor3d_HSurface.hxx
+++ b/src/Adaptor3d/Adaptor3d_HSurface.hxx
@@ -164,7 +164,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_HSurface,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Adaptor3d_HSurface,MMgt_TShared)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_HVertex.cxx b/src/Adaptor3d/Adaptor3d_HVertex.cxx
index 8252cdc307..00b1f6e641 100644
--- a/src/Adaptor3d/Adaptor3d_HVertex.cxx
+++ b/src/Adaptor3d/Adaptor3d_HVertex.cxx
@@ -19,6 +19,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_HVertex,MMgt_TShared)
+
 Adaptor3d_HVertex::Adaptor3d_HVertex ()
 {}
 
diff --git a/src/Adaptor3d/Adaptor3d_HVertex.hxx b/src/Adaptor3d/Adaptor3d_HVertex.hxx
index 498b63b3ee..56220cb3a1 100644
--- a/src/Adaptor3d/Adaptor3d_HVertex.hxx
+++ b/src/Adaptor3d/Adaptor3d_HVertex.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_HVertex,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Adaptor3d_HVertex,MMgt_TShared)
 
 protected:
 
diff --git a/src/Adaptor3d/Adaptor3d_TopolTool.cxx b/src/Adaptor3d/Adaptor3d_TopolTool.cxx
index 2747c0bfd6..fcf9ae978f 100644
--- a/src/Adaptor3d/Adaptor3d_TopolTool.cxx
+++ b/src/Adaptor3d/Adaptor3d_TopolTool.cxx
@@ -27,6 +27,8 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Adaptor3d_TopolTool,MMgt_TShared)
+
 #define myInfinite Precision::Infinite()
 
 static void GetConeApexParam(const gp_Cone& C, Standard_Real& U, Standard_Real& V)
diff --git a/src/Adaptor3d/Adaptor3d_TopolTool.hxx b/src/Adaptor3d/Adaptor3d_TopolTool.hxx
index aa172beb4e..74912268c7 100644
--- a/src/Adaptor3d/Adaptor3d_TopolTool.hxx
+++ b/src/Adaptor3d/Adaptor3d_TopolTool.hxx
@@ -154,7 +154,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Adaptor3d_TopolTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Adaptor3d_TopolTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/AppDef/AppDef_LinearCriteria.cxx b/src/AppDef/AppDef_LinearCriteria.cxx
index 6a167eb375..826c6572ce 100644
--- a/src/AppDef/AppDef_LinearCriteria.cxx
+++ b/src/AppDef/AppDef_LinearCriteria.cxx
@@ -38,6 +38,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AppDef_LinearCriteria,AppDef_SmoothCriterion)
+
 static Standard_Integer order(const Handle(PLib_Base)& B)
 {
   return (*( Handle(PLib_HermitJacobi)*)&B)->NivConstr();
diff --git a/src/AppDef/AppDef_LinearCriteria.hxx b/src/AppDef/AppDef_LinearCriteria.hxx
index 5868ea59db..ca11ee53c8 100644
--- a/src/AppDef/AppDef_LinearCriteria.hxx
+++ b/src/AppDef/AppDef_LinearCriteria.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AppDef_LinearCriteria,AppDef_SmoothCriterion)
+  DEFINE_STANDARD_RTTIEXT(AppDef_LinearCriteria,AppDef_SmoothCriterion)
 
 protected:
 
diff --git a/src/AppDef/AppDef_SmoothCriterion.cxx b/src/AppDef/AppDef_SmoothCriterion.cxx
index 5cd0fb9eea..7c554212cb 100644
--- a/src/AppDef/AppDef_SmoothCriterion.cxx
+++ b/src/AppDef/AppDef_SmoothCriterion.cxx
@@ -21,3 +21,5 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(AppDef_SmoothCriterion,MMgt_TShared)
\ No newline at end of file
diff --git a/src/AppDef/AppDef_SmoothCriterion.hxx b/src/AppDef/AppDef_SmoothCriterion.hxx
index 74f10bee3d..56cff99340 100644
--- a/src/AppDef/AppDef_SmoothCriterion.hxx
+++ b/src/AppDef/AppDef_SmoothCriterion.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AppDef_SmoothCriterion,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(AppDef_SmoothCriterion,MMgt_TShared)
 
 protected:
 
diff --git a/src/AppStd/AppStd_Application.cxx b/src/AppStd/AppStd_Application.cxx
index aabc8fbc54..471ea329d1 100644
--- a/src/AppStd/AppStd_Application.cxx
+++ b/src/AppStd/AppStd_Application.cxx
@@ -20,6 +20,8 @@
 #include <CDM_MessageDriver.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application)
+
 //=======================================================================
 //function : AppStd_Application
 //purpose  : 
diff --git a/src/AppStd/AppStd_Application.hxx b/src/AppStd/AppStd_Application.hxx
index 548384ba56..7c09ba9e98 100644
--- a/src/AppStd/AppStd_Application.hxx
+++ b/src/AppStd/AppStd_Application.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AppStd_Application,TDocStd_Application)
+  DEFINE_STANDARD_RTTIEXT(AppStd_Application,TDocStd_Application)
 
 protected:
 
diff --git a/src/AppStdL/AppStdL_Application.cxx b/src/AppStdL/AppStdL_Application.cxx
index 17609f67b9..a04b6622a2 100644
--- a/src/AppStdL/AppStdL_Application.cxx
+++ b/src/AppStdL/AppStdL_Application.cxx
@@ -20,6 +20,8 @@
 #include <CDM_MessageDriver.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application)
+
 //=======================================================================
 //function : AppStdL_Application
 //purpose  : 
diff --git a/src/AppStdL/AppStdL_Application.hxx b/src/AppStdL/AppStdL_Application.hxx
index a7ca50de80..7c0987b1ef 100644
--- a/src/AppStdL/AppStdL_Application.hxx
+++ b/src/AppStdL/AppStdL_Application.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(AppStdL_Application,TDocStd_Application)
+  DEFINE_STANDARD_RTTIEXT(AppStdL_Application,TDocStd_Application)
 
 protected:
 
diff --git a/src/Approx/Approx_CurvlinFunc.cxx b/src/Approx/Approx_CurvlinFunc.cxx
index 00f7b8b95c..84bea9e7c8 100644
--- a/src/Approx/Approx_CurvlinFunc.cxx
+++ b/src/Approx/Approx_CurvlinFunc.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Approx_CurvlinFunc,MMgt_TShared)
+
 #ifdef OCCT_DEBUG_CHRONO
 #include <OSD_Timer.hxx>
 static OSD_Chronometer chr_uparam;
diff --git a/src/Approx/Approx_CurvlinFunc.hxx b/src/Approx/Approx_CurvlinFunc.hxx
index e73848ddea..05493b9c85 100644
--- a/src/Approx/Approx_CurvlinFunc.hxx
+++ b/src/Approx/Approx_CurvlinFunc.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Approx_CurvlinFunc,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Approx_CurvlinFunc,MMgt_TShared)
 
 protected:
 
diff --git a/src/Approx/Approx_SweepFunction.cxx b/src/Approx/Approx_SweepFunction.cxx
index b2ae480cab..634b77f8ae 100644
--- a/src/Approx/Approx_SweepFunction.cxx
+++ b/src/Approx/Approx_SweepFunction.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Approx_SweepFunction,MMgt_TShared)
+
 // Standard_Boolean Approx_SweepFunction::D1(const Standard_Real Param,const Standard_Real First,const Standard_Real Last,TColgp_Array1OfPnt& Poles,TColgp_Array1OfVec& DPoles,TColgp_Array1OfPnt2d& Poles2d,TColgp_Array1OfVec2d& DPoles2d,TColStd_Array1OfReal& Weigths,TColStd_Array1OfReal& DWeigths) 
 Standard_Boolean Approx_SweepFunction::D1(const Standard_Real ,const Standard_Real ,const Standard_Real ,TColgp_Array1OfPnt& ,TColgp_Array1OfVec& ,TColgp_Array1OfPnt2d& ,TColgp_Array1OfVec2d& ,TColStd_Array1OfReal& ,TColStd_Array1OfReal& ) 
 {
diff --git a/src/Approx/Approx_SweepFunction.hxx b/src/Approx/Approx_SweepFunction.hxx
index 21682d9899..8455044e07 100644
--- a/src/Approx/Approx_SweepFunction.hxx
+++ b/src/Approx/Approx_SweepFunction.hxx
@@ -131,7 +131,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Approx_SweepFunction,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Approx_SweepFunction,MMgt_TShared)
 
 protected:
 
diff --git a/src/Aspect/Aspect_AspectFillArea.cxx b/src/Aspect/Aspect_AspectFillArea.cxx
index 5469ef8c3e..57a248a140 100644
--- a/src/Aspect/Aspect_AspectFillArea.cxx
+++ b/src/Aspect/Aspect_AspectFillArea.cxx
@@ -31,6 +31,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_AspectFillArea,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //	-- interior
diff --git a/src/Aspect/Aspect_AspectFillArea.hxx b/src/Aspect/Aspect_AspectFillArea.hxx
index 768d4304ef..c9a47cfc9a 100644
--- a/src/Aspect/Aspect_AspectFillArea.hxx
+++ b/src/Aspect/Aspect_AspectFillArea.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_AspectFillArea,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Aspect_AspectFillArea,MMgt_TShared)
 
 protected:
 
diff --git a/src/Aspect/Aspect_AspectLine.cxx b/src/Aspect/Aspect_AspectLine.cxx
index 598aeb1682..2a875d0e1f 100644
--- a/src/Aspect/Aspect_AspectLine.cxx
+++ b/src/Aspect/Aspect_AspectLine.cxx
@@ -30,6 +30,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_AspectLine,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //	-- color
diff --git a/src/Aspect/Aspect_AspectLine.hxx b/src/Aspect/Aspect_AspectLine.hxx
index 3c0fcf196d..0e81548076 100644
--- a/src/Aspect/Aspect_AspectLine.hxx
+++ b/src/Aspect/Aspect_AspectLine.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_AspectLine,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Aspect_AspectLine,MMgt_TShared)
 
 protected:
 
diff --git a/src/Aspect/Aspect_AspectMarker.cxx b/src/Aspect/Aspect_AspectMarker.cxx
index 8e6e52efcf..c68ea940ab 100644
--- a/src/Aspect/Aspect_AspectMarker.cxx
+++ b/src/Aspect/Aspect_AspectMarker.cxx
@@ -30,6 +30,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_AspectMarker,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //	-- color
diff --git a/src/Aspect/Aspect_AspectMarker.hxx b/src/Aspect/Aspect_AspectMarker.hxx
index f44ac071e5..ed64b68374 100644
--- a/src/Aspect/Aspect_AspectMarker.hxx
+++ b/src/Aspect/Aspect_AspectMarker.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_AspectMarker,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Aspect_AspectMarker,MMgt_TShared)
 
 protected:
 
diff --git a/src/Aspect/Aspect_CircularGrid.cxx b/src/Aspect/Aspect_CircularGrid.cxx
index 6834f5eede..dc9f38df05 100644
--- a/src/Aspect/Aspect_CircularGrid.cxx
+++ b/src/Aspect/Aspect_CircularGrid.cxx
@@ -20,6 +20,8 @@
 #include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_CircularGrid,Aspect_Grid)
+
 Aspect_CircularGrid::Aspect_CircularGrid
      (const Quantity_Length aRadiusStep,
       const Standard_Integer aDivisionNumber,
diff --git a/src/Aspect/Aspect_CircularGrid.hxx b/src/Aspect/Aspect_CircularGrid.hxx
index 91cf9e76f4..e3a3f3cc70 100644
--- a/src/Aspect/Aspect_CircularGrid.hxx
+++ b/src/Aspect/Aspect_CircularGrid.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_CircularGrid,Aspect_Grid)
+  DEFINE_STANDARD_RTTIEXT(Aspect_CircularGrid,Aspect_Grid)
 
 protected:
 
diff --git a/src/Aspect/Aspect_DisplayConnection.cxx b/src/Aspect/Aspect_DisplayConnection.cxx
index dfab6bf3e3..e15349ac92 100755
--- a/src/Aspect/Aspect_DisplayConnection.cxx
+++ b/src/Aspect/Aspect_DisplayConnection.cxx
@@ -17,6 +17,8 @@
 #include <OSD_Environment.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_DisplayConnection,Standard_Transient)
+
 // =======================================================================
 // function : Aspect_DisplayConnection
 // purpose  :
diff --git a/src/Aspect/Aspect_DisplayConnection.hxx b/src/Aspect/Aspect_DisplayConnection.hxx
index 82165da9bf..d2080a7b58 100755
--- a/src/Aspect/Aspect_DisplayConnection.hxx
+++ b/src/Aspect/Aspect_DisplayConnection.hxx
@@ -76,7 +76,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Aspect_DisplayConnection, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Aspect_DisplayConnection,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Aspect/Aspect_Grid.cxx b/src/Aspect/Aspect_Grid.cxx
index c68d809fab..8bc3de3d1b 100644
--- a/src/Aspect/Aspect_Grid.cxx
+++ b/src/Aspect/Aspect_Grid.cxx
@@ -16,6 +16,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_Grid,MMgt_TShared)
+
 Aspect_Grid::Aspect_Grid(
 			       const Quantity_Length anXOrigin,
 			       const Quantity_Length anYOrigin,
diff --git a/src/Aspect/Aspect_Grid.hxx b/src/Aspect/Aspect_Grid.hxx
index 06d838d317..6dfc711d7d 100644
--- a/src/Aspect/Aspect_Grid.hxx
+++ b/src/Aspect/Aspect_Grid.hxx
@@ -109,7 +109,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_Grid,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Aspect_Grid,MMgt_TShared)
 
 protected:
 
diff --git a/src/Aspect/Aspect_RectangularGrid.cxx b/src/Aspect/Aspect_RectangularGrid.cxx
index 9d76801e55..cf6824b68a 100644
--- a/src/Aspect/Aspect_RectangularGrid.cxx
+++ b/src/Aspect/Aspect_RectangularGrid.cxx
@@ -19,6 +19,8 @@
 #include <Standard_NumericError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_RectangularGrid,Aspect_Grid)
+
 Aspect_RectangularGrid::Aspect_RectangularGrid(
                                const Quantity_Length aXStep,
                                const Quantity_Length aYStep,
diff --git a/src/Aspect/Aspect_RectangularGrid.hxx b/src/Aspect/Aspect_RectangularGrid.hxx
index 3481b99af4..cb31b0f438 100644
--- a/src/Aspect/Aspect_RectangularGrid.hxx
+++ b/src/Aspect/Aspect_RectangularGrid.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Aspect_RectangularGrid,Aspect_Grid)
+  DEFINE_STANDARD_RTTIEXT(Aspect_RectangularGrid,Aspect_Grid)
 
 protected:
 
diff --git a/src/Aspect/Aspect_Window.cxx b/src/Aspect/Aspect_Window.cxx
index 0add021068..5fa8abecca 100644
--- a/src/Aspect/Aspect_Window.cxx
+++ b/src/Aspect/Aspect_Window.cxx
@@ -31,6 +31,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Aspect_Window,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //-Destructors
diff --git a/src/Aspect/Aspect_Window.hxx b/src/Aspect/Aspect_Window.hxx
index 77e6444df5..f309c67d73 100644
--- a/src/Aspect/Aspect_Window.hxx
+++ b/src/Aspect/Aspect_Window.hxx
@@ -117,7 +117,7 @@ public:
   //! Returns native Window FB config (GLXFBConfig on Xlib)
   Standard_EXPORT virtual Aspect_FBConfig NativeFBConfig() const = 0;
 
-  DEFINE_STANDARD_RTTI(Aspect_Window,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Aspect_Window,MMgt_TShared)
 
 protected:
 
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
index 1ecde6d32c..dd7002dd10 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
@@ -293,7 +293,7 @@ class BOPAlgo_BPC {
   const TopoDS_Face& GetFace() const {
     return myF;
   }
-  const Handle_Geom2d_Curve& GetCurve2d() const {
+  const Handle(Geom2d_Curve)& GetCurve2d() const {
     return myCurve;
   }
   Standard_Boolean IsToUpdate() const {
@@ -307,7 +307,7 @@ class BOPAlgo_BPC {
  protected:
   TopoDS_Edge myE;
   TopoDS_Face myF;
-  Handle_Geom2d_Curve myCurve;
+  Handle(Geom2d_Curve) myCurve;
   Standard_Boolean myToUpdate;
 };
 //=======================================================================
diff --git a/src/BOPDS/BOPDS_CommonBlock.cxx b/src/BOPDS/BOPDS_CommonBlock.cxx
index b687e844ce..a7f6b75cb5 100644
--- a/src/BOPDS/BOPDS_CommonBlock.cxx
+++ b/src/BOPDS/BOPDS_CommonBlock.cxx
@@ -17,6 +17,8 @@
 #include <BOPDS_PaveBlock.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BOPDS_CommonBlock,MMgt_TShared)
+
 //=======================================================================
 // function:  
 // purpose: 
diff --git a/src/BOPDS/BOPDS_CommonBlock.hxx b/src/BOPDS/BOPDS_CommonBlock.hxx
index 038b0a1472..2a84edd1d3 100644
--- a/src/BOPDS/BOPDS_CommonBlock.hxx
+++ b/src/BOPDS/BOPDS_CommonBlock.hxx
@@ -145,7 +145,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BOPDS_CommonBlock,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BOPDS_CommonBlock,MMgt_TShared)
 
 protected:
 
diff --git a/src/BOPDS/BOPDS_PaveBlock.cxx b/src/BOPDS/BOPDS_PaveBlock.cxx
index f2c840caba..dd2701fa1a 100755
--- a/src/BOPDS/BOPDS_PaveBlock.cxx
+++ b/src/BOPDS/BOPDS_PaveBlock.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 
 #include <algorithm>
+IMPLEMENT_STANDARD_RTTIEXT(BOPDS_PaveBlock,MMgt_TShared)
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4291 )
 #endif
diff --git a/src/BOPDS/BOPDS_PaveBlock.hxx b/src/BOPDS/BOPDS_PaveBlock.hxx
index 9de2986602..5462f5a613 100644
--- a/src/BOPDS/BOPDS_PaveBlock.hxx
+++ b/src/BOPDS/BOPDS_PaveBlock.hxx
@@ -205,7 +205,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BOPDS_PaveBlock,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BOPDS_PaveBlock,MMgt_TShared)
 
 protected:
 
diff --git a/src/BOPTest/BOPTest_DrawableShape.cxx b/src/BOPTest/BOPTest_DrawableShape.cxx
index 4758f34223..acdd451155 100644
--- a/src/BOPTest/BOPTest_DrawableShape.cxx
+++ b/src/BOPTest/BOPTest_DrawableShape.cxx
@@ -45,6 +45,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(BOPTest_DrawableShape,DBRep_DrawableShape)
+
 //=======================================================================
 //function : 
 //purpose  : 
diff --git a/src/BOPTest/BOPTest_DrawableShape.hxx b/src/BOPTest/BOPTest_DrawableShape.hxx
index 444b30aab0..0f19c74f92 100644
--- a/src/BOPTest/BOPTest_DrawableShape.hxx
+++ b/src/BOPTest/BOPTest_DrawableShape.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BOPTest_DrawableShape,DBRep_DrawableShape)
+  DEFINE_STANDARD_RTTIEXT(BOPTest_DrawableShape,DBRep_DrawableShape)
 
 protected:
 
diff --git a/src/BRep/BRep_Curve3D.cxx b/src/BRep/BRep_Curve3D.cxx
index 5d085d49c1..86a06deab8 100644
--- a/src/BRep/BRep_Curve3D.cxx
+++ b/src/BRep/BRep_Curve3D.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_Curve3D,BRep_GCurve)
+
 //=======================================================================
 //function : BRep_Curve3D
 //purpose  : 
diff --git a/src/BRep/BRep_Curve3D.hxx b/src/BRep/BRep_Curve3D.hxx
index 84a725d672..e459d1ddff 100644
--- a/src/BRep/BRep_Curve3D.hxx
+++ b/src/BRep/BRep_Curve3D.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_Curve3D,BRep_GCurve)
+  DEFINE_STANDARD_RTTIEXT(BRep_Curve3D,BRep_GCurve)
 
 protected:
 
diff --git a/src/BRep/BRep_CurveOn2Surfaces.cxx b/src/BRep/BRep_CurveOn2Surfaces.cxx
index 0541c96b31..dedf017f53 100644
--- a/src/BRep/BRep_CurveOn2Surfaces.cxx
+++ b/src/BRep/BRep_CurveOn2Surfaces.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_CurveOn2Surfaces,BRep_CurveRepresentation)
+
 //=======================================================================
 //function : BRep_CurveOn2Surfaces
 //purpose  : 
diff --git a/src/BRep/BRep_CurveOn2Surfaces.hxx b/src/BRep/BRep_CurveOn2Surfaces.hxx
index 7f64f34959..867423ff24 100644
--- a/src/BRep/BRep_CurveOn2Surfaces.hxx
+++ b/src/BRep/BRep_CurveOn2Surfaces.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_CurveOn2Surfaces,BRep_CurveRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_CurveOn2Surfaces,BRep_CurveRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_CurveOnClosedSurface.cxx b/src/BRep/BRep_CurveOnClosedSurface.cxx
index ab84995cf7..5f0b028931 100644
--- a/src/BRep/BRep_CurveOnClosedSurface.cxx
+++ b/src/BRep/BRep_CurveOnClosedSurface.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_CurveOnClosedSurface,BRep_CurveOnSurface)
+
 //=======================================================================
 //function : BRep_CurveOnClosedSurface
 //purpose  : 
diff --git a/src/BRep/BRep_CurveOnClosedSurface.hxx b/src/BRep/BRep_CurveOnClosedSurface.hxx
index 352e4326af..5bed28216b 100644
--- a/src/BRep/BRep_CurveOnClosedSurface.hxx
+++ b/src/BRep/BRep_CurveOnClosedSurface.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_CurveOnClosedSurface,BRep_CurveOnSurface)
+  DEFINE_STANDARD_RTTIEXT(BRep_CurveOnClosedSurface,BRep_CurveOnSurface)
 
 protected:
 
diff --git a/src/BRep/BRep_CurveOnSurface.cxx b/src/BRep/BRep_CurveOnSurface.cxx
index 1e5224d557..f5f6cd377b 100644
--- a/src/BRep/BRep_CurveOnSurface.cxx
+++ b/src/BRep/BRep_CurveOnSurface.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_CurveOnSurface,BRep_GCurve)
+
 //=======================================================================
 //function : BRep_CurveOnSurface
 //purpose  : 
diff --git a/src/BRep/BRep_CurveOnSurface.hxx b/src/BRep/BRep_CurveOnSurface.hxx
index 1f0e011170..baece2ff34 100644
--- a/src/BRep/BRep_CurveOnSurface.hxx
+++ b/src/BRep/BRep_CurveOnSurface.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_CurveOnSurface,BRep_GCurve)
+  DEFINE_STANDARD_RTTIEXT(BRep_CurveOnSurface,BRep_GCurve)
 
 protected:
 
diff --git a/src/BRep/BRep_CurveRepresentation.cxx b/src/BRep/BRep_CurveRepresentation.cxx
index 72697793d9..29362dd5d3 100644
--- a/src/BRep/BRep_CurveRepresentation.cxx
+++ b/src/BRep/BRep_CurveRepresentation.cxx
@@ -28,6 +28,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_CurveRepresentation,MMgt_TShared)
+
 //=======================================================================
 //function : BRep_CurveRepresentation
 //purpose  : 
diff --git a/src/BRep/BRep_CurveRepresentation.hxx b/src/BRep/BRep_CurveRepresentation.hxx
index 1543fa4578..9bb0ae84ff 100644
--- a/src/BRep/BRep_CurveRepresentation.hxx
+++ b/src/BRep/BRep_CurveRepresentation.hxx
@@ -147,7 +147,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_CurveRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRep_CurveRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRep/BRep_GCurve.cxx b/src/BRep/BRep_GCurve.cxx
index db29bbbf54..22c36ccfe4 100644
--- a/src/BRep/BRep_GCurve.cxx
+++ b/src/BRep/BRep_GCurve.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_GCurve,BRep_CurveRepresentation)
+
 //=======================================================================
 //function : BRep_GCurve
 //purpose  : 
diff --git a/src/BRep/BRep_GCurve.hxx b/src/BRep/BRep_GCurve.hxx
index ce8ff73eed..1d2c4d5433 100644
--- a/src/BRep/BRep_GCurve.hxx
+++ b/src/BRep/BRep_GCurve.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_GCurve,BRep_CurveRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_GCurve,BRep_CurveRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_PointOnCurve.cxx b/src/BRep/BRep_PointOnCurve.cxx
index d90147ed8b..737c7c1f2b 100644
--- a/src/BRep/BRep_PointOnCurve.cxx
+++ b/src/BRep/BRep_PointOnCurve.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PointOnCurve,BRep_PointRepresentation)
+
 //=======================================================================
 //function : BRep_PointOnCurve
 //purpose  : 
diff --git a/src/BRep/BRep_PointOnCurve.hxx b/src/BRep/BRep_PointOnCurve.hxx
index d89f4babaf..3e22ee967c 100644
--- a/src/BRep/BRep_PointOnCurve.hxx
+++ b/src/BRep/BRep_PointOnCurve.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PointOnCurve,BRep_PointRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_PointOnCurve,BRep_PointRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_PointOnCurveOnSurface.cxx b/src/BRep/BRep_PointOnCurveOnSurface.cxx
index e667535a50..d82010bd17 100644
--- a/src/BRep/BRep_PointOnCurveOnSurface.cxx
+++ b/src/BRep/BRep_PointOnCurveOnSurface.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PointOnCurveOnSurface,BRep_PointsOnSurface)
+
 //=======================================================================
 //function : BRep_PointOnCurveOnSurface
 //purpose  : 
diff --git a/src/BRep/BRep_PointOnCurveOnSurface.hxx b/src/BRep/BRep_PointOnCurveOnSurface.hxx
index 39703037ef..73eeec8361 100644
--- a/src/BRep/BRep_PointOnCurveOnSurface.hxx
+++ b/src/BRep/BRep_PointOnCurveOnSurface.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PointOnCurveOnSurface,BRep_PointsOnSurface)
+  DEFINE_STANDARD_RTTIEXT(BRep_PointOnCurveOnSurface,BRep_PointsOnSurface)
 
 protected:
 
diff --git a/src/BRep/BRep_PointOnSurface.cxx b/src/BRep/BRep_PointOnSurface.cxx
index aacb5c62b5..282f4b3ddf 100644
--- a/src/BRep/BRep_PointOnSurface.cxx
+++ b/src/BRep/BRep_PointOnSurface.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PointOnSurface,BRep_PointsOnSurface)
+
 //=======================================================================
 //function : BRep_PointOnSurface
 //purpose  : 
diff --git a/src/BRep/BRep_PointOnSurface.hxx b/src/BRep/BRep_PointOnSurface.hxx
index 3796c0886f..878dd65de8 100644
--- a/src/BRep/BRep_PointOnSurface.hxx
+++ b/src/BRep/BRep_PointOnSurface.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PointOnSurface,BRep_PointsOnSurface)
+  DEFINE_STANDARD_RTTIEXT(BRep_PointOnSurface,BRep_PointsOnSurface)
 
 protected:
 
diff --git a/src/BRep/BRep_PointRepresentation.cxx b/src/BRep/BRep_PointRepresentation.cxx
index e247fa486f..2f8f20cff5 100644
--- a/src/BRep/BRep_PointRepresentation.cxx
+++ b/src/BRep/BRep_PointRepresentation.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PointRepresentation,MMgt_TShared)
+
 //=======================================================================
 //function : BRep_PointRepresentation
 //purpose  : 
diff --git a/src/BRep/BRep_PointRepresentation.hxx b/src/BRep/BRep_PointRepresentation.hxx
index 65fd8290cb..52145d5bdf 100644
--- a/src/BRep/BRep_PointRepresentation.hxx
+++ b/src/BRep/BRep_PointRepresentation.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PointRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRep_PointRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRep/BRep_PointsOnSurface.cxx b/src/BRep/BRep_PointsOnSurface.cxx
index ca7d4aa5ab..740a09abc6 100644
--- a/src/BRep/BRep_PointsOnSurface.cxx
+++ b/src/BRep/BRep_PointsOnSurface.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PointsOnSurface,BRep_PointRepresentation)
+
 //=======================================================================
 //function : BRep_PointsOnSurface
 //purpose  : 
diff --git a/src/BRep/BRep_PointsOnSurface.hxx b/src/BRep/BRep_PointsOnSurface.hxx
index 50d83db7fd..83f23f64ed 100644
--- a/src/BRep/BRep_PointsOnSurface.hxx
+++ b/src/BRep/BRep_PointsOnSurface.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PointsOnSurface,BRep_PointRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_PointsOnSurface,BRep_PointRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_Polygon3D.cxx b/src/BRep/BRep_Polygon3D.cxx
index 0fff5bd9b7..921a4ed1f9 100644
--- a/src/BRep/BRep_Polygon3D.cxx
+++ b/src/BRep/BRep_Polygon3D.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_Polygon3D,BRep_CurveRepresentation)
+
 //=======================================================================
 //function : BRep_Polygon3D
 //purpose  : 
diff --git a/src/BRep/BRep_Polygon3D.hxx b/src/BRep/BRep_Polygon3D.hxx
index c07359276e..ff5e6d8d95 100644
--- a/src/BRep/BRep_Polygon3D.hxx
+++ b/src/BRep/BRep_Polygon3D.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_Polygon3D,BRep_CurveRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_Polygon3D,BRep_CurveRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_PolygonOnClosedSurface.cxx b/src/BRep/BRep_PolygonOnClosedSurface.cxx
index a5e9b2eb33..8696bb8164 100644
--- a/src/BRep/BRep_PolygonOnClosedSurface.cxx
+++ b/src/BRep/BRep_PolygonOnClosedSurface.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PolygonOnClosedSurface,BRep_PolygonOnSurface)
+
 //=======================================================================
 //function : BRep_PolygonOnClosedSurface
 //purpose  : 
diff --git a/src/BRep/BRep_PolygonOnClosedSurface.hxx b/src/BRep/BRep_PolygonOnClosedSurface.hxx
index 467167876f..79ee1ec633 100644
--- a/src/BRep/BRep_PolygonOnClosedSurface.hxx
+++ b/src/BRep/BRep_PolygonOnClosedSurface.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PolygonOnClosedSurface,BRep_PolygonOnSurface)
+  DEFINE_STANDARD_RTTIEXT(BRep_PolygonOnClosedSurface,BRep_PolygonOnSurface)
 
 protected:
 
diff --git a/src/BRep/BRep_PolygonOnClosedTriangulation.cxx b/src/BRep/BRep_PolygonOnClosedTriangulation.cxx
index 5ddbf521e2..83bcc2bac5 100644
--- a/src/BRep/BRep_PolygonOnClosedTriangulation.cxx
+++ b/src/BRep/BRep_PolygonOnClosedTriangulation.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PolygonOnClosedTriangulation,BRep_PolygonOnTriangulation)
+
 //=======================================================================
 //function : BRep_PolygonOnClosedTriangulation
 //purpose  : 
diff --git a/src/BRep/BRep_PolygonOnClosedTriangulation.hxx b/src/BRep/BRep_PolygonOnClosedTriangulation.hxx
index 81b69f8ff6..bc9eba85a5 100644
--- a/src/BRep/BRep_PolygonOnClosedTriangulation.hxx
+++ b/src/BRep/BRep_PolygonOnClosedTriangulation.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PolygonOnClosedTriangulation,BRep_PolygonOnTriangulation)
+  DEFINE_STANDARD_RTTIEXT(BRep_PolygonOnClosedTriangulation,BRep_PolygonOnTriangulation)
 
 protected:
 
diff --git a/src/BRep/BRep_PolygonOnSurface.cxx b/src/BRep/BRep_PolygonOnSurface.cxx
index 1904c3080b..197b5b8fa4 100644
--- a/src/BRep/BRep_PolygonOnSurface.cxx
+++ b/src/BRep/BRep_PolygonOnSurface.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PolygonOnSurface,BRep_CurveRepresentation)
+
 //=======================================================================
 //function : BRep_PolygonOnSurface
 //purpose  : 
diff --git a/src/BRep/BRep_PolygonOnSurface.hxx b/src/BRep/BRep_PolygonOnSurface.hxx
index 80f81e0594..b0c165798e 100644
--- a/src/BRep/BRep_PolygonOnSurface.hxx
+++ b/src/BRep/BRep_PolygonOnSurface.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PolygonOnSurface,BRep_CurveRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_PolygonOnSurface,BRep_CurveRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_PolygonOnTriangulation.cxx b/src/BRep/BRep_PolygonOnTriangulation.cxx
index 31ae62c80b..24beb3dc9a 100644
--- a/src/BRep/BRep_PolygonOnTriangulation.cxx
+++ b/src/BRep/BRep_PolygonOnTriangulation.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_PolygonOnTriangulation,BRep_CurveRepresentation)
+
 //=======================================================================
 //function : BRep_PolygonOnTriangulation
 //purpose  : 
diff --git a/src/BRep/BRep_PolygonOnTriangulation.hxx b/src/BRep/BRep_PolygonOnTriangulation.hxx
index fdfefce73b..b400ea9d74 100644
--- a/src/BRep/BRep_PolygonOnTriangulation.hxx
+++ b/src/BRep/BRep_PolygonOnTriangulation.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_PolygonOnTriangulation,BRep_CurveRepresentation)
+  DEFINE_STANDARD_RTTIEXT(BRep_PolygonOnTriangulation,BRep_CurveRepresentation)
 
 protected:
 
diff --git a/src/BRep/BRep_TEdge.cxx b/src/BRep/BRep_TEdge.cxx
index 4f79b292ed..1a90362909 100644
--- a/src/BRep/BRep_TEdge.cxx
+++ b/src/BRep/BRep_TEdge.cxx
@@ -25,6 +25,8 @@
 #include <TopAbs.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_TEdge,TopoDS_TEdge)
+
 static const Standard_Integer ParameterMask       = 1;
 static const Standard_Integer RangeMask           = 2;
 static const Standard_Integer DegeneratedMask     = 4;
diff --git a/src/BRep/BRep_TEdge.hxx b/src/BRep/BRep_TEdge.hxx
index 93754d06a8..2bd0642fb8 100644
--- a/src/BRep/BRep_TEdge.hxx
+++ b/src/BRep/BRep_TEdge.hxx
@@ -84,7 +84,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_TEdge,TopoDS_TEdge)
+  DEFINE_STANDARD_RTTIEXT(BRep_TEdge,TopoDS_TEdge)
 
 protected:
 
diff --git a/src/BRep/BRep_TFace.cxx b/src/BRep/BRep_TFace.cxx
index 8f118b32cb..b4d35e4585 100644
--- a/src/BRep/BRep_TFace.cxx
+++ b/src/BRep/BRep_TFace.cxx
@@ -23,6 +23,8 @@
 #include <TopLoc_Location.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_TFace,TopoDS_TFace)
+
 //=======================================================================
 //function : BRep_TFace
 //purpose  : 
diff --git a/src/BRep/BRep_TFace.hxx b/src/BRep/BRep_TFace.hxx
index cadecebcbe..c24337de47 100644
--- a/src/BRep/BRep_TFace.hxx
+++ b/src/BRep/BRep_TFace.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_TFace,TopoDS_TFace)
+  DEFINE_STANDARD_RTTIEXT(BRep_TFace,TopoDS_TFace)
 
 protected:
 
diff --git a/src/BRep/BRep_TVertex.cxx b/src/BRep/BRep_TVertex.cxx
index 3e18cc0fe2..067f8197c0 100644
--- a/src/BRep/BRep_TVertex.cxx
+++ b/src/BRep/BRep_TVertex.cxx
@@ -21,6 +21,8 @@
 #include <TopAbs.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRep_TVertex,TopoDS_TVertex)
+
 //=======================================================================
 //function : BRep_TVertex
 //purpose  : 
diff --git a/src/BRep/BRep_TVertex.hxx b/src/BRep/BRep_TVertex.hxx
index c729e64908..9729fb52f6 100644
--- a/src/BRep/BRep_TVertex.hxx
+++ b/src/BRep/BRep_TVertex.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRep_TVertex,TopoDS_TVertex)
+  DEFINE_STANDARD_RTTIEXT(BRep_TVertex,TopoDS_TVertex)
 
 protected:
 
diff --git a/src/BRep/BRep_Tool.cxx b/src/BRep/BRep_Tool.cxx
index 8b8e2f62c3..9cb3a1900b 100644
--- a/src/BRep/BRep_Tool.cxx
+++ b/src/BRep/BRep_Tool.cxx
@@ -68,6 +68,7 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
+#include <BRep_GCurve.hxx>
 
 //modified by NIZNHY-PKV Fri Oct 17 14:13:29 2008f
 static 
diff --git a/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx b/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx
index 1937c5a077..f0b085758b 100644
--- a/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx
+++ b/src/BRepAdaptor/BRepAdaptor_HCompCurve.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAdaptor_HCompCurve,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(BRepAdaptor_HCompCurve,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/BRepAdaptor/BRepAdaptor_HCurve.hxx b/src/BRepAdaptor/BRepAdaptor_HCurve.hxx
index c2a14db99c..0e048d93df 100644
--- a/src/BRepAdaptor/BRepAdaptor_HCurve.hxx
+++ b/src/BRepAdaptor/BRepAdaptor_HCurve.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAdaptor_HCurve,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(BRepAdaptor_HCurve,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx b/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx
index 65ea34cd21..9549145068 100644
--- a/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx
+++ b/src/BRepAdaptor/BRepAdaptor_HCurve2d.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAdaptor_HCurve2d,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(BRepAdaptor_HCurve2d,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/BRepAdaptor/BRepAdaptor_HSurface.hxx b/src/BRepAdaptor/BRepAdaptor_HSurface.hxx
index dc30043d26..cc544cf03f 100644
--- a/src/BRepAdaptor/BRepAdaptor_HSurface.hxx
+++ b/src/BRepAdaptor/BRepAdaptor_HSurface.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAdaptor_HSurface,Adaptor3d_HSurface)
+  DEFINE_STANDARD_RTTI_INLINE(BRepAdaptor_HSurface,Adaptor3d_HSurface)
 
 protected:
 
diff --git a/src/BRepAlgo/BRepAlgo_AsDes.cxx b/src/BRepAlgo/BRepAlgo_AsDes.cxx
index 0cb13f9654..97641ab223 100644
--- a/src/BRepAlgo/BRepAlgo_AsDes.cxx
+++ b/src/BRepAlgo/BRepAlgo_AsDes.cxx
@@ -21,6 +21,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepAlgo_AsDes,MMgt_TShared)
+
 //=======================================================================
 //function : BRepAlgo_AsDes
 //purpose  : 
diff --git a/src/BRepAlgo/BRepAlgo_AsDes.hxx b/src/BRepAlgo/BRepAlgo_AsDes.hxx
index 85c126e29a..a54d80575a 100644
--- a/src/BRepAlgo/BRepAlgo_AsDes.hxx
+++ b/src/BRepAlgo/BRepAlgo_AsDes.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAlgo_AsDes,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepAlgo_AsDes,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepAlgo/BRepAlgo_EdgeConnector.cxx b/src/BRepAlgo/BRepAlgo_EdgeConnector.cxx
index ab9fc951aa..62ed293e06 100644
--- a/src/BRepAlgo/BRepAlgo_EdgeConnector.cxx
+++ b/src/BRepAlgo/BRepAlgo_EdgeConnector.cxx
@@ -28,6 +28,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepAlgo_EdgeConnector,MMgt_TShared)
+
 //=======================================================================
 //function : Create
 //purpose  : 
diff --git a/src/BRepAlgo/BRepAlgo_EdgeConnector.hxx b/src/BRepAlgo/BRepAlgo_EdgeConnector.hxx
index 258ced28ba..fd8258e882 100644
--- a/src/BRepAlgo/BRepAlgo_EdgeConnector.hxx
+++ b/src/BRepAlgo/BRepAlgo_EdgeConnector.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepAlgo_EdgeConnector,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepAlgo_EdgeConnector,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepApprox/BRepApprox_ApproxLine.cxx b/src/BRepApprox/BRepApprox_ApproxLine.cxx
index 5973ebd698..fd1f62e6b7 100644
--- a/src/BRepApprox/BRepApprox_ApproxLine.cxx
+++ b/src/BRepApprox/BRepApprox_ApproxLine.cxx
@@ -23,6 +23,8 @@
 #include <IntSurf_PntOn2S.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepApprox_ApproxLine,MMgt_TShared)
+
 //=======================================================================
 //function : BRepApprox_ApproxLine
 //purpose  : 
diff --git a/src/BRepApprox/BRepApprox_ApproxLine.hxx b/src/BRepApprox/BRepApprox_ApproxLine.hxx
index a5117f5fb5..7186c27c42 100644
--- a/src/BRepApprox/BRepApprox_ApproxLine.hxx
+++ b/src/BRepApprox/BRepApprox_ApproxLine.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepApprox_ApproxLine,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepApprox_ApproxLine,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepBlend/BRepBlend_AppFunc.cxx b/src/BRepBlend/BRepBlend_AppFunc.cxx
index 9ba49f15fd..10a7734e35 100644
--- a/src/BRepBlend/BRepBlend_AppFunc.cxx
+++ b/src/BRepBlend/BRepBlend_AppFunc.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBlend_AppFunc,BRepBlend_AppFuncRoot)
+
 BRepBlend_AppFunc::BRepBlend_AppFunc(Handle(BRepBlend_Line)& Line,
 				     Blend_Function& Func,
 				     const Standard_Real Tol3d,
diff --git a/src/BRepBlend/BRepBlend_AppFunc.hxx b/src/BRepBlend/BRepBlend_AppFunc.hxx
index e137aab76a..7e52e33456 100644
--- a/src/BRepBlend/BRepBlend_AppFunc.hxx
+++ b/src/BRepBlend/BRepBlend_AppFunc.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBlend_AppFunc,BRepBlend_AppFuncRoot)
+  DEFINE_STANDARD_RTTIEXT(BRepBlend_AppFunc,BRepBlend_AppFuncRoot)
 
 protected:
 
diff --git a/src/BRepBlend/BRepBlend_AppFuncRoot.cxx b/src/BRepBlend/BRepBlend_AppFuncRoot.cxx
index 2fc921c733..8a97359728 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRoot.cxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRoot.cxx
@@ -30,6 +30,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBlend_AppFuncRoot,Approx_SweepFunction)
+
 BRepBlend_AppFuncRoot::BRepBlend_AppFuncRoot(Handle(BRepBlend_Line)& Line,
 					     Blend_AppFunction&      Func,
 					     const Standard_Real     Tol3d,
diff --git a/src/BRepBlend/BRepBlend_AppFuncRoot.hxx b/src/BRepBlend/BRepBlend_AppFuncRoot.hxx
index 9fa8752ce6..3a01b50ec5 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRoot.hxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRoot.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBlend_AppFuncRoot,Approx_SweepFunction)
+  DEFINE_STANDARD_RTTIEXT(BRepBlend_AppFuncRoot,Approx_SweepFunction)
 
 protected:
 
diff --git a/src/BRepBlend/BRepBlend_AppFuncRst.cxx b/src/BRepBlend/BRepBlend_AppFuncRst.cxx
index 613351e315..d61808261b 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRst.cxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRst.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBlend_AppFuncRst,BRepBlend_AppFuncRoot)
+
 BRepBlend_AppFuncRst::BRepBlend_AppFuncRst (Handle(BRepBlend_Line)& Line,
 					    Blend_SurfRstFunction& Func,
 					    const Standard_Real Tol3d,
diff --git a/src/BRepBlend/BRepBlend_AppFuncRst.hxx b/src/BRepBlend/BRepBlend_AppFuncRst.hxx
index cdf3c7022a..faf58742c1 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRst.hxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRst.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBlend_AppFuncRst,BRepBlend_AppFuncRoot)
+  DEFINE_STANDARD_RTTIEXT(BRepBlend_AppFuncRst,BRepBlend_AppFuncRoot)
 
 protected:
 
diff --git a/src/BRepBlend/BRepBlend_AppFuncRstRst.cxx b/src/BRepBlend/BRepBlend_AppFuncRstRst.cxx
index 137fa94656..dfda9f6512 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRstRst.cxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRstRst.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBlend_AppFuncRstRst,BRepBlend_AppFuncRoot)
+
 BRepBlend_AppFuncRstRst::BRepBlend_AppFuncRstRst (Handle(BRepBlend_Line)& Line,
 						  Blend_RstRstFunction& Func,
 						  const Standard_Real Tol3d,
diff --git a/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx b/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx
index 3cbe5fe3aa..34b136d7a7 100644
--- a/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx
+++ b/src/BRepBlend/BRepBlend_AppFuncRstRst.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBlend_AppFuncRstRst,BRepBlend_AppFuncRoot)
+  DEFINE_STANDARD_RTTIEXT(BRepBlend_AppFuncRstRst,BRepBlend_AppFuncRoot)
 
 protected:
 
diff --git a/src/BRepBlend/BRepBlend_Line.cxx b/src/BRepBlend/BRepBlend_Line.cxx
index de6293d391..fdf90a9272 100644
--- a/src/BRepBlend/BRepBlend_Line.cxx
+++ b/src/BRepBlend/BRepBlend_Line.cxx
@@ -19,6 +19,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBlend_Line,MMgt_TShared)
+
 BRepBlend_Line::BRepBlend_Line ():
   tras1(IntSurf_Undecided),tras2(IntSurf_Undecided),
   hass1(Standard_False),hass2(Standard_False)
diff --git a/src/BRepBlend/BRepBlend_Line.hxx b/src/BRepBlend/BRepBlend_Line.hxx
index bfd78342e7..7ada9cb2c1 100644
--- a/src/BRepBlend/BRepBlend_Line.hxx
+++ b/src/BRepBlend/BRepBlend_Line.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBlend_Line,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepBlend_Line,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
index 51d0d61ca8..d8939b833f 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Copy.cxx
@@ -178,7 +178,7 @@ public:
   }
 
 public:
-  DEFINE_STANDARD_RTTI(BRepBuilderAPI_Copy_Modification, BRepTools_Modification)
+  DEFINE_STANDARD_RTTI_INLINE(BRepBuilderAPI_Copy_Modification,BRepTools_Modification)
 
 private: 
   Standard_Boolean myCopyGeom;
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
index 900481b5f9..7644ccee6f 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.cxx
@@ -33,6 +33,8 @@
 #include <TopTools_MapOfShape.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_FastSewing,Standard_Transient)
+
 //=======================================================================
 //function : IntersetctionOfSets
 //purpose  : Returns minimal value of intersection result
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
index 87a236a7ae..9b3850b6f0 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FastSewing.hxx
@@ -98,7 +98,7 @@ public:
   //! Returns list of statuses. Print message if theOS != 0
   Standard_EXPORT FS_VARStatuses GetStatuses(Standard_OStream* const theOS = 0);
 
-  DEFINE_STANDARD_RTTI(BRepBuilderAPI_FastSewing, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepBuilderAPI_FastSewing,Standard_Transient)
 
 protected:
   class NodeInspector;
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
index 8c9b592905..3be3e1d1d4 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -130,6 +130,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepBuilderAPI_Sewing,MMgt_TShared)
+
 //#include <LocalAnalysis_SurfaceContinuity.hxx>
 //=======================================================================
 //function : SameRange
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.hxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.hxx
index aa8fbfad98..23f7f8437a 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.hxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.hxx
@@ -241,7 +241,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepBuilderAPI_Sewing,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepBuilderAPI_Sewing,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Edge.cxx b/src/BRepCheck/BRepCheck_Edge.cxx
index 63b8c9dbcf..0c192748a7 100644
--- a/src/BRepCheck/BRepCheck_Edge.cxx
+++ b/src/BRepCheck/BRepCheck_Edge.cxx
@@ -60,6 +60,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Edge,BRepCheck_Result)
+
 //modified by NIZNHY-PKV Thu May 05 09:01:57 2011f
 static 
   Standard_Boolean Validate(const Adaptor3d_Curve&,
diff --git a/src/BRepCheck/BRepCheck_Edge.hxx b/src/BRepCheck/BRepCheck_Edge.hxx
index 74eeeec3c5..05fee227d0 100644
--- a/src/BRepCheck/BRepCheck_Edge.hxx
+++ b/src/BRepCheck/BRepCheck_Edge.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Edge,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Edge,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Face.cxx b/src/BRepCheck/BRepCheck_Face.cxx
index 59daf7e897..fd500c5e53 100644
--- a/src/BRepCheck/BRepCheck_Face.cxx
+++ b/src/BRepCheck/BRepCheck_Face.cxx
@@ -56,6 +56,8 @@
 #include <TopTools_OrientedShapeMapHasher.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Face,BRepCheck_Result)
+
 //#include <BRepAdaptor_Curve2d.hxx>
 //#include <Geom2dInt_GInter.hxx>
 typedef NCollection_DataMap<TopoDS_Shape, Bnd_Box2d, TopTools_OrientedShapeMapHasher> DataMapOfShapeBox2d;
diff --git a/src/BRepCheck/BRepCheck_Face.hxx b/src/BRepCheck/BRepCheck_Face.hxx
index d6c9196822..a6853e9e39 100644
--- a/src/BRepCheck/BRepCheck_Face.hxx
+++ b/src/BRepCheck/BRepCheck_Face.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Face,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Face,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Result.cxx b/src/BRepCheck/BRepCheck_Result.cxx
index c699d5689b..97a0fa4464 100644
--- a/src/BRepCheck/BRepCheck_Result.cxx
+++ b/src/BRepCheck/BRepCheck_Result.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Result,MMgt_TShared)
+
 //=======================================================================
 //function : BRepCheck_Result
 //purpose  : 
diff --git a/src/BRepCheck/BRepCheck_Result.hxx b/src/BRepCheck/BRepCheck_Result.hxx
index fdebe79c6c..e88c672a12 100644
--- a/src/BRepCheck/BRepCheck_Result.hxx
+++ b/src/BRepCheck/BRepCheck_Result.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Result,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Result,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Shell.cxx b/src/BRepCheck/BRepCheck_Shell.cxx
index b39e76b02c..1cd78e0635 100644
--- a/src/BRepCheck/BRepCheck_Shell.cxx
+++ b/src/BRepCheck/BRepCheck_Shell.cxx
@@ -37,6 +37,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Shell,BRepCheck_Result)
+
 //=======================================================================
 //function : Propagate
 //purpose  : 
diff --git a/src/BRepCheck/BRepCheck_Shell.hxx b/src/BRepCheck/BRepCheck_Shell.hxx
index eef7345f15..2876d1c0e3 100644
--- a/src/BRepCheck/BRepCheck_Shell.hxx
+++ b/src/BRepCheck/BRepCheck_Shell.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Shell,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Shell,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Solid.cxx b/src/BRepCheck/BRepCheck_Solid.cxx
index 1874710370..a6d5e648a9 100644
--- a/src/BRepCheck/BRepCheck_Solid.cxx
+++ b/src/BRepCheck/BRepCheck_Solid.cxx
@@ -34,6 +34,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ShapeMapHasher.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Solid,BRepCheck_Result)
+
 //
 //
 //
@@ -65,7 +67,7 @@ class BRepCheck_HSC : public MMgt_TShared {
       return mySC;
     };
   //
-  DEFINE_STANDARD_RTTI(BRepCheck_HSC, MMgt_TShared);
+  DEFINE_STANDARD_RTTI_INLINE(BRepCheck_HSC,MMgt_TShared);
 
  protected:
   BRepClass3d_SolidClassifier mySC;
diff --git a/src/BRepCheck/BRepCheck_Solid.hxx b/src/BRepCheck/BRepCheck_Solid.hxx
index d3269d551f..65adff458e 100644
--- a/src/BRepCheck/BRepCheck_Solid.hxx
+++ b/src/BRepCheck/BRepCheck_Solid.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Solid,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Solid,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Vertex.cxx b/src/BRepCheck/BRepCheck_Vertex.cxx
index 8225677cdf..a6eaec1247 100644
--- a/src/BRepCheck/BRepCheck_Vertex.cxx
+++ b/src/BRepCheck/BRepCheck_Vertex.cxx
@@ -41,6 +41,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Vertex,BRepCheck_Result)
+
 //=======================================================================
 //function : BRepCheck_Vertex
 //purpose  : 
diff --git a/src/BRepCheck/BRepCheck_Vertex.hxx b/src/BRepCheck/BRepCheck_Vertex.hxx
index 6400836330..1e9f15f40c 100644
--- a/src/BRepCheck/BRepCheck_Vertex.hxx
+++ b/src/BRepCheck/BRepCheck_Vertex.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Vertex,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Vertex,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx
index 9fbccc3b90..2f1e7a6a3c 100644
--- a/src/BRepCheck/BRepCheck_Wire.cxx
+++ b/src/BRepCheck/BRepCheck_Wire.cxx
@@ -74,6 +74,8 @@
 #include <TopTools_MapOfShape.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(BRepCheck_Wire,BRepCheck_Result)
+
 static void Propagate(const TopTools_IndexedDataMapOfShapeListOfShape&,
                       const TopoDS_Shape&,   // edge
                       TopTools_MapOfShape&); // mapofedge
diff --git a/src/BRepCheck/BRepCheck_Wire.hxx b/src/BRepCheck/BRepCheck_Wire.hxx
index 19bcadbb53..762af22cc9 100644
--- a/src/BRepCheck/BRepCheck_Wire.hxx
+++ b/src/BRepCheck/BRepCheck_Wire.hxx
@@ -114,7 +114,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepCheck_Wire,BRepCheck_Result)
+  DEFINE_STANDARD_RTTIEXT(BRepCheck_Wire,BRepCheck_Result)
 
 protected:
 
diff --git a/src/BRepExtrema/BRepExtrema_TriangleSet.cxx b/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
index e33c1b0c49..ff4b5382a1 100644
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
@@ -22,6 +22,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepExtrema_TriangleSet,Standard_Transient)
+
 //=======================================================================
 //function : BRepExtrema_TriangleSet
 //purpose  : Creates empty triangle set
diff --git a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
index b60a22bf59..22e0832539 100644
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
@@ -80,7 +80,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(BRepExtrema_TriangleSet, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepExtrema_TriangleSet,Standard_Transient)
 
 };
 
diff --git a/src/BRepFill/BRepFill_ACRLaw.cxx b/src/BRepFill/BRepFill_ACRLaw.cxx
index 1b4fe13648..8c8368a53c 100644
--- a/src/BRepFill/BRepFill_ACRLaw.cxx
+++ b/src/BRepFill/BRepFill_ACRLaw.cxx
@@ -33,6 +33,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HArray1OfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_ACRLaw,BRepFill_LocationLaw)
+
 BRepFill_ACRLaw::BRepFill_ACRLaw(const TopoDS_Wire& Path,
 				 const Handle(GeomFill_LocationGuide)& theLaw)
 {
diff --git a/src/BRepFill/BRepFill_ACRLaw.hxx b/src/BRepFill/BRepFill_ACRLaw.hxx
index 9279d1dfc9..f06e64ef59 100644
--- a/src/BRepFill/BRepFill_ACRLaw.hxx
+++ b/src/BRepFill/BRepFill_ACRLaw.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_ACRLaw,BRepFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_ACRLaw,BRepFill_LocationLaw)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_CurveConstraint.cxx b/src/BRepFill/BRepFill_CurveConstraint.cxx
index 470ac1e728..49d01e01db 100644
--- a/src/BRepFill/BRepFill_CurveConstraint.cxx
+++ b/src/BRepFill/BRepFill_CurveConstraint.cxx
@@ -35,6 +35,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_CurveConstraint,GeomPlate_CurveConstraint)
+
 //---------------------------------------------------------
 //         Constructeurs avec courbe sur surface
 //---------------------------------------------------------
diff --git a/src/BRepFill/BRepFill_CurveConstraint.hxx b/src/BRepFill/BRepFill_CurveConstraint.hxx
index 7826e7f93f..be01a01c79 100644
--- a/src/BRepFill/BRepFill_CurveConstraint.hxx
+++ b/src/BRepFill/BRepFill_CurveConstraint.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_CurveConstraint,GeomPlate_CurveConstraint)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_CurveConstraint,GeomPlate_CurveConstraint)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_DraftLaw.cxx b/src/BRepFill/BRepFill_DraftLaw.cxx
index 7b0e233b84..4c53a06a63 100644
--- a/src/BRepFill/BRepFill_DraftLaw.cxx
+++ b/src/BRepFill/BRepFill_DraftLaw.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_DraftLaw,BRepFill_Edge3DLaw)
+
 //=======================================================================
 //function : ToG0
 //purpose  : Cacul une tranformation T tq T.M2 = M1
diff --git a/src/BRepFill/BRepFill_DraftLaw.hxx b/src/BRepFill/BRepFill_DraftLaw.hxx
index efa1c87dcb..7beb4620b3 100644
--- a/src/BRepFill/BRepFill_DraftLaw.hxx
+++ b/src/BRepFill/BRepFill_DraftLaw.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_DraftLaw,BRepFill_Edge3DLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_DraftLaw,BRepFill_Edge3DLaw)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_Edge3DLaw.cxx b/src/BRepFill/BRepFill_Edge3DLaw.cxx
index dc00a52414..98be92c5f8 100644
--- a/src/BRepFill/BRepFill_Edge3DLaw.cxx
+++ b/src/BRepFill/BRepFill_Edge3DLaw.cxx
@@ -30,6 +30,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HArray1OfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_Edge3DLaw,BRepFill_LocationLaw)
+
 BRepFill_Edge3DLaw::BRepFill_Edge3DLaw(const TopoDS_Wire& Path,
 				     const Handle(GeomFill_LocationLaw)& Law)
 {
diff --git a/src/BRepFill/BRepFill_Edge3DLaw.hxx b/src/BRepFill/BRepFill_Edge3DLaw.hxx
index ba25636e2e..569f56dc5d 100644
--- a/src/BRepFill/BRepFill_Edge3DLaw.hxx
+++ b/src/BRepFill/BRepFill_Edge3DLaw.hxx
@@ -40,7 +40,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_Edge3DLaw,BRepFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_Edge3DLaw,BRepFill_LocationLaw)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_EdgeOnSurfLaw.cxx b/src/BRepFill/BRepFill_EdgeOnSurfLaw.cxx
index 20e37f892f..b5a0003109 100644
--- a/src/BRepFill/BRepFill_EdgeOnSurfLaw.cxx
+++ b/src/BRepFill/BRepFill_EdgeOnSurfLaw.cxx
@@ -36,6 +36,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HArray1OfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_EdgeOnSurfLaw,BRepFill_LocationLaw)
+
 BRepFill_EdgeOnSurfLaw::BRepFill_EdgeOnSurfLaw(const TopoDS_Wire& Path,
 					       const TopoDS_Shape& Surf)
 {
diff --git a/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx b/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
index 2ace73ef95..0d53a0d9d3 100644
--- a/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
+++ b/src/BRepFill/BRepFill_EdgeOnSurfLaw.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_EdgeOnSurfLaw,BRepFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_EdgeOnSurfLaw,BRepFill_LocationLaw)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_Filling.cxx b/src/BRepFill/BRepFill_Filling.cxx
index d0be7823cd..d14fc3d81d 100644
--- a/src/BRepFill/BRepFill_Filling.cxx
+++ b/src/BRepFill/BRepFill_Filling.cxx
@@ -66,6 +66,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <Geom_Surface.hxx>
 
 static gp_Vec MakeFinVec( const TopoDS_Wire aWire, const TopoDS_Vertex aVertex )
 {
diff --git a/src/BRepFill/BRepFill_LocationLaw.cxx b/src/BRepFill/BRepFill_LocationLaw.cxx
index 3f0675ee48..39b27dc7a6 100644
--- a/src/BRepFill/BRepFill_LocationLaw.cxx
+++ b/src/BRepFill/BRepFill_LocationLaw.cxx
@@ -42,6 +42,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_LocationLaw,MMgt_TShared)
+
 //=======================================================================
 //function : Norm
 //purpose  : Norm of a Matrix
diff --git a/src/BRepFill/BRepFill_LocationLaw.hxx b/src/BRepFill/BRepFill_LocationLaw.hxx
index 60d9993f94..d3f7ad2c04 100644
--- a/src/BRepFill/BRepFill_LocationLaw.hxx
+++ b/src/BRepFill/BRepFill_LocationLaw.hxx
@@ -122,7 +122,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_LocationLaw,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_LocationLaw,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_NSections.cxx b/src/BRepFill/BRepFill_NSections.cxx
index b49f7d8c17..2d637b603a 100644
--- a/src/BRepFill/BRepFill_NSections.cxx
+++ b/src/BRepFill/BRepFill_NSections.cxx
@@ -57,6 +57,8 @@
 #include <TopTools_Array1OfShape.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_NSections,BRepFill_SectionLaw)
+
 #ifdef OCCT_DEBUG
 static Standard_Boolean Affich = 0;
 #endif
diff --git a/src/BRepFill/BRepFill_NSections.hxx b/src/BRepFill/BRepFill_NSections.hxx
index 8fe83d70a8..e01352a0f1 100644
--- a/src/BRepFill/BRepFill_NSections.hxx
+++ b/src/BRepFill/BRepFill_NSections.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_NSections,BRepFill_SectionLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_NSections,BRepFill_SectionLaw)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_PipeShell.cxx b/src/BRepFill/BRepFill_PipeShell.cxx
index fdd85d65a4..8592178b07 100644
--- a/src/BRepFill/BRepFill_PipeShell.cxx
+++ b/src/BRepFill/BRepFill_PipeShell.cxx
@@ -80,6 +80,8 @@
 #include <TopTools_SequenceOfShape.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_PipeShell,MMgt_TShared)
+
 //Specification Guide
 #ifdef DRAW
 #include <Draw.hxx>
diff --git a/src/BRepFill/BRepFill_PipeShell.hxx b/src/BRepFill/BRepFill_PipeShell.hxx
index e4a103341d..6c784a2936 100644
--- a/src/BRepFill/BRepFill_PipeShell.hxx
+++ b/src/BRepFill/BRepFill_PipeShell.hxx
@@ -190,7 +190,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_PipeShell,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_PipeShell,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_SectionLaw.cxx b/src/BRepFill/BRepFill_SectionLaw.cxx
index 668d6d4206..03ea21de07 100644
--- a/src/BRepFill/BRepFill_SectionLaw.cxx
+++ b/src/BRepFill/BRepFill_SectionLaw.cxx
@@ -38,6 +38,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_SectionLaw,MMgt_TShared)
+
 //=======================================================================
 //function : NbLaw
 //purpose  : Gives the number of elementary (or Geometric) law
diff --git a/src/BRepFill/BRepFill_SectionLaw.hxx b/src/BRepFill/BRepFill_SectionLaw.hxx
index 26c548c3d1..c16de9e0cf 100644
--- a/src/BRepFill/BRepFill_SectionLaw.hxx
+++ b/src/BRepFill/BRepFill_SectionLaw.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_SectionLaw,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_SectionLaw,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepFill/BRepFill_ShapeLaw.cxx b/src/BRepFill/BRepFill_ShapeLaw.cxx
index ca237d152c..5bdbf3766b 100644
--- a/src/BRepFill/BRepFill_ShapeLaw.cxx
+++ b/src/BRepFill/BRepFill_ShapeLaw.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepFill_ShapeLaw,BRepFill_SectionLaw)
+
 //=======================================================================
 //function : Create
 //purpose  : Process the case of Vertex by constructing a line
diff --git a/src/BRepFill/BRepFill_ShapeLaw.hxx b/src/BRepFill/BRepFill_ShapeLaw.hxx
index 6db9906b60..feef75ec8d 100644
--- a/src/BRepFill/BRepFill_ShapeLaw.hxx
+++ b/src/BRepFill/BRepFill_ShapeLaw.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepFill_ShapeLaw,BRepFill_SectionLaw)
+  DEFINE_STANDARD_RTTIEXT(BRepFill_ShapeLaw,BRepFill_SectionLaw)
 
 protected:
 
diff --git a/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx b/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
index 3159c34cd1..d14f2f17b4 100644
--- a/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
+++ b/src/BRepLib/BRepLib_CheckCurveOnSurface.cxx
@@ -19,6 +19,7 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
+#include <Geom_Curve.hxx>
 
 //=======================================================================
 //function : BRepLib_CheckCurveOnSurface
diff --git a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
index 03397e6165..2f9b0bc52a 100644
--- a/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
+++ b/src/BRepMAT2d/BRepMAT2d_BisectingLocus.cxx
@@ -38,6 +38,7 @@
 #include <Precision.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <TColGeom2d_SequenceOfGeometry.hxx>
+#include <Geom2d_Curve.hxx>
 
 static void CutSketch (MAT2d_SequenceOfSequenceOfGeometry&    Figure,
 		       MAT2d_DataMapOfBiIntInteger&           NbSect);
diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
index eb4704ebaf..225103b5b1 100644
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cxx
@@ -25,6 +25,8 @@
 #include <Standard_ErrorHandler.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DataStructureOfDelaun,Standard_Transient)
+
 //=======================================================================
 //function : BRepMesh_DataStructureOfDelaun
 //purpose  : 
diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
index 4599404108..fc9b639ac0 100644
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.hxx
@@ -260,7 +260,7 @@ public: //! @name Auxilary API
     clearDeletedNodes();
   }
 
-  DEFINE_STANDARD_RTTI(BRepMesh_DataStructureOfDelaun, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_DataStructureOfDelaun,Standard_Transient)
 
 private: 
 
diff --git a/src/BRepMesh/BRepMesh_DiscretRoot.cxx b/src/BRepMesh/BRepMesh_DiscretRoot.cxx
index 751908ea17..e6d0978e63 100644
--- a/src/BRepMesh/BRepMesh_DiscretRoot.cxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.cxx
@@ -16,6 +16,8 @@
 #include <BRepMesh_DiscretRoot.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_DiscretRoot,Standard_Transient)
+
 //=======================================================================
 //function : BRepMesh_DiscretRoot
 //purpose  :
diff --git a/src/BRepMesh/BRepMesh_DiscretRoot.hxx b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
index ab785422a0..f3834204df 100644
--- a/src/BRepMesh/BRepMesh_DiscretRoot.hxx
+++ b/src/BRepMesh/BRepMesh_DiscretRoot.hxx
@@ -49,7 +49,7 @@ public:
   Standard_EXPORT virtual void Perform() = 0;
 
 
-  DEFINE_STANDARD_RTTI(BRepMesh_DiscretRoot, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_DiscretRoot,Standard_Transient)
 
 protected:
   
diff --git a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
index 1a83050d34..7f735f7fce 100644
--- a/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeParameterProvider.hxx
@@ -25,7 +25,7 @@
 class gp_Pnt;
 class TopoDS_Edge;
 class TopoDS_Face;
-class TColStd_HArray1OfReal;
+#include <TColStd_HArray1OfReal.hxx>
 
 //! Auxiliary class provides correct parameters 
 //! on curve regarding SameParameter flag.
diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
index e680cbd09b..d01f24d101 100644
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.cxx
@@ -20,6 +20,8 @@
 #include <BRepMesh_ShapeTool.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellationExtractor,BRepMesh_IEdgeTool)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
index f37ba8af9c..82dbc8259b 100644
--- a/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellationExtractor.hxx
@@ -62,7 +62,7 @@ public:
                      gp_Pnt&                thePoint,
                      gp_Pnt2d&              theUV) Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellationExtractor, BRepMesh_IEdgeTool)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_EdgeTessellationExtractor,BRepMesh_IEdgeTool)
 
 private:
 
diff --git a/src/BRepMesh/BRepMesh_EdgeTessellator.cxx b/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
index 679ddc4ef2..c59079d276 100644
--- a/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_Array1OfReal.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_EdgeTessellator,BRepMesh_IEdgeTool)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
index 0ef64ac96a..d560f602a1 100644
--- a/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
+++ b/src/BRepMesh/BRepMesh_EdgeTessellator.hxx
@@ -63,7 +63,7 @@ public:
                      gp_Pnt&                thePoint,
                      gp_Pnt2d&              theUV) Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(BRepMesh_EdgeTessellator, BRepMesh_IEdgeTool)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_EdgeTessellator,BRepMesh_IEdgeTool)
 
 private:
 
diff --git a/src/BRepMesh/BRepMesh_FaceAttribute.cxx b/src/BRepMesh/BRepMesh_FaceAttribute.cxx
index 9052318eff..4cba24b1f8 100644
--- a/src/BRepMesh/BRepMesh_FaceAttribute.cxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.cxx
@@ -26,6 +26,8 @@
 #include <BRep_Tool.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FaceAttribute,Standard_Transient)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BRepMesh/BRepMesh_FaceAttribute.hxx b/src/BRepMesh/BRepMesh_FaceAttribute.hxx
index 7207c39acc..ffd811efbb 100644
--- a/src/BRepMesh/BRepMesh_FaceAttribute.hxx
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.hxx
@@ -317,7 +317,7 @@ public: //! @name Auxiliary methods
   Standard_EXPORT gp_XY Scale(const gp_XY&           thePoint2d, 
                               const Standard_Boolean isToFaceBasis);
 
-  DEFINE_STANDARD_RTTI(BRepMesh_FaceAttribute, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_FaceAttribute,Standard_Transient)
 
 private:
 
diff --git a/src/BRepMesh/BRepMesh_FastDiscret.cxx b/src/BRepMesh/BRepMesh_FastDiscret.cxx
index f59b6e3bd6..ff5019daaf 100644
--- a/src/BRepMesh/BRepMesh_FastDiscret.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.cxx
@@ -71,6 +71,8 @@
 
 #include <vector>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscret,Standard_Transient)
+
 #define UVDEFLECTION 1.e-05
 
 //=======================================================================
diff --git a/src/BRepMesh/BRepMesh_FastDiscret.hxx b/src/BRepMesh/BRepMesh_FastDiscret.hxx
index 7466b5bec0..8ac5989ff4 100644
--- a/src/BRepMesh/BRepMesh_FastDiscret.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscret.hxx
@@ -167,7 +167,7 @@ public:
     return myBoundaryPoints->Extent();
   }
 
-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscret, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_FastDiscret,Standard_Transient)
 
 private:
 
diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
index 3db143d9f7..dd1fe61688 100644
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cxx
@@ -57,6 +57,8 @@
 #include <algorithm>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_FastDiscretFace,Standard_Transient)
+
 static Standard_Real FUN_CalcAverageDUV(TColStd_Array1OfReal& P, const Standard_Integer PLen)
 {
   Standard_Integer i, j, n = 0;
diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
index 17b0ab6eb9..f85ca476d2 100644
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.hxx
@@ -62,7 +62,7 @@ public:
 
   Standard_EXPORT void Perform(const Handle(BRepMesh_FaceAttribute)& theAttribute);
 
-  DEFINE_STANDARD_RTTI(BRepMesh_FastDiscretFace, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_FastDiscretFace,Standard_Transient)
 
 private:
 
diff --git a/src/BRepMesh/BRepMesh_IEdgeTool.cxx b/src/BRepMesh/BRepMesh_IEdgeTool.cxx
index 186c01fc00..f343c21829 100644
--- a/src/BRepMesh/BRepMesh_IEdgeTool.cxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.cxx
@@ -16,3 +16,5 @@
 #include <BRepMesh_IEdgeTool.hxx>
 
 
+
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IEdgeTool,Standard_Transient)
\ No newline at end of file
diff --git a/src/BRepMesh/BRepMesh_IEdgeTool.hxx b/src/BRepMesh/BRepMesh_IEdgeTool.hxx
index bec9594347..c3493e0f51 100644
--- a/src/BRepMesh/BRepMesh_IEdgeTool.hxx
+++ b/src/BRepMesh/BRepMesh_IEdgeTool.hxx
@@ -38,7 +38,7 @@ public:
                      gp_Pnt&                thePoint,
                      gp_Pnt2d&              theUV) = 0;
 
-  DEFINE_STANDARD_RTTI(BRepMesh_IEdgeTool, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_IEdgeTool,Standard_Transient)
 };
 
 DEFINE_STANDARD_HANDLE(BRepMesh_IEdgeTool, Standard_Transient)
diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
index 091d786ced..55873a710d 100644
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.cxx
@@ -53,6 +53,8 @@
 
 #include <GCPnts_TangentialDeflection.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepMesh_IncrementalMesh,BRepMesh_DiscretRoot)
+
 namespace
 {
   //! Default flag to control parallelization for BRepMesh_IncrementalMesh
diff --git a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
index 897794e4cf..5e7d4f3bdc 100644
--- a/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
+++ b/src/BRepMesh/BRepMesh_IncrementalMesh.hxx
@@ -117,7 +117,7 @@ public: //! @name plugin API
   //! Discret() static method (thus applied only to Mesh Factories).
   Standard_EXPORT static void SetParallelDefault(const Standard_Boolean isInParallel);
 
-  DEFINE_STANDARD_RTTI(BRepMesh_IncrementalMesh, BRepMesh_DiscretRoot)
+  DEFINE_STANDARD_RTTIEXT(BRepMesh_IncrementalMesh,BRepMesh_DiscretRoot)
 
 protected:
 
diff --git a/src/BRepOffset/BRepOffset_Offset.cxx b/src/BRepOffset/BRepOffset_Offset.cxx
index 5c7d9889d7..b1e8df348c 100644
--- a/src/BRepOffset/BRepOffset_Offset.cxx
+++ b/src/BRepOffset/BRepOffset_Offset.cxx
@@ -92,6 +92,7 @@ static Standard_Integer NbOFFSET = 0;
 #include <DBRep.hxx>
 #endif
 #include <stdio.h>
+#include <Geom_BSplineSurface.hxx>
 
 
 static gp_Pnt GetFarestCorner(const TopoDS_Wire& aWire)
diff --git a/src/BRepTools/BRepTools_GTrsfModification.cxx b/src/BRepTools/BRepTools_GTrsfModification.cxx
index 4ea4fa1fd5..76169ffa95 100644
--- a/src/BRepTools/BRepTools_GTrsfModification.cxx
+++ b/src/BRepTools/BRepTools_GTrsfModification.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTools_GTrsfModification,BRepTools_Modification)
+
 //=======================================================================
 //function : BRepTools_GTrsfModification
 //purpose  : 
diff --git a/src/BRepTools/BRepTools_GTrsfModification.hxx b/src/BRepTools/BRepTools_GTrsfModification.hxx
index 869c570164..5640c1613b 100644
--- a/src/BRepTools/BRepTools_GTrsfModification.hxx
+++ b/src/BRepTools/BRepTools_GTrsfModification.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTools_GTrsfModification,BRepTools_Modification)
+  DEFINE_STANDARD_RTTIEXT(BRepTools_GTrsfModification,BRepTools_Modification)
 
 protected:
 
diff --git a/src/BRepTools/BRepTools_Modification.cxx b/src/BRepTools/BRepTools_Modification.cxx
index a4544c1321..012035a8b2 100644
--- a/src/BRepTools/BRepTools_Modification.cxx
+++ b/src/BRepTools/BRepTools_Modification.cxx
@@ -28,6 +28,8 @@
 #include <Poly_PolygonOnTriangulation.hxx>
 #include <Poly_Triangulation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTools_Modification,MMgt_TShared)
+
 Standard_Boolean BRepTools_Modification::NewTriangulation(const TopoDS_Face&, Handle(Poly_Triangulation)&)
 {
   return Standard_False;
diff --git a/src/BRepTools/BRepTools_Modification.hxx b/src/BRepTools/BRepTools_Modification.hxx
index 08200fcaf4..afc44553e7 100644
--- a/src/BRepTools/BRepTools_Modification.hxx
+++ b/src/BRepTools/BRepTools_Modification.hxx
@@ -126,7 +126,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTools_Modification,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepTools_Modification,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.cxx b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
index a94c30781d..7f678ec0c0 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
@@ -68,6 +68,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRep_Builder.hxx>
+IMPLEMENT_STANDARD_RTTIEXT(BRepTools_NurbsConvertModification,BRepTools_Modification)
+
 //
 static void GeomLib_ChangeUBounds(Handle(Geom_BSplineSurface)& aSurface,
                   const Standard_Real newU1,
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.hxx b/src/BRepTools/BRepTools_NurbsConvertModification.hxx
index 1e7c0aa34a..8e79209702 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.hxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.hxx
@@ -106,7 +106,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTools_NurbsConvertModification,BRepTools_Modification)
+  DEFINE_STANDARD_RTTIEXT(BRepTools_NurbsConvertModification,BRepTools_Modification)
 
 protected:
 
diff --git a/src/BRepTools/BRepTools_ReShape.cxx b/src/BRepTools/BRepTools_ReShape.cxx
index 8a9b683eff..c34c0824a8 100644
--- a/src/BRepTools/BRepTools_ReShape.cxx
+++ b/src/BRepTools/BRepTools_ReShape.cxx
@@ -35,6 +35,8 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTools_ReShape,MMgt_TShared)
+
 //include <ShapeExtend.hxx>
 //#include <BRepTools_Edge.hxx>
 static void CopyRanges (const TopoDS_Shape& toedge, const TopoDS_Shape& fromedge,
diff --git a/src/BRepTools/BRepTools_ReShape.hxx b/src/BRepTools/BRepTools_ReShape.hxx
index b176fd7e8b..c97cebe994 100644
--- a/src/BRepTools/BRepTools_ReShape.hxx
+++ b/src/BRepTools/BRepTools_ReShape.hxx
@@ -139,7 +139,7 @@ public:
                                            const Standard_Real aTol);
 
 
-  DEFINE_STANDARD_RTTI(BRepTools_ReShape,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BRepTools_ReShape,MMgt_TShared)
 
 protected:
 
diff --git a/src/BRepTools/BRepTools_TrsfModification.cxx b/src/BRepTools/BRepTools_TrsfModification.cxx
index ce311fce1a..36e812a4e6 100644
--- a/src/BRepTools/BRepTools_TrsfModification.cxx
+++ b/src/BRepTools/BRepTools_TrsfModification.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTools_TrsfModification,BRepTools_Modification)
+
 //=======================================================================
 //function : BRepTools_TrsfModification
 //purpose  : 
diff --git a/src/BRepTools/BRepTools_TrsfModification.hxx b/src/BRepTools/BRepTools_TrsfModification.hxx
index 4139611bf3..04b1f88476 100644
--- a/src/BRepTools/BRepTools_TrsfModification.hxx
+++ b/src/BRepTools/BRepTools_TrsfModification.hxx
@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTools_TrsfModification,BRepTools_Modification)
+  DEFINE_STANDARD_RTTIEXT(BRepTools_TrsfModification,BRepTools_Modification)
 
 protected:
 
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
index 5c510c94e5..0da87cd856 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTopAdaptor_HVertex,Adaptor3d_HVertex)
+
 BRepTopAdaptor_HVertex::BRepTopAdaptor_HVertex
   (const TopoDS_Vertex& V,
    const Handle(BRepAdaptor_HCurve2d)& C):
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
index 99db93eccb..75d69129ed 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTopAdaptor_HVertex,Adaptor3d_HVertex)
+  DEFINE_STANDARD_RTTIEXT(BRepTopAdaptor_HVertex,Adaptor3d_HVertex)
 
 protected:
 
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
index fe1a2e2e79..db15eae508 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cxx
@@ -36,6 +36,8 @@
 #include <TColgp_Array2OfPnt.hxx>
 #include <TopoDS.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BRepTopAdaptor_TopolTool,Adaptor3d_TopolTool)
+
 static 
   void Analyse(const TColgp_Array2OfPnt& array2,
 	       const Standard_Integer nbup,
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
index fd8e6a97d2..e95e588c3f 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BRepTopAdaptor_TopolTool,Adaptor3d_TopolTool)
+  DEFINE_STANDARD_RTTIEXT(BRepTopAdaptor_TopolTool,Adaptor3d_TopolTool)
 
 protected:
 
diff --git a/src/BSplCLib/BSplCLib_Cache.cxx b/src/BSplCLib/BSplCLib_Cache.cxx
index c57a0069ca..81b6998ed0 100644
--- a/src/BSplCLib/BSplCLib_Cache.cxx
+++ b/src/BSplCLib/BSplCLib_Cache.cxx
@@ -22,6 +22,8 @@
 #include <TColStd_HArray2OfReal.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BSplCLib_Cache,Standard_Transient)
+
 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
 static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
 {
diff --git a/src/BSplCLib/BSplCLib_Cache.hxx b/src/BSplCLib/BSplCLib_Cache.hxx
index 19937782b5..f2f8f39fcf 100644
--- a/src/BSplCLib/BSplCLib_Cache.hxx
+++ b/src/BSplCLib/BSplCLib_Cache.hxx
@@ -139,7 +139,7 @@ public:
                                 gp_Vec&        theTorsion) const;
 
 
-  DEFINE_STANDARD_RTTI(BSplCLib_Cache, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BSplCLib_Cache,Standard_Transient)
 
 protected:
   //! Normalizes the parameter for periodical curves
diff --git a/src/BSplSLib/BSplSLib_Cache.cxx b/src/BSplSLib/BSplSLib_Cache.cxx
index 33ebb37568..ea8b833ef1 100644
--- a/src/BSplSLib/BSplSLib_Cache.cxx
+++ b/src/BSplSLib/BSplSLib_Cache.cxx
@@ -22,6 +22,8 @@
 #include <TColStd_HArray2OfReal.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BSplSLib_Cache,Standard_Transient)
+
 //! Converts handle of array of Standard_Real into the pointer to Standard_Real
 static Standard_Real* ConvertArray(const Handle(TColStd_HArray2OfReal)& theHArray)
 {
diff --git a/src/BSplSLib/BSplSLib_Cache.hxx b/src/BSplSLib/BSplSLib_Cache.hxx
index bbf5ae8f2b..ac6e5963ab 100644
--- a/src/BSplSLib/BSplSLib_Cache.hxx
+++ b/src/BSplSLib/BSplSLib_Cache.hxx
@@ -121,7 +121,7 @@ public:
                                 gp_Vec&        theCurvatureUV) const;
 
 
-  DEFINE_STANDARD_RTTI(BSplSLib_Cache, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BSplSLib_Cache,Standard_Transient)
 
 protected:
   //! Normalizes the parameter for periodical surfaces
diff --git a/src/BVH/BVH_BuildThread.cxx b/src/BVH/BVH_BuildThread.cxx
index 9e0fc4c8f9..ec04704650 100644
--- a/src/BVH/BVH_BuildThread.cxx
+++ b/src/BVH/BVH_BuildThread.cxx
@@ -15,6 +15,8 @@
 
 #include <BVH_BuildThread.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BVH_BuildThread,Standard_Transient)
+
 // =======================================================================
 // function : BVH_BuildThread
 // purpose  : Creates new BVH build thread
diff --git a/src/BVH/BVH_BuildThread.hxx b/src/BVH/BVH_BuildThread.hxx
index 0200497f05..734e0fe880 100644
--- a/src/BVH/BVH_BuildThread.hxx
+++ b/src/BVH/BVH_BuildThread.hxx
@@ -72,7 +72,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(BVH_BuildThread, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(BVH_BuildThread,Standard_Transient)
 };
 
 DEFINE_STANDARD_HANDLE (BVH_BuildThread, Standard_Transient)
diff --git a/src/BiTgte/BiTgte_HCurveOnEdge.hxx b/src/BiTgte/BiTgte_HCurveOnEdge.hxx
index 82ae24b1b0..1e63fac4ec 100644
--- a/src/BiTgte/BiTgte_HCurveOnEdge.hxx
+++ b/src/BiTgte/BiTgte_HCurveOnEdge.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BiTgte_HCurveOnEdge,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(BiTgte_HCurveOnEdge,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/BiTgte/BiTgte_HCurveOnVertex.hxx b/src/BiTgte/BiTgte_HCurveOnVertex.hxx
index f5fa4585bd..4b2087584e 100644
--- a/src/BiTgte/BiTgte_HCurveOnVertex.hxx
+++ b/src/BiTgte/BiTgte_HCurveOnVertex.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BiTgte_HCurveOnVertex,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(BiTgte_HCurveOnVertex,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
index b7334e1802..0a823a6cd2 100644
--- a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cxx
@@ -29,6 +29,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinDrivers_DocumentRetrievalDriver,BinLDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : BinDrivers_DocumentRetrievalDriver
 //purpose  : Constructor
diff --git a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
index c24e7ad3fe..97e751df04 100644
--- a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinDrivers_DocumentRetrievalDriver,BinLDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(BinDrivers_DocumentRetrievalDriver,BinLDrivers_DocumentRetrievalDriver)
 
 protected:
 
diff --git a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
index a2cef40bd7..a6db4870bd 100644
--- a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
+++ b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cxx
@@ -26,6 +26,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : BinDrivers_DocumentStorageDriver
 //purpose  : Constructor
diff --git a/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx b/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
index 2d6703f71f..ad0cba1229 100644
--- a/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
+++ b/src/BinDrivers/BinDrivers_DocumentStorageDriver.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(BinDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
 
 protected:
 
diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
index 75d95da731..5a0338ab14 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@@ -41,6 +41,8 @@
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Owner.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
+
 #define SHAPESECTION_POS "SHAPE_SECTION_POS:"
 #define SIZEOFSHAPELABEL  18
 
diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
index 7c3eea2a86..d635a52782 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(BinLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
 
 protected:
 
diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
index 0195bb862e..63f8e80383 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
@@ -42,6 +42,8 @@
 #include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
+
 #define SHAPESECTION_POS (Standard_CString)"SHAPE_SECTION_POS:"
 
 //=======================================================================
diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
index 29f2c3c1f5..4c4ed4a69a 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
+++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
+  DEFINE_STANDARD_RTTIEXT(BinLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
 
 protected:
 
diff --git a/src/BinMDF/BinMDF_ADriver.cxx b/src/BinMDF/BinMDF_ADriver.cxx
index f687f8ef2a..8b0bbf7edd 100644
--- a/src/BinMDF/BinMDF_ADriver.cxx
+++ b/src/BinMDF/BinMDF_ADriver.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDF_ADriver,MMgt_TShared)
+
 //=======================================================================
 //function : BinMDF_ADriver
 //purpose  : Constructor
diff --git a/src/BinMDF/BinMDF_ADriver.hxx b/src/BinMDF/BinMDF_ADriver.hxx
index 02e8caf784..67d7912acd 100644
--- a/src/BinMDF/BinMDF_ADriver.hxx
+++ b/src/BinMDF/BinMDF_ADriver.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDF_ADriver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BinMDF_ADriver,MMgt_TShared)
 
 protected:
 
diff --git a/src/BinMDF/BinMDF_ADriverTable.cxx b/src/BinMDF/BinMDF_ADriverTable.cxx
index 8a2be2f333..3c165aa873 100644
--- a/src/BinMDF/BinMDF_ADriverTable.cxx
+++ b/src/BinMDF/BinMDF_ADriverTable.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDF_ADriverTable,MMgt_TShared)
+
 //=======================================================================
 //function : BinMDF_ADriverTable
 //purpose  : Constructor
diff --git a/src/BinMDF/BinMDF_ADriverTable.hxx b/src/BinMDF/BinMDF_ADriverTable.hxx
index 6efd00a35b..81c368ec0e 100644
--- a/src/BinMDF/BinMDF_ADriverTable.hxx
+++ b/src/BinMDF/BinMDF_ADriverTable.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDF_ADriverTable,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(BinMDF_ADriverTable,MMgt_TShared)
 
 protected:
 
diff --git a/src/BinMDF/BinMDF_ReferenceDriver.cxx b/src/BinMDF/BinMDF_ReferenceDriver.cxx
index 34b6b9e51d..178be2b922 100644
--- a/src/BinMDF/BinMDF_ReferenceDriver.cxx
+++ b/src/BinMDF/BinMDF_ReferenceDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_Reference.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDF_ReferenceDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDF_ReferenceDriver
 //purpose  : Constructor
diff --git a/src/BinMDF/BinMDF_ReferenceDriver.hxx b/src/BinMDF/BinMDF_ReferenceDriver.hxx
index 20f8c5630c..d525618c5a 100644
--- a/src/BinMDF/BinMDF_ReferenceDriver.hxx
+++ b/src/BinMDF/BinMDF_ReferenceDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDF_ReferenceDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDF_ReferenceDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDF/BinMDF_TagSourceDriver.cxx b/src/BinMDF/BinMDF_TagSourceDriver.cxx
index fe3e3a5448..946e85e875 100644
--- a/src/BinMDF/BinMDF_TagSourceDriver.cxx
+++ b/src/BinMDF/BinMDF_TagSourceDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_TagSource.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDF_TagSourceDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDF_TagSourceDriver
 //purpose  : Constructor
diff --git a/src/BinMDF/BinMDF_TagSourceDriver.hxx b/src/BinMDF/BinMDF_TagSourceDriver.hxx
index 822ed70cc4..455a0c27ba 100644
--- a/src/BinMDF/BinMDF_TagSourceDriver.hxx
+++ b/src/BinMDF/BinMDF_TagSourceDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDF_TagSourceDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDF_TagSourceDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
index d7ca15855f..622a1bdfe0 100644
--- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_AsciiString.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_AsciiStringDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_AsciiStringDriver
 //purpose  :
diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx
index 67d5a98968..e771af431d 100644
--- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_AsciiStringDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_AsciiStringDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
index 8f560af82f..0067cbde4d 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_BooleanArray.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_BooleanArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_BooleanArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx
index e9351262d5..c56bc52ac9 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_BooleanArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_BooleanArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
index 91a00fa073..62960ce1e1 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_ListIteratorOfListOfByte.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_BooleanListDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_BooleanListDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx b/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx
index 11e8191c67..9c1304d832 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_BooleanListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_BooleanListDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_BooleanListDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
index 6c3f4baae3..cecf7933ad 100644
--- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_ByteArray.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ByteArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ByteArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx
index 1f6c8e3dbb..0a2c09fc30 100644
--- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ByteArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ByteArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.cxx b/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
index 966edf64c3..bb3001249f 100644
--- a/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_CommentDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDataStd_Comment.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_CommentDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_CommentDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx b/src/BinMDataStd/BinMDataStd_CommentDriver.hxx
index 3d3ed351fa..515e31b89c 100644
--- a/src/BinMDataStd/BinMDataStd_CommentDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_CommentDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_CommentDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_CommentDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
index 9114b618e3..1b2eba6450 100644
--- a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_Directory.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_DirectoryDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_DirectoryDriver
 //purpose  : 
diff --git a/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx b/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx
index 78e08e1c7c..f13a201a77 100644
--- a/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_DirectoryDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_DirectoryDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_DirectoryDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
index e3f9868b76..9b841d0ce6 100644
--- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_ListIteratorOfAttributeList.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExpressionDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ExpressionDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx b/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx
index f28f6e81be..657f26964e 100644
--- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ExpressionDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ExpressionDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
index b3e0be17e2..3d26246e6e 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_ExtStringArray.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExtStringArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ExtStringArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx
index 328ba504a7..7075688329 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ExtStringArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ExtStringArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
index 9f4fdea05a..1027c6b44b 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_ListIteratorOfListOfExtendedString.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExtStringListDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ExtStringListDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx
index 0e7a3b7bd9..909cace4a2 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ExtStringListDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ExtStringListDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
index fba48ae27b..be90e5c102 100644
--- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx
@@ -29,6 +29,8 @@
 #include <TDataStd_IntPackedMap.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntPackedMapDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_IntPackedMapDriver
 //purpose  :
diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx
index 9aac74d792..8194122f43 100644
--- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_IntPackedMapDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_IntPackedMapDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
index 5a953e2541..1762a6f27c 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_IntegerArray.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_IntegerArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx
index b409f7476d..582fdadb3f 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_IntegerArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_IntegerArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
index 9cb47bc332..ce66050053 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDataStd_Integer.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_IntegerDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx
index ee41749005..9fbd27e998 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_IntegerDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_IntegerDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
index c1b852f6f5..ad0edaffea 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_IntegerList.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerListDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_IntegerListDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx b/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx
index 577aaa9964..23bc69e3ab 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_IntegerListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_IntegerListDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_IntegerListDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.cxx b/src/BinMDataStd/BinMDataStd_NameDriver.cxx
index a4a1b3a5ad..be94e0d330 100644
--- a/src/BinMDataStd/BinMDataStd_NameDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NameDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDataStd_Name.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NameDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_NameDriver
 //purpose  :
diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.hxx b/src/BinMDataStd/BinMDataStd_NameDriver.hxx
index 9ce675f988..19e20fc750 100644
--- a/src/BinMDataStd/BinMDataStd_NameDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NameDriver.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_NameDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_NameDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
index b8abc9a96b..cf463bc498 100644
--- a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cxx
@@ -36,6 +36,8 @@
 #include <TDataStd_NamedData.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NamedDataDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_NamedDataDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx b/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx
index 5b388ba64e..a66d2f9515 100644
--- a/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NamedDataDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_NamedDataDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_NamedDataDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
index 1128d90e39..d369ba629c 100644
--- a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_NoteBook.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_NoteBookDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_NoteBookDriver
 //purpose  : 
diff --git a/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx b/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx
index 012a32043c..415a0a318f 100644
--- a/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_NoteBookDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_NoteBookDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_NoteBookDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
index 0d74960f5c..8c165d20eb 100644
--- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_RealArray.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_RealArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx
index 56b7bd3dbf..0dc82103b7 100644
--- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_RealArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_RealArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.cxx b/src/BinMDataStd/BinMDataStd_RealDriver.cxx
index 8059804487..ed6fe17027 100644
--- a/src/BinMDataStd/BinMDataStd_RealDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDataStd_Real.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_RealDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.hxx b/src/BinMDataStd/BinMDataStd_RealDriver.hxx
index b862ba750d..51801a5614 100644
--- a/src/BinMDataStd/BinMDataStd_RealDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_RealDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_RealDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_RealListDriver.cxx b/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
index 1db3a95e7b..9ea3139382 100644
--- a/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RealListDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_RealList.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealListDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_RealListDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_RealListDriver.hxx b/src/BinMDataStd/BinMDataStd_RealListDriver.hxx
index d14908d167..5353092fda 100644
--- a/src/BinMDataStd/BinMDataStd_RealListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RealListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_RealListDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_RealListDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
index 99ca0a4d9c..1717316d08 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ReferenceArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ReferenceArrayDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx
index d57a41ef60..dc6e605dfa 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ReferenceArrayDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ReferenceArrayDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
index 2b0638fbb1..50b7edf71c 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ReferenceListDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_ReferenceListDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx
index a182806b04..81ddaa688a 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_ReferenceListDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_ReferenceListDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.cxx b/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
index ce77492127..25120e9152 100644
--- a/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_RelationDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_ListIteratorOfAttributeList.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RelationDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_RelationDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx b/src/BinMDataStd/BinMDataStd_RelationDriver.hxx
index 4021bcf09c..ca6915b608 100644
--- a/src/BinMDataStd/BinMDataStd_RelationDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_RelationDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_RelationDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_RelationDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_TickDriver.cxx b/src/BinMDataStd/BinMDataStd_TickDriver.cxx
index ffef5fb106..2421395f89 100644
--- a/src/BinMDataStd/BinMDataStd_TickDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_TickDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataStd_Tick.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_TickDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_TickDriver
 //purpose  : 
diff --git a/src/BinMDataStd/BinMDataStd_TickDriver.hxx b/src/BinMDataStd/BinMDataStd_TickDriver.hxx
index 7672af973b..3fe9c31283 100644
--- a/src/BinMDataStd/BinMDataStd_TickDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_TickDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_TickDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_TickDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
index cb72a0e385..f09471894b 100644
--- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cxx
@@ -22,6 +22,8 @@
 #include <TDataStd_TreeNode.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_TreeNodeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_TreeNodeDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx
index 65d1ca57fd..8bcd2e3c2e 100644
--- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_TreeNodeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_TreeNodeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
index a80d16317e..9e1fa27feb 100644
--- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_UAttributeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_UAttributeDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx b/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx
index 4d3bb6d660..b71d5d0abf 100644
--- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_UAttributeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_UAttributeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.cxx b/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
index abc427f552..96d2cc353b 100644
--- a/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
+++ b/src/BinMDataStd/BinMDataStd_VariableDriver.cxx
@@ -22,6 +22,8 @@
 #include <TDataStd_Variable.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_VariableDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_VariableDriver
 //purpose  : Constructor
diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx b/src/BinMDataStd/BinMDataStd_VariableDriver.hxx
index e9f3bfe705..2406c33945 100644
--- a/src/BinMDataStd/BinMDataStd_VariableDriver.hxx
+++ b/src/BinMDataStd/BinMDataStd_VariableDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataStd_VariableDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataStd_VariableDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
index 70ed2a3b14..a0a60c6eaf 100644
--- a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataXtd_Axis.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_AxisDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_AxisDriver
 //purpose  : 
diff --git a/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx b/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx
index 83766468ae..121867460a 100644
--- a/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_AxisDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_AxisDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_AxisDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
index 80abd5eb4e..7ed731a9ca 100644
--- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Attribute.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_ConstraintDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_ConstraintDriver
 //purpose  : Constructor
diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx
index f9d0aea73c..6ee9f7da15 100644
--- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_ConstraintDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_ConstraintDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
index 1cc6dbced9..6d320700ac 100644
--- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cxx
@@ -22,6 +22,8 @@
 #include <TDataXtd_Geometry.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_GeometryDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_GeometryDriver
 //purpose  : Constructor
diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx
index ef2a317779..4a4072459f 100644
--- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_GeometryDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_GeometryDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
index b3e02dfacd..cc1423cffa 100644
--- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Attribute.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PatternStdDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_PatternStdDriver
 //purpose  : Constructor
diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx
index b188ee411c..ca12d14725 100644
--- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_PatternStdDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PatternStdDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
index 5baf3d79b1..7af4277755 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataXtd_Placement.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PlacementDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_PlacementDriver
 //purpose  : 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx
index fb9afdb248..1a03b22a72 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_PlacementDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PlacementDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
index ca1f566158..8c460140d5 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataXtd_Plane.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PlaneDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_PlaneDriver
 //purpose  : 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx
index ed38b3305d..6d00b06b0e 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_PlaneDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PlaneDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
index f77e839802..4d1900a86f 100644
--- a/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_PointDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataXtd_Point.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PointDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_PointDriver
 //purpose  : 
diff --git a/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx
index dcf48421a0..a8d22b6ed3 100644
--- a/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_PointDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_PointDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PointDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
index f0403b73f3..34b9161c24 100644
--- a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
+++ b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDataXtd_Shape.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_ShapeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataXtd_ShapeDriver
 //purpose  : 
diff --git a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx
index cd65135c7f..76c5e85b14 100644
--- a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx
+++ b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDataXtd_ShapeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDataXtd_ShapeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx b/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
index 6e63d3dc49..b35cf166a5 100644
--- a/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
+++ b/src/BinMDocStd/BinMDocStd_XLinkDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDocStd_XLink.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMDocStd_XLinkDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDocStd_XLinkDriver
 //purpose  : 
diff --git a/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx b/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx
index ec60b65a63..dca3ce33c4 100644
--- a/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx
+++ b/src/BinMDocStd/BinMDocStd_XLinkDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMDocStd_XLinkDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMDocStd_XLinkDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMFunction/BinMFunction_FunctionDriver.cxx b/src/BinMFunction/BinMFunction_FunctionDriver.cxx
index 779bd6d514..eae9bedf1e 100644
--- a/src/BinMFunction/BinMFunction_FunctionDriver.cxx
+++ b/src/BinMFunction/BinMFunction_FunctionDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Attribute.hxx>
 #include <TFunction_Function.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_FunctionDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMFunction_FunctionDriver
 //purpose  : 
diff --git a/src/BinMFunction/BinMFunction_FunctionDriver.hxx b/src/BinMFunction/BinMFunction_FunctionDriver.hxx
index 39f1936f85..34a1f3dd7d 100644
--- a/src/BinMFunction/BinMFunction_FunctionDriver.hxx
+++ b/src/BinMFunction/BinMFunction_FunctionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMFunction_FunctionDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMFunction_FunctionDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx b/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
index 7a62735b0c..6632a3f483 100644
--- a/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
+++ b/src/BinMFunction/BinMFunction_GraphNodeDriver.cxx
@@ -26,6 +26,8 @@
 #include <TDF_Attribute.hxx>
 #include <TFunction_GraphNode.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_GraphNodeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMFunction_GraphNodeDriver
 //purpose  : 
diff --git a/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx b/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx
index daf6eed744..d61e6234c2 100644
--- a/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx
+++ b/src/BinMFunction/BinMFunction_GraphNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMFunction_GraphNodeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMFunction_GraphNodeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMFunction/BinMFunction_ScopeDriver.cxx b/src/BinMFunction/BinMFunction_ScopeDriver.cxx
index bb2995d29f..374d44ac47 100644
--- a/src/BinMFunction/BinMFunction_ScopeDriver.cxx
+++ b/src/BinMFunction/BinMFunction_ScopeDriver.cxx
@@ -28,6 +28,8 @@
 #include <TFunction_DoubleMapIteratorOfDoubleMapOfIntegerLabel.hxx>
 #include <TFunction_Scope.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMFunction_ScopeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMFunction_GraphNodeDriver
 //purpose  : 
diff --git a/src/BinMFunction/BinMFunction_ScopeDriver.hxx b/src/BinMFunction/BinMFunction_ScopeDriver.hxx
index a4bb222427..0d63038598 100644
--- a/src/BinMFunction/BinMFunction_ScopeDriver.hxx
+++ b/src/BinMFunction/BinMFunction_ScopeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMFunction_ScopeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMFunction_ScopeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
index b0eb742332..1fbe784ccf 100644
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx
@@ -31,6 +31,8 @@
 #include <TopAbs_Orientation.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMNaming_NamedShapeDriver,BinMDF_ADriver)
+
 #define SHAPESET "SHAPE_SECTION"
 #define FORMAT_NUMBER 3
 //=======================================================================
diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
index 531cc366eb..a0f7884223 100644
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMNaming_NamedShapeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMNaming_NamedShapeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMNaming/BinMNaming_NamingDriver.cxx b/src/BinMNaming/BinMNaming_NamingDriver.cxx
index 854777ffba..da51b2d4c4 100644
--- a/src/BinMNaming/BinMNaming_NamingDriver.cxx
+++ b/src/BinMNaming/BinMNaming_NamingDriver.cxx
@@ -34,6 +34,8 @@
 #include <TNaming_Naming.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMNaming_NamingDriver,BinMDF_ADriver)
+
 #define  NULL_ENTRY "0:0"
 #define  OBSOLETE_NUM (int)sizeof(Standard_Integer)
 
diff --git a/src/BinMNaming/BinMNaming_NamingDriver.hxx b/src/BinMNaming/BinMNaming_NamingDriver.hxx
index 5ad53ed0b8..8768804e4c 100644
--- a/src/BinMNaming/BinMNaming_NamingDriver.hxx
+++ b/src/BinMNaming/BinMNaming_NamingDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMNaming_NamingDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMNaming_NamingDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx
index c01f00c46a..168588c89b 100644
--- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx
+++ b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Attribute.hxx>
 #include <TPrsStd_AISPresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMPrsStd_AISPresentationDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_AISPresentationDriver
 //purpose  : Constructor
diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx
index c245d21be7..e9541906a2 100644
--- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx
+++ b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMPrsStd_AISPresentationDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMPrsStd_AISPresentationDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx b/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx
index aac89c0747..0bc90570df 100644
--- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx
+++ b/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx
@@ -23,6 +23,8 @@
 #include <TDataXtd_Position.hxx>
 #include <TDF_Attribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMPrsStd_PositionDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinMDataStd_PositionDriver
 //purpose  : Constructor
diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx b/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx
index 47d0340b1e..0d0df88bfe 100644
--- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx
+++ b/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMPrsStd_PositionDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMPrsStd_PositionDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
index 979ccb99bc..445c2bd89d 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Area.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_AreaDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx
index fa9a0a160f..af3441ec6c 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_AreaDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_AreaDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
index 30b5a1677a..ebc84692fe 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Centroid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_CentroidDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx
index 77e1cc2ffb..d0938dd213 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_CentroidDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_CentroidDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
index 9a2bd9e931..0d2d34f837 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Color.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ColorDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx
index 3e62f27f72..0caebfd33d 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_ColorDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_ColorDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
index 0ba524b6c2..181df4e2fe 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_ColorTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ColorToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : 
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx
index cd52da1c78..71e881273d 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_ColorToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_ColorToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
index 6f7f006f41..d15ada8829 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Datum.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DatumDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx
index 60ce9e83c9..705edf294c 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_DatumDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_DatumDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
index 7e208f165d..8df20ba15b 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_DimTol.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx
index d287ec18b1..eb3f93bb67 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_DimTolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
index 73544847b2..fdc4ccb5ff 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_DimTolTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : 
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx
index 77355228d8..51024da126 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_DimTolToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_DimTolToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
index fbd047f51d..5b73f000e4 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_DocumentToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx
index 8a1cc9dee4..b4f94927e7 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_DocumentToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_DocumentToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
index 9123bdc114..74d88c12ff 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_GraphNode.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_GraphNodeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx
index 1345666151..105dc6121a 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_GraphNodeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_GraphNodeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
index 6e8e82d528..d69d1823cf 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_LayerTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_LayerToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx
index 1740349b79..d66d746be7 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_LayerToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_LayerToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
index 6af5fe5953..3d58f6c94e 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx
@@ -28,6 +28,8 @@
 #include <TopLoc_Location.hxx>
 #include <XCAFDoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_LocationDriver,BinMDF_ADriver)
+
 //#include <Precision.hxx>
 //=======================================================================
 //function :
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
index 2286656846..b7355bd707 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_LocationDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_LocationDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
index 7a5b9a69a7..c8204507a4 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Material.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx
index 61e3bdda2a..caa65a3e7b 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_MaterialDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
index 7770756abd..1e16af91fe 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_MaterialTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : 
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx
index e4b8b58b57..9005038a22 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_MaterialToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_MaterialToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
index 5cf4e19b5f..7598c4ac95 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_ShapeToolDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx
index 5c96cb19a8..ff2f249c21 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_ShapeToolDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_ShapeToolDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cxx
index 49965c953a..af35ecd952 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Attribute.hxx>
 #include <XCAFDoc_Volume.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinMXCAFDoc_VolumeDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.hxx b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.hxx
index 00cae3fece..d6efa21459 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.hxx
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinMXCAFDoc_VolumeDriver,BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinMXCAFDoc_VolumeDriver,BinMDF_ADriver)
 
 protected:
 
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx
index 22bd57bc1d..b9e4581179 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.cxx
@@ -19,6 +19,8 @@
 #include <BinLDrivers.hxx>
 #include <BinTObjDrivers.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_DocumentRetrievalDriver,BinLDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : BinTObjDrivers_DocumentRetrievalDriver
 //purpose  : 
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
index b1b4162ec5..9408fdff78 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
@@ -40,7 +40,7 @@ class BinTObjDrivers_DocumentRetrievalDriver :
 
  public:
   // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentRetrievalDriver, BinLDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_DocumentRetrievalDriver,BinLDrivers_DocumentRetrievalDriver)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx
index c0bf4002b2..82a204a267 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.cxx
@@ -19,6 +19,8 @@
 #include <BinLDrivers.hxx>
 #include <BinTObjDrivers.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : BinTObjDrivers_DocumentStorageDriver
 //purpose  : 
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
index 9f999bcc1d..7db397952a 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
@@ -40,7 +40,7 @@ class BinTObjDrivers_DocumentStorageDriver :
 
  public:
   // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (BinTObjDrivers_DocumentStorageDriver, BinLDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx
index d0d5cb44f9..ea52587457 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Tool.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_IntSparseArrayDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinTObjDrivers_IntSparseArrayDriver
 //purpose  : constructor
diff --git a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx
index 35a783a099..b981c4d5a5 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_IntSparseArrayDriver.hxx
@@ -49,7 +49,7 @@ class BinTObjDrivers_IntSparseArrayDriver : public BinMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_IntSparseArrayDriver, BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_IntSparseArrayDriver,BinMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx
index e043d87fd3..53775552b1 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.cxx
@@ -29,6 +29,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ModelDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinTObjDrivers_ModelDriver
 //purpose  : constructor
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx
index 8c7b3f4a94..a6f61a89c1 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ModelDriver.hxx
@@ -54,7 +54,7 @@ class BinTObjDrivers_ModelDriver : public BinMDF_ADriver
   
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ModelDriver, BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_ModelDriver,BinMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx
index 815147110d..4282a3d7f8 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.cxx
@@ -28,6 +28,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ObjectDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinTObjDrivers_ObjectDriver
 //purpose  : constructor
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx
index b2431891fb..fcd53214f8 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ObjectDriver.hxx
@@ -55,7 +55,7 @@ class BinTObjDrivers_ObjectDriver : public BinMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ObjectDriver, BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_ObjectDriver,BinMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx
index 06133bbd07..b23020529d 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.cxx
@@ -28,6 +28,8 @@
 #include <TDF_Tool.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ReferenceDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinTObjDrivers_ReferenceDriver
 //purpose  : constructor
diff --git a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx
index dd0c5f8eab..cfc7cea957 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_ReferenceDriver.hxx
@@ -55,7 +55,7 @@ class BinTObjDrivers_ReferenceDriver : public BinMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_ReferenceDriver, BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_ReferenceDriver,BinMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx
index 2b79e03bc2..691a320499 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.cxx
@@ -23,6 +23,8 @@
 #include <TObj_TXYZ.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_XYZDriver,BinMDF_ADriver)
+
 //=======================================================================
 //function : BinTObjDrivers_XYZDriver
 //purpose  : constructor
diff --git a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx
index 794097a5fd..45f044e863 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_XYZDriver.hxx
@@ -50,7 +50,7 @@ class BinTObjDrivers_XYZDriver : public BinMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(BinTObjDrivers_XYZDriver, BinMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(BinTObjDrivers_XYZDriver,BinMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cxx b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cxx
index 4a71053a49..1e36379f69 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cxx
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cxx
@@ -20,6 +20,8 @@
 #include <CDM_MessageDriver.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinXCAFDrivers_DocumentRetrievalDriver,BinDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : 
 //purpose  :
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.hxx b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.hxx
index f79b443b39..ef6c7ee4f6 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinXCAFDrivers_DocumentRetrievalDriver,BinDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(BinXCAFDrivers_DocumentRetrievalDriver,BinDrivers_DocumentRetrievalDriver)
 
 protected:
 
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cxx b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cxx
index 27ff53504e..07d370c53e 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cxx
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cxx
@@ -20,6 +20,8 @@
 #include <CDM_MessageDriver.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(BinXCAFDrivers_DocumentStorageDriver,BinDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : 
 //purpose  :
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.hxx b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.hxx
index 3ae72aef77..e491f115d9 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.hxx
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(BinXCAFDrivers_DocumentStorageDriver,BinDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(BinXCAFDrivers_DocumentStorageDriver,BinDrivers_DocumentStorageDriver)
 
 protected:
 
diff --git a/src/Bisector/Bisector_BisecAna.cxx b/src/Bisector/Bisector_BisecAna.cxx
index a30b70feee..ca2aaee669 100644
--- a/src/Bisector/Bisector_BisecAna.cxx
+++ b/src/Bisector/Bisector_BisecAna.cxx
@@ -54,6 +54,8 @@
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Bisector_BisecAna,Bisector_Curve)
+
 static Standard_Boolean Degenerate(Handle(GccInt_Bisec)& aBisector,
 				   const Standard_Real   Tolerance);
 
diff --git a/src/Bisector/Bisector_BisecAna.hxx b/src/Bisector/Bisector_BisecAna.hxx
index 9eb30cbb64..fbc0b8a21d 100644
--- a/src/Bisector/Bisector_BisecAna.hxx
+++ b/src/Bisector/Bisector_BisecAna.hxx
@@ -144,7 +144,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Bisector_BisecAna,Bisector_Curve)
+  DEFINE_STANDARD_RTTIEXT(Bisector_BisecAna,Bisector_Curve)
 
 protected:
 
diff --git a/src/Bisector/Bisector_BisecCC.cxx b/src/Bisector/Bisector_BisecCC.cxx
index b0b0e2f07c..c8d9f1238a 100644
--- a/src/Bisector/Bisector_BisecCC.cxx
+++ b/src/Bisector/Bisector_BisecCC.cxx
@@ -50,6 +50,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Bisector_BisecCC,Bisector_Curve)
+
 static Standard_Boolean ProjOnCurve (const gp_Pnt2d& P,
   const Handle(Geom2d_Curve)& C,
   Standard_Real& theParam);
diff --git a/src/Bisector/Bisector_BisecCC.hxx b/src/Bisector/Bisector_BisecCC.hxx
index 6ddedf6bd3..8340c0f76c 100644
--- a/src/Bisector/Bisector_BisecCC.hxx
+++ b/src/Bisector/Bisector_BisecCC.hxx
@@ -173,7 +173,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Bisector_BisecCC,Bisector_Curve)
+  DEFINE_STANDARD_RTTIEXT(Bisector_BisecCC,Bisector_Curve)
 
 protected:
 
diff --git a/src/Bisector/Bisector_BisecPC.cxx b/src/Bisector/Bisector_BisecPC.cxx
index c1e1672671..b577d8ad24 100644
--- a/src/Bisector/Bisector_BisecPC.cxx
+++ b/src/Bisector/Bisector_BisecPC.cxx
@@ -44,6 +44,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Bisector_BisecPC,Bisector_Curve)
+
 //=============================================================================
 //function :
 // purpose :
diff --git a/src/Bisector/Bisector_BisecPC.hxx b/src/Bisector/Bisector_BisecPC.hxx
index b71fb32dda..a748e7e4f5 100644
--- a/src/Bisector/Bisector_BisecPC.hxx
+++ b/src/Bisector/Bisector_BisecPC.hxx
@@ -166,7 +166,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Bisector_BisecPC,Bisector_Curve)
+  DEFINE_STANDARD_RTTIEXT(Bisector_BisecPC,Bisector_Curve)
 
 protected:
 
diff --git a/src/Bisector/Bisector_Curve.cxx b/src/Bisector/Bisector_Curve.cxx
index 38bdf84bb7..abd1bc9ee7 100644
--- a/src/Bisector/Bisector_Curve.cxx
+++ b/src/Bisector/Bisector_Curve.cxx
@@ -18,3 +18,5 @@
 #include <Bisector_Curve.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Bisector_Curve,Geom2d_Curve)
\ No newline at end of file
diff --git a/src/Bisector/Bisector_Curve.hxx b/src/Bisector/Bisector_Curve.hxx
index 3d40fa91b6..7738f1955e 100644
--- a/src/Bisector/Bisector_Curve.hxx
+++ b/src/Bisector/Bisector_Curve.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Bisector_Curve,Geom2d_Curve)
+  DEFINE_STANDARD_RTTIEXT(Bisector_Curve,Geom2d_Curve)
 
 protected:
 
diff --git a/src/CDF/CDF_Application.cxx b/src/CDF/CDF_Application.cxx
index c601deaafa..eda4b96d86 100644
--- a/src/CDF/CDF_Application.cxx
+++ b/src/CDF/CDF_Application.cxx
@@ -38,6 +38,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_Application,CDM_Application)
+
 #define theMetaDataDriver CDF_Session::CurrentSession()->MetaDataDriver()
 
 
diff --git a/src/CDF/CDF_Application.hxx b/src/CDF/CDF_Application.hxx
index 5d0f63db72..a3992850c9 100644
--- a/src/CDF/CDF_Application.hxx
+++ b/src/CDF/CDF_Application.hxx
@@ -139,7 +139,7 @@ public:
 friend class CDF_Session;
 
 
-  DEFINE_STANDARD_RTTI(CDF_Application,CDM_Application)
+  DEFINE_STANDARD_RTTIEXT(CDF_Application,CDM_Application)
 
 protected:
 
diff --git a/src/CDF/CDF_Directory.cxx b/src/CDF/CDF_Directory.cxx
index 9db9ca4d53..c4ed91ca72 100644
--- a/src/CDF/CDF_Directory.cxx
+++ b/src/CDF/CDF_Directory.cxx
@@ -22,6 +22,8 @@
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_Directory,Standard_Transient)
+
 CDF_Directory::CDF_Directory () {}
 
 void CDF_Directory::Add(const Handle(CDM_Document)& aDocument) {
diff --git a/src/CDF/CDF_Directory.hxx b/src/CDF/CDF_Directory.hxx
index e934930347..2a502a934e 100644
--- a/src/CDF/CDF_Directory.hxx
+++ b/src/CDF/CDF_Directory.hxx
@@ -67,7 +67,7 @@ public:
 friend class CDF_DirectoryIterator;
 
 
-  DEFINE_STANDARD_RTTI(CDF_Directory,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDF_Directory,Standard_Transient)
 
 protected:
 
diff --git a/src/CDF/CDF_FWOSDriver.cxx b/src/CDF/CDF_FWOSDriver.cxx
index c5172537cf..99337493e9 100644
--- a/src/CDF/CDF_FWOSDriver.cxx
+++ b/src/CDF/CDF_FWOSDriver.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_FWOSDriver,CDF_MetaDataDriver)
+
 #ifdef _MSC_VER
 #include <tchar.h>
 #endif  // _MSC_VER
diff --git a/src/CDF/CDF_FWOSDriver.hxx b/src/CDF/CDF_FWOSDriver.hxx
index e7f06ff0e5..6988abe2d6 100644
--- a/src/CDF/CDF_FWOSDriver.hxx
+++ b/src/CDF/CDF_FWOSDriver.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDF_FWOSDriver,CDF_MetaDataDriver)
+  DEFINE_STANDARD_RTTIEXT(CDF_FWOSDriver,CDF_MetaDataDriver)
 
 protected:
 
diff --git a/src/CDF/CDF_MetaDataDriver.cxx b/src/CDF/CDF_MetaDataDriver.cxx
index 9e9f96be41..9ca76e7f73 100644
--- a/src/CDF/CDF_MetaDataDriver.cxx
+++ b/src/CDF/CDF_MetaDataDriver.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_MetaDataDriver,Standard_Transient)
+
 //=======================================================================
 //function : CDF_MetaDataDriver
 //purpose  : 
diff --git a/src/CDF/CDF_MetaDataDriver.hxx b/src/CDF/CDF_MetaDataDriver.hxx
index 89b3e12b6d..4d3d733044 100644
--- a/src/CDF/CDF_MetaDataDriver.hxx
+++ b/src/CDF/CDF_MetaDataDriver.hxx
@@ -111,7 +111,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDF_MetaDataDriver,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDF_MetaDataDriver,Standard_Transient)
 
 protected:
 
diff --git a/src/CDF/CDF_MetaDataDriverFactory.cxx b/src/CDF/CDF_MetaDataDriverFactory.cxx
index a193f68ad8..0209705699 100644
--- a/src/CDF/CDF_MetaDataDriverFactory.cxx
+++ b/src/CDF/CDF_MetaDataDriverFactory.cxx
@@ -18,3 +18,5 @@
 #include <CDF_MetaDataDriver.hxx>
 #include <CDF_MetaDataDriverFactory.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(CDF_MetaDataDriverFactory,Standard_Transient)
\ No newline at end of file
diff --git a/src/CDF/CDF_MetaDataDriverFactory.hxx b/src/CDF/CDF_MetaDataDriverFactory.hxx
index 360e326e71..782da39d86 100644
--- a/src/CDF/CDF_MetaDataDriverFactory.hxx
+++ b/src/CDF/CDF_MetaDataDriverFactory.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDF_MetaDataDriverFactory,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDF_MetaDataDriverFactory,Standard_Transient)
 
 protected:
 
diff --git a/src/CDF/CDF_Session.cxx b/src/CDF/CDF_Session.cxx
index 6c9384b593..43e4331d21 100644
--- a/src/CDF/CDF_Session.cxx
+++ b/src/CDF/CDF_Session.cxx
@@ -32,6 +32,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_Session,Standard_Transient)
+
 static Handle(CDF_Session) CS;
 
 //=======================================================================
diff --git a/src/CDF/CDF_Session.hxx b/src/CDF/CDF_Session.hxx
index 3936477d68..0f74b323c8 100644
--- a/src/CDF/CDF_Session.hxx
+++ b/src/CDF/CDF_Session.hxx
@@ -67,7 +67,7 @@ public:
 friend class CDF_Application;
 
 
-  DEFINE_STANDARD_RTTI(CDF_Session,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDF_Session,Standard_Transient)
 
 protected:
 
diff --git a/src/CDF/CDF_StoreList.cxx b/src/CDF/CDF_StoreList.cxx
index 27b8287ee8..d30ef39fd0 100644
--- a/src/CDF/CDF_StoreList.cxx
+++ b/src/CDF/CDF_StoreList.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDF_StoreList,Standard_Transient)
+
 static void CAUGHT(TCollection_ExtendedString& status,const TCollection_ExtendedString& what) {
   Handle(Standard_Failure) F = Standard_Failure::Caught();
   status += what;
diff --git a/src/CDF/CDF_StoreList.hxx b/src/CDF/CDF_StoreList.hxx
index 0ead6cc27b..47fb2a910c 100644
--- a/src/CDF/CDF_StoreList.hxx
+++ b/src/CDF/CDF_StoreList.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDF_StoreList,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDF_StoreList,Standard_Transient)
 
 protected:
 
diff --git a/src/CDM/CDM_Application.cxx b/src/CDM/CDM_Application.cxx
index adec1e3023..60ed12ad38 100644
--- a/src/CDM/CDM_Application.cxx
+++ b/src/CDM/CDM_Application.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_Application,Standard_Transient)
+
 //=======================================================================
 //function : SetDocumentVersion
 //purpose  : 
diff --git a/src/CDM/CDM_Application.hxx b/src/CDM/CDM_Application.hxx
index 644fcdd053..b1e8326d0e 100644
--- a/src/CDM/CDM_Application.hxx
+++ b/src/CDM/CDM_Application.hxx
@@ -65,7 +65,7 @@ friend class CDM_Reference;
 friend class CDM_MetaData;
 
 
-  DEFINE_STANDARD_RTTI(CDM_Application,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDM_Application,Standard_Transient)
 
 protected:
 
diff --git a/src/CDM/CDM_COutMessageDriver.cxx b/src/CDM/CDM_COutMessageDriver.cxx
index c518062fda..ead684c72e 100644
--- a/src/CDM/CDM_COutMessageDriver.cxx
+++ b/src/CDM/CDM_COutMessageDriver.cxx
@@ -18,6 +18,8 @@
 #include <Standard_PCharacter.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_COutMessageDriver,CDM_MessageDriver)
+
 //=======================================================================
 //function : Write
 //purpose  : 
diff --git a/src/CDM/CDM_COutMessageDriver.hxx b/src/CDM/CDM_COutMessageDriver.hxx
index c13e352ad9..ab9f4c1e91 100644
--- a/src/CDM/CDM_COutMessageDriver.hxx
+++ b/src/CDM/CDM_COutMessageDriver.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDM_COutMessageDriver,CDM_MessageDriver)
+  DEFINE_STANDARD_RTTIEXT(CDM_COutMessageDriver,CDM_MessageDriver)
 
 protected:
 
diff --git a/src/CDM/CDM_Document.cxx b/src/CDM/CDM_Document.cxx
index a6dc2e0364..abb89f358c 100644
--- a/src/CDM/CDM_Document.cxx
+++ b/src/CDM/CDM_Document.cxx
@@ -37,6 +37,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_Document,Standard_Transient)
+
 static CDM_PresentationDirectory& getPresentations() {
   static CDM_PresentationDirectory thePresentations;
   return thePresentations;
diff --git a/src/CDM/CDM_Document.hxx b/src/CDM/CDM_Document.hxx
index 0863f769cc..612e359381 100644
--- a/src/CDM/CDM_Document.hxx
+++ b/src/CDM/CDM_Document.hxx
@@ -371,7 +371,7 @@ friend class CDM_ReferenceIterator;
 friend class CDM_Application;
 
 
-  DEFINE_STANDARD_RTTI(CDM_Document,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDM_Document,Standard_Transient)
 
 protected:
 
diff --git a/src/CDM/CDM_MessageDriver.cxx b/src/CDM/CDM_MessageDriver.cxx
index af844fe001..e8eddb4d85 100644
--- a/src/CDM/CDM_MessageDriver.cxx
+++ b/src/CDM/CDM_MessageDriver.cxx
@@ -17,3 +17,5 @@
 
 #include <CDM_MessageDriver.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(CDM_MessageDriver,Standard_Transient)
\ No newline at end of file
diff --git a/src/CDM/CDM_MessageDriver.hxx b/src/CDM/CDM_MessageDriver.hxx
index ed7e0f5175..be67b1d33c 100644
--- a/src/CDM/CDM_MessageDriver.hxx
+++ b/src/CDM/CDM_MessageDriver.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDM_MessageDriver,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDM_MessageDriver,Standard_Transient)
 
 protected:
 
diff --git a/src/CDM/CDM_MetaData.cxx b/src/CDM/CDM_MetaData.cxx
index 5d6352d435..6c74e04891 100644
--- a/src/CDM/CDM_MetaData.cxx
+++ b/src/CDM/CDM_MetaData.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_MetaData,Standard_Transient)
+
 static CDM_MetaDataLookUpTable& getLookUpTable(){
   static CDM_MetaDataLookUpTable theLookUpTable;
   return theLookUpTable;
diff --git a/src/CDM/CDM_MetaData.hxx b/src/CDM/CDM_MetaData.hxx
index 65bb19adef..5b76e637fa 100644
--- a/src/CDM/CDM_MetaData.hxx
+++ b/src/CDM/CDM_MetaData.hxx
@@ -96,7 +96,7 @@ friend
   Standard_EXPORT void CDM_Application::SetDocumentVersion (const Handle(CDM_Document)& aDocument, const Handle(CDM_MetaData)& aMetaData) const;
 
 
-  DEFINE_STANDARD_RTTI(CDM_MetaData,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDM_MetaData,Standard_Transient)
 
 protected:
 
diff --git a/src/CDM/CDM_NullMessageDriver.cxx b/src/CDM/CDM_NullMessageDriver.cxx
index 11aaac0842..2a588658f9 100644
--- a/src/CDM/CDM_NullMessageDriver.cxx
+++ b/src/CDM/CDM_NullMessageDriver.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_NullMessageDriver,CDM_MessageDriver)
+
 CDM_NullMessageDriver::CDM_NullMessageDriver() {}
 
 void CDM_NullMessageDriver::Write(const Standard_ExtString /*aString*/) {
diff --git a/src/CDM/CDM_NullMessageDriver.hxx b/src/CDM/CDM_NullMessageDriver.hxx
index 325d54799e..b616fdb9ff 100644
--- a/src/CDM/CDM_NullMessageDriver.hxx
+++ b/src/CDM/CDM_NullMessageDriver.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(CDM_NullMessageDriver,CDM_MessageDriver)
+  DEFINE_STANDARD_RTTIEXT(CDM_NullMessageDriver,CDM_MessageDriver)
 
 protected:
 
diff --git a/src/CDM/CDM_Reference.cxx b/src/CDM/CDM_Reference.cxx
index 3752c407ce..f9234a7538 100644
--- a/src/CDM/CDM_Reference.cxx
+++ b/src/CDM/CDM_Reference.cxx
@@ -21,6 +21,8 @@
 #include <CDM_Reference.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(CDM_Reference,Standard_Transient)
+
 CDM_Reference::CDM_Reference(const Handle(CDM_Document)& aFromDocument, const Handle(CDM_Document)& aToDocument, const Standard_Integer aReferenceIdentifier, const Standard_Integer aToDocumentVersion):
 myToDocument(aToDocument),
 myFromDocument(aFromDocument.operator->()),
diff --git a/src/CDM/CDM_Reference.hxx b/src/CDM/CDM_Reference.hxx
index 1675e3db70..c8746fd3d7 100644
--- a/src/CDM/CDM_Reference.hxx
+++ b/src/CDM/CDM_Reference.hxx
@@ -53,7 +53,7 @@ public:
 friend class CDM_Document;
 
 
-  DEFINE_STANDARD_RTTI(CDM_Reference,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(CDM_Reference,Standard_Transient)
 
 protected:
 
diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx
index 3d351ab15d..f7c03ea940 100644
--- a/src/ChFi3d/ChFi3d_Builder_C1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx
@@ -161,6 +161,7 @@ extern void ChFi3d_ResultChron(OSD_Chronometer & ch,Standard_Real& time);
 #include <Geom2dAdaptor_Curve.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
 #include <Geom_BezierCurve.hxx>
+#include <Geom_BoundedSurface.hxx>
 
 static Standard_Real recadre(const Standard_Real p,
 			     const Standard_Real ref,
diff --git a/src/ChFiDS/ChFiDS_ChamfSpine.cxx b/src/ChFiDS/ChFiDS_ChamfSpine.cxx
index b89dc41aef..cbfd18e3c6 100644
--- a/src/ChFiDS/ChFiDS_ChamfSpine.cxx
+++ b/src/ChFiDS/ChFiDS_ChamfSpine.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_ChamfSpine,ChFiDS_Spine)
+
 //=======================================================================
 //function : ChFiDS_ChamfSpine
 //purpose  : 
diff --git a/src/ChFiDS/ChFiDS_ChamfSpine.hxx b/src/ChFiDS/ChFiDS_ChamfSpine.hxx
index dad03d9ffa..c668e0a852 100644
--- a/src/ChFiDS/ChFiDS_ChamfSpine.hxx
+++ b/src/ChFiDS/ChFiDS_ChamfSpine.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_ChamfSpine,ChFiDS_Spine)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_ChamfSpine,ChFiDS_Spine)
 
 protected:
 
diff --git a/src/ChFiDS/ChFiDS_FilSpine.cxx b/src/ChFiDS/ChFiDS_FilSpine.cxx
index 07f6b4fb48..1ce9a6de64 100644
--- a/src/ChFiDS/ChFiDS_FilSpine.cxx
+++ b/src/ChFiDS/ChFiDS_FilSpine.cxx
@@ -35,6 +35,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_FilSpine,ChFiDS_Spine)
+
 //=======================================================================
 //function : ChFiDS_FilSpine
 //purpose  : 
diff --git a/src/ChFiDS/ChFiDS_FilSpine.hxx b/src/ChFiDS/ChFiDS_FilSpine.hxx
index 51443ee5c7..6d1355b0b2 100644
--- a/src/ChFiDS/ChFiDS_FilSpine.hxx
+++ b/src/ChFiDS/ChFiDS_FilSpine.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_FilSpine,ChFiDS_Spine)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_FilSpine,ChFiDS_Spine)
 
 protected:
 
diff --git a/src/ChFiDS/ChFiDS_HElSpine.hxx b/src/ChFiDS/ChFiDS_HElSpine.hxx
index 8d03834df3..721e81012d 100644
--- a/src/ChFiDS/ChFiDS_HElSpine.hxx
+++ b/src/ChFiDS/ChFiDS_HElSpine.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_HElSpine,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(ChFiDS_HElSpine,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/ChFiDS/ChFiDS_Spine.cxx b/src/ChFiDS/ChFiDS_Spine.cxx
index 4816b18688..ec80cccac3 100644
--- a/src/ChFiDS/ChFiDS_Spine.cxx
+++ b/src/ChFiDS/ChFiDS_Spine.cxx
@@ -34,6 +34,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_Spine,MMgt_TShared)
+
 //=======================================================================
 //function : ChFiDS_Spine
 //purpose  : 
diff --git a/src/ChFiDS/ChFiDS_Spine.hxx b/src/ChFiDS/ChFiDS_Spine.hxx
index 8d8f2699b5..dfcaecaa8f 100644
--- a/src/ChFiDS/ChFiDS_Spine.hxx
+++ b/src/ChFiDS/ChFiDS_Spine.hxx
@@ -229,7 +229,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_Spine,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_Spine,MMgt_TShared)
 
 protected:
 
diff --git a/src/ChFiDS/ChFiDS_Stripe.cxx b/src/ChFiDS/ChFiDS_Stripe.cxx
index 97b6f0a590..12e8627261 100644
--- a/src/ChFiDS/ChFiDS_Stripe.cxx
+++ b/src/ChFiDS/ChFiDS_Stripe.cxx
@@ -20,6 +20,8 @@
 #include <Geom2d_Curve.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_Stripe,MMgt_TShared)
+
 ChFiDS_Stripe::ChFiDS_Stripe ():
        begfilled(/*Standard_False*/0), // eap, Apr 29 2002, occ293
        endfilled(/*Standard_False*/0),
diff --git a/src/ChFiDS/ChFiDS_Stripe.hxx b/src/ChFiDS/ChFiDS_Stripe.hxx
index dc7e25b909..020c69eba7 100644
--- a/src/ChFiDS/ChFiDS_Stripe.hxx
+++ b/src/ChFiDS/ChFiDS_Stripe.hxx
@@ -150,7 +150,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_Stripe,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_Stripe,MMgt_TShared)
 
 protected:
 
diff --git a/src/ChFiDS/ChFiDS_SurfData.cxx b/src/ChFiDS/ChFiDS_SurfData.cxx
index da8c006a29..bdff2e6535 100644
--- a/src/ChFiDS/ChFiDS_SurfData.cxx
+++ b/src/ChFiDS/ChFiDS_SurfData.cxx
@@ -22,6 +22,8 @@
 #include <MMgt_TShared.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ChFiDS_SurfData,MMgt_TShared)
+
 ChFiDS_SurfData::ChFiDS_SurfData () : 
 indexOfS1(0),indexOfS2(0),indexOfConge(0),
 isoncurv1(0),isoncurv2(0),twistons1(0),twistons2(0)
diff --git a/src/ChFiDS/ChFiDS_SurfData.hxx b/src/ChFiDS/ChFiDS_SurfData.hxx
index 7ed7546a58..2c9b6aa0d8 100644
--- a/src/ChFiDS/ChFiDS_SurfData.hxx
+++ b/src/ChFiDS/ChFiDS_SurfData.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ChFiDS_SurfData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ChFiDS_SurfData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Contap/Contap_TheIWLineOfTheIWalking.hxx b/src/Contap/Contap_TheIWLineOfTheIWalking.hxx
index bcce1d7631..996ec9d89b 100644
--- a/src/Contap/Contap_TheIWLineOfTheIWalking.hxx
+++ b/src/Contap/Contap_TheIWLineOfTheIWalking.hxx
@@ -143,7 +143,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Contap_TheIWLineOfTheIWalking,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Contap_TheIWLineOfTheIWalking,MMgt_TShared)
 
 protected:
 
diff --git a/src/D3DHost/D3DHost_FrameBuffer.cxx b/src/D3DHost/D3DHost_FrameBuffer.cxx
index 0526cd6636..6a96dd6280 100644
--- a/src/D3DHost/D3DHost_FrameBuffer.cxx
+++ b/src/D3DHost/D3DHost_FrameBuffer.cxx
@@ -22,6 +22,8 @@
 #include <Standard_ProgramError.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(D3DHost_FrameBuffer,OpenGl_FrameBuffer)
+
 // =======================================================================
 // function : D3DHost_FrameBuffer
 // purpose  :
diff --git a/src/D3DHost/D3DHost_FrameBuffer.hxx b/src/D3DHost/D3DHost_FrameBuffer.hxx
index 3e7719dfa8..e3c933876b 100644
--- a/src/D3DHost/D3DHost_FrameBuffer.hxx
+++ b/src/D3DHost/D3DHost_FrameBuffer.hxx
@@ -75,7 +75,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(D3DHost_FrameBuffer, OpenGl_FrameBuffer)
+  DEFINE_STANDARD_RTTIEXT(D3DHost_FrameBuffer,OpenGl_FrameBuffer)
 
 };
 
diff --git a/src/D3DHost/D3DHost_GraphicDriver.cxx b/src/D3DHost/D3DHost_GraphicDriver.cxx
index 50c3a337b3..d2f232f4ab 100644
--- a/src/D3DHost/D3DHost_GraphicDriver.cxx
+++ b/src/D3DHost/D3DHost_GraphicDriver.cxx
@@ -18,6 +18,8 @@
 #include <D3DHost_GraphicDriver.hxx>
 #include <D3DHost_View.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(D3DHost_GraphicDriver,OpenGl_GraphicDriver)
+
 #ifdef _MSC_VER
   #pragma comment (lib, "D3D9.lib")
 #endif
diff --git a/src/D3DHost/D3DHost_GraphicDriver.hxx b/src/D3DHost/D3DHost_GraphicDriver.hxx
index 1cf41cf28e..5679c1ffbf 100644
--- a/src/D3DHost/D3DHost_GraphicDriver.hxx
+++ b/src/D3DHost/D3DHost_GraphicDriver.hxx
@@ -34,7 +34,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(D3DHost_GraphicDriver, OpenGl_GraphicDriver)
+  DEFINE_STANDARD_RTTIEXT(D3DHost_GraphicDriver,OpenGl_GraphicDriver)
 
 };
 
diff --git a/src/D3DHost/D3DHost_View.cxx b/src/D3DHost/D3DHost_View.cxx
index e773f87ba1..1c1d5c2928 100644
--- a/src/D3DHost/D3DHost_View.cxx
+++ b/src/D3DHost/D3DHost_View.cxx
@@ -20,6 +20,8 @@
 #include <D3DHost_GraphicDriver.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(D3DHost_View,OpenGl_View)
+
 // =======================================================================
 // function : d3dFormatError
 // purpose  :
diff --git a/src/D3DHost/D3DHost_View.hxx b/src/D3DHost/D3DHost_View.hxx
index c2a9c9fb11..0e14851232 100644
--- a/src/D3DHost/D3DHost_View.hxx
+++ b/src/D3DHost/D3DHost_View.hxx
@@ -113,7 +113,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(D3DHost_View, OpenGl_View)
+  DEFINE_STANDARD_RTTIEXT(D3DHost_View,OpenGl_View)
 
 };
 
diff --git a/src/DBRep/DBRep_DrawableShape.cxx b/src/DBRep/DBRep_DrawableShape.cxx
index da164eb32f..3da810e721 100644
--- a/src/DBRep/DBRep_DrawableShape.cxx
+++ b/src/DBRep/DBRep_DrawableShape.cxx
@@ -60,6 +60,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DBRep_DrawableShape,Draw_Drawable3D)
+
 static Standard_Real IsoRatio = 1.001;
 
 static Standard_Integer MaxPlotCount = 5; // To avoid huge recursive calls in
diff --git a/src/DBRep/DBRep_DrawableShape.hxx b/src/DBRep/DBRep_DrawableShape.hxx
index a9d41baf9a..d4d4c5f0cc 100644
--- a/src/DBRep/DBRep_DrawableShape.hxx
+++ b/src/DBRep/DBRep_DrawableShape.hxx
@@ -111,7 +111,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DBRep_DrawableShape,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DBRep_DrawableShape,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DBRep/DBRep_Edge.cxx b/src/DBRep/DBRep_Edge.cxx
index d107b5300a..b7826c0cca 100644
--- a/src/DBRep/DBRep_Edge.cxx
+++ b/src/DBRep/DBRep_Edge.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Edge.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DBRep_Edge,MMgt_TShared)
+
 //=======================================================================
 //function : DBRep_Edge
 //purpose  : 
diff --git a/src/DBRep/DBRep_Edge.hxx b/src/DBRep/DBRep_Edge.hxx
index 1867b88029..4b82aca0cc 100644
--- a/src/DBRep/DBRep_Edge.hxx
+++ b/src/DBRep/DBRep_Edge.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DBRep_Edge,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(DBRep_Edge,MMgt_TShared)
 
 protected:
 
diff --git a/src/DBRep/DBRep_Face.cxx b/src/DBRep/DBRep_Face.cxx
index 841e0123ba..e4fa96338d 100644
--- a/src/DBRep/DBRep_Face.cxx
+++ b/src/DBRep/DBRep_Face.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DBRep_Face,MMgt_TShared)
+
 //=======================================================================
 //function : DBRep_Face
 //purpose  : 
diff --git a/src/DBRep/DBRep_Face.hxx b/src/DBRep/DBRep_Face.hxx
index 407437d681..f3ac32cd01 100644
--- a/src/DBRep/DBRep_Face.hxx
+++ b/src/DBRep/DBRep_Face.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DBRep_Face,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(DBRep_Face,MMgt_TShared)
 
 protected:
 
diff --git a/src/DDF/DDF_Browser.cxx b/src/DDF/DDF_Browser.cxx
index 8ece5317ad..0f35341091 100644
--- a/src/DDF/DDF_Browser.cxx
+++ b/src/DDF/DDF_Browser.cxx
@@ -34,6 +34,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDF_Browser,Draw_Drawable3D)
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Communication convention with tcl:
 // tcl waits for a string of characters, being an information list.
diff --git a/src/DDF/DDF_Browser.hxx b/src/DDF/DDF_Browser.hxx
index 0fe33d8165..eda5a0546c 100644
--- a/src/DDF/DDF_Browser.hxx
+++ b/src/DDF/DDF_Browser.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDF_Browser,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DDF_Browser,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DDF/DDF_Data.cxx b/src/DDF/DDF_Data.cxx
index 52e8b692fb..7d9fe7e7fa 100644
--- a/src/DDF/DDF_Data.cxx
+++ b/src/DDF/DDF_Data.cxx
@@ -33,6 +33,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDF_Data,Draw_Drawable3D)
+
 //=======================================================================
 //function : DDF_Data
 //purpose  : 
diff --git a/src/DDF/DDF_Data.hxx b/src/DDF/DDF_Data.hxx
index af121aaefe..5c0a0edb0f 100644
--- a/src/DDF/DDF_Data.hxx
+++ b/src/DDF/DDF_Data.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDF_Data,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DDF_Data,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DDF/DDF_Transaction.cxx b/src/DDF/DDF_Transaction.cxx
index 4fd021407b..e46df175c5 100644
--- a/src/DDF/DDF_Transaction.cxx
+++ b/src/DDF/DDF_Transaction.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Data.hxx>
 #include <TDF_Delta.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDF_Transaction,MMgt_TShared)
+
 //=======================================================================
 //function : DDF_Transaction
 //purpose  : 
diff --git a/src/DDF/DDF_Transaction.hxx b/src/DDF/DDF_Transaction.hxx
index 2c6c422451..41124b7a99 100644
--- a/src/DDF/DDF_Transaction.hxx
+++ b/src/DDF/DDF_Transaction.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDF_Transaction,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(DDF_Transaction,MMgt_TShared)
 
 protected:
 
diff --git a/src/DDataStd/DDataStd_DrawDriver.cxx b/src/DDataStd/DDataStd_DrawDriver.cxx
index 578592aa4b..250aa700c9 100644
--- a/src/DDataStd/DDataStd_DrawDriver.cxx
+++ b/src/DDataStd/DDataStd_DrawDriver.cxx
@@ -60,6 +60,8 @@
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDataStd_DrawDriver,MMgt_TShared)
+
 // attribut affichable
 // drawable object
 static Standard_Integer DISCRET    = 100;
diff --git a/src/DDataStd/DDataStd_DrawDriver.hxx b/src/DDataStd/DDataStd_DrawDriver.hxx
index 64b9091fce..a9e17ba7a9 100644
--- a/src/DDataStd/DDataStd_DrawDriver.hxx
+++ b/src/DDataStd/DDataStd_DrawDriver.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDataStd_DrawDriver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(DDataStd_DrawDriver,MMgt_TShared)
 
 protected:
 
diff --git a/src/DDataStd/DDataStd_DrawPresentation.cxx b/src/DDataStd/DDataStd_DrawPresentation.cxx
index 8867cf27eb..12472ed65f 100644
--- a/src/DDataStd/DDataStd_DrawPresentation.cxx
+++ b/src/DDataStd/DDataStd_DrawPresentation.cxx
@@ -31,6 +31,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDataStd_DrawPresentation,TDF_Attribute)
+
 #ifndef _WIN32
 extern Draw_Viewer dout;
 #else
diff --git a/src/DDataStd/DDataStd_DrawPresentation.hxx b/src/DDataStd/DDataStd_DrawPresentation.hxx
index 6eb6a0631d..034934f266 100644
--- a/src/DDataStd/DDataStd_DrawPresentation.hxx
+++ b/src/DDataStd/DDataStd_DrawPresentation.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDataStd_DrawPresentation,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(DDataStd_DrawPresentation,TDF_Attribute)
 
 protected:
 
diff --git a/src/DDataStd/DDataStd_TreeBrowser.cxx b/src/DDataStd/DDataStd_TreeBrowser.cxx
index fe1929c80c..c8c3046033 100644
--- a/src/DDataStd/DDataStd_TreeBrowser.cxx
+++ b/src/DDataStd/DDataStd_TreeBrowser.cxx
@@ -31,6 +31,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDataStd_TreeBrowser,Draw_Drawable3D)
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Communication convention with tcl:
 // tcl waits for a string of characters, being an information list.
diff --git a/src/DDataStd/DDataStd_TreeBrowser.hxx b/src/DDataStd/DDataStd_TreeBrowser.hxx
index bc4d9fae02..204df49f5a 100644
--- a/src/DDataStd/DDataStd_TreeBrowser.hxx
+++ b/src/DDataStd/DDataStd_TreeBrowser.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDataStd_TreeBrowser,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DDataStd_TreeBrowser,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DDocStd/DDocStd_DrawDocument.cxx b/src/DDocStd/DDocStd_DrawDocument.cxx
index 4a08fd15c8..c0f1442cfe 100644
--- a/src/DDocStd/DDocStd_DrawDocument.cxx
+++ b/src/DDocStd/DDocStd_DrawDocument.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Tool.hxx>
 #include <TDocStd_Document.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DDocStd_DrawDocument,DDF_Data)
+
 //=======================================================================
 //function : Find
 //purpose  : 
diff --git a/src/DDocStd/DDocStd_DrawDocument.hxx b/src/DDocStd/DDocStd_DrawDocument.hxx
index 36da741930..a2da90d4d1 100644
--- a/src/DDocStd/DDocStd_DrawDocument.hxx
+++ b/src/DDocStd/DDocStd_DrawDocument.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DDocStd_DrawDocument,DDF_Data)
+  DEFINE_STANDARD_RTTIEXT(DDocStd_DrawDocument,DDF_Data)
 
 protected:
 
diff --git a/src/DNaming/DNaming_BooleanOperationDriver.cxx b/src/DNaming/DNaming_BooleanOperationDriver.cxx
index 5e813761a5..3a484f43a7 100644
--- a/src/DNaming/DNaming_BooleanOperationDriver.cxx
+++ b/src/DNaming/DNaming_BooleanOperationDriver.cxx
@@ -53,6 +53,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_BooleanOperationDriver,TFunction_Driver)
+
 static Standard_Boolean FixSameParameter(const TopoDS_Shape&    theShape,
 					     BRepCheck_Analyzer&    theAnalyzer,
 					     const Standard_Boolean bIgnoreNotSPErrors = Standard_False );
diff --git a/src/DNaming/DNaming_BooleanOperationDriver.hxx b/src/DNaming/DNaming_BooleanOperationDriver.hxx
index 3754ee237f..37ae917de4 100644
--- a/src/DNaming/DNaming_BooleanOperationDriver.hxx
+++ b/src/DNaming/DNaming_BooleanOperationDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_BooleanOperationDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_BooleanOperationDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_BoxDriver.cxx b/src/DNaming/DNaming_BoxDriver.cxx
index 6002c2a1ed..9bc6b5cf22 100644
--- a/src/DNaming/DNaming_BoxDriver.cxx
+++ b/src/DNaming/DNaming_BoxDriver.cxx
@@ -33,6 +33,8 @@
 #include <TopLoc_Location.hxx>
 #include <TopoDS_Solid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_BoxDriver,TFunction_Driver)
+
 //=======================================================================
 //function : DNaming_BoxDriver
 //purpose  : Constructor
diff --git a/src/DNaming/DNaming_BoxDriver.hxx b/src/DNaming/DNaming_BoxDriver.hxx
index ba4f65d07a..4b432110fd 100644
--- a/src/DNaming/DNaming_BoxDriver.hxx
+++ b/src/DNaming/DNaming_BoxDriver.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_BoxDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_BoxDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_CylinderDriver.cxx b/src/DNaming/DNaming_CylinderDriver.cxx
index d04eed4a68..3ea97219e1 100644
--- a/src/DNaming/DNaming_CylinderDriver.cxx
+++ b/src/DNaming/DNaming_CylinderDriver.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Solid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_CylinderDriver,TFunction_Driver)
+
 //=======================================================================
 //function : DNaming_CylinderDriver
 //purpose  : Constructor
diff --git a/src/DNaming/DNaming_CylinderDriver.hxx b/src/DNaming/DNaming_CylinderDriver.hxx
index 5c3ac22970..c93eae2ee5 100644
--- a/src/DNaming/DNaming_CylinderDriver.hxx
+++ b/src/DNaming/DNaming_CylinderDriver.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_CylinderDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_CylinderDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_FilletDriver.cxx b/src/DNaming/DNaming_FilletDriver.cxx
index 002eb079e1..61ced83ea5 100644
--- a/src/DNaming/DNaming_FilletDriver.cxx
+++ b/src/DNaming/DNaming_FilletDriver.cxx
@@ -41,6 +41,8 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_FilletDriver,TFunction_Driver)
+
 //=======================================================================
 //function : FilletDriver
 //purpose  : Constructor
diff --git a/src/DNaming/DNaming_FilletDriver.hxx b/src/DNaming/DNaming_FilletDriver.hxx
index 9a172501b8..78a2524efc 100644
--- a/src/DNaming/DNaming_FilletDriver.hxx
+++ b/src/DNaming/DNaming_FilletDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_FilletDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_FilletDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_Line3DDriver.cxx b/src/DNaming/DNaming_Line3DDriver.cxx
index 370bd285e4..e065895d9a 100644
--- a/src/DNaming/DNaming_Line3DDriver.cxx
+++ b/src/DNaming/DNaming_Line3DDriver.cxx
@@ -53,6 +53,8 @@
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_Line3DDriver,TFunction_Driver)
+
 //=======================================================================
 //function : DNaming_Line3DDriver
 //purpose  : Constructor
diff --git a/src/DNaming/DNaming_Line3DDriver.hxx b/src/DNaming/DNaming_Line3DDriver.hxx
index 9cbbddbaf0..5092901400 100644
--- a/src/DNaming/DNaming_Line3DDriver.hxx
+++ b/src/DNaming/DNaming_Line3DDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_Line3DDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_Line3DDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_PointDriver.cxx b/src/DNaming/DNaming_PointDriver.cxx
index 21ac778ef1..522802d1af 100644
--- a/src/DNaming/DNaming_PointDriver.cxx
+++ b/src/DNaming/DNaming_PointDriver.cxx
@@ -34,6 +34,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_PointDriver,TFunction_Driver)
+
 //OCCT
 // OCAF
 //=======================================================================
diff --git a/src/DNaming/DNaming_PointDriver.hxx b/src/DNaming/DNaming_PointDriver.hxx
index 54b6c625be..e763d68bca 100644
--- a/src/DNaming/DNaming_PointDriver.hxx
+++ b/src/DNaming/DNaming_PointDriver.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_PointDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_PointDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_PrismDriver.cxx b/src/DNaming/DNaming_PrismDriver.cxx
index 85ad6a35f6..6e9d8cc194 100644
--- a/src/DNaming/DNaming_PrismDriver.cxx
+++ b/src/DNaming/DNaming_PrismDriver.cxx
@@ -53,6 +53,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_PrismDriver,TFunction_Driver)
+
 // OCC
 // OCAF
 //=======================================================================
diff --git a/src/DNaming/DNaming_PrismDriver.hxx b/src/DNaming/DNaming_PrismDriver.hxx
index 27ae8ad114..d72e96bb8b 100644
--- a/src/DNaming/DNaming_PrismDriver.hxx
+++ b/src/DNaming/DNaming_PrismDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_PrismDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_PrismDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_RevolutionDriver.cxx b/src/DNaming/DNaming_RevolutionDriver.cxx
index 62fa95bbe0..aa36336cf6 100644
--- a/src/DNaming/DNaming_RevolutionDriver.cxx
+++ b/src/DNaming/DNaming_RevolutionDriver.cxx
@@ -58,6 +58,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_RevolutionDriver,TFunction_Driver)
+
 // OCAF
 //=======================================================================
 //function : DNaming_RevolutionDriver
diff --git a/src/DNaming/DNaming_RevolutionDriver.hxx b/src/DNaming/DNaming_RevolutionDriver.hxx
index 6e00e0f9a8..0299431d8f 100644
--- a/src/DNaming/DNaming_RevolutionDriver.hxx
+++ b/src/DNaming/DNaming_RevolutionDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_RevolutionDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_RevolutionDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_SelectionDriver.cxx b/src/DNaming/DNaming_SelectionDriver.cxx
index 7f5846dfac..7c4c81742e 100644
--- a/src/DNaming/DNaming_SelectionDriver.cxx
+++ b/src/DNaming/DNaming_SelectionDriver.cxx
@@ -29,6 +29,8 @@
 #include <TopAbs.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_SelectionDriver,TFunction_Driver)
+
 //#define SEL_DEB 1
 #ifdef OCCT_DEBUG
 #include <TDF_Tool.hxx>
diff --git a/src/DNaming/DNaming_SelectionDriver.hxx b/src/DNaming/DNaming_SelectionDriver.hxx
index a7053d5f5a..1b4e40dacd 100644
--- a/src/DNaming/DNaming_SelectionDriver.hxx
+++ b/src/DNaming/DNaming_SelectionDriver.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_SelectionDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_SelectionDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_SphereDriver.cxx b/src/DNaming/DNaming_SphereDriver.cxx
index 7e0aea74d7..0d98f58cb8 100644
--- a/src/DNaming/DNaming_SphereDriver.cxx
+++ b/src/DNaming/DNaming_SphereDriver.cxx
@@ -44,6 +44,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_SphereDriver,TFunction_Driver)
+
 //=======================================================================
 //function : DNaming_SphereDriver
 //purpose  : Constructor
diff --git a/src/DNaming/DNaming_SphereDriver.hxx b/src/DNaming/DNaming_SphereDriver.hxx
index 5715be12d3..169292fc6b 100644
--- a/src/DNaming/DNaming_SphereDriver.hxx
+++ b/src/DNaming/DNaming_SphereDriver.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_SphereDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_SphereDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/DNaming/DNaming_TransformationDriver.cxx b/src/DNaming/DNaming_TransformationDriver.cxx
index 5f8761a0a1..4c0eb9df1f 100644
--- a/src/DNaming/DNaming_TransformationDriver.cxx
+++ b/src/DNaming/DNaming_TransformationDriver.cxx
@@ -53,6 +53,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DNaming_TransformationDriver,TFunction_Driver)
+
 #ifdef _WIN32
 #define EXCEPTION ...
 #else
diff --git a/src/DNaming/DNaming_TransformationDriver.hxx b/src/DNaming/DNaming_TransformationDriver.hxx
index 1231705804..baa0dafe79 100644
--- a/src/DNaming/DNaming_TransformationDriver.hxx
+++ b/src/DNaming/DNaming_TransformationDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DNaming_TransformationDriver,TFunction_Driver)
+  DEFINE_STANDARD_RTTIEXT(DNaming_TransformationDriver,TFunction_Driver)
 
 protected:
 
diff --git a/src/Dico/Dico_DictionaryOfInteger.hxx b/src/Dico/Dico_DictionaryOfInteger.hxx
index 4546d6ad14..b0add9a5bb 100644
--- a/src/Dico/Dico_DictionaryOfInteger.hxx
+++ b/src/Dico/Dico_DictionaryOfInteger.hxx
@@ -129,7 +129,7 @@ public:
 friend class Dico_IteratorOfDictionaryOfInteger;
 
 
-  DEFINE_STANDARD_RTTI(Dico_DictionaryOfInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Dico_DictionaryOfInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/Dico/Dico_DictionaryOfTransient.hxx b/src/Dico/Dico_DictionaryOfTransient.hxx
index 9801615ef6..5e04c94a00 100644
--- a/src/Dico/Dico_DictionaryOfTransient.hxx
+++ b/src/Dico/Dico_DictionaryOfTransient.hxx
@@ -130,7 +130,7 @@ public:
 friend class Dico_IteratorOfDictionaryOfTransient;
 
 
-  DEFINE_STANDARD_RTTI(Dico_DictionaryOfTransient,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Dico_DictionaryOfTransient,MMgt_TShared)
 
 protected:
 
diff --git a/src/Dico/Dico_StackItemOfDictionaryOfInteger.hxx b/src/Dico/Dico_StackItemOfDictionaryOfInteger.hxx
index 1d6b367a28..4f62cf113f 100644
--- a/src/Dico/Dico_StackItemOfDictionaryOfInteger.hxx
+++ b/src/Dico/Dico_StackItemOfDictionaryOfInteger.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Dico_StackItemOfDictionaryOfInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Dico_StackItemOfDictionaryOfInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/Dico/Dico_StackItemOfDictionaryOfTransient.hxx b/src/Dico/Dico_StackItemOfDictionaryOfTransient.hxx
index 13829a0365..7d27b34a18 100644
--- a/src/Dico/Dico_StackItemOfDictionaryOfTransient.hxx
+++ b/src/Dico/Dico_StackItemOfDictionaryOfTransient.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Dico_StackItemOfDictionaryOfTransient,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Dico_StackItemOfDictionaryOfTransient,MMgt_TShared)
 
 protected:
 
diff --git a/src/Draft/Draft_Modification.cxx b/src/Draft/Draft_Modification.cxx
index 0c2b6cdd71..8273692e53 100644
--- a/src/Draft/Draft_Modification.cxx
+++ b/src/Draft/Draft_Modification.cxx
@@ -55,6 +55,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draft_Modification,BRepTools_Modification)
+
 //=======================================================================
 //function : Draft_Modification
 //purpose  : 
diff --git a/src/Draft/Draft_Modification.hxx b/src/Draft/Draft_Modification.hxx
index f398d5b29c..24b7fc0604 100644
--- a/src/Draft/Draft_Modification.hxx
+++ b/src/Draft/Draft_Modification.hxx
@@ -166,7 +166,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draft_Modification,BRepTools_Modification)
+  DEFINE_STANDARD_RTTIEXT(Draft_Modification,BRepTools_Modification)
 
 protected:
 
diff --git a/src/Draw/Draw_Axis2D.cxx b/src/Draw/Draw_Axis2D.cxx
index 5d21f923ff..27b9af7508 100644
--- a/src/Draw/Draw_Axis2D.cxx
+++ b/src/Draw/Draw_Axis2D.cxx
@@ -24,6 +24,8 @@
 #include <gp_Vec2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Axis2D,Draw_Drawable2D)
+
 extern Standard_Boolean Draw_Bounds;
 
 //=======================================================================
diff --git a/src/Draw/Draw_Axis2D.hxx b/src/Draw/Draw_Axis2D.hxx
index 028adb0349..3bbc1c348f 100644
--- a/src/Draw/Draw_Axis2D.hxx
+++ b/src/Draw/Draw_Axis2D.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Axis2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Axis2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Draw/Draw_Axis3D.cxx b/src/Draw/Draw_Axis3D.cxx
index 62ff3e67ca..8a8bcda826 100644
--- a/src/Draw/Draw_Axis3D.cxx
+++ b/src/Draw/Draw_Axis3D.cxx
@@ -24,6 +24,8 @@
 #include <gp_Vec.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Axis3D,Draw_Drawable3D)
+
 extern Standard_Boolean Draw_Bounds;
 
 
diff --git a/src/Draw/Draw_Axis3D.hxx b/src/Draw/Draw_Axis3D.hxx
index a077e92ae9..d594d338d6 100644
--- a/src/Draw/Draw_Axis3D.hxx
+++ b/src/Draw/Draw_Axis3D.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Axis3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Axis3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Box.cxx b/src/Draw/Draw_Box.cxx
index 1fec615f62..250492519f 100644
--- a/src/Draw/Draw_Box.cxx
+++ b/src/Draw/Draw_Box.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Box,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Box
 //purpose  : 
diff --git a/src/Draw/Draw_Box.hxx b/src/Draw/Draw_Box.hxx
index 2062a3f1ed..0b37c82e58 100644
--- a/src/Draw/Draw_Box.hxx
+++ b/src/Draw/Draw_Box.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Box,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Box,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Chronometer.cxx b/src/Draw/Draw_Chronometer.cxx
index 44b273a8cc..4792f22d40 100644
--- a/src/Draw/Draw_Chronometer.cxx
+++ b/src/Draw/Draw_Chronometer.cxx
@@ -21,6 +21,8 @@
 #include <OSD_Timer.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Chronometer,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Chronometer
 //purpose  : 
diff --git a/src/Draw/Draw_Chronometer.hxx b/src/Draw/Draw_Chronometer.hxx
index 23518f45d1..03e8b1eb8e 100644
--- a/src/Draw/Draw_Chronometer.hxx
+++ b/src/Draw/Draw_Chronometer.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Chronometer,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Chronometer,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Circle2D.cxx b/src/Draw/Draw_Circle2D.cxx
index 5f707bf0c9..e908d91bf1 100644
--- a/src/Draw/Draw_Circle2D.cxx
+++ b/src/Draw/Draw_Circle2D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Circ2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Circle2D,Draw_Drawable2D)
+
 //=======================================================================
 //function : Draw_Circle2D
 //purpose  : 
diff --git a/src/Draw/Draw_Circle2D.hxx b/src/Draw/Draw_Circle2D.hxx
index ad9de3b55d..e68580a4d2 100644
--- a/src/Draw/Draw_Circle2D.hxx
+++ b/src/Draw/Draw_Circle2D.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Circle2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Circle2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Draw/Draw_Circle3D.cxx b/src/Draw/Draw_Circle3D.cxx
index fc2b7177c8..02200ec7ca 100644
--- a/src/Draw/Draw_Circle3D.cxx
+++ b/src/Draw/Draw_Circle3D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Circ.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Circle3D,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Circle3D
 //purpose  : 
diff --git a/src/Draw/Draw_Circle3D.hxx b/src/Draw/Draw_Circle3D.hxx
index 4efe2f1751..2df55a04d2 100644
--- a/src/Draw/Draw_Circle3D.hxx
+++ b/src/Draw/Draw_Circle3D.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Circle3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Circle3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Drawable2D.cxx b/src/Draw/Draw_Drawable2D.cxx
index 1523ebd374..f617f3c5fd 100644
--- a/src/Draw/Draw_Drawable2D.cxx
+++ b/src/Draw/Draw_Drawable2D.cxx
@@ -16,6 +16,8 @@
 #include <Draw_Drawable2D.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Drawable2D,Draw_Drawable3D)
+
 Standard_Boolean Draw_Drawable2D::Is3D() const
 {
   return Standard_False;
diff --git a/src/Draw/Draw_Drawable2D.hxx b/src/Draw/Draw_Drawable2D.hxx
index 8394f468f0..6ddab1278d 100644
--- a/src/Draw/Draw_Drawable2D.hxx
+++ b/src/Draw/Draw_Drawable2D.hxx
@@ -40,7 +40,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Drawable2D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Drawable2D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Drawable3D.cxx b/src/Draw/Draw_Drawable3D.cxx
index df49d313cf..53fa7d794c 100644
--- a/src/Draw/Draw_Drawable3D.cxx
+++ b/src/Draw/Draw_Drawable3D.cxx
@@ -19,6 +19,8 @@
 #include <Draw_Drawable3D.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Drawable3D,MMgt_TShared)
+
 //=======================================================================
 //function : Draw_Drawable3D
 //purpose  : 
diff --git a/src/Draw/Draw_Drawable3D.hxx b/src/Draw/Draw_Drawable3D.hxx
index 56f92540dc..f91b371eb2 100644
--- a/src/Draw/Draw_Drawable3D.hxx
+++ b/src/Draw/Draw_Drawable3D.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Drawable3D,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Draw_Drawable3D,MMgt_TShared)
 
 protected:
 
diff --git a/src/Draw/Draw_Grid.cxx b/src/Draw/Draw_Grid.cxx
index e5c8cd87cc..27a5270ba3 100644
--- a/src/Draw/Draw_Grid.cxx
+++ b/src/Draw/Draw_Grid.cxx
@@ -24,6 +24,8 @@
 #include <gp_Trsf.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Grid,Draw_Drawable3D)
+
 static Standard_Real MinimumStep = 1.e-3 ;
 static Standard_Real Ratio       = 200.0 ;
 
diff --git a/src/Draw/Draw_Grid.hxx b/src/Draw/Draw_Grid.hxx
index f37a270828..c7ff66a499 100644
--- a/src/Draw/Draw_Grid.hxx
+++ b/src/Draw/Draw_Grid.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Grid,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Grid,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Marker2D.cxx b/src/Draw/Draw_Marker2D.cxx
index 336d21f28a..c2dd8663b4 100644
--- a/src/Draw/Draw_Marker2D.cxx
+++ b/src/Draw/Draw_Marker2D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Marker2D,Draw_Drawable2D)
+
 //=======================================================================
 //function : Draw_Marker2D
 //purpose  : 
diff --git a/src/Draw/Draw_Marker2D.hxx b/src/Draw/Draw_Marker2D.hxx
index 41cc631f02..62009d6a00 100644
--- a/src/Draw/Draw_Marker2D.hxx
+++ b/src/Draw/Draw_Marker2D.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Marker2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Marker2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Draw/Draw_Marker3D.cxx b/src/Draw/Draw_Marker3D.cxx
index 47f11e245a..7c705e94dc 100644
--- a/src/Draw/Draw_Marker3D.cxx
+++ b/src/Draw/Draw_Marker3D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Marker3D,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Marker3D
 //purpose  : 
diff --git a/src/Draw/Draw_Marker3D.hxx b/src/Draw/Draw_Marker3D.hxx
index faf820874f..7645f951fb 100644
--- a/src/Draw/Draw_Marker3D.hxx
+++ b/src/Draw/Draw_Marker3D.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Marker3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Marker3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Number.cxx b/src/Draw/Draw_Number.cxx
index d5ae77f698..23d726a3dd 100644
--- a/src/Draw/Draw_Number.cxx
+++ b/src/Draw/Draw_Number.cxx
@@ -20,6 +20,8 @@
 #include <Draw_Number.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Number
 //purpose  : 
diff --git a/src/Draw/Draw_Number.hxx b/src/Draw/Draw_Number.hxx
index 982a2f8b50..bb3a116841 100644
--- a/src/Draw/Draw_Number.hxx
+++ b/src/Draw/Draw_Number.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Number,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Printer.cxx b/src/Draw/Draw_Printer.cxx
index c9db710d31..09e29e1e14 100644
--- a/src/Draw/Draw_Printer.cxx
+++ b/src/Draw/Draw_Printer.cxx
@@ -19,6 +19,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Printer,Message_Printer)
+
 //=======================================================================
 //function : Draw_Printer
 //purpose  : 
diff --git a/src/Draw/Draw_Printer.hxx b/src/Draw/Draw_Printer.hxx
index bf981dad15..2cd649bc2b 100644
--- a/src/Draw/Draw_Printer.hxx
+++ b/src/Draw/Draw_Printer.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Printer,Message_Printer)
+  DEFINE_STANDARD_RTTIEXT(Draw_Printer,Message_Printer)
 
 protected:
 
diff --git a/src/Draw/Draw_ProgressIndicator.cxx b/src/Draw/Draw_ProgressIndicator.cxx
index ae5b983573..2734d9951f 100644
--- a/src/Draw/Draw_ProgressIndicator.cxx
+++ b/src/Draw/Draw_ProgressIndicator.cxx
@@ -22,6 +22,8 @@
 
 #include <stdio.h>
 #include <time.h>
+IMPLEMENT_STANDARD_RTTIEXT(Draw_ProgressIndicator,Message_ProgressIndicator)
+
 //=======================================================================
 //function : Draw_ProgressIndicator
 //purpose  : 
diff --git a/src/Draw/Draw_ProgressIndicator.hxx b/src/Draw/Draw_ProgressIndicator.hxx
index ded67d148d..f176e5298f 100644
--- a/src/Draw/Draw_ProgressIndicator.hxx
+++ b/src/Draw/Draw_ProgressIndicator.hxx
@@ -77,7 +77,7 @@ public:
   //! note that it uses static variable and thus not thread-safe! 
   Standard_EXPORT static Standard_Address& StopIndicator();
 
-  DEFINE_STANDARD_RTTI(Draw_ProgressIndicator,Message_ProgressIndicator)
+  DEFINE_STANDARD_RTTIEXT(Draw_ProgressIndicator,Message_ProgressIndicator)
 
 private:
   Standard_Boolean myTextMode;
diff --git a/src/Draw/Draw_Segment2D.cxx b/src/Draw/Draw_Segment2D.cxx
index 1269c41029..99fe81cf74 100644
--- a/src/Draw/Draw_Segment2D.cxx
+++ b/src/Draw/Draw_Segment2D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Segment2D,Draw_Drawable2D)
+
 //=======================================================================
 //function : Draw_Segment2D
 //purpose  : 
diff --git a/src/Draw/Draw_Segment2D.hxx b/src/Draw/Draw_Segment2D.hxx
index d901f9defd..15ca9408a8 100644
--- a/src/Draw/Draw_Segment2D.hxx
+++ b/src/Draw/Draw_Segment2D.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Segment2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Segment2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Draw/Draw_Segment3D.cxx b/src/Draw/Draw_Segment3D.cxx
index c9a5c51866..1efa98564c 100644
--- a/src/Draw/Draw_Segment3D.cxx
+++ b/src/Draw/Draw_Segment3D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Segment3D,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Segment3D
 //purpose  : 
diff --git a/src/Draw/Draw_Segment3D.hxx b/src/Draw/Draw_Segment3D.hxx
index 794eac7f62..de97ae3021 100644
--- a/src/Draw/Draw_Segment3D.hxx
+++ b/src/Draw/Draw_Segment3D.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Segment3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Segment3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/Draw/Draw_Text2D.cxx b/src/Draw/Draw_Text2D.cxx
index 93140b8125..125a1c6edd 100644
--- a/src/Draw/Draw_Text2D.cxx
+++ b/src/Draw/Draw_Text2D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Text2D,Draw_Drawable2D)
+
 //=======================================================================
 //function : Draw_Text2D
 //purpose  : 
diff --git a/src/Draw/Draw_Text2D.hxx b/src/Draw/Draw_Text2D.hxx
index 326f1c9812..13751beb14 100644
--- a/src/Draw/Draw_Text2D.hxx
+++ b/src/Draw/Draw_Text2D.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Text2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Text2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Draw/Draw_Text3D.cxx b/src/Draw/Draw_Text3D.cxx
index b50c542803..f420a75cbb 100644
--- a/src/Draw/Draw_Text3D.cxx
+++ b/src/Draw/Draw_Text3D.cxx
@@ -21,6 +21,8 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Draw_Text3D,Draw_Drawable3D)
+
 //=======================================================================
 //function : Draw_Text3D
 //purpose  : 
diff --git a/src/Draw/Draw_Text3D.hxx b/src/Draw/Draw_Text3D.hxx
index 3854ec05c0..431441b5ba 100644
--- a/src/Draw/Draw_Text3D.hxx
+++ b/src/Draw/Draw_Text3D.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Draw_Text3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(Draw_Text3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_Angle.cxx b/src/DrawDim/DrawDim_Angle.cxx
index e67a80be4f..d2b33629dc 100644
--- a/src/DrawDim/DrawDim_Angle.cxx
+++ b/src/DrawDim/DrawDim_Angle.cxx
@@ -35,6 +35,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_Angle,DrawDim_Dimension)
+
 //=======================================================================
 //function : DrawDim_Angle
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_Angle.hxx b/src/DrawDim/DrawDim_Angle.hxx
index 778d942891..633fadb47f 100644
--- a/src/DrawDim/DrawDim_Angle.hxx
+++ b/src/DrawDim/DrawDim_Angle.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_Angle,DrawDim_Dimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_Angle,DrawDim_Dimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_Dimension.cxx b/src/DrawDim/DrawDim_Dimension.cxx
index a48840a13a..ad947f4b5d 100644
--- a/src/DrawDim/DrawDim_Dimension.cxx
+++ b/src/DrawDim/DrawDim_Dimension.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_Dimension,Draw_Drawable3D)
+
 //=======================================================================
 //function : DrawDim_Dimension
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_Dimension.hxx b/src/DrawDim/DrawDim_Dimension.hxx
index 2b3d1201ef..15f42a99e2 100644
--- a/src/DrawDim/DrawDim_Dimension.hxx
+++ b/src/DrawDim/DrawDim_Dimension.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_Dimension,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_Dimension,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_Distance.cxx b/src/DrawDim/DrawDim_Distance.cxx
index 49234f0b25..6f2ca45fbd 100644
--- a/src/DrawDim/DrawDim_Distance.cxx
+++ b/src/DrawDim/DrawDim_Distance.cxx
@@ -34,6 +34,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_Distance,DrawDim_Dimension)
+
 //=======================================================================
 //function : DrawDim_Distance
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_Distance.hxx b/src/DrawDim/DrawDim_Distance.hxx
index 4a953d2a78..3e545f602a 100644
--- a/src/DrawDim/DrawDim_Distance.hxx
+++ b/src/DrawDim/DrawDim_Distance.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_Distance,DrawDim_Dimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_Distance,DrawDim_Dimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_PlanarAngle.cxx b/src/DrawDim/DrawDim_PlanarAngle.cxx
index 8ccadf6b7f..d88a18689b 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.cxx
+++ b/src/DrawDim/DrawDim_PlanarAngle.cxx
@@ -53,6 +53,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_PlanarAngle,DrawDim_PlanarDimension)
+
 //=======================================================================
 //function : DrawDim_PlanarAngle
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarAngle.hxx b/src/DrawDim/DrawDim_PlanarAngle.hxx
index 3e11ae1e49..8f4fe404ed 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.hxx
+++ b/src/DrawDim/DrawDim_PlanarAngle.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_PlanarAngle,DrawDim_PlanarDimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_PlanarAngle,DrawDim_PlanarDimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_PlanarDiameter.cxx b/src/DrawDim/DrawDim_PlanarDiameter.cxx
index e9b0e107c6..51e3537514 100644
--- a/src/DrawDim/DrawDim_PlanarDiameter.cxx
+++ b/src/DrawDim/DrawDim_PlanarDiameter.cxx
@@ -32,6 +32,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_PlanarDiameter,DrawDim_PlanarDimension)
+
 //=======================================================================
 //function : DrawDim_PlanarDiameter
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarDiameter.hxx b/src/DrawDim/DrawDim_PlanarDiameter.hxx
index 57b0517a6d..7ceb415fc0 100644
--- a/src/DrawDim/DrawDim_PlanarDiameter.hxx
+++ b/src/DrawDim/DrawDim_PlanarDiameter.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_PlanarDiameter,DrawDim_PlanarDimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_PlanarDiameter,DrawDim_PlanarDimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_PlanarDimension.cxx b/src/DrawDim/DrawDim_PlanarDimension.cxx
index 0f817e806e..167262ab5b 100644
--- a/src/DrawDim/DrawDim_PlanarDimension.cxx
+++ b/src/DrawDim/DrawDim_PlanarDimension.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_PlanarDimension,DrawDim_Dimension)
+
 //=======================================================================
 //function : SetPlane
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarDimension.hxx b/src/DrawDim/DrawDim_PlanarDimension.hxx
index 30d96d8e6e..d270e96a00 100644
--- a/src/DrawDim/DrawDim_PlanarDimension.hxx
+++ b/src/DrawDim/DrawDim_PlanarDimension.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_PlanarDimension,DrawDim_Dimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_PlanarDimension,DrawDim_Dimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_PlanarDistance.cxx b/src/DrawDim/DrawDim_PlanarDistance.cxx
index 2deb163e6a..4e09571940 100644
--- a/src/DrawDim/DrawDim_PlanarDistance.cxx
+++ b/src/DrawDim/DrawDim_PlanarDistance.cxx
@@ -31,6 +31,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_PlanarDistance,DrawDim_PlanarDimension)
+
 //=======================================================================
 //function : Draw
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarDistance.hxx b/src/DrawDim/DrawDim_PlanarDistance.hxx
index 6de18e5dd2..479bb1fc57 100644
--- a/src/DrawDim/DrawDim_PlanarDistance.hxx
+++ b/src/DrawDim/DrawDim_PlanarDistance.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_PlanarDistance,DrawDim_PlanarDimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_PlanarDistance,DrawDim_PlanarDimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_PlanarRadius.cxx b/src/DrawDim/DrawDim_PlanarRadius.cxx
index 2760ac72e7..fe8f777697 100644
--- a/src/DrawDim/DrawDim_PlanarRadius.cxx
+++ b/src/DrawDim/DrawDim_PlanarRadius.cxx
@@ -33,6 +33,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_PlanarRadius,DrawDim_PlanarDimension)
+
 //=======================================================================
 //function : DrawDim_PlanarRadius
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_PlanarRadius.hxx b/src/DrawDim/DrawDim_PlanarRadius.hxx
index 0a5a81d9c0..1bea4b7163 100644
--- a/src/DrawDim/DrawDim_PlanarRadius.hxx
+++ b/src/DrawDim/DrawDim_PlanarRadius.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_PlanarRadius,DrawDim_PlanarDimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_PlanarRadius,DrawDim_PlanarDimension)
 
 protected:
 
diff --git a/src/DrawDim/DrawDim_Radius.cxx b/src/DrawDim/DrawDim_Radius.cxx
index a178ced6b4..ca0d15b0cf 100644
--- a/src/DrawDim/DrawDim_Radius.cxx
+++ b/src/DrawDim/DrawDim_Radius.cxx
@@ -29,6 +29,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawDim_Radius,DrawDim_Dimension)
+
 //=======================================================================
 //function : DrawDim_Radius
 //purpose  : 
diff --git a/src/DrawDim/DrawDim_Radius.hxx b/src/DrawDim/DrawDim_Radius.hxx
index 85a34dd2b8..9b10fb0324 100644
--- a/src/DrawDim/DrawDim_Radius.hxx
+++ b/src/DrawDim/DrawDim_Radius.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawDim_Radius,DrawDim_Dimension)
+  DEFINE_STANDARD_RTTIEXT(DrawDim_Radius,DrawDim_Dimension)
 
 protected:
 
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cxx b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
index 4dd32642c1..2083c68d6a 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.cxx
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.cxx
@@ -23,6 +23,8 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawFairCurve_Batten,DrawTrSurf_BSplineCurve2d)
+
 DrawFairCurve_Batten::DrawFairCurve_Batten(const Standard_Address TheBatten)
                      : DrawTrSurf_BSplineCurve2d( ((FairCurve_Batten*)TheBatten)->Curve()),
                        MyBatten( TheBatten)
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.hxx b/src/DrawFairCurve/DrawFairCurve_Batten.hxx
index 220a556d06..35f268fd2a 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.hxx
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawFairCurve_Batten,DrawTrSurf_BSplineCurve2d)
+  DEFINE_STANDARD_RTTIEXT(DrawFairCurve_Batten,DrawTrSurf_BSplineCurve2d)
 
 protected:
 
diff --git a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
index de12a87038..69e228eff4 100644
--- a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
+++ b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cxx
@@ -18,6 +18,8 @@
 #include <FairCurve_MinimalVariation.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawFairCurve_MinimalVariation,DrawFairCurve_Batten)
+
 DrawFairCurve_MinimalVariation::DrawFairCurve_MinimalVariation(const Standard_Address TheMVC)
                                : DrawFairCurve_Batten(TheMVC)
                                  
diff --git a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
index c1decc03a9..4bb77f6f1c 100644
--- a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
+++ b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawFairCurve_MinimalVariation,DrawFairCurve_Batten)
+  DEFINE_STANDARD_RTTIEXT(DrawFairCurve_MinimalVariation,DrawFairCurve_Batten)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx
index 9bf531fafd..bda82a828f 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx
@@ -24,6 +24,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve)
+
 DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve (
    const Handle(Geom_BSplineCurve)& C) :
    DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1) {
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
index 0db1c050ee..58ed4d2818 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx
index b1662cd3b5..814e3ebf9f 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx
@@ -24,6 +24,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d)
+
 DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d (
    const Handle(Geom2d_BSplineCurve)& C) 
    : DrawTrSurf_Curve2d (C, Draw_vert, 100) {
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
index 4f49759e50..6b470f5857 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx
index 84618f159c..d265ff020b 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx
@@ -28,6 +28,8 @@
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface)
+
 DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (
    const Handle(Geom_BSplineSurface)& S)
    : DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2, 
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx
index 88305fcdb5..7ab5214c6f 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx b/src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx
index 6c9e7953ee..f02b57e594 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx
@@ -23,6 +23,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve,DrawTrSurf_Curve)
+
 DrawTrSurf_BezierCurve::DrawTrSurf_BezierCurve (
    const Handle(Geom_BezierCurve)& C) 
    : DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1) {
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx b/src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
index d45cca9674..77fb4601fb 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierCurve,DrawTrSurf_Curve)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve,DrawTrSurf_Curve)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx
index c5fa05e3b3..79a26084fb 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx
@@ -23,6 +23,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d)
+
 DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d (
    const Handle(Geom2d_BezierCurve)& C) :
    DrawTrSurf_Curve2d (C, Draw_vert, 50) {
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
index 3c4e5bf725..472c7c4367 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx b/src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx
index d8b6e20c86..85e94dc169 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx
@@ -24,6 +24,8 @@
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface,DrawTrSurf_Surface)
+
 DrawTrSurf_BezierSurface::DrawTrSurf_BezierSurface (
    const Handle(Geom_BezierSurface)& S)
    : DrawTrSurf_Surface (S, 1, 1, Draw_jaune, Draw_bleu, 30, 0.05, 0) {
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx b/src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx
index e750189043..fe3c5fabd9 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierSurface,DrawTrSurf_Surface)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface,DrawTrSurf_Surface)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve.cxx b/src/DrawTrSurf/DrawTrSurf_Curve.cxx
index 4e79f0bd88..638f657940 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve,DrawTrSurf_Drawable)
+
 Standard_Real DrawTrSurf_CurveLimit = 400;
 extern Standard_Boolean Draw_Bounds;
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve.hxx b/src/DrawTrSurf/DrawTrSurf_Curve.hxx
index 6efdbc733f..5dc8ae4ae3 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Curve,DrawTrSurf_Drawable)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve,DrawTrSurf_Drawable)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx b/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
index 1cbb99e208..6d2477a366 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
+
 static Standard_Real DrawTrSurf_CurveLimit = 400;
 extern Standard_Boolean Draw_Bounds;
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
index ca1d2e186c..ca86b478bb 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Drawable.cxx b/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
index 1c652f085f..fa16a78f09 100644
--- a/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Drawable.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Drawable,Draw_Drawable3D)
+
 //=======================================================================
 //function : DrawTrSurf_Drawable
 //purpose  : initialise the discretisation
diff --git a/src/DrawTrSurf/DrawTrSurf_Drawable.hxx b/src/DrawTrSurf/DrawTrSurf_Drawable.hxx
index 590ade9015..638b0a8442 100644
--- a/src/DrawTrSurf/DrawTrSurf_Drawable.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Drawable.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Drawable,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Drawable,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cxx b/src/DrawTrSurf/DrawTrSurf_Point.cxx
index 87d4a81173..a43fb75e6e 100644
--- a/src/DrawTrSurf/DrawTrSurf_Point.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Stream.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Point,Draw_Drawable3D)
+
 //=======================================================================
 //function : DrawTrSurf_Point
 //purpose  : 
diff --git a/src/DrawTrSurf/DrawTrSurf_Point.hxx b/src/DrawTrSurf/DrawTrSurf_Point.hxx
index 9eb0e115c3..82731c0bc0 100644
--- a/src/DrawTrSurf/DrawTrSurf_Point.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Point.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Point,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Point,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx b/src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx
index 7801691d56..d6e790a48f 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx
@@ -24,6 +24,8 @@
 #include <Poly_Polygon2D.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D,Draw_Drawable2D)
+
 //=======================================================================
 //function : DrawTrSurf_Polygon2D
 //purpose  : 
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx b/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx
index ea58a34db4..f966eda801 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Polygon2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx b/src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx
index 703c293700..429a30b482 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx
@@ -24,6 +24,8 @@
 #include <Poly_Polygon3D.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D,Draw_Drawable3D)
+
 //=======================================================================
 //function : DrawTrSurf_Polygon3D
 //purpose  : 
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx b/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
index 2b47ae2fb3..bc1e6d6eca 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Polygon3D,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Surface.cxx b/src/DrawTrSurf/DrawTrSurf_Surface.cxx
index a53cbaf42c..dee629db2f 100644
--- a/src/DrawTrSurf/DrawTrSurf_Surface.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Surface.cxx
@@ -24,6 +24,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Surface,DrawTrSurf_Drawable)
+
 Standard_Real DrawTrSurf_SurfaceLimit = 400;
 
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Surface.hxx b/src/DrawTrSurf/DrawTrSurf_Surface.hxx
index b31004ff38..643b3ddb40 100644
--- a/src/DrawTrSurf/DrawTrSurf_Surface.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Surface.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Surface,DrawTrSurf_Drawable)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Surface,DrawTrSurf_Drawable)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
index 217a51471e..ddc1ad2696 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
@@ -29,6 +29,8 @@
 #include <TColStd_Array1OfInteger.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Triangulation,Draw_Drawable3D)
+
 //=======================================================================
 //function : DrawTrSurf_Triangulation
 //purpose  : 
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx b/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx
index 42972ec2ba..4f73b4909e 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Triangulation,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
index 727085d0ea..88ba30c3f8 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx
@@ -29,6 +29,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Triangulation2D,Draw_Drawable2D)
+
 #ifdef _MSC_VER
 #include <stdio.h>
 #endif
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
index a10ae65bc6..561213acfe 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(DrawTrSurf_Triangulation2D,Draw_Drawable2D)
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation2D,Draw_Drawable2D)
 
 protected:
 
diff --git a/src/Expr/Expr_Absolute.cxx b/src/Expr/Expr_Absolute.cxx
index 3127d3a0ec..5eb3dbc0ed 100644
--- a/src/Expr/Expr_Absolute.cxx
+++ b/src/Expr/Expr_Absolute.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Absolute,Expr_UnaryExpression)
+
 Expr_Absolute::Expr_Absolute (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Absolute.hxx b/src/Expr/Expr_Absolute.hxx
index 3d3fba557f..c5fe991013 100644
--- a/src/Expr/Expr_Absolute.hxx
+++ b/src/Expr/Expr_Absolute.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Absolute,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Absolute,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArcCosine.cxx b/src/Expr/Expr_ArcCosine.cxx
index efb8be9581..761d54e7d8 100644
--- a/src/Expr/Expr_ArcCosine.cxx
+++ b/src/Expr/Expr_ArcCosine.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArcCosine,Expr_UnaryExpression)
+
 Expr_ArcCosine::Expr_ArcCosine (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArcCosine.hxx b/src/Expr/Expr_ArcCosine.hxx
index 83edc917a8..ac1a9957c8 100644
--- a/src/Expr/Expr_ArcCosine.hxx
+++ b/src/Expr/Expr_ArcCosine.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArcCosine,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArcCosine,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArcSine.cxx b/src/Expr/Expr_ArcSine.cxx
index 9a1f0ed020..3f015d3869 100644
--- a/src/Expr/Expr_ArcSine.cxx
+++ b/src/Expr/Expr_ArcSine.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArcSine,Expr_UnaryExpression)
+
 Expr_ArcSine::Expr_ArcSine (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArcSine.hxx b/src/Expr/Expr_ArcSine.hxx
index 1bdcf4553d..5ba779c8a6 100644
--- a/src/Expr/Expr_ArcSine.hxx
+++ b/src/Expr/Expr_ArcSine.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArcSine,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArcSine,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArcTangent.cxx b/src/Expr/Expr_ArcTangent.cxx
index a346d030e4..5ac38e040a 100644
--- a/src/Expr/Expr_ArcTangent.cxx
+++ b/src/Expr/Expr_ArcTangent.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArcTangent,Expr_UnaryExpression)
+
 Expr_ArcTangent::Expr_ArcTangent (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArcTangent.hxx b/src/Expr/Expr_ArcTangent.hxx
index 756db687b1..2698cf4de5 100644
--- a/src/Expr/Expr_ArcTangent.hxx
+++ b/src/Expr/Expr_ArcTangent.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArcTangent,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArcTangent,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArgCosh.cxx b/src/Expr/Expr_ArgCosh.cxx
index 1dd6ffb2c3..ecf8cb5db5 100644
--- a/src/Expr/Expr_ArgCosh.cxx
+++ b/src/Expr/Expr_ArgCosh.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArgCosh,Expr_UnaryExpression)
+
 Expr_ArgCosh::Expr_ArgCosh (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArgCosh.hxx b/src/Expr/Expr_ArgCosh.hxx
index 69633e3bc6..adf346a92d 100644
--- a/src/Expr/Expr_ArgCosh.hxx
+++ b/src/Expr/Expr_ArgCosh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArgCosh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArgCosh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArgSinh.cxx b/src/Expr/Expr_ArgSinh.cxx
index e916435494..7f0c991553 100644
--- a/src/Expr/Expr_ArgSinh.cxx
+++ b/src/Expr/Expr_ArgSinh.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArgSinh,Expr_UnaryExpression)
+
 Expr_ArgSinh::Expr_ArgSinh (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArgSinh.hxx b/src/Expr/Expr_ArgSinh.hxx
index 42b1c91335..18e6207bd5 100644
--- a/src/Expr/Expr_ArgSinh.hxx
+++ b/src/Expr/Expr_ArgSinh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArgSinh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArgSinh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_ArgTanh.cxx b/src/Expr/Expr_ArgTanh.cxx
index 8733c080ec..0889483df1 100644
--- a/src/Expr/Expr_ArgTanh.cxx
+++ b/src/Expr/Expr_ArgTanh.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_ArgTanh,Expr_UnaryExpression)
+
 Expr_ArgTanh::Expr_ArgTanh (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_ArgTanh.hxx b/src/Expr/Expr_ArgTanh.hxx
index 96e58485d9..f5b01c963c 100644
--- a/src/Expr/Expr_ArgTanh.hxx
+++ b/src/Expr/Expr_ArgTanh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_ArgTanh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_ArgTanh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_BinaryExpression.cxx b/src/Expr/Expr_BinaryExpression.cxx
index 30ec457acd..ad41be892c 100644
--- a/src/Expr/Expr_BinaryExpression.cxx
+++ b/src/Expr/Expr_BinaryExpression.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_BinaryExpression,Expr_GeneralExpression)
+
 void Expr_BinaryExpression::SetFirstOperand (const Handle(Expr_GeneralExpression)& exp)
 {
   Handle(Expr_BinaryExpression) me;
diff --git a/src/Expr/Expr_BinaryExpression.hxx b/src/Expr/Expr_BinaryExpression.hxx
index 754424b51c..b22d727482 100644
--- a/src/Expr/Expr_BinaryExpression.hxx
+++ b/src/Expr/Expr_BinaryExpression.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_BinaryExpression,Expr_GeneralExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_BinaryExpression,Expr_GeneralExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_BinaryFunction.cxx b/src/Expr/Expr_BinaryFunction.cxx
index dae886ddb2..6a41e08b00 100644
--- a/src/Expr/Expr_BinaryFunction.cxx
+++ b/src/Expr/Expr_BinaryFunction.cxx
@@ -38,6 +38,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_BinaryFunction,Expr_BinaryExpression)
+
 Expr_BinaryFunction::Expr_BinaryFunction (const Handle(Expr_GeneralFunction)& func, const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   if (func->NbOfVariables() != 2) {
diff --git a/src/Expr/Expr_BinaryFunction.hxx b/src/Expr/Expr_BinaryFunction.hxx
index a2e3ab5045..13c8624e9d 100644
--- a/src/Expr/Expr_BinaryFunction.hxx
+++ b/src/Expr/Expr_BinaryFunction.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_BinaryFunction,Expr_BinaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_BinaryFunction,Expr_BinaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Cosh.cxx b/src/Expr/Expr_Cosh.cxx
index 258d800153..68f97981e8 100644
--- a/src/Expr/Expr_Cosh.cxx
+++ b/src/Expr/Expr_Cosh.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Cosh,Expr_UnaryExpression)
+
 Expr_Cosh::Expr_Cosh(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Cosh.hxx b/src/Expr/Expr_Cosh.hxx
index 58d2873c39..4f7533d39a 100644
--- a/src/Expr/Expr_Cosh.hxx
+++ b/src/Expr/Expr_Cosh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Cosh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Cosh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Cosine.cxx b/src/Expr/Expr_Cosine.cxx
index 371e75d87e..79f595f63c 100644
--- a/src/Expr/Expr_Cosine.cxx
+++ b/src/Expr/Expr_Cosine.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Cosine,Expr_UnaryExpression)
+
 Expr_Cosine::Expr_Cosine(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Cosine.hxx b/src/Expr/Expr_Cosine.hxx
index 5e63c9b032..7062d5a635 100644
--- a/src/Expr/Expr_Cosine.hxx
+++ b/src/Expr/Expr_Cosine.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Cosine,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Cosine,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Difference.cxx b/src/Expr/Expr_Difference.cxx
index 989fe2560e..d2d1258c81 100644
--- a/src/Expr/Expr_Difference.cxx
+++ b/src/Expr/Expr_Difference.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Difference,Expr_BinaryExpression)
+
 Expr_Difference::Expr_Difference (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   CreateFirstOperand(exp1);
diff --git a/src/Expr/Expr_Difference.hxx b/src/Expr/Expr_Difference.hxx
index 4cec776868..36f2823245 100644
--- a/src/Expr/Expr_Difference.hxx
+++ b/src/Expr/Expr_Difference.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Difference,Expr_BinaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Difference,Expr_BinaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Different.cxx b/src/Expr/Expr_Different.cxx
index 56c030ab8e..a2b370577f 100644
--- a/src/Expr/Expr_Different.cxx
+++ b/src/Expr/Expr_Different.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Different,Expr_SingleRelation)
+
 Expr_Different::Expr_Different (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_Different.hxx b/src/Expr/Expr_Different.hxx
index f136b3dc39..123360642c 100644
--- a/src/Expr/Expr_Different.hxx
+++ b/src/Expr/Expr_Different.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Different,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_Different,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_Division.cxx b/src/Expr/Expr_Division.cxx
index 313abf7be8..8e910b5509 100644
--- a/src/Expr/Expr_Division.cxx
+++ b/src/Expr/Expr_Division.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Division,Expr_BinaryExpression)
+
 Expr_Division::Expr_Division (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   CreateFirstOperand(exp1);
diff --git a/src/Expr/Expr_Division.hxx b/src/Expr/Expr_Division.hxx
index 95b92b57dd..8c03f79aa4 100644
--- a/src/Expr/Expr_Division.hxx
+++ b/src/Expr/Expr_Division.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Division,Expr_BinaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Division,Expr_BinaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Equal.cxx b/src/Expr/Expr_Equal.cxx
index d064b4f8a0..63bfed4e5f 100644
--- a/src/Expr/Expr_Equal.cxx
+++ b/src/Expr/Expr_Equal.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Equal,Expr_SingleRelation)
+
 Expr_Equal::Expr_Equal (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_Equal.hxx b/src/Expr/Expr_Equal.hxx
index 500c6694c2..1e2cf416a6 100644
--- a/src/Expr/Expr_Equal.hxx
+++ b/src/Expr/Expr_Equal.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Equal,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_Equal,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_Exponential.cxx b/src/Expr/Expr_Exponential.cxx
index f37be997b3..461609e52d 100644
--- a/src/Expr/Expr_Exponential.cxx
+++ b/src/Expr/Expr_Exponential.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Exponential,Expr_UnaryExpression)
+
 Expr_Exponential::Expr_Exponential(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Exponential.hxx b/src/Expr/Expr_Exponential.hxx
index b16f9aa086..f5a93fa6c4 100644
--- a/src/Expr/Expr_Exponential.hxx
+++ b/src/Expr/Expr_Exponential.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Exponential,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Exponential,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Exponentiate.cxx b/src/Expr/Expr_Exponentiate.cxx
index cedcc0ddbb..18854cb3d0 100644
--- a/src/Expr/Expr_Exponentiate.cxx
+++ b/src/Expr/Expr_Exponentiate.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Exponentiate,Expr_BinaryExpression)
+
 Expr_Exponentiate::Expr_Exponentiate (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   CreateFirstOperand(exp1);
diff --git a/src/Expr/Expr_Exponentiate.hxx b/src/Expr/Expr_Exponentiate.hxx
index d2d9b0ed6a..131e5e8f92 100644
--- a/src/Expr/Expr_Exponentiate.hxx
+++ b/src/Expr/Expr_Exponentiate.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Exponentiate,Expr_BinaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Exponentiate,Expr_BinaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_FunctionDerivative.cxx b/src/Expr/Expr_FunctionDerivative.cxx
index 10daea84b1..0ee80e4ca4 100644
--- a/src/Expr/Expr_FunctionDerivative.cxx
+++ b/src/Expr/Expr_FunctionDerivative.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_FunctionDerivative,Expr_GeneralFunction)
+
 Expr_FunctionDerivative::Expr_FunctionDerivative (const Handle(Expr_GeneralFunction)& func, const Handle(Expr_NamedUnknown)& withX, const Standard_Integer deg)
 {
   myFunction = func;
diff --git a/src/Expr/Expr_FunctionDerivative.hxx b/src/Expr/Expr_FunctionDerivative.hxx
index 3249e31371..795c1e8777 100644
--- a/src/Expr/Expr_FunctionDerivative.hxx
+++ b/src/Expr/Expr_FunctionDerivative.hxx
@@ -101,7 +101,7 @@ public:
 friend class Expr_NamedFunction;
 
 
-  DEFINE_STANDARD_RTTI(Expr_FunctionDerivative,Expr_GeneralFunction)
+  DEFINE_STANDARD_RTTIEXT(Expr_FunctionDerivative,Expr_GeneralFunction)
 
 protected:
 
diff --git a/src/Expr/Expr_GeneralExpression.cxx b/src/Expr/Expr_GeneralExpression.cxx
index 12d3128683..77b186135e 100644
--- a/src/Expr/Expr_GeneralExpression.cxx
+++ b/src/Expr/Expr_GeneralExpression.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_GeneralExpression,MMgt_TShared)
+
 Standard_Boolean Expr_GeneralExpression::IsShareable() const
  {
    return Standard_False;
diff --git a/src/Expr/Expr_GeneralExpression.hxx b/src/Expr/Expr_GeneralExpression.hxx
index c9d438d626..c7a705ed6d 100644
--- a/src/Expr/Expr_GeneralExpression.hxx
+++ b/src/Expr/Expr_GeneralExpression.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_GeneralExpression,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Expr_GeneralExpression,MMgt_TShared)
 
 protected:
 
diff --git a/src/Expr/Expr_GeneralFunction.cxx b/src/Expr/Expr_GeneralFunction.cxx
index b20c33a502..323c6e6f24 100644
--- a/src/Expr/Expr_GeneralFunction.cxx
+++ b/src/Expr/Expr_GeneralFunction.cxx
@@ -23,3 +23,5 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Expr_GeneralFunction,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Expr/Expr_GeneralFunction.hxx b/src/Expr/Expr_GeneralFunction.hxx
index 192798c7de..adea6cfb70 100644
--- a/src/Expr/Expr_GeneralFunction.hxx
+++ b/src/Expr/Expr_GeneralFunction.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_GeneralFunction,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Expr_GeneralFunction,MMgt_TShared)
 
 protected:
 
diff --git a/src/Expr/Expr_GeneralRelation.cxx b/src/Expr/Expr_GeneralRelation.cxx
index 80a104e773..fa71243ffd 100644
--- a/src/Expr/Expr_GeneralRelation.cxx
+++ b/src/Expr/Expr_GeneralRelation.cxx
@@ -22,3 +22,5 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Expr_GeneralRelation,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Expr/Expr_GeneralRelation.hxx b/src/Expr/Expr_GeneralRelation.hxx
index 3923873c63..bb563a62ec 100644
--- a/src/Expr/Expr_GeneralRelation.hxx
+++ b/src/Expr/Expr_GeneralRelation.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_GeneralRelation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Expr_GeneralRelation,MMgt_TShared)
 
 protected:
 
diff --git a/src/Expr/Expr_GreaterThan.cxx b/src/Expr/Expr_GreaterThan.cxx
index 229261aec3..b1d8efba88 100644
--- a/src/Expr/Expr_GreaterThan.cxx
+++ b/src/Expr/Expr_GreaterThan.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_GreaterThan,Expr_SingleRelation)
+
 Expr_GreaterThan::Expr_GreaterThan (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_GreaterThan.hxx b/src/Expr/Expr_GreaterThan.hxx
index 0206ad9896..740c404655 100644
--- a/src/Expr/Expr_GreaterThan.hxx
+++ b/src/Expr/Expr_GreaterThan.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_GreaterThan,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_GreaterThan,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_GreaterThanOrEqual.cxx b/src/Expr/Expr_GreaterThanOrEqual.cxx
index 7495ab32e3..3f2e526d60 100644
--- a/src/Expr/Expr_GreaterThanOrEqual.cxx
+++ b/src/Expr/Expr_GreaterThanOrEqual.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_GreaterThanOrEqual,Expr_SingleRelation)
+
 Expr_GreaterThanOrEqual::Expr_GreaterThanOrEqual (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_GreaterThanOrEqual.hxx b/src/Expr/Expr_GreaterThanOrEqual.hxx
index cfa4468e5b..7c53748e6d 100644
--- a/src/Expr/Expr_GreaterThanOrEqual.hxx
+++ b/src/Expr/Expr_GreaterThanOrEqual.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_GreaterThanOrEqual,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_GreaterThanOrEqual,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_LessThan.cxx b/src/Expr/Expr_LessThan.cxx
index fb505912b9..b160478a10 100644
--- a/src/Expr/Expr_LessThan.cxx
+++ b/src/Expr/Expr_LessThan.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_LessThan,Expr_SingleRelation)
+
 Expr_LessThan::Expr_LessThan (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_LessThan.hxx b/src/Expr/Expr_LessThan.hxx
index c51bed33c5..93163d7a13 100644
--- a/src/Expr/Expr_LessThan.hxx
+++ b/src/Expr/Expr_LessThan.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_LessThan,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_LessThan,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_LessThanOrEqual.cxx b/src/Expr/Expr_LessThanOrEqual.cxx
index 19d355923a..f97379e63f 100644
--- a/src/Expr/Expr_LessThanOrEqual.cxx
+++ b/src/Expr/Expr_LessThanOrEqual.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_LessThanOrEqual,Expr_SingleRelation)
+
 Expr_LessThanOrEqual::Expr_LessThanOrEqual (const Handle(Expr_GeneralExpression)& exp1, const Handle(Expr_GeneralExpression)& exp2)
 {
   SetFirstMember(exp1);
diff --git a/src/Expr/Expr_LessThanOrEqual.hxx b/src/Expr/Expr_LessThanOrEqual.hxx
index a562c356ec..2222cb0e2a 100644
--- a/src/Expr/Expr_LessThanOrEqual.hxx
+++ b/src/Expr/Expr_LessThanOrEqual.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_LessThanOrEqual,Expr_SingleRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_LessThanOrEqual,Expr_SingleRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_LogOf10.cxx b/src/Expr/Expr_LogOf10.cxx
index cf99d9a0a5..31c7e13419 100644
--- a/src/Expr/Expr_LogOf10.cxx
+++ b/src/Expr/Expr_LogOf10.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_LogOf10,Expr_UnaryExpression)
+
 Expr_LogOf10::Expr_LogOf10(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_LogOf10.hxx b/src/Expr/Expr_LogOf10.hxx
index b4f5946408..6c4f4067c2 100644
--- a/src/Expr/Expr_LogOf10.hxx
+++ b/src/Expr/Expr_LogOf10.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_LogOf10,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_LogOf10,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_LogOfe.cxx b/src/Expr/Expr_LogOfe.cxx
index a1c2e4f145..9595728ff9 100644
--- a/src/Expr/Expr_LogOfe.cxx
+++ b/src/Expr/Expr_LogOfe.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_LogOfe,Expr_UnaryExpression)
+
 Expr_LogOfe::Expr_LogOfe(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_LogOfe.hxx b/src/Expr/Expr_LogOfe.hxx
index 02132393e9..d581141f10 100644
--- a/src/Expr/Expr_LogOfe.hxx
+++ b/src/Expr/Expr_LogOfe.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_LogOfe,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_LogOfe,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_NamedConstant.cxx b/src/Expr/Expr_NamedConstant.cxx
index 616b9b1f0d..fd413f685e 100644
--- a/src/Expr/Expr_NamedConstant.cxx
+++ b/src/Expr/Expr_NamedConstant.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_NamedConstant,Expr_NamedExpression)
+
 Expr_NamedConstant::Expr_NamedConstant(const TCollection_AsciiString& name, const Standard_Real value)
 {
   SetName(name);
diff --git a/src/Expr/Expr_NamedConstant.hxx b/src/Expr/Expr_NamedConstant.hxx
index a0fd7ddcb6..90be9b2921 100644
--- a/src/Expr/Expr_NamedConstant.hxx
+++ b/src/Expr/Expr_NamedConstant.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_NamedConstant,Expr_NamedExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_NamedConstant,Expr_NamedExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_NamedExpression.cxx b/src/Expr/Expr_NamedExpression.cxx
index 424132727b..5ed5c1f211 100644
--- a/src/Expr/Expr_NamedExpression.cxx
+++ b/src/Expr/Expr_NamedExpression.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_NamedExpression,Expr_GeneralExpression)
+
 //=======================================================================
 //function : GetName
 //purpose  : 
diff --git a/src/Expr/Expr_NamedExpression.hxx b/src/Expr/Expr_NamedExpression.hxx
index a70858094a..f94b724d57 100644
--- a/src/Expr/Expr_NamedExpression.hxx
+++ b/src/Expr/Expr_NamedExpression.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_NamedExpression,Expr_GeneralExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_NamedExpression,Expr_GeneralExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_NamedFunction.cxx b/src/Expr/Expr_NamedFunction.cxx
index db90dc010e..44088177e4 100644
--- a/src/Expr/Expr_NamedFunction.cxx
+++ b/src/Expr/Expr_NamedFunction.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_NamedFunction,Expr_GeneralFunction)
+
 Expr_NamedFunction::Expr_NamedFunction (const TCollection_AsciiString& name, const Handle(Expr_GeneralExpression)& exp, const Expr_Array1OfNamedUnknown& vars) : 
                                  myVariables(vars.Lower(),vars.Upper())
 {
diff --git a/src/Expr/Expr_NamedFunction.hxx b/src/Expr/Expr_NamedFunction.hxx
index ef20ccb89b..ef0be055a4 100644
--- a/src/Expr/Expr_NamedFunction.hxx
+++ b/src/Expr/Expr_NamedFunction.hxx
@@ -99,7 +99,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_NamedFunction,Expr_GeneralFunction)
+  DEFINE_STANDARD_RTTIEXT(Expr_NamedFunction,Expr_GeneralFunction)
 
 protected:
 
diff --git a/src/Expr/Expr_NamedUnknown.cxx b/src/Expr/Expr_NamedUnknown.cxx
index 1280038f6f..74151202b5 100644
--- a/src/Expr/Expr_NamedUnknown.cxx
+++ b/src/Expr/Expr_NamedUnknown.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_NamedUnknown,Expr_NamedExpression)
+
 Expr_NamedUnknown::Expr_NamedUnknown(const TCollection_AsciiString& name)
 {
   SetName(name);
diff --git a/src/Expr/Expr_NamedUnknown.hxx b/src/Expr/Expr_NamedUnknown.hxx
index 6338d429d0..165104d771 100644
--- a/src/Expr/Expr_NamedUnknown.hxx
+++ b/src/Expr/Expr_NamedUnknown.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_NamedUnknown,Expr_NamedExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_NamedUnknown,Expr_NamedExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_NumericValue.cxx b/src/Expr/Expr_NumericValue.cxx
index 9e1b37f8f3..284c2c2914 100644
--- a/src/Expr/Expr_NumericValue.cxx
+++ b/src/Expr/Expr_NumericValue.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Expr_NumericValue,Expr_GeneralExpression)
+
 Expr_NumericValue::Expr_NumericValue(const Standard_Real val)
 {
   myValue = val;
diff --git a/src/Expr/Expr_NumericValue.hxx b/src/Expr/Expr_NumericValue.hxx
index 5d6c3c829e..7620c2399e 100644
--- a/src/Expr/Expr_NumericValue.hxx
+++ b/src/Expr/Expr_NumericValue.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_NumericValue,Expr_GeneralExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_NumericValue,Expr_GeneralExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_PolyExpression.cxx b/src/Expr/Expr_PolyExpression.cxx
index b10834ec43..186a1cba48 100644
--- a/src/Expr/Expr_PolyExpression.cxx
+++ b/src/Expr/Expr_PolyExpression.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_PolyExpression,Expr_GeneralExpression)
+
 Expr_PolyExpression::Expr_PolyExpression()
 {
 }
diff --git a/src/Expr/Expr_PolyExpression.hxx b/src/Expr/Expr_PolyExpression.hxx
index 33f3263b16..b3e3b495b9 100644
--- a/src/Expr/Expr_PolyExpression.hxx
+++ b/src/Expr/Expr_PolyExpression.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_PolyExpression,Expr_GeneralExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_PolyExpression,Expr_GeneralExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_PolyFunction.cxx b/src/Expr/Expr_PolyFunction.cxx
index e83235df12..61f1544a8a 100644
--- a/src/Expr/Expr_PolyFunction.cxx
+++ b/src/Expr/Expr_PolyFunction.cxx
@@ -38,6 +38,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_PolyFunction,Expr_PolyExpression)
+
 Expr_PolyFunction::Expr_PolyFunction (const Handle(Expr_GeneralFunction)& func, const Expr_Array1OfGeneralExpression& exps)
 {
   for (Standard_Integer i=exps.Lower();i <= exps.Upper(); i++) {
diff --git a/src/Expr/Expr_PolyFunction.hxx b/src/Expr/Expr_PolyFunction.hxx
index 7b9d40dcf9..98d24a8f10 100644
--- a/src/Expr/Expr_PolyFunction.hxx
+++ b/src/Expr/Expr_PolyFunction.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_PolyFunction,Expr_PolyExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_PolyFunction,Expr_PolyExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Product.cxx b/src/Expr/Expr_Product.cxx
index 155230a93a..2aca663460 100644
--- a/src/Expr/Expr_Product.cxx
+++ b/src/Expr/Expr_Product.cxx
@@ -34,6 +34,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Product,Expr_PolyExpression)
+
 Expr_Product::Expr_Product (const Expr_SequenceOfGeneralExpression& exps)
 {
   Standard_Integer i;
diff --git a/src/Expr/Expr_Product.hxx b/src/Expr/Expr_Product.hxx
index d23187ed7b..c459f8d0c0 100644
--- a/src/Expr/Expr_Product.hxx
+++ b/src/Expr/Expr_Product.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Product,Expr_PolyExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Product,Expr_PolyExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Sign.cxx b/src/Expr/Expr_Sign.cxx
index 0c512dee08..2f18b9b868 100644
--- a/src/Expr/Expr_Sign.cxx
+++ b/src/Expr/Expr_Sign.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Sign,Expr_UnaryExpression)
+
 Expr_Sign::Expr_Sign (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Sign.hxx b/src/Expr/Expr_Sign.hxx
index bb6200d437..378619a2a6 100644
--- a/src/Expr/Expr_Sign.hxx
+++ b/src/Expr/Expr_Sign.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Sign,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Sign,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Sine.cxx b/src/Expr/Expr_Sine.cxx
index ca2bfe7ade..c05d550304 100644
--- a/src/Expr/Expr_Sine.cxx
+++ b/src/Expr/Expr_Sine.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Sine,Expr_UnaryExpression)
+
 Expr_Sine::Expr_Sine(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Sine.hxx b/src/Expr/Expr_Sine.hxx
index d004558cb8..99e913ee7e 100644
--- a/src/Expr/Expr_Sine.hxx
+++ b/src/Expr/Expr_Sine.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Sine,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Sine,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_SingleRelation.cxx b/src/Expr/Expr_SingleRelation.cxx
index 8fc247c162..4a29c108b0 100644
--- a/src/Expr/Expr_SingleRelation.cxx
+++ b/src/Expr/Expr_SingleRelation.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_SingleRelation,Expr_GeneralRelation)
+
 void Expr_SingleRelation::SetFirstMember (const Handle(Expr_GeneralExpression)& exp)
 {
   myFirstMember = exp;
diff --git a/src/Expr/Expr_SingleRelation.hxx b/src/Expr/Expr_SingleRelation.hxx
index 99a30707b8..d6455ce3c0 100644
--- a/src/Expr/Expr_SingleRelation.hxx
+++ b/src/Expr/Expr_SingleRelation.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_SingleRelation,Expr_GeneralRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_SingleRelation,Expr_GeneralRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_Sinh.cxx b/src/Expr/Expr_Sinh.cxx
index 5bad7434e4..0e72534e92 100644
--- a/src/Expr/Expr_Sinh.cxx
+++ b/src/Expr/Expr_Sinh.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Sinh,Expr_UnaryExpression)
+
 Expr_Sinh::Expr_Sinh(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Sinh.hxx b/src/Expr/Expr_Sinh.hxx
index 54749ac015..62605d0cb7 100644
--- a/src/Expr/Expr_Sinh.hxx
+++ b/src/Expr/Expr_Sinh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Sinh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Sinh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Square.cxx b/src/Expr/Expr_Square.cxx
index 109a8996bb..5a8e136a95 100644
--- a/src/Expr/Expr_Square.cxx
+++ b/src/Expr/Expr_Square.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Square,Expr_UnaryExpression)
+
 Expr_Square::Expr_Square (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Square.hxx b/src/Expr/Expr_Square.hxx
index c5ac1633f8..e8140110f5 100644
--- a/src/Expr/Expr_Square.hxx
+++ b/src/Expr/Expr_Square.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Square,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Square,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_SquareRoot.cxx b/src/Expr/Expr_SquareRoot.cxx
index ba222d45c6..d99d65d155 100644
--- a/src/Expr/Expr_SquareRoot.cxx
+++ b/src/Expr/Expr_SquareRoot.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_SquareRoot,Expr_UnaryExpression)
+
 Expr_SquareRoot::Expr_SquareRoot (const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_SquareRoot.hxx b/src/Expr/Expr_SquareRoot.hxx
index d8b277e7cd..8883d9d899 100644
--- a/src/Expr/Expr_SquareRoot.hxx
+++ b/src/Expr/Expr_SquareRoot.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_SquareRoot,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_SquareRoot,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Sum.cxx b/src/Expr/Expr_Sum.cxx
index 6ef8f6b9fb..b1aa2b6955 100644
--- a/src/Expr/Expr_Sum.cxx
+++ b/src/Expr/Expr_Sum.cxx
@@ -32,6 +32,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Sum,Expr_PolyExpression)
+
 Expr_Sum::Expr_Sum (const Expr_SequenceOfGeneralExpression& exps)
 {
   Standard_Integer i;
diff --git a/src/Expr/Expr_Sum.hxx b/src/Expr/Expr_Sum.hxx
index 284c6c782b..4d793dcc0a 100644
--- a/src/Expr/Expr_Sum.hxx
+++ b/src/Expr/Expr_Sum.hxx
@@ -84,7 +84,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Sum,Expr_PolyExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Sum,Expr_PolyExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_SystemRelation.cxx b/src/Expr/Expr_SystemRelation.cxx
index f9c6017221..a754e95cf5 100644
--- a/src/Expr/Expr_SystemRelation.cxx
+++ b/src/Expr/Expr_SystemRelation.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_SystemRelation,Expr_GeneralRelation)
+
 Expr_SystemRelation::Expr_SystemRelation (const Handle(Expr_GeneralRelation)& relation)
 {
   myRelations.Append(relation);
diff --git a/src/Expr/Expr_SystemRelation.hxx b/src/Expr/Expr_SystemRelation.hxx
index 767dfdcc70..cf23653ef2 100644
--- a/src/Expr/Expr_SystemRelation.hxx
+++ b/src/Expr/Expr_SystemRelation.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_SystemRelation,Expr_GeneralRelation)
+  DEFINE_STANDARD_RTTIEXT(Expr_SystemRelation,Expr_GeneralRelation)
 
 protected:
 
diff --git a/src/Expr/Expr_Tangent.cxx b/src/Expr/Expr_Tangent.cxx
index 81c4e35588..9ee8572442 100644
--- a/src/Expr/Expr_Tangent.cxx
+++ b/src/Expr/Expr_Tangent.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Tangent,Expr_UnaryExpression)
+
 Expr_Tangent::Expr_Tangent(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Tangent.hxx b/src/Expr/Expr_Tangent.hxx
index faf8d9d591..665c8ca7a3 100644
--- a/src/Expr/Expr_Tangent.hxx
+++ b/src/Expr/Expr_Tangent.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Tangent,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Tangent,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_Tanh.cxx b/src/Expr/Expr_Tanh.cxx
index b90ec02016..788f3ffd7e 100644
--- a/src/Expr/Expr_Tanh.cxx
+++ b/src/Expr/Expr_Tanh.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_Tanh,Expr_UnaryExpression)
+
 Expr_Tanh::Expr_Tanh(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_Tanh.hxx b/src/Expr/Expr_Tanh.hxx
index 533cc690b9..f0399d12e9 100644
--- a/src/Expr/Expr_Tanh.hxx
+++ b/src/Expr/Expr_Tanh.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_Tanh,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_Tanh,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_UnaryExpression.cxx b/src/Expr/Expr_UnaryExpression.cxx
index d8d790a8d3..4266037faf 100644
--- a/src/Expr/Expr_UnaryExpression.cxx
+++ b/src/Expr/Expr_UnaryExpression.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_UnaryExpression,Expr_GeneralExpression)
+
 void Expr_UnaryExpression::SetOperand (const Handle(Expr_GeneralExpression)& exp)
 {
   Handle(Expr_UnaryExpression) me = this;
diff --git a/src/Expr/Expr_UnaryExpression.hxx b/src/Expr/Expr_UnaryExpression.hxx
index db2df830e3..ea98ff47b1 100644
--- a/src/Expr/Expr_UnaryExpression.hxx
+++ b/src/Expr/Expr_UnaryExpression.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_UnaryExpression,Expr_GeneralExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_UnaryExpression,Expr_GeneralExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_UnaryFunction.cxx b/src/Expr/Expr_UnaryFunction.cxx
index 1e28ce848b..d6d431ec5f 100644
--- a/src/Expr/Expr_UnaryFunction.cxx
+++ b/src/Expr/Expr_UnaryFunction.cxx
@@ -37,6 +37,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_UnaryFunction,Expr_UnaryExpression)
+
 Expr_UnaryFunction::Expr_UnaryFunction (const Handle(Expr_GeneralFunction)& func, const Handle(Expr_GeneralExpression)& exp)
 {
   if (func->NbOfVariables() != 1) {
diff --git a/src/Expr/Expr_UnaryFunction.hxx b/src/Expr/Expr_UnaryFunction.hxx
index edafc730df..031aafd820 100644
--- a/src/Expr/Expr_UnaryFunction.hxx
+++ b/src/Expr/Expr_UnaryFunction.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_UnaryFunction,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_UnaryFunction,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/Expr/Expr_UnaryMinus.cxx b/src/Expr/Expr_UnaryMinus.cxx
index 9a273ad386..25ffe63bad 100644
--- a/src/Expr/Expr_UnaryMinus.cxx
+++ b/src/Expr/Expr_UnaryMinus.cxx
@@ -27,6 +27,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Expr_UnaryMinus,Expr_UnaryExpression)
+
 Expr_UnaryMinus::Expr_UnaryMinus(const Handle(Expr_GeneralExpression)& exp)
 {
   CreateOperand(exp);
diff --git a/src/Expr/Expr_UnaryMinus.hxx b/src/Expr/Expr_UnaryMinus.hxx
index ad3f9fb071..0c07732585 100644
--- a/src/Expr/Expr_UnaryMinus.hxx
+++ b/src/Expr/Expr_UnaryMinus.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Expr_UnaryMinus,Expr_UnaryExpression)
+  DEFINE_STANDARD_RTTIEXT(Expr_UnaryMinus,Expr_UnaryExpression)
 
 protected:
 
diff --git a/src/ExprIntrp/ExprIntrp_GenExp.cxx b/src/ExprIntrp/ExprIntrp_GenExp.cxx
index 87450e714f..593b54f823 100644
--- a/src/ExprIntrp/ExprIntrp_GenExp.cxx
+++ b/src/ExprIntrp/ExprIntrp_GenExp.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ExprIntrp_GenExp,ExprIntrp_Generator)
+
 ExprIntrp_GenExp::ExprIntrp_GenExp ()
 {
   done = Standard_False;
diff --git a/src/ExprIntrp/ExprIntrp_GenExp.hxx b/src/ExprIntrp/ExprIntrp_GenExp.hxx
index 641dadc2e8..fc71d36736 100644
--- a/src/ExprIntrp/ExprIntrp_GenExp.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenExp.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ExprIntrp_GenExp,ExprIntrp_Generator)
+  DEFINE_STANDARD_RTTIEXT(ExprIntrp_GenExp,ExprIntrp_Generator)
 
 protected:
 
diff --git a/src/ExprIntrp/ExprIntrp_GenFct.cxx b/src/ExprIntrp/ExprIntrp_GenFct.cxx
index 39ee8d4410..8a6fcf2fd5 100644
--- a/src/ExprIntrp/ExprIntrp_GenFct.cxx
+++ b/src/ExprIntrp/ExprIntrp_GenFct.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ExprIntrp_GenFct,ExprIntrp_Generator)
+
 ExprIntrp_GenFct::ExprIntrp_GenFct ()
 {
   done = Standard_False;
diff --git a/src/ExprIntrp/ExprIntrp_GenFct.hxx b/src/ExprIntrp/ExprIntrp_GenFct.hxx
index 4c5f15534c..31dc38c990 100644
--- a/src/ExprIntrp/ExprIntrp_GenFct.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenFct.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ExprIntrp_GenFct,ExprIntrp_Generator)
+  DEFINE_STANDARD_RTTIEXT(ExprIntrp_GenFct,ExprIntrp_Generator)
 
 protected:
 
diff --git a/src/ExprIntrp/ExprIntrp_GenRel.cxx b/src/ExprIntrp/ExprIntrp_GenRel.cxx
index 4342f3a2ef..c101950d7b 100644
--- a/src/ExprIntrp/ExprIntrp_GenRel.cxx
+++ b/src/ExprIntrp/ExprIntrp_GenRel.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ExprIntrp_GenRel,ExprIntrp_Generator)
+
 ExprIntrp_GenRel::ExprIntrp_GenRel ()
 {
   done = Standard_False;
diff --git a/src/ExprIntrp/ExprIntrp_GenRel.hxx b/src/ExprIntrp/ExprIntrp_GenRel.hxx
index e2abbba00f..efe7bb62ef 100644
--- a/src/ExprIntrp/ExprIntrp_GenRel.hxx
+++ b/src/ExprIntrp/ExprIntrp_GenRel.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ExprIntrp_GenRel,ExprIntrp_Generator)
+  DEFINE_STANDARD_RTTIEXT(ExprIntrp_GenRel,ExprIntrp_Generator)
 
 protected:
 
diff --git a/src/ExprIntrp/ExprIntrp_Generator.cxx b/src/ExprIntrp/ExprIntrp_Generator.cxx
index b9cfcb6807..531a49992c 100644
--- a/src/ExprIntrp/ExprIntrp_Generator.cxx
+++ b/src/ExprIntrp/ExprIntrp_Generator.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ExprIntrp_Generator,MMgt_TShared)
+
 //#include <ExprIntrp_yaccanal.hxx>
 Standard_EXPORT ExprIntrp_Analysis ExprIntrp_Recept;
 
diff --git a/src/ExprIntrp/ExprIntrp_Generator.hxx b/src/ExprIntrp/ExprIntrp_Generator.hxx
index 4888a1fa29..fccc2f04a9 100644
--- a/src/ExprIntrp/ExprIntrp_Generator.hxx
+++ b/src/ExprIntrp/ExprIntrp_Generator.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ExprIntrp_Generator,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ExprIntrp_Generator,MMgt_TShared)
 
 protected:
 
diff --git a/src/Extrema/Extrema_ExtPExtS.cxx b/src/Extrema/Extrema_ExtPExtS.cxx
index 2def513f06..02ae328ed8 100644
--- a/src/Extrema/Extrema_ExtPExtS.cxx
+++ b/src/Extrema/Extrema_ExtPExtS.cxx
@@ -36,6 +36,8 @@
 #include <GeomAdaptor_HSurfaceOfLinearExtrusion.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Extrema_ExtPExtS,Standard_Transient)
+
 static gp_Ax2 GetPosition (const Handle(Adaptor3d_HCurve)& C);
      
 static void PerformExtPElC (Extrema_ExtPElC& E,
diff --git a/src/Extrema/Extrema_ExtPExtS.hxx b/src/Extrema/Extrema_ExtPExtS.hxx
index de4ca15d6d..426a41c47d 100644
--- a/src/Extrema/Extrema_ExtPExtS.hxx
+++ b/src/Extrema/Extrema_ExtPExtS.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Extrema_ExtPExtS,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Extrema_ExtPExtS,Standard_Transient)
 
 protected:
 
diff --git a/src/Extrema/Extrema_ExtPRevS.cxx b/src/Extrema/Extrema_ExtPRevS.cxx
index 5990864c94..e92e9d8f6e 100644
--- a/src/Extrema/Extrema_ExtPRevS.cxx
+++ b/src/Extrema/Extrema_ExtPRevS.cxx
@@ -35,6 +35,8 @@
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Extrema_ExtPRevS,Standard_Transient)
+
 static gp_Ax2 GetPosition (const GeomAdaptor_SurfaceOfRevolution& S)//const Handle(Adaptor_HCurve)& C)
 {
   Handle(Adaptor3d_HCurve) C = S.BasisCurve();
diff --git a/src/Extrema/Extrema_ExtPRevS.hxx b/src/Extrema/Extrema_ExtPRevS.hxx
index 84f20c6e23..e6d069d8ac 100644
--- a/src/Extrema/Extrema_ExtPRevS.hxx
+++ b/src/Extrema/Extrema_ExtPRevS.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Extrema_ExtPRevS,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Extrema_ExtPRevS,Standard_Transient)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_Curve.cxx b/src/FEmTool/FEmTool_Curve.cxx
index c68af1978b..5cc1ed5f67 100644
--- a/src/FEmTool/FEmTool_Curve.cxx
+++ b/src/FEmTool/FEmTool_Curve.cxx
@@ -26,6 +26,8 @@
 #include <Standard_DimensionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_Curve,MMgt_TShared)
+
 //=======================================================================
 //function : FEmTool_Curve
 //purpose  :
diff --git a/src/FEmTool/FEmTool_Curve.hxx b/src/FEmTool/FEmTool_Curve.hxx
index 8c23d8fb39..6fe4239cde 100644
--- a/src/FEmTool/FEmTool_Curve.hxx
+++ b/src/FEmTool/FEmTool_Curve.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_Curve,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_Curve,MMgt_TShared)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_ElementaryCriterion.cxx b/src/FEmTool/FEmTool_ElementaryCriterion.cxx
index 48f160d783..8d9fe22541 100644
--- a/src/FEmTool/FEmTool_ElementaryCriterion.cxx
+++ b/src/FEmTool/FEmTool_ElementaryCriterion.cxx
@@ -21,6 +21,8 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_ElementaryCriterion,MMgt_TShared)
+
 void FEmTool_ElementaryCriterion::Set(const Handle(TColStd_HArray2OfReal)& Coeff) 
 {
   myCoeff = Coeff;
diff --git a/src/FEmTool/FEmTool_ElementaryCriterion.hxx b/src/FEmTool/FEmTool_ElementaryCriterion.hxx
index ad9b86ed0b..c593f592b1 100644
--- a/src/FEmTool/FEmTool_ElementaryCriterion.hxx
+++ b/src/FEmTool/FEmTool_ElementaryCriterion.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_ElementaryCriterion,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_ElementaryCriterion,MMgt_TShared)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_LinearFlexion.cxx b/src/FEmTool/FEmTool_LinearFlexion.cxx
index a4d787603d..d8f57c06e9 100644
--- a/src/FEmTool/FEmTool_LinearFlexion.cxx
+++ b/src/FEmTool/FEmTool_LinearFlexion.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_LinearFlexion,FEmTool_ElementaryCriterion)
+
 //=======================================================================
 //function : FEmTool_LinearFlexion
 //purpose  :
diff --git a/src/FEmTool/FEmTool_LinearFlexion.hxx b/src/FEmTool/FEmTool_LinearFlexion.hxx
index 9bdf421f23..7f5a4a01e0 100644
--- a/src/FEmTool/FEmTool_LinearFlexion.hxx
+++ b/src/FEmTool/FEmTool_LinearFlexion.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_LinearFlexion,FEmTool_ElementaryCriterion)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_LinearFlexion,FEmTool_ElementaryCriterion)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_LinearJerk.cxx b/src/FEmTool/FEmTool_LinearJerk.cxx
index 9e76dcaf5e..ef93fff702 100644
--- a/src/FEmTool/FEmTool_LinearJerk.cxx
+++ b/src/FEmTool/FEmTool_LinearJerk.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_LinearJerk,FEmTool_ElementaryCriterion)
+
 FEmTool_LinearJerk::FEmTool_LinearJerk(const Standard_Integer WorkDegree,
 				       const GeomAbs_Shape ConstraintOrder):
        RefMatrix(0,WorkDegree,0,WorkDegree)
diff --git a/src/FEmTool/FEmTool_LinearJerk.hxx b/src/FEmTool/FEmTool_LinearJerk.hxx
index 4d2e0da27d..ffc487cf29 100644
--- a/src/FEmTool/FEmTool_LinearJerk.hxx
+++ b/src/FEmTool/FEmTool_LinearJerk.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_LinearJerk,FEmTool_ElementaryCriterion)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_LinearJerk,FEmTool_ElementaryCriterion)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_LinearTension.cxx b/src/FEmTool/FEmTool_LinearTension.cxx
index ea7e64f994..c9a32dd2ca 100644
--- a/src/FEmTool/FEmTool_LinearTension.cxx
+++ b/src/FEmTool/FEmTool_LinearTension.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HArray2OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_LinearTension,FEmTool_ElementaryCriterion)
+
 FEmTool_LinearTension::FEmTool_LinearTension(const Standard_Integer WorkDegree,
 					     const GeomAbs_Shape ConstraintOrder):
        RefMatrix(0,WorkDegree,0,WorkDegree)
diff --git a/src/FEmTool/FEmTool_LinearTension.hxx b/src/FEmTool/FEmTool_LinearTension.hxx
index d121a7c8d4..7b64168785 100644
--- a/src/FEmTool/FEmTool_LinearTension.hxx
+++ b/src/FEmTool/FEmTool_LinearTension.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_LinearTension,FEmTool_ElementaryCriterion)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_LinearTension,FEmTool_ElementaryCriterion)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_ProfileMatrix.cxx b/src/FEmTool/FEmTool_ProfileMatrix.cxx
index 87e1bbca75..0295d03de0 100644
--- a/src/FEmTool/FEmTool_ProfileMatrix.cxx
+++ b/src/FEmTool/FEmTool_ProfileMatrix.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_ProfileMatrix,FEmTool_SparseMatrix)
+
 //=======================================================================
 //function : :FEmTool_ProfileMatrix
 //purpose  :
diff --git a/src/FEmTool/FEmTool_ProfileMatrix.hxx b/src/FEmTool/FEmTool_ProfileMatrix.hxx
index f20e69d06f..6ab2cbb6d2 100644
--- a/src/FEmTool/FEmTool_ProfileMatrix.hxx
+++ b/src/FEmTool/FEmTool_ProfileMatrix.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_ProfileMatrix,FEmTool_SparseMatrix)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_ProfileMatrix,FEmTool_SparseMatrix)
 
 protected:
 
diff --git a/src/FEmTool/FEmTool_SparseMatrix.cxx b/src/FEmTool/FEmTool_SparseMatrix.cxx
index 842e86158d..cfe869a2b1 100644
--- a/src/FEmTool/FEmTool_SparseMatrix.cxx
+++ b/src/FEmTool/FEmTool_SparseMatrix.cxx
@@ -18,3 +18,5 @@
 #include <FEmTool_SparseMatrix.hxx>
 #include <Standard_Type.hxx>
 #include <StdFail_NotDone.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(FEmTool_SparseMatrix,MMgt_TShared)
\ No newline at end of file
diff --git a/src/FEmTool/FEmTool_SparseMatrix.hxx b/src/FEmTool/FEmTool_SparseMatrix.hxx
index f725ac3424..18745ba26e 100644
--- a/src/FEmTool/FEmTool_SparseMatrix.hxx
+++ b/src/FEmTool/FEmTool_SparseMatrix.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FEmTool_SparseMatrix,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(FEmTool_SparseMatrix,MMgt_TShared)
 
 protected:
 
diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.cxx b/src/FWOSDriver/FWOSDriver_DriverFactory.cxx
index 80c84d4bf7..18f4ab3a67 100644
--- a/src/FWOSDriver/FWOSDriver_DriverFactory.cxx
+++ b/src/FWOSDriver/FWOSDriver_DriverFactory.cxx
@@ -20,6 +20,8 @@
 #include <FWOSDriver_DriverFactory.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(FWOSDriver_DriverFactory,CDF_MetaDataDriverFactory)
+
 FWOSDriver_DriverFactory::FWOSDriver_DriverFactory(){}
 
 
diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx b/src/FWOSDriver/FWOSDriver_DriverFactory.hxx
index 1ab0e67535..2305300dc4 100644
--- a/src/FWOSDriver/FWOSDriver_DriverFactory.hxx
+++ b/src/FWOSDriver/FWOSDriver_DriverFactory.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(FWOSDriver_DriverFactory,CDF_MetaDataDriverFactory)
+  DEFINE_STANDARD_RTTIEXT(FWOSDriver_DriverFactory,CDF_MetaDataDriverFactory)
 
 protected:
 
diff --git a/src/Font/Font_BRepFont.cxx b/src/Font/Font_BRepFont.cxx
index 128d2b8f35..6ac15ac2c4 100755
--- a/src/Font/Font_BRepFont.cxx
+++ b/src/Font/Font_BRepFont.cxx
@@ -48,6 +48,8 @@
 #include FT_OUTLINE_H
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Font_BRepFont,Font_FTFont)
+
 namespace
 {
   // pre-defined font rendering options
diff --git a/src/Font/Font_BRepFont.hxx b/src/Font/Font_BRepFont.hxx
index e3e5d15aec..9ed0fa77b9 100755
--- a/src/Font/Font_BRepFont.hxx
+++ b/src/Font/Font_BRepFont.hxx
@@ -211,7 +211,7 @@ protected: //! @name Shared temporary variables for glyph construction
 
 public:
 
-  DEFINE_STANDARD_RTTI(Font_BRepFont, Font_FTFont)
+  DEFINE_STANDARD_RTTIEXT(Font_BRepFont,Font_FTFont)
 
 };
 
diff --git a/src/Font/Font_FTFont.cxx b/src/Font/Font_FTFont.cxx
index 6243a5dd3a..22cd8738b5 100755
--- a/src/Font/Font_FTFont.cxx
+++ b/src/Font/Font_FTFont.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Font_FTFont,Standard_Transient)
+
 // =======================================================================
 // function : Font_FTFont
 // purpose  :
diff --git a/src/Font/Font_FTFont.hxx b/src/Font/Font_FTFont.hxx
index 1ddfee0ac6..13b3054567 100755
--- a/src/Font/Font_FTFont.hxx
+++ b/src/Font/Font_FTFont.hxx
@@ -181,7 +181,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Font_FTFont, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Font_FTFont,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Font/Font_FTLibrary.cxx b/src/Font/Font_FTLibrary.cxx
index 53fb363d2f..1b9654238d 100755
--- a/src/Font/Font_FTLibrary.cxx
+++ b/src/Font/Font_FTLibrary.cxx
@@ -16,6 +16,8 @@
 #include <Font_FTLibrary.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Font_FTLibrary,Standard_Transient)
+
 // =======================================================================
 // function : Font_FTLibrary
 // purpose  :
diff --git a/src/Font/Font_FTLibrary.hxx b/src/Font/Font_FTLibrary.hxx
index 55c23546a8..bd7e65ad95 100755
--- a/src/Font/Font_FTLibrary.hxx
+++ b/src/Font/Font_FTLibrary.hxx
@@ -59,7 +59,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Font_FTLibrary, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Font_FTLibrary,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Font/Font_FontMgr.cxx b/src/Font/Font_FontMgr.cxx
index 583281121b..edb1cae6b0 100644
--- a/src/Font/Font_FontMgr.cxx
+++ b/src/Font/Font_FontMgr.cxx
@@ -26,6 +26,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+IMPLEMENT_STANDARD_RTTIEXT(Font_FontMgr,MMgt_TShared)
+
 struct Font_FontMgr_FontAliasMapNode
 {
   const char *    EnumName;
diff --git a/src/Font/Font_FontMgr.hxx b/src/Font/Font_FontMgr.hxx
index 087640297c..da8f712c84 100644
--- a/src/Font/Font_FontMgr.hxx
+++ b/src/Font/Font_FontMgr.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Font_FontMgr,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Font_FontMgr,MMgt_TShared)
 
 protected:
 
diff --git a/src/Font/Font_SystemFont.cxx b/src/Font/Font_SystemFont.cxx
index ba2ba7f38b..21d87ff1c6 100644
--- a/src/Font/Font_SystemFont.cxx
+++ b/src/Font/Font_SystemFont.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Font_SystemFont,MMgt_TShared)
+
 Font_SystemFont::Font_SystemFont():
 MyFontName(),
 MyFontAspect(Font_FA_Undefined),
diff --git a/src/Font/Font_SystemFont.hxx b/src/Font/Font_SystemFont.hxx
index 1851ad0123..9d1318fdc3 100644
--- a/src/Font/Font_SystemFont.hxx
+++ b/src/Font/Font_SystemFont.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Font_SystemFont,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Font_SystemFont,MMgt_TShared)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BCirc.cxx b/src/GccInt/GccInt_BCirc.cxx
index 2c94b05032..fc39d280fc 100644
--- a/src/GccInt/GccInt_BCirc.cxx
+++ b/src/GccInt/GccInt_BCirc.cxx
@@ -20,6 +20,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BCirc,GccInt_Bisec)
+
 GccInt_BCirc::
    GccInt_BCirc(const gp_Circ2d& Circ) {
    cir = gp_Circ2d(Circ);
diff --git a/src/GccInt/GccInt_BCirc.hxx b/src/GccInt/GccInt_BCirc.hxx
index b2a4c7e084..77ee34fcf4 100644
--- a/src/GccInt/GccInt_BCirc.hxx
+++ b/src/GccInt/GccInt_BCirc.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BCirc,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BCirc,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BElips.cxx b/src/GccInt/GccInt_BElips.cxx
index 3fc4ed7509..ec68d651e5 100644
--- a/src/GccInt/GccInt_BElips.cxx
+++ b/src/GccInt/GccInt_BElips.cxx
@@ -20,6 +20,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BElips,GccInt_Bisec)
+
 GccInt_BElips::
    GccInt_BElips(const gp_Elips2d& Ellipse) {
    eli = gp_Elips2d(Ellipse);
diff --git a/src/GccInt/GccInt_BElips.hxx b/src/GccInt/GccInt_BElips.hxx
index 0eb0b3c2df..6c024160bc 100644
--- a/src/GccInt/GccInt_BElips.hxx
+++ b/src/GccInt/GccInt_BElips.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BElips,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BElips,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BHyper.cxx b/src/GccInt/GccInt_BHyper.cxx
index cdd8be6e52..82a08083f3 100644
--- a/src/GccInt/GccInt_BHyper.cxx
+++ b/src/GccInt/GccInt_BHyper.cxx
@@ -20,6 +20,8 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BHyper,GccInt_Bisec)
+
 GccInt_BHyper::
    GccInt_BHyper(const gp_Hypr2d& Hyper) {
    hyp = gp_Hypr2d(Hyper);
diff --git a/src/GccInt/GccInt_BHyper.hxx b/src/GccInt/GccInt_BHyper.hxx
index 6e078360c6..7d55e3c1fb 100644
--- a/src/GccInt/GccInt_BHyper.hxx
+++ b/src/GccInt/GccInt_BHyper.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BHyper,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BHyper,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BLine.cxx b/src/GccInt/GccInt_BLine.cxx
index 4382f7119c..65b56f0552 100644
--- a/src/GccInt/GccInt_BLine.cxx
+++ b/src/GccInt/GccInt_BLine.cxx
@@ -20,6 +20,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BLine,GccInt_Bisec)
+
 GccInt_BLine::
    GccInt_BLine(const gp_Lin2d& Line) {
    lin = gp_Lin2d(Line);
diff --git a/src/GccInt/GccInt_BLine.hxx b/src/GccInt/GccInt_BLine.hxx
index 3ab39031eb..3e30595fd2 100644
--- a/src/GccInt/GccInt_BLine.hxx
+++ b/src/GccInt/GccInt_BLine.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BLine,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BLine,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BParab.cxx b/src/GccInt/GccInt_BParab.cxx
index 451cefbd46..74ff3ff098 100644
--- a/src/GccInt/GccInt_BParab.cxx
+++ b/src/GccInt/GccInt_BParab.cxx
@@ -20,6 +20,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BParab,GccInt_Bisec)
+
 GccInt_BParab::
    GccInt_BParab(const gp_Parab2d& Parab) {
    par = gp_Parab2d(Parab);
diff --git a/src/GccInt/GccInt_BParab.hxx b/src/GccInt/GccInt_BParab.hxx
index 354d844773..1411af3b40 100644
--- a/src/GccInt/GccInt_BParab.hxx
+++ b/src/GccInt/GccInt_BParab.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BParab,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BParab,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_BPoint.cxx b/src/GccInt/GccInt_BPoint.cxx
index a713caafad..02772295da 100644
--- a/src/GccInt/GccInt_BPoint.cxx
+++ b/src/GccInt/GccInt_BPoint.cxx
@@ -20,6 +20,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_BPoint,GccInt_Bisec)
+
 GccInt_BPoint::
    GccInt_BPoint(const gp_Pnt2d& Point) {
    pnt = gp_Pnt2d(Point);
diff --git a/src/GccInt/GccInt_BPoint.hxx b/src/GccInt/GccInt_BPoint.hxx
index 3226006f1c..f376254fc1 100644
--- a/src/GccInt/GccInt_BPoint.hxx
+++ b/src/GccInt/GccInt_BPoint.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_BPoint,GccInt_Bisec)
+  DEFINE_STANDARD_RTTIEXT(GccInt_BPoint,GccInt_Bisec)
 
 protected:
 
diff --git a/src/GccInt/GccInt_Bisec.cxx b/src/GccInt/GccInt_Bisec.cxx
index dcb7f639b6..13dd740dfb 100644
--- a/src/GccInt/GccInt_Bisec.cxx
+++ b/src/GccInt/GccInt_Bisec.cxx
@@ -26,6 +26,8 @@
 #include <Standard_NotImplemented.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GccInt_Bisec,MMgt_TShared)
+
 gp_Circ2d GccInt_Bisec::
   Circle() const { 
     Standard_NotImplemented::Raise();
diff --git a/src/GccInt/GccInt_Bisec.hxx b/src/GccInt/GccInt_Bisec.hxx
index 6d74ef06e0..91c0d56cdd 100644
--- a/src/GccInt/GccInt_Bisec.hxx
+++ b/src/GccInt/GccInt_Bisec.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GccInt_Bisec,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GccInt_Bisec,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom/Geom_Axis1Placement.cxx b/src/Geom/Geom_Axis1Placement.cxx
index 044226a1d3..ac1f2e1cc9 100644
--- a/src/Geom/Geom_Axis1Placement.cxx
+++ b/src/Geom/Geom_Axis1Placement.cxx
@@ -23,6 +23,8 @@
 #include <gp_Trsf.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Axis1Placement,Geom_AxisPlacement)
+
 typedef Geom_Axis1Placement         Axis1Placement;
 typedef gp_Ax2  Ax2;
 typedef gp_Dir  Dir;
diff --git a/src/Geom/Geom_Axis1Placement.hxx b/src/Geom/Geom_Axis1Placement.hxx
index 847960fc57..0e57a490f5 100644
--- a/src/Geom/Geom_Axis1Placement.hxx
+++ b/src/Geom/Geom_Axis1Placement.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Axis1Placement,Geom_AxisPlacement)
+  DEFINE_STANDARD_RTTIEXT(Geom_Axis1Placement,Geom_AxisPlacement)
 
 protected:
 
diff --git a/src/Geom/Geom_Axis2Placement.cxx b/src/Geom/Geom_Axis2Placement.cxx
index 2fbfdf4ce2..036e88fcee 100644
--- a/src/Geom/Geom_Axis2Placement.cxx
+++ b/src/Geom/Geom_Axis2Placement.cxx
@@ -24,6 +24,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Axis2Placement,Geom_AxisPlacement)
+
 typedef Geom_Axis2Placement Axis2Placement;
 typedef gp_Ax1  Ax1;
 typedef gp_Dir  Dir;
diff --git a/src/Geom/Geom_Axis2Placement.hxx b/src/Geom/Geom_Axis2Placement.hxx
index 6d87fcd4d9..813e904f07 100644
--- a/src/Geom/Geom_Axis2Placement.hxx
+++ b/src/Geom/Geom_Axis2Placement.hxx
@@ -132,7 +132,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Axis2Placement,Geom_AxisPlacement)
+  DEFINE_STANDARD_RTTIEXT(Geom_Axis2Placement,Geom_AxisPlacement)
 
 protected:
 
diff --git a/src/Geom/Geom_AxisPlacement.cxx b/src/Geom/Geom_AxisPlacement.cxx
index 543a19535f..78d25142bd 100644
--- a/src/Geom/Geom_AxisPlacement.cxx
+++ b/src/Geom/Geom_AxisPlacement.cxx
@@ -22,6 +22,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_AxisPlacement,Geom_Geometry)
+
 typedef gp_Ax1 Ax1;
 typedef gp_Dir Dir;
 typedef gp_Pnt Pnt;
diff --git a/src/Geom/Geom_AxisPlacement.hxx b/src/Geom/Geom_AxisPlacement.hxx
index 77b5f128b7..f5b4407189 100644
--- a/src/Geom/Geom_AxisPlacement.hxx
+++ b/src/Geom/Geom_AxisPlacement.hxx
@@ -111,7 +111,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_AxisPlacement,Geom_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom_AxisPlacement,Geom_Geometry)
 
 protected:
 
diff --git a/src/Geom/Geom_BSplineCurve.cxx b/src/Geom/Geom_BSplineCurve.cxx
index 286ffcc689..e7e9118783 100644
--- a/src/Geom/Geom_BSplineCurve.cxx
+++ b/src/Geom/Geom_BSplineCurve.cxx
@@ -51,6 +51,8 @@
 #include <Standard_Real.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BSplineCurve,Geom_BoundedCurve)
+
 //=======================================================================
 //function : CheckCurveData
 //purpose  : Internal use only
diff --git a/src/Geom/Geom_BSplineCurve.hxx b/src/Geom/Geom_BSplineCurve.hxx
index 1f7830f531..9e82fe5af3 100644
--- a/src/Geom/Geom_BSplineCurve.hxx
+++ b/src/Geom/Geom_BSplineCurve.hxx
@@ -797,7 +797,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BSplineCurve,Geom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom_BSplineCurve,Geom_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom/Geom_BSplineSurface.cxx b/src/Geom/Geom_BSplineSurface.cxx
index 5a854e9368..0696f6e994 100644
--- a/src/Geom/Geom_BSplineSurface.cxx
+++ b/src/Geom/Geom_BSplineSurface.cxx
@@ -43,6 +43,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BSplineSurface,Geom_BoundedSurface)
+
 //=======================================================================
 //function : CheckSurfaceData
 //purpose  : Internal use only.
diff --git a/src/Geom/Geom_BSplineSurface.hxx b/src/Geom/Geom_BSplineSurface.hxx
index 725d057c42..e0a7a208b8 100644
--- a/src/Geom/Geom_BSplineSurface.hxx
+++ b/src/Geom/Geom_BSplineSurface.hxx
@@ -1195,7 +1195,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BSplineSurface,Geom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_BSplineSurface,Geom_BoundedSurface)
 
 protected:
 
diff --git a/src/Geom/Geom_BezierCurve.cxx b/src/Geom/Geom_BezierCurve.cxx
index 4490d4d9bd..c379a60597 100644
--- a/src/Geom/Geom_BezierCurve.cxx
+++ b/src/Geom/Geom_BezierCurve.cxx
@@ -43,6 +43,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BezierCurve,Geom_BoundedCurve)
+
 //=======================================================================
 //function : Rational
 //purpose  : check rationality of an array of weights
diff --git a/src/Geom/Geom_BezierCurve.hxx b/src/Geom/Geom_BezierCurve.hxx
index c143b47e90..b186aa256a 100644
--- a/src/Geom/Geom_BezierCurve.hxx
+++ b/src/Geom/Geom_BezierCurve.hxx
@@ -336,7 +336,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BezierCurve,Geom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom_BezierCurve,Geom_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom/Geom_BezierSurface.cxx b/src/Geom/Geom_BezierSurface.cxx
index a4a34e642c..587d6121b5 100644
--- a/src/Geom/Geom_BezierSurface.cxx
+++ b/src/Geom/Geom_BezierSurface.cxx
@@ -46,6 +46,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BezierSurface,Geom_BoundedSurface)
+
 //=======================================================================
 //function : Rational
 //purpose  : check rationality of an array of weights
diff --git a/src/Geom/Geom_BezierSurface.hxx b/src/Geom/Geom_BezierSurface.hxx
index 79ed96d643..351121e09d 100644
--- a/src/Geom/Geom_BezierSurface.hxx
+++ b/src/Geom/Geom_BezierSurface.hxx
@@ -586,7 +586,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BezierSurface,Geom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_BezierSurface,Geom_BoundedSurface)
 
 protected:
 
diff --git a/src/Geom/Geom_BoundedCurve.cxx b/src/Geom/Geom_BoundedCurve.cxx
index 4dfd53c5fa..8dffe7a043 100644
--- a/src/Geom/Geom_BoundedCurve.cxx
+++ b/src/Geom/Geom_BoundedCurve.cxx
@@ -18,3 +18,5 @@
 #include <Geom_BoundedCurve.hxx>
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BoundedCurve,Geom_Curve)
\ No newline at end of file
diff --git a/src/Geom/Geom_BoundedCurve.hxx b/src/Geom/Geom_BoundedCurve.hxx
index 64af8bdd86..7af31bd6d2 100644
--- a/src/Geom/Geom_BoundedCurve.hxx
+++ b/src/Geom/Geom_BoundedCurve.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BoundedCurve,Geom_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom_BoundedCurve,Geom_Curve)
 
 protected:
 
diff --git a/src/Geom/Geom_BoundedSurface.cxx b/src/Geom/Geom_BoundedSurface.cxx
index f5910a94d5..13a2621843 100644
--- a/src/Geom/Geom_BoundedSurface.cxx
+++ b/src/Geom/Geom_BoundedSurface.cxx
@@ -17,3 +17,5 @@
 
 #include <Geom_BoundedSurface.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Geom_BoundedSurface,Geom_Surface)
\ No newline at end of file
diff --git a/src/Geom/Geom_BoundedSurface.hxx b/src/Geom/Geom_BoundedSurface.hxx
index 0213f5a024..c15b4cbb79 100644
--- a/src/Geom/Geom_BoundedSurface.hxx
+++ b/src/Geom/Geom_BoundedSurface.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_BoundedSurface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(Geom_BoundedSurface,Geom_Surface)
 
 protected:
 
diff --git a/src/Geom/Geom_CartesianPoint.cxx b/src/Geom/Geom_CartesianPoint.cxx
index bcf3bf501f..40761e7af7 100644
--- a/src/Geom/Geom_CartesianPoint.cxx
+++ b/src/Geom/Geom_CartesianPoint.cxx
@@ -21,6 +21,8 @@
 #include <gp_Trsf.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_CartesianPoint,Geom_Point)
+
 typedef Geom_CartesianPoint         CartesianPoint;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_CartesianPoint.hxx b/src/Geom/Geom_CartesianPoint.hxx
index ec99c80b66..417e6b2cd4 100644
--- a/src/Geom/Geom_CartesianPoint.hxx
+++ b/src/Geom/Geom_CartesianPoint.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_CartesianPoint,Geom_Point)
+  DEFINE_STANDARD_RTTIEXT(Geom_CartesianPoint,Geom_Point)
 
 protected:
 
diff --git a/src/Geom/Geom_Circle.cxx b/src/Geom/Geom_Circle.cxx
index be1244158a..eb8da30949 100644
--- a/src/Geom/Geom_Circle.cxx
+++ b/src/Geom/Geom_Circle.cxx
@@ -28,6 +28,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Circle,Geom_Conic)
+
 typedef Geom_Circle         Circle;
 typedef gp_Ax2  Ax2;
 typedef gp_Pnt  Pnt;
diff --git a/src/Geom/Geom_Circle.hxx b/src/Geom/Geom_Circle.hxx
index 36035c09f0..4b75cb1f35 100644
--- a/src/Geom/Geom_Circle.hxx
+++ b/src/Geom/Geom_Circle.hxx
@@ -161,7 +161,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Circle,Geom_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom_Circle,Geom_Conic)
 
 protected:
 
diff --git a/src/Geom/Geom_Conic.cxx b/src/Geom/Geom_Conic.cxx
index 3de92f23d6..c5a12b6cad 100644
--- a/src/Geom/Geom_Conic.cxx
+++ b/src/Geom/Geom_Conic.cxx
@@ -24,6 +24,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Conic,Geom_Curve)
+
 typedef Geom_Conic         Conic;
 typedef gp_Ax1 Ax1;
 typedef gp_Ax2 Ax2;
diff --git a/src/Geom/Geom_Conic.hxx b/src/Geom/Geom_Conic.hxx
index 649c7f1c3b..7dad5062b8 100644
--- a/src/Geom/Geom_Conic.hxx
+++ b/src/Geom/Geom_Conic.hxx
@@ -139,7 +139,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Conic,Geom_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom_Conic,Geom_Curve)
 
 protected:
 
diff --git a/src/Geom/Geom_ConicalSurface.cxx b/src/Geom/Geom_ConicalSurface.cxx
index d3754312ab..2f7292fc61 100644
--- a/src/Geom/Geom_ConicalSurface.cxx
+++ b/src/Geom/Geom_ConicalSurface.cxx
@@ -39,6 +39,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_ConicalSurface,Geom_ElementarySurface)
+
 typedef Geom_ConicalSurface         ConicalSurface;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_ConicalSurface.hxx b/src/Geom/Geom_ConicalSurface.hxx
index fb653d550e..40ac5b531a 100644
--- a/src/Geom/Geom_ConicalSurface.hxx
+++ b/src/Geom/Geom_ConicalSurface.hxx
@@ -282,7 +282,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_ConicalSurface,Geom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_ConicalSurface,Geom_ElementarySurface)
 
 protected:
 
diff --git a/src/Geom/Geom_Curve.cxx b/src/Geom/Geom_Curve.cxx
index c4628aa191..6f0ba329a5 100644
--- a/src/Geom/Geom_Curve.cxx
+++ b/src/Geom/Geom_Curve.cxx
@@ -25,6 +25,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Curve,Geom_Geometry)
+
 typedef Geom_Curve         Curve;
 
 //=======================================================================
diff --git a/src/Geom/Geom_Curve.hxx b/src/Geom/Geom_Curve.hxx
index c6a6ff5b1d..4cacecc422 100644
--- a/src/Geom/Geom_Curve.hxx
+++ b/src/Geom/Geom_Curve.hxx
@@ -228,7 +228,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Curve,Geom_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom_Curve,Geom_Geometry)
 
 protected:
 
diff --git a/src/Geom/Geom_CylindricalSurface.cxx b/src/Geom/Geom_CylindricalSurface.cxx
index 4fd3092b26..bb01d90da0 100644
--- a/src/Geom/Geom_CylindricalSurface.cxx
+++ b/src/Geom/Geom_CylindricalSurface.cxx
@@ -38,6 +38,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_CylindricalSurface,Geom_ElementarySurface)
+
 typedef Geom_CylindricalSurface         CylindricalSurface;
 
 typedef gp_Ax1  Ax1;
diff --git a/src/Geom/Geom_CylindricalSurface.hxx b/src/Geom/Geom_CylindricalSurface.hxx
index 11de92af51..8f4ae4dabc 100644
--- a/src/Geom/Geom_CylindricalSurface.hxx
+++ b/src/Geom/Geom_CylindricalSurface.hxx
@@ -215,7 +215,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_CylindricalSurface,Geom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_CylindricalSurface,Geom_ElementarySurface)
 
 protected:
 
diff --git a/src/Geom/Geom_Direction.cxx b/src/Geom/Geom_Direction.cxx
index f6fe6d7dcc..7d7aa40433 100644
--- a/src/Geom/Geom_Direction.cxx
+++ b/src/Geom/Geom_Direction.cxx
@@ -24,6 +24,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Direction,Geom_Vector)
+
 typedef Geom_Direction         Direction;
 typedef Geom_Vector            Vector;
 typedef gp_Ax1  Ax1;
diff --git a/src/Geom/Geom_Direction.hxx b/src/Geom/Geom_Direction.hxx
index c428a16aea..a06579e96d 100644
--- a/src/Geom/Geom_Direction.hxx
+++ b/src/Geom/Geom_Direction.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Direction,Geom_Vector)
+  DEFINE_STANDARD_RTTIEXT(Geom_Direction,Geom_Vector)
 
 protected:
 
diff --git a/src/Geom/Geom_ElementarySurface.cxx b/src/Geom/Geom_ElementarySurface.cxx
index 0b944eb0b9..a111852617 100644
--- a/src/Geom/Geom_ElementarySurface.cxx
+++ b/src/Geom/Geom_ElementarySurface.cxx
@@ -22,6 +22,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_ElementarySurface,Geom_Surface)
+
 typedef Geom_ElementarySurface         ElementarySurface;
 typedef gp_Ax1 Ax1;
 typedef gp_Ax2 Ax2;
diff --git a/src/Geom/Geom_ElementarySurface.hxx b/src/Geom/Geom_ElementarySurface.hxx
index a77b0669fd..ef82db27a8 100644
--- a/src/Geom/Geom_ElementarySurface.hxx
+++ b/src/Geom/Geom_ElementarySurface.hxx
@@ -142,7 +142,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_ElementarySurface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(Geom_ElementarySurface,Geom_Surface)
 
 protected:
 
diff --git a/src/Geom/Geom_Ellipse.cxx b/src/Geom/Geom_Ellipse.cxx
index 12784f1fce..89b02897e6 100644
--- a/src/Geom/Geom_Ellipse.cxx
+++ b/src/Geom/Geom_Ellipse.cxx
@@ -29,6 +29,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Ellipse,Geom_Conic)
+
 typedef Geom_Ellipse         Ellipse;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_Ellipse.hxx b/src/Geom/Geom_Ellipse.hxx
index 6f1c944f55..845c1a76b6 100644
--- a/src/Geom/Geom_Ellipse.hxx
+++ b/src/Geom/Geom_Ellipse.hxx
@@ -223,7 +223,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Ellipse,Geom_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom_Ellipse,Geom_Conic)
 
 protected:
 
diff --git a/src/Geom/Geom_Geometry.cxx b/src/Geom/Geom_Geometry.cxx
index 72f7ca03a4..43d963a6c6 100644
--- a/src/Geom/Geom_Geometry.cxx
+++ b/src/Geom/Geom_Geometry.cxx
@@ -25,6 +25,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Geometry,MMgt_TShared)
+
 typedef Geom_Geometry         Geometry;
 typedef gp_Pnt                Pnt;
 typedef gp_Vec                Vec;
diff --git a/src/Geom/Geom_Geometry.hxx b/src/Geom/Geom_Geometry.hxx
index b06b5bd8a7..7dcc266b64 100644
--- a/src/Geom/Geom_Geometry.hxx
+++ b/src/Geom/Geom_Geometry.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Geometry,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Geom_Geometry,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom/Geom_Hyperbola.cxx b/src/Geom/Geom_Hyperbola.cxx
index e46492689f..f46cc92f11 100644
--- a/src/Geom/Geom_Hyperbola.cxx
+++ b/src/Geom/Geom_Hyperbola.cxx
@@ -31,6 +31,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Hyperbola,Geom_Conic)
+
 typedef Geom_Hyperbola         Hyperbola;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_Hyperbola.hxx b/src/Geom/Geom_Hyperbola.hxx
index 8ea9622645..19023092b0 100644
--- a/src/Geom/Geom_Hyperbola.hxx
+++ b/src/Geom/Geom_Hyperbola.hxx
@@ -279,7 +279,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Hyperbola,Geom_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom_Hyperbola,Geom_Conic)
 
 protected:
 
diff --git a/src/Geom/Geom_Line.cxx b/src/Geom/Geom_Line.cxx
index af2ad088b3..de103abf45 100644
--- a/src/Geom/Geom_Line.cxx
+++ b/src/Geom/Geom_Line.cxx
@@ -29,6 +29,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Line,Geom_Curve)
+
 //=======================================================================
 //function : Copy
 //purpose  : 
diff --git a/src/Geom/Geom_Line.hxx b/src/Geom/Geom_Line.hxx
index da629f99e2..77355dbec8 100644
--- a/src/Geom/Geom_Line.hxx
+++ b/src/Geom/Geom_Line.hxx
@@ -182,7 +182,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Line,Geom_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom_Line,Geom_Curve)
 
 protected:
 
diff --git a/src/Geom/Geom_OffsetCurve.hxx b/src/Geom/Geom_OffsetCurve.hxx
index 38b0fec7cf..a195a85e92 100644
--- a/src/Geom/Geom_OffsetCurve.hxx
+++ b/src/Geom/Geom_OffsetCurve.hxx
@@ -284,7 +284,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_OffsetCurve,Geom_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom_OffsetCurve,Geom_Curve)
 
 protected:
 
diff --git a/src/Geom/Geom_OffsetSurface.cxx b/src/Geom/Geom_OffsetSurface.cxx
index 2a02f62d50..9eda42ef14 100644
--- a/src/Geom/Geom_OffsetSurface.cxx
+++ b/src/Geom/Geom_OffsetSurface.cxx
@@ -72,6 +72,8 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_OffsetSurface,Geom_Surface)
+
 static const Standard_Real MyAngularToleranceForG1 = Precision::Angular();
 
 
diff --git a/src/Geom/Geom_OffsetSurface.hxx b/src/Geom/Geom_OffsetSurface.hxx
index ca624cfc2c..c568f3abac 100644
--- a/src/Geom/Geom_OffsetSurface.hxx
+++ b/src/Geom/Geom_OffsetSurface.hxx
@@ -357,7 +357,7 @@ public:
   inline GeomAbs_Shape GetBasisSurfContinuity() const
   { return myBasisSurfContinuity; }
 
-  DEFINE_STANDARD_RTTI(Geom_OffsetSurface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(Geom_OffsetSurface,Geom_Surface)
 
 private:
 
diff --git a/src/Geom/Geom_OsculatingSurface.cxx b/src/Geom/Geom_OsculatingSurface.cxx
index 05c95f1b3c..9357b08188 100644
--- a/src/Geom/Geom_OsculatingSurface.cxx
+++ b/src/Geom/Geom_OsculatingSurface.cxx
@@ -30,6 +30,8 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray2OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_OsculatingSurface,MMgt_TShared)
+
 //=======================================================================
 //function : Geom_OffsetOsculatingSurface
 //purpose  : 
diff --git a/src/Geom/Geom_OsculatingSurface.hxx b/src/Geom/Geom_OsculatingSurface.hxx
index 82c58b27f6..db018ffe51 100644
--- a/src/Geom/Geom_OsculatingSurface.hxx
+++ b/src/Geom/Geom_OsculatingSurface.hxx
@@ -66,7 +66,7 @@ public:
   Standard_EXPORT Standard_Boolean VOscSurf (const Standard_Real U, const Standard_Real V, Standard_Boolean& t, Handle(Geom_BSplineSurface)& L) const;
 
 
-  DEFINE_STANDARD_RTTI(Geom_OsculatingSurface, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Geom_OsculatingSurface,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom/Geom_Parabola.cxx b/src/Geom/Geom_Parabola.cxx
index 74994e4a60..ee9b45569d 100644
--- a/src/Geom/Geom_Parabola.cxx
+++ b/src/Geom/Geom_Parabola.cxx
@@ -30,6 +30,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Parabola,Geom_Conic)
+
 typedef Geom_Parabola         Parabola;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_Parabola.hxx b/src/Geom/Geom_Parabola.hxx
index 767fd7898a..8757c5594b 100644
--- a/src/Geom/Geom_Parabola.hxx
+++ b/src/Geom/Geom_Parabola.hxx
@@ -226,7 +226,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Parabola,Geom_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom_Parabola,Geom_Conic)
 
 protected:
 
diff --git a/src/Geom/Geom_Plane.cxx b/src/Geom/Geom_Plane.cxx
index 0613fc38cf..65188e4f4c 100644
--- a/src/Geom/Geom_Plane.cxx
+++ b/src/Geom/Geom_Plane.cxx
@@ -37,6 +37,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Plane,Geom_ElementarySurface)
+
 typedef Geom_Plane         Plane;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_Plane.hxx b/src/Geom/Geom_Plane.hxx
index f7905fadce..07caac2445 100644
--- a/src/Geom/Geom_Plane.hxx
+++ b/src/Geom/Geom_Plane.hxx
@@ -221,7 +221,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Plane,Geom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_Plane,Geom_ElementarySurface)
 
 protected:
 
diff --git a/src/Geom/Geom_Point.cxx b/src/Geom/Geom_Point.cxx
index 1d7bf9d7ef..21f4afb2d2 100644
--- a/src/Geom/Geom_Point.cxx
+++ b/src/Geom/Geom_Point.cxx
@@ -19,6 +19,8 @@
 #include <gp_Pnt.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Point,Geom_Geometry)
+
 typedef Geom_Point         Point;
 
 Standard_Real Geom_Point::Distance (const Handle(Geom_Point)& Other) const {
diff --git a/src/Geom/Geom_Point.hxx b/src/Geom/Geom_Point.hxx
index 24a8de1003..e6cc94b2c6 100644
--- a/src/Geom/Geom_Point.hxx
+++ b/src/Geom/Geom_Point.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Point,Geom_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom_Point,Geom_Geometry)
 
 protected:
 
diff --git a/src/Geom/Geom_RectangularTrimmedSurface.cxx b/src/Geom/Geom_RectangularTrimmedSurface.cxx
index 6b440b00aa..a024e31f71 100644
--- a/src/Geom/Geom_RectangularTrimmedSurface.cxx
+++ b/src/Geom/Geom_RectangularTrimmedSurface.cxx
@@ -45,6 +45,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_RectangularTrimmedSurface,Geom_BoundedSurface)
+
 typedef Geom_RectangularTrimmedSurface RectangularTrimmedSurface;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_RectangularTrimmedSurface.hxx b/src/Geom/Geom_RectangularTrimmedSurface.hxx
index 3ebe244d96..a7144e0ae7 100644
--- a/src/Geom/Geom_RectangularTrimmedSurface.hxx
+++ b/src/Geom/Geom_RectangularTrimmedSurface.hxx
@@ -308,7 +308,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_RectangularTrimmedSurface,Geom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_RectangularTrimmedSurface,Geom_BoundedSurface)
 
 protected:
 
diff --git a/src/Geom/Geom_SphericalSurface.cxx b/src/Geom/Geom_SphericalSurface.cxx
index 4a9ab476cd..22aea20049 100644
--- a/src/Geom/Geom_SphericalSurface.cxx
+++ b/src/Geom/Geom_SphericalSurface.cxx
@@ -32,6 +32,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_SphericalSurface,Geom_ElementarySurface)
+
 typedef Geom_Circle                   Circle;
 typedef Geom_SphericalSurface         SphericalSurface;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_SphericalSurface.hxx b/src/Geom/Geom_SphericalSurface.hxx
index ab9290a62e..827a468673 100644
--- a/src/Geom/Geom_SphericalSurface.hxx
+++ b/src/Geom/Geom_SphericalSurface.hxx
@@ -224,7 +224,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_SphericalSurface,Geom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_SphericalSurface,Geom_ElementarySurface)
 
 protected:
 
diff --git a/src/Geom/Geom_Surface.cxx b/src/Geom/Geom_Surface.cxx
index 992511a407..d01f1a9979 100644
--- a/src/Geom/Geom_Surface.cxx
+++ b/src/Geom/Geom_Surface.cxx
@@ -27,6 +27,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Surface,Geom_Geometry)
+
 typedef Geom_Surface         Surface;
 
 //=======================================================================
diff --git a/src/Geom/Geom_Surface.hxx b/src/Geom/Geom_Surface.hxx
index 898c9a5a76..187c3b47d9 100644
--- a/src/Geom/Geom_Surface.hxx
+++ b/src/Geom/Geom_Surface.hxx
@@ -279,7 +279,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Surface,Geom_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom_Surface,Geom_Geometry)
 
 protected:
 
diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx
index e55c2f5a97..62d816d994 100644
--- a/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx
+++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.cxx
@@ -45,6 +45,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_SurfaceOfLinearExtrusion,Geom_SweptSurface)
+
 #define  POLES    (poles->Array2())
 #define  WEIGHTS  (weights->Array2())
 #define  UKNOTS   (uknots->Array1())
diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx
index 5cb3971a1d..e0fb9d2f2f 100644
--- a/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx
+++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.hxx
@@ -252,7 +252,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_SurfaceOfLinearExtrusion,Geom_SweptSurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_SurfaceOfLinearExtrusion,Geom_SweptSurface)
 
 protected:
 
diff --git a/src/Geom/Geom_SurfaceOfRevolution.cxx b/src/Geom/Geom_SurfaceOfRevolution.cxx
index 77585b71bb..2f82001c52 100644
--- a/src/Geom/Geom_SurfaceOfRevolution.cxx
+++ b/src/Geom/Geom_SurfaceOfRevolution.cxx
@@ -41,6 +41,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_SurfaceOfRevolution,Geom_SweptSurface)
+
 #define  POLES    (poles->Array2())
 #define  WEIGHTS  (weights->Array2())
 #define  UKNOTS   (uknots->Array1())
diff --git a/src/Geom/Geom_SurfaceOfRevolution.hxx b/src/Geom/Geom_SurfaceOfRevolution.hxx
index 11141e740f..e83528e732 100644
--- a/src/Geom/Geom_SurfaceOfRevolution.hxx
+++ b/src/Geom/Geom_SurfaceOfRevolution.hxx
@@ -304,7 +304,7 @@ public:
   Standard_EXPORT Handle(Geom_Geometry) Copy() const Standard_OVERRIDE;
 
 
-  DEFINE_STANDARD_RTTI(Geom_SurfaceOfRevolution,Geom_SweptSurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_SurfaceOfRevolution,Geom_SweptSurface)
 
 private:
   Handle(GeomEvaluator_SurfaceOfRevolution) myEvaluator;
diff --git a/src/Geom/Geom_SweptSurface.cxx b/src/Geom/Geom_SweptSurface.cxx
index 39fae04e7e..d3c921f13a 100644
--- a/src/Geom/Geom_SweptSurface.cxx
+++ b/src/Geom/Geom_SweptSurface.cxx
@@ -20,6 +20,8 @@
 #include <gp_Dir.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_SweptSurface,Geom_Surface)
+
 //=======================================================================
 //function : Continuity
 //purpose  : 
diff --git a/src/Geom/Geom_SweptSurface.hxx b/src/Geom/Geom_SweptSurface.hxx
index 86349711d5..f7be27b3d1 100644
--- a/src/Geom/Geom_SweptSurface.hxx
+++ b/src/Geom/Geom_SweptSurface.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_SweptSurface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(Geom_SweptSurface,Geom_Surface)
 
 protected:
 
diff --git a/src/Geom/Geom_ToroidalSurface.cxx b/src/Geom/Geom_ToroidalSurface.cxx
index ac54ba54a4..6e08a4ce74 100644
--- a/src/Geom/Geom_ToroidalSurface.cxx
+++ b/src/Geom/Geom_ToroidalSurface.cxx
@@ -35,6 +35,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_ToroidalSurface,Geom_ElementarySurface)
+
 typedef Geom_ToroidalSurface         ToroidalSurface;
 typedef TColStd_Array1OfReal      Array1OfReal;
 typedef gp_Ax1  Ax1;
diff --git a/src/Geom/Geom_ToroidalSurface.hxx b/src/Geom/Geom_ToroidalSurface.hxx
index e823e04117..93499c848f 100644
--- a/src/Geom/Geom_ToroidalSurface.hxx
+++ b/src/Geom/Geom_ToroidalSurface.hxx
@@ -248,7 +248,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_ToroidalSurface,Geom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(Geom_ToroidalSurface,Geom_ElementarySurface)
 
 protected:
 
diff --git a/src/Geom/Geom_Transformation.cxx b/src/Geom/Geom_Transformation.cxx
index 1e91d64a94..ed7ed87744 100644
--- a/src/Geom/Geom_Transformation.cxx
+++ b/src/Geom/Geom_Transformation.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Transformation,MMgt_TShared)
+
 typedef Geom_Transformation         Transformation;
 typedef gp_Ax1      Ax1;
 typedef gp_Ax2      Ax2;
diff --git a/src/Geom/Geom_Transformation.hxx b/src/Geom/Geom_Transformation.hxx
index 4f1ee9b0f9..178b8a4f2e 100644
--- a/src/Geom/Geom_Transformation.hxx
+++ b/src/Geom/Geom_Transformation.hxx
@@ -229,7 +229,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Transformation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Geom_Transformation,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom/Geom_TrimmedCurve.cxx b/src/Geom/Geom_TrimmedCurve.cxx
index 111187a058..6fe4d6aa4a 100644
--- a/src/Geom/Geom_TrimmedCurve.cxx
+++ b/src/Geom/Geom_TrimmedCurve.cxx
@@ -39,6 +39,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_TrimmedCurve,Geom_BoundedCurve)
+
 typedef Geom_TrimmedCurve         TrimmedCurve;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_TrimmedCurve.hxx b/src/Geom/Geom_TrimmedCurve.hxx
index c81004d2d2..32cef493dd 100644
--- a/src/Geom/Geom_TrimmedCurve.hxx
+++ b/src/Geom/Geom_TrimmedCurve.hxx
@@ -255,7 +255,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_TrimmedCurve,Geom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom_TrimmedCurve,Geom_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom/Geom_Vector.cxx b/src/Geom/Geom_Vector.cxx
index 10c4f698b0..097d29e1e5 100644
--- a/src/Geom/Geom_Vector.cxx
+++ b/src/Geom/Geom_Vector.cxx
@@ -22,6 +22,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_Vector,Geom_Geometry)
+
 typedef Geom_Vector         Vector;
 typedef gp_Ax1  Ax1;
 typedef gp_Ax2  Ax2;
diff --git a/src/Geom/Geom_Vector.hxx b/src/Geom/Geom_Vector.hxx
index 78b06504f9..addc144111 100644
--- a/src/Geom/Geom_Vector.hxx
+++ b/src/Geom/Geom_Vector.hxx
@@ -137,7 +137,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_Vector,Geom_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom_Vector,Geom_Geometry)
 
 protected:
 
diff --git a/src/Geom/Geom_VectorWithMagnitude.cxx b/src/Geom/Geom_VectorWithMagnitude.cxx
index 089f4213bd..a69f7eef93 100644
--- a/src/Geom/Geom_VectorWithMagnitude.cxx
+++ b/src/Geom/Geom_VectorWithMagnitude.cxx
@@ -24,6 +24,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom_VectorWithMagnitude,Geom_Vector)
+
 typedef Geom_VectorWithMagnitude         VectorWithMagnitude;
 typedef Geom_Vector                      Vector;
 typedef gp_Ax1  Ax1;
diff --git a/src/Geom/Geom_VectorWithMagnitude.hxx b/src/Geom/Geom_VectorWithMagnitude.hxx
index 58686108b1..a9c52eac07 100644
--- a/src/Geom/Geom_VectorWithMagnitude.hxx
+++ b/src/Geom/Geom_VectorWithMagnitude.hxx
@@ -145,7 +145,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom_VectorWithMagnitude,Geom_Vector)
+  DEFINE_STANDARD_RTTIEXT(Geom_VectorWithMagnitude,Geom_Vector)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_AxisPlacement.cxx b/src/Geom2d/Geom2d_AxisPlacement.cxx
index d39a191260..b48ef685e3 100644
--- a/src/Geom2d/Geom2d_AxisPlacement.cxx
+++ b/src/Geom2d/Geom2d_AxisPlacement.cxx
@@ -23,6 +23,8 @@
 #include <gp_Trsf2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_AxisPlacement,Geom2d_Geometry)
+
 typedef Geom2d_AxisPlacement          AxisPlacement;
 typedef gp_Dir2d  Dir2d;
 typedef gp_Pnt2d  Pnt2d;
diff --git a/src/Geom2d/Geom2d_AxisPlacement.hxx b/src/Geom2d/Geom2d_AxisPlacement.hxx
index faf0361c47..8055ec47c1 100644
--- a/src/Geom2d/Geom2d_AxisPlacement.hxx
+++ b/src/Geom2d/Geom2d_AxisPlacement.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_AxisPlacement,Geom2d_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_AxisPlacement,Geom2d_Geometry)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_BSplineCurve.cxx b/src/Geom2d/Geom2d_BSplineCurve.cxx
index b3ad8d6e69..d27abd947d 100644
--- a/src/Geom2d/Geom2d_BSplineCurve.cxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.cxx
@@ -49,6 +49,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_BSplineCurve,Geom2d_BoundedCurve)
+
 //=======================================================================
 //function : CheckCurveData
 //purpose  : Internal use only
diff --git a/src/Geom2d/Geom2d_BSplineCurve.hxx b/src/Geom2d/Geom2d_BSplineCurve.hxx
index 34771d02dc..dd8383dad3 100644
--- a/src/Geom2d/Geom2d_BSplineCurve.hxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.hxx
@@ -823,7 +823,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_BSplineCurve,Geom2d_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_BSplineCurve,Geom2d_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_BezierCurve.cxx b/src/Geom2d/Geom2d_BezierCurve.cxx
index c5ee314d89..8ee3af99f2 100644
--- a/src/Geom2d/Geom2d_BezierCurve.cxx
+++ b/src/Geom2d/Geom2d_BezierCurve.cxx
@@ -44,6 +44,8 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_BezierCurve,Geom2d_BoundedCurve)
+
 //=======================================================================
 //function : Rational
 //purpose  : check rationality of an array of weights
diff --git a/src/Geom2d/Geom2d_BezierCurve.hxx b/src/Geom2d/Geom2d_BezierCurve.hxx
index c73f28f832..62c51e07f8 100644
--- a/src/Geom2d/Geom2d_BezierCurve.hxx
+++ b/src/Geom2d/Geom2d_BezierCurve.hxx
@@ -323,7 +323,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_BezierCurve,Geom2d_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_BezierCurve,Geom2d_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_BoundedCurve.cxx b/src/Geom2d/Geom2d_BoundedCurve.cxx
index badac98741..eebd15e9a2 100644
--- a/src/Geom2d/Geom2d_BoundedCurve.cxx
+++ b/src/Geom2d/Geom2d_BoundedCurve.cxx
@@ -18,3 +18,5 @@
 #include <Geom2d_BoundedCurve.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_BoundedCurve,Geom2d_Curve)
\ No newline at end of file
diff --git a/src/Geom2d/Geom2d_BoundedCurve.hxx b/src/Geom2d/Geom2d_BoundedCurve.hxx
index 7665e7d978..fae7b0ea01 100644
--- a/src/Geom2d/Geom2d_BoundedCurve.hxx
+++ b/src/Geom2d/Geom2d_BoundedCurve.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_BoundedCurve,Geom2d_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_BoundedCurve,Geom2d_Curve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_CartesianPoint.cxx b/src/Geom2d/Geom2d_CartesianPoint.cxx
index d662468132..f643c7f2ff 100644
--- a/src/Geom2d/Geom2d_CartesianPoint.cxx
+++ b/src/Geom2d/Geom2d_CartesianPoint.cxx
@@ -21,6 +21,8 @@
 #include <gp_Trsf2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_CartesianPoint,Geom2d_Point)
+
 typedef Geom2d_CartesianPoint         CartesianPoint;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Vec2d  Vec2d;
diff --git a/src/Geom2d/Geom2d_CartesianPoint.hxx b/src/Geom2d/Geom2d_CartesianPoint.hxx
index ef868ea530..c4929f6103 100644
--- a/src/Geom2d/Geom2d_CartesianPoint.hxx
+++ b/src/Geom2d/Geom2d_CartesianPoint.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_CartesianPoint,Geom2d_Point)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_CartesianPoint,Geom2d_Point)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Circle.cxx b/src/Geom2d/Geom2d_Circle.cxx
index 929c22db25..87ba84e634 100644
--- a/src/Geom2d/Geom2d_Circle.cxx
+++ b/src/Geom2d/Geom2d_Circle.cxx
@@ -29,6 +29,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Circle,Geom2d_Conic)
+
 typedef Geom2d_Circle         Circle;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
diff --git a/src/Geom2d/Geom2d_Circle.hxx b/src/Geom2d/Geom2d_Circle.hxx
index 602744e879..76e55766e4 100644
--- a/src/Geom2d/Geom2d_Circle.hxx
+++ b/src/Geom2d/Geom2d_Circle.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Circle,Geom2d_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Circle,Geom2d_Conic)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Conic.cxx b/src/Geom2d/Geom2d_Conic.cxx
index bfd0e68664..51eeea6c38 100644
--- a/src/Geom2d/Geom2d_Conic.cxx
+++ b/src/Geom2d/Geom2d_Conic.cxx
@@ -24,6 +24,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Conic,Geom2d_Curve)
+
 typedef Geom2d_Conic         Conic;
 
 typedef gp_Ax2d  Ax2d;
diff --git a/src/Geom2d/Geom2d_Conic.hxx b/src/Geom2d/Geom2d_Conic.hxx
index 32ca94a03d..d37eb9a841 100644
--- a/src/Geom2d/Geom2d_Conic.hxx
+++ b/src/Geom2d/Geom2d_Conic.hxx
@@ -127,7 +127,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Conic,Geom2d_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Conic,Geom2d_Curve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Curve.cxx b/src/Geom2d/Geom2d_Curve.cxx
index 93704a9d73..59ed0848eb 100644
--- a/src/Geom2d/Geom2d_Curve.cxx
+++ b/src/Geom2d/Geom2d_Curve.cxx
@@ -25,6 +25,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Curve,Geom2d_Geometry)
+
 typedef Geom2d_Curve         Curve;
 
 
diff --git a/src/Geom2d/Geom2d_Curve.hxx b/src/Geom2d/Geom2d_Curve.hxx
index a32abbe4d5..844993b2bb 100644
--- a/src/Geom2d/Geom2d_Curve.hxx
+++ b/src/Geom2d/Geom2d_Curve.hxx
@@ -227,7 +227,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Curve,Geom2d_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Curve,Geom2d_Geometry)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Direction.cxx b/src/Geom2d/Geom2d_Direction.cxx
index cacf5fc7fa..ca933040f2 100644
--- a/src/Geom2d/Geom2d_Direction.cxx
+++ b/src/Geom2d/Geom2d_Direction.cxx
@@ -24,6 +24,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Direction,Geom2d_Vector)
+
 typedef Geom2d_Direction         Direction;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Pnt2d  Pnt2d;
diff --git a/src/Geom2d/Geom2d_Direction.hxx b/src/Geom2d/Geom2d_Direction.hxx
index a77cc4a033..316ec1a36e 100644
--- a/src/Geom2d/Geom2d_Direction.hxx
+++ b/src/Geom2d/Geom2d_Direction.hxx
@@ -99,7 +99,7 @@ Standard_Real operator ^ (const Handle(Geom2d_Vector)& Other) const
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Direction,Geom2d_Vector)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Direction,Geom2d_Vector)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Ellipse.cxx b/src/Geom2d/Geom2d_Ellipse.cxx
index a3fb96f6bc..d2aa2654a0 100644
--- a/src/Geom2d/Geom2d_Ellipse.cxx
+++ b/src/Geom2d/Geom2d_Ellipse.cxx
@@ -31,6 +31,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Ellipse,Geom2d_Conic)
+
 typedef Geom2d_Ellipse         Ellipse;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
diff --git a/src/Geom2d/Geom2d_Ellipse.hxx b/src/Geom2d/Geom2d_Ellipse.hxx
index fdcb28daca..78ff674e61 100644
--- a/src/Geom2d/Geom2d_Ellipse.hxx
+++ b/src/Geom2d/Geom2d_Ellipse.hxx
@@ -244,7 +244,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Ellipse,Geom2d_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Ellipse,Geom2d_Conic)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Geometry.cxx b/src/Geom2d/Geom2d_Geometry.cxx
index c408ce6ecb..2c5f8fbf65 100644
--- a/src/Geom2d/Geom2d_Geometry.cxx
+++ b/src/Geom2d/Geom2d_Geometry.cxx
@@ -23,6 +23,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Geometry,MMgt_TShared)
+
 typedef Geom2d_Geometry Geometry;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Pnt2d  Pnt2d;
diff --git a/src/Geom2d/Geom2d_Geometry.hxx b/src/Geom2d/Geom2d_Geometry.hxx
index cba24e49de..ad5d267181 100644
--- a/src/Geom2d/Geom2d_Geometry.hxx
+++ b/src/Geom2d/Geom2d_Geometry.hxx
@@ -113,7 +113,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Geometry,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Geometry,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Hyperbola.cxx b/src/Geom2d/Geom2d_Hyperbola.cxx
index 08b3221ce3..9d4915f235 100644
--- a/src/Geom2d/Geom2d_Hyperbola.cxx
+++ b/src/Geom2d/Geom2d_Hyperbola.cxx
@@ -33,6 +33,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Hyperbola,Geom2d_Conic)
+
 typedef Geom2d_Hyperbola         Hyperbola;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
diff --git a/src/Geom2d/Geom2d_Hyperbola.hxx b/src/Geom2d/Geom2d_Hyperbola.hxx
index 59036053ab..02e341d9a7 100644
--- a/src/Geom2d/Geom2d_Hyperbola.hxx
+++ b/src/Geom2d/Geom2d_Hyperbola.hxx
@@ -297,7 +297,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Hyperbola,Geom2d_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Hyperbola,Geom2d_Conic)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Line.cxx b/src/Geom2d/Geom2d_Line.cxx
index e58ae97f94..6ac9b7b774 100644
--- a/src/Geom2d/Geom2d_Line.cxx
+++ b/src/Geom2d/Geom2d_Line.cxx
@@ -29,6 +29,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Line,Geom2d_Curve)
+
 typedef Geom2d_Line         Line;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
diff --git a/src/Geom2d/Geom2d_Line.hxx b/src/Geom2d/Geom2d_Line.hxx
index d1d061d8a3..ed74a20522 100644
--- a/src/Geom2d/Geom2d_Line.hxx
+++ b/src/Geom2d/Geom2d_Line.hxx
@@ -184,7 +184,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Line,Geom2d_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Line,Geom2d_Curve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_OffsetCurve.hxx b/src/Geom2d/Geom2d_OffsetCurve.hxx
index 8cf9f6c9e4..0886f46baa 100644
--- a/src/Geom2d/Geom2d_OffsetCurve.hxx
+++ b/src/Geom2d/Geom2d_OffsetCurve.hxx
@@ -288,7 +288,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_OffsetCurve,Geom2d_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_OffsetCurve,Geom2d_Curve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Parabola.cxx b/src/Geom2d/Geom2d_Parabola.cxx
index 5294ce09c4..91194f1282 100644
--- a/src/Geom2d/Geom2d_Parabola.cxx
+++ b/src/Geom2d/Geom2d_Parabola.cxx
@@ -31,6 +31,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Parabola,Geom2d_Conic)
+
 typedef Geom2d_Parabola         Parabola;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Dir2d  Dir2d;
diff --git a/src/Geom2d/Geom2d_Parabola.hxx b/src/Geom2d/Geom2d_Parabola.hxx
index c3afe49924..fa5f2a76c6 100644
--- a/src/Geom2d/Geom2d_Parabola.hxx
+++ b/src/Geom2d/Geom2d_Parabola.hxx
@@ -208,7 +208,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Parabola,Geom2d_Conic)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Parabola,Geom2d_Conic)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Point.cxx b/src/Geom2d/Geom2d_Point.cxx
index 36a10e388d..e3dacd91a3 100644
--- a/src/Geom2d/Geom2d_Point.cxx
+++ b/src/Geom2d/Geom2d_Point.cxx
@@ -19,6 +19,8 @@
 #include <gp_Pnt2d.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Point,Geom2d_Geometry)
+
 typedef Geom2d_Point Point;
 
 Standard_Real Geom2d_Point::Distance (const Handle(Geom2d_Point)& Other) const {
diff --git a/src/Geom2d/Geom2d_Point.hxx b/src/Geom2d/Geom2d_Point.hxx
index 67af09903f..ea3e9d1a56 100644
--- a/src/Geom2d/Geom2d_Point.hxx
+++ b/src/Geom2d/Geom2d_Point.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Point,Geom2d_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Point,Geom2d_Geometry)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Transformation.cxx b/src/Geom2d/Geom2d_Transformation.cxx
index afb18d2099..79a0dccfb8 100644
--- a/src/Geom2d/Geom2d_Transformation.cxx
+++ b/src/Geom2d/Geom2d_Transformation.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Transformation,MMgt_TShared)
+
 typedef Geom2d_Transformation         Transformation;
 typedef gp_Ax2d     Ax2d;
 typedef gp_Pnt2d    Pnt2d;
diff --git a/src/Geom2d/Geom2d_Transformation.hxx b/src/Geom2d/Geom2d_Transformation.hxx
index 5110f85dc3..2fd579604e 100644
--- a/src/Geom2d/Geom2d_Transformation.hxx
+++ b/src/Geom2d/Geom2d_Transformation.hxx
@@ -219,7 +219,7 @@ void operator *= (const Handle(Geom2d_Transformation)& Other)
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Transformation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Transformation,MMgt_TShared)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_TrimmedCurve.cxx b/src/Geom2d/Geom2d_TrimmedCurve.cxx
index 43ddfc7b0f..42343cacbc 100644
--- a/src/Geom2d/Geom2d_TrimmedCurve.cxx
+++ b/src/Geom2d/Geom2d_TrimmedCurve.cxx
@@ -39,6 +39,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_TrimmedCurve,Geom2d_BoundedCurve)
+
 typedef Geom2d_TrimmedCurve         TrimmedCurve;
 typedef gp_Ax2d   Ax2d;
 typedef gp_Pnt2d  Pnt2d;
diff --git a/src/Geom2d/Geom2d_TrimmedCurve.hxx b/src/Geom2d/Geom2d_TrimmedCurve.hxx
index 2eee9db9eb..08e9b5e5ea 100644
--- a/src/Geom2d/Geom2d_TrimmedCurve.hxx
+++ b/src/Geom2d/Geom2d_TrimmedCurve.hxx
@@ -259,7 +259,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_TrimmedCurve,Geom2d_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_TrimmedCurve,Geom2d_BoundedCurve)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_Vector.cxx b/src/Geom2d/Geom2d_Vector.cxx
index 8a0f80b95b..4ee9d4b747 100644
--- a/src/Geom2d/Geom2d_Vector.cxx
+++ b/src/Geom2d/Geom2d_Vector.cxx
@@ -21,6 +21,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_Vector,Geom2d_Geometry)
+
 typedef Geom2d_Vector         Vector;
 typedef gp_Ax2d  Ax2d;
 typedef gp_Pnt2d Pnt2d;
diff --git a/src/Geom2d/Geom2d_Vector.hxx b/src/Geom2d/Geom2d_Vector.hxx
index afd0b1a813..0687a145eb 100644
--- a/src/Geom2d/Geom2d_Vector.hxx
+++ b/src/Geom2d/Geom2d_Vector.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_Vector,Geom2d_Geometry)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_Vector,Geom2d_Geometry)
 
 protected:
 
diff --git a/src/Geom2d/Geom2d_VectorWithMagnitude.cxx b/src/Geom2d/Geom2d_VectorWithMagnitude.cxx
index a82b1fb5f9..aa86352616 100644
--- a/src/Geom2d/Geom2d_VectorWithMagnitude.cxx
+++ b/src/Geom2d/Geom2d_VectorWithMagnitude.cxx
@@ -24,6 +24,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2d_VectorWithMagnitude,Geom2d_Vector)
+
 typedef Geom2d_Vector Vector;
 typedef Geom2d_VectorWithMagnitude         VectorWithMagnitude;
 typedef gp_Ax2d   Ax2d;
diff --git a/src/Geom2d/Geom2d_VectorWithMagnitude.hxx b/src/Geom2d/Geom2d_VectorWithMagnitude.hxx
index 2e39ba1cec..bf2f24bdd1 100644
--- a/src/Geom2d/Geom2d_VectorWithMagnitude.hxx
+++ b/src/Geom2d/Geom2d_VectorWithMagnitude.hxx
@@ -162,7 +162,7 @@ Handle(Geom2d_VectorWithMagnitude) operator - (const Handle(Geom2d_Vector)& Othe
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2d_VectorWithMagnitude,Geom2d_Vector)
+  DEFINE_STANDARD_RTTIEXT(Geom2d_VectorWithMagnitude,Geom2d_Vector)
 
 protected:
 
diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx b/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx
index b957e9a5c8..d1c7611c1f 100644
--- a/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx
+++ b/src/Geom2dAdaptor/Geom2dAdaptor_GHCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2dAdaptor_GHCurve,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(Geom2dAdaptor_GHCurve,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cxx b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cxx
index 032f287f08..87cbfc8332 100644
--- a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cxx
+++ b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cxx
@@ -21,6 +21,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2dAdaptor_HCurve,Geom2dAdaptor_GHCurve)
+
 //=======================================================================
 //function : Geom2dAdaptor_HCurve
 //purpose  : 
diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.hxx b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.hxx
index e780cfdb40..f32b1c832f 100644
--- a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.hxx
+++ b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Geom2dAdaptor_HCurve,Geom2dAdaptor_GHCurve)
+  DEFINE_STANDARD_RTTIEXT(Geom2dAdaptor_HCurve,Geom2dAdaptor_GHCurve)
 
 protected:
 
diff --git a/src/Geom2dEvaluator/Geom2dEvaluator_Curve.hxx b/src/Geom2dEvaluator/Geom2dEvaluator_Curve.hxx
index 3d6d0d64b6..4c99991a8e 100644
--- a/src/Geom2dEvaluator/Geom2dEvaluator_Curve.hxx
+++ b/src/Geom2dEvaluator/Geom2dEvaluator_Curve.hxx
@@ -44,7 +44,7 @@ public:
   virtual gp_Vec2d DN(const Standard_Real theU,
                       const Standard_Integer theDerU) const = 0;
 
-  DEFINE_STANDARD_RTTI(Geom2dEvaluator_Curve, Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(Geom2dEvaluator_Curve,Standard_Transient)
 };
 
 DEFINE_STANDARD_HANDLE(Geom2dEvaluator_Curve, Standard_Transient)
diff --git a/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.cxx b/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.cxx
index b60cf57c59..211f885388 100644
--- a/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.cxx
+++ b/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.cxx
@@ -18,6 +18,8 @@
 #include <Standard_NullValue.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Geom2dEvaluator_OffsetCurve,Geom2dEvaluator_Curve)
+
 Geom2dEvaluator_OffsetCurve::Geom2dEvaluator_OffsetCurve(
         const Handle(Geom2d_Curve)& theBase,
         const Standard_Real theOffset)
diff --git a/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.hxx b/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.hxx
index b9209da516..c24d351281 100644
--- a/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.hxx
+++ b/src/Geom2dEvaluator/Geom2dEvaluator_OffsetCurve.hxx
@@ -54,7 +54,7 @@ public:
   Standard_EXPORT gp_Vec2d DN(const Standard_Real theU,
                               const Standard_Integer theDeriv) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Geom2dEvaluator_OffsetCurve, Geom2dEvaluator_Curve)
+  DEFINE_STANDARD_RTTIEXT(Geom2dEvaluator_OffsetCurve,Geom2dEvaluator_Curve)
 
 private:
   //! Recalculate D1 values of base curve into D0 value of offset curve
diff --git a/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx b/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx
index c81c6fc63f..592a0135a0 100644
--- a/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_GHCurve.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_GHCurve,Adaptor3d_HCurve)
+  DEFINE_STANDARD_RTTI_INLINE(GeomAdaptor_GHCurve,Adaptor3d_HCurve)
 
 protected:
 
diff --git a/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx b/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx
index a7dd7dca7d..de1cf857d4 100644
--- a/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_GHSurface.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_GHSurface,Adaptor3d_HSurface)
+  DEFINE_STANDARD_RTTI_INLINE(GeomAdaptor_GHSurface,Adaptor3d_HSurface)
 
 protected:
 
diff --git a/src/GeomAdaptor/GeomAdaptor_HCurve.cxx b/src/GeomAdaptor/GeomAdaptor_HCurve.cxx
index 4731617ee1..0f5f5b186c 100644
--- a/src/GeomAdaptor/GeomAdaptor_HCurve.cxx
+++ b/src/GeomAdaptor/GeomAdaptor_HCurve.cxx
@@ -20,3 +20,5 @@
 #include <GeomAdaptor_HCurve.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(GeomAdaptor_HCurve,GeomAdaptor_GHCurve)
\ No newline at end of file
diff --git a/src/GeomAdaptor/GeomAdaptor_HCurve.hxx b/src/GeomAdaptor/GeomAdaptor_HCurve.hxx
index 77f2892c6f..72515486b0 100644
--- a/src/GeomAdaptor/GeomAdaptor_HCurve.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_HCurve.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_HCurve,GeomAdaptor_GHCurve)
+  DEFINE_STANDARD_RTTIEXT(GeomAdaptor_HCurve,GeomAdaptor_GHCurve)
 
 protected:
 
diff --git a/src/GeomAdaptor/GeomAdaptor_HSurface.cxx b/src/GeomAdaptor/GeomAdaptor_HSurface.cxx
index 0a02210bb6..e34063a04d 100644
--- a/src/GeomAdaptor/GeomAdaptor_HSurface.cxx
+++ b/src/GeomAdaptor/GeomAdaptor_HSurface.cxx
@@ -20,3 +20,5 @@
 #include <GeomAdaptor_Surface.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(GeomAdaptor_HSurface,GeomAdaptor_GHSurface)
\ No newline at end of file
diff --git a/src/GeomAdaptor/GeomAdaptor_HSurface.hxx b/src/GeomAdaptor/GeomAdaptor_HSurface.hxx
index 2eb31142a0..f621d590aa 100644
--- a/src/GeomAdaptor/GeomAdaptor_HSurface.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_HSurface.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_HSurface,GeomAdaptor_GHSurface)
+  DEFINE_STANDARD_RTTIEXT(GeomAdaptor_HSurface,GeomAdaptor_GHSurface)
 
 protected:
 
diff --git a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx
index 386b16c1c5..a6ffd43a74 100644
--- a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfLinearExtrusion.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_HSurfaceOfLinearExtrusion,Adaptor3d_HSurface)
+  DEFINE_STANDARD_RTTI_INLINE(GeomAdaptor_HSurfaceOfLinearExtrusion,Adaptor3d_HSurface)
 
 protected:
 
diff --git a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx
index 7019873f8a..b6387ea1ff 100644
--- a/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx
+++ b/src/GeomAdaptor/GeomAdaptor_HSurfaceOfRevolution.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomAdaptor_HSurfaceOfRevolution,Adaptor3d_HSurface)
+  DEFINE_STANDARD_RTTI_INLINE(GeomAdaptor_HSurfaceOfRevolution,Adaptor3d_HSurface)
 
 protected:
 
diff --git a/src/GeomEvaluator/GeomEvaluator_Curve.hxx b/src/GeomEvaluator/GeomEvaluator_Curve.hxx
index 2c8df0273a..6d57afad87 100644
--- a/src/GeomEvaluator/GeomEvaluator_Curve.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_Curve.hxx
@@ -44,7 +44,7 @@ public:
   virtual gp_Vec DN(const Standard_Real theU,
                     const Standard_Integer theDerU) const = 0;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_Curve, Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(GeomEvaluator_Curve,Standard_Transient)
 };
 
 DEFINE_STANDARD_HANDLE(GeomEvaluator_Curve, Standard_Transient)
diff --git a/src/GeomEvaluator/GeomEvaluator_OffsetCurve.cxx b/src/GeomEvaluator/GeomEvaluator_OffsetCurve.cxx
index 765662a41d..f6dfa54b65 100644
--- a/src/GeomEvaluator/GeomEvaluator_OffsetCurve.cxx
+++ b/src/GeomEvaluator/GeomEvaluator_OffsetCurve.cxx
@@ -18,6 +18,8 @@
 #include <Standard_NullValue.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomEvaluator_OffsetCurve,GeomEvaluator_Curve)
+
 GeomEvaluator_OffsetCurve::GeomEvaluator_OffsetCurve(
         const Handle(Geom_Curve)& theBase,
         const Standard_Real theOffset,
diff --git a/src/GeomEvaluator/GeomEvaluator_OffsetCurve.hxx b/src/GeomEvaluator/GeomEvaluator_OffsetCurve.hxx
index 3c74dade7d..28bdeaccb4 100644
--- a/src/GeomEvaluator/GeomEvaluator_OffsetCurve.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_OffsetCurve.hxx
@@ -60,7 +60,7 @@ public:
   Standard_EXPORT gp_Vec DN(const Standard_Real theU,
                             const Standard_Integer theDeriv) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_OffsetCurve, GeomEvaluator_Curve)
+  DEFINE_STANDARD_RTTIEXT(GeomEvaluator_OffsetCurve,GeomEvaluator_Curve)
 
 private:
   //! Recalculate D1 values of base curve into D0 value of offset curve
diff --git a/src/GeomEvaluator/GeomEvaluator_OffsetSurface.cxx b/src/GeomEvaluator/GeomEvaluator_OffsetSurface.cxx
index 49b4e7c2c5..f190f3fb78 100644
--- a/src/GeomEvaluator/GeomEvaluator_OffsetSurface.cxx
+++ b/src/GeomEvaluator/GeomEvaluator_OffsetSurface.cxx
@@ -25,6 +25,8 @@
 #include <Standard_RangeError.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomEvaluator_OffsetSurface,GeomEvaluator_Surface)
+
 template<class SurfOrAdapt>
 static void derivatives(Standard_Integer theMaxOrder,
                         Standard_Integer theMinOrder,
diff --git a/src/GeomEvaluator/GeomEvaluator_OffsetSurface.hxx b/src/GeomEvaluator/GeomEvaluator_OffsetSurface.hxx
index 5bfda688e0..c888f0a6c0 100644
--- a/src/GeomEvaluator/GeomEvaluator_OffsetSurface.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_OffsetSurface.hxx
@@ -65,7 +65,7 @@ public:
                             const Standard_Integer theDerU,
                             const Standard_Integer theDerV) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_OffsetSurface, GeomEvaluator_Surface)
+  DEFINE_STANDARD_RTTIEXT(GeomEvaluator_OffsetSurface,GeomEvaluator_Surface)
 
 private:
   //! Returns bounds of a base surface
diff --git a/src/GeomEvaluator/GeomEvaluator_Surface.hxx b/src/GeomEvaluator/GeomEvaluator_Surface.hxx
index 3d24938b97..4ec9aa5dbd 100644
--- a/src/GeomEvaluator/GeomEvaluator_Surface.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_Surface.hxx
@@ -49,7 +49,7 @@ public:
   virtual gp_Vec DN(const Standard_Real theU, const Standard_Real theV,
                     const Standard_Integer theDerU, const Standard_Integer theDerV) const = 0;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_Surface, Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(GeomEvaluator_Surface,Standard_Transient)
 };
 
 DEFINE_STANDARD_HANDLE(GeomEvaluator_Surface, Standard_Transient)
diff --git a/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.cxx b/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.cxx
index ece0d27543..4e71fcd08a 100644
--- a/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.cxx
+++ b/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.cxx
@@ -16,6 +16,8 @@
 
 #include <GeomAdaptor_HCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomEvaluator_SurfaceOfExtrusion,GeomEvaluator_Surface)
+
 GeomEvaluator_SurfaceOfExtrusion::GeomEvaluator_SurfaceOfExtrusion(
         const Handle(Geom_Curve)& theBase, const gp_Dir& theExtrusionDir)
   : GeomEvaluator_Surface(),
diff --git a/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.hxx b/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.hxx
index ce42a49c37..252f5f1c2c 100644
--- a/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_SurfaceOfExtrusion.hxx
@@ -61,7 +61,7 @@ public:
                             const Standard_Integer theDerU,
                             const Standard_Integer theDerV) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_SurfaceOfExtrusion, GeomEvaluator_Surface)
+  DEFINE_STANDARD_RTTIEXT(GeomEvaluator_SurfaceOfExtrusion,GeomEvaluator_Surface)
 
 private:
   //! Shift the point along direction to the given distance (theShift)
diff --git a/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.cxx b/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.cxx
index b93932eff1..995be65de2 100644
--- a/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.cxx
+++ b/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.cxx
@@ -17,6 +17,8 @@
 #include <Adaptor3d_HCurve.hxx>
 #include <gp_Trsf.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomEvaluator_SurfaceOfRevolution,GeomEvaluator_Surface)
+
 GeomEvaluator_SurfaceOfRevolution::GeomEvaluator_SurfaceOfRevolution(
         const Handle(Geom_Curve)& theBase,
         const gp_Dir& theRevolDir,
diff --git a/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.hxx b/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.hxx
index 904b2ecf72..172f242035 100644
--- a/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.hxx
+++ b/src/GeomEvaluator/GeomEvaluator_SurfaceOfRevolution.hxx
@@ -73,7 +73,7 @@ public:
                             const Standard_Integer theDerU,
                             const Standard_Integer theDerV) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(GeomEvaluator_SurfaceOfRevolution, GeomEvaluator_Surface)
+  DEFINE_STANDARD_RTTIEXT(GeomEvaluator_SurfaceOfRevolution,GeomEvaluator_Surface)
 
 private:
   Handle(Geom_Curve)       myBaseCurve;
diff --git a/src/GeomFill/GeomFill_BoundWithSurf.cxx b/src/GeomFill/GeomFill_BoundWithSurf.cxx
index bcc8faed1b..93bcf91925 100644
--- a/src/GeomFill/GeomFill_BoundWithSurf.cxx
+++ b/src/GeomFill/GeomFill_BoundWithSurf.cxx
@@ -28,6 +28,8 @@
 #include <Law_Function.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_BoundWithSurf,GeomFill_Boundary)
+
 //=======================================================================
 //function : GeomFill_BoundWithSurf
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_BoundWithSurf.hxx b/src/GeomFill/GeomFill_BoundWithSurf.hxx
index d9ffd54c13..b8e6005e32 100644
--- a/src/GeomFill/GeomFill_BoundWithSurf.hxx
+++ b/src/GeomFill/GeomFill_BoundWithSurf.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_BoundWithSurf,GeomFill_Boundary)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_BoundWithSurf,GeomFill_Boundary)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_Boundary.cxx b/src/GeomFill/GeomFill_Boundary.cxx
index 8ab65e4766..3e68305979 100644
--- a/src/GeomFill/GeomFill_Boundary.cxx
+++ b/src/GeomFill/GeomFill_Boundary.cxx
@@ -20,6 +20,8 @@
 #include <gp_Vec.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_Boundary,MMgt_TShared)
+
 //=======================================================================
 //function : GeomFill_Boundary
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_Boundary.hxx b/src/GeomFill/GeomFill_Boundary.hxx
index bacea8f373..9229899683 100644
--- a/src/GeomFill/GeomFill_Boundary.hxx
+++ b/src/GeomFill/GeomFill_Boundary.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_Boundary,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_Boundary,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_CircularBlendFunc.cxx b/src/GeomFill/GeomFill_CircularBlendFunc.cxx
index 78e09d62ce..62c4dd4fcb 100644
--- a/src/GeomFill/GeomFill_CircularBlendFunc.cxx
+++ b/src/GeomFill/GeomFill_CircularBlendFunc.cxx
@@ -26,6 +26,8 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_CircularBlendFunc,Approx_SweepFunction)
+
 #if DRAW
 #include <GeomAdaptor_HCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
diff --git a/src/GeomFill/GeomFill_CircularBlendFunc.hxx b/src/GeomFill/GeomFill_CircularBlendFunc.hxx
index 56af657857..1bcf86694d 100644
--- a/src/GeomFill/GeomFill_CircularBlendFunc.hxx
+++ b/src/GeomFill/GeomFill_CircularBlendFunc.hxx
@@ -132,7 +132,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_CircularBlendFunc,Approx_SweepFunction)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_CircularBlendFunc,Approx_SweepFunction)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_ConstantBiNormal.cxx b/src/GeomFill/GeomFill_ConstantBiNormal.cxx
index d4bdb1b89b..91f875102f 100644
--- a/src/GeomFill/GeomFill_ConstantBiNormal.cxx
+++ b/src/GeomFill/GeomFill_ConstantBiNormal.cxx
@@ -28,6 +28,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_ConstantBiNormal,GeomFill_TrihedronLaw)
+
 //=======================================================================
 //function : FDeriv
 //purpose  : computes (F/|F|)'
diff --git a/src/GeomFill/GeomFill_ConstantBiNormal.hxx b/src/GeomFill/GeomFill_ConstantBiNormal.hxx
index 85f8a2f558..098c8534d3 100644
--- a/src/GeomFill/GeomFill_ConstantBiNormal.hxx
+++ b/src/GeomFill/GeomFill_ConstantBiNormal.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_ConstantBiNormal,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_ConstantBiNormal,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_CoonsAlgPatch.cxx b/src/GeomFill/GeomFill_CoonsAlgPatch.cxx
index 74ddba6c54..53b2ae724c 100644
--- a/src/GeomFill/GeomFill_CoonsAlgPatch.cxx
+++ b/src/GeomFill/GeomFill_CoonsAlgPatch.cxx
@@ -24,6 +24,8 @@
 #include <Law_Linear.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_CoonsAlgPatch,MMgt_TShared)
+
 //=======================================================================
 //function : GeomFill_CoonsAlgPatch
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_CoonsAlgPatch.hxx b/src/GeomFill/GeomFill_CoonsAlgPatch.hxx
index b3c5166179..ceecae85e7 100644
--- a/src/GeomFill/GeomFill_CoonsAlgPatch.hxx
+++ b/src/GeomFill/GeomFill_CoonsAlgPatch.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_CoonsAlgPatch,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_CoonsAlgPatch,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.cxx b/src/GeomFill/GeomFill_CorrectedFrenet.cxx
index 0dd4aeeeac..3987adcbeb 100644
--- a/src/GeomFill/GeomFill_CorrectedFrenet.cxx
+++ b/src/GeomFill/GeomFill_CorrectedFrenet.cxx
@@ -45,6 +45,8 @@
 #include <TColStd_SequenceOfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_CorrectedFrenet,GeomFill_TrihedronLaw)
+
 //Patch
 #ifdef OCCT_DEBUG
 static Standard_Boolean Affich=0;
diff --git a/src/GeomFill/GeomFill_CorrectedFrenet.hxx b/src/GeomFill/GeomFill_CorrectedFrenet.hxx
index c18ce73c97..f7a5085ae1 100644
--- a/src/GeomFill/GeomFill_CorrectedFrenet.hxx
+++ b/src/GeomFill/GeomFill_CorrectedFrenet.hxx
@@ -110,7 +110,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_CorrectedFrenet,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_CorrectedFrenet,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_CurveAndTrihedron.cxx b/src/GeomFill/GeomFill_CurveAndTrihedron.cxx
index daaa6edd4d..92f516afc4 100644
--- a/src/GeomFill/GeomFill_CurveAndTrihedron.cxx
+++ b/src/GeomFill/GeomFill_CurveAndTrihedron.cxx
@@ -29,6 +29,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_CurveAndTrihedron,GeomFill_LocationLaw)
+
 //==================================================================
 //Function: Create
 //Purpose :
diff --git a/src/GeomFill/GeomFill_CurveAndTrihedron.hxx b/src/GeomFill/GeomFill_CurveAndTrihedron.hxx
index b60c84f9d2..a92371719c 100644
--- a/src/GeomFill/GeomFill_CurveAndTrihedron.hxx
+++ b/src/GeomFill/GeomFill_CurveAndTrihedron.hxx
@@ -132,7 +132,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_CurveAndTrihedron,GeomFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_CurveAndTrihedron,GeomFill_LocationLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_Darboux.cxx b/src/GeomFill/GeomFill_Darboux.cxx
index 51bceb4520..d11c5f227d 100644
--- a/src/GeomFill/GeomFill_Darboux.cxx
+++ b/src/GeomFill/GeomFill_Darboux.cxx
@@ -35,6 +35,8 @@
 #include <Standard_Type.hxx>
 #include <TColgp_Array2OfVec.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_Darboux,GeomFill_TrihedronLaw)
+
 //=======================================================================
 //function : FDeriv
 //purpose  : computes (F/|F|)'
diff --git a/src/GeomFill/GeomFill_Darboux.hxx b/src/GeomFill/GeomFill_Darboux.hxx
index c2e3a94a12..1f3a50ee6d 100644
--- a/src/GeomFill/GeomFill_Darboux.hxx
+++ b/src/GeomFill/GeomFill_Darboux.hxx
@@ -84,7 +84,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_Darboux,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_Darboux,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_DegeneratedBound.cxx b/src/GeomFill/GeomFill_DegeneratedBound.cxx
index 93f0b6eeed..3ec95f41df 100644
--- a/src/GeomFill/GeomFill_DegeneratedBound.cxx
+++ b/src/GeomFill/GeomFill_DegeneratedBound.cxx
@@ -20,6 +20,8 @@
 #include <gp_Vec.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_DegeneratedBound,GeomFill_Boundary)
+
 //=======================================================================
 //function : GeomFill_DegeneratedBound
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_DegeneratedBound.hxx b/src/GeomFill/GeomFill_DegeneratedBound.hxx
index 1c08073576..392c5ed033 100644
--- a/src/GeomFill/GeomFill_DegeneratedBound.hxx
+++ b/src/GeomFill/GeomFill_DegeneratedBound.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_DegeneratedBound,GeomFill_Boundary)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_DegeneratedBound,GeomFill_Boundary)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_DiscreteTrihedron.cxx b/src/GeomFill/GeomFill_DiscreteTrihedron.cxx
index e41073c4c6..ef9fe3d8be 100755
--- a/src/GeomFill/GeomFill_DiscreteTrihedron.cxx
+++ b/src/GeomFill/GeomFill_DiscreteTrihedron.cxx
@@ -27,6 +27,8 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_DiscreteTrihedron,GeomFill_TrihedronLaw)
+
 static const Standard_Real TolConf = Precision::Confusion();
 
 //=======================================================================
diff --git a/src/GeomFill/GeomFill_DiscreteTrihedron.hxx b/src/GeomFill/GeomFill_DiscreteTrihedron.hxx
index ee487f2205..f3f6149656 100644
--- a/src/GeomFill/GeomFill_DiscreteTrihedron.hxx
+++ b/src/GeomFill/GeomFill_DiscreteTrihedron.hxx
@@ -99,7 +99,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_DiscreteTrihedron,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_DiscreteTrihedron,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_DraftTrihedron.cxx b/src/GeomFill/GeomFill_DraftTrihedron.cxx
index 79c18486fc..14a1390759 100644
--- a/src/GeomFill/GeomFill_DraftTrihedron.cxx
+++ b/src/GeomFill/GeomFill_DraftTrihedron.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_DraftTrihedron,GeomFill_TrihedronLaw)
+
 //=======================================================================
 //function : DDeriv
 //purpose  : computes (F/|F|)''
diff --git a/src/GeomFill/GeomFill_DraftTrihedron.hxx b/src/GeomFill/GeomFill_DraftTrihedron.hxx
index 580da2d1dd..32a353275b 100644
--- a/src/GeomFill/GeomFill_DraftTrihedron.hxx
+++ b/src/GeomFill/GeomFill_DraftTrihedron.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_DraftTrihedron,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_DraftTrihedron,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_EvolvedSection.cxx b/src/GeomFill/GeomFill_EvolvedSection.cxx
index 6a84f8ca86..d8acab5083 100644
--- a/src/GeomFill/GeomFill_EvolvedSection.cxx
+++ b/src/GeomFill/GeomFill_EvolvedSection.cxx
@@ -35,6 +35,8 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_EvolvedSection,GeomFill_SectionLaw)
+
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
 #include <Geom_Curve.hxx>
diff --git a/src/GeomFill/GeomFill_EvolvedSection.hxx b/src/GeomFill/GeomFill_EvolvedSection.hxx
index ff36ec8c85..3b4beabb08 100644
--- a/src/GeomFill/GeomFill_EvolvedSection.hxx
+++ b/src/GeomFill/GeomFill_EvolvedSection.hxx
@@ -148,7 +148,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_EvolvedSection,GeomFill_SectionLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_EvolvedSection,GeomFill_SectionLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_Fixed.cxx b/src/GeomFill/GeomFill_Fixed.cxx
index 9527c5b1c5..ac0ef5971c 100644
--- a/src/GeomFill/GeomFill_Fixed.cxx
+++ b/src/GeomFill/GeomFill_Fixed.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_Fixed,GeomFill_TrihedronLaw)
+
 GeomFill_Fixed::GeomFill_Fixed(const gp_Vec& Tangent,
 			       const gp_Vec& Normal)
 {
diff --git a/src/GeomFill/GeomFill_Fixed.hxx b/src/GeomFill/GeomFill_Fixed.hxx
index 1d4faf7c48..e927a5cac8 100644
--- a/src/GeomFill/GeomFill_Fixed.hxx
+++ b/src/GeomFill/GeomFill_Fixed.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_Fixed,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_Fixed,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_Frenet.cxx b/src/GeomFill/GeomFill_Frenet.cxx
index fe57d026c5..1e3f195a7c 100644
--- a/src/GeomFill/GeomFill_Frenet.cxx
+++ b/src/GeomFill/GeomFill_Frenet.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HArray1OfBoolean.hxx>
 
 #include <algorithm>
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_Frenet,GeomFill_TrihedronLaw)
+
 static const Standard_Real NullTol = 1.e-10;
 static const Standard_Real MaxSingular = 1.e-5;
 
diff --git a/src/GeomFill/GeomFill_Frenet.hxx b/src/GeomFill/GeomFill_Frenet.hxx
index 89275c409f..790df46c18 100644
--- a/src/GeomFill/GeomFill_Frenet.hxx
+++ b/src/GeomFill/GeomFill_Frenet.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_Frenet,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_Frenet,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
index ffd39fe41f..6af14fab11 100644
--- a/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronAC.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_GuideTrihedronAC,GeomFill_TrihedronWithGuide)
+
 //=======================================================================
 //function : GuideTrihedron
 //purpose  : Constructor
diff --git a/src/GeomFill/GeomFill_GuideTrihedronAC.hxx b/src/GeomFill/GeomFill_GuideTrihedronAC.hxx
index 6aa8321f12..bb095b2387 100644
--- a/src/GeomFill/GeomFill_GuideTrihedronAC.hxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronAC.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_GuideTrihedronAC,GeomFill_TrihedronWithGuide)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_GuideTrihedronAC,GeomFill_TrihedronWithGuide)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx b/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx
index 2310ecfcdf..557a7b7f75 100644
--- a/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronPlan.cxx
@@ -38,6 +38,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_GuideTrihedronPlan,GeomFill_TrihedronWithGuide)
+
 //#include <gp_Trsf2d.hxx>
 //#include <Bnd_Box2d.hxx>
 #if DRAW
diff --git a/src/GeomFill/GeomFill_GuideTrihedronPlan.hxx b/src/GeomFill/GeomFill_GuideTrihedronPlan.hxx
index f57baffd39..15b24536e5 100644
--- a/src/GeomFill/GeomFill_GuideTrihedronPlan.hxx
+++ b/src/GeomFill/GeomFill_GuideTrihedronPlan.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_GuideTrihedronPlan,GeomFill_TrihedronWithGuide)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_GuideTrihedronPlan,GeomFill_TrihedronWithGuide)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_Line.cxx b/src/GeomFill/GeomFill_Line.cxx
index de0b2c27d6..a6285c6c7e 100644
--- a/src/GeomFill/GeomFill_Line.cxx
+++ b/src/GeomFill/GeomFill_Line.cxx
@@ -18,6 +18,8 @@
 #include <GeomFill_Line.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_Line,MMgt_TShared)
+
 //=======================================================================
 //function : GeomFill_Line
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_Line.hxx b/src/GeomFill/GeomFill_Line.hxx
index 7b9be5108d..3815f1916b 100644
--- a/src/GeomFill/GeomFill_Line.hxx
+++ b/src/GeomFill/GeomFill_Line.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_Line,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_Line,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_LocationDraft.cxx b/src/GeomFill/GeomFill_LocationDraft.cxx
index e912fab441..7df92bbc1c 100644
--- a/src/GeomFill/GeomFill_LocationDraft.cxx
+++ b/src/GeomFill/GeomFill_LocationDraft.cxx
@@ -43,6 +43,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_LocationDraft,GeomFill_LocationLaw)
+
 //==================================================================
 //Function: GeomFill_LocationDraft
 //Purpose : constructor
diff --git a/src/GeomFill/GeomFill_LocationDraft.hxx b/src/GeomFill/GeomFill_LocationDraft.hxx
index 1c8919cea5..36359e0f6d 100644
--- a/src/GeomFill/GeomFill_LocationDraft.hxx
+++ b/src/GeomFill/GeomFill_LocationDraft.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_LocationDraft,GeomFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_LocationDraft,GeomFill_LocationLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_LocationGuide.cxx b/src/GeomFill/GeomFill_LocationGuide.cxx
index bbbdc1f8e6..ef2664522c 100644
--- a/src/GeomFill/GeomFill_LocationGuide.cxx
+++ b/src/GeomFill/GeomFill_LocationGuide.cxx
@@ -61,6 +61,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_LocationGuide,GeomFill_LocationLaw)
+
 #if DRAW
 static Standard_Integer Affich = 0;
 #include <Approx_Curve3d.hxx>
diff --git a/src/GeomFill/GeomFill_LocationGuide.hxx b/src/GeomFill/GeomFill_LocationGuide.hxx
index 14a0e86830..d0d2d06318 100644
--- a/src/GeomFill/GeomFill_LocationGuide.hxx
+++ b/src/GeomFill/GeomFill_LocationGuide.hxx
@@ -173,7 +173,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_LocationGuide,GeomFill_LocationLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_LocationGuide,GeomFill_LocationLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_LocationLaw.cxx b/src/GeomFill/GeomFill_LocationLaw.cxx
index f705e6e6fd..ac270d8b04 100644
--- a/src/GeomFill/GeomFill_LocationLaw.cxx
+++ b/src/GeomFill/GeomFill_LocationLaw.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_LocationLaw,MMgt_TShared)
+
 Standard_Boolean GeomFill_LocationLaw::D1(const Standard_Real, gp_Mat&, gp_Vec&,gp_Mat&, gp_Vec&,TColgp_Array1OfPnt2d&,TColgp_Array1OfVec2d&) 
 {
   Standard_NotImplemented::Raise("GeomFill_LocationLaw::D1");
diff --git a/src/GeomFill/GeomFill_LocationLaw.hxx b/src/GeomFill/GeomFill_LocationLaw.hxx
index cfdf79ea03..2011e6bfd5 100644
--- a/src/GeomFill/GeomFill_LocationLaw.hxx
+++ b/src/GeomFill/GeomFill_LocationLaw.hxx
@@ -157,7 +157,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_LocationLaw,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_LocationLaw,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_NSections.cxx b/src/GeomFill/GeomFill_NSections.cxx
index c09c04eff1..778f14cda4 100644
--- a/src/GeomFill/GeomFill_NSections.cxx
+++ b/src/GeomFill/GeomFill_NSections.cxx
@@ -49,6 +49,8 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_NSections,GeomFill_SectionLaw)
+
 #ifdef OCCT_DEBUG
 # ifdef DRAW
 #  include <DrawTrSurf.hxx>
diff --git a/src/GeomFill/GeomFill_NSections.hxx b/src/GeomFill/GeomFill_NSections.hxx
index 2c9259a9eb..3e2ede34c5 100644
--- a/src/GeomFill/GeomFill_NSections.hxx
+++ b/src/GeomFill/GeomFill_NSections.hxx
@@ -183,7 +183,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_NSections,GeomFill_SectionLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_NSections,GeomFill_SectionLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_SectionLaw.cxx b/src/GeomFill/GeomFill_SectionLaw.cxx
index 90d3d806c3..236720c38b 100644
--- a/src/GeomFill/GeomFill_SectionLaw.cxx
+++ b/src/GeomFill/GeomFill_SectionLaw.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_SectionLaw,MMgt_TShared)
+
 Standard_Boolean GeomFill_SectionLaw::D1(const Standard_Real,TColgp_Array1OfPnt&,TColgp_Array1OfVec&,TColStd_Array1OfReal&,TColStd_Array1OfReal& ) 
 {
   Standard_NotImplemented::Raise("GeomFill_SectionLaw::D1");
diff --git a/src/GeomFill/GeomFill_SectionLaw.hxx b/src/GeomFill/GeomFill_SectionLaw.hxx
index 278cc22431..b47662e10b 100644
--- a/src/GeomFill/GeomFill_SectionLaw.hxx
+++ b/src/GeomFill/GeomFill_SectionLaw.hxx
@@ -160,7 +160,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_SectionLaw,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_SectionLaw,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_SimpleBound.cxx b/src/GeomFill/GeomFill_SimpleBound.cxx
index 8ff248c659..e2261cbcd6 100644
--- a/src/GeomFill/GeomFill_SimpleBound.cxx
+++ b/src/GeomFill/GeomFill_SimpleBound.cxx
@@ -24,6 +24,8 @@
 #include <Law_Function.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_SimpleBound,GeomFill_Boundary)
+
 //=======================================================================
 //function : GeomFill_SimpleBound
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_SimpleBound.hxx b/src/GeomFill/GeomFill_SimpleBound.hxx
index 097f9b1eed..44b7300dd4 100644
--- a/src/GeomFill/GeomFill_SimpleBound.hxx
+++ b/src/GeomFill/GeomFill_SimpleBound.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_SimpleBound,GeomFill_Boundary)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_SimpleBound,GeomFill_Boundary)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_SweepFunction.cxx b/src/GeomFill/GeomFill_SweepFunction.cxx
index 1a333e36df..609581b344 100644
--- a/src/GeomFill/GeomFill_SweepFunction.cxx
+++ b/src/GeomFill/GeomFill_SweepFunction.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_SequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_SweepFunction,Approx_SweepFunction)
+
 //=======================================================================
 //function : GeomFill_SweepFunction
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_SweepFunction.hxx b/src/GeomFill/GeomFill_SweepFunction.hxx
index 041b0d36f1..75672f562b 100644
--- a/src/GeomFill/GeomFill_SweepFunction.hxx
+++ b/src/GeomFill/GeomFill_SweepFunction.hxx
@@ -132,7 +132,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_SweepFunction,Approx_SweepFunction)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_SweepFunction,Approx_SweepFunction)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_TgtField.cxx b/src/GeomFill/GeomFill_TgtField.cxx
index fb68213ee8..fb80a8219d 100644
--- a/src/GeomFill/GeomFill_TgtField.cxx
+++ b/src/GeomFill/GeomFill_TgtField.cxx
@@ -20,6 +20,8 @@
 #include <Law_BSpline.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_TgtField,MMgt_TShared)
+
 //=======================================================================
 //function : IsScalable
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_TgtField.hxx b/src/GeomFill/GeomFill_TgtField.hxx
index 89dd9272dc..e937ce55a8 100644
--- a/src/GeomFill/GeomFill_TgtField.hxx
+++ b/src/GeomFill/GeomFill_TgtField.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_TgtField,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_TgtField,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_TgtOnCoons.cxx b/src/GeomFill/GeomFill_TgtOnCoons.cxx
index fb13ef6053..d4e0180d77 100644
--- a/src/GeomFill/GeomFill_TgtOnCoons.cxx
+++ b/src/GeomFill/GeomFill_TgtOnCoons.cxx
@@ -21,6 +21,8 @@
 #include <gp_Vec.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_TgtOnCoons,GeomFill_TgtField)
+
 //=======================================================================
 //function : GeomFill_TgtOnCoons
 //purpose  : 
diff --git a/src/GeomFill/GeomFill_TgtOnCoons.hxx b/src/GeomFill/GeomFill_TgtOnCoons.hxx
index f3c9320536..f2dc6cafa2 100644
--- a/src/GeomFill/GeomFill_TgtOnCoons.hxx
+++ b/src/GeomFill/GeomFill_TgtOnCoons.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_TgtOnCoons,GeomFill_TgtField)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_TgtOnCoons,GeomFill_TgtField)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_TrihedronLaw.cxx b/src/GeomFill/GeomFill_TrihedronLaw.cxx
index 7ae9cdcb0b..5334c3ff2e 100644
--- a/src/GeomFill/GeomFill_TrihedronLaw.cxx
+++ b/src/GeomFill/GeomFill_TrihedronLaw.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_TrihedronLaw,MMgt_TShared)
+
 void GeomFill_TrihedronLaw::SetCurve(const Handle(Adaptor3d_HCurve)& C) 
 {
   myCurve = C;
diff --git a/src/GeomFill/GeomFill_TrihedronLaw.hxx b/src/GeomFill/GeomFill_TrihedronLaw.hxx
index 38769270a8..d8f8a19c3d 100644
--- a/src/GeomFill/GeomFill_TrihedronLaw.hxx
+++ b/src/GeomFill/GeomFill_TrihedronLaw.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_TrihedronLaw,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_TrihedronLaw,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_TrihedronWithGuide.cxx b/src/GeomFill/GeomFill_TrihedronWithGuide.cxx
index 8cdeffc349..a9c3edca84 100644
--- a/src/GeomFill/GeomFill_TrihedronWithGuide.cxx
+++ b/src/GeomFill/GeomFill_TrihedronWithGuide.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_TrihedronWithGuide,GeomFill_TrihedronLaw)
+
 Handle(Adaptor3d_HCurve) GeomFill_TrihedronWithGuide::Guide()const
 {
   return myGuide;
diff --git a/src/GeomFill/GeomFill_TrihedronWithGuide.hxx b/src/GeomFill/GeomFill_TrihedronWithGuide.hxx
index bfa927596c..afd0954f76 100644
--- a/src/GeomFill/GeomFill_TrihedronWithGuide.hxx
+++ b/src/GeomFill/GeomFill_TrihedronWithGuide.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_TrihedronWithGuide,GeomFill_TrihedronLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_TrihedronWithGuide,GeomFill_TrihedronLaw)
 
 protected:
 
diff --git a/src/GeomFill/GeomFill_UniformSection.cxx b/src/GeomFill/GeomFill_UniformSection.cxx
index f6a12bdba8..6a50c1ee9b 100644
--- a/src/GeomFill/GeomFill_UniformSection.cxx
+++ b/src/GeomFill/GeomFill_UniformSection.cxx
@@ -34,6 +34,8 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(GeomFill_UniformSection,GeomFill_SectionLaw)
+
 #ifdef DRAW
 #include <DrawTrSurf.hxx>
 #include <Geom_Curve.hxx>
diff --git a/src/GeomFill/GeomFill_UniformSection.hxx b/src/GeomFill/GeomFill_UniformSection.hxx
index e339594852..4bcb2253fe 100644
--- a/src/GeomFill/GeomFill_UniformSection.hxx
+++ b/src/GeomFill/GeomFill_UniformSection.hxx
@@ -148,7 +148,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomFill_UniformSection,GeomFill_SectionLaw)
+  DEFINE_STANDARD_RTTIEXT(GeomFill_UniformSection,GeomFill_SectionLaw)
 
 protected:
 
diff --git a/src/GeomPlate/GeomPlate_CurveConstraint.cxx b/src/GeomPlate/GeomPlate_CurveConstraint.cxx
index 0e3fae5355..2368ee7a66 100644
--- a/src/GeomPlate/GeomPlate_CurveConstraint.cxx
+++ b/src/GeomPlate/GeomPlate_CurveConstraint.cxx
@@ -41,6 +41,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomPlate_CurveConstraint,MMgt_TShared)
+
 //---------------------------------------------------------
 //         Constructeur vide
 //---------------------------------------------------------
diff --git a/src/GeomPlate/GeomPlate_CurveConstraint.hxx b/src/GeomPlate/GeomPlate_CurveConstraint.hxx
index ba1f98b919..ec83068739 100644
--- a/src/GeomPlate/GeomPlate_CurveConstraint.hxx
+++ b/src/GeomPlate/GeomPlate_CurveConstraint.hxx
@@ -160,7 +160,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomPlate_CurveConstraint,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomPlate_CurveConstraint,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomPlate/GeomPlate_PointConstraint.cxx b/src/GeomPlate/GeomPlate_PointConstraint.cxx
index 7d5fe60954..126ff33a3c 100644
--- a/src/GeomPlate/GeomPlate_PointConstraint.cxx
+++ b/src/GeomPlate/GeomPlate_PointConstraint.cxx
@@ -31,6 +31,8 @@
 #include <Standard_ConstructionError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomPlate_PointConstraint,MMgt_TShared)
+
 //---------------------------------------------------------
 //         Constructeurs avec un point 
 //---------------------------------------------------------
diff --git a/src/GeomPlate/GeomPlate_PointConstraint.hxx b/src/GeomPlate/GeomPlate_PointConstraint.hxx
index c82254f735..6ac10b1756 100644
--- a/src/GeomPlate/GeomPlate_PointConstraint.hxx
+++ b/src/GeomPlate/GeomPlate_PointConstraint.hxx
@@ -146,7 +146,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomPlate_PointConstraint,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomPlate_PointConstraint,MMgt_TShared)
 
 protected:
 
diff --git a/src/GeomPlate/GeomPlate_Surface.cxx b/src/GeomPlate/GeomPlate_Surface.cxx
index 7cd5d06482..f083969bf6 100644
--- a/src/GeomPlate/GeomPlate_Surface.cxx
+++ b/src/GeomPlate/GeomPlate_Surface.cxx
@@ -38,6 +38,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomPlate_Surface,Geom_Surface)
+
 //=======================================================================
 //function : GeomPlate_Surface
 //purpose  : 
diff --git a/src/GeomPlate/GeomPlate_Surface.hxx b/src/GeomPlate/GeomPlate_Surface.hxx
index 72b89d1ea5..86dc118282 100644
--- a/src/GeomPlate/GeomPlate_Surface.hxx
+++ b/src/GeomPlate/GeomPlate_Surface.hxx
@@ -267,7 +267,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomPlate_Surface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(GeomPlate_Surface,Geom_Surface)
 
 protected:
 
diff --git a/src/GeomTools/GeomTools_UndefinedTypeHandler.cxx b/src/GeomTools/GeomTools_UndefinedTypeHandler.cxx
index 8f2dd4ca41..cfaa75d007 100644
--- a/src/GeomTools/GeomTools_UndefinedTypeHandler.cxx
+++ b/src/GeomTools/GeomTools_UndefinedTypeHandler.cxx
@@ -21,6 +21,8 @@
 #include <GeomTools_UndefinedTypeHandler.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(GeomTools_UndefinedTypeHandler,MMgt_TShared)
+
 GeomTools_UndefinedTypeHandler::GeomTools_UndefinedTypeHandler()
 {
 }
diff --git a/src/GeomTools/GeomTools_UndefinedTypeHandler.hxx b/src/GeomTools/GeomTools_UndefinedTypeHandler.hxx
index 563d6a848b..43349a8e96 100644
--- a/src/GeomTools/GeomTools_UndefinedTypeHandler.hxx
+++ b/src/GeomTools/GeomTools_UndefinedTypeHandler.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(GeomTools_UndefinedTypeHandler,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(GeomTools_UndefinedTypeHandler,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx b/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx
index b7f82f0d49..53a09ba794 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPoints.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPoints.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPoints::Graphic3d_ArrayOfPoints (const Standard_Integer theMaxVertexs,
                                                   const Standard_Boolean theHasVColors,
                                                   const Standard_Boolean theHasVNormals)
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx b/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
index a0465aa55a..a5ce78e4eb 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPoints.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPoints,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx b/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx
index 9f80a3beb3..7874f79dbb 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolygons.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPolygons.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPolygons::Graphic3d_ArrayOfPolygons (const Standard_Integer theMaxVertexs,
                                                       const Standard_Integer theMaxBounds,
                                                       const Standard_Integer theMaxEdges,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx b/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
index a7acae3f16..8ca1c13520 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolygons.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolygons,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx b/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx
index 64a76a9593..e18d09749b 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolylines.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfPolylines.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfPolylines::Graphic3d_ArrayOfPolylines (const Standard_Integer theMaxVertexs,
                                                         const Standard_Integer theMaxBounds,
                                                         const Standard_Integer theMaxEdges,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx b/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
index c189a26d99..f95cd759c2 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolylines.hxx
@@ -110,7 +110,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPolylines,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
index 4380a11b11..7421d56593 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cxx
@@ -29,6 +29,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfPrimitives,MMgt_TShared)
+
 Graphic3d_ArrayOfPrimitives::Graphic3d_ArrayOfPrimitives (const Graphic3d_TypeOfPrimitiveArray theType,
                                                           const Standard_Integer               theMaxVertexs,
                                                           const Standard_Integer               theMaxBounds,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
index bbd5f67f3f..ac40dabf45 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.hxx
@@ -333,7 +333,7 @@ Standard_Integer AddVertex (const Graphic3d_Vec3& theVertex);
 friend class Graphic3d_Group;
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfPrimitives,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfPrimitives,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx
index f0251551f0..bd954e71e7 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfQuadrangleStrips.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfQuadrangleStrips::Graphic3d_ArrayOfQuadrangleStrips (const Standard_Integer theMaxVertexs,
                                                                       const Standard_Integer theMaxStrips,
                                                                       const Standard_Boolean theHasVNormals,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
index 1621a6d793..c53cadadc8 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangleStrips,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx
index 083e4e4fb4..1e01c228fc 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cxx
@@ -17,6 +17,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfQuadrangles::Graphic3d_ArrayOfQuadrangles (const Standard_Integer theMaxVertexs,
                                                             const Standard_Integer theMaxEdges,
                                                             const Standard_Boolean theHasVNormals,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
index 7687602673..8fa4004610 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfQuadrangles,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx b/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx
index f2d8cc5128..f711238fb4 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfSegments.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfSegments.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfSegments::Graphic3d_ArrayOfSegments (const Standard_Integer theMaxVertexs,
                                                       const Standard_Integer theMaxEdges,
                                                       const Standard_Boolean theHasVColors)
diff --git a/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx b/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
index b3402fd69e..a8b99e8dee 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfSegments.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfSegments,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx
index d070984e03..7808e02801 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangleFans.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangleFans::Graphic3d_ArrayOfTriangleFans (const Standard_Integer theMaxVertexs,
                                                               const Standard_Integer theMaxFans,
                                                               const Standard_Boolean theHasVNormals,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
index 52d2503b42..1feeb33c08 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleFans,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx
index 443709251c..058dff1ff7 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangleStrips.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangleStrips::Graphic3d_ArrayOfTriangleStrips (const Standard_Integer theMaxVertexs,
                                                                   const Standard_Integer theMaxStrips,
                                                                   const Standard_Boolean theHasVNormals,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
index 40ef639abe..617c4eabaa 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangleStrips,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx b/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx
index 6116939967..da69bfa020 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangles.cxx
@@ -16,6 +16,8 @@
 #include <Graphic3d_ArrayOfTriangles.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)
+
 Graphic3d_ArrayOfTriangles::Graphic3d_ArrayOfTriangles (const Standard_Integer theMaxVertexs,
                                                         const Standard_Integer theMaxEdges,
                                                         const Standard_Boolean theHasVNormals,
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx b/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
index e5288b9bb6..e671fd91ab 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangles.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ArrayOfTriangles,Graphic3d_ArrayOfPrimitives)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
index db54203bdb..75727db894 100644
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cxx
@@ -32,6 +32,8 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)
+
 Graphic3d_AspectFillArea3d::Graphic3d_AspectFillArea3d ():
 DistinguishModeActive (Standard_False), EdgeModeActive (Standard_False), BackFaceRemovalActive (Standard_False),  MyTextureMapState(Standard_False), MyFrontMaterial (), MyBackMaterial ()
 {
diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx b/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx
index 1f84e6bb58..9ba2b47c4d 100644
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.hxx
@@ -171,7 +171,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectFillArea3d,Aspect_AspectFillArea)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_AspectLine3d.cxx b/src/Graphic3d/Graphic3d_AspectLine3d.cxx
index b39ca3edf6..df1c48013e 100644
--- a/src/Graphic3d/Graphic3d_AspectLine3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectLine3d.cxx
@@ -30,6 +30,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectLine3d,Aspect_AspectLine)
+
 //-Aliases
 //-Global data definitions
 //-Constructors
diff --git a/src/Graphic3d/Graphic3d_AspectLine3d.hxx b/src/Graphic3d/Graphic3d_AspectLine3d.hxx
index 707b7651ff..197269d142 100644
--- a/src/Graphic3d/Graphic3d_AspectLine3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectLine3d.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_AspectLine3d,Aspect_AspectLine)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectLine3d,Aspect_AspectLine)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_AspectMarker3d.cxx b/src/Graphic3d/Graphic3d_AspectMarker3d.cxx
index e46124ea58..f0b24e67c3 100644
--- a/src/Graphic3d/Graphic3d_AspectMarker3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectMarker3d.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfByte.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectMarker3d,Aspect_AspectMarker)
+
 // =======================================================================
 // function : Graphic3d_AspectMarker3d
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_AspectMarker3d.hxx b/src/Graphic3d/Graphic3d_AspectMarker3d.hxx
index f7e5d7b8ea..a28eca10b8 100644
--- a/src/Graphic3d/Graphic3d_AspectMarker3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectMarker3d.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_AspectMarker3d,Aspect_AspectMarker)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectMarker3d,Aspect_AspectMarker)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_AspectText3d.cxx b/src/Graphic3d/Graphic3d_AspectText3d.cxx
index beff35926c..00dfc9bcc5 100644
--- a/src/Graphic3d/Graphic3d_AspectText3d.cxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.cxx
@@ -35,6 +35,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_AspectText3d,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //  -- la font utilisee
diff --git a/src/Graphic3d/Graphic3d_AspectText3d.hxx b/src/Graphic3d/Graphic3d_AspectText3d.hxx
index 09ae080a68..4bb65b4537 100644
--- a/src/Graphic3d/Graphic3d_AspectText3d.hxx
+++ b/src/Graphic3d/Graphic3d_AspectText3d.hxx
@@ -143,7 +143,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_AspectText3d,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_AspectText3d,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_BoundBuffer.hxx b/src/Graphic3d/Graphic3d_BoundBuffer.hxx
index d1286774f2..18f74f756f 100644
--- a/src/Graphic3d/Graphic3d_BoundBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_BoundBuffer.hxx
@@ -65,7 +65,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_BoundBuffer, NCollection_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_BoundBuffer,NCollection_Buffer) // Type definition
 
 };
 
diff --git a/src/Graphic3d/Graphic3d_Buffer.hxx b/src/Graphic3d/Graphic3d_Buffer.hxx
index c849c682fe..a8e6fbbb8d 100644
--- a/src/Graphic3d/Graphic3d_Buffer.hxx
+++ b/src/Graphic3d/Graphic3d_Buffer.hxx
@@ -203,7 +203,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Buffer, NCollection_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_Buffer,NCollection_Buffer) // Type definition
 
 };
 
diff --git a/src/Graphic3d/Graphic3d_CStructure.cxx b/src/Graphic3d/Graphic3d_CStructure.cxx
index 6cd50092d9..4826060e7a 100644
--- a/src/Graphic3d/Graphic3d_CStructure.cxx
+++ b/src/Graphic3d/Graphic3d_CStructure.cxx
@@ -19,6 +19,8 @@
 #include <Graphic3d_TransModeFlags.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient)
+
 //=============================================================================
 //function : Graphic3d_CStructure
 //purpose  :
diff --git a/src/Graphic3d/Graphic3d_CStructure.hxx b/src/Graphic3d/Graphic3d_CStructure.hxx
index 18d30ab543..cc2bee3625 100644
--- a/src/Graphic3d/Graphic3d_CStructure.hxx
+++ b/src/Graphic3d/Graphic3d_CStructure.hxx
@@ -160,7 +160,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_CStructure, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_CStructure,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Graphic3d/Graphic3d_CView.cxx b/src/Graphic3d/Graphic3d_CView.cxx
index ed4f057ef8..f2868ee97e 100644
--- a/src/Graphic3d/Graphic3d_CView.cxx
+++ b/src/Graphic3d/Graphic3d_CView.cxx
@@ -15,6 +15,8 @@
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 #include <Graphic3d_StructureManager.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_CView,Graphic3d_DataStructureManager)
+
 //=======================================================================
 //function : Constructor
 //purpose  :
diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index 414cfdf4c1..8eaefed26e 100644
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -570,7 +570,7 @@ protected:
 
 private:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_CView, Graphic3d_DataStructureManager)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_CView,Graphic3d_DataStructureManager)
 };
 
 #endif // _Graphic3d_CView_HeaderFile
diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx
index a4689ccb64..d5e531b3c5 100644
--- a/src/Graphic3d/Graphic3d_Camera.cxx
+++ b/src/Graphic3d/Graphic3d_Camera.cxx
@@ -26,6 +26,8 @@
 #include <NCollection_Sequence.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient)
+
 namespace
 {
   // (degrees -> radians) * 0.5
diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx
index a83df8ccd0..39604147fe 100644
--- a/src/Graphic3d/Graphic3d_Camera.hxx
+++ b/src/Graphic3d/Graphic3d_Camera.hxx
@@ -637,7 +637,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Camera, Standard_Transient);
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Camera,Standard_Transient);
 };
 
 DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient)
diff --git a/src/Graphic3d/Graphic3d_ClipPlane.cxx b/src/Graphic3d/Graphic3d_ClipPlane.cxx
index 2776bcac54..bed8508dd1 100755
--- a/src/Graphic3d/Graphic3d_ClipPlane.cxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Atomic.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient)
+
 namespace
 {
   static volatile Standard_Integer THE_CLIP_PLANE_COUNTER = 0;
diff --git a/src/Graphic3d/Graphic3d_ClipPlane.hxx b/src/Graphic3d/Graphic3d_ClipPlane.hxx
index ef05c0981a..318c335ced 100755
--- a/src/Graphic3d/Graphic3d_ClipPlane.hxx
+++ b/src/Graphic3d/Graphic3d_ClipPlane.hxx
@@ -218,7 +218,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ClipPlane, Standard_Transient);
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ClipPlane,Standard_Transient);
 };
 
 DEFINE_STANDARD_HANDLE (Graphic3d_ClipPlane, Standard_Transient)
diff --git a/src/Graphic3d/Graphic3d_DataStructureManager.cxx b/src/Graphic3d/Graphic3d_DataStructureManager.cxx
index 8092994a7d..77afe37046 100644
--- a/src/Graphic3d/Graphic3d_DataStructureManager.cxx
+++ b/src/Graphic3d/Graphic3d_DataStructureManager.cxx
@@ -25,6 +25,8 @@
 #include <Graphic3d_DataStructureManager.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
+
 //-Aliases
 //-Global data definitions
 //-Constructors
diff --git a/src/Graphic3d/Graphic3d_DataStructureManager.hxx b/src/Graphic3d/Graphic3d_DataStructureManager.hxx
index 21050abdcd..f2e1025605 100644
--- a/src/Graphic3d/Graphic3d_DataStructureManager.hxx
+++ b/src/Graphic3d/Graphic3d_DataStructureManager.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_DataStructureManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_DataStructureManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_GraphicDriver.cxx b/src/Graphic3d/Graphic3d_GraphicDriver.cxx
index 3960d6694f..89ef87f13b 100644
--- a/src/Graphic3d/Graphic3d_GraphicDriver.cxx
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.cxx
@@ -16,6 +16,8 @@
 
 #include <Graphic3d_GraphicDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_GraphicDriver,MMgt_TShared)
+
 // =======================================================================
 // function : Graphic3d_GraphicDriver
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_GraphicDriver.hxx b/src/Graphic3d/Graphic3d_GraphicDriver.hxx
index edbbe0cd1d..f81e9f4da8 100644
--- a/src/Graphic3d/Graphic3d_GraphicDriver.hxx
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.hxx
@@ -139,7 +139,7 @@ public:
   
   Standard_EXPORT void ResetDeviceLostFlag();
 
-  DEFINE_STANDARD_RTTI(Graphic3d_GraphicDriver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_GraphicDriver,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Group.cxx b/src/Graphic3d/Graphic3d_Group.cxx
index 42ad428d7e..6b13361c53 100644
--- a/src/Graphic3d/Graphic3d_Group.cxx
+++ b/src/Graphic3d/Graphic3d_Group.cxx
@@ -39,6 +39,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
+
 #define MyContainsFacet myCBitFields.bool2
 
 // =======================================================================
diff --git a/src/Graphic3d/Graphic3d_Group.hxx b/src/Graphic3d/Graphic3d_Group.hxx
index a73e918d09..277c0d8e24 100644
--- a/src/Graphic3d/Graphic3d_Group.hxx
+++ b/src/Graphic3d/Graphic3d_Group.hxx
@@ -298,7 +298,7 @@ public:
 friend class Graphic3d_Structure;
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Group,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Group,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_IndexBuffer.hxx b/src/Graphic3d/Graphic3d_IndexBuffer.hxx
index c860d6d892..f6b7448f8d 100644
--- a/src/Graphic3d/Graphic3d_IndexBuffer.hxx
+++ b/src/Graphic3d/Graphic3d_IndexBuffer.hxx
@@ -72,7 +72,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_IndexBuffer, Graphic3d_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Graphic3d_IndexBuffer,Graphic3d_Buffer) // Type definition
 
 };
 
diff --git a/src/Graphic3d/Graphic3d_MarkerImage.cxx b/src/Graphic3d/Graphic3d_MarkerImage.cxx
index 436494c4ea..fd5eb6cd4f 100755
--- a/src/Graphic3d/Graphic3d_MarkerImage.cxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Atomic.hxx>
 #include <TColStd_HArray1OfByte.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_MarkerImage,Standard_Transient)
+
 namespace
 {
   static volatile Standard_Integer THE_MARKER_IMAGE_COUNTER = 0;
diff --git a/src/Graphic3d/Graphic3d_MarkerImage.hxx b/src/Graphic3d/Graphic3d_MarkerImage.hxx
index 75e89a2a8e..3296dee046 100755
--- a/src/Graphic3d/Graphic3d_MarkerImage.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx
@@ -78,7 +78,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_MarkerImage, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_MarkerImage,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Graphic3d/Graphic3d_ShaderObject.cxx b/src/Graphic3d/Graphic3d_ShaderObject.cxx
index e78cbca359..adf7944362 100755
--- a/src/Graphic3d/Graphic3d_ShaderObject.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.cxx
@@ -19,6 +19,8 @@
 #include <Graphic3d_ShaderObject.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderObject,Standard_Transient)
+
 namespace
 {
   static volatile Standard_Integer THE_SHADER_OBJECT_COUNTER = 0;
diff --git a/src/Graphic3d/Graphic3d_ShaderObject.hxx b/src/Graphic3d/Graphic3d_ShaderObject.hxx
index 2050720a7b..4bf0130048 100755
--- a/src/Graphic3d/Graphic3d_ShaderObject.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderObject.hxx
@@ -60,7 +60,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderObject, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderObject,Standard_Transient)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ShaderProgram.cxx b/src/Graphic3d/Graphic3d_ShaderProgram.cxx
index f44e609e78..1d14d4ceff 100755
--- a/src/Graphic3d/Graphic3d_ShaderProgram.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.cxx
@@ -24,6 +24,8 @@
 #include <OSD_File.hxx>
 #include <OSD_Path.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderProgram,Standard_Transient)
+
 namespace
 {
   static volatile Standard_Integer THE_PROGRAM_OBJECT_COUNTER = 0;
diff --git a/src/Graphic3d/Graphic3d_ShaderProgram.hxx b/src/Graphic3d/Graphic3d_ShaderProgram.hxx
index 1627308234..890b240c11 100755
--- a/src/Graphic3d/Graphic3d_ShaderProgram.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderProgram.hxx
@@ -101,7 +101,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderProgram, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderProgram,Standard_Transient)
 
 private:
 
diff --git a/src/Graphic3d/Graphic3d_ShaderVariable.cxx b/src/Graphic3d/Graphic3d_ShaderVariable.cxx
index 7ba40bd37e..7d1e77d754 100755
--- a/src/Graphic3d/Graphic3d_ShaderVariable.cxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.cxx
@@ -18,6 +18,8 @@
 #include <Graphic3d_ShaderVariable.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ShaderVariable,Standard_Transient)
+
 // Specific instantiations of struct templates to avoid compilation warnings
 template struct Graphic3d_UniformValue<Standard_Integer>;
 template struct Graphic3d_UniformValue<Standard_ShortReal>;
diff --git a/src/Graphic3d/Graphic3d_ShaderVariable.hxx b/src/Graphic3d/Graphic3d_ShaderVariable.hxx
index 517f82532b..df6f27942e 100755
--- a/src/Graphic3d/Graphic3d_ShaderVariable.hxx
+++ b/src/Graphic3d/Graphic3d_ShaderVariable.hxx
@@ -144,7 +144,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI (Graphic3d_ShaderVariable, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ShaderVariable,Standard_Transient)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx
index 27401943d0..a32663511a 100644
--- a/src/Graphic3d/Graphic3d_Structure.cxx
+++ b/src/Graphic3d/Graphic3d_Structure.cxx
@@ -40,6 +40,8 @@
 #include <TColStd_Array2OfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Structure,MMgt_TShared)
+
 //=============================================================================
 //function : Graphic3d_Structure
 //purpose  :
diff --git a/src/Graphic3d/Graphic3d_Structure.hxx b/src/Graphic3d/Graphic3d_Structure.hxx
index a7cc8922a7..2fdc75f6e9 100644
--- a/src/Graphic3d/Graphic3d_Structure.hxx
+++ b/src/Graphic3d/Graphic3d_Structure.hxx
@@ -487,7 +487,7 @@ public:
 friend class Graphic3d_Group;
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Structure,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Structure,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_StructureManager.cxx b/src/Graphic3d/Graphic3d_StructureManager.cxx
index 7f506e6e7c..d858c23e1b 100644
--- a/src/Graphic3d/Graphic3d_StructureManager.cxx
+++ b/src/Graphic3d/Graphic3d_StructureManager.cxx
@@ -34,12 +34,15 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_StructureManager,MMgt_TShared)
+
 static Standard_Boolean Initialisation = Standard_True;
 static int StructureManager_ArrayId[StructureManager_MAX];
 static Standard_Integer StructureManager_CurrentId = 0;
 
 #include "Graphic3d_Structure.pxx"
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
+#include <Graphic3d_CView.hxx>
 
 Graphic3d_StructureManager::Graphic3d_StructureManager (const Handle(Graphic3d_GraphicDriver)& theDriver)
 : myViewGenId (0, 31)
diff --git a/src/Graphic3d/Graphic3d_StructureManager.hxx b/src/Graphic3d/Graphic3d_StructureManager.hxx
index fadac9e993..1892bf86c2 100644
--- a/src/Graphic3d/Graphic3d_StructureManager.hxx
+++ b/src/Graphic3d/Graphic3d_StructureManager.hxx
@@ -232,7 +232,7 @@ public:
 
   friend class Graphic3d_Structure;
 
-  DEFINE_STANDARD_RTTI(Graphic3d_StructureManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_StructureManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture1D.cxx b/src/Graphic3d/Graphic3d_Texture1D.cxx
index a497859a13..66b20c9cfa 100644
--- a/src/Graphic3d/Graphic3d_Texture1D.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1D,Graphic3d_TextureMap)
+
 static const char *NameOfTexture_to_FileName[] =
 {
   "1d_elevation.rgb"
diff --git a/src/Graphic3d/Graphic3d_Texture1D.hxx b/src/Graphic3d/Graphic3d_Texture1D.hxx
index 9d2420fd93..cf65ca67ba 100644
--- a/src/Graphic3d/Graphic3d_Texture1D.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1D.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1D,Graphic3d_TextureMap)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1D,Graphic3d_TextureMap)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx b/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx
index ed3e442d15..c7992d5ef4 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dmanual.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)
+
 // =======================================================================
 // function : Graphic3d_Texture1Dmanual
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx b/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx
index 184a5c299f..a13c8f5655 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dmanual.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1Dmanual,Graphic3d_Texture1D)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx b/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx
index 9097ba7cbe..41e134f867 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dsegment.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)
+
 // =======================================================================
 // function : Graphic3d_Texture1Dsegment
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx b/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx
index 068cab8db6..274f3902c6 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx
+++ b/src/Graphic3d/Graphic3d_Texture1Dsegment.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture1Dsegment,Graphic3d_Texture1D)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture2D.cxx b/src/Graphic3d/Graphic3d_Texture2D.cxx
index b4724f88b2..8fda9a28e5 100644
--- a/src/Graphic3d/Graphic3d_Texture2D.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2D,Graphic3d_TextureMap)
+
 static const char *NameOfTexture_to_FileName[] =
 {
   "2d_MatraDatavision.rgb",
diff --git a/src/Graphic3d/Graphic3d_Texture2D.hxx b/src/Graphic3d/Graphic3d_Texture2D.hxx
index 71db6bad7e..773dcd9e7c 100644
--- a/src/Graphic3d/Graphic3d_Texture2D.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2D.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2D,Graphic3d_TextureMap)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2D,Graphic3d_TextureMap)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx b/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx
index f50e883040..89c38fd0b4 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dmanual.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)
+
 // =======================================================================
 // function : Graphic3d_Texture2Dmanual
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx b/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx
index a623a763a8..a7917e842f 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dmanual.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2Dmanual,Graphic3d_Texture2D)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_Texture2Dplane.cxx b/src/Graphic3d/Graphic3d_Texture2Dplane.cxx
index d88df466a4..9e599a8dee 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dplane.cxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dplane.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)
+
 // =======================================================================
 // function : Graphic3d_Texture2Dplane
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_Texture2Dplane.hxx b/src/Graphic3d/Graphic3d_Texture2Dplane.hxx
index ede0fee5cf..aec405fa60 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dplane.hxx
+++ b/src/Graphic3d/Graphic3d_Texture2Dplane.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_Texture2Dplane,Graphic3d_Texture2D)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_TextureEnv.cxx b/src/Graphic3d/Graphic3d_TextureEnv.cxx
index 8ff4b183e8..bbda33247b 100644
--- a/src/Graphic3d/Graphic3d_TextureEnv.cxx
+++ b/src/Graphic3d/Graphic3d_TextureEnv.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureEnv,Graphic3d_TextureRoot)
+
 static const char *NameOfTexture_to_FileName[] =
 {
   "env_clouds.rgb",
diff --git a/src/Graphic3d/Graphic3d_TextureEnv.hxx b/src/Graphic3d/Graphic3d_TextureEnv.hxx
index d94a2cba3b..76ef1f0825 100644
--- a/src/Graphic3d/Graphic3d_TextureEnv.hxx
+++ b/src/Graphic3d/Graphic3d_TextureEnv.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_TextureEnv,Graphic3d_TextureRoot)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureEnv,Graphic3d_TextureRoot)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_TextureMap.cxx b/src/Graphic3d/Graphic3d_TextureMap.cxx
index cdcaf90260..bdbc13d85b 100644
--- a/src/Graphic3d/Graphic3d_TextureMap.cxx
+++ b/src/Graphic3d/Graphic3d_TextureMap.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureMap,Graphic3d_TextureRoot)
+
 // =======================================================================
 // function : Graphic3d_TextureMap
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_TextureMap.hxx b/src/Graphic3d/Graphic3d_TextureMap.hxx
index 3b8b7a8b68..b394f77300 100644
--- a/src/Graphic3d/Graphic3d_TextureMap.hxx
+++ b/src/Graphic3d/Graphic3d_TextureMap.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_TextureMap,Graphic3d_TextureRoot)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureMap,Graphic3d_TextureRoot)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_TextureParams.cxx b/src/Graphic3d/Graphic3d_TextureParams.cxx
index e181e44631..178f39b95c 100644
--- a/src/Graphic3d/Graphic3d_TextureParams.cxx
+++ b/src/Graphic3d/Graphic3d_TextureParams.cxx
@@ -15,6 +15,8 @@
 #include <Graphic3d_TextureParams.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureParams,Standard_Transient)
+
 // =======================================================================
 // function : Graphic3d_TextureParams
 // purpose  :
diff --git a/src/Graphic3d/Graphic3d_TextureParams.hxx b/src/Graphic3d/Graphic3d_TextureParams.hxx
index 1b86810f3b..2215f1352b 100644
--- a/src/Graphic3d/Graphic3d_TextureParams.hxx
+++ b/src/Graphic3d/Graphic3d_TextureParams.hxx
@@ -110,7 +110,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_TextureParams,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureParams,Standard_Transient)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_TextureRoot.cxx b/src/Graphic3d/Graphic3d_TextureRoot.cxx
index f2197e8f91..249ee30401 100644
--- a/src/Graphic3d/Graphic3d_TextureRoot.cxx
+++ b/src/Graphic3d/Graphic3d_TextureRoot.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_TextureRoot,MMgt_TShared)
+
 namespace
 {
   static volatile Standard_Integer THE_TEXTURE_COUNTER = 0;
diff --git a/src/Graphic3d/Graphic3d_TextureRoot.hxx b/src/Graphic3d/Graphic3d_TextureRoot.hxx
index 1bb6dc090c..1d62390549 100644
--- a/src/Graphic3d/Graphic3d_TextureRoot.hxx
+++ b/src/Graphic3d/Graphic3d_TextureRoot.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Graphic3d_TextureRoot,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_TextureRoot,MMgt_TShared)
 
 protected:
 
diff --git a/src/Graphic3d/Graphic3d_ViewAffinity.cxx b/src/Graphic3d/Graphic3d_ViewAffinity.cxx
index 58623a77e2..10e4206971 100644
--- a/src/Graphic3d/Graphic3d_ViewAffinity.cxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.cxx
@@ -16,3 +16,5 @@
 #include <Graphic3d_ViewAffinity.hxx>
 
 
+
+IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient)
\ No newline at end of file
diff --git a/src/Graphic3d/Graphic3d_ViewAffinity.hxx b/src/Graphic3d/Graphic3d_ViewAffinity.hxx
index 9de09532bd..41bd9503c8 100644
--- a/src/Graphic3d/Graphic3d_ViewAffinity.hxx
+++ b/src/Graphic3d/Graphic3d_ViewAffinity.hxx
@@ -65,7 +65,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Graphic3d_ViewAffinity, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Graphic3d_ViewAffinity,Standard_Transient)
 
 };
 
diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx b/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx
index 10e0387972..9c1cbe19c6 100644
--- a/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx
+++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx
@@ -22,6 +22,8 @@
 #include <HLRAlgo_EdgesBlock.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_EdgesBlock,MMgt_TShared)
+
 //=======================================================================
 //function : HLRAlgo_EdgesBlock
 //purpose  : 
diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.hxx b/src/HLRAlgo/HLRAlgo_EdgesBlock.hxx
index 7b37b192f6..3aa1286f45 100644
--- a/src/HLRAlgo/HLRAlgo_EdgesBlock.hxx
+++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_EdgesBlock,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_EdgesBlock,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx b/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx
index 2e8729e6ee..c50d45f647 100644
--- a/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx
@@ -28,6 +28,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyAlgo,MMgt_TShared)
+
 #define EMskGrALin1  ((Standard_Boolean)   8)
 #define EMskGrALin2  ((Standard_Boolean)  16)
 #define EMskGrALin3  ((Standard_Boolean)  32)
diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.hxx b/src/HLRAlgo/HLRAlgo_PolyAlgo.hxx
index 8c2e61ebb7..f987a31a97 100644
--- a/src/HLRAlgo/HLRAlgo_PolyAlgo.hxx
+++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_PolyAlgo,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_PolyAlgo,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cxx b/src/HLRAlgo/HLRAlgo_PolyData.cxx
index 77a88578dc..043f5ec839 100644
--- a/src/HLRAlgo/HLRAlgo_PolyData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyData.cxx
@@ -23,6 +23,8 @@
 #include <HLRAlgo_PolyData.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyData,MMgt_TShared)
+
 #define EMskGrALin1  ((Standard_Boolean)   8)
 #define EMskGrALin2  ((Standard_Boolean)  16)
 #define EMskGrALin3  ((Standard_Boolean)  32)
diff --git a/src/HLRAlgo/HLRAlgo_PolyData.hxx b/src/HLRAlgo/HLRAlgo_PolyData.hxx
index f086bf3d34..ae67fcc321 100644
--- a/src/HLRAlgo/HLRAlgo_PolyData.hxx
+++ b/src/HLRAlgo/HLRAlgo_PolyData.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_PolyData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_PolyData,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
index e52d34b000..f174de72f6 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Stream.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyInternalData,MMgt_TShared)
+
 #define Tri1Node1 ((Standard_Integer*)Tri1Indices)[0]
 #define Tri1Node2 ((Standard_Integer*)Tri1Indices)[1]
 #define Tri1Node3 ((Standard_Integer*)Tri1Indices)[2]
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.hxx b/src/HLRAlgo/HLRAlgo_PolyInternalData.hxx
index 3d2a99b3f0..599d1cbf37 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalData.hxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_PolyInternalData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_PolyInternalData,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx
index b558935f2f..f57e36e417 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cxx
@@ -17,3 +17,5 @@
 
 #include <HLRAlgo_PolyInternalNode.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyInternalNode,MMgt_TShared)
\ No newline at end of file
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.hxx b/src/HLRAlgo/HLRAlgo_PolyInternalNode.hxx
index e4d85146df..cb09fd99c8 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.hxx
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_PolyInternalNode,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_PolyInternalNode,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.cxx b/src/HLRAlgo/HLRAlgo_PolyShellData.cxx
index 419444adcc..924a9a76a6 100644
--- a/src/HLRAlgo/HLRAlgo_PolyShellData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyShellData.cxx
@@ -25,6 +25,8 @@
 #include <HLRAlgo_PolyShellData.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_PolyShellData,MMgt_TShared)
+
 #define PntX1  ((Standard_Real*)Coordinates)[ 0]
 #define PntY1  ((Standard_Real*)Coordinates)[ 1]
 #define PntZ1  ((Standard_Real*)Coordinates)[ 2]
diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.hxx b/src/HLRAlgo/HLRAlgo_PolyShellData.hxx
index fcb76f809c..c458fb5fba 100644
--- a/src/HLRAlgo/HLRAlgo_PolyShellData.hxx
+++ b/src/HLRAlgo/HLRAlgo_PolyShellData.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_PolyShellData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_PolyShellData,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.cxx b/src/HLRAlgo/HLRAlgo_WiresBlock.cxx
index d4bc81fc34..ee2a661c76 100644
--- a/src/HLRAlgo/HLRAlgo_WiresBlock.cxx
+++ b/src/HLRAlgo/HLRAlgo_WiresBlock.cxx
@@ -23,6 +23,8 @@
 #include <HLRAlgo_WiresBlock.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRAlgo_WiresBlock,MMgt_TShared)
+
 //=======================================================================
 //function : HLRAlgo_WiresBlock
 //purpose  : 
diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.hxx b/src/HLRAlgo/HLRAlgo_WiresBlock.hxx
index fa9113af33..4f91bde7d7 100644
--- a/src/HLRAlgo/HLRAlgo_WiresBlock.hxx
+++ b/src/HLRAlgo/HLRAlgo_WiresBlock.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRAlgo_WiresBlock,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRAlgo_WiresBlock,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRBRep/HLRBRep_Algo.cxx b/src/HLRBRep/HLRBRep_Algo.cxx
index 37a7614b02..dd5d2cd20d 100644
--- a/src/HLRBRep/HLRBRep_Algo.cxx
+++ b/src/HLRBRep/HLRBRep_Algo.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_Algo,HLRBRep_InternalAlgo)
+
 //=======================================================================
 //function : HLRBRep_Algo
 //purpose  : 
diff --git a/src/HLRBRep/HLRBRep_Algo.hxx b/src/HLRBRep/HLRBRep_Algo.hxx
index fe4c414632..5660f2870f 100644
--- a/src/HLRBRep/HLRBRep_Algo.hxx
+++ b/src/HLRBRep/HLRBRep_Algo.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRBRep_Algo,HLRBRep_InternalAlgo)
+  DEFINE_STANDARD_RTTIEXT(HLRBRep_Algo,HLRBRep_InternalAlgo)
 
 protected:
 
diff --git a/src/HLRBRep/HLRBRep_AreaLimit.cxx b/src/HLRBRep/HLRBRep_AreaLimit.cxx
index 5558d3d750..46cd2225b3 100644
--- a/src/HLRBRep/HLRBRep_AreaLimit.cxx
+++ b/src/HLRBRep/HLRBRep_AreaLimit.cxx
@@ -19,6 +19,8 @@
 #include <HLRBRep_AreaLimit.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_AreaLimit,MMgt_TShared)
+
 //=======================================================================
 //function : HLRBRep_AreaLimit
 //purpose  : 
diff --git a/src/HLRBRep/HLRBRep_AreaLimit.hxx b/src/HLRBRep/HLRBRep_AreaLimit.hxx
index e513c1a0f0..d2c7ee2bca 100644
--- a/src/HLRBRep/HLRBRep_AreaLimit.hxx
+++ b/src/HLRBRep/HLRBRep_AreaLimit.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRBRep_AreaLimit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRBRep_AreaLimit,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx
index 4d73476be6..c19a76fcfc 100644
--- a/src/HLRBRep/HLRBRep_Data.cxx
+++ b/src/HLRBRep/HLRBRep_Data.cxx
@@ -41,6 +41,8 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_Data,MMgt_TShared)
+
 Standard_Integer nbOkIntersection;
 Standard_Integer nbPtIntersection;
 Standard_Integer nbSegIntersection;
diff --git a/src/HLRBRep/HLRBRep_Data.hxx b/src/HLRBRep/HLRBRep_Data.hxx
index 258d0d4412..72ee999565 100644
--- a/src/HLRBRep/HLRBRep_Data.hxx
+++ b/src/HLRBRep/HLRBRep_Data.hxx
@@ -182,7 +182,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRBRep_Data,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRBRep_Data,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cxx b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
index 23e299764a..63a149dfbc 100644
--- a/src/HLRBRep/HLRBRep_InternalAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_InternalAlgo.cxx
@@ -31,6 +31,8 @@
 #include <TColStd_Array1OfReal.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_InternalAlgo,MMgt_TShared)
+
 extern Standard_Integer nbPtIntersection;   // total P.I.
 extern Standard_Integer nbSegIntersection;  // total S.I
 extern Standard_Integer nbClassification;   // total classification
diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.hxx b/src/HLRBRep/HLRBRep_InternalAlgo.hxx
index 07e97863b7..f1687f53c8 100644
--- a/src/HLRBRep/HLRBRep_InternalAlgo.hxx
+++ b/src/HLRBRep/HLRBRep_InternalAlgo.hxx
@@ -129,7 +129,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRBRep_InternalAlgo,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRBRep_InternalAlgo,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
index 9b8d75d870..8e60740002 100644
--- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx
@@ -54,6 +54,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
+
 #define EMskOutLin1  ((Standard_Boolean)   1)
 #define EMskOutLin2  ((Standard_Boolean)   2)
 #define EMskOutLin3  ((Standard_Boolean)   4)
diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.hxx b/src/HLRBRep/HLRBRep_PolyAlgo.hxx
index 68fd49a207..f5ce88a0fa 100644
--- a/src/HLRBRep/HLRBRep_PolyAlgo.hxx
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.hxx
@@ -184,7 +184,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRBRep_PolyAlgo,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRBRep_PolyAlgo,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRTest/HLRTest_DrawableEdgeTool.cxx b/src/HLRTest/HLRTest_DrawableEdgeTool.cxx
index 91d18e88ba..7dd3625bf6 100644
--- a/src/HLRTest/HLRTest_DrawableEdgeTool.cxx
+++ b/src/HLRTest/HLRTest_DrawableEdgeTool.cxx
@@ -25,6 +25,8 @@
 #include <HLRTest_ShapeData.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTest_DrawableEdgeTool,Draw_Drawable3D)
+
 //=======================================================================
 //function : HLRTest_DrawableEdgeTool
 //purpose  : 
diff --git a/src/HLRTest/HLRTest_DrawableEdgeTool.hxx b/src/HLRTest/HLRTest_DrawableEdgeTool.hxx
index b82efc3d17..13bda2481e 100644
--- a/src/HLRTest/HLRTest_DrawableEdgeTool.hxx
+++ b/src/HLRTest/HLRTest_DrawableEdgeTool.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTest_DrawableEdgeTool,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(HLRTest_DrawableEdgeTool,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cxx b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cxx
index 10712e56f9..2be29eb5cf 100644
--- a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cxx
+++ b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cxx
@@ -27,6 +27,8 @@
 #include <OSD_Chronometer.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTest_DrawablePolyEdgeTool,Draw_Drawable3D)
+
 #define PntX1 ((Standard_Real*)Coordinates)[0]
 #define PntY1 ((Standard_Real*)Coordinates)[1]
 #define PntZ1 ((Standard_Real*)Coordinates)[2]
diff --git a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx
index 3ce5f8e4cf..f310527a33 100644
--- a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx
+++ b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTest_DrawablePolyEdgeTool,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(HLRTest_DrawablePolyEdgeTool,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/HLRTest/HLRTest_OutLiner.cxx b/src/HLRTest/HLRTest_OutLiner.cxx
index bc8f1dd9d6..465bc02ffa 100644
--- a/src/HLRTest/HLRTest_OutLiner.cxx
+++ b/src/HLRTest/HLRTest_OutLiner.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTest_OutLiner,Draw_Drawable3D)
+
 //=======================================================================
 //function : HLRTest_OutLiner
 //purpose  : 
diff --git a/src/HLRTest/HLRTest_OutLiner.hxx b/src/HLRTest/HLRTest_OutLiner.hxx
index d968bc8f2d..ffec6f5114 100644
--- a/src/HLRTest/HLRTest_OutLiner.hxx
+++ b/src/HLRTest/HLRTest_OutLiner.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTest_OutLiner,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(HLRTest_OutLiner,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/HLRTest/HLRTest_Projector.cxx b/src/HLRTest/HLRTest_Projector.cxx
index f37361182c..e90bab7bff 100644
--- a/src/HLRTest/HLRTest_Projector.cxx
+++ b/src/HLRTest/HLRTest_Projector.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Stream.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTest_Projector,Draw_Drawable3D)
+
 //=======================================================================
 //function : HLRTest_Projector
 //purpose  : 
diff --git a/src/HLRTest/HLRTest_Projector.hxx b/src/HLRTest/HLRTest_Projector.hxx
index 80a8a1cbbc..bd967dd53f 100644
--- a/src/HLRTest/HLRTest_Projector.hxx
+++ b/src/HLRTest/HLRTest_Projector.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTest_Projector,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(HLRTest_Projector,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/HLRTest/HLRTest_ShapeData.cxx b/src/HLRTest/HLRTest_ShapeData.cxx
index d8c40c4c07..edb1ea6f5a 100644
--- a/src/HLRTest/HLRTest_ShapeData.cxx
+++ b/src/HLRTest/HLRTest_ShapeData.cxx
@@ -19,6 +19,8 @@
 #include <HLRTest_ShapeData.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTest_ShapeData,MMgt_TShared)
+
 //=======================================================================
 //function : HLRTest_ShapeData
 //purpose  : 
diff --git a/src/HLRTest/HLRTest_ShapeData.hxx b/src/HLRTest/HLRTest_ShapeData.hxx
index 2d1ba53d14..1b6d91c4e5 100644
--- a/src/HLRTest/HLRTest_ShapeData.hxx
+++ b/src/HLRTest/HLRTest_ShapeData.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTest_ShapeData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRTest_ShapeData,MMgt_TShared)
 
 protected:
 
diff --git a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx
index 33d3d17af6..ee010a730a 100644
--- a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx
+++ b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cxx
@@ -38,6 +38,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HLRTopoBRep_OutLiner,MMgt_TShared)
+
 //=======================================================================
 //function : OutLiner
 //purpose  : 
diff --git a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.hxx b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.hxx
index 49caa312eb..2aa3c79334 100644
--- a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.hxx
+++ b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HLRTopoBRep_OutLiner,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HLRTopoBRep_OutLiner,MMgt_TShared)
 
 protected:
 
diff --git a/src/HeaderSection/HeaderSection_FileDescription.cxx b/src/HeaderSection/HeaderSection_FileDescription.cxx
index 3fa793dc3a..4f52316d96 100644
--- a/src/HeaderSection/HeaderSection_FileDescription.cxx
+++ b/src/HeaderSection/HeaderSection_FileDescription.cxx
@@ -16,6 +16,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HeaderSection_FileDescription,MMgt_TShared)
+
 HeaderSection_FileDescription::HeaderSection_FileDescription ()  {}
 
 void HeaderSection_FileDescription::Init(
diff --git a/src/HeaderSection/HeaderSection_FileDescription.hxx b/src/HeaderSection/HeaderSection_FileDescription.hxx
index 5134d2b118..cb6851169e 100644
--- a/src/HeaderSection/HeaderSection_FileDescription.hxx
+++ b/src/HeaderSection/HeaderSection_FileDescription.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HeaderSection_FileDescription,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HeaderSection_FileDescription,MMgt_TShared)
 
 protected:
 
diff --git a/src/HeaderSection/HeaderSection_FileName.cxx b/src/HeaderSection/HeaderSection_FileName.cxx
index cef1d26794..f427492b6e 100644
--- a/src/HeaderSection/HeaderSection_FileName.cxx
+++ b/src/HeaderSection/HeaderSection_FileName.cxx
@@ -16,6 +16,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HeaderSection_FileName,MMgt_TShared)
+
 HeaderSection_FileName::HeaderSection_FileName ()  {}
 
 void HeaderSection_FileName::Init(
diff --git a/src/HeaderSection/HeaderSection_FileName.hxx b/src/HeaderSection/HeaderSection_FileName.hxx
index dcaf0685a5..18cfe9bf56 100644
--- a/src/HeaderSection/HeaderSection_FileName.hxx
+++ b/src/HeaderSection/HeaderSection_FileName.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HeaderSection_FileName,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HeaderSection_FileName,MMgt_TShared)
 
 protected:
 
diff --git a/src/HeaderSection/HeaderSection_FileSchema.cxx b/src/HeaderSection/HeaderSection_FileSchema.cxx
index 9d7c1792d9..4c0d1026ed 100644
--- a/src/HeaderSection/HeaderSection_FileSchema.cxx
+++ b/src/HeaderSection/HeaderSection_FileSchema.cxx
@@ -16,6 +16,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HeaderSection_FileSchema,MMgt_TShared)
+
 HeaderSection_FileSchema::HeaderSection_FileSchema ()  {}
 
 void HeaderSection_FileSchema::Init(
diff --git a/src/HeaderSection/HeaderSection_FileSchema.hxx b/src/HeaderSection/HeaderSection_FileSchema.hxx
index 573ddc521f..b9c137e728 100644
--- a/src/HeaderSection/HeaderSection_FileSchema.hxx
+++ b/src/HeaderSection/HeaderSection_FileSchema.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HeaderSection_FileSchema,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(HeaderSection_FileSchema,MMgt_TShared)
 
 protected:
 
diff --git a/src/HeaderSection/HeaderSection_HeaderRecognizer.cxx b/src/HeaderSection/HeaderSection_HeaderRecognizer.cxx
index 1a19427393..47e6ce8ad4 100644
--- a/src/HeaderSection/HeaderSection_HeaderRecognizer.cxx
+++ b/src/HeaderSection/HeaderSection_HeaderRecognizer.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HeaderSection_HeaderRecognizer,StepData_FileRecognizer)
+
 static TCollection_AsciiString reco_FileName    ("FILE_NAME");
 static TCollection_AsciiString reco_FileSchema ("FILE_SCHEMA");
 static TCollection_AsciiString reco_FileDescription ("FILE_DESCRIPTION");
diff --git a/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx b/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx
index 97f69670bc..6fdba9b595 100644
--- a/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx
+++ b/src/HeaderSection/HeaderSection_HeaderRecognizer.hxx
@@ -40,7 +40,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HeaderSection_HeaderRecognizer,StepData_FileRecognizer)
+  DEFINE_STANDARD_RTTIEXT(HeaderSection_HeaderRecognizer,StepData_FileRecognizer)
 
 protected:
 
diff --git a/src/HeaderSection/HeaderSection_Protocol.cxx b/src/HeaderSection/HeaderSection_Protocol.cxx
index 5f92cdf4a5..c43908ce37 100644
--- a/src/HeaderSection/HeaderSection_Protocol.cxx
+++ b/src/HeaderSection/HeaderSection_Protocol.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <StepData_UndefinedEntity.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(HeaderSection_Protocol,StepData_Protocol)
+
 static Standard_CString schemaName = "header_section";
 
 HeaderSection_Protocol::HeaderSection_Protocol () { }
diff --git a/src/HeaderSection/HeaderSection_Protocol.hxx b/src/HeaderSection/HeaderSection_Protocol.hxx
index eb0ff3fb58..4ee81ac65d 100644
--- a/src/HeaderSection/HeaderSection_Protocol.hxx
+++ b/src/HeaderSection/HeaderSection_Protocol.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(HeaderSection_Protocol,StepData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(HeaderSection_Protocol,StepData_Protocol)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Act.cxx b/src/IFSelect/IFSelect_Act.cxx
index d1f74cc2d7..aacb291d77 100644
--- a/src/IFSelect/IFSelect_Act.cxx
+++ b/src/IFSelect/IFSelect_Act.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Act,IFSelect_Activator)
+
 static TCollection_AsciiString thedefgr, thedefil;
 
 
diff --git a/src/IFSelect/IFSelect_Act.hxx b/src/IFSelect/IFSelect_Act.hxx
index adfb5a9fe8..af2705c2d9 100644
--- a/src/IFSelect/IFSelect_Act.hxx
+++ b/src/IFSelect/IFSelect_Act.hxx
@@ -85,7 +85,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Act,IFSelect_Activator)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Act,IFSelect_Activator)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Activator.cxx b/src/IFSelect/IFSelect_Activator.cxx
index 474f0f5bc5..f703792921 100644
--- a/src/IFSelect/IFSelect_Activator.cxx
+++ b/src/IFSelect/IFSelect_Activator.cxx
@@ -26,6 +26,8 @@
 #include <TColStd_SequenceOfInteger.hxx>
 #include <TColStd_SequenceOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Activator,MMgt_TShared)
+
 static Handle(Dico_DictionaryOfInteger) thedico; // = new Dico_DictionaryOfInteger;
 static TColStd_SequenceOfInteger   thenums, themodes;
 static TColStd_SequenceOfTransient theacts;
diff --git a/src/IFSelect/IFSelect_Activator.hxx b/src/IFSelect/IFSelect_Activator.hxx
index fce062dc8a..f24a9278d2 100644
--- a/src/IFSelect/IFSelect_Activator.hxx
+++ b/src/IFSelect/IFSelect_Activator.hxx
@@ -134,7 +134,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Activator,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Activator,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_AppliedModifiers.cxx b/src/IFSelect/IFSelect_AppliedModifiers.cxx
index 6d7b0af42d..52a626c610 100644
--- a/src/IFSelect/IFSelect_AppliedModifiers.cxx
+++ b/src/IFSelect/IFSelect_AppliedModifiers.cxx
@@ -16,6 +16,8 @@
 #include <IFSelect_GeneralModifier.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_AppliedModifiers,MMgt_TShared)
+
 IFSelect_AppliedModifiers::IFSelect_AppliedModifiers
   (const Standard_Integer nbmax, const Standard_Integer nbent)
     : thelists (nbmax+1)
diff --git a/src/IFSelect/IFSelect_AppliedModifiers.hxx b/src/IFSelect/IFSelect_AppliedModifiers.hxx
index 4ee393cbe2..30cc44ae5c 100644
--- a/src/IFSelect/IFSelect_AppliedModifiers.hxx
+++ b/src/IFSelect/IFSelect_AppliedModifiers.hxx
@@ -106,7 +106,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_AppliedModifiers,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_AppliedModifiers,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_BasicDumper.cxx b/src/IFSelect/IFSelect_BasicDumper.cxx
index e0cbba6694..7883f84f5e 100644
--- a/src/IFSelect/IFSelect_BasicDumper.cxx
+++ b/src/IFSelect/IFSelect_BasicDumper.cxx
@@ -42,6 +42,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_BasicDumper,IFSelect_SessionDumper)
+
 //#include <IFSelect_SelectTextType.hxx>
 #define FIRSTCHAR 1
 // Param litteral "own" sous la forme  :"<val>" -> first = 3
diff --git a/src/IFSelect/IFSelect_BasicDumper.hxx b/src/IFSelect/IFSelect_BasicDumper.hxx
index fb67d68ba3..f89baf13ab 100644
--- a/src/IFSelect/IFSelect_BasicDumper.hxx
+++ b/src/IFSelect/IFSelect_BasicDumper.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_BasicDumper,IFSelect_SessionDumper)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_BasicDumper,IFSelect_SessionDumper)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_CheckCounter.cxx b/src/IFSelect/IFSelect_CheckCounter.cxx
index f56e9f0423..fa683f23c9 100644
--- a/src/IFSelect/IFSelect_CheckCounter.cxx
+++ b/src/IFSelect/IFSelect_CheckCounter.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_CheckCounter,IFSelect_SignatureList)
+
 //=======================================================================
 //function : IFSelect_CheckCounter
 //purpose  : 
diff --git a/src/IFSelect/IFSelect_CheckCounter.hxx b/src/IFSelect/IFSelect_CheckCounter.hxx
index a785470da9..a22733b061 100644
--- a/src/IFSelect/IFSelect_CheckCounter.hxx
+++ b/src/IFSelect/IFSelect_CheckCounter.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_CheckCounter,IFSelect_SignatureList)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_CheckCounter,IFSelect_SignatureList)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_DispGlobal.cxx b/src/IFSelect/IFSelect_DispGlobal.cxx
index 866e6b5241..a5fbbf25ad 100644
--- a/src/IFSelect/IFSelect_DispGlobal.cxx
+++ b/src/IFSelect/IFSelect_DispGlobal.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_DispGlobal,IFSelect_Dispatch)
+
 // Genere un seul paquet avec la sortie finale
 IFSelect_DispGlobal::IFSelect_DispGlobal ()    {  }
 
diff --git a/src/IFSelect/IFSelect_DispGlobal.hxx b/src/IFSelect/IFSelect_DispGlobal.hxx
index 955e179a99..16a91137db 100644
--- a/src/IFSelect/IFSelect_DispGlobal.hxx
+++ b/src/IFSelect/IFSelect_DispGlobal.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_DispGlobal,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_DispGlobal,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_DispPerCount.cxx b/src/IFSelect/IFSelect_DispPerCount.cxx
index a177604d08..aa553ac8cf 100644
--- a/src/IFSelect/IFSelect_DispPerCount.cxx
+++ b/src/IFSelect/IFSelect_DispPerCount.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_DispPerCount,IFSelect_Dispatch)
+
 IFSelect_DispPerCount::IFSelect_DispPerCount ()    {  }
 
     Handle(IFSelect_IntParam)  IFSelect_DispPerCount::Count () const 
diff --git a/src/IFSelect/IFSelect_DispPerCount.hxx b/src/IFSelect/IFSelect_DispPerCount.hxx
index 811e208adb..1ab70f97b2 100644
--- a/src/IFSelect/IFSelect_DispPerCount.hxx
+++ b/src/IFSelect/IFSelect_DispPerCount.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_DispPerCount,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_DispPerCount,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_DispPerFiles.cxx b/src/IFSelect/IFSelect_DispPerFiles.cxx
index 290bba3a09..f0c37fe3f3 100644
--- a/src/IFSelect/IFSelect_DispPerFiles.cxx
+++ b/src/IFSelect/IFSelect_DispPerFiles.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_DispPerFiles,IFSelect_Dispatch)
+
 IFSelect_DispPerFiles::IFSelect_DispPerFiles ()    {  }
 
     Handle(IFSelect_IntParam)  IFSelect_DispPerFiles::Count () const 
diff --git a/src/IFSelect/IFSelect_DispPerFiles.hxx b/src/IFSelect/IFSelect_DispPerFiles.hxx
index ce4774fc10..062e7489d0 100644
--- a/src/IFSelect/IFSelect_DispPerFiles.hxx
+++ b/src/IFSelect/IFSelect_DispPerFiles.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_DispPerFiles,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_DispPerFiles,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_DispPerOne.cxx b/src/IFSelect/IFSelect_DispPerOne.cxx
index 6bc1a6f634..3e0aaece32 100644
--- a/src/IFSelect/IFSelect_DispPerOne.cxx
+++ b/src/IFSelect/IFSelect_DispPerOne.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_DispPerOne,IFSelect_Dispatch)
+
 //  Genere un paquet par racine (strong comp.) locale a la liste transmise
 IFSelect_DispPerOne::IFSelect_DispPerOne ()    {  }
 
diff --git a/src/IFSelect/IFSelect_DispPerOne.hxx b/src/IFSelect/IFSelect_DispPerOne.hxx
index c6b15e4a16..8b805d5d7d 100644
--- a/src/IFSelect/IFSelect_DispPerOne.hxx
+++ b/src/IFSelect/IFSelect_DispPerOne.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_DispPerOne,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_DispPerOne,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_DispPerSignature.cxx b/src/IFSelect/IFSelect_DispPerSignature.cxx
index a977c744bd..9668d042a4 100644
--- a/src/IFSelect/IFSelect_DispPerSignature.cxx
+++ b/src/IFSelect/IFSelect_DispPerSignature.cxx
@@ -26,6 +26,8 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_DispPerSignature,IFSelect_Dispatch)
+
 IFSelect_DispPerSignature::IFSelect_DispPerSignature ()    {  }
 
     Handle(IFSelect_SignCounter)  IFSelect_DispPerSignature::SignCounter () const
diff --git a/src/IFSelect/IFSelect_DispPerSignature.hxx b/src/IFSelect/IFSelect_DispPerSignature.hxx
index 840390ed1d..0601a540c8 100644
--- a/src/IFSelect/IFSelect_DispPerSignature.hxx
+++ b/src/IFSelect/IFSelect_DispPerSignature.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_DispPerSignature,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_DispPerSignature,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Dispatch.cxx b/src/IFSelect/IFSelect_Dispatch.cxx
index 2450084550..7e39615ffe 100644
--- a/src/IFSelect/IFSelect_Dispatch.cxx
+++ b/src/IFSelect/IFSelect_Dispatch.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Dispatch,MMgt_TShared)
+
 void  IFSelect_Dispatch::SetRootName
   (const Handle(TCollection_HAsciiString)& name)
 {
diff --git a/src/IFSelect/IFSelect_Dispatch.hxx b/src/IFSelect/IFSelect_Dispatch.hxx
index c3915ecca3..c360bac3a1 100644
--- a/src/IFSelect/IFSelect_Dispatch.hxx
+++ b/src/IFSelect/IFSelect_Dispatch.hxx
@@ -138,7 +138,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Dispatch,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Dispatch,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_EditForm.cxx b/src/IFSelect/IFSelect_EditForm.cxx
index 8c204ac55e..73415b884c 100644
--- a/src/IFSelect/IFSelect_EditForm.cxx
+++ b/src/IFSelect/IFSelect_EditForm.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HSequenceOfHAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_EditForm,MMgt_TShared)
+
 IFSelect_EditForm::IFSelect_EditForm
   (const Handle(IFSelect_Editor)& editor,
    const Standard_Boolean readonly, const Standard_Boolean undoable,
diff --git a/src/IFSelect/IFSelect_EditForm.hxx b/src/IFSelect/IFSelect_EditForm.hxx
index 1417b0e91a..5623548cd8 100644
--- a/src/IFSelect/IFSelect_EditForm.hxx
+++ b/src/IFSelect/IFSelect_EditForm.hxx
@@ -284,7 +284,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_EditForm,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_EditForm,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Editor.cxx b/src/IFSelect/IFSelect_Editor.cxx
index c2ab0a7371..a5cf629848 100644
--- a/src/IFSelect/IFSelect_Editor.cxx
+++ b/src/IFSelect/IFSelect_Editor.cxx
@@ -27,6 +27,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Editor,MMgt_TShared)
+
 IFSelect_Editor::IFSelect_Editor (const Standard_Integer nbval)
     : thenbval (nbval) , themaxsh (0) , themaxco (0) , themaxla (0) ,
       thevalues (1,nbval) , theshorts (1,nbval) , themodes (1,nbval) ,
diff --git a/src/IFSelect/IFSelect_Editor.hxx b/src/IFSelect/IFSelect_Editor.hxx
index bb247eac58..1e95d96c59 100644
--- a/src/IFSelect/IFSelect_Editor.hxx
+++ b/src/IFSelect/IFSelect_Editor.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Editor,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Editor,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_GeneralModifier.cxx b/src/IFSelect/IFSelect_GeneralModifier.cxx
index 3a146e0e55..26bad6a67c 100644
--- a/src/IFSelect/IFSelect_GeneralModifier.cxx
+++ b/src/IFSelect/IFSelect_GeneralModifier.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_GeneralModifier,MMgt_TShared)
+
 IFSelect_GeneralModifier::IFSelect_GeneralModifier
   (const Standard_Boolean maychangegraph)    {  thechgr = maychangegraph;  }
 
diff --git a/src/IFSelect/IFSelect_GeneralModifier.hxx b/src/IFSelect/IFSelect_GeneralModifier.hxx
index 5f44cd508c..6b11e7fe29 100644
--- a/src/IFSelect/IFSelect_GeneralModifier.hxx
+++ b/src/IFSelect/IFSelect_GeneralModifier.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_GeneralModifier,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_GeneralModifier,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_GraphCounter.cxx b/src/IFSelect/IFSelect_GraphCounter.cxx
index 06dc661447..a5aa6f8824 100644
--- a/src/IFSelect/IFSelect_GraphCounter.cxx
+++ b/src/IFSelect/IFSelect_GraphCounter.cxx
@@ -21,6 +21,8 @@
 
 #include <stdio.h>
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_GraphCounter,IFSelect_SignCounter)
+
 IFSelect_GraphCounter::IFSelect_GraphCounter
   (const Standard_Boolean withmap, const Standard_Boolean withlist)
   : IFSelect_SignCounter (withmap,withlist)  {  }
diff --git a/src/IFSelect/IFSelect_GraphCounter.hxx b/src/IFSelect/IFSelect_GraphCounter.hxx
index 6c6b2d3706..60a01c626b 100644
--- a/src/IFSelect/IFSelect_GraphCounter.hxx
+++ b/src/IFSelect/IFSelect_GraphCounter.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_GraphCounter,IFSelect_SignCounter)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_GraphCounter,IFSelect_SignCounter)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_IntParam.cxx b/src/IFSelect/IFSelect_IntParam.cxx
index 51de0470c1..a300fa509b 100644
--- a/src/IFSelect/IFSelect_IntParam.cxx
+++ b/src/IFSelect/IFSelect_IntParam.cxx
@@ -16,6 +16,8 @@
 #include <Interface_Static.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_IntParam,MMgt_TShared)
+
 IFSelect_IntParam::IFSelect_IntParam ()
       {  theval = 0;  }
 
diff --git a/src/IFSelect/IFSelect_IntParam.hxx b/src/IFSelect/IFSelect_IntParam.hxx
index 4c0d010c37..6dccb51a1c 100644
--- a/src/IFSelect/IFSelect_IntParam.hxx
+++ b/src/IFSelect/IFSelect_IntParam.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_IntParam,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_IntParam,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ListEditor.cxx b/src/IFSelect/IFSelect_ListEditor.cxx
index 8a2abf915c..78c7be68c3 100644
--- a/src/IFSelect/IFSelect_ListEditor.cxx
+++ b/src/IFSelect/IFSelect_ListEditor.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ListEditor,MMgt_TShared)
+
 IFSelect_ListEditor::IFSelect_ListEditor  ()
 : themax (0) , thetouc (0)  {  }
 
diff --git a/src/IFSelect/IFSelect_ListEditor.hxx b/src/IFSelect/IFSelect_ListEditor.hxx
index a2817240ed..c42631dd85 100644
--- a/src/IFSelect/IFSelect_ListEditor.hxx
+++ b/src/IFSelect/IFSelect_ListEditor.hxx
@@ -143,7 +143,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ListEditor,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ListEditor,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ModelCopier.cxx b/src/IFSelect/IFSelect_ModelCopier.cxx
index 1293842b2a..278eca1949 100644
--- a/src/IFSelect/IFSelect_ModelCopier.cxx
+++ b/src/IFSelect/IFSelect_ModelCopier.cxx
@@ -38,6 +38,8 @@
 #include <TColStd_HSequenceOfInteger.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ModelCopier,MMgt_TShared)
+
 //#define MISOPOINT
 IFSelect_ModelCopier::IFSelect_ModelCopier ()    {  }
 
diff --git a/src/IFSelect/IFSelect_ModelCopier.hxx b/src/IFSelect/IFSelect_ModelCopier.hxx
index beab50b9b5..6b486549a9 100644
--- a/src/IFSelect/IFSelect_ModelCopier.hxx
+++ b/src/IFSelect/IFSelect_ModelCopier.hxx
@@ -207,7 +207,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ModelCopier,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ModelCopier,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ModifEditForm.cxx b/src/IFSelect/IFSelect_ModifEditForm.cxx
index f71af8ac94..8a731b33bb 100644
--- a/src/IFSelect/IFSelect_ModifEditForm.cxx
+++ b/src/IFSelect/IFSelect_ModifEditForm.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ModifEditForm,IFSelect_Modifier)
+
 IFSelect_ModifEditForm::IFSelect_ModifEditForm
   (const Handle(IFSelect_EditForm)& editform)
     : IFSelect_Modifier (Standard_False)    {  theedit = editform;  }
diff --git a/src/IFSelect/IFSelect_ModifEditForm.hxx b/src/IFSelect/IFSelect_ModifEditForm.hxx
index c56e0c86af..3965d1a2a6 100644
--- a/src/IFSelect/IFSelect_ModifEditForm.hxx
+++ b/src/IFSelect/IFSelect_ModifEditForm.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ModifEditForm,IFSelect_Modifier)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ModifEditForm,IFSelect_Modifier)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ModifReorder.cxx b/src/IFSelect/IFSelect_ModifReorder.cxx
index 211252aeca..76f675e7ea 100644
--- a/src/IFSelect/IFSelect_ModifReorder.cxx
+++ b/src/IFSelect/IFSelect_ModifReorder.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ModifReorder,IFSelect_Modifier)
+
 IFSelect_ModifReorder::IFSelect_ModifReorder (const Standard_Boolean rootlast)
     : IFSelect_Modifier (Standard_True)    {  thertl = rootlast;  }
 
diff --git a/src/IFSelect/IFSelect_ModifReorder.hxx b/src/IFSelect/IFSelect_ModifReorder.hxx
index a09fe62a2b..b974c6bf2a 100644
--- a/src/IFSelect/IFSelect_ModifReorder.hxx
+++ b/src/IFSelect/IFSelect_ModifReorder.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ModifReorder,IFSelect_Modifier)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ModifReorder,IFSelect_Modifier)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Modifier.cxx b/src/IFSelect/IFSelect_Modifier.cxx
index 244b7a392f..eeebc1ec5b 100644
--- a/src/IFSelect/IFSelect_Modifier.cxx
+++ b/src/IFSelect/IFSelect_Modifier.cxx
@@ -19,5 +19,7 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Modifier,IFSelect_GeneralModifier)
+
 IFSelect_Modifier::IFSelect_Modifier (const Standard_Boolean grf)
     : IFSelect_GeneralModifier (grf)    {  }
diff --git a/src/IFSelect/IFSelect_Modifier.hxx b/src/IFSelect/IFSelect_Modifier.hxx
index 61d099f952..71be4d71ca 100644
--- a/src/IFSelect/IFSelect_Modifier.hxx
+++ b/src/IFSelect/IFSelect_Modifier.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Modifier,IFSelect_GeneralModifier)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Modifier,IFSelect_GeneralModifier)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_PacketList.cxx b/src/IFSelect/IFSelect_PacketList.cxx
index 024fba29c4..84969ab606 100644
--- a/src/IFSelect/IFSelect_PacketList.cxx
+++ b/src/IFSelect/IFSelect_PacketList.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_PacketList,MMgt_TShared)
+
 IFSelect_PacketList::IFSelect_PacketList
   (const Handle(Interface_InterfaceModel)& model)
     : thedupls (0,model->NbEntities()) , 
diff --git a/src/IFSelect/IFSelect_PacketList.hxx b/src/IFSelect/IFSelect_PacketList.hxx
index e01daa1f21..be14217f71 100644
--- a/src/IFSelect/IFSelect_PacketList.hxx
+++ b/src/IFSelect/IFSelect_PacketList.hxx
@@ -106,7 +106,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_PacketList,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_PacketList,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ParamEditor.cxx b/src/IFSelect/IFSelect_ParamEditor.cxx
index 756980c789..3380692fb0 100644
--- a/src/IFSelect/IFSelect_ParamEditor.cxx
+++ b/src/IFSelect/IFSelect_ParamEditor.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ParamEditor,IFSelect_Editor)
+
 IFSelect_ParamEditor::IFSelect_ParamEditor
   (const Standard_Integer nbmax, const Standard_CString label)
 : IFSelect_Editor (nbmax) , thelabel (label)
diff --git a/src/IFSelect/IFSelect_ParamEditor.hxx b/src/IFSelect/IFSelect_ParamEditor.hxx
index 5bc27e1281..3386be0ca5 100644
--- a/src/IFSelect/IFSelect_ParamEditor.hxx
+++ b/src/IFSelect/IFSelect_ParamEditor.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ParamEditor,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ParamEditor,IFSelect_Editor)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectAnyList.cxx b/src/IFSelect/IFSelect_SelectAnyList.cxx
index 89d7a41421..cc3a0422e2 100644
--- a/src/IFSelect/IFSelect_SelectAnyList.cxx
+++ b/src/IFSelect/IFSelect_SelectAnyList.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectAnyList,IFSelect_SelectDeduct)
+
 // ....    Definition de liste : methodes "deferred" NbItems & FillResult
 void  IFSelect_SelectAnyList::SetRange
   (const Handle(IFSelect_IntParam)& rankfrom,
diff --git a/src/IFSelect/IFSelect_SelectAnyList.hxx b/src/IFSelect/IFSelect_SelectAnyList.hxx
index 28d6964743..87c61b144b 100644
--- a/src/IFSelect/IFSelect_SelectAnyList.hxx
+++ b/src/IFSelect/IFSelect_SelectAnyList.hxx
@@ -131,7 +131,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectAnyList,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectAnyList,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectAnyType.cxx b/src/IFSelect/IFSelect_SelectAnyType.cxx
index 2825cc6aff..be63842af2 100644
--- a/src/IFSelect/IFSelect_SelectAnyType.cxx
+++ b/src/IFSelect/IFSelect_SelectAnyType.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectAnyType,IFSelect_SelectExtract)
+
 Standard_Boolean  IFSelect_SelectAnyType::Sort
   (const Standard_Integer , const Handle(Standard_Transient)& ent,
    const Handle(Interface_InterfaceModel)& ) const 
diff --git a/src/IFSelect/IFSelect_SelectAnyType.hxx b/src/IFSelect/IFSelect_SelectAnyType.hxx
index 8c1546e516..94f6dac663 100644
--- a/src/IFSelect/IFSelect_SelectAnyType.hxx
+++ b/src/IFSelect/IFSelect_SelectAnyType.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectAnyType,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectAnyType,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectBase.cxx b/src/IFSelect/IFSelect_SelectBase.cxx
index de239152c0..6b15b09c89 100644
--- a/src/IFSelect/IFSelect_SelectBase.cxx
+++ b/src/IFSelect/IFSelect_SelectBase.cxx
@@ -16,6 +16,8 @@
 #include <IFSelect_SelectionIterator.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectBase,IFSelect_Selection)
+
 void  IFSelect_SelectBase::FillIterator
   (IFSelect_SelectionIterator& ) const 
       {  }   // rien a faire, une SelectBase ne depend d aucune autre Selection
diff --git a/src/IFSelect/IFSelect_SelectBase.hxx b/src/IFSelect/IFSelect_SelectBase.hxx
index 779bfc332f..841e43d17f 100644
--- a/src/IFSelect/IFSelect_SelectBase.hxx
+++ b/src/IFSelect/IFSelect_SelectBase.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectBase,IFSelect_Selection)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectBase,IFSelect_Selection)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectCombine.cxx b/src/IFSelect/IFSelect_SelectCombine.cxx
index 0f5c0aba26..f72253bfd2 100644
--- a/src/IFSelect/IFSelect_SelectCombine.cxx
+++ b/src/IFSelect/IFSelect_SelectCombine.cxx
@@ -18,6 +18,8 @@
 #include <IFSelect_SelectionIterator.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectCombine,IFSelect_Selection)
+
 IFSelect_SelectCombine::IFSelect_SelectCombine ()    {  }
 //      {  thelist = new IFSelect_SequenceOfSelection();  }
 
diff --git a/src/IFSelect/IFSelect_SelectCombine.hxx b/src/IFSelect/IFSelect_SelectCombine.hxx
index 7623aa7056..6ccb254d96 100644
--- a/src/IFSelect/IFSelect_SelectCombine.hxx
+++ b/src/IFSelect/IFSelect_SelectCombine.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectCombine,IFSelect_Selection)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectCombine,IFSelect_Selection)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectControl.cxx b/src/IFSelect/IFSelect_SelectControl.cxx
index 5628630823..e9239cdf1e 100644
--- a/src/IFSelect/IFSelect_SelectControl.cxx
+++ b/src/IFSelect/IFSelect_SelectControl.cxx
@@ -17,6 +17,8 @@
 #include <IFSelect_SelectionIterator.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectControl,IFSelect_Selection)
+
 Handle(IFSelect_Selection)  IFSelect_SelectControl::MainInput () const 
       {  return themain;  }
 
diff --git a/src/IFSelect/IFSelect_SelectControl.hxx b/src/IFSelect/IFSelect_SelectControl.hxx
index 454f612b09..581d736cc2 100644
--- a/src/IFSelect/IFSelect_SelectControl.hxx
+++ b/src/IFSelect/IFSelect_SelectControl.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectControl,IFSelect_Selection)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectControl,IFSelect_Selection)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectDeduct.cxx b/src/IFSelect/IFSelect_SelectDeduct.cxx
index 88b5e5dea3..ce5c55b892 100644
--- a/src/IFSelect/IFSelect_SelectDeduct.cxx
+++ b/src/IFSelect/IFSelect_SelectDeduct.cxx
@@ -21,6 +21,8 @@
 #include <Interface_InterfaceError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectDeduct,IFSelect_Selection)
+
 void  IFSelect_SelectDeduct::SetInput (const Handle(IFSelect_Selection)& sel)
       {  thesel = sel;  }
 
diff --git a/src/IFSelect/IFSelect_SelectDeduct.hxx b/src/IFSelect/IFSelect_SelectDeduct.hxx
index ebda639d99..793a0418f1 100644
--- a/src/IFSelect/IFSelect_SelectDeduct.hxx
+++ b/src/IFSelect/IFSelect_SelectDeduct.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectDeduct,IFSelect_Selection)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectDeduct,IFSelect_Selection)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectDiff.cxx b/src/IFSelect/IFSelect_SelectDiff.cxx
index 189c074b81..4c23ec358f 100644
--- a/src/IFSelect/IFSelect_SelectDiff.cxx
+++ b/src/IFSelect/IFSelect_SelectDiff.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectDiff,IFSelect_SelectControl)
+
 IFSelect_SelectDiff::IFSelect_SelectDiff ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectDiff.hxx b/src/IFSelect/IFSelect_SelectDiff.hxx
index 9c1da09e3e..4709c1cf28 100644
--- a/src/IFSelect/IFSelect_SelectDiff.hxx
+++ b/src/IFSelect/IFSelect_SelectDiff.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectDiff,IFSelect_SelectControl)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectDiff,IFSelect_SelectControl)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectEntityNumber.cxx b/src/IFSelect/IFSelect_SelectEntityNumber.cxx
index cd56c040fc..989872734d 100644
--- a/src/IFSelect/IFSelect_SelectEntityNumber.cxx
+++ b/src/IFSelect/IFSelect_SelectEntityNumber.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectEntityNumber,IFSelect_SelectBase)
+
 IFSelect_SelectEntityNumber::IFSelect_SelectEntityNumber ()    {  }
 
     void  IFSelect_SelectEntityNumber::SetNumber
diff --git a/src/IFSelect/IFSelect_SelectEntityNumber.hxx b/src/IFSelect/IFSelect_SelectEntityNumber.hxx
index 78d662770b..4c5e14b26b 100644
--- a/src/IFSelect/IFSelect_SelectEntityNumber.hxx
+++ b/src/IFSelect/IFSelect_SelectEntityNumber.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectEntityNumber,IFSelect_SelectBase)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectEntityNumber,IFSelect_SelectBase)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectErrorEntities.cxx b/src/IFSelect/IFSelect_SelectErrorEntities.cxx
index 1f1cf42302..50b5ab202d 100644
--- a/src/IFSelect/IFSelect_SelectErrorEntities.cxx
+++ b/src/IFSelect/IFSelect_SelectErrorEntities.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectErrorEntities,IFSelect_SelectExtract)
+
 IFSelect_SelectErrorEntities::IFSelect_SelectErrorEntities ()    {  }
 
     Standard_Boolean  IFSelect_SelectErrorEntities::Sort
diff --git a/src/IFSelect/IFSelect_SelectErrorEntities.hxx b/src/IFSelect/IFSelect_SelectErrorEntities.hxx
index 7ecda8a76c..b3fde551d2 100644
--- a/src/IFSelect/IFSelect_SelectErrorEntities.hxx
+++ b/src/IFSelect/IFSelect_SelectErrorEntities.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectErrorEntities,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectErrorEntities,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectExplore.cxx b/src/IFSelect/IFSelect_SelectExplore.cxx
index d05b7efd91..477780bdbd 100644
--- a/src/IFSelect/IFSelect_SelectExplore.cxx
+++ b/src/IFSelect/IFSelect_SelectExplore.cxx
@@ -21,6 +21,8 @@
 #include <TColStd_IndexedMapOfTransient.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectExplore,IFSelect_SelectDeduct)
+
 IFSelect_SelectExplore::IFSelect_SelectExplore (const Standard_Integer level)
 : thelevel (level)    {  }
 
diff --git a/src/IFSelect/IFSelect_SelectExplore.hxx b/src/IFSelect/IFSelect_SelectExplore.hxx
index b0360a5899..85004e6198 100644
--- a/src/IFSelect/IFSelect_SelectExplore.hxx
+++ b/src/IFSelect/IFSelect_SelectExplore.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectExplore,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectExplore,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectExtract.cxx b/src/IFSelect/IFSelect_SelectExtract.cxx
index d35ae2f3e7..2985948be7 100644
--- a/src/IFSelect/IFSelect_SelectExtract.cxx
+++ b/src/IFSelect/IFSelect_SelectExtract.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectExtract,IFSelect_SelectDeduct)
+
 IFSelect_SelectExtract::IFSelect_SelectExtract ()
       {  thesort = Standard_True;  }
 
diff --git a/src/IFSelect/IFSelect_SelectExtract.hxx b/src/IFSelect/IFSelect_SelectExtract.hxx
index 8d05b46a96..066b780d6f 100644
--- a/src/IFSelect/IFSelect_SelectExtract.hxx
+++ b/src/IFSelect/IFSelect_SelectExtract.hxx
@@ -84,7 +84,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectExtract,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectExtract,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectFlag.cxx b/src/IFSelect/IFSelect_SelectFlag.cxx
index 3b939653a4..5dbab34c0a 100644
--- a/src/IFSelect/IFSelect_SelectFlag.cxx
+++ b/src/IFSelect/IFSelect_SelectFlag.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectFlag,IFSelect_SelectExtract)
+
 IFSelect_SelectFlag::IFSelect_SelectFlag (const Standard_CString flagname)
     : thename (flagname)    {  }
 
diff --git a/src/IFSelect/IFSelect_SelectFlag.hxx b/src/IFSelect/IFSelect_SelectFlag.hxx
index a3db1248e3..584f874626 100644
--- a/src/IFSelect/IFSelect_SelectFlag.hxx
+++ b/src/IFSelect/IFSelect_SelectFlag.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectFlag,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectFlag,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectInList.cxx b/src/IFSelect/IFSelect_SelectInList.cxx
index c2c4e215ca..1caec0752c 100644
--- a/src/IFSelect/IFSelect_SelectInList.cxx
+++ b/src/IFSelect/IFSelect_SelectInList.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectInList,IFSelect_SelectAnyList)
+
 // ....    Specialisation de SelectAnyList dans laquelle on traite une liste
 //         dont chaque item est une Entite
 void IFSelect_SelectInList::FillResult
diff --git a/src/IFSelect/IFSelect_SelectInList.hxx b/src/IFSelect/IFSelect_SelectInList.hxx
index 4352f756e5..9d1fcb5321 100644
--- a/src/IFSelect/IFSelect_SelectInList.hxx
+++ b/src/IFSelect/IFSelect_SelectInList.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectInList,IFSelect_SelectAnyList)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectInList,IFSelect_SelectAnyList)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectIncorrectEntities.cxx b/src/IFSelect/IFSelect_SelectIncorrectEntities.cxx
index 6fcdbd1c70..7ce246b1d1 100644
--- a/src/IFSelect/IFSelect_SelectIncorrectEntities.cxx
+++ b/src/IFSelect/IFSelect_SelectIncorrectEntities.cxx
@@ -18,5 +18,7 @@
 #include <IFSelect_SelectIncorrectEntities.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectIncorrectEntities,IFSelect_SelectFlag)
+
 IFSelect_SelectIncorrectEntities::IFSelect_SelectIncorrectEntities ()
     : IFSelect_SelectFlag ("Incorrect")    {  }
diff --git a/src/IFSelect/IFSelect_SelectIncorrectEntities.hxx b/src/IFSelect/IFSelect_SelectIncorrectEntities.hxx
index bc92339bbd..6400ceef05 100644
--- a/src/IFSelect/IFSelect_SelectIncorrectEntities.hxx
+++ b/src/IFSelect/IFSelect_SelectIncorrectEntities.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectIncorrectEntities,IFSelect_SelectFlag)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectIncorrectEntities,IFSelect_SelectFlag)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectIntersection.cxx b/src/IFSelect/IFSelect_SelectIntersection.cxx
index 840d9ff315..c154b7ac52 100644
--- a/src/IFSelect/IFSelect_SelectIntersection.cxx
+++ b/src/IFSelect/IFSelect_SelectIntersection.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectIntersection,IFSelect_SelectCombine)
+
 IFSelect_SelectIntersection::IFSelect_SelectIntersection ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectIntersection.hxx b/src/IFSelect/IFSelect_SelectIntersection.hxx
index 27fa1a7cfc..c0ab1a3f50 100644
--- a/src/IFSelect/IFSelect_SelectIntersection.hxx
+++ b/src/IFSelect/IFSelect_SelectIntersection.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectIntersection,IFSelect_SelectCombine)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectIntersection,IFSelect_SelectCombine)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectModelEntities.cxx b/src/IFSelect/IFSelect_SelectModelEntities.cxx
index 898a261807..d6e42235f2 100644
--- a/src/IFSelect/IFSelect_SelectModelEntities.cxx
+++ b/src/IFSelect/IFSelect_SelectModelEntities.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectModelEntities,IFSelect_SelectBase)
+
 IFSelect_SelectModelEntities::IFSelect_SelectModelEntities ()    {  }
 
     Interface_EntityIterator  IFSelect_SelectModelEntities::RootResult
diff --git a/src/IFSelect/IFSelect_SelectModelEntities.hxx b/src/IFSelect/IFSelect_SelectModelEntities.hxx
index e2af3f5fc4..a3afcd9150 100644
--- a/src/IFSelect/IFSelect_SelectModelEntities.hxx
+++ b/src/IFSelect/IFSelect_SelectModelEntities.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectModelEntities,IFSelect_SelectBase)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectModelEntities,IFSelect_SelectBase)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectModelRoots.cxx b/src/IFSelect/IFSelect_SelectModelRoots.cxx
index 8379d582b4..f1bc5eedf6 100644
--- a/src/IFSelect/IFSelect_SelectModelRoots.cxx
+++ b/src/IFSelect/IFSelect_SelectModelRoots.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectModelRoots,IFSelect_SelectBase)
+
 IFSelect_SelectModelRoots::IFSelect_SelectModelRoots ()    {  }
 
     Interface_EntityIterator  IFSelect_SelectModelRoots::RootResult
diff --git a/src/IFSelect/IFSelect_SelectModelRoots.hxx b/src/IFSelect/IFSelect_SelectModelRoots.hxx
index b2dd4c9e27..1827aa1a40 100644
--- a/src/IFSelect/IFSelect_SelectModelRoots.hxx
+++ b/src/IFSelect/IFSelect_SelectModelRoots.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectModelRoots,IFSelect_SelectBase)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectModelRoots,IFSelect_SelectBase)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectPointed.cxx b/src/IFSelect/IFSelect_SelectPointed.cxx
index 3304cecb12..a043635ffb 100644
--- a/src/IFSelect/IFSelect_SelectPointed.cxx
+++ b/src/IFSelect/IFSelect_SelectPointed.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_MapOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectPointed,IFSelect_SelectBase)
+
 IFSelect_SelectPointed::IFSelect_SelectPointed ()
     : theset (Standard_False)    {  }
 
diff --git a/src/IFSelect/IFSelect_SelectPointed.hxx b/src/IFSelect/IFSelect_SelectPointed.hxx
index 0daa669c05..2daaf83758 100644
--- a/src/IFSelect/IFSelect_SelectPointed.hxx
+++ b/src/IFSelect/IFSelect_SelectPointed.hxx
@@ -127,7 +127,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectPointed,IFSelect_SelectBase)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectPointed,IFSelect_SelectBase)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectRange.cxx b/src/IFSelect/IFSelect_SelectRange.cxx
index a9b4a56d94..55d4ef54a9 100644
--- a/src/IFSelect/IFSelect_SelectRange.cxx
+++ b/src/IFSelect/IFSelect_SelectRange.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectRange,IFSelect_SelectExtract)
+
 IFSelect_SelectRange::IFSelect_SelectRange ()    {  }
 
     void  IFSelect_SelectRange::SetRange
diff --git a/src/IFSelect/IFSelect_SelectRange.hxx b/src/IFSelect/IFSelect_SelectRange.hxx
index e7f195f00b..9e4d01416b 100644
--- a/src/IFSelect/IFSelect_SelectRange.hxx
+++ b/src/IFSelect/IFSelect_SelectRange.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectRange,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectRange,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectRootComps.cxx b/src/IFSelect/IFSelect_SelectRootComps.cxx
index 7725066cc9..cd2e8fe663 100644
--- a/src/IFSelect/IFSelect_SelectRootComps.cxx
+++ b/src/IFSelect/IFSelect_SelectRootComps.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectRootComps,IFSelect_SelectExtract)
+
 IFSelect_SelectRootComps::IFSelect_SelectRootComps ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectRootComps.hxx b/src/IFSelect/IFSelect_SelectRootComps.hxx
index 83c3137d83..37c0c19fb7 100644
--- a/src/IFSelect/IFSelect_SelectRootComps.hxx
+++ b/src/IFSelect/IFSelect_SelectRootComps.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectRootComps,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectRootComps,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectRoots.cxx b/src/IFSelect/IFSelect_SelectRoots.cxx
index d2c36fa9df..0784aec2c2 100644
--- a/src/IFSelect/IFSelect_SelectRoots.cxx
+++ b/src/IFSelect/IFSelect_SelectRoots.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectRoots,IFSelect_SelectExtract)
+
 IFSelect_SelectRoots::IFSelect_SelectRoots ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectRoots.hxx b/src/IFSelect/IFSelect_SelectRoots.hxx
index 9ddaf260d1..4eafb00e2d 100644
--- a/src/IFSelect/IFSelect_SelectRoots.hxx
+++ b/src/IFSelect/IFSelect_SelectRoots.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectRoots,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectRoots,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSent.cxx b/src/IFSelect/IFSelect_SelectSent.cxx
index 84eb296156..e97dad4ee0 100644
--- a/src/IFSelect/IFSelect_SelectSent.cxx
+++ b/src/IFSelect/IFSelect_SelectSent.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSent,IFSelect_SelectExtract)
+
 IFSelect_SelectSent::IFSelect_SelectSent
   (const Standard_Integer sentcount, const Standard_Boolean atleast)
       {  thecnt = sentcount;  thelst = atleast;  }
diff --git a/src/IFSelect/IFSelect_SelectSent.hxx b/src/IFSelect/IFSelect_SelectSent.hxx
index 1307aee9c8..eb90d48a45 100644
--- a/src/IFSelect/IFSelect_SelectSent.hxx
+++ b/src/IFSelect/IFSelect_SelectSent.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSent,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSent,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectShared.cxx b/src/IFSelect/IFSelect_SelectShared.cxx
index ea813aa0cc..3085d52c3f 100644
--- a/src/IFSelect/IFSelect_SelectShared.cxx
+++ b/src/IFSelect/IFSelect_SelectShared.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectShared,IFSelect_SelectDeduct)
+
 IFSelect_SelectShared::IFSelect_SelectShared ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectShared.hxx b/src/IFSelect/IFSelect_SelectShared.hxx
index f1de4d255e..955387cfd7 100644
--- a/src/IFSelect/IFSelect_SelectShared.hxx
+++ b/src/IFSelect/IFSelect_SelectShared.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectShared,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectShared,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSharing.cxx b/src/IFSelect/IFSelect_SelectSharing.cxx
index e77e114e0c..9336cade6b 100644
--- a/src/IFSelect/IFSelect_SelectSharing.cxx
+++ b/src/IFSelect/IFSelect_SelectSharing.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSharing,IFSelect_SelectDeduct)
+
 IFSelect_SelectSharing::IFSelect_SelectSharing ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectSharing.hxx b/src/IFSelect/IFSelect_SelectSharing.hxx
index 1c93361837..f801f47ac1 100644
--- a/src/IFSelect/IFSelect_SelectSharing.hxx
+++ b/src/IFSelect/IFSelect_SelectSharing.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSharing,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSharing,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSignature.cxx b/src/IFSelect/IFSelect_SelectSignature.cxx
index 5065fc3503..6282fd2731 100644
--- a/src/IFSelect/IFSelect_SelectSignature.cxx
+++ b/src/IFSelect/IFSelect_SelectSignature.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSignature,IFSelect_SelectExtract)
+
 //  theexact : -1  OUI   0  NON une seule valeur  > 0 NON nb de valeurs
 //  signmode : 1 prendre si contenu, 2 refuser si contenu
 //             3 prendre si egal,    4 refuser si egal
diff --git a/src/IFSelect/IFSelect_SelectSignature.hxx b/src/IFSelect/IFSelect_SelectSignature.hxx
index fe27753b4e..8e8bb90776 100644
--- a/src/IFSelect/IFSelect_SelectSignature.hxx
+++ b/src/IFSelect/IFSelect_SelectSignature.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSignature,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSignature,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSignedShared.cxx b/src/IFSelect/IFSelect_SelectSignedShared.cxx
index 671c84cfc6..ccaa577f0e 100644
--- a/src/IFSelect/IFSelect_SelectSignedShared.cxx
+++ b/src/IFSelect/IFSelect_SelectSignedShared.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSignedShared,IFSelect_SelectExplore)
+
 IFSelect_SelectSignedShared::IFSelect_SelectSignedShared
   (const Handle(IFSelect_Signature)& matcher,
    const Standard_CString signtext, const Standard_Boolean exact,
diff --git a/src/IFSelect/IFSelect_SelectSignedShared.hxx b/src/IFSelect/IFSelect_SelectSignedShared.hxx
index a63e714b08..4171289b5c 100644
--- a/src/IFSelect/IFSelect_SelectSignedShared.hxx
+++ b/src/IFSelect/IFSelect_SelectSignedShared.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSignedShared,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSignedShared,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSignedSharing.cxx b/src/IFSelect/IFSelect_SelectSignedSharing.cxx
index cfc749f81c..dcf39f7eec 100644
--- a/src/IFSelect/IFSelect_SelectSignedSharing.cxx
+++ b/src/IFSelect/IFSelect_SelectSignedSharing.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSignedSharing,IFSelect_SelectExplore)
+
 IFSelect_SelectSignedSharing::IFSelect_SelectSignedSharing
   (const Handle(IFSelect_Signature)& matcher,
    const Standard_CString signtext, const Standard_Boolean exact,
diff --git a/src/IFSelect/IFSelect_SelectSignedSharing.hxx b/src/IFSelect/IFSelect_SelectSignedSharing.hxx
index 42bc23f758..984b508642 100644
--- a/src/IFSelect/IFSelect_SelectSignedSharing.hxx
+++ b/src/IFSelect/IFSelect_SelectSignedSharing.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSignedSharing,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSignedSharing,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectSuite.cxx b/src/IFSelect/IFSelect_SelectSuite.cxx
index 8cd30fe0c0..12d8b5250e 100644
--- a/src/IFSelect/IFSelect_SelectSuite.cxx
+++ b/src/IFSelect/IFSelect_SelectSuite.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectSuite,IFSelect_SelectDeduct)
+
 IFSelect_SelectSuite::IFSelect_SelectSuite  ()    {  }
 
     Standard_Boolean  IFSelect_SelectSuite::AddInput
diff --git a/src/IFSelect/IFSelect_SelectSuite.hxx b/src/IFSelect/IFSelect_SelectSuite.hxx
index 581ce3464f..1080b57dda 100644
--- a/src/IFSelect/IFSelect_SelectSuite.hxx
+++ b/src/IFSelect/IFSelect_SelectSuite.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectSuite,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectSuite,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectType.cxx b/src/IFSelect/IFSelect_SelectType.cxx
index f8b144ff1a..337bf7634a 100644
--- a/src/IFSelect/IFSelect_SelectType.cxx
+++ b/src/IFSelect/IFSelect_SelectType.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectType,IFSelect_SelectAnyType)
+
 IFSelect_SelectType::IFSelect_SelectType ()
       {  thetype = STANDARD_TYPE(Standard_Transient);  }
 
diff --git a/src/IFSelect/IFSelect_SelectType.hxx b/src/IFSelect/IFSelect_SelectType.hxx
index ab91d17cca..2940470202 100644
--- a/src/IFSelect/IFSelect_SelectType.hxx
+++ b/src/IFSelect/IFSelect_SelectType.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectType,IFSelect_SelectAnyType)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectType,IFSelect_SelectAnyType)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectUnion.cxx b/src/IFSelect/IFSelect_SelectUnion.cxx
index fc773bde17..c38ad3de45 100644
--- a/src/IFSelect/IFSelect_SelectUnion.cxx
+++ b/src/IFSelect/IFSelect_SelectUnion.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectUnion,IFSelect_SelectCombine)
+
 IFSelect_SelectUnion::IFSelect_SelectUnion ()    {  }
 
 
diff --git a/src/IFSelect/IFSelect_SelectUnion.hxx b/src/IFSelect/IFSelect_SelectUnion.hxx
index c0176a15a2..39acf687f3 100644
--- a/src/IFSelect/IFSelect_SelectUnion.hxx
+++ b/src/IFSelect/IFSelect_SelectUnion.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectUnion,IFSelect_SelectCombine)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectUnion,IFSelect_SelectCombine)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SelectUnknownEntities.cxx b/src/IFSelect/IFSelect_SelectUnknownEntities.cxx
index 0488937265..c8391a9a4b 100644
--- a/src/IFSelect/IFSelect_SelectUnknownEntities.cxx
+++ b/src/IFSelect/IFSelect_SelectUnknownEntities.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SelectUnknownEntities,IFSelect_SelectExtract)
+
 IFSelect_SelectUnknownEntities::IFSelect_SelectUnknownEntities ()    {  }
 
     Standard_Boolean  IFSelect_SelectUnknownEntities::Sort
diff --git a/src/IFSelect/IFSelect_SelectUnknownEntities.hxx b/src/IFSelect/IFSelect_SelectUnknownEntities.hxx
index 93538834c6..ab9643ca02 100644
--- a/src/IFSelect/IFSelect_SelectUnknownEntities.hxx
+++ b/src/IFSelect/IFSelect_SelectUnknownEntities.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SelectUnknownEntities,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SelectUnknownEntities,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Selection.cxx b/src/IFSelect/IFSelect_Selection.cxx
index 468e764235..da33cf0913 100644
--- a/src/IFSelect/IFSelect_Selection.cxx
+++ b/src/IFSelect/IFSelect_Selection.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Selection,MMgt_TShared)
+
 Standard_Boolean  IFSelect_Selection::HasUniqueResult () const 
       {  return Standard_False;  }    // eminemment redefinissable
 
diff --git a/src/IFSelect/IFSelect_Selection.hxx b/src/IFSelect/IFSelect_Selection.hxx
index 050bddc396..e98d74c8d1 100644
--- a/src/IFSelect/IFSelect_Selection.hxx
+++ b/src/IFSelect/IFSelect_Selection.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Selection,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Selection,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SessionDumper.cxx b/src/IFSelect/IFSelect_SessionDumper.cxx
index 23371803b4..add7efe846 100644
--- a/src/IFSelect/IFSelect_SessionDumper.cxx
+++ b/src/IFSelect/IFSelect_SessionDumper.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SessionDumper,MMgt_TShared)
+
 static Handle(IFSelect_SessionDumper)  thefirst;
 static int cefait = 0;
 // On commence la serie avec celui-la
diff --git a/src/IFSelect/IFSelect_SessionDumper.hxx b/src/IFSelect/IFSelect_SessionDumper.hxx
index 1d1404a152..10febf2f79 100644
--- a/src/IFSelect/IFSelect_SessionDumper.hxx
+++ b/src/IFSelect/IFSelect_SessionDumper.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SessionDumper,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SessionDumper,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SessionPilot.cxx b/src/IFSelect/IFSelect_SessionPilot.cxx
index 1eb7e011ce..f40e510a00 100644
--- a/src/IFSelect/IFSelect_SessionPilot.cxx
+++ b/src/IFSelect/IFSelect_SessionPilot.cxx
@@ -31,6 +31,8 @@
 #include <TColStd_HSequenceOfAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SessionPilot,IFSelect_Activator)
+
 #define MAXWORDS 200
 #define MAXCARS 1000
 
diff --git a/src/IFSelect/IFSelect_SessionPilot.hxx b/src/IFSelect/IFSelect_SessionPilot.hxx
index 322445dd20..1d00b4477a 100644
--- a/src/IFSelect/IFSelect_SessionPilot.hxx
+++ b/src/IFSelect/IFSelect_SessionPilot.hxx
@@ -213,7 +213,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SessionPilot,IFSelect_Activator)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SessionPilot,IFSelect_Activator)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_ShareOut.cxx b/src/IFSelect/IFSelect_ShareOut.cxx
index e21ba62d45..43d92e592c 100644
--- a/src/IFSelect/IFSelect_ShareOut.cxx
+++ b/src/IFSelect/IFSelect_ShareOut.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_ShareOut,MMgt_TShared)
+
 IFSelect_ShareOut::IFSelect_ShareOut ()
 {
   thedefrt  = new TCollection_HAsciiString ("Default");
diff --git a/src/IFSelect/IFSelect_ShareOut.hxx b/src/IFSelect/IFSelect_ShareOut.hxx
index 1ada94bd2f..29807860ff 100644
--- a/src/IFSelect/IFSelect_ShareOut.hxx
+++ b/src/IFSelect/IFSelect_ShareOut.hxx
@@ -229,7 +229,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_ShareOut,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_ShareOut,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignAncestor.cxx b/src/IFSelect/IFSelect_SignAncestor.cxx
index d31af5edb2..8e11595c3d 100644
--- a/src/IFSelect/IFSelect_SignAncestor.cxx
+++ b/src/IFSelect/IFSelect_SignAncestor.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignAncestor,IFSelect_SignType)
+
 IFSelect_SignAncestor::IFSelect_SignAncestor (const Standard_Boolean nopk) 
      : IFSelect_SignType (nopk) {  }
      
diff --git a/src/IFSelect/IFSelect_SignAncestor.hxx b/src/IFSelect/IFSelect_SignAncestor.hxx
index efe49e3d7f..d8d7da35ff 100644
--- a/src/IFSelect/IFSelect_SignAncestor.hxx
+++ b/src/IFSelect/IFSelect_SignAncestor.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignAncestor,IFSelect_SignType)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignAncestor,IFSelect_SignType)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignCategory.cxx b/src/IFSelect/IFSelect_SignCategory.cxx
index 6fc5507f3f..c7d7988bb4 100644
--- a/src/IFSelect/IFSelect_SignCategory.cxx
+++ b/src/IFSelect/IFSelect_SignCategory.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignCategory,IFSelect_Signature)
+
 static Standard_CString nulsign = "";
 
 
diff --git a/src/IFSelect/IFSelect_SignCategory.hxx b/src/IFSelect/IFSelect_SignCategory.hxx
index 849d4bd8af..705569bc29 100644
--- a/src/IFSelect/IFSelect_SignCategory.hxx
+++ b/src/IFSelect/IFSelect_SignCategory.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignCategory,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignCategory,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignCounter.cxx b/src/IFSelect/IFSelect_SignCounter.cxx
index 2b411cef81..d0833fb65f 100644
--- a/src/IFSelect/IFSelect_SignCounter.cxx
+++ b/src/IFSelect/IFSelect_SignCounter.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignCounter,IFSelect_SignatureList)
+
 IFSelect_SignCounter::IFSelect_SignCounter
   (const Standard_Boolean withmap, const Standard_Boolean withlist)
     : IFSelect_SignatureList (withlist)
diff --git a/src/IFSelect/IFSelect_SignCounter.hxx b/src/IFSelect/IFSelect_SignCounter.hxx
index 6b617b1553..2d719d4af5 100644
--- a/src/IFSelect/IFSelect_SignCounter.hxx
+++ b/src/IFSelect/IFSelect_SignCounter.hxx
@@ -157,7 +157,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignCounter,IFSelect_SignatureList)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignCounter,IFSelect_SignatureList)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignMultiple.cxx b/src/IFSelect/IFSelect_SignMultiple.cxx
index a5a493d8ba..50094ad13c 100644
--- a/src/IFSelect/IFSelect_SignMultiple.cxx
+++ b/src/IFSelect/IFSelect_SignMultiple.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignMultiple,IFSelect_Signature)
+
 static TCollection_AsciiString theval;    // temporaire pour construire Value
 
     IFSelect_SignMultiple::IFSelect_SignMultiple (const Standard_CString name)
diff --git a/src/IFSelect/IFSelect_SignMultiple.hxx b/src/IFSelect/IFSelect_SignMultiple.hxx
index 168063067e..9a0d9310b8 100644
--- a/src/IFSelect/IFSelect_SignMultiple.hxx
+++ b/src/IFSelect/IFSelect_SignMultiple.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignMultiple,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignMultiple,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignType.cxx b/src/IFSelect/IFSelect_SignType.cxx
index 8da72c6b61..bf19e04fd2 100644
--- a/src/IFSelect/IFSelect_SignType.cxx
+++ b/src/IFSelect/IFSelect_SignType.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignType,IFSelect_Signature)
+
 static Standard_CString nulsign = "";
 
 
diff --git a/src/IFSelect/IFSelect_SignType.hxx b/src/IFSelect/IFSelect_SignType.hxx
index 18e8eaed7f..5d871f5c1c 100644
--- a/src/IFSelect/IFSelect_SignType.hxx
+++ b/src/IFSelect/IFSelect_SignType.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignType,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignType,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignValidity.cxx b/src/IFSelect/IFSelect_SignValidity.cxx
index 65b2f1b10c..6379970a3a 100644
--- a/src/IFSelect/IFSelect_SignValidity.cxx
+++ b/src/IFSelect/IFSelect_SignValidity.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignValidity,IFSelect_Signature)
+
 static Standard_CString nulsign = "";
 
 
diff --git a/src/IFSelect/IFSelect_SignValidity.hxx b/src/IFSelect/IFSelect_SignValidity.hxx
index 48abb83a9b..60f592a780 100644
--- a/src/IFSelect/IFSelect_SignValidity.hxx
+++ b/src/IFSelect/IFSelect_SignValidity.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignValidity,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignValidity,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Signature.cxx b/src/IFSelect/IFSelect_Signature.cxx
index 9eee035f93..29a846078f 100644
--- a/src/IFSelect/IFSelect_Signature.cxx
+++ b/src/IFSelect/IFSelect_Signature.cxx
@@ -19,6 +19,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Signature,Interface_SignType)
+
 // unused 
 //static Standard_CString nulsign = "";
 static char intval[20];
diff --git a/src/IFSelect/IFSelect_Signature.hxx b/src/IFSelect/IFSelect_Signature.hxx
index 7c2528c5b0..13ecbdad81 100644
--- a/src/IFSelect/IFSelect_Signature.hxx
+++ b/src/IFSelect/IFSelect_Signature.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Signature,Interface_SignType)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Signature,Interface_SignType)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_SignatureList.cxx b/src/IFSelect/IFSelect_SignatureList.cxx
index d2720d6a9c..6314509a10 100644
--- a/src/IFSelect/IFSelect_SignatureList.cxx
+++ b/src/IFSelect/IFSelect_SignatureList.cxx
@@ -27,6 +27,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HSequenceOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SignatureList,MMgt_TShared)
+
 IFSelect_SignatureList::IFSelect_SignatureList
   (const Standard_Boolean withlist)
 {
diff --git a/src/IFSelect/IFSelect_SignatureList.hxx b/src/IFSelect/IFSelect_SignatureList.hxx
index 1f09fe7e9a..3b50f8fc81 100644
--- a/src/IFSelect/IFSelect_SignatureList.hxx
+++ b/src/IFSelect/IFSelect_SignatureList.hxx
@@ -141,7 +141,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_SignatureList,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_SignatureList,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_TransformStandard.cxx b/src/IFSelect/IFSelect_TransformStandard.cxx
index 748d8ddb8b..f130c589a7 100644
--- a/src/IFSelect/IFSelect_TransformStandard.cxx
+++ b/src/IFSelect/IFSelect_TransformStandard.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_TransformStandard,IFSelect_Transformer)
+
 IFSelect_TransformStandard::IFSelect_TransformStandard ()
       {  thecopy = Standard_True;  }
 
diff --git a/src/IFSelect/IFSelect_TransformStandard.hxx b/src/IFSelect/IFSelect_TransformStandard.hxx
index 646dd7f4f2..3ca33d2e5b 100644
--- a/src/IFSelect/IFSelect_TransformStandard.hxx
+++ b/src/IFSelect/IFSelect_TransformStandard.hxx
@@ -153,7 +153,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_TransformStandard,IFSelect_Transformer)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_TransformStandard,IFSelect_Transformer)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_Transformer.cxx b/src/IFSelect/IFSelect_Transformer.cxx
index c5ea881dc9..7811c3c5e4 100644
--- a/src/IFSelect/IFSelect_Transformer.cxx
+++ b/src/IFSelect/IFSelect_Transformer.cxx
@@ -21,6 +21,9 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
-Standard_Boolean  IFSelect_Transformer::ChangeProtocol
-  (Handle(Interface_Protocol)& ) const
-      {  return Standard_False;  }        // par defaut, protocole inchange
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_Transformer,MMgt_TShared)
+
+Standard_Boolean  IFSelect_Transformer::ChangeProtocol (Handle(Interface_Protocol)& ) const
+{ 
+  return Standard_False; // par defaut, protocole inchange
+}
diff --git a/src/IFSelect/IFSelect_Transformer.hxx b/src/IFSelect/IFSelect_Transformer.hxx
index 1a55d2276a..8068f0335c 100644
--- a/src/IFSelect/IFSelect_Transformer.hxx
+++ b/src/IFSelect/IFSelect_Transformer.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_Transformer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_Transformer,MMgt_TShared)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_WorkLibrary.cxx b/src/IFSelect/IFSelect_WorkLibrary.cxx
index 43dd9f2a92..49ed080769 100644
--- a/src/IFSelect/IFSelect_WorkLibrary.cxx
+++ b/src/IFSelect/IFSelect_WorkLibrary.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_WorkLibrary,Standard_Transient)
+
 //  all deferred but Copy (virtual default)
 IFSelect_WorkLibrary::IFSelect_WorkLibrary ()  {  thelevdef = 0;  }
 
diff --git a/src/IFSelect/IFSelect_WorkLibrary.hxx b/src/IFSelect/IFSelect_WorkLibrary.hxx
index db3a8b2311..fa19ba190c 100644
--- a/src/IFSelect/IFSelect_WorkLibrary.hxx
+++ b/src/IFSelect/IFSelect_WorkLibrary.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_WorkLibrary,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_WorkLibrary,Standard_Transient)
 
 protected:
 
diff --git a/src/IFSelect/IFSelect_WorkSession.cxx b/src/IFSelect/IFSelect_WorkSession.cxx
index 5a3fe2bc88..2c6a6212dc 100644
--- a/src/IFSelect/IFSelect_WorkSession.cxx
+++ b/src/IFSelect/IFSelect_WorkSession.cxx
@@ -87,6 +87,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IFSelect_WorkSession,MMgt_TShared)
+
 #define Flag_Incorrect 2
 //  (Bit Map n0 2)
 
diff --git a/src/IFSelect/IFSelect_WorkSession.hxx b/src/IFSelect/IFSelect_WorkSession.hxx
index 0698b4eb83..e0e6eff9f1 100644
--- a/src/IFSelect/IFSelect_WorkSession.hxx
+++ b/src/IFSelect/IFSelect_WorkSession.hxx
@@ -1076,7 +1076,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IFSelect_WorkSession,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IFSelect_WorkSession,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_DrilledHole.cxx b/src/IGESAppli/IGESAppli_DrilledHole.cxx
index 6ef31dc532..d612ffce1d 100644
--- a/src/IGESAppli/IGESAppli_DrilledHole.cxx
+++ b/src/IGESAppli/IGESAppli_DrilledHole.cxx
@@ -19,6 +19,8 @@
 #include <IGESAppli_DrilledHole.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_DrilledHole,IGESData_IGESEntity)
+
 IGESAppli_DrilledHole::IGESAppli_DrilledHole ()    {  }
 
     void  IGESAppli_DrilledHole::Init
diff --git a/src/IGESAppli/IGESAppli_DrilledHole.hxx b/src/IGESAppli/IGESAppli_DrilledHole.hxx
index bdb84950ab..c533f9084e 100644
--- a/src/IGESAppli/IGESAppli_DrilledHole.hxx
+++ b/src/IGESAppli/IGESAppli_DrilledHole.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_DrilledHole,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_DrilledHole,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_ElementResults.cxx b/src/IGESAppli/IGESAppli_ElementResults.cxx
index 77ea1d118b..d7a10d7d50 100644
--- a/src/IGESAppli/IGESAppli_ElementResults.cxx
+++ b/src/IGESAppli/IGESAppli_ElementResults.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_ElementResults,IGESData_IGESEntity)
+
 IGESAppli_ElementResults::IGESAppli_ElementResults ()    {  }
 
     void  IGESAppli_ElementResults::Init
diff --git a/src/IGESAppli/IGESAppli_ElementResults.hxx b/src/IGESAppli/IGESAppli_ElementResults.hxx
index ec5821c772..f265002969 100644
--- a/src/IGESAppli/IGESAppli_ElementResults.hxx
+++ b/src/IGESAppli/IGESAppli_ElementResults.hxx
@@ -139,7 +139,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_ElementResults,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_ElementResults,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_FiniteElement.cxx b/src/IGESAppli/IGESAppli_FiniteElement.cxx
index bedcd3a261..9c943d735a 100644
--- a/src/IGESAppli/IGESAppli_FiniteElement.cxx
+++ b/src/IGESAppli/IGESAppli_FiniteElement.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_FiniteElement,IGESData_IGESEntity)
+
 IGESAppli_FiniteElement::IGESAppli_FiniteElement ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_FiniteElement.hxx b/src/IGESAppli/IGESAppli_FiniteElement.hxx
index 936dd937ba..77d59a4ed4 100644
--- a/src/IGESAppli/IGESAppli_FiniteElement.hxx
+++ b/src/IGESAppli/IGESAppli_FiniteElement.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_FiniteElement,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_FiniteElement,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_Flow.cxx b/src/IGESAppli/IGESAppli_Flow.cxx
index a50ef648d3..7a3c4b451d 100644
--- a/src/IGESAppli/IGESAppli_Flow.cxx
+++ b/src/IGESAppli/IGESAppli_Flow.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_Flow,IGESData_IGESEntity)
+
 IGESAppli_Flow::IGESAppli_Flow ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_Flow.hxx b/src/IGESAppli/IGESAppli_Flow.hxx
index 0f7f2fc4b9..6d24843dd3 100644
--- a/src/IGESAppli/IGESAppli_Flow.hxx
+++ b/src/IGESAppli/IGESAppli_Flow.hxx
@@ -123,7 +123,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_Flow,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_Flow,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_FlowLineSpec.cxx b/src/IGESAppli/IGESAppli_FlowLineSpec.cxx
index 7ebf893992..27c747ceef 100644
--- a/src/IGESAppli/IGESAppli_FlowLineSpec.cxx
+++ b/src/IGESAppli/IGESAppli_FlowLineSpec.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_FlowLineSpec,IGESData_IGESEntity)
+
 IGESAppli_FlowLineSpec::IGESAppli_FlowLineSpec ()    {  }
 
     void  IGESAppli_FlowLineSpec::Init
diff --git a/src/IGESAppli/IGESAppli_FlowLineSpec.hxx b/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
index 8ab9500ca3..13f1b6bdd1 100644
--- a/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
+++ b/src/IGESAppli/IGESAppli_FlowLineSpec.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_FlowLineSpec,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_FlowLineSpec,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_GeneralModule.cxx b/src/IGESAppli/IGESAppli_GeneralModule.cxx
index 59645f37fc..873c63a18a 100644
--- a/src/IGESAppli/IGESAppli_GeneralModule.cxx
+++ b/src/IGESAppli/IGESAppli_GeneralModule.cxx
@@ -62,6 +62,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESAppli/IGESAppli_GeneralModule.hxx b/src/IGESAppli/IGESAppli_GeneralModule.hxx
index ef68e5a1d4..535bb5b34a 100644
--- a/src/IGESAppli/IGESAppli_GeneralModule.hxx
+++ b/src/IGESAppli/IGESAppli_GeneralModule.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_LevelFunction.cxx b/src/IGESAppli/IGESAppli_LevelFunction.cxx
index e29857bdd6..62dbb193ee 100644
--- a/src/IGESAppli/IGESAppli_LevelFunction.cxx
+++ b/src/IGESAppli/IGESAppli_LevelFunction.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_LevelFunction,IGESData_IGESEntity)
+
 IGESAppli_LevelFunction::IGESAppli_LevelFunction ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_LevelFunction.hxx b/src/IGESAppli/IGESAppli_LevelFunction.hxx
index 2c11d90933..fd98e0def3 100644
--- a/src/IGESAppli/IGESAppli_LevelFunction.hxx
+++ b/src/IGESAppli/IGESAppli_LevelFunction.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_LevelFunction,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_LevelFunction,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cxx b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cxx
index ec5934a6f2..8aa1e1cdff 100644
--- a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cxx
+++ b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_LevelToPWBLayerMap,IGESData_IGESEntity)
+
 IGESAppli_LevelToPWBLayerMap::IGESAppli_LevelToPWBLayerMap ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
index 7d632accec..66aaddd1a1 100644
--- a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
+++ b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_LevelToPWBLayerMap,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_LevelToPWBLayerMap,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_LineWidening.cxx b/src/IGESAppli/IGESAppli_LineWidening.cxx
index 3ceda48aeb..5f36d2d9af 100644
--- a/src/IGESAppli/IGESAppli_LineWidening.cxx
+++ b/src/IGESAppli/IGESAppli_LineWidening.cxx
@@ -20,6 +20,8 @@
 #include <IGESData_LevelListEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_LineWidening,IGESData_IGESEntity)
+
 IGESAppli_LineWidening::IGESAppli_LineWidening ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_LineWidening.hxx b/src/IGESAppli/IGESAppli_LineWidening.hxx
index 361a026dc6..f2457351a3 100644
--- a/src/IGESAppli/IGESAppli_LineWidening.hxx
+++ b/src/IGESAppli/IGESAppli_LineWidening.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_LineWidening,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_LineWidening,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_NodalConstraint.cxx b/src/IGESAppli/IGESAppli_NodalConstraint.cxx
index 0132dad0fc..7a97892b22 100644
--- a/src/IGESAppli/IGESAppli_NodalConstraint.cxx
+++ b/src/IGESAppli/IGESAppli_NodalConstraint.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_NodalConstraint,IGESData_IGESEntity)
+
 IGESAppli_NodalConstraint::IGESAppli_NodalConstraint ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_NodalConstraint.hxx b/src/IGESAppli/IGESAppli_NodalConstraint.hxx
index 2a8af75859..db54f948e7 100644
--- a/src/IGESAppli/IGESAppli_NodalConstraint.hxx
+++ b/src/IGESAppli/IGESAppli_NodalConstraint.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_NodalConstraint,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_NodalConstraint,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_NodalDisplAndRot.cxx b/src/IGESAppli/IGESAppli_NodalDisplAndRot.cxx
index 01c22d10b5..046b39625f 100644
--- a/src/IGESAppli/IGESAppli_NodalDisplAndRot.cxx
+++ b/src/IGESAppli/IGESAppli_NodalDisplAndRot.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TColgp_HArray1OfXYZ.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_NodalDisplAndRot,IGESData_IGESEntity)
+
 IGESAppli_NodalDisplAndRot::IGESAppli_NodalDisplAndRot ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx b/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
index 592b694e78..7e9f7e064b 100644
--- a/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
+++ b/src/IGESAppli/IGESAppli_NodalDisplAndRot.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_NodalDisplAndRot,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_NodalDisplAndRot,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_NodalResults.cxx b/src/IGESAppli/IGESAppli_NodalResults.cxx
index 53f15d69c1..525222cfd2 100644
--- a/src/IGESAppli/IGESAppli_NodalResults.cxx
+++ b/src/IGESAppli/IGESAppli_NodalResults.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_NodalResults,IGESData_IGESEntity)
+
 IGESAppli_NodalResults::IGESAppli_NodalResults ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_NodalResults.hxx b/src/IGESAppli/IGESAppli_NodalResults.hxx
index f3883076e8..43315cc724 100644
--- a/src/IGESAppli/IGESAppli_NodalResults.hxx
+++ b/src/IGESAppli/IGESAppli_NodalResults.hxx
@@ -97,7 +97,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_NodalResults,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_NodalResults,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_Node.cxx b/src/IGESAppli/IGESAppli_Node.cxx
index 5ee76203f5..4cae056c65 100644
--- a/src/IGESAppli/IGESAppli_Node.cxx
+++ b/src/IGESAppli/IGESAppli_Node.cxx
@@ -25,6 +25,8 @@
 #include <Interface_Macros.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_Node,IGESData_IGESEntity)
+
 IGESAppli_Node::IGESAppli_Node ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_Node.hxx b/src/IGESAppli/IGESAppli_Node.hxx
index 2b0577c97d..5cfd9a16af 100644
--- a/src/IGESAppli/IGESAppli_Node.hxx
+++ b/src/IGESAppli/IGESAppli_Node.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_Node,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_Node,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_PWBArtworkStackup.cxx b/src/IGESAppli/IGESAppli_PWBArtworkStackup.cxx
index 333658bc2e..3bcab5a8b0 100644
--- a/src/IGESAppli/IGESAppli_PWBArtworkStackup.cxx
+++ b/src/IGESAppli/IGESAppli_PWBArtworkStackup.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_PWBArtworkStackup,IGESData_IGESEntity)
+
 IGESAppli_PWBArtworkStackup::IGESAppli_PWBArtworkStackup ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx b/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
index b2e5ca0d43..bc97bc7f35 100644
--- a/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
+++ b/src/IGESAppli/IGESAppli_PWBArtworkStackup.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_PWBArtworkStackup,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_PWBArtworkStackup,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_PWBDrilledHole.cxx b/src/IGESAppli/IGESAppli_PWBDrilledHole.cxx
index 69d1f39a36..88be618ad1 100644
--- a/src/IGESAppli/IGESAppli_PWBDrilledHole.cxx
+++ b/src/IGESAppli/IGESAppli_PWBDrilledHole.cxx
@@ -19,6 +19,8 @@
 #include <IGESAppli_PWBDrilledHole.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_PWBDrilledHole,IGESData_IGESEntity)
+
 IGESAppli_PWBDrilledHole::IGESAppli_PWBDrilledHole ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_PWBDrilledHole.hxx b/src/IGESAppli/IGESAppli_PWBDrilledHole.hxx
index 2dcf584d54..12e74f0ad7 100644
--- a/src/IGESAppli/IGESAppli_PWBDrilledHole.hxx
+++ b/src/IGESAppli/IGESAppli_PWBDrilledHole.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_PWBDrilledHole,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_PWBDrilledHole,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_PartNumber.cxx b/src/IGESAppli/IGESAppli_PartNumber.cxx
index 9e5177b19c..cde32148ad 100644
--- a/src/IGESAppli/IGESAppli_PartNumber.cxx
+++ b/src/IGESAppli/IGESAppli_PartNumber.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_PartNumber,IGESData_IGESEntity)
+
 IGESAppli_PartNumber::IGESAppli_PartNumber ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_PartNumber.hxx b/src/IGESAppli/IGESAppli_PartNumber.hxx
index 1a20d801f4..b2767e3df6 100644
--- a/src/IGESAppli/IGESAppli_PartNumber.hxx
+++ b/src/IGESAppli/IGESAppli_PartNumber.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_PartNumber,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_PartNumber,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_PinNumber.cxx b/src/IGESAppli/IGESAppli_PinNumber.cxx
index f0a08ff02b..309640cfd5 100644
--- a/src/IGESAppli/IGESAppli_PinNumber.cxx
+++ b/src/IGESAppli/IGESAppli_PinNumber.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_PinNumber,IGESData_IGESEntity)
+
 IGESAppli_PinNumber::IGESAppli_PinNumber ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_PinNumber.hxx b/src/IGESAppli/IGESAppli_PinNumber.hxx
index b2e57ebf78..3b7c5024b0 100644
--- a/src/IGESAppli/IGESAppli_PinNumber.hxx
+++ b/src/IGESAppli/IGESAppli_PinNumber.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_PinNumber,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_PinNumber,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_PipingFlow.cxx b/src/IGESAppli/IGESAppli_PipingFlow.cxx
index fc293d903f..0ce3be28e1 100644
--- a/src/IGESAppli/IGESAppli_PipingFlow.cxx
+++ b/src/IGESAppli/IGESAppli_PipingFlow.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_PipingFlow,IGESData_IGESEntity)
+
 IGESAppli_PipingFlow::IGESAppli_PipingFlow ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_PipingFlow.hxx b/src/IGESAppli/IGESAppli_PipingFlow.hxx
index e3d4732122..46f1f52886 100644
--- a/src/IGESAppli/IGESAppli_PipingFlow.hxx
+++ b/src/IGESAppli/IGESAppli_PipingFlow.hxx
@@ -116,7 +116,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_PipingFlow,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_PipingFlow,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_Protocol.cxx b/src/IGESAppli/IGESAppli_Protocol.cxx
index 34429efb38..3c6c895c70 100644
--- a/src/IGESAppli/IGESAppli_Protocol.cxx
+++ b/src/IGESAppli/IGESAppli_Protocol.cxx
@@ -39,6 +39,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14,atype15,
diff --git a/src/IGESAppli/IGESAppli_Protocol.hxx b/src/IGESAppli/IGESAppli_Protocol.hxx
index f61e95dab1..09c80a659b 100644
--- a/src/IGESAppli/IGESAppli_Protocol.hxx
+++ b/src/IGESAppli/IGESAppli_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_ReadWriteModule.cxx b/src/IGESAppli/IGESAppli_ReadWriteModule.cxx
index c293ef45cf..8a3f85a503 100644
--- a/src/IGESAppli/IGESAppli_ReadWriteModule.cxx
+++ b/src/IGESAppli/IGESAppli_ReadWriteModule.cxx
@@ -59,6 +59,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
index 27a2366445..31a31bdd77 100644
--- a/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
+++ b/src/IGESAppli/IGESAppli_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_ReferenceDesignator.cxx b/src/IGESAppli/IGESAppli_ReferenceDesignator.cxx
index 6efe660e1a..5bf4489e1b 100644
--- a/src/IGESAppli/IGESAppli_ReferenceDesignator.cxx
+++ b/src/IGESAppli/IGESAppli_ReferenceDesignator.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_ReferenceDesignator,IGESData_IGESEntity)
+
 IGESAppli_ReferenceDesignator::IGESAppli_ReferenceDesignator ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_ReferenceDesignator.hxx b/src/IGESAppli/IGESAppli_ReferenceDesignator.hxx
index f8e64d6248..e899522362 100644
--- a/src/IGESAppli/IGESAppli_ReferenceDesignator.hxx
+++ b/src/IGESAppli/IGESAppli_ReferenceDesignator.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_ReferenceDesignator,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_ReferenceDesignator,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_RegionRestriction.cxx b/src/IGESAppli/IGESAppli_RegionRestriction.cxx
index b9cd6de59b..9160fd0485 100644
--- a/src/IGESAppli/IGESAppli_RegionRestriction.cxx
+++ b/src/IGESAppli/IGESAppli_RegionRestriction.cxx
@@ -19,6 +19,8 @@
 #include <IGESAppli_RegionRestriction.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_RegionRestriction,IGESData_IGESEntity)
+
 IGESAppli_RegionRestriction::IGESAppli_RegionRestriction ()    {  }
 
 
diff --git a/src/IGESAppli/IGESAppli_RegionRestriction.hxx b/src/IGESAppli/IGESAppli_RegionRestriction.hxx
index 309719ddb9..8f952f6722 100644
--- a/src/IGESAppli/IGESAppli_RegionRestriction.hxx
+++ b/src/IGESAppli/IGESAppli_RegionRestriction.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_RegionRestriction,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_RegionRestriction,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESAppli/IGESAppli_SpecificModule.cxx b/src/IGESAppli/IGESAppli_SpecificModule.cxx
index fdf9625b18..57583f81d5 100644
--- a/src/IGESAppli/IGESAppli_SpecificModule.cxx
+++ b/src/IGESAppli/IGESAppli_SpecificModule.cxx
@@ -57,6 +57,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESAppli_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESAppli/IGESAppli_SpecificModule.hxx b/src/IGESAppli/IGESAppli_SpecificModule.hxx
index 4322b8b690..2e723c6f5f 100644
--- a/src/IGESAppli/IGESAppli_SpecificModule.hxx
+++ b/src/IGESAppli/IGESAppli_SpecificModule.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESAppli_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESAppli_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_AssocGroupType.cxx b/src/IGESBasic/IGESBasic_AssocGroupType.cxx
index 2590c948a0..433b889192 100644
--- a/src/IGESBasic/IGESBasic_AssocGroupType.cxx
+++ b/src/IGESBasic/IGESBasic_AssocGroupType.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_AssocGroupType,IGESData_IGESEntity)
+
 IGESBasic_AssocGroupType::IGESBasic_AssocGroupType ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_AssocGroupType.hxx b/src/IGESBasic/IGESBasic_AssocGroupType.hxx
index 1b5caf8488..59c3e49543 100644
--- a/src/IGESBasic/IGESBasic_AssocGroupType.hxx
+++ b/src/IGESBasic/IGESBasic_AssocGroupType.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_AssocGroupType,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_AssocGroupType,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFile.cxx b/src/IGESBasic/IGESBasic_ExternalRefFile.cxx
index 76f7aa67d9..222f266005 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFile.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFile.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalRefFile,IGESData_IGESEntity)
+
 IGESBasic_ExternalRefFile::IGESBasic_ExternalRefFile ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFile.hxx b/src/IGESBasic/IGESBasic_ExternalRefFile.hxx
index 783392bc0d..c75ee13dc8 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFile.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFile.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalRefFile,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalRefFile,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cxx b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cxx
index 11eb0aa093..a6f04993b6 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalRefFileIndex,IGESData_IGESEntity)
+
 IGESBasic_ExternalRefFileIndex::IGESBasic_ExternalRefFileIndex ()    {  }
 
     void  IGESBasic_ExternalRefFileIndex::Init
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
index 188cd12fe2..c024dbe606 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalRefFileIndex,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalRefFileIndex,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileName.cxx b/src/IGESBasic/IGESBasic_ExternalRefFileName.cxx
index 172312ff1b..5b4dc28df3 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileName.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileName.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalRefFileName,IGESData_IGESEntity)
+
 IGESBasic_ExternalRefFileName::IGESBasic_ExternalRefFileName ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileName.hxx b/src/IGESBasic/IGESBasic_ExternalRefFileName.hxx
index 4e9a64c0c9..11407191c0 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileName.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileName.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalRefFileName,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalRefFileName,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefLibName.cxx b/src/IGESBasic/IGESBasic_ExternalRefLibName.cxx
index 5aaecf6894..ea5e04e381 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefLibName.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefLibName.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalRefLibName,IGESData_IGESEntity)
+
 IGESBasic_ExternalRefLibName::IGESBasic_ExternalRefLibName ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefLibName.hxx b/src/IGESBasic/IGESBasic_ExternalRefLibName.hxx
index 70af5fc343..539b845180 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefLibName.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefLibName.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalRefLibName,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalRefLibName,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefName.cxx b/src/IGESBasic/IGESBasic_ExternalRefName.cxx
index 332ff64884..65356f7cae 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefName.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefName.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalRefName,IGESData_IGESEntity)
+
 IGESBasic_ExternalRefName::IGESBasic_ExternalRefName ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefName.hxx b/src/IGESBasic/IGESBasic_ExternalRefName.hxx
index 39e4e7acd1..1dbc312606 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefName.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalRefName.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalRefName,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalRefName,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ExternalReferenceFile.cxx b/src/IGESBasic/IGESBasic_ExternalReferenceFile.cxx
index c25bd072f2..1d5b2f8011 100644
--- a/src/IGESBasic/IGESBasic_ExternalReferenceFile.cxx
+++ b/src/IGESBasic/IGESBasic_ExternalReferenceFile.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ExternalReferenceFile,IGESData_IGESEntity)
+
 IGESBasic_ExternalReferenceFile::IGESBasic_ExternalReferenceFile ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx b/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
index 4e91b5ee18..8cd328719e 100644
--- a/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
+++ b/src/IGESBasic/IGESBasic_ExternalReferenceFile.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ExternalReferenceFile,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ExternalReferenceFile,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_GeneralModule.cxx b/src/IGESBasic/IGESBasic_GeneralModule.cxx
index 33397ead49..8f144ddee9 100644
--- a/src/IGESBasic/IGESBasic_GeneralModule.cxx
+++ b/src/IGESBasic/IGESBasic_GeneralModule.cxx
@@ -56,6 +56,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESBasic/IGESBasic_GeneralModule.hxx b/src/IGESBasic/IGESBasic_GeneralModule.hxx
index 823facc924..d11fe6c0fc 100644
--- a/src/IGESBasic/IGESBasic_GeneralModule.hxx
+++ b/src/IGESBasic/IGESBasic_GeneralModule.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_Group.cxx b/src/IGESBasic/IGESBasic_Group.cxx
index 152d43acc2..c269c71ad5 100644
--- a/src/IGESBasic/IGESBasic_Group.cxx
+++ b/src/IGESBasic/IGESBasic_Group.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_Group,IGESData_IGESEntity)
+
 IGESBasic_Group::IGESBasic_Group ()    {  InitTypeAndForm(402,1);  }
 
     IGESBasic_Group::IGESBasic_Group
diff --git a/src/IGESBasic/IGESBasic_Group.hxx b/src/IGESBasic/IGESBasic_Group.hxx
index 1397870ec2..fbcd4f3a6a 100644
--- a/src/IGESBasic/IGESBasic_Group.hxx
+++ b/src/IGESBasic/IGESBasic_Group.hxx
@@ -97,7 +97,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_Group,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_Group,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_GroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_GroupWithoutBackP.cxx
index fd490bad74..7bdebc8ee7 100644
--- a/src/IGESBasic/IGESBasic_GroupWithoutBackP.cxx
+++ b/src/IGESBasic/IGESBasic_GroupWithoutBackP.cxx
@@ -20,5 +20,7 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_GroupWithoutBackP,IGESBasic_Group)
+
 IGESBasic_GroupWithoutBackP::IGESBasic_GroupWithoutBackP ()
       {  InitTypeAndForm(402,7);  }
diff --git a/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
index ec71b14c90..b5c792ada2 100644
--- a/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_GroupWithoutBackP.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_GroupWithoutBackP,IGESBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_GroupWithoutBackP,IGESBasic_Group)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity.hxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity.hxx
index b19f00d30d..2f14d44cb7 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity.hxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_HArray1OfHArray1OfIGESEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESBasic_HArray1OfHArray1OfIGESEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger.hxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger.hxx
index 6a9e553909..17debdacfc 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger.hxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_HArray1OfHArray1OfInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESBasic_HArray1OfHArray1OfInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal.hxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal.hxx
index fc66bb66ec..dd85b3361e 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal.hxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_HArray1OfHArray1OfReal,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESBasic_HArray1OfHArray1OfReal,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY.hxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY.hxx
index 44ec325366..72e3406a1d 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY.hxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_HArray1OfHArray1OfXY,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESBasic_HArray1OfHArray1OfXY,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ.hxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ.hxx
index 28b9845083..dead172915 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ.hxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_HArray1OfHArray1OfXYZ,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESBasic_HArray1OfHArray1OfXYZ,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_Hierarchy.cxx b/src/IGESBasic/IGESBasic_Hierarchy.cxx
index a6b6606652..fb70dd834f 100644
--- a/src/IGESBasic/IGESBasic_Hierarchy.cxx
+++ b/src/IGESBasic/IGESBasic_Hierarchy.cxx
@@ -19,6 +19,8 @@
 #include <IGESBasic_Hierarchy.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_Hierarchy,IGESData_IGESEntity)
+
 IGESBasic_Hierarchy::IGESBasic_Hierarchy ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_Hierarchy.hxx b/src/IGESBasic/IGESBasic_Hierarchy.hxx
index 577b0a2a1d..7e76ec559b 100644
--- a/src/IGESBasic/IGESBasic_Hierarchy.hxx
+++ b/src/IGESBasic/IGESBasic_Hierarchy.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_Hierarchy,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_Hierarchy,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_Name.cxx b/src/IGESBasic/IGESBasic_Name.cxx
index 64b9d069f0..f8ad75747d 100644
--- a/src/IGESBasic/IGESBasic_Name.cxx
+++ b/src/IGESBasic/IGESBasic_Name.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_Name,IGESData_NameEntity)
+
 IGESBasic_Name::IGESBasic_Name ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_Name.hxx b/src/IGESBasic/IGESBasic_Name.hxx
index 9b666ba196..3cd66b1e22 100644
--- a/src/IGESBasic/IGESBasic_Name.hxx
+++ b/src/IGESBasic/IGESBasic_Name.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_Name,IGESData_NameEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_Name,IGESData_NameEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_OrderedGroup.cxx b/src/IGESBasic/IGESBasic_OrderedGroup.cxx
index 23bb43e4ea..1ca58f5aa0 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroup.cxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroup.cxx
@@ -20,5 +20,7 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_OrderedGroup,IGESBasic_Group)
+
 IGESBasic_OrderedGroup::IGESBasic_OrderedGroup ()
       {  InitTypeAndForm(402,14);  }
diff --git a/src/IGESBasic/IGESBasic_OrderedGroup.hxx b/src/IGESBasic/IGESBasic_OrderedGroup.hxx
index b71749eb1b..fb34b2f636 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroup.hxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroup.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_OrderedGroup,IGESBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_OrderedGroup,IGESBasic_Group)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cxx
index d5235ffbe9..7355454b70 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cxx
@@ -20,5 +20,7 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_OrderedGroupWithoutBackP,IGESBasic_Group)
+
 IGESBasic_OrderedGroupWithoutBackP::IGESBasic_OrderedGroupWithoutBackP ()
       {  InitTypeAndForm(402,15);  }
diff --git a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
index 1111908f5e..7945ab1267 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
+++ b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_OrderedGroupWithoutBackP,IGESBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_OrderedGroupWithoutBackP,IGESBasic_Group)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_Protocol.cxx b/src/IGESBasic/IGESBasic_Protocol.cxx
index 4fc736d8cc..2bc10318b2 100644
--- a/src/IGESBasic/IGESBasic_Protocol.cxx
+++ b/src/IGESBasic/IGESBasic_Protocol.cxx
@@ -34,6 +34,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14,atype15,atype16;
diff --git a/src/IGESBasic/IGESBasic_Protocol.hxx b/src/IGESBasic/IGESBasic_Protocol.hxx
index 2d2163421a..136e95c5cf 100644
--- a/src/IGESBasic/IGESBasic_Protocol.hxx
+++ b/src/IGESBasic/IGESBasic_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_ReadWriteModule.cxx b/src/IGESBasic/IGESBasic_ReadWriteModule.cxx
index 6fd6e85ea8..eb5dfdd79c 100644
--- a/src/IGESBasic/IGESBasic_ReadWriteModule.cxx
+++ b/src/IGESBasic/IGESBasic_ReadWriteModule.cxx
@@ -53,6 +53,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
index 1b7e31664f..8075ff2e24 100644
--- a/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
+++ b/src/IGESBasic/IGESBasic_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_SingleParent.cxx b/src/IGESBasic/IGESBasic_SingleParent.cxx
index 3710a61f6f..508b2f24b4 100644
--- a/src/IGESBasic/IGESBasic_SingleParent.cxx
+++ b/src/IGESBasic/IGESBasic_SingleParent.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_SingleParent,IGESData_SingleParentEntity)
+
 IGESBasic_SingleParent::IGESBasic_SingleParent ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_SingleParent.hxx b/src/IGESBasic/IGESBasic_SingleParent.hxx
index 60a5a0ba33..a1e3f6bed8 100644
--- a/src/IGESBasic/IGESBasic_SingleParent.hxx
+++ b/src/IGESBasic/IGESBasic_SingleParent.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_SingleParent,IGESData_SingleParentEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_SingleParent,IGESData_SingleParentEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_SingularSubfigure.cxx b/src/IGESBasic/IGESBasic_SingularSubfigure.cxx
index 4e62c9cf80..83f1c54099 100644
--- a/src/IGESBasic/IGESBasic_SingularSubfigure.cxx
+++ b/src/IGESBasic/IGESBasic_SingularSubfigure.cxx
@@ -22,6 +22,8 @@
 #include <IGESBasic_SubfigureDef.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_SingularSubfigure,IGESData_IGESEntity)
+
 IGESBasic_SingularSubfigure::IGESBasic_SingularSubfigure ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_SingularSubfigure.hxx b/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
index 83d1497154..e08f576496 100644
--- a/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
+++ b/src/IGESBasic/IGESBasic_SingularSubfigure.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_SingularSubfigure,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_SingularSubfigure,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_SpecificModule.cxx b/src/IGESBasic/IGESBasic_SpecificModule.cxx
index 674d0a1cd7..39e3d62d7d 100644
--- a/src/IGESBasic/IGESBasic_SpecificModule.cxx
+++ b/src/IGESBasic/IGESBasic_SpecificModule.cxx
@@ -51,6 +51,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESBasic/IGESBasic_SpecificModule.hxx b/src/IGESBasic/IGESBasic_SpecificModule.hxx
index 7445f90451..6e464c251b 100644
--- a/src/IGESBasic/IGESBasic_SpecificModule.hxx
+++ b/src/IGESBasic/IGESBasic_SpecificModule.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESBasic/IGESBasic_SubfigureDef.cxx b/src/IGESBasic/IGESBasic_SubfigureDef.cxx
index 19f6b9d0a9..303b0c79d0 100644
--- a/src/IGESBasic/IGESBasic_SubfigureDef.cxx
+++ b/src/IGESBasic/IGESBasic_SubfigureDef.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESBasic_SubfigureDef,IGESData_IGESEntity)
+
 IGESBasic_SubfigureDef::IGESBasic_SubfigureDef ()    {  }
 
 
diff --git a/src/IGESBasic/IGESBasic_SubfigureDef.hxx b/src/IGESBasic/IGESBasic_SubfigureDef.hxx
index 985bc7ea10..8446f7a1ac 100644
--- a/src/IGESBasic/IGESBasic_SubfigureDef.hxx
+++ b/src/IGESBasic/IGESBasic_SubfigureDef.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESBasic_SubfigureDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESBasic_SubfigureDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESControl/IGESControl_ActorWrite.cxx b/src/IGESControl/IGESControl_ActorWrite.cxx
index 9923c69f2a..4708b0614a 100644
--- a/src/IGESControl/IGESControl_ActorWrite.cxx
+++ b/src/IGESControl/IGESControl_ActorWrite.cxx
@@ -33,6 +33,8 @@
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESControl_ActorWrite,Transfer_ActorOfFinderProcess)
+
 IGESControl_ActorWrite::IGESControl_ActorWrite ()  {  ModeTrans() = 0;  }
 
 Standard_Boolean  IGESControl_ActorWrite::Recognize
diff --git a/src/IGESControl/IGESControl_ActorWrite.hxx b/src/IGESControl/IGESControl_ActorWrite.hxx
index 800c44ce6e..cabe728247 100644
--- a/src/IGESControl/IGESControl_ActorWrite.hxx
+++ b/src/IGESControl/IGESControl_ActorWrite.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESControl_ActorWrite,Transfer_ActorOfFinderProcess)
+  DEFINE_STANDARD_RTTIEXT(IGESControl_ActorWrite,Transfer_ActorOfFinderProcess)
 
 protected:
 
diff --git a/src/IGESControl/IGESControl_AlgoContainer.cxx b/src/IGESControl/IGESControl_AlgoContainer.cxx
index 6e4a4d0727..3fba57f501 100644
--- a/src/IGESControl/IGESControl_AlgoContainer.cxx
+++ b/src/IGESControl/IGESControl_AlgoContainer.cxx
@@ -18,6 +18,8 @@
 #include <IGESControl_ToolContainer.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESControl_AlgoContainer,IGESToBRep_AlgoContainer)
+
 //=======================================================================
 //function : IGESControl_AlgoContainer
 //purpose  : 
diff --git a/src/IGESControl/IGESControl_AlgoContainer.hxx b/src/IGESControl/IGESControl_AlgoContainer.hxx
index 7c0ba27f5e..a73643992b 100644
--- a/src/IGESControl/IGESControl_AlgoContainer.hxx
+++ b/src/IGESControl/IGESControl_AlgoContainer.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESControl_AlgoContainer,IGESToBRep_AlgoContainer)
+  DEFINE_STANDARD_RTTIEXT(IGESControl_AlgoContainer,IGESToBRep_AlgoContainer)
 
 protected:
 
diff --git a/src/IGESControl/IGESControl_Controller.cxx b/src/IGESControl/IGESControl_Controller.cxx
index 173150a0b7..d18f1436da 100644
--- a/src/IGESControl/IGESControl_Controller.cxx
+++ b/src/IGESControl/IGESControl_Controller.cxx
@@ -66,6 +66,8 @@
 #include <XSControl_SelectForTransfer.hxx>
 #include <XSControl_WorkSession.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESControl_Controller,XSControl_Controller)
+
 //szv#4:S4163:12Mar99 never referenced
 //static const Standard_CString thelong  = "IGES";
 //static const Standard_CString theshort = "iges";
diff --git a/src/IGESControl/IGESControl_Controller.hxx b/src/IGESControl/IGESControl_Controller.hxx
index 3d7bf941c8..7a8472906f 100644
--- a/src/IGESControl/IGESControl_Controller.hxx
+++ b/src/IGESControl/IGESControl_Controller.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESControl_Controller,XSControl_Controller)
+  DEFINE_STANDARD_RTTIEXT(IGESControl_Controller,XSControl_Controller)
 
 protected:
 
diff --git a/src/IGESControl/IGESControl_IGESBoundary.cxx b/src/IGESControl/IGESControl_IGESBoundary.cxx
index 50e9b579f8..9ba8c9c856 100644
--- a/src/IGESControl/IGESControl_IGESBoundary.cxx
+++ b/src/IGESControl/IGESControl_IGESBoundary.cxx
@@ -55,6 +55,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESControl_IGESBoundary,IGESToBRep_IGESBoundary)
+
 //=======================================================================
 //function : IGESControl_IGESBoundary
 //purpose  : 
diff --git a/src/IGESControl/IGESControl_IGESBoundary.hxx b/src/IGESControl/IGESControl_IGESBoundary.hxx
index 5d93648c00..8fff40b5b1 100644
--- a/src/IGESControl/IGESControl_IGESBoundary.hxx
+++ b/src/IGESControl/IGESControl_IGESBoundary.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESControl_IGESBoundary,IGESToBRep_IGESBoundary)
+  DEFINE_STANDARD_RTTIEXT(IGESControl_IGESBoundary,IGESToBRep_IGESBoundary)
 
 protected:
 
diff --git a/src/IGESControl/IGESControl_ToolContainer.cxx b/src/IGESControl/IGESControl_ToolContainer.cxx
index abc6c52c14..d278072c4f 100644
--- a/src/IGESControl/IGESControl_ToolContainer.cxx
+++ b/src/IGESControl/IGESControl_ToolContainer.cxx
@@ -19,6 +19,8 @@
 #include <IGESToBRep_IGESBoundary.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESControl_ToolContainer,IGESToBRep_ToolContainer)
+
 //=======================================================================
 //function : IGESControl_ToolContainer
 //purpose  : 
diff --git a/src/IGESControl/IGESControl_ToolContainer.hxx b/src/IGESControl/IGESControl_ToolContainer.hxx
index 13e114b82a..1fd575f29a 100644
--- a/src/IGESControl/IGESControl_ToolContainer.hxx
+++ b/src/IGESControl/IGESControl_ToolContainer.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESControl_ToolContainer,IGESToBRep_ToolContainer)
+  DEFINE_STANDARD_RTTIEXT(IGESControl_ToolContainer,IGESToBRep_ToolContainer)
 
 protected:
 
diff --git a/src/IGESData/IGESData_ColorEntity.cxx b/src/IGESData/IGESData_ColorEntity.cxx
index c3bb0202c7..f8db1ec126 100644
--- a/src/IGESData/IGESData_ColorEntity.cxx
+++ b/src/IGESData/IGESData_ColorEntity.cxx
@@ -15,4 +15,6 @@
 #include <IGESData_ColorEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_ColorEntity,IGESData_IGESEntity)
+
 // ColorEntity ne sert qu'au controle de type (entite Color du directory part)
diff --git a/src/IGESData/IGESData_ColorEntity.hxx b/src/IGESData/IGESData_ColorEntity.hxx
index 45cfdf0a29..ed16df1575 100644
--- a/src/IGESData/IGESData_ColorEntity.hxx
+++ b/src/IGESData/IGESData_ColorEntity.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_ColorEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_ColorEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_DefaultGeneral.cxx b/src/IGESData/IGESData_DefaultGeneral.cxx
index 840680f87e..4576785537 100644
--- a/src/IGESData/IGESData_DefaultGeneral.cxx
+++ b/src/IGESData/IGESData_DefaultGeneral.cxx
@@ -30,6 +30,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_DefaultGeneral,IGESData_GeneralModule)
+
 IGESData_DefaultGeneral::IGESData_DefaultGeneral ()
 {  Interface_GeneralLib::SetGlobal(this, IGESData::Protocol());  }
 
diff --git a/src/IGESData/IGESData_DefaultGeneral.hxx b/src/IGESData/IGESData_DefaultGeneral.hxx
index 2278f6a2ab..2621a84862 100644
--- a/src/IGESData/IGESData_DefaultGeneral.hxx
+++ b/src/IGESData/IGESData_DefaultGeneral.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_DefaultGeneral,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESData_DefaultGeneral,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESData/IGESData_DefaultSpecific.cxx b/src/IGESData/IGESData_DefaultSpecific.cxx
index 650afd6800..f4718082df 100644
--- a/src/IGESData/IGESData_DefaultSpecific.cxx
+++ b/src/IGESData/IGESData_DefaultSpecific.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_DefaultSpecific,IGESData_SpecificModule)
+
 IGESData_DefaultSpecific::IGESData_DefaultSpecific ()
 {  IGESData_SpecificLib::SetGlobal(this, IGESData::Protocol());  }
 
diff --git a/src/IGESData/IGESData_DefaultSpecific.hxx b/src/IGESData/IGESData_DefaultSpecific.hxx
index 8c789ee07b..13556af0ef 100644
--- a/src/IGESData/IGESData_DefaultSpecific.hxx
+++ b/src/IGESData/IGESData_DefaultSpecific.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_DefaultSpecific,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESData_DefaultSpecific,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESData/IGESData_FileProtocol.cxx b/src/IGESData/IGESData_FileProtocol.cxx
index 74b5671333..f5cc6afca9 100644
--- a/src/IGESData/IGESData_FileProtocol.cxx
+++ b/src/IGESData/IGESData_FileProtocol.cxx
@@ -17,6 +17,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_FileProtocol,IGESData_Protocol)
+
 IGESData_FileProtocol::IGESData_FileProtocol ()    {  }
 
     void  IGESData_FileProtocol::Add (const Handle(IGESData_Protocol)& protocol)
diff --git a/src/IGESData/IGESData_FileProtocol.hxx b/src/IGESData/IGESData_FileProtocol.hxx
index 335d03e169..c1eaf7481d 100644
--- a/src/IGESData/IGESData_FileProtocol.hxx
+++ b/src/IGESData/IGESData_FileProtocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_FileProtocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESData_FileProtocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESData/IGESData_FileRecognizer.hxx b/src/IGESData/IGESData_FileRecognizer.hxx
index 39b2842725..fcd84bd119 100644
--- a/src/IGESData/IGESData_FileRecognizer.hxx
+++ b/src/IGESData/IGESData_FileRecognizer.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_FileRecognizer,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(IGESData_FileRecognizer,Standard_Transient)
 
 protected:
 
diff --git a/src/IGESData/IGESData_FreeFormatEntity.cxx b/src/IGESData/IGESData_FreeFormatEntity.cxx
index d29b948786..0a27c4ce8f 100644
--- a/src/IGESData/IGESData_FreeFormatEntity.cxx
+++ b/src/IGESData/IGESData_FreeFormatEntity.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_FreeFormatEntity,IGESData_UndefinedEntity)
+
 //  Donne un acces simple a la constitution d une UndefinedEntity :
 //  Methodes de UndefinedContent, + Type & Form, + AddEntities (little gadget)
 IGESData_FreeFormatEntity::IGESData_FreeFormatEntity ()    {  }
diff --git a/src/IGESData/IGESData_FreeFormatEntity.hxx b/src/IGESData/IGESData_FreeFormatEntity.hxx
index 1912f0ca6b..134c63e99d 100644
--- a/src/IGESData/IGESData_FreeFormatEntity.hxx
+++ b/src/IGESData/IGESData_FreeFormatEntity.hxx
@@ -135,7 +135,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_FreeFormatEntity,IGESData_UndefinedEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_FreeFormatEntity,IGESData_UndefinedEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_GeneralModule.cxx b/src/IGESData/IGESData_GeneralModule.cxx
index 3bcb4619fe..e480f669bb 100644
--- a/src/IGESData/IGESData_GeneralModule.cxx
+++ b/src/IGESData/IGESData_GeneralModule.cxx
@@ -33,6 +33,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_GeneralModule,Interface_GeneralModule)
+
 void  IGESData_GeneralModule::FillSharedCase
   (const Standard_Integer CN, const Handle(Standard_Transient)& ent,
    Interface_EntityIterator& iter) const 
diff --git a/src/IGESData/IGESData_GeneralModule.hxx b/src/IGESData/IGESData_GeneralModule.hxx
index 7d1f653df2..fcf88a2fd1 100644
--- a/src/IGESData/IGESData_GeneralModule.hxx
+++ b/src/IGESData/IGESData_GeneralModule.hxx
@@ -122,7 +122,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_GeneralModule,Interface_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESData_GeneralModule,Interface_GeneralModule)
 
 protected:
 
diff --git a/src/IGESData/IGESData_GlobalNodeOfSpecificLib.hxx b/src/IGESData/IGESData_GlobalNodeOfSpecificLib.hxx
index ce9e406d00..e9db7ad2af 100644
--- a/src/IGESData/IGESData_GlobalNodeOfSpecificLib.hxx
+++ b/src/IGESData/IGESData_GlobalNodeOfSpecificLib.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_GlobalNodeOfSpecificLib,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(IGESData_GlobalNodeOfSpecificLib,Standard_Transient)
 
 protected:
 
diff --git a/src/IGESData/IGESData_GlobalNodeOfWriterLib.hxx b/src/IGESData/IGESData_GlobalNodeOfWriterLib.hxx
index e970c59fb9..cea9c9c7f3 100644
--- a/src/IGESData/IGESData_GlobalNodeOfWriterLib.hxx
+++ b/src/IGESData/IGESData_GlobalNodeOfWriterLib.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_GlobalNodeOfWriterLib,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(IGESData_GlobalNodeOfWriterLib,Standard_Transient)
 
 protected:
 
diff --git a/src/IGESData/IGESData_IGESEntity.cxx b/src/IGESData/IGESData_IGESEntity.cxx
index 5005d4c193..e8bd5af5f7 100644
--- a/src/IGESData/IGESData_IGESEntity.cxx
+++ b/src/IGESData/IGESData_IGESEntity.cxx
@@ -37,6 +37,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_IGESEntity,MMgt_TShared)
+
 #define ThisEntity  Handle(IGESData_IGESEntity)::DownCast(This())
 
 namespace
diff --git a/src/IGESData/IGESData_IGESEntity.hxx b/src/IGESData/IGESData_IGESEntity.hxx
index 4b0c4f7416..663451668d 100644
--- a/src/IGESData/IGESData_IGESEntity.hxx
+++ b/src/IGESData/IGESData_IGESEntity.hxx
@@ -330,7 +330,7 @@ friend class IGESData_IGESReaderTool;
 friend class IGESData_DirChecker;
 
 
-  DEFINE_STANDARD_RTTI(IGESData_IGESEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESData_IGESEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESData/IGESData_IGESModel.cxx b/src/IGESData/IGESData_IGESModel.cxx
index 5b8fbf923c..98df9cffe1 100644
--- a/src/IGESData/IGESData_IGESModel.cxx
+++ b/src/IGESData/IGESData_IGESModel.cxx
@@ -32,6 +32,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_IGESModel,Interface_InterfaceModel)
+
 static Standard_CString voidline = "";
 
 // Routine interne utilisee pour VerifyCheck
diff --git a/src/IGESData/IGESData_IGESModel.hxx b/src/IGESData/IGESData_IGESModel.hxx
index 143d7f9c21..70e114685c 100644
--- a/src/IGESData/IGESData_IGESModel.hxx
+++ b/src/IGESData/IGESData_IGESModel.hxx
@@ -162,7 +162,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_IGESModel,Interface_InterfaceModel)
+  DEFINE_STANDARD_RTTIEXT(IGESData_IGESModel,Interface_InterfaceModel)
 
 protected:
 
diff --git a/src/IGESData/IGESData_IGESReaderData.cxx b/src/IGESData/IGESData_IGESReaderData.cxx
index c7f298d35a..d5ef0b39c2 100644
--- a/src/IGESData/IGESData_IGESReaderData.cxx
+++ b/src/IGESData/IGESData_IGESReaderData.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_IGESReaderData,Interface_FileReaderData)
+
 IGESData_IGESReaderData::IGESData_IGESReaderData
   (const Standard_Integer nbe, const Standard_Integer nbp)
     : Interface_FileReaderData (nbe,nbp) , thectyp (0,0) , thedirs(0,nbe)  
diff --git a/src/IGESData/IGESData_IGESReaderData.hxx b/src/IGESData/IGESData_IGESReaderData.hxx
index fe1c5a8fc4..71ac9d06dc 100644
--- a/src/IGESData/IGESData_IGESReaderData.hxx
+++ b/src/IGESData/IGESData_IGESReaderData.hxx
@@ -115,7 +115,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_IGESReaderData,Interface_FileReaderData)
+  DEFINE_STANDARD_RTTIEXT(IGESData_IGESReaderData,Interface_FileReaderData)
 
 protected:
 
diff --git a/src/IGESData/IGESData_LabelDisplayEntity.cxx b/src/IGESData/IGESData_LabelDisplayEntity.cxx
index 87086a7d4a..36617aeea3 100644
--- a/src/IGESData/IGESData_LabelDisplayEntity.cxx
+++ b/src/IGESData/IGESData_LabelDisplayEntity.cxx
@@ -15,4 +15,6 @@
 #include <IGESData_LabelDisplayEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_LabelDisplayEntity,IGESData_IGESEntity)
+
 // LabelDisplayEntity ne sert qu'au controle de type (pour le directory part)
diff --git a/src/IGESData/IGESData_LabelDisplayEntity.hxx b/src/IGESData/IGESData_LabelDisplayEntity.hxx
index 4e01ed3fdf..29ad6942fd 100644
--- a/src/IGESData/IGESData_LabelDisplayEntity.hxx
+++ b/src/IGESData/IGESData_LabelDisplayEntity.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_LabelDisplayEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_LabelDisplayEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_LevelListEntity.cxx b/src/IGESData/IGESData_LevelListEntity.cxx
index 8cc2bed9e9..9fb736b05b 100644
--- a/src/IGESData/IGESData_LevelListEntity.cxx
+++ b/src/IGESData/IGESData_LevelListEntity.cxx
@@ -16,6 +16,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_LevelListEntity,IGESData_IGESEntity)
+
 // LevelListEntity ne sert qu'au controle de type (pour le directory part)
 Standard_Boolean  IGESData_LevelListEntity::HasLevelNumber
   (const Standard_Integer level) const
diff --git a/src/IGESData/IGESData_LevelListEntity.hxx b/src/IGESData/IGESData_LevelListEntity.hxx
index 2bb57fc682..8994e3b19a 100644
--- a/src/IGESData/IGESData_LevelListEntity.hxx
+++ b/src/IGESData/IGESData_LevelListEntity.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_LevelListEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_LevelListEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_LineFontEntity.cxx b/src/IGESData/IGESData_LineFontEntity.cxx
index 38698e8d6f..b1d7bdf819 100644
--- a/src/IGESData/IGESData_LineFontEntity.cxx
+++ b/src/IGESData/IGESData_LineFontEntity.cxx
@@ -15,4 +15,6 @@
 #include <IGESData_LineFontEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_LineFontEntity,IGESData_IGESEntity)
+
 // LineTypeEntity ne sert qu'au controle de type (pour le directory part)
diff --git a/src/IGESData/IGESData_LineFontEntity.hxx b/src/IGESData/IGESData_LineFontEntity.hxx
index 18f13a8044..38be576995 100644
--- a/src/IGESData/IGESData_LineFontEntity.hxx
+++ b/src/IGESData/IGESData_LineFontEntity.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_LineFontEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_LineFontEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_NameEntity.cxx b/src/IGESData/IGESData_NameEntity.cxx
index 00db833c73..2976652bb8 100644
--- a/src/IGESData/IGESData_NameEntity.cxx
+++ b/src/IGESData/IGESData_NameEntity.cxx
@@ -16,4 +16,6 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_NameEntity,IGESData_IGESEntity)
+
 // NameEntity sert a decrire des entites "propriete nom" (Value a definir)
diff --git a/src/IGESData/IGESData_NameEntity.hxx b/src/IGESData/IGESData_NameEntity.hxx
index e02944efd2..1c621f5666 100644
--- a/src/IGESData/IGESData_NameEntity.hxx
+++ b/src/IGESData/IGESData_NameEntity.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_NameEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_NameEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_NodeOfSpecificLib.hxx b/src/IGESData/IGESData_NodeOfSpecificLib.hxx
index 89b2aeba70..d96f224fc6 100644
--- a/src/IGESData/IGESData_NodeOfSpecificLib.hxx
+++ b/src/IGESData/IGESData_NodeOfSpecificLib.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_NodeOfSpecificLib,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESData_NodeOfSpecificLib,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESData/IGESData_NodeOfWriterLib.hxx b/src/IGESData/IGESData_NodeOfWriterLib.hxx
index 5b71ac5c3f..df4f59c67d 100644
--- a/src/IGESData/IGESData_NodeOfWriterLib.hxx
+++ b/src/IGESData/IGESData_NodeOfWriterLib.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_NodeOfWriterLib,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESData_NodeOfWriterLib,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESData/IGESData_Protocol.cxx b/src/IGESData/IGESData_Protocol.cxx
index b9c7452d3f..c40e5396c6 100644
--- a/src/IGESData/IGESData_Protocol.cxx
+++ b/src/IGESData/IGESData_Protocol.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_Protocol,Interface_Protocol)
+
 IGESData_Protocol::IGESData_Protocol ()    {  }
 
 
diff --git a/src/IGESData/IGESData_Protocol.hxx b/src/IGESData/IGESData_Protocol.hxx
index 88ccaaa6c8..54497254c6 100644
--- a/src/IGESData/IGESData_Protocol.hxx
+++ b/src/IGESData/IGESData_Protocol.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_Protocol,Interface_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESData_Protocol,Interface_Protocol)
 
 protected:
 
diff --git a/src/IGESData/IGESData_ReadWriteModule.cxx b/src/IGESData/IGESData_ReadWriteModule.cxx
index 3f29674e31..a4a0154e71 100644
--- a/src/IGESData/IGESData_ReadWriteModule.cxx
+++ b/src/IGESData/IGESData_ReadWriteModule.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_ReadWriteModule,Interface_ReaderModule)
+
 Standard_Integer  IGESData_ReadWriteModule::CaseNum
   (const Handle(Interface_FileReaderData)& data,
    const Standard_Integer num) const 
diff --git a/src/IGESData/IGESData_ReadWriteModule.hxx b/src/IGESData/IGESData_ReadWriteModule.hxx
index 14ae7bb2ee..0cee336436 100644
--- a/src/IGESData/IGESData_ReadWriteModule.hxx
+++ b/src/IGESData/IGESData_ReadWriteModule.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_ReadWriteModule,Interface_ReaderModule)
+  DEFINE_STANDARD_RTTIEXT(IGESData_ReadWriteModule,Interface_ReaderModule)
 
 protected:
 
diff --git a/src/IGESData/IGESData_SingleParentEntity.cxx b/src/IGESData/IGESData_SingleParentEntity.cxx
index 3da611f257..465f8cb0cb 100644
--- a/src/IGESData/IGESData_SingleParentEntity.cxx
+++ b/src/IGESData/IGESData_SingleParentEntity.cxx
@@ -17,5 +17,7 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_SingleParentEntity,IGESData_IGESEntity)
+
 // SingleParentEntity sert a decrire des entites "associativite parent"
 // (methode Parent a definir)
diff --git a/src/IGESData/IGESData_SingleParentEntity.hxx b/src/IGESData/IGESData_SingleParentEntity.hxx
index 3cbc142cbf..262b58c567 100644
--- a/src/IGESData/IGESData_SingleParentEntity.hxx
+++ b/src/IGESData/IGESData_SingleParentEntity.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_SingleParentEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_SingleParentEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_SpecificModule.cxx b/src/IGESData/IGESData_SpecificModule.cxx
index 9e0932ba6b..0eec2f5374 100644
--- a/src/IGESData/IGESData_SpecificModule.cxx
+++ b/src/IGESData/IGESData_SpecificModule.cxx
@@ -18,6 +18,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_SpecificModule,Standard_Transient)
+
 Standard_Boolean  IGESData_SpecificModule::OwnCorrect
   (const Standard_Integer , const Handle(IGESData_IGESEntity)& ) const
 {  return Standard_False;  }    // par defaut, ne fait rien
diff --git a/src/IGESData/IGESData_SpecificModule.hxx b/src/IGESData/IGESData_SpecificModule.hxx
index d721115425..8eb81a33cc 100644
--- a/src/IGESData/IGESData_SpecificModule.hxx
+++ b/src/IGESData/IGESData_SpecificModule.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_SpecificModule,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(IGESData_SpecificModule,Standard_Transient)
 
 protected:
 
diff --git a/src/IGESData/IGESData_ToolLocation.cxx b/src/IGESData/IGESData_ToolLocation.cxx
index fa31b999aa..5438478a57 100644
--- a/src/IGESData/IGESData_ToolLocation.cxx
+++ b/src/IGESData/IGESData_ToolLocation.cxx
@@ -32,6 +32,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_ToolLocation,MMgt_TShared)
+
 #define TYPEFORASSOC 402
 
 IGESData_ToolLocation::IGESData_ToolLocation (const Handle(IGESData_IGESModel)& amodel,
diff --git a/src/IGESData/IGESData_ToolLocation.hxx b/src/IGESData/IGESData_ToolLocation.hxx
index 3df9de1567..612d0dba00 100644
--- a/src/IGESData/IGESData_ToolLocation.hxx
+++ b/src/IGESData/IGESData_ToolLocation.hxx
@@ -154,7 +154,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_ToolLocation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESData_ToolLocation,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESData/IGESData_TransfEntity.cxx b/src/IGESData/IGESData_TransfEntity.cxx
index 28d6a8c03c..6ef143a656 100644
--- a/src/IGESData/IGESData_TransfEntity.cxx
+++ b/src/IGESData/IGESData_TransfEntity.cxx
@@ -16,5 +16,7 @@
 #include <IGESData_TransfEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_TransfEntity,IGESData_IGESEntity)
+
 // TransfEntity ne sert que pour controle de Type, et fourniture par Value
 // de la GTrsf correspondante
diff --git a/src/IGESData/IGESData_TransfEntity.hxx b/src/IGESData/IGESData_TransfEntity.hxx
index e92f2b19a8..9a990ca777 100644
--- a/src/IGESData/IGESData_TransfEntity.hxx
+++ b/src/IGESData/IGESData_TransfEntity.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_TransfEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_TransfEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_UndefinedEntity.cxx b/src/IGESData/IGESData_UndefinedEntity.cxx
index 5e02e95dc2..f055741230 100644
--- a/src/IGESData/IGESData_UndefinedEntity.cxx
+++ b/src/IGESData/IGESData_UndefinedEntity.cxx
@@ -31,6 +31,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_UndefinedEntity,IGESData_IGESEntity)
+
 // MGE 23/07/98
 //=======================================================================
 //function : IGESData_UndefinedEntity
diff --git a/src/IGESData/IGESData_UndefinedEntity.hxx b/src/IGESData/IGESData_UndefinedEntity.hxx
index 11b11f8dcd..cadc43bbd1 100644
--- a/src/IGESData/IGESData_UndefinedEntity.hxx
+++ b/src/IGESData/IGESData_UndefinedEntity.hxx
@@ -106,7 +106,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_UndefinedEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_UndefinedEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESData/IGESData_ViewKindEntity.cxx b/src/IGESData/IGESData_ViewKindEntity.cxx
index 777f095a9a..4cccd10357 100644
--- a/src/IGESData/IGESData_ViewKindEntity.cxx
+++ b/src/IGESData/IGESData_ViewKindEntity.cxx
@@ -16,6 +16,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESData_ViewKindEntity,IGESData_IGESEntity)
+
 // ViewKindEntity ne sert qu'au controle de type (entite View du directory part
 // qui peut etre une Vue Simple ou une Liste de Vue
 // Vue Simple doit implementer IsSingle a Standard_True, Liste de Vue a Standard_False
diff --git a/src/IGESData/IGESData_ViewKindEntity.hxx b/src/IGESData/IGESData_ViewKindEntity.hxx
index fead3c0fe7..06b33521e6 100644
--- a/src/IGESData/IGESData_ViewKindEntity.hxx
+++ b/src/IGESData/IGESData_ViewKindEntity.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESData_ViewKindEntity,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESData_ViewKindEntity,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_AssociativityDef.cxx b/src/IGESDefs/IGESDefs_AssociativityDef.cxx
index de2a581273..6957058831 100644
--- a/src/IGESDefs/IGESDefs_AssociativityDef.cxx
+++ b/src/IGESDefs/IGESDefs_AssociativityDef.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_AssociativityDef,IGESData_IGESEntity)
+
 IGESDefs_AssociativityDef::IGESDefs_AssociativityDef ()    {  }
 
 
diff --git a/src/IGESDefs/IGESDefs_AssociativityDef.hxx b/src/IGESDefs/IGESDefs_AssociativityDef.hxx
index 91c8a8e899..905eda05b6 100644
--- a/src/IGESDefs/IGESDefs_AssociativityDef.hxx
+++ b/src/IGESDefs/IGESDefs_AssociativityDef.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_AssociativityDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_AssociativityDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_AttributeDef.cxx b/src/IGESDefs/IGESDefs_AttributeDef.cxx
index 2fc2d92928..6780fd332e 100644
--- a/src/IGESDefs/IGESDefs_AttributeDef.cxx
+++ b/src/IGESDefs/IGESDefs_AttributeDef.cxx
@@ -33,6 +33,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_AttributeDef,IGESData_IGESEntity)
+
 //  For each Attribute Value, according to Attribute Type :
 // 0 -> Void, 1 -> Integer, 2 -> Real, 3 -> String, 4 -> Entity   6 -> Logical
 IGESDefs_AttributeDef::IGESDefs_AttributeDef ()    {  }
diff --git a/src/IGESDefs/IGESDefs_AttributeDef.hxx b/src/IGESDefs/IGESDefs_AttributeDef.hxx
index 69a7241035..0dafcae8ad 100644
--- a/src/IGESDefs/IGESDefs_AttributeDef.hxx
+++ b/src/IGESDefs/IGESDefs_AttributeDef.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_AttributeDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_AttributeDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_AttributeTable.cxx b/src/IGESDefs/IGESDefs_AttributeTable.cxx
index fc232c7cf0..31a39944ed 100644
--- a/src/IGESDefs/IGESDefs_AttributeTable.cxx
+++ b/src/IGESDefs/IGESDefs_AttributeTable.cxx
@@ -31,6 +31,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_AttributeTable,IGESData_IGESEntity)
+
 //  ATTENTION  ATTENTION : L Appellation "ROW" n est pas reconduite en l etat
 //  Le Numero d Attribut est donne en 1er (donc, en colonne du HArray2 et non
 //  en ligne), le numero de Colonne en 2e (donc, comme un numero de Ligne)
diff --git a/src/IGESDefs/IGESDefs_AttributeTable.hxx b/src/IGESDefs/IGESDefs_AttributeTable.hxx
index 69589cf8b3..a830114849 100644
--- a/src/IGESDefs/IGESDefs_AttributeTable.hxx
+++ b/src/IGESDefs/IGESDefs_AttributeTable.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_AttributeTable,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_AttributeTable,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_GeneralModule.cxx b/src/IGESDefs/IGESDefs_GeneralModule.cxx
index b5aba42d6c..f87e672e95 100644
--- a/src/IGESDefs/IGESDefs_GeneralModule.cxx
+++ b/src/IGESDefs/IGESDefs_GeneralModule.cxx
@@ -38,6 +38,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDefs/IGESDefs_GeneralModule.hxx b/src/IGESDefs/IGESDefs_GeneralModule.hxx
index b1cf12690d..bcc00c72de 100644
--- a/src/IGESDefs/IGESDefs_GeneralModule.hxx
+++ b/src/IGESDefs/IGESDefs_GeneralModule.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_GenericData.cxx b/src/IGESDefs/IGESDefs_GenericData.cxx
index 443f1a516d..acd83e9f6b 100644
--- a/src/IGESDefs/IGESDefs_GenericData.cxx
+++ b/src/IGESDefs/IGESDefs_GenericData.cxx
@@ -30,6 +30,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_GenericData,IGESData_IGESEntity)
+
 IGESDefs_GenericData::IGESDefs_GenericData ()    {  }
 
 
diff --git a/src/IGESDefs/IGESDefs_GenericData.hxx b/src/IGESDefs/IGESDefs_GenericData.hxx
index 98ed5afd9a..a42b6f91d4 100644
--- a/src/IGESDefs/IGESDefs_GenericData.hxx
+++ b/src/IGESDefs/IGESDefs_GenericData.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_GenericData,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_GenericData,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate.hxx b/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate.hxx
index 3dca614898..49a2430af7 100644
--- a/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate.hxx
+++ b/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_HArray1OfHArray1OfTextDisplayTemplate,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IGESDefs_HArray1OfHArray1OfTextDisplayTemplate,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_MacroDef.cxx b/src/IGESDefs/IGESDefs_MacroDef.cxx
index 4854c822a2..6047c5c09d 100644
--- a/src/IGESDefs/IGESDefs_MacroDef.cxx
+++ b/src/IGESDefs/IGESDefs_MacroDef.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_MacroDef,IGESData_IGESEntity)
+
 IGESDefs_MacroDef::IGESDefs_MacroDef ()    {  }
 
     void  IGESDefs_MacroDef::Init
diff --git a/src/IGESDefs/IGESDefs_MacroDef.hxx b/src/IGESDefs/IGESDefs_MacroDef.hxx
index bdfff09458..afaecc4197 100644
--- a/src/IGESDefs/IGESDefs_MacroDef.hxx
+++ b/src/IGESDefs/IGESDefs_MacroDef.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_MacroDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_MacroDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_Protocol.cxx b/src/IGESDefs/IGESDefs_Protocol.cxx
index f097a106b5..a38f9577b6 100644
--- a/src/IGESDefs/IGESDefs_Protocol.cxx
+++ b/src/IGESDefs/IGESDefs_Protocol.cxx
@@ -25,6 +25,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype1,atype2,atype3,atype4,atype5,atype6,atype7;
 
diff --git a/src/IGESDefs/IGESDefs_Protocol.hxx b/src/IGESDefs/IGESDefs_Protocol.hxx
index d3da329ce0..7bdc365120 100644
--- a/src/IGESDefs/IGESDefs_Protocol.hxx
+++ b/src/IGESDefs/IGESDefs_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_ReadWriteModule.cxx b/src/IGESDefs/IGESDefs_ReadWriteModule.cxx
index e3329f2a08..845fa9715b 100644
--- a/src/IGESDefs/IGESDefs_ReadWriteModule.cxx
+++ b/src/IGESDefs/IGESDefs_ReadWriteModule.cxx
@@ -35,6 +35,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
index 8eaac82656..6e1617e5a8 100644
--- a/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
+++ b/src/IGESDefs/IGESDefs_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_SpecificModule.cxx b/src/IGESDefs/IGESDefs_SpecificModule.cxx
index b9c63de9ea..537d2f92c5 100644
--- a/src/IGESDefs/IGESDefs_SpecificModule.cxx
+++ b/src/IGESDefs/IGESDefs_SpecificModule.cxx
@@ -33,6 +33,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDefs/IGESDefs_SpecificModule.hxx b/src/IGESDefs/IGESDefs_SpecificModule.hxx
index 3e9feafe20..68dc1a57ab 100644
--- a/src/IGESDefs/IGESDefs_SpecificModule.hxx
+++ b/src/IGESDefs/IGESDefs_SpecificModule.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_TabularData.cxx b/src/IGESDefs/IGESDefs_TabularData.cxx
index 3058df22da..0cc27e55d9 100644
--- a/src/IGESDefs/IGESDefs_TabularData.cxx
+++ b/src/IGESDefs/IGESDefs_TabularData.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_TabularData,IGESData_IGESEntity)
+
 IGESDefs_TabularData::IGESDefs_TabularData ()    {  }
 
 
diff --git a/src/IGESDefs/IGESDefs_TabularData.hxx b/src/IGESDefs/IGESDefs_TabularData.hxx
index 33b53df7e3..c4557ada76 100644
--- a/src/IGESDefs/IGESDefs_TabularData.hxx
+++ b/src/IGESDefs/IGESDefs_TabularData.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_TabularData,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_TabularData,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDefs/IGESDefs_UnitsData.cxx b/src/IGESDefs/IGESDefs_UnitsData.cxx
index f60075b46b..0200222e0f 100644
--- a/src/IGESDefs/IGESDefs_UnitsData.cxx
+++ b/src/IGESDefs/IGESDefs_UnitsData.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_UnitsData,IGESData_IGESEntity)
+
 IGESDefs_UnitsData::IGESDefs_UnitsData ()    {  }
 
 
diff --git a/src/IGESDefs/IGESDefs_UnitsData.hxx b/src/IGESDefs/IGESDefs_UnitsData.hxx
index f11a4d93a7..8d8fe73747 100644
--- a/src/IGESDefs/IGESDefs_UnitsData.hxx
+++ b/src/IGESDefs/IGESDefs_UnitsData.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDefs_UnitsData,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDefs_UnitsData,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_AngularDimension.cxx b/src/IGESDimen/IGESDimen_AngularDimension.cxx
index ff2b28c18a..2a849defac 100644
--- a/src/IGESDimen/IGESDimen_AngularDimension.cxx
+++ b/src/IGESDimen/IGESDimen_AngularDimension.cxx
@@ -26,6 +26,8 @@
 #include <IGESDimen_WitnessLine.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_AngularDimension,IGESData_IGESEntity)
+
 IGESDimen_AngularDimension::IGESDimen_AngularDimension ()    {  }
 
     void  IGESDimen_AngularDimension::Init
diff --git a/src/IGESDimen/IGESDimen_AngularDimension.hxx b/src/IGESDimen/IGESDimen_AngularDimension.hxx
index 07e17f2367..57b35476f6 100644
--- a/src/IGESDimen/IGESDimen_AngularDimension.hxx
+++ b/src/IGESDimen/IGESDimen_AngularDimension.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_AngularDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_AngularDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_BasicDimension.cxx b/src/IGESDimen/IGESDimen_BasicDimension.cxx
index 0ce3550257..46719846c6 100644
--- a/src/IGESDimen/IGESDimen_BasicDimension.cxx
+++ b/src/IGESDimen/IGESDimen_BasicDimension.cxx
@@ -21,6 +21,8 @@
 #include <IGESDimen_BasicDimension.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_BasicDimension,IGESData_IGESEntity)
+
 IGESDimen_BasicDimension::IGESDimen_BasicDimension ()    {  }
 
     void  IGESDimen_BasicDimension::Init
diff --git a/src/IGESDimen/IGESDimen_BasicDimension.hxx b/src/IGESDimen/IGESDimen_BasicDimension.hxx
index 8d410b911f..02142e8e89 100644
--- a/src/IGESDimen/IGESDimen_BasicDimension.hxx
+++ b/src/IGESDimen/IGESDimen_BasicDimension.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_BasicDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_BasicDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_CenterLine.cxx b/src/IGESDimen/IGESDimen_CenterLine.cxx
index 6fbe6e9d70..05bed476da 100644
--- a/src/IGESDimen/IGESDimen_CenterLine.cxx
+++ b/src/IGESDimen/IGESDimen_CenterLine.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_CenterLine,IGESData_IGESEntity)
+
 IGESDimen_CenterLine::IGESDimen_CenterLine ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_CenterLine.hxx b/src/IGESDimen/IGESDimen_CenterLine.hxx
index bb80bc3793..5610e906ee 100644
--- a/src/IGESDimen/IGESDimen_CenterLine.hxx
+++ b/src/IGESDimen/IGESDimen_CenterLine.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_CenterLine,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_CenterLine,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_CurveDimension.cxx b/src/IGESDimen/IGESDimen_CurveDimension.cxx
index 53f0f1b84b..8e90c85043 100644
--- a/src/IGESDimen/IGESDimen_CurveDimension.cxx
+++ b/src/IGESDimen/IGESDimen_CurveDimension.cxx
@@ -26,6 +26,8 @@
 #include <IGESGeom_Line.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_CurveDimension,IGESData_IGESEntity)
+
 IGESDimen_CurveDimension::IGESDimen_CurveDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_CurveDimension.hxx b/src/IGESDimen/IGESDimen_CurveDimension.hxx
index 0c2edf68af..12f841e8b7 100644
--- a/src/IGESDimen/IGESDimen_CurveDimension.hxx
+++ b/src/IGESDimen/IGESDimen_CurveDimension.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_CurveDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_CurveDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_DiameterDimension.cxx b/src/IGESDimen/IGESDimen_DiameterDimension.cxx
index 380224a921..c5e276ae82 100644
--- a/src/IGESDimen/IGESDimen_DiameterDimension.cxx
+++ b/src/IGESDimen/IGESDimen_DiameterDimension.cxx
@@ -25,6 +25,8 @@
 #include <IGESDimen_LeaderArrow.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_DiameterDimension,IGESData_IGESEntity)
+
 IGESDimen_DiameterDimension::IGESDimen_DiameterDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_DiameterDimension.hxx b/src/IGESDimen/IGESDimen_DiameterDimension.hxx
index 73504fc310..9b8224ac56 100644
--- a/src/IGESDimen/IGESDimen_DiameterDimension.hxx
+++ b/src/IGESDimen/IGESDimen_DiameterDimension.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_DiameterDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_DiameterDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_DimensionDisplayData.cxx b/src/IGESDimen/IGESDimen_DimensionDisplayData.cxx
index 25ff7fc595..e43d8537cf 100644
--- a/src/IGESDimen/IGESDimen_DimensionDisplayData.cxx
+++ b/src/IGESDimen/IGESDimen_DimensionDisplayData.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_DimensionDisplayData,IGESData_IGESEntity)
+
 IGESDimen_DimensionDisplayData::IGESDimen_DimensionDisplayData ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx b/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
index 4e5c515abd..3a15b46482 100644
--- a/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionDisplayData.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_DimensionDisplayData,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_DimensionDisplayData,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_DimensionTolerance.cxx b/src/IGESDimen/IGESDimen_DimensionTolerance.cxx
index 1fd00cc970..bc9e84c290 100644
--- a/src/IGESDimen/IGESDimen_DimensionTolerance.cxx
+++ b/src/IGESDimen/IGESDimen_DimensionTolerance.cxx
@@ -19,6 +19,8 @@
 #include <IGESDimen_DimensionTolerance.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_DimensionTolerance,IGESData_IGESEntity)
+
 IGESDimen_DimensionTolerance::IGESDimen_DimensionTolerance ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_DimensionTolerance.hxx b/src/IGESDimen/IGESDimen_DimensionTolerance.hxx
index 351ff1f2c1..640876854e 100644
--- a/src/IGESDimen/IGESDimen_DimensionTolerance.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionTolerance.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_DimensionTolerance,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_DimensionTolerance,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_DimensionUnits.cxx b/src/IGESDimen/IGESDimen_DimensionUnits.cxx
index 4a9e4c1877..0fa0b6b747 100644
--- a/src/IGESDimen/IGESDimen_DimensionUnits.cxx
+++ b/src/IGESDimen/IGESDimen_DimensionUnits.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_DimensionUnits,IGESData_IGESEntity)
+
 IGESDimen_DimensionUnits::IGESDimen_DimensionUnits ()    {  }
 
     void  IGESDimen_DimensionUnits::Init
diff --git a/src/IGESDimen/IGESDimen_DimensionUnits.hxx b/src/IGESDimen/IGESDimen_DimensionUnits.hxx
index 986fbf0caf..6f780ef2d9 100644
--- a/src/IGESDimen/IGESDimen_DimensionUnits.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionUnits.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_DimensionUnits,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_DimensionUnits,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_DimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_DimensionedGeometry.cxx
index 3d0913c062..6d4fb868c9 100644
--- a/src/IGESDimen/IGESDimen_DimensionedGeometry.cxx
+++ b/src/IGESDimen/IGESDimen_DimensionedGeometry.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_DimensionedGeometry,IGESData_IGESEntity)
+
 IGESDimen_DimensionedGeometry::IGESDimen_DimensionedGeometry ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
index fd907071fb..6a73318c96 100644
--- a/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_DimensionedGeometry.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_DimensionedGeometry,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_DimensionedGeometry,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_FlagNote.cxx b/src/IGESDimen/IGESDimen_FlagNote.cxx
index b6e873a7c4..dd43bd1c42 100644
--- a/src/IGESDimen/IGESDimen_FlagNote.cxx
+++ b/src/IGESDimen/IGESDimen_FlagNote.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_FlagNote,IGESData_IGESEntity)
+
 IGESDimen_FlagNote::IGESDimen_FlagNote ()    {  }
 
     void  IGESDimen_FlagNote::Init
diff --git a/src/IGESDimen/IGESDimen_FlagNote.hxx b/src/IGESDimen/IGESDimen_FlagNote.hxx
index ced0850a2d..1ccff311aa 100644
--- a/src/IGESDimen/IGESDimen_FlagNote.hxx
+++ b/src/IGESDimen/IGESDimen_FlagNote.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_FlagNote,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_FlagNote,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_GeneralLabel.cxx b/src/IGESDimen/IGESDimen_GeneralLabel.cxx
index 609e895bd3..bc1c2b2a69 100644
--- a/src/IGESDimen/IGESDimen_GeneralLabel.cxx
+++ b/src/IGESDimen/IGESDimen_GeneralLabel.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_GeneralLabel,IGESData_IGESEntity)
+
 IGESDimen_GeneralLabel::IGESDimen_GeneralLabel ()    {  }
 
     void  IGESDimen_GeneralLabel::Init
diff --git a/src/IGESDimen/IGESDimen_GeneralLabel.hxx b/src/IGESDimen/IGESDimen_GeneralLabel.hxx
index de0c9795dd..1888d5a6ff 100644
--- a/src/IGESDimen/IGESDimen_GeneralLabel.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralLabel.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_GeneralLabel,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_GeneralLabel,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_GeneralModule.cxx b/src/IGESDimen/IGESDimen_GeneralModule.cxx
index a4d141eedc..493c9f9c06 100644
--- a/src/IGESDimen/IGESDimen_GeneralModule.cxx
+++ b/src/IGESDimen/IGESDimen_GeneralModule.cxx
@@ -70,6 +70,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDimen/IGESDimen_GeneralModule.hxx b/src/IGESDimen/IGESDimen_GeneralModule.hxx
index cb1017c295..389c749b6e 100644
--- a/src/IGESDimen/IGESDimen_GeneralModule.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralModule.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_GeneralNote.cxx b/src/IGESDimen/IGESDimen_GeneralNote.cxx
index 1e7156baaf..9ec9850b17 100644
--- a/src/IGESDimen/IGESDimen_GeneralNote.cxx
+++ b/src/IGESDimen/IGESDimen_GeneralNote.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_GeneralNote,IGESData_IGESEntity)
+
 IGESDimen_GeneralNote::IGESDimen_GeneralNote ()    {  }
 
     void  IGESDimen_GeneralNote::Init
diff --git a/src/IGESDimen/IGESDimen_GeneralNote.hxx b/src/IGESDimen/IGESDimen_GeneralNote.hxx
index ae99e5c1b1..f0b130a0f5 100644
--- a/src/IGESDimen/IGESDimen_GeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralNote.hxx
@@ -141,7 +141,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_GeneralNote,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_GeneralNote,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_GeneralSymbol.cxx b/src/IGESDimen/IGESDimen_GeneralSymbol.cxx
index 7b0a00458b..943fb97c55 100644
--- a/src/IGESDimen/IGESDimen_GeneralSymbol.cxx
+++ b/src/IGESDimen/IGESDimen_GeneralSymbol.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_GeneralSymbol,IGESData_IGESEntity)
+
 IGESDimen_GeneralSymbol::IGESDimen_GeneralSymbol ()    {  }
 
     void  IGESDimen_GeneralSymbol::Init 
diff --git a/src/IGESDimen/IGESDimen_GeneralSymbol.hxx b/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
index 35a262d3a5..03af3f0054 100644
--- a/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
+++ b/src/IGESDimen/IGESDimen_GeneralSymbol.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_GeneralSymbol,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_GeneralSymbol,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_LeaderArrow.cxx b/src/IGESDimen/IGESDimen_LeaderArrow.cxx
index 754baeaddd..9ff74a90ee 100644
--- a/src/IGESDimen/IGESDimen_LeaderArrow.cxx
+++ b/src/IGESDimen/IGESDimen_LeaderArrow.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_LeaderArrow,IGESData_IGESEntity)
+
 IGESDimen_LeaderArrow::IGESDimen_LeaderArrow ()    {  }
 
     void  IGESDimen_LeaderArrow::Init
diff --git a/src/IGESDimen/IGESDimen_LeaderArrow.hxx b/src/IGESDimen/IGESDimen_LeaderArrow.hxx
index c45dd992da..6e218c8979 100644
--- a/src/IGESDimen/IGESDimen_LeaderArrow.hxx
+++ b/src/IGESDimen/IGESDimen_LeaderArrow.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_LeaderArrow,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_LeaderArrow,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_LinearDimension.cxx b/src/IGESDimen/IGESDimen_LinearDimension.cxx
index a8924167c8..6cbefe5ae0 100644
--- a/src/IGESDimen/IGESDimen_LinearDimension.cxx
+++ b/src/IGESDimen/IGESDimen_LinearDimension.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_LinearDimension,IGESData_IGESEntity)
+
 IGESDimen_LinearDimension::IGESDimen_LinearDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_LinearDimension.hxx b/src/IGESDimen/IGESDimen_LinearDimension.hxx
index 6efd2c0584..51a081da6a 100644
--- a/src/IGESDimen/IGESDimen_LinearDimension.hxx
+++ b/src/IGESDimen/IGESDimen_LinearDimension.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_LinearDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_LinearDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cxx
index c127b7e35b..d3ef7ac7fe 100644
--- a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cxx
+++ b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_NewDimensionedGeometry,IGESData_IGESEntity)
+
 IGESDimen_NewDimensionedGeometry::IGESDimen_NewDimensionedGeometry ()   { }
 
 
diff --git a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
index 1fb2927c51..3cb4d4a335 100644
--- a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
+++ b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_NewDimensionedGeometry,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_NewDimensionedGeometry,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_NewGeneralNote.cxx b/src/IGESDimen/IGESDimen_NewGeneralNote.cxx
index 5836b360cc..5e9031246f 100644
--- a/src/IGESDimen/IGESDimen_NewGeneralNote.cxx
+++ b/src/IGESDimen/IGESDimen_NewGeneralNote.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_NewGeneralNote,IGESData_IGESEntity)
+
 IGESDimen_NewGeneralNote::IGESDimen_NewGeneralNote ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_NewGeneralNote.hxx b/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
index f16d97860a..e1e9bd7217 100644
--- a/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
+++ b/src/IGESDimen/IGESDimen_NewGeneralNote.hxx
@@ -240,7 +240,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_NewGeneralNote,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_NewGeneralNote,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_OrdinateDimension.cxx b/src/IGESDimen/IGESDimen_OrdinateDimension.cxx
index a6560ed764..5a5b8f63e7 100644
--- a/src/IGESDimen/IGESDimen_OrdinateDimension.cxx
+++ b/src/IGESDimen/IGESDimen_OrdinateDimension.cxx
@@ -22,6 +22,8 @@
 #include <IGESDimen_WitnessLine.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_OrdinateDimension,IGESData_IGESEntity)
+
 IGESDimen_OrdinateDimension::IGESDimen_OrdinateDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_OrdinateDimension.hxx b/src/IGESDimen/IGESDimen_OrdinateDimension.hxx
index 15431a4a80..e0c9816a42 100644
--- a/src/IGESDimen/IGESDimen_OrdinateDimension.hxx
+++ b/src/IGESDimen/IGESDimen_OrdinateDimension.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_OrdinateDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_OrdinateDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_PointDimension.cxx b/src/IGESDimen/IGESDimen_PointDimension.cxx
index f7dd221a8e..a999f7d9f9 100644
--- a/src/IGESDimen/IGESDimen_PointDimension.cxx
+++ b/src/IGESDimen/IGESDimen_PointDimension.cxx
@@ -25,6 +25,8 @@
 #include <Interface_Macros.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_PointDimension,IGESData_IGESEntity)
+
 IGESDimen_PointDimension::IGESDimen_PointDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_PointDimension.hxx b/src/IGESDimen/IGESDimen_PointDimension.hxx
index 43e5bb7f2c..6d8617ccf1 100644
--- a/src/IGESDimen/IGESDimen_PointDimension.hxx
+++ b/src/IGESDimen/IGESDimen_PointDimension.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_PointDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_PointDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_Protocol.cxx b/src/IGESDimen/IGESDimen_Protocol.cxx
index fce867894b..87330aab09 100644
--- a/src/IGESDimen/IGESDimen_Protocol.cxx
+++ b/src/IGESDimen/IGESDimen_Protocol.cxx
@@ -43,6 +43,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14,atype15,
diff --git a/src/IGESDimen/IGESDimen_Protocol.hxx b/src/IGESDimen/IGESDimen_Protocol.hxx
index 717be17b52..705e069f5f 100644
--- a/src/IGESDimen/IGESDimen_Protocol.hxx
+++ b/src/IGESDimen/IGESDimen_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_RadiusDimension.cxx b/src/IGESDimen/IGESDimen_RadiusDimension.cxx
index 14d3d1ee2f..45dc4bd92e 100644
--- a/src/IGESDimen/IGESDimen_RadiusDimension.cxx
+++ b/src/IGESDimen/IGESDimen_RadiusDimension.cxx
@@ -25,6 +25,8 @@
 #include <IGESDimen_RadiusDimension.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_RadiusDimension,IGESData_IGESEntity)
+
 IGESDimen_RadiusDimension::IGESDimen_RadiusDimension ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_RadiusDimension.hxx b/src/IGESDimen/IGESDimen_RadiusDimension.hxx
index 984bb4952e..2fd0eb5ca5 100644
--- a/src/IGESDimen/IGESDimen_RadiusDimension.hxx
+++ b/src/IGESDimen/IGESDimen_RadiusDimension.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_RadiusDimension,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_RadiusDimension,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_ReadWriteModule.cxx b/src/IGESDimen/IGESDimen_ReadWriteModule.cxx
index a895973698..b3e0ec9d64 100644
--- a/src/IGESDimen/IGESDimen_ReadWriteModule.cxx
+++ b/src/IGESDimen/IGESDimen_ReadWriteModule.cxx
@@ -67,6 +67,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
index 0275a99523..3d27774cac 100644
--- a/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
+++ b/src/IGESDimen/IGESDimen_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_Section.cxx b/src/IGESDimen/IGESDimen_Section.cxx
index 66b63590f4..d0b6b05ebd 100644
--- a/src/IGESDimen/IGESDimen_Section.cxx
+++ b/src/IGESDimen/IGESDimen_Section.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_Section,IGESData_IGESEntity)
+
 IGESDimen_Section::IGESDimen_Section ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_Section.hxx b/src/IGESDimen/IGESDimen_Section.hxx
index 43c5194d54..a56ac36146 100644
--- a/src/IGESDimen/IGESDimen_Section.hxx
+++ b/src/IGESDimen/IGESDimen_Section.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_Section,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_Section,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_SectionedArea.cxx b/src/IGESDimen/IGESDimen_SectionedArea.cxx
index 6918a66c43..0ba006ba15 100644
--- a/src/IGESDimen/IGESDimen_SectionedArea.cxx
+++ b/src/IGESDimen/IGESDimen_SectionedArea.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_SectionedArea,IGESData_IGESEntity)
+
 IGESDimen_SectionedArea::IGESDimen_SectionedArea ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_SectionedArea.hxx b/src/IGESDimen/IGESDimen_SectionedArea.hxx
index 74ff35caa9..d1e18b9057 100644
--- a/src/IGESDimen/IGESDimen_SectionedArea.hxx
+++ b/src/IGESDimen/IGESDimen_SectionedArea.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_SectionedArea,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_SectionedArea,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_SpecificModule.cxx b/src/IGESDimen/IGESDimen_SpecificModule.cxx
index ffc5fcf988..9dd3484b9e 100644
--- a/src/IGESDimen/IGESDimen_SpecificModule.cxx
+++ b/src/IGESDimen/IGESDimen_SpecificModule.cxx
@@ -65,6 +65,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDimen/IGESDimen_SpecificModule.hxx b/src/IGESDimen/IGESDimen_SpecificModule.hxx
index f90c886537..29bdd57da1 100644
--- a/src/IGESDimen/IGESDimen_SpecificModule.hxx
+++ b/src/IGESDimen/IGESDimen_SpecificModule.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESDimen/IGESDimen_WitnessLine.cxx b/src/IGESDimen/IGESDimen_WitnessLine.cxx
index 884b52c3de..2662aff189 100644
--- a/src/IGESDimen/IGESDimen_WitnessLine.cxx
+++ b/src/IGESDimen/IGESDimen_WitnessLine.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDimen_WitnessLine,IGESData_IGESEntity)
+
 IGESDimen_WitnessLine::IGESDimen_WitnessLine ()    {  }
 
 
diff --git a/src/IGESDimen/IGESDimen_WitnessLine.hxx b/src/IGESDimen/IGESDimen_WitnessLine.hxx
index 1d0a811541..92407ce024 100644
--- a/src/IGESDimen/IGESDimen_WitnessLine.hxx
+++ b/src/IGESDimen/IGESDimen_WitnessLine.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDimen_WitnessLine,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDimen_WitnessLine,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_CircArraySubfigure.cxx b/src/IGESDraw/IGESDraw_CircArraySubfigure.cxx
index f2574e81ab..2b7e0d2398 100644
--- a/src/IGESDraw/IGESDraw_CircArraySubfigure.cxx
+++ b/src/IGESDraw/IGESDraw_CircArraySubfigure.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_CircArraySubfigure,IGESData_IGESEntity)
+
 IGESDraw_CircArraySubfigure::IGESDraw_CircArraySubfigure ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx b/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
index a8f6c333ae..cad2df30fc 100644
--- a/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_CircArraySubfigure.hxx
@@ -106,7 +106,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_CircArraySubfigure,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_CircArraySubfigure,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_ConnectPoint.cxx b/src/IGESDraw/IGESDraw_ConnectPoint.cxx
index e3e8bc84e6..b9008d7d6b 100644
--- a/src/IGESDraw/IGESDraw_ConnectPoint.cxx
+++ b/src/IGESDraw/IGESDraw_ConnectPoint.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_ConnectPoint,IGESData_IGESEntity)
+
 IGESDraw_ConnectPoint::IGESDraw_ConnectPoint ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_ConnectPoint.hxx b/src/IGESDraw/IGESDraw_ConnectPoint.hxx
index 649f52a3b9..b04d0da06b 100644
--- a/src/IGESDraw/IGESDraw_ConnectPoint.hxx
+++ b/src/IGESDraw/IGESDraw_ConnectPoint.hxx
@@ -146,7 +146,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_ConnectPoint,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_ConnectPoint,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_Drawing.cxx b/src/IGESDraw/IGESDraw_Drawing.cxx
index 9ff2d914be..dcf1cd64f4 100644
--- a/src/IGESDraw/IGESDraw_Drawing.cxx
+++ b/src/IGESDraw/IGESDraw_Drawing.cxx
@@ -31,6 +31,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_Drawing,IGESData_IGESEntity)
+
 IGESDraw_Drawing::IGESDraw_Drawing ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_Drawing.hxx b/src/IGESDraw/IGESDraw_Drawing.hxx
index fa67891a74..d51a4313d5 100644
--- a/src/IGESDraw/IGESDraw_Drawing.hxx
+++ b/src/IGESDraw/IGESDraw_Drawing.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_Drawing,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_Drawing,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_DrawingWithRotation.cxx b/src/IGESDraw/IGESDraw_DrawingWithRotation.cxx
index e2d4ec3585..217a9d112d 100644
--- a/src/IGESDraw/IGESDraw_DrawingWithRotation.cxx
+++ b/src/IGESDraw/IGESDraw_DrawingWithRotation.cxx
@@ -31,6 +31,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_DrawingWithRotation,IGESData_IGESEntity)
+
 IGESDraw_DrawingWithRotation::IGESDraw_DrawingWithRotation ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx b/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
index 505f28ea93..7faac4c0fb 100644
--- a/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
+++ b/src/IGESDraw/IGESDraw_DrawingWithRotation.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_DrawingWithRotation,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_DrawingWithRotation,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_GeneralModule.cxx b/src/IGESDraw/IGESDraw_GeneralModule.cxx
index c49aa66331..8cf2742d50 100644
--- a/src/IGESDraw/IGESDraw_GeneralModule.cxx
+++ b/src/IGESDraw/IGESDraw_GeneralModule.cxx
@@ -52,6 +52,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDraw/IGESDraw_GeneralModule.hxx b/src/IGESDraw/IGESDraw_GeneralModule.hxx
index dfdba297a5..a3d3fe800d 100644
--- a/src/IGESDraw/IGESDraw_GeneralModule.hxx
+++ b/src/IGESDraw/IGESDraw_GeneralModule.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_LabelDisplay.cxx b/src/IGESDraw/IGESDraw_LabelDisplay.cxx
index 2662857930..ce2dece75c 100644
--- a/src/IGESDraw/IGESDraw_LabelDisplay.cxx
+++ b/src/IGESDraw/IGESDraw_LabelDisplay.cxx
@@ -28,6 +28,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_LabelDisplay,IGESData_LabelDisplayEntity)
+
 IGESDraw_LabelDisplay::IGESDraw_LabelDisplay ()    {  }
 
     void IGESDraw_LabelDisplay::Init
diff --git a/src/IGESDraw/IGESDraw_LabelDisplay.hxx b/src/IGESDraw/IGESDraw_LabelDisplay.hxx
index 773aa13c45..6f3c2bca83 100644
--- a/src/IGESDraw/IGESDraw_LabelDisplay.hxx
+++ b/src/IGESDraw/IGESDraw_LabelDisplay.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_LabelDisplay,IGESData_LabelDisplayEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_LabelDisplay,IGESData_LabelDisplayEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigure.cxx b/src/IGESDraw/IGESDraw_NetworkSubfigure.cxx
index 8cfb630d14..1c12260f44 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigure.cxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigure.cxx
@@ -27,6 +27,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_NetworkSubfigure,IGESData_IGESEntity)
+
 IGESDraw_NetworkSubfigure::IGESDraw_NetworkSubfigure ()    {  }
 
     void IGESDraw_NetworkSubfigure::Init
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx b/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
index bcca67697c..388ab51e9a 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigure.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_NetworkSubfigure,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_NetworkSubfigure,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cxx b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cxx
index b76e01ea7e..42a319966a 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_NetworkSubfigureDef,IGESData_IGESEntity)
+
 IGESDraw_NetworkSubfigureDef::IGESDraw_NetworkSubfigureDef ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
index 4abb66984e..503370f64b 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.hxx
@@ -119,7 +119,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_NetworkSubfigureDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_NetworkSubfigureDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_PerspectiveView.cxx b/src/IGESDraw/IGESDraw_PerspectiveView.cxx
index 4cdeab46f1..2210330705 100644
--- a/src/IGESDraw/IGESDraw_PerspectiveView.cxx
+++ b/src/IGESDraw/IGESDraw_PerspectiveView.cxx
@@ -28,6 +28,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_PerspectiveView,IGESData_ViewKindEntity)
+
 IGESDraw_PerspectiveView::IGESDraw_PerspectiveView ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_PerspectiveView.hxx b/src/IGESDraw/IGESDraw_PerspectiveView.hxx
index c77a8c633a..b6f2ed66e0 100644
--- a/src/IGESDraw/IGESDraw_PerspectiveView.hxx
+++ b/src/IGESDraw/IGESDraw_PerspectiveView.hxx
@@ -138,7 +138,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_PerspectiveView,IGESData_ViewKindEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_PerspectiveView,IGESData_ViewKindEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_Planar.cxx b/src/IGESDraw/IGESDraw_Planar.cxx
index ba5d5e1c4a..6b71a6a8ae 100644
--- a/src/IGESDraw/IGESDraw_Planar.cxx
+++ b/src/IGESDraw/IGESDraw_Planar.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_Planar,IGESData_IGESEntity)
+
 IGESDraw_Planar::IGESDraw_Planar ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_Planar.hxx b/src/IGESDraw/IGESDraw_Planar.hxx
index af859a2336..c77a7996cb 100644
--- a/src/IGESDraw/IGESDraw_Planar.hxx
+++ b/src/IGESDraw/IGESDraw_Planar.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_Planar,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_Planar,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_Protocol.cxx b/src/IGESDraw/IGESDraw_Protocol.cxx
index f46a480401..95621fda4e 100644
--- a/src/IGESDraw/IGESDraw_Protocol.cxx
+++ b/src/IGESDraw/IGESDraw_Protocol.cxx
@@ -32,6 +32,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14;
diff --git a/src/IGESDraw/IGESDraw_Protocol.hxx b/src/IGESDraw/IGESDraw_Protocol.hxx
index a8bec04176..19db4ec0c5 100644
--- a/src/IGESDraw/IGESDraw_Protocol.hxx
+++ b/src/IGESDraw/IGESDraw_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_ReadWriteModule.cxx b/src/IGESDraw/IGESDraw_ReadWriteModule.cxx
index 6751c3eb38..c34ae1cc1a 100644
--- a/src/IGESDraw/IGESDraw_ReadWriteModule.cxx
+++ b/src/IGESDraw/IGESDraw_ReadWriteModule.cxx
@@ -49,6 +49,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
index 497d9ac79e..38a1c6034d 100644
--- a/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
+++ b/src/IGESDraw/IGESDraw_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_RectArraySubfigure.cxx b/src/IGESDraw/IGESDraw_RectArraySubfigure.cxx
index e3cdc5a11f..244f907d01 100644
--- a/src/IGESDraw/IGESDraw_RectArraySubfigure.cxx
+++ b/src/IGESDraw/IGESDraw_RectArraySubfigure.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_RectArraySubfigure,IGESData_IGESEntity)
+
 IGESDraw_RectArraySubfigure::IGESDraw_RectArraySubfigure ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx b/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
index 409756585b..0cd4bba257 100644
--- a/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
+++ b/src/IGESDraw/IGESDraw_RectArraySubfigure.hxx
@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_RectArraySubfigure,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_RectArraySubfigure,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cxx b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cxx
index 254f0c5ecf..db1ec2e734 100644
--- a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cxx
+++ b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_SegmentedViewsVisible,IGESData_ViewKindEntity)
+
 IGESDraw_SegmentedViewsVisible::IGESDraw_SegmentedViewsVisible ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
index e461b512cd..5b7010d24b 100644
--- a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.hxx
@@ -134,7 +134,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_SegmentedViewsVisible,IGESData_ViewKindEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_SegmentedViewsVisible,IGESData_ViewKindEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_SpecificModule.cxx b/src/IGESDraw/IGESDraw_SpecificModule.cxx
index 51880550de..7621d9ad96 100644
--- a/src/IGESDraw/IGESDraw_SpecificModule.cxx
+++ b/src/IGESDraw/IGESDraw_SpecificModule.cxx
@@ -47,6 +47,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESDraw/IGESDraw_SpecificModule.hxx b/src/IGESDraw/IGESDraw_SpecificModule.hxx
index 144f8a8be7..ea95d6eb68 100644
--- a/src/IGESDraw/IGESDraw_SpecificModule.hxx
+++ b/src/IGESDraw/IGESDraw_SpecificModule.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_View.cxx b/src/IGESDraw/IGESDraw_View.cxx
index 915d9d6827..98cd91d852 100644
--- a/src/IGESDraw/IGESDraw_View.cxx
+++ b/src/IGESDraw/IGESDraw_View.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_View,IGESData_ViewKindEntity)
+
 IGESDraw_View::IGESDraw_View ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_View.hxx b/src/IGESDraw/IGESDraw_View.hxx
index 2a4d253296..615221d3dc 100644
--- a/src/IGESDraw/IGESDraw_View.hxx
+++ b/src/IGESDraw/IGESDraw_View.hxx
@@ -122,7 +122,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_View,IGESData_ViewKindEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_View,IGESData_ViewKindEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisible.cxx b/src/IGESDraw/IGESDraw_ViewsVisible.cxx
index 5bd4e68fe8..e4aa9be19d 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisible.cxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisible.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_ViewsVisible,IGESData_ViewKindEntity)
+
 IGESDraw_ViewsVisible::IGESDraw_ViewsVisible ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisible.hxx b/src/IGESDraw/IGESDraw_ViewsVisible.hxx
index dae1b8c165..8dbeb365d9 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisible.hxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisible.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_ViewsVisible,IGESData_ViewKindEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_ViewsVisible,IGESData_ViewKindEntity)
 
 protected:
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cxx b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cxx
index 245b7f94be..a533264150 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_ViewsVisibleWithAttr,IGESData_ViewKindEntity)
+
 IGESDraw_ViewsVisibleWithAttr::IGESDraw_ViewsVisibleWithAttr ()    {  }
 
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
index 11cf7fb747..da8ee9f513 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
+++ b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.hxx
@@ -124,7 +124,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESDraw_ViewsVisibleWithAttr,IGESData_ViewKindEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESDraw_ViewsVisibleWithAttr,IGESData_ViewKindEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_BSplineCurve.cxx b/src/IGESGeom/IGESGeom_BSplineCurve.cxx
index e27b707afe..7736d9ddd7 100644
--- a/src/IGESGeom/IGESGeom_BSplineCurve.cxx
+++ b/src/IGESGeom/IGESGeom_BSplineCurve.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_BSplineCurve,IGESData_IGESEntity)
+
 IGESGeom_BSplineCurve::IGESGeom_BSplineCurve ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_BSplineCurve.hxx b/src/IGESGeom/IGESGeom_BSplineCurve.hxx
index ddfbb2678b..4349b52d77 100644
--- a/src/IGESGeom/IGESGeom_BSplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_BSplineCurve.hxx
@@ -128,7 +128,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_BSplineCurve,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_BSplineCurve,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_BSplineSurface.cxx b/src/IGESGeom/IGESGeom_BSplineSurface.cxx
index e7d97d8b53..035767b949 100644
--- a/src/IGESGeom/IGESGeom_BSplineSurface.cxx
+++ b/src/IGESGeom/IGESGeom_BSplineSurface.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_BSplineSurface,IGESData_IGESEntity)
+
 IGESGeom_BSplineSurface::IGESGeom_BSplineSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_BSplineSurface.hxx b/src/IGESGeom/IGESGeom_BSplineSurface.hxx
index 981513700d..92fd496d21 100644
--- a/src/IGESGeom/IGESGeom_BSplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_BSplineSurface.hxx
@@ -157,7 +157,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_BSplineSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_BSplineSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Boundary.cxx b/src/IGESGeom/IGESGeom_Boundary.cxx
index a1633ef13d..f1a4f2e34f 100644
--- a/src/IGESGeom/IGESGeom_Boundary.cxx
+++ b/src/IGESGeom/IGESGeom_Boundary.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Boundary,IGESData_IGESEntity)
+
 IGESGeom_Boundary::IGESGeom_Boundary ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Boundary.hxx b/src/IGESGeom/IGESGeom_Boundary.hxx
index 4b2a7e90e1..f2e5bc3d39 100644
--- a/src/IGESGeom/IGESGeom_Boundary.hxx
+++ b/src/IGESGeom/IGESGeom_Boundary.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Boundary,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Boundary,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_BoundedSurface.cxx b/src/IGESGeom/IGESGeom_BoundedSurface.cxx
index 1b1a05696c..c4910eb48d 100644
--- a/src/IGESGeom/IGESGeom_BoundedSurface.cxx
+++ b/src/IGESGeom/IGESGeom_BoundedSurface.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_BoundedSurface,IGESData_IGESEntity)
+
 IGESGeom_BoundedSurface::IGESGeom_BoundedSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_BoundedSurface.hxx b/src/IGESGeom/IGESGeom_BoundedSurface.hxx
index e0ceccde6f..bf0b45c2f2 100644
--- a/src/IGESGeom/IGESGeom_BoundedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_BoundedSurface.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_BoundedSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_BoundedSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_CircularArc.cxx b/src/IGESGeom/IGESGeom_CircularArc.cxx
index f373c3e700..21b14b7cf2 100644
--- a/src/IGESGeom/IGESGeom_CircularArc.cxx
+++ b/src/IGESGeom/IGESGeom_CircularArc.cxx
@@ -25,6 +25,8 @@
 #include <IGESGeom_CircularArc.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_CircularArc,IGESData_IGESEntity)
+
 IGESGeom_CircularArc::IGESGeom_CircularArc ()    {  }
 
     void IGESGeom_CircularArc::Init 
diff --git a/src/IGESGeom/IGESGeom_CircularArc.hxx b/src/IGESGeom/IGESGeom_CircularArc.hxx
index c0baf8e4a9..c9066303c6 100644
--- a/src/IGESGeom/IGESGeom_CircularArc.hxx
+++ b/src/IGESGeom/IGESGeom_CircularArc.hxx
@@ -97,7 +97,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_CircularArc,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_CircularArc,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_CompositeCurve.cxx b/src/IGESGeom/IGESGeom_CompositeCurve.cxx
index 82826f99ba..250c9225ed 100644
--- a/src/IGESGeom/IGESGeom_CompositeCurve.cxx
+++ b/src/IGESGeom/IGESGeom_CompositeCurve.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_CompositeCurve,IGESData_IGESEntity)
+
 IGESGeom_CompositeCurve::IGESGeom_CompositeCurve ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_CompositeCurve.hxx b/src/IGESGeom/IGESGeom_CompositeCurve.hxx
index 60554a9394..9d8f0321a1 100644
--- a/src/IGESGeom/IGESGeom_CompositeCurve.hxx
+++ b/src/IGESGeom/IGESGeom_CompositeCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_CompositeCurve,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_CompositeCurve,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_ConicArc.cxx b/src/IGESGeom/IGESGeom_ConicArc.cxx
index 3fedb7751c..f3b25f254f 100644
--- a/src/IGESGeom/IGESGeom_ConicArc.cxx
+++ b/src/IGESGeom/IGESGeom_ConicArc.cxx
@@ -26,6 +26,8 @@
 #include <IGESGeom_ConicArc.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_ConicArc,IGESData_IGESEntity)
+
 IGESGeom_ConicArc::IGESGeom_ConicArc ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_ConicArc.hxx b/src/IGESGeom/IGESGeom_ConicArc.hxx
index 6412819876..bb276f7da6 100644
--- a/src/IGESGeom/IGESGeom_ConicArc.hxx
+++ b/src/IGESGeom/IGESGeom_ConicArc.hxx
@@ -131,7 +131,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_ConicArc,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_ConicArc,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_CopiousData.cxx b/src/IGESGeom/IGESGeom_CopiousData.cxx
index c71e08222b..3a0bac2bd7 100644
--- a/src/IGESGeom/IGESGeom_CopiousData.cxx
+++ b/src/IGESGeom/IGESGeom_CopiousData.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_CopiousData,IGESData_IGESEntity)
+
 IGESGeom_CopiousData::IGESGeom_CopiousData ()
 {
   theDataType = 0;  // to allow Setting Form Number before Init
diff --git a/src/IGESGeom/IGESGeom_CopiousData.hxx b/src/IGESGeom/IGESGeom_CopiousData.hxx
index 361695bba3..d05b97ffb2 100644
--- a/src/IGESGeom/IGESGeom_CopiousData.hxx
+++ b/src/IGESGeom/IGESGeom_CopiousData.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_CopiousData,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_CopiousData,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_CurveOnSurface.cxx b/src/IGESGeom/IGESGeom_CurveOnSurface.cxx
index 82357decca..5e53ac826d 100644
--- a/src/IGESGeom/IGESGeom_CurveOnSurface.cxx
+++ b/src/IGESGeom/IGESGeom_CurveOnSurface.cxx
@@ -20,6 +20,8 @@
 #include <IGESGeom_CurveOnSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_CurveOnSurface,IGESData_IGESEntity)
+
 IGESGeom_CurveOnSurface::IGESGeom_CurveOnSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_CurveOnSurface.hxx b/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
index cfce3e4400..444dcefa63 100644
--- a/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
+++ b/src/IGESGeom/IGESGeom_CurveOnSurface.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_CurveOnSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_CurveOnSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Direction.cxx b/src/IGESGeom/IGESGeom_Direction.cxx
index d6ab828c2e..6f9ce3110c 100644
--- a/src/IGESGeom/IGESGeom_Direction.cxx
+++ b/src/IGESGeom/IGESGeom_Direction.cxx
@@ -22,6 +22,8 @@
 #include <IGESGeom_Direction.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Direction,IGESData_IGESEntity)
+
 IGESGeom_Direction::IGESGeom_Direction ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Direction.hxx b/src/IGESGeom/IGESGeom_Direction.hxx
index ea859976c4..f4687bc6f3 100644
--- a/src/IGESGeom/IGESGeom_Direction.hxx
+++ b/src/IGESGeom/IGESGeom_Direction.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Direction,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Direction,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Flash.cxx b/src/IGESGeom/IGESGeom_Flash.cxx
index b33668c5c1..50e162211b 100644
--- a/src/IGESGeom/IGESGeom_Flash.cxx
+++ b/src/IGESGeom/IGESGeom_Flash.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Flash,IGESData_IGESEntity)
+
 IGESGeom_Flash::IGESGeom_Flash ()     {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Flash.hxx b/src/IGESGeom/IGESGeom_Flash.hxx
index 16b120fe67..e8f1534101 100644
--- a/src/IGESGeom/IGESGeom_Flash.hxx
+++ b/src/IGESGeom/IGESGeom_Flash.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Flash,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Flash,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_GeneralModule.cxx b/src/IGESGeom/IGESGeom_GeneralModule.cxx
index ca3dbf4c04..e6b95ef829 100644
--- a/src/IGESGeom/IGESGeom_GeneralModule.cxx
+++ b/src/IGESGeom/IGESGeom_GeneralModule.cxx
@@ -70,6 +70,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGeom/IGESGeom_GeneralModule.hxx b/src/IGESGeom/IGESGeom_GeneralModule.hxx
index f02057f548..9bdeba647f 100644
--- a/src/IGESGeom/IGESGeom_GeneralModule.hxx
+++ b/src/IGESGeom/IGESGeom_GeneralModule.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Line.cxx b/src/IGESGeom/IGESGeom_Line.cxx
index 106fed5fda..ca35cce39b 100644
--- a/src/IGESGeom/IGESGeom_Line.cxx
+++ b/src/IGESGeom/IGESGeom_Line.cxx
@@ -22,6 +22,8 @@
 #include <IGESGeom_Line.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Line,IGESData_IGESEntity)
+
 IGESGeom_Line::IGESGeom_Line ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Line.hxx b/src/IGESGeom/IGESGeom_Line.hxx
index 27ba44439e..9a47cd7018 100644
--- a/src/IGESGeom/IGESGeom_Line.hxx
+++ b/src/IGESGeom/IGESGeom_Line.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Line,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Line,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_OffsetCurve.cxx b/src/IGESGeom/IGESGeom_OffsetCurve.cxx
index fd26992d36..7e8b91fa5c 100644
--- a/src/IGESGeom/IGESGeom_OffsetCurve.cxx
+++ b/src/IGESGeom/IGESGeom_OffsetCurve.cxx
@@ -23,6 +23,8 @@
 #include <IGESGeom_OffsetCurve.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_OffsetCurve,IGESData_IGESEntity)
+
 IGESGeom_OffsetCurve::IGESGeom_OffsetCurve ()     {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_OffsetCurve.hxx b/src/IGESGeom/IGESGeom_OffsetCurve.hxx
index 8b9451904b..74647cc76a 100644
--- a/src/IGESGeom/IGESGeom_OffsetCurve.hxx
+++ b/src/IGESGeom/IGESGeom_OffsetCurve.hxx
@@ -138,7 +138,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_OffsetCurve,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_OffsetCurve,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_OffsetSurface.cxx b/src/IGESGeom/IGESGeom_OffsetSurface.cxx
index ef89c811a8..070a4e1c98 100644
--- a/src/IGESGeom/IGESGeom_OffsetSurface.cxx
+++ b/src/IGESGeom/IGESGeom_OffsetSurface.cxx
@@ -23,6 +23,8 @@
 #include <IGESGeom_OffsetSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_OffsetSurface,IGESData_IGESEntity)
+
 IGESGeom_OffsetSurface::IGESGeom_OffsetSurface ()     {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_OffsetSurface.hxx b/src/IGESGeom/IGESGeom_OffsetSurface.hxx
index 624e8bbf9a..9cff6b7801 100644
--- a/src/IGESGeom/IGESGeom_OffsetSurface.hxx
+++ b/src/IGESGeom/IGESGeom_OffsetSurface.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_OffsetSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_OffsetSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Plane.cxx b/src/IGESGeom/IGESGeom_Plane.cxx
index 8273df2c93..ce914f62f7 100644
--- a/src/IGESGeom/IGESGeom_Plane.cxx
+++ b/src/IGESGeom/IGESGeom_Plane.cxx
@@ -23,6 +23,8 @@
 #include <IGESGeom_Plane.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Plane,IGESData_IGESEntity)
+
 IGESGeom_Plane::IGESGeom_Plane ()     {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Plane.hxx b/src/IGESGeom/IGESGeom_Plane.hxx
index 3a7a7b39dc..b294d031fa 100644
--- a/src/IGESGeom/IGESGeom_Plane.hxx
+++ b/src/IGESGeom/IGESGeom_Plane.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Plane,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Plane,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Point.cxx b/src/IGESGeom/IGESGeom_Point.cxx
index 036633adfd..70888e1e61 100644
--- a/src/IGESGeom/IGESGeom_Point.cxx
+++ b/src/IGESGeom/IGESGeom_Point.cxx
@@ -23,6 +23,8 @@
 #include <IGESGeom_Point.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Point,IGESData_IGESEntity)
+
 IGESGeom_Point::IGESGeom_Point ()     {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_Point.hxx b/src/IGESGeom/IGESGeom_Point.hxx
index 73a820d66c..8f3a43a6ee 100644
--- a/src/IGESGeom/IGESGeom_Point.hxx
+++ b/src/IGESGeom/IGESGeom_Point.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Point,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Point,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_Protocol.cxx b/src/IGESGeom/IGESGeom_Protocol.cxx
index a6dd110346..01117dc26f 100644
--- a/src/IGESGeom/IGESGeom_Protocol.cxx
+++ b/src/IGESGeom/IGESGeom_Protocol.cxx
@@ -41,6 +41,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14,atype15,
diff --git a/src/IGESGeom/IGESGeom_Protocol.hxx b/src/IGESGeom/IGESGeom_Protocol.hxx
index 49bb79a72a..ea14a5b869 100644
--- a/src/IGESGeom/IGESGeom_Protocol.hxx
+++ b/src/IGESGeom/IGESGeom_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_ReadWriteModule.cxx b/src/IGESGeom/IGESGeom_ReadWriteModule.cxx
index e31bc049df..d99d7c61f9 100644
--- a/src/IGESGeom/IGESGeom_ReadWriteModule.cxx
+++ b/src/IGESGeom/IGESGeom_ReadWriteModule.cxx
@@ -67,6 +67,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
index 363fc66e2e..2e03a7158a 100644
--- a/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
+++ b/src/IGESGeom/IGESGeom_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_RuledSurface.cxx b/src/IGESGeom/IGESGeom_RuledSurface.cxx
index 0bf100cf8c..ac4a19e8e8 100644
--- a/src/IGESGeom/IGESGeom_RuledSurface.cxx
+++ b/src/IGESGeom/IGESGeom_RuledSurface.cxx
@@ -20,6 +20,8 @@
 #include <IGESGeom_RuledSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_RuledSurface,IGESData_IGESEntity)
+
 IGESGeom_RuledSurface::IGESGeom_RuledSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_RuledSurface.hxx b/src/IGESGeom/IGESGeom_RuledSurface.hxx
index ef2ae01e84..21b468edc9 100644
--- a/src/IGESGeom/IGESGeom_RuledSurface.hxx
+++ b/src/IGESGeom/IGESGeom_RuledSurface.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_RuledSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_RuledSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_SpecificModule.cxx b/src/IGESGeom/IGESGeom_SpecificModule.cxx
index 3d1f515832..316d22ffae 100644
--- a/src/IGESGeom/IGESGeom_SpecificModule.cxx
+++ b/src/IGESGeom/IGESGeom_SpecificModule.cxx
@@ -65,6 +65,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGeom/IGESGeom_SpecificModule.hxx b/src/IGESGeom/IGESGeom_SpecificModule.hxx
index 548ad70069..76d1b6e800 100644
--- a/src/IGESGeom/IGESGeom_SpecificModule.hxx
+++ b/src/IGESGeom/IGESGeom_SpecificModule.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_SplineCurve.cxx b/src/IGESGeom/IGESGeom_SplineCurve.cxx
index 6298759e1a..b13e1c925f 100644
--- a/src/IGESGeom/IGESGeom_SplineCurve.cxx
+++ b/src/IGESGeom/IGESGeom_SplineCurve.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_SplineCurve,IGESData_IGESEntity)
+
 IGESGeom_SplineCurve::IGESGeom_SplineCurve ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_SplineCurve.hxx b/src/IGESGeom/IGESGeom_SplineCurve.hxx
index cfe04f50da..daec4c37fd 100644
--- a/src/IGESGeom/IGESGeom_SplineCurve.hxx
+++ b/src/IGESGeom/IGESGeom_SplineCurve.hxx
@@ -124,7 +124,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_SplineCurve,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_SplineCurve,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_SplineSurface.cxx b/src/IGESGeom/IGESGeom_SplineSurface.cxx
index 33cca163aa..f25a9909bd 100644
--- a/src/IGESGeom/IGESGeom_SplineSurface.cxx
+++ b/src/IGESGeom/IGESGeom_SplineSurface.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_SplineSurface,IGESData_IGESEntity)
+
 IGESGeom_SplineSurface::IGESGeom_SplineSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_SplineSurface.hxx b/src/IGESGeom/IGESGeom_SplineSurface.hxx
index 9e151c15f7..1898f47b21 100644
--- a/src/IGESGeom/IGESGeom_SplineSurface.hxx
+++ b/src/IGESGeom/IGESGeom_SplineSurface.hxx
@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_SplineSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_SplineSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cxx b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cxx
index 39965e1498..55f1c55ddc 100644
--- a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cxx
+++ b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cxx
@@ -21,6 +21,8 @@
 #include <IGESGeom_SurfaceOfRevolution.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_SurfaceOfRevolution,IGESData_IGESEntity)
+
 IGESGeom_SurfaceOfRevolution::IGESGeom_SurfaceOfRevolution ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
index 8ed277600e..b67e3a572e 100644
--- a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
+++ b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_SurfaceOfRevolution,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_SurfaceOfRevolution,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_TabulatedCylinder.cxx b/src/IGESGeom/IGESGeom_TabulatedCylinder.cxx
index 909bdc0152..b4da951a67 100644
--- a/src/IGESGeom/IGESGeom_TabulatedCylinder.cxx
+++ b/src/IGESGeom/IGESGeom_TabulatedCylinder.cxx
@@ -23,6 +23,8 @@
 #include <IGESGeom_TabulatedCylinder.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_TabulatedCylinder,IGESData_IGESEntity)
+
 IGESGeom_TabulatedCylinder::IGESGeom_TabulatedCylinder ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx b/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
index 2dbdf9bb28..a9a75f9eef 100644
--- a/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
+++ b/src/IGESGeom/IGESGeom_TabulatedCylinder.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_TabulatedCylinder,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_TabulatedCylinder,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.cxx b/src/IGESGeom/IGESGeom_TransformationMatrix.cxx
index ac466d4310..da7e809b08 100644
--- a/src/IGESGeom/IGESGeom_TransformationMatrix.cxx
+++ b/src/IGESGeom/IGESGeom_TransformationMatrix.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_TransformationMatrix,IGESData_TransfEntity)
+
 IGESGeom_TransformationMatrix::IGESGeom_TransformationMatrix ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
index 9b4c22a86c..5db8bd3428 100644
--- a/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
+++ b/src/IGESGeom/IGESGeom_TransformationMatrix.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_TransformationMatrix,IGESData_TransfEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_TransformationMatrix,IGESData_TransfEntity)
 
 protected:
 
diff --git a/src/IGESGeom/IGESGeom_TrimmedSurface.cxx b/src/IGESGeom/IGESGeom_TrimmedSurface.cxx
index a438d69978..7c7810cb85 100644
--- a/src/IGESGeom/IGESGeom_TrimmedSurface.cxx
+++ b/src/IGESGeom/IGESGeom_TrimmedSurface.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_TrimmedSurface,IGESData_IGESEntity)
+
 IGESGeom_TrimmedSurface::IGESGeom_TrimmedSurface ()    {  }
 
 
diff --git a/src/IGESGeom/IGESGeom_TrimmedSurface.hxx b/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
index b3aa91bc92..0400436c92 100644
--- a/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
+++ b/src/IGESGeom/IGESGeom_TrimmedSurface.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGeom_TrimmedSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGeom_TrimmedSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_Color.cxx b/src/IGESGraph/IGESGraph_Color.cxx
index 96f260d7a6..e23f0bcd79 100644
--- a/src/IGESGraph/IGESGraph_Color.cxx
+++ b/src/IGESGraph/IGESGraph_Color.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_Color,IGESData_ColorEntity)
+
 IGESGraph_Color::IGESGraph_Color ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_Color.hxx b/src/IGESGraph/IGESGraph_Color.hxx
index e3281bd31b..f41a955c74 100644
--- a/src/IGESGraph/IGESGraph_Color.hxx
+++ b/src/IGESGraph/IGESGraph_Color.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_Color,IGESData_ColorEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_Color,IGESData_ColorEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_DefinitionLevel.cxx b/src/IGESGraph/IGESGraph_DefinitionLevel.cxx
index c0ed001f6d..4e6304412f 100644
--- a/src/IGESGraph/IGESGraph_DefinitionLevel.cxx
+++ b/src/IGESGraph/IGESGraph_DefinitionLevel.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_DefinitionLevel,IGESData_LevelListEntity)
+
 IGESGraph_DefinitionLevel::IGESGraph_DefinitionLevel ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
index 92a35182bd..3e9702f1d6 100644
--- a/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
+++ b/src/IGESGraph/IGESGraph_DefinitionLevel.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_DefinitionLevel,IGESData_LevelListEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_DefinitionLevel,IGESData_LevelListEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_DrawingSize.cxx b/src/IGESGraph/IGESGraph_DrawingSize.cxx
index 5edc2ab4f6..4d6e572b45 100644
--- a/src/IGESGraph/IGESGraph_DrawingSize.cxx
+++ b/src/IGESGraph/IGESGraph_DrawingSize.cxx
@@ -19,6 +19,8 @@
 #include <IGESGraph_DrawingSize.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_DrawingSize,IGESData_IGESEntity)
+
 IGESGraph_DrawingSize::IGESGraph_DrawingSize ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_DrawingSize.hxx b/src/IGESGraph/IGESGraph_DrawingSize.hxx
index cc5b07c81b..23c030ed8a 100644
--- a/src/IGESGraph/IGESGraph_DrawingSize.hxx
+++ b/src/IGESGraph/IGESGraph_DrawingSize.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_DrawingSize,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_DrawingSize,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_DrawingUnits.cxx b/src/IGESGraph/IGESGraph_DrawingUnits.cxx
index be233f5627..8b591bc3f4 100644
--- a/src/IGESGraph/IGESGraph_DrawingUnits.cxx
+++ b/src/IGESGraph/IGESGraph_DrawingUnits.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_DrawingUnits,IGESData_IGESEntity)
+
 IGESGraph_DrawingUnits::IGESGraph_DrawingUnits ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_DrawingUnits.hxx b/src/IGESGraph/IGESGraph_DrawingUnits.hxx
index 80600499f1..c1b75692d8 100644
--- a/src/IGESGraph/IGESGraph_DrawingUnits.hxx
+++ b/src/IGESGraph/IGESGraph_DrawingUnits.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_DrawingUnits,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_DrawingUnits,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_GeneralModule.cxx b/src/IGESGraph/IGESGraph_GeneralModule.cxx
index e5686382d9..bb559c968a 100644
--- a/src/IGESGraph/IGESGraph_GeneralModule.cxx
+++ b/src/IGESGraph/IGESGraph_GeneralModule.cxx
@@ -52,6 +52,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGraph/IGESGraph_GeneralModule.hxx b/src/IGESGraph/IGESGraph_GeneralModule.hxx
index 31ccea315a..9159cdf0d6 100644
--- a/src/IGESGraph/IGESGraph_GeneralModule.hxx
+++ b/src/IGESGraph/IGESGraph_GeneralModule.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_HighLight.cxx b/src/IGESGraph/IGESGraph_HighLight.cxx
index 2ce9a9dda5..82d7895c88 100644
--- a/src/IGESGraph/IGESGraph_HighLight.cxx
+++ b/src/IGESGraph/IGESGraph_HighLight.cxx
@@ -19,6 +19,8 @@
 #include <IGESGraph_HighLight.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_HighLight,IGESData_IGESEntity)
+
 IGESGraph_HighLight::IGESGraph_HighLight ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_HighLight.hxx b/src/IGESGraph/IGESGraph_HighLight.hxx
index 43cff7112b..84c1ed9aa9 100644
--- a/src/IGESGraph/IGESGraph_HighLight.hxx
+++ b/src/IGESGraph/IGESGraph_HighLight.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_HighLight,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_HighLight,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_IntercharacterSpacing.cxx b/src/IGESGraph/IGESGraph_IntercharacterSpacing.cxx
index 1ceddbc508..4ef95ed832 100644
--- a/src/IGESGraph/IGESGraph_IntercharacterSpacing.cxx
+++ b/src/IGESGraph/IGESGraph_IntercharacterSpacing.cxx
@@ -19,6 +19,8 @@
 #include <IGESGraph_IntercharacterSpacing.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_IntercharacterSpacing,IGESData_IGESEntity)
+
 IGESGraph_IntercharacterSpacing::IGESGraph_IntercharacterSpacing ()    {  }
 
     void IGESGraph_IntercharacterSpacing::Init
diff --git a/src/IGESGraph/IGESGraph_IntercharacterSpacing.hxx b/src/IGESGraph/IGESGraph_IntercharacterSpacing.hxx
index 94829d8182..d874ec523b 100644
--- a/src/IGESGraph/IGESGraph_IntercharacterSpacing.hxx
+++ b/src/IGESGraph/IGESGraph_IntercharacterSpacing.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_IntercharacterSpacing,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_IntercharacterSpacing,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefPattern.cxx b/src/IGESGraph/IGESGraph_LineFontDefPattern.cxx
index f140b0a3e2..d763a35b36 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefPattern.cxx
+++ b/src/IGESGraph/IGESGraph_LineFontDefPattern.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_LineFontDefPattern,IGESData_LineFontEntity)
+
 IGESGraph_LineFontDefPattern::IGESGraph_LineFontDefPattern ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx b/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
index a36f8859e3..59c2d2424f 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
+++ b/src/IGESGraph/IGESGraph_LineFontDefPattern.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_LineFontDefPattern,IGESData_LineFontEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_LineFontDefPattern,IGESData_LineFontEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefTemplate.cxx b/src/IGESGraph/IGESGraph_LineFontDefTemplate.cxx
index 6d6fc7b021..6a03e393e1 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefTemplate.cxx
+++ b/src/IGESGraph/IGESGraph_LineFontDefTemplate.cxx
@@ -20,6 +20,8 @@
 #include <IGESGraph_LineFontDefTemplate.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_LineFontDefTemplate,IGESData_LineFontEntity)
+
 IGESGraph_LineFontDefTemplate::IGESGraph_LineFontDefTemplate ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefTemplate.hxx b/src/IGESGraph/IGESGraph_LineFontDefTemplate.hxx
index b4c273a1ac..5e7284b22e 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefTemplate.hxx
+++ b/src/IGESGraph/IGESGraph_LineFontDefTemplate.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_LineFontDefTemplate,IGESData_LineFontEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_LineFontDefTemplate,IGESData_LineFontEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_LineFontPredefined.cxx b/src/IGESGraph/IGESGraph_LineFontPredefined.cxx
index e8432101ec..2d2d0e729e 100644
--- a/src/IGESGraph/IGESGraph_LineFontPredefined.cxx
+++ b/src/IGESGraph/IGESGraph_LineFontPredefined.cxx
@@ -19,6 +19,8 @@
 #include <IGESGraph_LineFontPredefined.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_LineFontPredefined,IGESData_IGESEntity)
+
 IGESGraph_LineFontPredefined::IGESGraph_LineFontPredefined ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_LineFontPredefined.hxx b/src/IGESGraph/IGESGraph_LineFontPredefined.hxx
index 8c7b451842..2ab2019c05 100644
--- a/src/IGESGraph/IGESGraph_LineFontPredefined.hxx
+++ b/src/IGESGraph/IGESGraph_LineFontPredefined.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_LineFontPredefined,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_LineFontPredefined,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_NominalSize.cxx b/src/IGESGraph/IGESGraph_NominalSize.cxx
index 71ddbde8e9..e80f120fc6 100644
--- a/src/IGESGraph/IGESGraph_NominalSize.cxx
+++ b/src/IGESGraph/IGESGraph_NominalSize.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_NominalSize,IGESData_IGESEntity)
+
 IGESGraph_NominalSize::IGESGraph_NominalSize ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_NominalSize.hxx b/src/IGESGraph/IGESGraph_NominalSize.hxx
index bea62f2987..bf6d1e0a0f 100644
--- a/src/IGESGraph/IGESGraph_NominalSize.hxx
+++ b/src/IGESGraph/IGESGraph_NominalSize.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_NominalSize,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_NominalSize,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_Pick.cxx b/src/IGESGraph/IGESGraph_Pick.cxx
index 4a04f1f308..38a4b2eb54 100644
--- a/src/IGESGraph/IGESGraph_Pick.cxx
+++ b/src/IGESGraph/IGESGraph_Pick.cxx
@@ -19,6 +19,8 @@
 #include <IGESGraph_Pick.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_Pick,IGESData_IGESEntity)
+
 IGESGraph_Pick::IGESGraph_Pick ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_Pick.hxx b/src/IGESGraph/IGESGraph_Pick.hxx
index bdfe90b4cf..fdeab96acf 100644
--- a/src/IGESGraph/IGESGraph_Pick.hxx
+++ b/src/IGESGraph/IGESGraph_Pick.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_Pick,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_Pick,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_Protocol.cxx b/src/IGESGraph/IGESGraph_Protocol.cxx
index acb67ffa2c..eb611faec8 100644
--- a/src/IGESGraph/IGESGraph_Protocol.cxx
+++ b/src/IGESGraph/IGESGraph_Protocol.cxx
@@ -32,6 +32,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14;
diff --git a/src/IGESGraph/IGESGraph_Protocol.hxx b/src/IGESGraph/IGESGraph_Protocol.hxx
index 5db1c28a8b..5bf94b3c34 100644
--- a/src/IGESGraph/IGESGraph_Protocol.hxx
+++ b/src/IGESGraph/IGESGraph_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_ReadWriteModule.cxx b/src/IGESGraph/IGESGraph_ReadWriteModule.cxx
index 172d81508f..0a8a939c51 100644
--- a/src/IGESGraph/IGESGraph_ReadWriteModule.cxx
+++ b/src/IGESGraph/IGESGraph_ReadWriteModule.cxx
@@ -49,6 +49,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
index 2bea86a501..2839759638 100644
--- a/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
+++ b/src/IGESGraph/IGESGraph_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_SpecificModule.cxx b/src/IGESGraph/IGESGraph_SpecificModule.cxx
index b78b430c9f..d96d195e4f 100644
--- a/src/IGESGraph/IGESGraph_SpecificModule.cxx
+++ b/src/IGESGraph/IGESGraph_SpecificModule.cxx
@@ -47,6 +47,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESGraph/IGESGraph_SpecificModule.hxx b/src/IGESGraph/IGESGraph_SpecificModule.hxx
index c7bf29881b..d119954854 100644
--- a/src/IGESGraph/IGESGraph_SpecificModule.hxx
+++ b/src/IGESGraph/IGESGraph_SpecificModule.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_TextDisplayTemplate.cxx b/src/IGESGraph/IGESGraph_TextDisplayTemplate.cxx
index 9fb19a5a9c..24ea215fee 100644
--- a/src/IGESGraph/IGESGraph_TextDisplayTemplate.cxx
+++ b/src/IGESGraph/IGESGraph_TextDisplayTemplate.cxx
@@ -23,6 +23,8 @@
 #include <IGESGraph_TextFontDef.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_TextDisplayTemplate,IGESData_IGESEntity)
+
 IGESGraph_TextDisplayTemplate::IGESGraph_TextDisplayTemplate ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx b/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
index c30554a732..133048e7d8 100644
--- a/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
+++ b/src/IGESGraph/IGESGraph_TextDisplayTemplate.hxx
@@ -120,7 +120,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_TextDisplayTemplate,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_TextDisplayTemplate,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_TextFontDef.cxx b/src/IGESGraph/IGESGraph_TextFontDef.cxx
index 768da12a24..6621e9028d 100644
--- a/src/IGESGraph/IGESGraph_TextFontDef.cxx
+++ b/src/IGESGraph/IGESGraph_TextFontDef.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_TextFontDef,IGESData_IGESEntity)
+
 IGESGraph_TextFontDef::IGESGraph_TextFontDef ()    {  }
 
 
diff --git a/src/IGESGraph/IGESGraph_TextFontDef.hxx b/src/IGESGraph/IGESGraph_TextFontDef.hxx
index 40895caaed..04777acfe8 100644
--- a/src/IGESGraph/IGESGraph_TextFontDef.hxx
+++ b/src/IGESGraph/IGESGraph_TextFontDef.hxx
@@ -113,7 +113,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_TextFontDef,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_TextFontDef,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESGraph/IGESGraph_UniformRectGrid.cxx b/src/IGESGraph/IGESGraph_UniformRectGrid.cxx
index b5a5571e97..5455e37e25 100644
--- a/src/IGESGraph/IGESGraph_UniformRectGrid.cxx
+++ b/src/IGESGraph/IGESGraph_UniformRectGrid.cxx
@@ -22,6 +22,8 @@
 #include <IGESGraph_UniformRectGrid.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESGraph_UniformRectGrid,IGESData_IGESEntity)
+
 IGESGraph_UniformRectGrid::IGESGraph_UniformRectGrid ()    {  }
 
     void IGESGraph_UniformRectGrid::Init
diff --git a/src/IGESGraph/IGESGraph_UniformRectGrid.hxx b/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
index c5c5b7e0f6..999405fdc1 100644
--- a/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
+++ b/src/IGESGraph/IGESGraph_UniformRectGrid.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESGraph_UniformRectGrid,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESGraph_UniformRectGrid,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_Activator.cxx b/src/IGESSelect/IGESSelect_Activator.cxx
index 30fc326830..dcd66b485d 100644
--- a/src/IGESSelect/IGESSelect_Activator.cxx
+++ b/src/IGESSelect/IGESSelect_Activator.cxx
@@ -56,6 +56,8 @@
 #include <TColStd_HSequenceOfTransient.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_Activator,IFSelect_Activator)
+
 static int initActivator = 0;
 
     IGESSelect_Activator::IGESSelect_Activator ()
diff --git a/src/IGESSelect/IGESSelect_Activator.hxx b/src/IGESSelect/IGESSelect_Activator.hxx
index dfca5ba437..c5d30954b5 100644
--- a/src/IGESSelect/IGESSelect_Activator.hxx
+++ b/src/IGESSelect/IGESSelect_Activator.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_Activator,IFSelect_Activator)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_Activator,IFSelect_Activator)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_AddFileComment.cxx b/src/IGESSelect/IGESSelect_AddFileComment.cxx
index dcecf71e67..835208820a 100644
--- a/src/IGESSelect/IGESSelect_AddFileComment.cxx
+++ b/src/IGESSelect/IGESSelect_AddFileComment.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_AddFileComment,IGESSelect_FileModifier)
+
 IGESSelect_AddFileComment::IGESSelect_AddFileComment  ()
       {  thelist = new TColStd_HSequenceOfHAsciiString();  }
 
diff --git a/src/IGESSelect/IGESSelect_AddFileComment.hxx b/src/IGESSelect/IGESSelect_AddFileComment.hxx
index 6e4e39e39c..f829277e4d 100644
--- a/src/IGESSelect/IGESSelect_AddFileComment.hxx
+++ b/src/IGESSelect/IGESSelect_AddFileComment.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_AddFileComment,IGESSelect_FileModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_AddFileComment,IGESSelect_FileModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_AddGroup.cxx b/src/IGESSelect/IGESSelect_AddGroup.cxx
index 9298b6dd07..702cce2ace 100644
--- a/src/IGESSelect/IGESSelect_AddGroup.cxx
+++ b/src/IGESSelect/IGESSelect_AddGroup.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_AddGroup,IGESSelect_ModelModifier)
+
 IGESSelect_AddGroup::IGESSelect_AddGroup ()
     : IGESSelect_ModelModifier (Standard_True)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_AddGroup.hxx b/src/IGESSelect/IGESSelect_AddGroup.hxx
index 7764c592f5..49454ab8c8 100644
--- a/src/IGESSelect/IGESSelect_AddGroup.hxx
+++ b/src/IGESSelect/IGESSelect_AddGroup.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_AddGroup,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_AddGroup,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_AutoCorrect.cxx b/src/IGESSelect/IGESSelect_AutoCorrect.cxx
index dfdc8e6c00..c60a5faf9e 100644
--- a/src/IGESSelect/IGESSelect_AutoCorrect.cxx
+++ b/src/IGESSelect/IGESSelect_AutoCorrect.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_AutoCorrect,IGESSelect_ModelModifier)
+
 IGESSelect_AutoCorrect::IGESSelect_AutoCorrect ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_AutoCorrect.hxx b/src/IGESSelect/IGESSelect_AutoCorrect.hxx
index a542d99ce7..7a99e8e019 100644
--- a/src/IGESSelect/IGESSelect_AutoCorrect.hxx
+++ b/src/IGESSelect/IGESSelect_AutoCorrect.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_AutoCorrect,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_AutoCorrect,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelList.cxx b/src/IGESSelect/IGESSelect_ChangeLevelList.cxx
index 20052b798a..62157c0c2e 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelList.cxx
+++ b/src/IGESSelect/IGESSelect_ChangeLevelList.cxx
@@ -28,6 +28,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_ChangeLevelList,IGESSelect_ModelModifier)
+
 IGESSelect_ChangeLevelList::IGESSelect_ChangeLevelList ()
     :  IGESSelect_ModelModifier (Standard_True)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelList.hxx b/src/IGESSelect/IGESSelect_ChangeLevelList.hxx
index 209bad9a56..28100fae38 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelList.hxx
+++ b/src/IGESSelect/IGESSelect_ChangeLevelList.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_ChangeLevelList,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_ChangeLevelList,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelNumber.cxx b/src/IGESSelect/IGESSelect_ChangeLevelNumber.cxx
index f68ba39cba..08c5d16c98 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelNumber.cxx
+++ b/src/IGESSelect/IGESSelect_ChangeLevelNumber.cxx
@@ -28,6 +28,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_ChangeLevelNumber,IGESSelect_ModelModifier)
+
 IGESSelect_ChangeLevelNumber::IGESSelect_ChangeLevelNumber ()
     :  IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx b/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx
index a7cfdaf5e2..5197ac962a 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx
+++ b/src/IGESSelect/IGESSelect_ChangeLevelNumber.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_ChangeLevelNumber,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_ChangeLevelNumber,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_ComputeStatus.cxx b/src/IGESSelect/IGESSelect_ComputeStatus.cxx
index 6b568bb3c6..f32a687a63 100644
--- a/src/IGESSelect/IGESSelect_ComputeStatus.cxx
+++ b/src/IGESSelect/IGESSelect_ComputeStatus.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_ComputeStatus,IGESSelect_ModelModifier)
+
 IGESSelect_ComputeStatus::IGESSelect_ComputeStatus ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_ComputeStatus.hxx b/src/IGESSelect/IGESSelect_ComputeStatus.hxx
index bed5425cb0..85f70937b3 100644
--- a/src/IGESSelect/IGESSelect_ComputeStatus.hxx
+++ b/src/IGESSelect/IGESSelect_ComputeStatus.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_ComputeStatus,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_ComputeStatus,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx
index 3c0ac66bbc..884199a838 100644
--- a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx
+++ b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_CounterOfLevelNumber,IFSelect_SignCounter)
+
 IGESSelect_CounterOfLevelNumber::IGESSelect_CounterOfLevelNumber
   (const Standard_Boolean withmap, const Standard_Boolean withlist)
     : IFSelect_SignCounter (withmap,withlist)
diff --git a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.hxx b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.hxx
index 8d5c858efa..ea444af8e5 100644
--- a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.hxx
+++ b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_CounterOfLevelNumber,IFSelect_SignCounter)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_CounterOfLevelNumber,IFSelect_SignCounter)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_DispPerDrawing.cxx b/src/IGESSelect/IGESSelect_DispPerDrawing.cxx
index 38265ed009..b136320582 100644
--- a/src/IGESSelect/IGESSelect_DispPerDrawing.cxx
+++ b/src/IGESSelect/IGESSelect_DispPerDrawing.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_DispPerDrawing,IFSelect_Dispatch)
+
 IGESSelect_DispPerDrawing::IGESSelect_DispPerDrawing ()
       {  thesorter = new IGESSelect_ViewSorter;  }
 
diff --git a/src/IGESSelect/IGESSelect_DispPerDrawing.hxx b/src/IGESSelect/IGESSelect_DispPerDrawing.hxx
index 33bb92d3ce..f18d246075 100644
--- a/src/IGESSelect/IGESSelect_DispPerDrawing.hxx
+++ b/src/IGESSelect/IGESSelect_DispPerDrawing.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_DispPerDrawing,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_DispPerDrawing,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_DispPerSingleView.cxx b/src/IGESSelect/IGESSelect_DispPerSingleView.cxx
index 9df94ff427..285af95f3c 100644
--- a/src/IGESSelect/IGESSelect_DispPerSingleView.cxx
+++ b/src/IGESSelect/IGESSelect_DispPerSingleView.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_DispPerSingleView,IFSelect_Dispatch)
+
 IGESSelect_DispPerSingleView::IGESSelect_DispPerSingleView ()
       {  thesorter = new IGESSelect_ViewSorter;  }
 
diff --git a/src/IGESSelect/IGESSelect_DispPerSingleView.hxx b/src/IGESSelect/IGESSelect_DispPerSingleView.hxx
index b0e00f1e3c..238e97714f 100644
--- a/src/IGESSelect/IGESSelect_DispPerSingleView.hxx
+++ b/src/IGESSelect/IGESSelect_DispPerSingleView.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_DispPerSingleView,IFSelect_Dispatch)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_DispPerSingleView,IFSelect_Dispatch)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_Dumper.cxx b/src/IGESSelect/IGESSelect_Dumper.cxx
index 33fefdbac4..8e8241fb19 100644
--- a/src/IGESSelect/IGESSelect_Dumper.cxx
+++ b/src/IGESSelect/IGESSelect_Dumper.cxx
@@ -44,6 +44,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_Dumper,IFSelect_SessionDumper)
+
 //#include <IGESSelect_SelectIGESTypeForm.hxx>
 IGESSelect_Dumper::IGESSelect_Dumper ()    {  }
 
diff --git a/src/IGESSelect/IGESSelect_Dumper.hxx b/src/IGESSelect/IGESSelect_Dumper.hxx
index e74c3ae629..3253bc5c1f 100644
--- a/src/IGESSelect/IGESSelect_Dumper.hxx
+++ b/src/IGESSelect/IGESSelect_Dumper.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_Dumper,IFSelect_SessionDumper)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_Dumper,IFSelect_SessionDumper)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_EditDirPart.cxx b/src/IGESSelect/IGESSelect_EditDirPart.cxx
index cf20b8c5d1..50d4a1a777 100644
--- a/src/IGESSelect/IGESSelect_EditDirPart.cxx
+++ b/src/IGESSelect/IGESSelect_EditDirPart.cxx
@@ -31,6 +31,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_EditDirPart,IFSelect_Editor)
+
 static  Handle(Interface_TypedValue) NewDefType(const Standard_CString name)
 {
   Handle(Interface_TypedValue) deftype = new Interface_TypedValue(name,Interface_ParamEnum);
diff --git a/src/IGESSelect/IGESSelect_EditDirPart.hxx b/src/IGESSelect/IGESSelect_EditDirPart.hxx
index 7070c185be..af59bc5733 100644
--- a/src/IGESSelect/IGESSelect_EditDirPart.hxx
+++ b/src/IGESSelect/IGESSelect_EditDirPart.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_EditDirPart,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_EditDirPart,IFSelect_Editor)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_EditHeader.cxx b/src/IGESSelect/IGESSelect_EditHeader.cxx
index 171ccf7c16..6086a6179e 100644
--- a/src/IGESSelect/IGESSelect_EditHeader.cxx
+++ b/src/IGESSelect/IGESSelect_EditHeader.cxx
@@ -26,6 +26,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_EditHeader,IFSelect_Editor)
+
 static Standard_Boolean IsTimeStamp
   (const Handle(TCollection_HAsciiString)& val)
 {
diff --git a/src/IGESSelect/IGESSelect_EditHeader.hxx b/src/IGESSelect/IGESSelect_EditHeader.hxx
index 58502fe876..fec6df2647 100644
--- a/src/IGESSelect/IGESSelect_EditHeader.hxx
+++ b/src/IGESSelect/IGESSelect_EditHeader.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_EditHeader,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_EditHeader,IFSelect_Editor)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_FileModifier.hxx b/src/IGESSelect/IGESSelect_FileModifier.hxx
index cd01b98145..8b1040a952 100644
--- a/src/IGESSelect/IGESSelect_FileModifier.hxx
+++ b/src/IGESSelect/IGESSelect_FileModifier.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_FileModifier,IFSelect_GeneralModifier)
+  DEFINE_STANDARD_RTTI_INLINE(IGESSelect_FileModifier,IFSelect_GeneralModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_FloatFormat.cxx b/src/IGESSelect/IGESSelect_FloatFormat.cxx
index 2f1de649e8..ba3551db12 100644
--- a/src/IGESSelect/IGESSelect_FloatFormat.cxx
+++ b/src/IGESSelect/IGESSelect_FloatFormat.cxx
@@ -20,6 +20,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_FloatFormat,IGESSelect_FileModifier)
+
 IGESSelect_FloatFormat::IGESSelect_FloatFormat ()
     : thezerosup (Standard_True) , themainform ("%E") ,
       theformrange ("%f") , therangemin (0.1) , therangemax (1000.)
diff --git a/src/IGESSelect/IGESSelect_FloatFormat.hxx b/src/IGESSelect/IGESSelect_FloatFormat.hxx
index f559b9da1a..40e5d901f4 100644
--- a/src/IGESSelect/IGESSelect_FloatFormat.hxx
+++ b/src/IGESSelect/IGESSelect_FloatFormat.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_FloatFormat,IGESSelect_FileModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_FloatFormat,IGESSelect_FileModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_IGESName.cxx b/src/IGESSelect/IGESSelect_IGESName.cxx
index b3daec557e..cf6b376462 100644
--- a/src/IGESSelect/IGESSelect_IGESName.cxx
+++ b/src/IGESSelect/IGESSelect_IGESName.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_IGESName,IFSelect_Signature)
+
 static char falsetype [] = "?";
 static char voidlabel [] = "";
 
diff --git a/src/IGESSelect/IGESSelect_IGESName.hxx b/src/IGESSelect/IGESSelect_IGESName.hxx
index d266b9ae6b..484fb0f221 100644
--- a/src/IGESSelect/IGESSelect_IGESName.hxx
+++ b/src/IGESSelect/IGESSelect_IGESName.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_IGESName,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_IGESName,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_IGESTypeForm.cxx b/src/IGESSelect/IGESSelect_IGESTypeForm.cxx
index a054a0ae28..d351ee7a25 100644
--- a/src/IGESSelect/IGESSelect_IGESTypeForm.cxx
+++ b/src/IGESSelect/IGESSelect_IGESTypeForm.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_IGESTypeForm,IFSelect_Signature)
+
 static char falsetype [] = "?";
 static char typeval [30];    // une seule reponse a la fois ...
 
diff --git a/src/IGESSelect/IGESSelect_IGESTypeForm.hxx b/src/IGESSelect/IGESSelect_IGESTypeForm.hxx
index 2218c54691..873a036c24 100644
--- a/src/IGESSelect/IGESSelect_IGESTypeForm.hxx
+++ b/src/IGESSelect/IGESSelect_IGESTypeForm.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_IGESTypeForm,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_IGESTypeForm,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_ModelModifier.hxx b/src/IGESSelect/IGESSelect_ModelModifier.hxx
index f821465cb5..c59e1d2bcf 100644
--- a/src/IGESSelect/IGESSelect_ModelModifier.hxx
+++ b/src/IGESSelect/IGESSelect_ModelModifier.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_ModelModifier,IFSelect_Modifier)
+  DEFINE_STANDARD_RTTI_INLINE(IGESSelect_ModelModifier,IFSelect_Modifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_RebuildDrawings.cxx b/src/IGESSelect/IGESSelect_RebuildDrawings.cxx
index b4e2515181..216c2ed988 100644
--- a/src/IGESSelect/IGESSelect_RebuildDrawings.cxx
+++ b/src/IGESSelect/IGESSelect_RebuildDrawings.cxx
@@ -35,6 +35,8 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_RebuildDrawings,IGESSelect_ModelModifier)
+
 #define PourDrawing 404
 
 
diff --git a/src/IGESSelect/IGESSelect_RebuildDrawings.hxx b/src/IGESSelect/IGESSelect_RebuildDrawings.hxx
index e8a52c43f4..b3550a6b22 100644
--- a/src/IGESSelect/IGESSelect_RebuildDrawings.hxx
+++ b/src/IGESSelect/IGESSelect_RebuildDrawings.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_RebuildDrawings,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_RebuildDrawings,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_RebuildGroups.cxx b/src/IGESSelect/IGESSelect_RebuildGroups.cxx
index 72db30e61e..7b311318e6 100644
--- a/src/IGESSelect/IGESSelect_RebuildGroups.cxx
+++ b/src/IGESSelect/IGESSelect_RebuildGroups.cxx
@@ -28,6 +28,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_RebuildGroups,IGESSelect_ModelModifier)
+
 IGESSelect_RebuildGroups::IGESSelect_RebuildGroups ()
     : IGESSelect_ModelModifier (Standard_True)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_RebuildGroups.hxx b/src/IGESSelect/IGESSelect_RebuildGroups.hxx
index 73dad9e82a..4438ee2482 100644
--- a/src/IGESSelect/IGESSelect_RebuildGroups.hxx
+++ b/src/IGESSelect/IGESSelect_RebuildGroups.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_RebuildGroups,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_RebuildGroups,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_RemoveCurves.cxx b/src/IGESSelect/IGESSelect_RemoveCurves.cxx
index 6774347eac..116b5be471 100644
--- a/src/IGESSelect/IGESSelect_RemoveCurves.cxx
+++ b/src/IGESSelect/IGESSelect_RemoveCurves.cxx
@@ -28,6 +28,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_RemoveCurves,IGESSelect_ModelModifier)
+
 IGESSelect_RemoveCurves::IGESSelect_RemoveCurves (const Standard_Boolean UV)
     : IGESSelect_ModelModifier (Standard_True)  ,  theUV (UV)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_RemoveCurves.hxx b/src/IGESSelect/IGESSelect_RemoveCurves.hxx
index d29535dcf4..ede9b9b99f 100644
--- a/src/IGESSelect/IGESSelect_RemoveCurves.hxx
+++ b/src/IGESSelect/IGESSelect_RemoveCurves.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_RemoveCurves,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_RemoveCurves,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectBasicGeom.cxx b/src/IGESSelect/IGESSelect_SelectBasicGeom.cxx
index 5a015be47e..356b89a1c4 100644
--- a/src/IGESSelect/IGESSelect_SelectBasicGeom.cxx
+++ b/src/IGESSelect/IGESSelect_SelectBasicGeom.cxx
@@ -34,6 +34,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectBasicGeom,IFSelect_SelectExplore)
+
 IGESSelect_SelectBasicGeom::IGESSelect_SelectBasicGeom
   (const Standard_Integer mode)
     : IFSelect_SelectExplore (-1)    {  thegeom = mode;  }
diff --git a/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx b/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx
index e1ef62dbea..ecd97b3a93 100644
--- a/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx
+++ b/src/IGESSelect/IGESSelect_SelectBasicGeom.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectBasicGeom,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectBasicGeom,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectBypassGroup.cxx b/src/IGESSelect/IGESSelect_SelectBypassGroup.cxx
index 5a3beb9175..5c8165fb0e 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassGroup.cxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassGroup.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectBypassGroup,IFSelect_SelectExplore)
+
 #define TypePourGroup 402
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
index 14d340518c..007b6e5120 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassGroup.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectBypassGroup,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectBypassGroup,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cxx b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cxx
index bc70fad23a..e17a3504ce 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectBypassSubfigure,IFSelect_SelectExplore)
+
 IGESSelect_SelectBypassSubfigure::IGESSelect_SelectBypassSubfigure
   (const Standard_Integer level)
   : IFSelect_SelectExplore (level)    {  }
diff --git a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
index d940b03a93..bb86f99a8a 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
+++ b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectBypassSubfigure,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectBypassSubfigure,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx
index 17f400f4ec..4e0906c99b 100644
--- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx
+++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectDrawingFrom,IFSelect_SelectDeduct)
+
 IGESSelect_SelectDrawingFrom::IGESSelect_SelectDrawingFrom ()    {  }
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
index 7dd07b81e5..0881bfeaf7 100644
--- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
+++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectDrawingFrom,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectDrawingFrom,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectFaces.cxx b/src/IGESSelect/IGESSelect_SelectFaces.cxx
index 5aaa8d6cc2..acc0505906 100644
--- a/src/IGESSelect/IGESSelect_SelectFaces.cxx
+++ b/src/IGESSelect/IGESSelect_SelectFaces.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectFaces,IFSelect_SelectExplore)
+
 IGESSelect_SelectFaces::IGESSelect_SelectFaces ()
     : IFSelect_SelectExplore (-1)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_SelectFaces.hxx b/src/IGESSelect/IGESSelect_SelectFaces.hxx
index fc090be1bc..ec2f2abb71 100644
--- a/src/IGESSelect/IGESSelect_SelectFaces.hxx
+++ b/src/IGESSelect/IGESSelect_SelectFaces.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectFaces,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectFaces,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx b/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx
index d69be59914..2a4b2b7eb4 100644
--- a/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx
+++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectFromDrawing,IFSelect_SelectDeduct)
+
 #define PourDrawing 404
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
index 7612dcb488..7bbb8600e0 100644
--- a/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
+++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectFromDrawing,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectFromDrawing,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx b/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx
index d4ae591b32..94d5c3800e 100644
--- a/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx
+++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectFromSingleView,IFSelect_SelectDeduct)
+
 IGESSelect_SelectFromSingleView::IGESSelect_SelectFromSingleView ()    {  }
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
index 0dbe2fe3e6..ed6c03d437 100644
--- a/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
+++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectFromSingleView,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectFromSingleView,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectLevelNumber.cxx b/src/IGESSelect/IGESSelect_SelectLevelNumber.cxx
index 355ea10c49..1d4cbe0128 100644
--- a/src/IGESSelect/IGESSelect_SelectLevelNumber.cxx
+++ b/src/IGESSelect/IGESSelect_SelectLevelNumber.cxx
@@ -23,6 +23,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectLevelNumber,IFSelect_SelectExtract)
+
 IGESSelect_SelectLevelNumber::IGESSelect_SelectLevelNumber ()    {  }
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx b/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx
index 643fd55977..b79801dc55 100644
--- a/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx
+++ b/src/IGESSelect/IGESSelect_SelectLevelNumber.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectLevelNumber,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectLevelNumber,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectName.cxx b/src/IGESSelect/IGESSelect_SelectName.cxx
index b2a3d68d2c..ac73307577 100644
--- a/src/IGESSelect/IGESSelect_SelectName.cxx
+++ b/src/IGESSelect/IGESSelect_SelectName.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectName,IFSelect_SelectExtract)
+
 IGESSelect_SelectName::IGESSelect_SelectName ()    {  }
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectName.hxx b/src/IGESSelect/IGESSelect_SelectName.hxx
index a6b2a3d061..ca434f62ba 100644
--- a/src/IGESSelect/IGESSelect_SelectName.hxx
+++ b/src/IGESSelect/IGESSelect_SelectName.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectName,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectName,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectPCurves.cxx b/src/IGESSelect/IGESSelect_SelectPCurves.cxx
index 6d0c2065a8..41c0a703cb 100644
--- a/src/IGESSelect/IGESSelect_SelectPCurves.cxx
+++ b/src/IGESSelect/IGESSelect_SelectPCurves.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectPCurves,IFSelect_SelectExplore)
+
 IGESSelect_SelectPCurves::IGESSelect_SelectPCurves
   (const Standard_Boolean basic)
     : IFSelect_SelectExplore (-1) , thebasic (basic)    {  }
diff --git a/src/IGESSelect/IGESSelect_SelectPCurves.hxx b/src/IGESSelect/IGESSelect_SelectPCurves.hxx
index 709916113d..b3967503ce 100644
--- a/src/IGESSelect/IGESSelect_SelectPCurves.hxx
+++ b/src/IGESSelect/IGESSelect_SelectPCurves.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectPCurves,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectPCurves,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx
index 6c80af5b0b..06676e05f9 100644
--- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx
+++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectSingleViewFrom,IFSelect_SelectDeduct)
+
 IGESSelect_SelectSingleViewFrom::IGESSelect_SelectSingleViewFrom ()    {  }
 
     Standard_Boolean  IGESSelect_SelectSingleViewFrom::HasUniqueResult () const
diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
index 10b4aba7f9..a03fe34bd1 100644
--- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
+++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectSingleViewFrom,IFSelect_SelectDeduct)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectSingleViewFrom,IFSelect_SelectDeduct)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectSubordinate.cxx b/src/IGESSelect/IGESSelect_SelectSubordinate.cxx
index 4745bba9aa..fad811fab7 100644
--- a/src/IGESSelect/IGESSelect_SelectSubordinate.cxx
+++ b/src/IGESSelect/IGESSelect_SelectSubordinate.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectSubordinate,IFSelect_SelectExtract)
+
 IGESSelect_SelectSubordinate::IGESSelect_SelectSubordinate
   (const Standard_Integer status)    {  thestatus = status;  }
 
diff --git a/src/IGESSelect/IGESSelect_SelectSubordinate.hxx b/src/IGESSelect/IGESSelect_SelectSubordinate.hxx
index 4defc1099c..ad3451849d 100644
--- a/src/IGESSelect/IGESSelect_SelectSubordinate.hxx
+++ b/src/IGESSelect/IGESSelect_SelectSubordinate.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectSubordinate,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectSubordinate,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SelectVisibleStatus.cxx b/src/IGESSelect/IGESSelect_SelectVisibleStatus.cxx
index 1dd4d21d78..1b6ccd5539 100644
--- a/src/IGESSelect/IGESSelect_SelectVisibleStatus.cxx
+++ b/src/IGESSelect/IGESSelect_SelectVisibleStatus.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SelectVisibleStatus,IFSelect_SelectExtract)
+
 IGESSelect_SelectVisibleStatus::IGESSelect_SelectVisibleStatus ()    {  }
 
 
diff --git a/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx b/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx
index 0ebd83418c..c848318fd2 100644
--- a/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx
+++ b/src/IGESSelect/IGESSelect_SelectVisibleStatus.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SelectVisibleStatus,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SelectVisibleStatus,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SetGlobalParameter.cxx b/src/IGESSelect/IGESSelect_SetGlobalParameter.cxx
index 716e0f3837..5872ccc828 100644
--- a/src/IGESSelect/IGESSelect_SetGlobalParameter.cxx
+++ b/src/IGESSelect/IGESSelect_SetGlobalParameter.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SetGlobalParameter,IGESSelect_ModelModifier)
+
 IGESSelect_SetGlobalParameter::IGESSelect_SetGlobalParameter
   (const Standard_Integer numpar)
     : IGESSelect_ModelModifier (Standard_False)
diff --git a/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx b/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx
index 506ae16daa..d8124e4a5d 100644
--- a/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx
+++ b/src/IGESSelect/IGESSelect_SetGlobalParameter.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SetGlobalParameter,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SetGlobalParameter,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SetLabel.cxx b/src/IGESSelect/IGESSelect_SetLabel.cxx
index 7da57c8154..cf4ba53796 100644
--- a/src/IGESSelect/IGESSelect_SetLabel.cxx
+++ b/src/IGESSelect/IGESSelect_SetLabel.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SetLabel,IGESSelect_ModelModifier)
+
 IGESSelect_SetLabel::IGESSelect_SetLabel
   (const Standard_Integer mode, const Standard_Boolean enforce)
     : IGESSelect_ModelModifier (Standard_False) ,
diff --git a/src/IGESSelect/IGESSelect_SetLabel.hxx b/src/IGESSelect/IGESSelect_SetLabel.hxx
index 66432d9a42..dbf2037241 100644
--- a/src/IGESSelect/IGESSelect_SetLabel.hxx
+++ b/src/IGESSelect/IGESSelect_SetLabel.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SetLabel,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SetLabel,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SetVersion5.cxx b/src/IGESSelect/IGESSelect_SetVersion5.cxx
index bc1965355e..b2936e5412 100644
--- a/src/IGESSelect/IGESSelect_SetVersion5.cxx
+++ b/src/IGESSelect/IGESSelect_SetVersion5.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SetVersion5,IGESSelect_ModelModifier)
+
 IGESSelect_SetVersion5::IGESSelect_SetVersion5 ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_SetVersion5.hxx b/src/IGESSelect/IGESSelect_SetVersion5.hxx
index c65057b12d..65c99c830e 100644
--- a/src/IGESSelect/IGESSelect_SetVersion5.hxx
+++ b/src/IGESSelect/IGESSelect_SetVersion5.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SetVersion5,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SetVersion5,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SignColor.cxx b/src/IGESSelect/IGESSelect_SignColor.cxx
index 2403c67098..6f46a0ce67 100644
--- a/src/IGESSelect/IGESSelect_SignColor.cxx
+++ b/src/IGESSelect/IGESSelect_SignColor.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SignColor,IFSelect_Signature)
+
 static TCollection_AsciiString valbuf;  // to prepare value and keep some time
 
 static Standard_CString ColName (const Standard_Integer mode)
diff --git a/src/IGESSelect/IGESSelect_SignColor.hxx b/src/IGESSelect/IGESSelect_SignColor.hxx
index 2ab1055440..b5d6cb0701 100644
--- a/src/IGESSelect/IGESSelect_SignColor.hxx
+++ b/src/IGESSelect/IGESSelect_SignColor.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SignColor,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SignColor,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SignLevelNumber.cxx b/src/IGESSelect/IGESSelect_SignLevelNumber.cxx
index 1e92890023..45e884b283 100644
--- a/src/IGESSelect/IGESSelect_SignLevelNumber.cxx
+++ b/src/IGESSelect/IGESSelect_SignLevelNumber.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SignLevelNumber,IFSelect_Signature)
+
 static TCollection_AsciiString laval;
 
 
diff --git a/src/IGESSelect/IGESSelect_SignLevelNumber.hxx b/src/IGESSelect/IGESSelect_SignLevelNumber.hxx
index 84d772fccf..f8bbb20fe7 100644
--- a/src/IGESSelect/IGESSelect_SignLevelNumber.hxx
+++ b/src/IGESSelect/IGESSelect_SignLevelNumber.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SignLevelNumber,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SignLevelNumber,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SignStatus.cxx b/src/IGESSelect/IGESSelect_SignStatus.cxx
index 30eaedf888..9ef4ced162 100644
--- a/src/IGESSelect/IGESSelect_SignStatus.cxx
+++ b/src/IGESSelect/IGESSelect_SignStatus.cxx
@@ -20,6 +20,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SignStatus,IFSelect_Signature)
+
 static char theval[10];
 
     IGESSelect_SignStatus::IGESSelect_SignStatus ()
diff --git a/src/IGESSelect/IGESSelect_SignStatus.hxx b/src/IGESSelect/IGESSelect_SignStatus.hxx
index 778f79e3cc..db44509511 100644
--- a/src/IGESSelect/IGESSelect_SignStatus.hxx
+++ b/src/IGESSelect/IGESSelect_SignStatus.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SignStatus,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SignStatus,IFSelect_Signature)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_SplineToBSpline.cxx b/src/IGESSelect/IGESSelect_SplineToBSpline.cxx
index 78cf7fa73e..9fb4833ed5 100644
--- a/src/IGESSelect/IGESSelect_SplineToBSpline.cxx
+++ b/src/IGESSelect/IGESSelect_SplineToBSpline.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_SplineToBSpline,IFSelect_Transformer)
+
 IGESSelect_SplineToBSpline::IGESSelect_SplineToBSpline
   (const Standard_Boolean tryC2)
 {
diff --git a/src/IGESSelect/IGESSelect_SplineToBSpline.hxx b/src/IGESSelect/IGESSelect_SplineToBSpline.hxx
index 73b56b73e9..033de89ead 100644
--- a/src/IGESSelect/IGESSelect_SplineToBSpline.hxx
+++ b/src/IGESSelect/IGESSelect_SplineToBSpline.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_SplineToBSpline,IFSelect_Transformer)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_SplineToBSpline,IFSelect_Transformer)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_UpdateCreationDate.cxx b/src/IGESSelect/IGESSelect_UpdateCreationDate.cxx
index 9e892d8fdf..35a8c44aa2 100644
--- a/src/IGESSelect/IGESSelect_UpdateCreationDate.cxx
+++ b/src/IGESSelect/IGESSelect_UpdateCreationDate.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_UpdateCreationDate,IGESSelect_ModelModifier)
+
 IGESSelect_UpdateCreationDate::IGESSelect_UpdateCreationDate ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx b/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx
index 995496997f..d408d2f397 100644
--- a/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx
+++ b/src/IGESSelect/IGESSelect_UpdateCreationDate.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_UpdateCreationDate,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_UpdateCreationDate,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_UpdateFileName.cxx b/src/IGESSelect/IGESSelect_UpdateFileName.cxx
index 3367c459e9..8053a052e5 100644
--- a/src/IGESSelect/IGESSelect_UpdateFileName.cxx
+++ b/src/IGESSelect/IGESSelect_UpdateFileName.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_UpdateFileName,IGESSelect_ModelModifier)
+
 IGESSelect_UpdateFileName::IGESSelect_UpdateFileName  ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_UpdateFileName.hxx b/src/IGESSelect/IGESSelect_UpdateFileName.hxx
index 2fc9ca3e17..1cf378a7ed 100644
--- a/src/IGESSelect/IGESSelect_UpdateFileName.hxx
+++ b/src/IGESSelect/IGESSelect_UpdateFileName.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_UpdateFileName,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_UpdateFileName,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_UpdateLastChange.cxx b/src/IGESSelect/IGESSelect_UpdateLastChange.cxx
index 4ff08cd667..68f49f5514 100644
--- a/src/IGESSelect/IGESSelect_UpdateLastChange.cxx
+++ b/src/IGESSelect/IGESSelect_UpdateLastChange.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_UpdateLastChange,IGESSelect_ModelModifier)
+
 IGESSelect_UpdateLastChange::IGESSelect_UpdateLastChange ()
     : IGESSelect_ModelModifier (Standard_False)    {  }
 
diff --git a/src/IGESSelect/IGESSelect_UpdateLastChange.hxx b/src/IGESSelect/IGESSelect_UpdateLastChange.hxx
index 67866e6195..e8bba6983d 100644
--- a/src/IGESSelect/IGESSelect_UpdateLastChange.hxx
+++ b/src/IGESSelect/IGESSelect_UpdateLastChange.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_UpdateLastChange,IGESSelect_ModelModifier)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_UpdateLastChange,IGESSelect_ModelModifier)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_ViewSorter.cxx b/src/IGESSelect/IGESSelect_ViewSorter.cxx
index 4d8e41f3bb..8da45c7e13 100644
--- a/src/IGESSelect/IGESSelect_ViewSorter.cxx
+++ b/src/IGESSelect/IGESSelect_ViewSorter.cxx
@@ -24,6 +24,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_ViewSorter,MMgt_TShared)
+
 #define PourDrawing 404
 
 
diff --git a/src/IGESSelect/IGESSelect_ViewSorter.hxx b/src/IGESSelect/IGESSelect_ViewSorter.hxx
index 073ca1e6cd..5c6550a067 100644
--- a/src/IGESSelect/IGESSelect_ViewSorter.hxx
+++ b/src/IGESSelect/IGESSelect_ViewSorter.hxx
@@ -121,7 +121,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_ViewSorter,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_ViewSorter,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.cxx b/src/IGESSelect/IGESSelect_WorkLibrary.cxx
index 8233f657c9..8cc1bb5de4 100644
--- a/src/IGESSelect/IGESSelect_WorkLibrary.cxx
+++ b/src/IGESSelect/IGESSelect_WorkLibrary.cxx
@@ -44,6 +44,8 @@
 #include <TColStd_HSequenceOfInteger.hxx>
 
 #include <errno.h>
+IMPLEMENT_STANDARD_RTTIEXT(IGESSelect_WorkLibrary,IFSelect_WorkLibrary)
+
 static int deja = 0;
 static  Handle(IGESData_FileProtocol) IGESProto;
 
diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.hxx b/src/IGESSelect/IGESSelect_WorkLibrary.hxx
index bcde675da2..8021194ada 100644
--- a/src/IGESSelect/IGESSelect_WorkLibrary.hxx
+++ b/src/IGESSelect/IGESSelect_WorkLibrary.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSelect_WorkLibrary,IFSelect_WorkLibrary)
+  DEFINE_STANDARD_RTTIEXT(IGESSelect_WorkLibrary,IFSelect_WorkLibrary)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Block.cxx b/src/IGESSolid/IGESSolid_Block.cxx
index 320e00ddf0..b8d5c12f65 100644
--- a/src/IGESSolid/IGESSolid_Block.cxx
+++ b/src/IGESSolid/IGESSolid_Block.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_Block.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Block,IGESData_IGESEntity)
+
 IGESSolid_Block::IGESSolid_Block ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Block.hxx b/src/IGESSolid/IGESSolid_Block.hxx
index 6193547750..492ad07f91 100644
--- a/src/IGESSolid/IGESSolid_Block.hxx
+++ b/src/IGESSolid/IGESSolid_Block.hxx
@@ -97,7 +97,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Block,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Block,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_BooleanTree.cxx b/src/IGESSolid/IGESSolid_BooleanTree.cxx
index c171fe1516..5315b1a4af 100644
--- a/src/IGESSolid/IGESSolid_BooleanTree.cxx
+++ b/src/IGESSolid/IGESSolid_BooleanTree.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_BooleanTree,IGESData_IGESEntity)
+
 IGESSolid_BooleanTree::IGESSolid_BooleanTree ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_BooleanTree.hxx b/src/IGESSolid/IGESSolid_BooleanTree.hxx
index 39cea74778..470f9aba2a 100644
--- a/src/IGESSolid/IGESSolid_BooleanTree.hxx
+++ b/src/IGESSolid/IGESSolid_BooleanTree.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_BooleanTree,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_BooleanTree,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_ConeFrustum.cxx b/src/IGESSolid/IGESSolid_ConeFrustum.cxx
index b7b1f04dca..f430d71d18 100644
--- a/src/IGESSolid/IGESSolid_ConeFrustum.cxx
+++ b/src/IGESSolid/IGESSolid_ConeFrustum.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_ConeFrustum.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_ConeFrustum,IGESData_IGESEntity)
+
 IGESSolid_ConeFrustum::IGESSolid_ConeFrustum ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_ConeFrustum.hxx b/src/IGESSolid/IGESSolid_ConeFrustum.hxx
index 74c886c052..ee9e6c19ff 100644
--- a/src/IGESSolid/IGESSolid_ConeFrustum.hxx
+++ b/src/IGESSolid/IGESSolid_ConeFrustum.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_ConeFrustum,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_ConeFrustum,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_ConicalSurface.cxx b/src/IGESSolid/IGESSolid_ConicalSurface.cxx
index d473cec509..dcc4524d9e 100644
--- a/src/IGESSolid/IGESSolid_ConicalSurface.cxx
+++ b/src/IGESSolid/IGESSolid_ConicalSurface.cxx
@@ -21,6 +21,8 @@
 #include <IGESSolid_ConicalSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_ConicalSurface,IGESData_IGESEntity)
+
 IGESSolid_ConicalSurface::IGESSolid_ConicalSurface ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_ConicalSurface.hxx b/src/IGESSolid/IGESSolid_ConicalSurface.hxx
index 7adbb5e1f3..69d1cb5c6e 100644
--- a/src/IGESSolid/IGESSolid_ConicalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ConicalSurface.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_ConicalSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_ConicalSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Cylinder.cxx b/src/IGESSolid/IGESSolid_Cylinder.cxx
index dd02bb3d3d..e87969fdb1 100644
--- a/src/IGESSolid/IGESSolid_Cylinder.cxx
+++ b/src/IGESSolid/IGESSolid_Cylinder.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_Cylinder.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Cylinder,IGESData_IGESEntity)
+
 IGESSolid_Cylinder::IGESSolid_Cylinder ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Cylinder.hxx b/src/IGESSolid/IGESSolid_Cylinder.hxx
index fc489a4e70..7b4190dd46 100644
--- a/src/IGESSolid/IGESSolid_Cylinder.hxx
+++ b/src/IGESSolid/IGESSolid_Cylinder.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Cylinder,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Cylinder,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_CylindricalSurface.cxx b/src/IGESSolid/IGESSolid_CylindricalSurface.cxx
index 15a2be76e9..7065227327 100644
--- a/src/IGESSolid/IGESSolid_CylindricalSurface.cxx
+++ b/src/IGESSolid/IGESSolid_CylindricalSurface.cxx
@@ -21,6 +21,8 @@
 #include <IGESSolid_CylindricalSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_CylindricalSurface,IGESData_IGESEntity)
+
 IGESSolid_CylindricalSurface::IGESSolid_CylindricalSurface ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_CylindricalSurface.hxx b/src/IGESSolid/IGESSolid_CylindricalSurface.hxx
index 72219dbd28..0659ae2ec7 100644
--- a/src/IGESSolid/IGESSolid_CylindricalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_CylindricalSurface.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_CylindricalSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_CylindricalSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_EdgeList.cxx b/src/IGESSolid/IGESSolid_EdgeList.cxx
index 212816bf58..c3ae8caf65 100644
--- a/src/IGESSolid/IGESSolid_EdgeList.cxx
+++ b/src/IGESSolid/IGESSolid_EdgeList.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_EdgeList,IGESData_IGESEntity)
+
 IGESSolid_EdgeList::IGESSolid_EdgeList ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_EdgeList.hxx b/src/IGESSolid/IGESSolid_EdgeList.hxx
index db29920b05..bfb1e130ea 100644
--- a/src/IGESSolid/IGESSolid_EdgeList.hxx
+++ b/src/IGESSolid/IGESSolid_EdgeList.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_EdgeList,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_EdgeList,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Ellipsoid.cxx b/src/IGESSolid/IGESSolid_Ellipsoid.cxx
index 8f0106fba7..583089c819 100644
--- a/src/IGESSolid/IGESSolid_Ellipsoid.cxx
+++ b/src/IGESSolid/IGESSolid_Ellipsoid.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_Ellipsoid.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Ellipsoid,IGESData_IGESEntity)
+
 IGESSolid_Ellipsoid::IGESSolid_Ellipsoid ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Ellipsoid.hxx b/src/IGESSolid/IGESSolid_Ellipsoid.hxx
index a69f45e09e..f5a4881641 100644
--- a/src/IGESSolid/IGESSolid_Ellipsoid.hxx
+++ b/src/IGESSolid/IGESSolid_Ellipsoid.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Ellipsoid,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Ellipsoid,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Face.cxx b/src/IGESSolid/IGESSolid_Face.cxx
index bbc9dfe15e..82c789f956 100644
--- a/src/IGESSolid/IGESSolid_Face.cxx
+++ b/src/IGESSolid/IGESSolid_Face.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Face,IGESData_IGESEntity)
+
 IGESSolid_Face::IGESSolid_Face ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Face.hxx b/src/IGESSolid/IGESSolid_Face.hxx
index 572d0d8775..9d0e6e86ac 100644
--- a/src/IGESSolid/IGESSolid_Face.hxx
+++ b/src/IGESSolid/IGESSolid_Face.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Face,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Face,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_GeneralModule.cxx b/src/IGESSolid/IGESSolid_GeneralModule.cxx
index 7b40bb0bb5..f625aba084 100644
--- a/src/IGESSolid/IGESSolid_GeneralModule.cxx
+++ b/src/IGESSolid/IGESSolid_GeneralModule.cxx
@@ -72,6 +72,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_GeneralModule,IGESData_GeneralModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESSolid/IGESSolid_GeneralModule.hxx b/src/IGESSolid/IGESSolid_GeneralModule.hxx
index 2ef635ccc4..294fc3a37d 100644
--- a/src/IGESSolid/IGESSolid_GeneralModule.hxx
+++ b/src/IGESSolid/IGESSolid_GeneralModule.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_GeneralModule,IGESData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_GeneralModule,IGESData_GeneralModule)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Loop.cxx b/src/IGESSolid/IGESSolid_Loop.cxx
index a46870b0dd..e3ab009318 100644
--- a/src/IGESSolid/IGESSolid_Loop.cxx
+++ b/src/IGESSolid/IGESSolid_Loop.cxx
@@ -27,6 +27,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Loop,IGESData_IGESEntity)
+
 IGESSolid_Loop::IGESSolid_Loop ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Loop.hxx b/src/IGESSolid/IGESSolid_Loop.hxx
index 20efa3d738..5c23329f79 100644
--- a/src/IGESSolid/IGESSolid_Loop.hxx
+++ b/src/IGESSolid/IGESSolid_Loop.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Loop,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Loop,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_ManifoldSolid.cxx b/src/IGESSolid/IGESSolid_ManifoldSolid.cxx
index 7cfc67f698..f6f3bf1d44 100644
--- a/src/IGESSolid/IGESSolid_ManifoldSolid.cxx
+++ b/src/IGESSolid/IGESSolid_ManifoldSolid.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_ManifoldSolid,IGESData_IGESEntity)
+
 IGESSolid_ManifoldSolid::IGESSolid_ManifoldSolid ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_ManifoldSolid.hxx b/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
index f9b0abdb5c..a27cb984e7 100644
--- a/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
+++ b/src/IGESSolid/IGESSolid_ManifoldSolid.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_ManifoldSolid,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_ManifoldSolid,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_PlaneSurface.cxx b/src/IGESSolid/IGESSolid_PlaneSurface.cxx
index e507d3a519..54c6c663f8 100644
--- a/src/IGESSolid/IGESSolid_PlaneSurface.cxx
+++ b/src/IGESSolid/IGESSolid_PlaneSurface.cxx
@@ -21,6 +21,8 @@
 #include <IGESSolid_PlaneSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_PlaneSurface,IGESData_IGESEntity)
+
 IGESSolid_PlaneSurface::IGESSolid_PlaneSurface ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_PlaneSurface.hxx b/src/IGESSolid/IGESSolid_PlaneSurface.hxx
index f2e0a7a87f..c4b3d661c0 100644
--- a/src/IGESSolid/IGESSolid_PlaneSurface.hxx
+++ b/src/IGESSolid/IGESSolid_PlaneSurface.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_PlaneSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_PlaneSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Protocol.cxx b/src/IGESSolid/IGESSolid_Protocol.cxx
index 34aaf53b6f..c278ff1995 100644
--- a/src/IGESSolid/IGESSolid_Protocol.cxx
+++ b/src/IGESSolid/IGESSolid_Protocol.cxx
@@ -42,6 +42,8 @@
 #include <Interface_Protocol.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Protocol,IGESData_Protocol)
+
 static int deja = 0;
 static Handle(Standard_Type) atype01,atype02,atype03,atype04,atype05,atype06,
   atype07,atype08,atype09,atype10,atype11,atype12,atype13,atype14,atype15,
diff --git a/src/IGESSolid/IGESSolid_Protocol.hxx b/src/IGESSolid/IGESSolid_Protocol.hxx
index 687c5a10c8..a259221a9a 100644
--- a/src/IGESSolid/IGESSolid_Protocol.hxx
+++ b/src/IGESSolid/IGESSolid_Protocol.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Protocol,IGESData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Protocol,IGESData_Protocol)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_ReadWriteModule.cxx b/src/IGESSolid/IGESSolid_ReadWriteModule.cxx
index 967db6c2f8..7395dd614f 100644
--- a/src/IGESSolid/IGESSolid_ReadWriteModule.cxx
+++ b/src/IGESSolid/IGESSolid_ReadWriteModule.cxx
@@ -69,6 +69,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_ReadWriteModule,IGESData_ReadWriteModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
index 61e3c8b881..0eb551d841 100644
--- a/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
+++ b/src/IGESSolid/IGESSolid_ReadWriteModule.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_ReadWriteModule,IGESData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_ReadWriteModule,IGESData_ReadWriteModule)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_RightAngularWedge.cxx b/src/IGESSolid/IGESSolid_RightAngularWedge.cxx
index 3affa83ffa..bd9c499abf 100644
--- a/src/IGESSolid/IGESSolid_RightAngularWedge.cxx
+++ b/src/IGESSolid/IGESSolid_RightAngularWedge.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_RightAngularWedge.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_RightAngularWedge,IGESData_IGESEntity)
+
 IGESSolid_RightAngularWedge::IGESSolid_RightAngularWedge ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_RightAngularWedge.hxx b/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
index db41a28bd7..60c28679c7 100644
--- a/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
+++ b/src/IGESSolid/IGESSolid_RightAngularWedge.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_RightAngularWedge,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_RightAngularWedge,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SelectedComponent.cxx b/src/IGESSolid/IGESSolid_SelectedComponent.cxx
index 9698b2a13d..96d64ad44e 100644
--- a/src/IGESSolid/IGESSolid_SelectedComponent.cxx
+++ b/src/IGESSolid/IGESSolid_SelectedComponent.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_SelectedComponent.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SelectedComponent,IGESData_IGESEntity)
+
 IGESSolid_SelectedComponent::IGESSolid_SelectedComponent ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_SelectedComponent.hxx b/src/IGESSolid/IGESSolid_SelectedComponent.hxx
index 55900f4907..71352a0367 100644
--- a/src/IGESSolid/IGESSolid_SelectedComponent.hxx
+++ b/src/IGESSolid/IGESSolid_SelectedComponent.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SelectedComponent,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SelectedComponent,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Shell.cxx b/src/IGESSolid/IGESSolid_Shell.cxx
index c833150c2a..aaecb64aa1 100644
--- a/src/IGESSolid/IGESSolid_Shell.cxx
+++ b/src/IGESSolid/IGESSolid_Shell.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Shell,IGESData_IGESEntity)
+
 IGESSolid_Shell::IGESSolid_Shell ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Shell.hxx b/src/IGESSolid/IGESSolid_Shell.hxx
index 17a9778d4f..b296c18ae2 100644
--- a/src/IGESSolid/IGESSolid_Shell.hxx
+++ b/src/IGESSolid/IGESSolid_Shell.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Shell,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Shell,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SolidAssembly.cxx b/src/IGESSolid/IGESSolid_SolidAssembly.cxx
index efea168e89..628576a068 100644
--- a/src/IGESSolid/IGESSolid_SolidAssembly.cxx
+++ b/src/IGESSolid/IGESSolid_SolidAssembly.cxx
@@ -23,6 +23,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SolidAssembly,IGESData_IGESEntity)
+
 IGESSolid_SolidAssembly::IGESSolid_SolidAssembly ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidAssembly.hxx b/src/IGESSolid/IGESSolid_SolidAssembly.hxx
index 9593647346..a5fa1266ab 100644
--- a/src/IGESSolid/IGESSolid_SolidAssembly.hxx
+++ b/src/IGESSolid/IGESSolid_SolidAssembly.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SolidAssembly,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SolidAssembly,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SolidInstance.cxx b/src/IGESSolid/IGESSolid_SolidInstance.cxx
index c127c952fd..62fedb48d6 100644
--- a/src/IGESSolid/IGESSolid_SolidInstance.cxx
+++ b/src/IGESSolid/IGESSolid_SolidInstance.cxx
@@ -20,6 +20,8 @@
 #include <IGESSolid_SolidInstance.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SolidInstance,IGESData_IGESEntity)
+
 IGESSolid_SolidInstance::IGESSolid_SolidInstance ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidInstance.hxx b/src/IGESSolid/IGESSolid_SolidInstance.hxx
index ad952c8bf0..b7901a39ed 100644
--- a/src/IGESSolid/IGESSolid_SolidInstance.hxx
+++ b/src/IGESSolid/IGESSolid_SolidInstance.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SolidInstance,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SolidInstance,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cxx b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cxx
index 055f3bd8d3..94cfdfd101 100644
--- a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cxx
+++ b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_SolidOfLinearExtrusion.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SolidOfLinearExtrusion,IGESData_IGESEntity)
+
 IGESSolid_SolidOfLinearExtrusion::IGESSolid_SolidOfLinearExtrusion ()   { }
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
index c1b929aff2..00aa5af357 100644
--- a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
+++ b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SolidOfLinearExtrusion,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SolidOfLinearExtrusion,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfRevolution.cxx b/src/IGESSolid/IGESSolid_SolidOfRevolution.cxx
index a4c25d5918..55eef08c98 100644
--- a/src/IGESSolid/IGESSolid_SolidOfRevolution.cxx
+++ b/src/IGESSolid/IGESSolid_SolidOfRevolution.cxx
@@ -24,6 +24,8 @@
 #include <IGESSolid_SolidOfRevolution.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SolidOfRevolution,IGESData_IGESEntity)
+
 IGESSolid_SolidOfRevolution::IGESSolid_SolidOfRevolution ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx b/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
index 10ebb0c7a9..d24e6113ab 100644
--- a/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
+++ b/src/IGESSolid/IGESSolid_SolidOfRevolution.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SolidOfRevolution,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SolidOfRevolution,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SpecificModule.cxx b/src/IGESSolid/IGESSolid_SpecificModule.cxx
index d792947f56..88cff12e1f 100644
--- a/src/IGESSolid/IGESSolid_SpecificModule.cxx
+++ b/src/IGESSolid/IGESSolid_SpecificModule.cxx
@@ -67,6 +67,8 @@
 #include <Message_Messenger.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SpecificModule,IGESData_SpecificModule)
+
 //  Each Module is attached to a Protocol : it must interprete Case Numbers
 //  (arguments <CN> of various methods) in accordance to values returned by
 //  the method TypeNumber from this Protocol
diff --git a/src/IGESSolid/IGESSolid_SpecificModule.hxx b/src/IGESSolid/IGESSolid_SpecificModule.hxx
index 079d925855..642adebb12 100644
--- a/src/IGESSolid/IGESSolid_SpecificModule.hxx
+++ b/src/IGESSolid/IGESSolid_SpecificModule.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SpecificModule,IGESData_SpecificModule)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SpecificModule,IGESData_SpecificModule)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Sphere.cxx b/src/IGESSolid/IGESSolid_Sphere.cxx
index 426d6ed9ab..bb87d3e7c0 100644
--- a/src/IGESSolid/IGESSolid_Sphere.cxx
+++ b/src/IGESSolid/IGESSolid_Sphere.cxx
@@ -22,6 +22,8 @@
 #include <IGESSolid_Sphere.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Sphere,IGESData_IGESEntity)
+
 IGESSolid_Sphere::IGESSolid_Sphere ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Sphere.hxx b/src/IGESSolid/IGESSolid_Sphere.hxx
index 235e0cb833..ae5cedf13f 100644
--- a/src/IGESSolid/IGESSolid_Sphere.hxx
+++ b/src/IGESSolid/IGESSolid_Sphere.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Sphere,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Sphere,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_SphericalSurface.cxx b/src/IGESSolid/IGESSolid_SphericalSurface.cxx
index 24ffc7e522..352eb2f928 100644
--- a/src/IGESSolid/IGESSolid_SphericalSurface.cxx
+++ b/src/IGESSolid/IGESSolid_SphericalSurface.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_SphericalSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SphericalSurface,IGESData_IGESEntity)
+
 IGESSolid_SphericalSurface::IGESSolid_SphericalSurface ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_SphericalSurface.hxx b/src/IGESSolid/IGESSolid_SphericalSurface.hxx
index 9ffd749291..62eb85b9f7 100644
--- a/src/IGESSolid/IGESSolid_SphericalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_SphericalSurface.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_SphericalSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_SphericalSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_ToroidalSurface.cxx b/src/IGESSolid/IGESSolid_ToroidalSurface.cxx
index 95fa4723eb..bf07535bb8 100644
--- a/src/IGESSolid/IGESSolid_ToroidalSurface.cxx
+++ b/src/IGESSolid/IGESSolid_ToroidalSurface.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_ToroidalSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_ToroidalSurface,IGESData_IGESEntity)
+
 IGESSolid_ToroidalSurface::IGESSolid_ToroidalSurface ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_ToroidalSurface.hxx b/src/IGESSolid/IGESSolid_ToroidalSurface.hxx
index cab5a2b000..0f8dd539b5 100644
--- a/src/IGESSolid/IGESSolid_ToroidalSurface.hxx
+++ b/src/IGESSolid/IGESSolid_ToroidalSurface.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_ToroidalSurface,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_ToroidalSurface,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_Torus.cxx b/src/IGESSolid/IGESSolid_Torus.cxx
index 3653d42f3e..f2490cbc26 100644
--- a/src/IGESSolid/IGESSolid_Torus.cxx
+++ b/src/IGESSolid/IGESSolid_Torus.cxx
@@ -23,6 +23,8 @@
 #include <IGESSolid_Torus.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_Torus,IGESData_IGESEntity)
+
 IGESSolid_Torus::IGESSolid_Torus ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_Torus.hxx b/src/IGESSolid/IGESSolid_Torus.hxx
index ee17f17a65..a43e359c1a 100644
--- a/src/IGESSolid/IGESSolid_Torus.hxx
+++ b/src/IGESSolid/IGESSolid_Torus.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_Torus,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_Torus,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESSolid/IGESSolid_VertexList.cxx b/src/IGESSolid/IGESSolid_VertexList.cxx
index 22d46dce1b..fdc89cfc76 100644
--- a/src/IGESSolid/IGESSolid_VertexList.cxx
+++ b/src/IGESSolid/IGESSolid_VertexList.cxx
@@ -22,6 +22,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_VertexList,IGESData_IGESEntity)
+
 IGESSolid_VertexList::IGESSolid_VertexList ()    {  }
 
 
diff --git a/src/IGESSolid/IGESSolid_VertexList.hxx b/src/IGESSolid/IGESSolid_VertexList.hxx
index 6f98527a30..d8f0ed8d94 100644
--- a/src/IGESSolid/IGESSolid_VertexList.hxx
+++ b/src/IGESSolid/IGESSolid_VertexList.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESSolid_VertexList,IGESData_IGESEntity)
+  DEFINE_STANDARD_RTTIEXT(IGESSolid_VertexList,IGESData_IGESEntity)
 
 protected:
 
diff --git a/src/IGESToBRep/IGESToBRep_Actor.cxx b/src/IGESToBRep/IGESToBRep_Actor.cxx
index 2296d3c095..ac79cedfc4 100644
--- a/src/IGESToBRep/IGESToBRep_Actor.cxx
+++ b/src/IGESToBRep/IGESToBRep_Actor.cxx
@@ -37,6 +37,8 @@
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESToBRep_Actor,Transfer_ActorOfTransientProcess)
+
 //=======================================================================
 //function : IGESToBRep_Actor
 //purpose  : 
diff --git a/src/IGESToBRep/IGESToBRep_Actor.hxx b/src/IGESToBRep/IGESToBRep_Actor.hxx
index 6c0c008c53..d2c4d6d5dd 100644
--- a/src/IGESToBRep/IGESToBRep_Actor.hxx
+++ b/src/IGESToBRep/IGESToBRep_Actor.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESToBRep_Actor,Transfer_ActorOfTransientProcess)
+  DEFINE_STANDARD_RTTIEXT(IGESToBRep_Actor,Transfer_ActorOfTransientProcess)
 
 protected:
 
diff --git a/src/IGESToBRep/IGESToBRep_AlgoContainer.cxx b/src/IGESToBRep/IGESToBRep_AlgoContainer.cxx
index 90dc5ebfcb..103f050d4a 100644
--- a/src/IGESToBRep/IGESToBRep_AlgoContainer.cxx
+++ b/src/IGESToBRep/IGESToBRep_AlgoContainer.cxx
@@ -18,6 +18,8 @@
 #include <IGESToBRep_ToolContainer.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESToBRep_AlgoContainer,MMgt_TShared)
+
 //=======================================================================
 //function : IGESToBRep_AlgoContainer
 //purpose  : 
diff --git a/src/IGESToBRep/IGESToBRep_AlgoContainer.hxx b/src/IGESToBRep/IGESToBRep_AlgoContainer.hxx
index 8440ac2a17..e3ffa1443d 100644
--- a/src/IGESToBRep/IGESToBRep_AlgoContainer.hxx
+++ b/src/IGESToBRep/IGESToBRep_AlgoContainer.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESToBRep_AlgoContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESToBRep_AlgoContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx b/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
index 89787b6dae..3dc90d40f5 100644
--- a/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
+++ b/src/IGESToBRep/IGESToBRep_IGESBoundary.cxx
@@ -37,6 +37,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESToBRep_IGESBoundary,MMgt_TShared)
+
 //=======================================================================
 //function : IGESToBRep_IGESBoundary
 //purpose  : 
diff --git a/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx b/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
index dd274d8b26..f314f89b50 100644
--- a/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
+++ b/src/IGESToBRep/IGESToBRep_IGESBoundary.hxx
@@ -120,7 +120,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESToBRep_IGESBoundary,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESToBRep_IGESBoundary,MMgt_TShared)
 
 protected:
 
diff --git a/src/IGESToBRep/IGESToBRep_ToolContainer.cxx b/src/IGESToBRep/IGESToBRep_ToolContainer.cxx
index e76ee26d11..5fdabf9485 100644
--- a/src/IGESToBRep/IGESToBRep_ToolContainer.cxx
+++ b/src/IGESToBRep/IGESToBRep_ToolContainer.cxx
@@ -18,6 +18,8 @@
 #include <IGESToBRep_ToolContainer.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IGESToBRep_ToolContainer,MMgt_TShared)
+
 //=======================================================================
 //function : IGESToBRep_ToolContainer
 //purpose  : 
diff --git a/src/IGESToBRep/IGESToBRep_ToolContainer.hxx b/src/IGESToBRep/IGESToBRep_ToolContainer.hxx
index 316b41688e..c0b7cfa12d 100644
--- a/src/IGESToBRep/IGESToBRep_ToolContainer.hxx
+++ b/src/IGESToBRep/IGESToBRep_ToolContainer.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IGESToBRep_ToolContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IGESToBRep_ToolContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/IVtk/IVtk_IShape.cxx b/src/IVtk/IVtk_IShape.cxx
index 35c394ede1..d64794b819 100644
--- a/src/IVtk/IVtk_IShape.cxx
+++ b/src/IVtk/IVtk_IShape.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_IShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_IShape,IVtk_Interface)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_IShape.hxx b/src/IVtk/IVtk_IShape.hxx
index 769b59b98e..fa329d08c2 100644
--- a/src/IVtk/IVtk_IShape.hxx
+++ b/src/IVtk/IVtk_IShape.hxx
@@ -38,7 +38,7 @@ public:
   //! Get ids of sub-shapes composing a sub-shape with the given id
   virtual IVtk_ShapeIdList GetSubIds (const IVtk_IdType theId) const = 0;
 
-  DEFINE_STANDARD_RTTI(IVtk_IShape, IVtk_Interface)
+  DEFINE_STANDARD_RTTIEXT(IVtk_IShape,IVtk_Interface)
 
 private:
   IVtk_IdType myId;
diff --git a/src/IVtk/IVtk_IShapeData.cxx b/src/IVtk/IVtk_IShapeData.cxx
index a3c47e6f23..e9703a0913 100644
--- a/src/IVtk/IVtk_IShapeData.cxx
+++ b/src/IVtk/IVtk_IShapeData.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_IShapeData.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_IShapeData,IVtk_Interface)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_IShapeData.hxx b/src/IVtk/IVtk_IShapeData.hxx
index 50bf820c96..f6e7c6be19 100644
--- a/src/IVtk/IVtk_IShapeData.hxx
+++ b/src/IVtk/IVtk_IShapeData.hxx
@@ -31,7 +31,7 @@ public:
 
   virtual ~IVtk_IShapeData() { }
 
-  DEFINE_STANDARD_RTTI(IVtk_IShapeData, IVtk_Interface)
+  DEFINE_STANDARD_RTTIEXT(IVtk_IShapeData,IVtk_Interface)
 
   //! Insert a coordinate
   //! @param [in] theX X coordinate
diff --git a/src/IVtk/IVtk_IShapeMesher.cxx b/src/IVtk/IVtk_IShapeMesher.cxx
index a14f2e1e05..661ede60de 100644
--- a/src/IVtk/IVtk_IShapeMesher.cxx
+++ b/src/IVtk/IVtk_IShapeMesher.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_IShapeMesher.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_IShapeMesher,IVtk_Interface)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_IShapeMesher.hxx b/src/IVtk/IVtk_IShapeMesher.hxx
index 4259e8b8d7..6f740b436b 100644
--- a/src/IVtk/IVtk_IShapeMesher.hxx
+++ b/src/IVtk/IVtk_IShapeMesher.hxx
@@ -33,7 +33,7 @@ public:
 
   Standard_EXPORT void Build (const IVtk_IShape::Handle& theShape, const IVtk_IShapeData::Handle& theData);
 
-  DEFINE_STANDARD_RTTI(IVtk_IShapeMesher, IVtk_Interface)
+  DEFINE_STANDARD_RTTIEXT(IVtk_IShapeMesher,IVtk_Interface)
 
 protected:
   Standard_EXPORT virtual void initialize (const IVtk_IShape::Handle&     theShapeObj,
diff --git a/src/IVtk/IVtk_IShapePickerAlgo.cxx b/src/IVtk/IVtk_IShapePickerAlgo.cxx
index fd1b9056ff..e1a6e16784 100644
--- a/src/IVtk/IVtk_IShapePickerAlgo.cxx
+++ b/src/IVtk/IVtk_IShapePickerAlgo.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_IShapePickerAlgo.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_IShapePickerAlgo,IVtk_Interface)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_IShapePickerAlgo.hxx b/src/IVtk/IVtk_IShapePickerAlgo.hxx
index d7d348cdf2..f0b7bf3621 100644
--- a/src/IVtk/IVtk_IShapePickerAlgo.hxx
+++ b/src/IVtk/IVtk_IShapePickerAlgo.hxx
@@ -31,7 +31,7 @@ public:
 
   virtual ~IVtk_IShapePickerAlgo() { }
 
-  DEFINE_STANDARD_RTTI(IVtk_IShapePickerAlgo, IVtk_Interface)
+  DEFINE_STANDARD_RTTIEXT(IVtk_IShapePickerAlgo,IVtk_Interface)
 
   virtual void SetView (const IVtk_IView::Handle& theView) = 0;
   virtual int  NbPicked() = 0;
diff --git a/src/IVtk/IVtk_IView.cxx b/src/IVtk/IVtk_IView.cxx
index 59c1968ccc..05e3369eee 100644
--- a/src/IVtk/IVtk_IView.cxx
+++ b/src/IVtk/IVtk_IView.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_IView.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_IView,IVtk_Interface)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_IView.hxx b/src/IVtk/IVtk_IView.hxx
index 8ba72bcd07..83a5d2c5b7 100644
--- a/src/IVtk/IVtk_IView.hxx
+++ b/src/IVtk/IVtk_IView.hxx
@@ -88,7 +88,7 @@ public:
                                Standard_Real& theWidth,
                                Standard_Real& theHeight) const = 0;
 
-  DEFINE_STANDARD_RTTI(IVtk_IView, IVtk_Interface)
+  DEFINE_STANDARD_RTTIEXT(IVtk_IView,IVtk_Interface)
 };
 
 #endif // __IVTK_IVIEW_H__
diff --git a/src/IVtk/IVtk_Interface.cxx b/src/IVtk/IVtk_Interface.cxx
index 956d5edd3b..e2ecb3cd13 100644
--- a/src/IVtk/IVtk_Interface.cxx
+++ b/src/IVtk/IVtk_Interface.cxx
@@ -15,6 +15,8 @@
 
 #include <IVtk_Interface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtk_Interface,Standard_Transient)
+
 // Handle implementation
 
 
diff --git a/src/IVtk/IVtk_Interface.hxx b/src/IVtk/IVtk_Interface.hxx
index 3f4f5c736d..f59a030554 100644
--- a/src/IVtk/IVtk_Interface.hxx
+++ b/src/IVtk/IVtk_Interface.hxx
@@ -33,7 +33,7 @@ class IVtk_Interface : public Standard_Transient
 
 public:
   typedef Handle(IVtk_Interface) Handle;
-  DEFINE_STANDARD_RTTI(IVtk_Interface, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(IVtk_Interface,Standard_Transient)
 
   virtual ~IVtk_Interface() { }
 };
diff --git a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx
index c8f60acc8f..f2275f308e 100644
--- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx
+++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx
@@ -28,6 +28,8 @@
 #include <IVtkTools_ShapeObject.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkDraw_HighlightAndSelectionPipeline,Standard_Transient)
+
 //===========================================================
 // Function : Constructor
 // Purpose  :
diff --git a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
index d667b3f651..863de75227 100644
--- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
+++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
@@ -41,7 +41,7 @@ class IVtkDraw_HighlightAndSelectionPipeline : public Standard_Transient
 {
 public:
 
-  DEFINE_STANDARD_RTTI(IVtkDraw_HighlightAndSelectionPipeline, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(IVtkDraw_HighlightAndSelectionPipeline,Standard_Transient)
 
 public:
 
diff --git a/src/IVtkOCC/IVtkOCC_SelectableObject.cxx b/src/IVtkOCC/IVtkOCC_SelectableObject.cxx
index 50ea5232fe..43fb63e867 100644
--- a/src/IVtkOCC/IVtkOCC_SelectableObject.cxx
+++ b/src/IVtkOCC/IVtkOCC_SelectableObject.cxx
@@ -23,6 +23,8 @@
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <TopoDS_Iterator.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkOCC_SelectableObject,SelectMgr_SelectableObject)
+
 // Handle implementation
 
 
diff --git a/src/IVtkOCC/IVtkOCC_SelectableObject.hxx b/src/IVtkOCC/IVtkOCC_SelectableObject.hxx
index d515cf2843..9ce46eb0f3 100644
--- a/src/IVtkOCC/IVtkOCC_SelectableObject.hxx
+++ b/src/IVtkOCC/IVtkOCC_SelectableObject.hxx
@@ -46,7 +46,7 @@ public:
   //! Returns bounding box of object
   Standard_EXPORT virtual void BoundingBox (Bnd_Box& theBndBox) Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(IVtkOCC_SelectableObject, SelectMgr_SelectableObject)
+  DEFINE_STANDARD_RTTIEXT(IVtkOCC_SelectableObject,SelectMgr_SelectableObject)
 
 private: 
 
diff --git a/src/IVtkOCC/IVtkOCC_Shape.cxx b/src/IVtkOCC/IVtkOCC_Shape.cxx
index 602d9bd3f3..fd12c1db86 100644
--- a/src/IVtkOCC/IVtkOCC_Shape.cxx
+++ b/src/IVtkOCC/IVtkOCC_Shape.cxx
@@ -16,6 +16,8 @@
 #include <IVtkOCC_Shape.hxx>
 #include <TopExp.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkOCC_Shape,IVtk_IShape)
+
 // Handle implementation
 
 
diff --git a/src/IVtkOCC/IVtkOCC_Shape.hxx b/src/IVtkOCC/IVtkOCC_Shape.hxx
index 44ae5f9b03..e87027d27e 100644
--- a/src/IVtkOCC/IVtkOCC_Shape.hxx
+++ b/src/IVtkOCC/IVtkOCC_Shape.hxx
@@ -40,7 +40,7 @@ public:
 
   IVtk_IdType GetSubShapeId (const IVtk_IShape::Handle&) const;
 
-  DEFINE_STANDARD_RTTI(IVtkOCC_Shape, IVtk_IShape)
+  DEFINE_STANDARD_RTTIEXT(IVtkOCC_Shape,IVtk_IShape)
 
   //! Get the wrapped original OCCT shape
   //! @return TopoDS_Shape the wrapped original OCCT shape
diff --git a/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx b/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx
index 6b8dcbc059..edd8b34823 100644
--- a/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx
+++ b/src/IVtkOCC/IVtkOCC_ShapeMesher.cxx
@@ -46,6 +46,8 @@
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkOCC_ShapeMesher,IVtk_IShapeMesher)
+
 // Handle implementation
 
 
diff --git a/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx b/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx
index ae9c213293..9c05a68e71 100644
--- a/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx
+++ b/src/IVtkOCC/IVtkOCC_ShapeMesher.hxx
@@ -179,7 +179,7 @@ private:
   //! Get the IShape as OCC implementation
   const IVtkOCC_Shape::Handle GetShapeObj() const;
 
-  DEFINE_STANDARD_RTTI(IVtkOCC_ShapeMesher, IVtk_IShapeMesher)
+  DEFINE_STANDARD_RTTIEXT(IVtkOCC_ShapeMesher,IVtk_IShapeMesher)
 
 private:
   IVtk_ShapeTypeMap     myEdgesTypes;
diff --git a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx
index 0648234e1a..b3c08bd681 100644
--- a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx
+++ b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx
@@ -21,6 +21,8 @@
 #include <Message_Messenger.hxx>
 #include <StdSelect_BRepOwner.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkOCC_ShapePickerAlgo,IVtk_IShapePickerAlgo)
+
 // Handle implementation
 
 
diff --git a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx
index 924962fbb9..2477e74e9f 100644
--- a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx
+++ b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.hxx
@@ -96,7 +96,7 @@ public: //! @name Obtain picking results
 
 public:
 
-  DEFINE_STANDARD_RTTI(IVtkOCC_ShapePickerAlgo, IVtk_IShapePickerAlgo)
+  DEFINE_STANDARD_RTTIEXT(IVtkOCC_ShapePickerAlgo,IVtk_IShapePickerAlgo)
 
 private:
 
diff --git a/src/IVtkOCC/IVtkOCC_ViewerSelector.cxx b/src/IVtkOCC/IVtkOCC_ViewerSelector.cxx
index c485caa3bd..68c1a9d720 100644
--- a/src/IVtkOCC/IVtkOCC_ViewerSelector.cxx
+++ b/src/IVtkOCC/IVtkOCC_ViewerSelector.cxx
@@ -20,6 +20,8 @@
 #include <Graphic3d_Camera.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkOCC_ViewerSelector,SelectMgr_ViewerSelector)
+
 //============================================================================
 // Method:  Constructor
 // Purpose:
diff --git a/src/IVtkOCC/IVtkOCC_ViewerSelector.hxx b/src/IVtkOCC/IVtkOCC_ViewerSelector.hxx
index a03fdda9a3..dd44bce24b 100644
--- a/src/IVtkOCC/IVtkOCC_ViewerSelector.hxx
+++ b/src/IVtkOCC/IVtkOCC_ViewerSelector.hxx
@@ -56,7 +56,7 @@ public:
   //! Deactivate the given selection
   void Deactivate (const Handle(SelectMgr_Selection)& theSelection);
 
-  DEFINE_STANDARD_RTTI(IVtkOCC_ViewerSelector, SelectMgr_ViewerSelector)
+  DEFINE_STANDARD_RTTIEXT(IVtkOCC_ViewerSelector,SelectMgr_ViewerSelector)
 
 private:
   Standard_Integer myPixTol;
diff --git a/src/IVtkVTK/IVtkVTK_ShapeData.cxx b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
index 258cee1118..5714595c9e 100644
--- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx
+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx
@@ -21,6 +21,8 @@
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)
+
 const char* const IVtkVTK_ShapeData::ARRNAME_SUBSHAPE_IDS = "SUBSHAPE_IDS";
 
 const char* const IVtkVTK_ShapeData::ARRNAME_MESH_TYPES   = "MESH_TYPES";
diff --git a/src/IVtkVTK/IVtkVTK_ShapeData.hxx b/src/IVtkVTK/IVtkVTK_ShapeData.hxx
index ee99eea05d..889381d49c 100644
--- a/src/IVtkVTK/IVtkVTK_ShapeData.hxx
+++ b/src/IVtkVTK/IVtkVTK_ShapeData.hxx
@@ -55,7 +55,7 @@ public:
   //! Destructor
   Standard_EXPORT ~IVtkVTK_ShapeData();
 
-  DEFINE_STANDARD_RTTI(IVtkVTK_ShapeData, IVtk_IShapeData)
+  DEFINE_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)
 
   //! Insert a coordinate
   //! @param [in] theX X coordinate
diff --git a/src/IVtkVTK/IVtkVTK_View.cxx b/src/IVtkVTK/IVtkVTK_View.cxx
index ebdf7b4882..dfd3cb7b15 100644
--- a/src/IVtkVTK/IVtkVTK_View.cxx
+++ b/src/IVtkVTK/IVtkVTK_View.cxx
@@ -21,6 +21,8 @@
 #include <vtkRenderWindow.h>
 #include <vtkTransform.h>
 
+IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_View,IVtk_IView)
+
 // Initialization of VTK object factories.
 // Since VTK 6 the factory methods require "auto-initialization" depending on
 // what modules are enabled at VTK configure time.
diff --git a/src/IVtkVTK/IVtkVTK_View.hxx b/src/IVtkVTK/IVtkVTK_View.hxx
index 6f86eb661b..39ddc9dae4 100644
--- a/src/IVtkVTK/IVtkVTK_View.hxx
+++ b/src/IVtkVTK/IVtkVTK_View.hxx
@@ -89,7 +89,7 @@ public:
   //! @return true if conversion was successful, false otherwise
   Standard_EXPORT virtual bool    DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldPnt) const;
 
-  DEFINE_STANDARD_RTTI(IVtkVTK_View, IVtk_IView)
+  DEFINE_STANDARD_RTTIEXT(IVtkVTK_View,IVtk_IView)
 
 private:
   vtkRenderer* myRenderer;
diff --git a/src/Image/Image_AlienPixMap.hxx b/src/Image/Image_AlienPixMap.hxx
index f021b9dd88..7ef3b97e9e 100644
--- a/src/Image/Image_AlienPixMap.hxx
+++ b/src/Image/Image_AlienPixMap.hxx
@@ -90,7 +90,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Image_AlienPixMap, Image_PixMap) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Image_AlienPixMap,Image_PixMap) // Type definition
 
 };
 
diff --git a/src/Image/Image_Diff.cxx b/src/Image/Image_Diff.cxx
index a4ca767384..fa2c607846 100644
--- a/src/Image/Image_Diff.cxx
+++ b/src/Image/Image_Diff.cxx
@@ -21,6 +21,8 @@
 #include <cstdlib>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Image_Diff,Standard_Transient)
+
 //! POD structure for packed RGB color value (3 bytes)
 struct Image_ColorXXX24
 {
diff --git a/src/Image/Image_Diff.hxx b/src/Image/Image_Diff.hxx
index 4d825c45bf..548c6ba9e9 100644
--- a/src/Image/Image_Diff.hxx
+++ b/src/Image/Image_Diff.hxx
@@ -129,7 +129,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Image_Diff, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Image_Diff,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Image/Image_PixMap.cxx b/src/Image/Image_PixMap.cxx
index 31d41ee446..6731430678 100644
--- a/src/Image/Image_PixMap.cxx
+++ b/src/Image/Image_PixMap.cxx
@@ -22,6 +22,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Image_PixMap,Standard_Transient)
+
 // =======================================================================
 // function : Image_PixMap
 // purpose  :
diff --git a/src/Image/Image_PixMap.hxx b/src/Image/Image_PixMap.hxx
index 1d381861c3..73ce92bca1 100644
--- a/src/Image/Image_PixMap.hxx
+++ b/src/Image/Image_PixMap.hxx
@@ -279,7 +279,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Image_PixMap, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(Image_PixMap,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/Image/Image_PixMapData.hxx b/src/Image/Image_PixMapData.hxx
index ac3c61e46b..e2bccbbdf3 100644
--- a/src/Image/Image_PixMapData.hxx
+++ b/src/Image/Image_PixMapData.hxx
@@ -127,7 +127,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Image_PixMapData, NCollection_Buffer) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(Image_PixMapData,NCollection_Buffer) // Type definition
 
 };
 
diff --git a/src/IntPatch/IntPatch_ALine.cxx b/src/IntPatch/IntPatch_ALine.cxx
index e68853b199..e386e106bf 100644
--- a/src/IntPatch/IntPatch_ALine.cxx
+++ b/src/IntPatch/IntPatch_ALine.cxx
@@ -24,6 +24,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_ALine,IntPatch_Line)
+
 #define DEBUG 0
 
 IntPatch_ALine::IntPatch_ALine (const IntAna_Curve& C,
diff --git a/src/IntPatch/IntPatch_ALine.hxx b/src/IntPatch/IntPatch_ALine.hxx
index 273dadd265..a2e4c7d116 100644
--- a/src/IntPatch/IntPatch_ALine.hxx
+++ b/src/IntPatch/IntPatch_ALine.hxx
@@ -137,7 +137,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_ALine,IntPatch_Line)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_ALine,IntPatch_Line)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_GLine.cxx b/src/IntPatch/IntPatch_GLine.cxx
index eb8b8440bc..96a41a97f2 100644
--- a/src/IntPatch/IntPatch_GLine.cxx
+++ b/src/IntPatch/IntPatch_GLine.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_GLine,IntPatch_Line)
+
 #define DEBUG 0
 
 //  modified by Edward AGAPOV (eap) Wed Mar 6 2002 (bug occ212)
diff --git a/src/IntPatch/IntPatch_GLine.hxx b/src/IntPatch/IntPatch_GLine.hxx
index b1d49330f4..8a524b4771 100644
--- a/src/IntPatch/IntPatch_GLine.hxx
+++ b/src/IntPatch/IntPatch_GLine.hxx
@@ -175,7 +175,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_GLine,IntPatch_Line)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_GLine,IntPatch_Line)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
index 49cb16b73e..1b906fbec1 100644
--- a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
+++ b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx
@@ -28,6 +28,7 @@
 #include <Geom_Ellipse.hxx>
 #include <Geom_Parabola.hxx>
 #include <Geom_Hyperbola.hxx>
+#include <IntPatch_ALine.hxx>
 
 
 static void PutPointsOnLine(const Handle(Adaptor3d_HSurface)& S1,
diff --git a/src/IntPatch/IntPatch_Line.cxx b/src/IntPatch/IntPatch_Line.cxx
index 2f773f3062..f40c7112f2 100644
--- a/src/IntPatch/IntPatch_Line.cxx
+++ b/src/IntPatch/IntPatch_Line.cxx
@@ -18,6 +18,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_Line,MMgt_TShared)
+
 IntPatch_Line::IntPatch_Line (const Standard_Boolean Tang,
 			      const IntSurf_TypeTrans Trans1,
 			      const IntSurf_TypeTrans Trans2):
diff --git a/src/IntPatch/IntPatch_Line.hxx b/src/IntPatch/IntPatch_Line.hxx
index 5bb0724354..bdd072bf37 100644
--- a/src/IntPatch/IntPatch_Line.hxx
+++ b/src/IntPatch/IntPatch_Line.hxx
@@ -114,7 +114,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_Line,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_Line,MMgt_TShared)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_PointLine.cxx b/src/IntPatch/IntPatch_PointLine.cxx
index 75766772e5..5109061cc8 100644
--- a/src/IntPatch/IntPatch_PointLine.cxx
+++ b/src/IntPatch/IntPatch_PointLine.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_PointLine,IntPatch_Line)
+
 IntPatch_PointLine::IntPatch_PointLine (const Standard_Boolean Tang,
                                         const IntSurf_TypeTrans Trans1,
                                         const IntSurf_TypeTrans Trans2) : 
diff --git a/src/IntPatch/IntPatch_PointLine.hxx b/src/IntPatch/IntPatch_PointLine.hxx
index b521925b6b..8d0a4dc11b 100644
--- a/src/IntPatch/IntPatch_PointLine.hxx
+++ b/src/IntPatch/IntPatch_PointLine.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_PointLine,IntPatch_Line)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_PointLine,IntPatch_Line)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_RLine.cxx b/src/IntPatch/IntPatch_RLine.cxx
index 207da3cf56..fea931de7e 100644
--- a/src/IntPatch/IntPatch_RLine.cxx
+++ b/src/IntPatch/IntPatch_RLine.cxx
@@ -25,6 +25,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_RLine,IntPatch_PointLine)
+
 IntPatch_RLine::IntPatch_RLine (const Standard_Boolean Tang,
                                 const IntSurf_TypeTrans Trans1,
                                 const IntSurf_TypeTrans Trans2) :
diff --git a/src/IntPatch/IntPatch_RLine.hxx b/src/IntPatch/IntPatch_RLine.hxx
index b701883ef1..93b1edf943 100644
--- a/src/IntPatch/IntPatch_RLine.hxx
+++ b/src/IntPatch/IntPatch_RLine.hxx
@@ -142,7 +142,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_RLine,IntPatch_PointLine)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_RLine,IntPatch_PointLine)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_TheIWLineOfTheIWalking.hxx b/src/IntPatch/IntPatch_TheIWLineOfTheIWalking.hxx
index 23113f9f4b..84b23982b0 100644
--- a/src/IntPatch/IntPatch_TheIWLineOfTheIWalking.hxx
+++ b/src/IntPatch/IntPatch_TheIWLineOfTheIWalking.hxx
@@ -143,7 +143,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_TheIWLineOfTheIWalking,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(IntPatch_TheIWLineOfTheIWalking,MMgt_TShared)
 
 protected:
 
diff --git a/src/IntPatch/IntPatch_WLine.cxx b/src/IntPatch/IntPatch_WLine.cxx
index 0a8094d8ff..67046f6f9d 100644
--- a/src/IntPatch/IntPatch_WLine.cxx
+++ b/src/IntPatch/IntPatch_WLine.cxx
@@ -26,6 +26,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntPatch_WLine,IntPatch_PointLine)
+
 #define DEBUG 0
 #define DEBUGV 0
 
diff --git a/src/IntPatch/IntPatch_WLine.hxx b/src/IntPatch/IntPatch_WLine.hxx
index a640aa0515..60d50a9df3 100644
--- a/src/IntPatch/IntPatch_WLine.hxx
+++ b/src/IntPatch/IntPatch_WLine.hxx
@@ -164,7 +164,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntPatch_WLine,IntPatch_PointLine)
+  DEFINE_STANDARD_RTTIEXT(IntPatch_WLine,IntPatch_PointLine)
 
 protected:
 
diff --git a/src/IntStart/IntStart_SITopolTool.cxx b/src/IntStart/IntStart_SITopolTool.cxx
index 6ba55f42be..9d0743341a 100644
--- a/src/IntStart/IntStart_SITopolTool.cxx
+++ b/src/IntStart/IntStart_SITopolTool.cxx
@@ -16,3 +16,5 @@
 #include <gp_Pnt2d.hxx>
 #include <IntStart_SITopolTool.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(IntStart_SITopolTool,MMgt_TShared)
\ No newline at end of file
diff --git a/src/IntStart/IntStart_SITopolTool.hxx b/src/IntStart/IntStart_SITopolTool.hxx
index 362527bb30..fe0672a294 100644
--- a/src/IntStart/IntStart_SITopolTool.hxx
+++ b/src/IntStart/IntStart_SITopolTool.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntStart_SITopolTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IntStart_SITopolTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/IntSurf/IntSurf_LineOn2S.cxx b/src/IntSurf/IntSurf_LineOn2S.cxx
index 17bb3843d6..6ac65cf3cb 100644
--- a/src/IntSurf/IntSurf_LineOn2S.cxx
+++ b/src/IntSurf/IntSurf_LineOn2S.cxx
@@ -18,6 +18,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntSurf_LineOn2S,MMgt_TShared)
+
 IntSurf_LineOn2S::IntSurf_LineOn2S (const IntSurf_Allocator& theAllocator) :
     mySeq (theAllocator)
 {}
diff --git a/src/IntSurf/IntSurf_LineOn2S.hxx b/src/IntSurf/IntSurf_LineOn2S.hxx
index 9e8717e38e..eed0dbc39d 100644
--- a/src/IntSurf/IntSurf_LineOn2S.hxx
+++ b/src/IntSurf/IntSurf_LineOn2S.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntSurf_LineOn2S,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IntSurf_LineOn2S,MMgt_TShared)
 
 protected:
 
diff --git a/src/IntTools/IntTools_Context.cxx b/src/IntTools/IntTools_Context.cxx
index 7c09b67135..48d54501b6 100644
--- a/src/IntTools/IntTools_Context.cxx
+++ b/src/IntTools/IntTools_Context.cxx
@@ -46,6 +46,8 @@
 #include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntTools_Context,MMgt_TShared)
+
 // 
 //=======================================================================
 //function : 
diff --git a/src/IntTools/IntTools_Context.hxx b/src/IntTools/IntTools_Context.hxx
index dc4a2eda84..80c13490d9 100644
--- a/src/IntTools/IntTools_Context.hxx
+++ b/src/IntTools/IntTools_Context.hxx
@@ -217,7 +217,7 @@ Standard_EXPORT virtual  ~IntTools_Context();
 
 
 
-  DEFINE_STANDARD_RTTI(IntTools_Context,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(IntTools_Context,MMgt_TShared)
 
 protected:
 
diff --git a/src/IntTools/IntTools_TopolTool.cxx b/src/IntTools/IntTools_TopolTool.cxx
index e219b588a2..37e896f5e4 100644
--- a/src/IntTools/IntTools_TopolTool.cxx
+++ b/src/IntTools/IntTools_TopolTool.cxx
@@ -28,6 +28,8 @@
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(IntTools_TopolTool,Adaptor3d_TopolTool)
+
 static void Analyse(const TColgp_Array2OfPnt& array2,
 		    Standard_Integer&         theNbSamplesU,
 		    Standard_Integer&         theNbSamplesV);
diff --git a/src/IntTools/IntTools_TopolTool.hxx b/src/IntTools/IntTools_TopolTool.hxx
index fa5dc2e62f..359383e5d1 100644
--- a/src/IntTools/IntTools_TopolTool.hxx
+++ b/src/IntTools/IntTools_TopolTool.hxx
@@ -90,7 +90,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(IntTools_TopolTool,Adaptor3d_TopolTool)
+  DEFINE_STANDARD_RTTIEXT(IntTools_TopolTool,Adaptor3d_TopolTool)
 
 protected:
 
diff --git a/src/Interface/Interface_Check.cxx b/src/Interface/Interface_Check.cxx
index 5f891181c3..f82375762b 100644
--- a/src/Interface/Interface_Check.cxx
+++ b/src/Interface/Interface_Check.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_Check,MMgt_TShared)
+
 // Un Check est cree au depart sans liste de message : celle ci est creee
 // seulement si au moins une erreur doit y etre enregitree (Fail-Warning)
 //=======================================================================
diff --git a/src/Interface/Interface_Check.hxx b/src/Interface/Interface_Check.hxx
index 73f5ca2a69..4429eb61aa 100644
--- a/src/Interface/Interface_Check.hxx
+++ b/src/Interface/Interface_Check.hxx
@@ -244,7 +244,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_Check,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_Check,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_CopyControl.cxx b/src/Interface/Interface_CopyControl.cxx
index 3aebe4e650..6e34d376cb 100644
--- a/src/Interface/Interface_CopyControl.cxx
+++ b/src/Interface/Interface_CopyControl.cxx
@@ -16,3 +16,5 @@
 #include <Interface_InterfaceError.hxx>
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Interface_CopyControl,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Interface/Interface_CopyControl.hxx b/src/Interface/Interface_CopyControl.hxx
index a289192e2d..666de642c3 100644
--- a/src/Interface/Interface_CopyControl.hxx
+++ b/src/Interface/Interface_CopyControl.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_CopyControl,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_CopyControl,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_CopyMap.cxx b/src/Interface/Interface_CopyMap.cxx
index 8e9e71e6b5..803a4aca37 100644
--- a/src/Interface/Interface_CopyMap.cxx
+++ b/src/Interface/Interface_CopyMap.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_CopyMap,Interface_CopyControl)
+
 //  CopyMap : rien de plus qu une Map passive
 Interface_CopyMap::Interface_CopyMap
   (const Handle(Interface_InterfaceModel)& amodel)
diff --git a/src/Interface/Interface_CopyMap.hxx b/src/Interface/Interface_CopyMap.hxx
index 3ee7cc384c..a3b838f34a 100644
--- a/src/Interface/Interface_CopyMap.hxx
+++ b/src/Interface/Interface_CopyMap.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_CopyMap,Interface_CopyControl)
+  DEFINE_STANDARD_RTTIEXT(Interface_CopyMap,Interface_CopyControl)
 
 protected:
 
diff --git a/src/Interface/Interface_EntityCluster.cxx b/src/Interface/Interface_EntityCluster.cxx
index 9a4032eb8e..b8c3055bbd 100644
--- a/src/Interface/Interface_EntityCluster.cxx
+++ b/src/Interface/Interface_EntityCluster.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_EntityCluster,MMgt_TShared)
+
 // Un Cluster, ce sont 4 entites qui se suivent (dans le principe, nombre fixe,
 // meme si pas 4). Elles sont remplies depuis 0. Il y a donc autant d Entites
 // que de Handles non Nuls, plus le fait qu ils sont remplis dans l ordre
diff --git a/src/Interface/Interface_EntityCluster.hxx b/src/Interface/Interface_EntityCluster.hxx
index 35f52d6899..462b86ebf5 100644
--- a/src/Interface/Interface_EntityCluster.hxx
+++ b/src/Interface/Interface_EntityCluster.hxx
@@ -96,7 +96,7 @@ public:
 friend class Interface_EntityList;
 
 
-  DEFINE_STANDARD_RTTI(Interface_EntityCluster,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_EntityCluster,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_FileReaderData.cxx b/src/Interface/Interface_FileReaderData.cxx
index 580db88ec4..8ce57f7f7d 100644
--- a/src/Interface/Interface_FileReaderData.cxx
+++ b/src/Interface/Interface_FileReaderData.cxx
@@ -27,6 +27,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_FileReaderData,MMgt_TShared)
+
 //  Stoque les Donnees issues d un Fichier (Conservees sous forme Litterale)
 //  Chaque norme peut s en servir comme base (listes de parametres litteraux,
 //  entites associees) et y ajoute ses donnees propres.
diff --git a/src/Interface/Interface_FileReaderData.hxx b/src/Interface/Interface_FileReaderData.hxx
index 1b085da9f1..d0669b1c5c 100644
--- a/src/Interface/Interface_FileReaderData.hxx
+++ b/src/Interface/Interface_FileReaderData.hxx
@@ -180,7 +180,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_FileReaderData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_FileReaderData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_GTool.cxx b/src/Interface/Interface_GTool.cxx
index caa1f0a098..48871b105a 100644
--- a/src/Interface/Interface_GTool.cxx
+++ b/src/Interface/Interface_GTool.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_GTool,MMgt_TShared)
+
 Interface_GTool::Interface_GTool  ()    {  }
 
     Interface_GTool::Interface_GTool
diff --git a/src/Interface/Interface_GTool.hxx b/src/Interface/Interface_GTool.hxx
index d253f14044..43c11a0eab 100644
--- a/src/Interface/Interface_GTool.hxx
+++ b/src/Interface/Interface_GTool.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_GTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_GTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_GeneralModule.cxx b/src/Interface/Interface_GeneralModule.cxx
index f277c7aa49..019ffa04d2 100644
--- a/src/Interface/Interface_GeneralModule.cxx
+++ b/src/Interface/Interface_GeneralModule.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_GeneralModule,MMgt_TShared)
+
 void  Interface_GeneralModule::FillShared
   (const Handle(Interface_InterfaceModel)& /*model*/,
    const Standard_Integer casenum,
diff --git a/src/Interface/Interface_GeneralModule.hxx b/src/Interface/Interface_GeneralModule.hxx
index a391b72c31..ce2219c764 100644
--- a/src/Interface/Interface_GeneralModule.hxx
+++ b/src/Interface/Interface_GeneralModule.hxx
@@ -184,7 +184,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_GeneralModule,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_GeneralModule,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_GlobalNodeOfGeneralLib.hxx b/src/Interface/Interface_GlobalNodeOfGeneralLib.hxx
index ba35ef8ff9..713425ef7c 100644
--- a/src/Interface/Interface_GlobalNodeOfGeneralLib.hxx
+++ b/src/Interface/Interface_GlobalNodeOfGeneralLib.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_GlobalNodeOfGeneralLib,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(Interface_GlobalNodeOfGeneralLib,Standard_Transient)
 
 protected:
 
diff --git a/src/Interface/Interface_GlobalNodeOfReaderLib.hxx b/src/Interface/Interface_GlobalNodeOfReaderLib.hxx
index b9a5905fc7..6d6c9eac51 100644
--- a/src/Interface/Interface_GlobalNodeOfReaderLib.hxx
+++ b/src/Interface/Interface_GlobalNodeOfReaderLib.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_GlobalNodeOfReaderLib,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(Interface_GlobalNodeOfReaderLib,Standard_Transient)
 
 protected:
 
diff --git a/src/Interface/Interface_HGraph.cxx b/src/Interface/Interface_HGraph.cxx
index 236c9b0b6f..4c0e473b16 100644
--- a/src/Interface/Interface_HGraph.cxx
+++ b/src/Interface/Interface_HGraph.cxx
@@ -21,6 +21,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_HGraph,MMgt_TShared)
+
 Interface_HGraph::Interface_HGraph (const Interface_Graph& agraph)
     :  thegraph(agraph)    {  }
    
diff --git a/src/Interface/Interface_HGraph.hxx b/src/Interface/Interface_HGraph.hxx
index bc8a980fa4..7a54b10ca3 100644
--- a/src/Interface/Interface_HGraph.hxx
+++ b/src/Interface/Interface_HGraph.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_HGraph,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_HGraph,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_IntVal.cxx b/src/Interface/Interface_IntVal.cxx
index 9f528f2a8e..e99e60f128 100644
--- a/src/Interface/Interface_IntVal.cxx
+++ b/src/Interface/Interface_IntVal.cxx
@@ -15,6 +15,8 @@
 #include <Interface_IntVal.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_IntVal,MMgt_TShared)
+
 Interface_IntVal::Interface_IntVal  ()    {  theval = 0;  }
 
 Standard_Integer  Interface_IntVal::Value () const  {  return theval;  }
diff --git a/src/Interface/Interface_IntVal.hxx b/src/Interface/Interface_IntVal.hxx
index 5ab594ddf8..e34ee73180 100644
--- a/src/Interface/Interface_IntVal.hxx
+++ b/src/Interface/Interface_IntVal.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_IntVal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_IntVal,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_InterfaceModel.cxx b/src/Interface/Interface_InterfaceModel.cxx
index a561bb89c1..7f095ee161 100644
--- a/src/Interface/Interface_InterfaceModel.cxx
+++ b/src/Interface/Interface_InterfaceModel.cxx
@@ -39,6 +39,8 @@
 #include <TColStd_Array1OfTransient.hxx>
 #include <TColStd_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_InterfaceModel,MMgt_TShared)
+
 // Un Modele d`Interface est un ensemble ferme d`Entites d`interface : chacune
 // est dans un seul modele a la fois; elle y a un numero (Number) qui permet de
 // verifier qu`une entite est bien dans un seul modele, de definir des Map tres
diff --git a/src/Interface/Interface_InterfaceModel.hxx b/src/Interface/Interface_InterfaceModel.hxx
index 579f495d06..90a8dfa61c 100644
--- a/src/Interface/Interface_InterfaceModel.hxx
+++ b/src/Interface/Interface_InterfaceModel.hxx
@@ -400,7 +400,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_InterfaceModel,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_InterfaceModel,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_NodeOfGeneralLib.hxx b/src/Interface/Interface_NodeOfGeneralLib.hxx
index c9910f282b..1d45fd7155 100644
--- a/src/Interface/Interface_NodeOfGeneralLib.hxx
+++ b/src/Interface/Interface_NodeOfGeneralLib.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_NodeOfGeneralLib,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Interface_NodeOfGeneralLib,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_NodeOfReaderLib.hxx b/src/Interface/Interface_NodeOfReaderLib.hxx
index 64c4e1a3bb..23068305c0 100644
--- a/src/Interface/Interface_NodeOfReaderLib.hxx
+++ b/src/Interface/Interface_NodeOfReaderLib.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_NodeOfReaderLib,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Interface_NodeOfReaderLib,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_ParamList.cxx b/src/Interface/Interface_ParamList.cxx
index 0e88b91c37..7711872465 100644
--- a/src/Interface/Interface_ParamList.cxx
+++ b/src/Interface/Interface_ParamList.cxx
@@ -21,6 +21,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_ParamList,MMgt_TShared)
+
 //=======================================================================
 //function : Interface_ParamList
 //purpose  : 
diff --git a/src/Interface/Interface_ParamList.hxx b/src/Interface/Interface_ParamList.hxx
index 8d98095910..8bd956ee74 100644
--- a/src/Interface/Interface_ParamList.hxx
+++ b/src/Interface/Interface_ParamList.hxx
@@ -76,7 +76,7 @@ Interface_FileParameter& operator () (const Standard_Integer Index)
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_ParamList,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_ParamList,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_ParamSet.cxx b/src/Interface/Interface_ParamSet.cxx
index ea49e72177..e2eb9c2443 100644
--- a/src/Interface/Interface_ParamSet.cxx
+++ b/src/Interface/Interface_ParamSet.cxx
@@ -19,6 +19,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_ParamSet,MMgt_TShared)
+
 Interface_ParamSet::Interface_ParamSet (const Standard_Integer nres, const Standard_Integer )//nst)
 {
   thelist = new Interface_ParamList;// (nst,nst+nres+2);
diff --git a/src/Interface/Interface_ParamSet.hxx b/src/Interface/Interface_ParamSet.hxx
index 1186bb8e5d..f3416f34a2 100644
--- a/src/Interface/Interface_ParamSet.hxx
+++ b/src/Interface/Interface_ParamSet.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_ParamSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_ParamSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_Protocol.cxx b/src/Interface/Interface_Protocol.cxx
index 7b8c7869ea..6a69811e6f 100644
--- a/src/Interface/Interface_Protocol.cxx
+++ b/src/Interface/Interface_Protocol.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_Protocol,MMgt_TShared)
+
 //  Gestion du Protocol actif : tres simple, une variable statique
 static Handle(Interface_Protocol)& theactive()
 {
diff --git a/src/Interface/Interface_Protocol.hxx b/src/Interface/Interface_Protocol.hxx
index 994bc1ef18..0a870c04b6 100644
--- a/src/Interface/Interface_Protocol.hxx
+++ b/src/Interface/Interface_Protocol.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_Protocol,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_Protocol,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_ReaderModule.cxx b/src/Interface/Interface_ReaderModule.cxx
index b9c0265cdb..152e9a3848 100644
--- a/src/Interface/Interface_ReaderModule.cxx
+++ b/src/Interface/Interface_ReaderModule.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_ReaderModule,MMgt_TShared)
+
 Standard_Boolean Interface_ReaderModule::NewRead(const Standard_Integer,
                                                  const Handle(Interface_FileReaderData)&,
                                                  const Standard_Integer,
diff --git a/src/Interface/Interface_ReaderModule.hxx b/src/Interface/Interface_ReaderModule.hxx
index c8a5365a28..693a8c39df 100644
--- a/src/Interface/Interface_ReaderModule.hxx
+++ b/src/Interface/Interface_ReaderModule.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_ReaderModule,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_ReaderModule,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_ReportEntity.cxx b/src/Interface/Interface_ReportEntity.cxx
index 0af8772509..1d596b4e09 100644
--- a/src/Interface/Interface_ReportEntity.cxx
+++ b/src/Interface/Interface_ReportEntity.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_ReportEntity,MMgt_TShared)
+
 //=======================================================================
 //function : Interface_ReportEntity
 //purpose  : 
diff --git a/src/Interface/Interface_ReportEntity.hxx b/src/Interface/Interface_ReportEntity.hxx
index c292a0af0b..4d80905981 100644
--- a/src/Interface/Interface_ReportEntity.hxx
+++ b/src/Interface/Interface_ReportEntity.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_ReportEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_ReportEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/Interface/Interface_SignLabel.cxx b/src/Interface/Interface_SignLabel.cxx
index ee11d1f8eb..b3911137f4 100644
--- a/src/Interface/Interface_SignLabel.cxx
+++ b/src/Interface/Interface_SignLabel.cxx
@@ -19,6 +19,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_SignLabel,MoniTool_SignText)
+
 Interface_SignLabel::Interface_SignLabel  ()    {  }
 
     Standard_CString  Interface_SignLabel::Name () const
diff --git a/src/Interface/Interface_SignLabel.hxx b/src/Interface/Interface_SignLabel.hxx
index 947f380f04..9f754d88d1 100644
--- a/src/Interface/Interface_SignLabel.hxx
+++ b/src/Interface/Interface_SignLabel.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_SignLabel,MoniTool_SignText)
+  DEFINE_STANDARD_RTTIEXT(Interface_SignLabel,MoniTool_SignText)
 
 protected:
 
diff --git a/src/Interface/Interface_SignType.cxx b/src/Interface/Interface_SignType.cxx
index 1b83d3bd0d..98ee68ade3 100644
--- a/src/Interface/Interface_SignType.cxx
+++ b/src/Interface/Interface_SignType.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_SignType,MoniTool_SignText)
+
 TCollection_AsciiString  Interface_SignType::Text
   (const Handle(Standard_Transient)& ent,
    const Handle(Standard_Transient)& context) const
diff --git a/src/Interface/Interface_SignType.hxx b/src/Interface/Interface_SignType.hxx
index 8309eee369..8b685036a3 100644
--- a/src/Interface/Interface_SignType.hxx
+++ b/src/Interface/Interface_SignType.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_SignType,MoniTool_SignText)
+  DEFINE_STANDARD_RTTIEXT(Interface_SignType,MoniTool_SignText)
 
 protected:
 
diff --git a/src/Interface/Interface_Static.cxx b/src/Interface/Interface_Static.cxx
index 10ebd2acae..0c21f8dc56 100644
--- a/src/Interface/Interface_Static.cxx
+++ b/src/Interface/Interface_Static.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Interface_Static,Interface_TypedValue)
+
 static char defmess[31];
 
 //  Fonctions Satisfies offertes en standard ...
diff --git a/src/Interface/Interface_Static.hxx b/src/Interface/Interface_Static.hxx
index 40a8e463d4..201de10937 100644
--- a/src/Interface/Interface_Static.hxx
+++ b/src/Interface/Interface_Static.hxx
@@ -261,7 +261,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_Static,Interface_TypedValue)
+  DEFINE_STANDARD_RTTIEXT(Interface_Static,Interface_TypedValue)
 
 protected:
 
diff --git a/src/Interface/Interface_TypedValue.cxx b/src/Interface/Interface_TypedValue.cxx
index 8b7d7060c3..a3b16d1a2a 100644
--- a/src/Interface/Interface_TypedValue.cxx
+++ b/src/Interface/Interface_TypedValue.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Interface_TypedValue,MoniTool_TypedValue)
+
 //static  char defmess[30]; svv #2
 //  Fonctions Satisfies offertes en standard ...
 // svv#2
diff --git a/src/Interface/Interface_TypedValue.hxx b/src/Interface/Interface_TypedValue.hxx
index 42d62c3c24..24ba68ad50 100644
--- a/src/Interface/Interface_TypedValue.hxx
+++ b/src/Interface/Interface_TypedValue.hxx
@@ -85,7 +85,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_TypedValue,MoniTool_TypedValue)
+  DEFINE_STANDARD_RTTIEXT(Interface_TypedValue,MoniTool_TypedValue)
 
 protected:
 
diff --git a/src/Interface/Interface_UndefinedContent.cxx b/src/Interface/Interface_UndefinedContent.cxx
index a9ff9f724b..d4b3dbd338 100644
--- a/src/Interface/Interface_UndefinedContent.cxx
+++ b/src/Interface/Interface_UndefinedContent.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Interface_UndefinedContent,MMgt_TShared)
+
 #define Content_TypeField 31
 #define Content_LocalField 7
 #define Content_LocalRef 1
diff --git a/src/Interface/Interface_UndefinedContent.hxx b/src/Interface/Interface_UndefinedContent.hxx
index 8cf1091a71..ce62d22221 100644
--- a/src/Interface/Interface_UndefinedContent.hxx
+++ b/src/Interface/Interface_UndefinedContent.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Interface_UndefinedContent,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Interface_UndefinedContent,MMgt_TShared)
 
 protected:
 
diff --git a/src/LDOM/LDOM_MemManager.cxx b/src/LDOM/LDOM_MemManager.cxx
index c04fe9504a..c45d4f0c81 100644
--- a/src/LDOM/LDOM_MemManager.cxx
+++ b/src/LDOM/LDOM_MemManager.cxx
@@ -17,6 +17,8 @@
 #include <LDOMBasicString.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(LDOM_MemManager,MMgt_TShared)
+
 #define HASH_MASK 255
 #define MINIMAL_ROOM 3
 
diff --git a/src/LDOM/LDOM_MemManager.hxx b/src/LDOM/LDOM_MemManager.hxx
index a6525c8f29..d2880a578a 100644
--- a/src/LDOM/LDOM_MemManager.hxx
+++ b/src/LDOM/LDOM_MemManager.hxx
@@ -128,7 +128,7 @@ class LDOM_MemManager : public MMgt_TShared
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI (LDOM_MemManager, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(LDOM_MemManager,MMgt_TShared)
 };
 
 
diff --git a/src/Law/Law_BSpFunc.cxx b/src/Law/Law_BSpFunc.cxx
index 9ddfc2bd54..227762a81b 100644
--- a/src/Law/Law_BSpFunc.cxx
+++ b/src/Law/Law_BSpFunc.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_BSpFunc,Law_Function)
+
 #define PosTol Precision::PConfusion()/2
 
 //=======================================================================
diff --git a/src/Law/Law_BSpFunc.hxx b/src/Law/Law_BSpFunc.hxx
index b7845f46b1..755795feb5 100644
--- a/src/Law/Law_BSpFunc.hxx
+++ b/src/Law/Law_BSpFunc.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_BSpFunc,Law_Function)
+  DEFINE_STANDARD_RTTIEXT(Law_BSpFunc,Law_Function)
 
 protected:
 
diff --git a/src/Law/Law_BSpline.cxx b/src/Law/Law_BSpline.cxx
index a0a04f8f98..ffd12718d8 100644
--- a/src/Law/Law_BSpline.cxx
+++ b/src/Law/Law_BSpline.cxx
@@ -34,6 +34,8 @@
 #include <Standard_RangeError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_BSpline,MMgt_TShared)
+
 #define  POLES    (poles->Array1())
 #define  KNOTS    (knots->Array1())
 #define  FKNOTS   (flatknots->Array1())
diff --git a/src/Law/Law_BSpline.hxx b/src/Law/Law_BSpline.hxx
index ea0eb5955a..cfd51dad75 100644
--- a/src/Law/Law_BSpline.hxx
+++ b/src/Law/Law_BSpline.hxx
@@ -533,7 +533,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_BSpline,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Law_BSpline,MMgt_TShared)
 
 protected:
 
diff --git a/src/Law/Law_Composite.cxx b/src/Law/Law_Composite.cxx
index 54112b7d60..8742bf1417 100644
--- a/src/Law/Law_Composite.cxx
+++ b/src/Law/Law_Composite.cxx
@@ -26,6 +26,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_Composite,Law_Function)
+
 //=======================================================================
 //function : Law_Composite
 //purpose  : 
diff --git a/src/Law/Law_Composite.hxx b/src/Law/Law_Composite.hxx
index cfc775147e..0ffcbda7e9 100644
--- a/src/Law/Law_Composite.hxx
+++ b/src/Law/Law_Composite.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_Composite,Law_Function)
+  DEFINE_STANDARD_RTTIEXT(Law_Composite,Law_Function)
 
 protected:
 
diff --git a/src/Law/Law_Constant.cxx b/src/Law/Law_Constant.cxx
index d949e5d233..6d4fb51089 100644
--- a/src/Law/Law_Constant.cxx
+++ b/src/Law/Law_Constant.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_Constant,Law_Function)
+
 //=======================================================================
 //function : Law_Constant
 //purpose  : 
diff --git a/src/Law/Law_Constant.hxx b/src/Law/Law_Constant.hxx
index 49a636f657..42e1776852 100644
--- a/src/Law/Law_Constant.hxx
+++ b/src/Law/Law_Constant.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_Constant,Law_Function)
+  DEFINE_STANDARD_RTTIEXT(Law_Constant,Law_Function)
 
 protected:
 
diff --git a/src/Law/Law_Function.cxx b/src/Law/Law_Function.cxx
index d38aafb8b7..6a898e57a5 100644
--- a/src/Law/Law_Function.cxx
+++ b/src/Law/Law_Function.cxx
@@ -16,3 +16,5 @@
 #include <Law_Function.hxx>
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Law_Function,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Law/Law_Function.hxx b/src/Law/Law_Function.hxx
index 4bf888f361..67028678d1 100644
--- a/src/Law/Law_Function.hxx
+++ b/src/Law/Law_Function.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_Function,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Law_Function,MMgt_TShared)
 
 protected:
 
diff --git a/src/Law/Law_Interpol.cxx b/src/Law/Law_Interpol.cxx
index f321b3ed32..8b73cfcb7e 100644
--- a/src/Law/Law_Interpol.cxx
+++ b/src/Law/Law_Interpol.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_Interpol,Law_BSpFunc)
+
 #ifdef OCCT_DEBUG
 #ifdef DRAW
 
diff --git a/src/Law/Law_Interpol.hxx b/src/Law/Law_Interpol.hxx
index 209d568c84..6f3bd0e4a2 100644
--- a/src/Law/Law_Interpol.hxx
+++ b/src/Law/Law_Interpol.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_Interpol,Law_BSpFunc)
+  DEFINE_STANDARD_RTTIEXT(Law_Interpol,Law_BSpFunc)
 
 protected:
 
diff --git a/src/Law/Law_Linear.cxx b/src/Law/Law_Linear.cxx
index e271eadf19..64f57a3e93 100644
--- a/src/Law/Law_Linear.cxx
+++ b/src/Law/Law_Linear.cxx
@@ -21,6 +21,8 @@
 #include <Standard_OutOfRange.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_Linear,Law_Function)
+
 Law_Linear::Law_Linear () {}
 
 
diff --git a/src/Law/Law_Linear.hxx b/src/Law/Law_Linear.hxx
index 033e6be07c..45d930448d 100644
--- a/src/Law/Law_Linear.hxx
+++ b/src/Law/Law_Linear.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_Linear,Law_Function)
+  DEFINE_STANDARD_RTTIEXT(Law_Linear,Law_Function)
 
 protected:
 
diff --git a/src/Law/Law_S.cxx b/src/Law/Law_S.cxx
index 3634ebf2e9..4ad551292b 100644
--- a/src/Law/Law_S.cxx
+++ b/src/Law/Law_S.cxx
@@ -20,6 +20,8 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Law_S,Law_BSpFunc)
+
 Law_S::Law_S ()
 {}
 
diff --git a/src/Law/Law_S.hxx b/src/Law/Law_S.hxx
index 30ce75ce2a..9c53ad45f2 100644
--- a/src/Law/Law_S.hxx
+++ b/src/Law/Law_S.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Law_S,Law_BSpFunc)
+  DEFINE_STANDARD_RTTIEXT(Law_S,Law_BSpFunc)
 
 protected:
 
diff --git a/src/LocOpe/LocOpe_GeneratedShape.cxx b/src/LocOpe/LocOpe_GeneratedShape.cxx
index 5240681ed9..b67be49215 100644
--- a/src/LocOpe/LocOpe_GeneratedShape.cxx
+++ b/src/LocOpe/LocOpe_GeneratedShape.cxx
@@ -20,3 +20,5 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(LocOpe_GeneratedShape,MMgt_TShared)
\ No newline at end of file
diff --git a/src/LocOpe/LocOpe_GeneratedShape.hxx b/src/LocOpe/LocOpe_GeneratedShape.hxx
index 4813bbe960..f3f58c50b1 100644
--- a/src/LocOpe/LocOpe_GeneratedShape.hxx
+++ b/src/LocOpe/LocOpe_GeneratedShape.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(LocOpe_GeneratedShape,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(LocOpe_GeneratedShape,MMgt_TShared)
 
 protected:
 
diff --git a/src/LocOpe/LocOpe_GluedShape.cxx b/src/LocOpe/LocOpe_GluedShape.cxx
index 586828784e..bdf689530c 100644
--- a/src/LocOpe/LocOpe_GluedShape.cxx
+++ b/src/LocOpe/LocOpe_GluedShape.cxx
@@ -30,6 +30,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(LocOpe_GluedShape,LocOpe_GeneratedShape)
+
 //=======================================================================
 //function : LocOpe_GluedShape
 //purpose  : 
diff --git a/src/LocOpe/LocOpe_GluedShape.hxx b/src/LocOpe/LocOpe_GluedShape.hxx
index df90a76a59..ae17b7aef3 100644
--- a/src/LocOpe/LocOpe_GluedShape.hxx
+++ b/src/LocOpe/LocOpe_GluedShape.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(LocOpe_GluedShape,LocOpe_GeneratedShape)
+  DEFINE_STANDARD_RTTIEXT(LocOpe_GluedShape,LocOpe_GeneratedShape)
 
 protected:
 
diff --git a/src/LocOpe/LocOpe_HBuilder.cxx b/src/LocOpe/LocOpe_HBuilder.cxx
index c9ebe15d21..51d95f6459 100644
--- a/src/LocOpe/LocOpe_HBuilder.cxx
+++ b/src/LocOpe/LocOpe_HBuilder.cxx
@@ -18,3 +18,5 @@
 #include <LocOpe_HBuilder.hxx>
 #include <Standard_Type.hxx>
 #include <TopOpeBRepDS_BuildTool.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(LocOpe_HBuilder,TopOpeBRepBuild_HBuilder)
\ No newline at end of file
diff --git a/src/LocOpe/LocOpe_HBuilder.hxx b/src/LocOpe/LocOpe_HBuilder.hxx
index f100760716..9acd49a7cc 100644
--- a/src/LocOpe/LocOpe_HBuilder.hxx
+++ b/src/LocOpe/LocOpe_HBuilder.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(LocOpe_HBuilder,TopOpeBRepBuild_HBuilder)
+  DEFINE_STANDARD_RTTIEXT(LocOpe_HBuilder,TopOpeBRepBuild_HBuilder)
 
 protected:
 
diff --git a/src/LocOpe/LocOpe_WiresOnShape.cxx b/src/LocOpe/LocOpe_WiresOnShape.cxx
index 4493fc8d76..b538a48088 100644
--- a/src/LocOpe/LocOpe_WiresOnShape.cxx
+++ b/src/LocOpe/LocOpe_WiresOnShape.cxx
@@ -57,6 +57,8 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(LocOpe_WiresOnShape,MMgt_TShared)
+
 static Standard_Boolean Project(const TopoDS_Vertex&,
                                 const gp_Pnt2d&,
 				const TopoDS_Face&,
diff --git a/src/LocOpe/LocOpe_WiresOnShape.hxx b/src/LocOpe/LocOpe_WiresOnShape.hxx
index ef73d6a6d9..5d8022b34c 100644
--- a/src/LocOpe/LocOpe_WiresOnShape.hxx
+++ b/src/LocOpe/LocOpe_WiresOnShape.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(LocOpe_WiresOnShape,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(LocOpe_WiresOnShape,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Arc.cxx b/src/MAT/MAT_Arc.cxx
index 34a19212ac..ff9b28cbf5 100644
--- a/src/MAT/MAT_Arc.cxx
+++ b/src/MAT/MAT_Arc.cxx
@@ -21,6 +21,8 @@
 #include <Standard_DomainError.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Arc,MMgt_TShared)
+
 //========================================================================
 // function:
 // purpose :
diff --git a/src/MAT/MAT_Arc.hxx b/src/MAT/MAT_Arc.hxx
index 47258b2461..dafef90ff0 100644
--- a/src/MAT/MAT_Arc.hxx
+++ b/src/MAT/MAT_Arc.hxx
@@ -98,7 +98,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Arc,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Arc,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_BasicElt.cxx b/src/MAT/MAT_BasicElt.cxx
index 10d3d42e9e..5f6023ef08 100644
--- a/src/MAT/MAT_BasicElt.cxx
+++ b/src/MAT/MAT_BasicElt.cxx
@@ -21,6 +21,8 @@
 #include <MAT_SequenceOfArc.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_BasicElt,MMgt_TShared)
+
 //========================================================================
 // function:
 // purpose :
diff --git a/src/MAT/MAT_BasicElt.hxx b/src/MAT/MAT_BasicElt.hxx
index 343587df71..45ff93e410 100644
--- a/src/MAT/MAT_BasicElt.hxx
+++ b/src/MAT/MAT_BasicElt.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_BasicElt,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_BasicElt,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Bisector.cxx b/src/MAT/MAT_Bisector.cxx
index 90e6b0c803..bcf8ed7e08 100644
--- a/src/MAT/MAT_Bisector.cxx
+++ b/src/MAT/MAT_Bisector.cxx
@@ -21,6 +21,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Bisector,MMgt_TShared)
+
 MAT_Bisector::MAT_Bisector()
 {
   thebisectornumber = -1;
diff --git a/src/MAT/MAT_Bisector.hxx b/src/MAT/MAT_Bisector.hxx
index 0cd57b6fdd..cd0a2f2fa1 100644
--- a/src/MAT/MAT_Bisector.hxx
+++ b/src/MAT/MAT_Bisector.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Bisector,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Bisector,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Edge.cxx b/src/MAT/MAT_Edge.cxx
index 3283a98384..94f42c3ac2 100644
--- a/src/MAT/MAT_Edge.cxx
+++ b/src/MAT/MAT_Edge.cxx
@@ -19,6 +19,8 @@
 #include <MAT_Edge.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Edge,MMgt_TShared)
+
 MAT_Edge::MAT_Edge()
 {
 }
diff --git a/src/MAT/MAT_Edge.hxx b/src/MAT/MAT_Edge.hxx
index 78b52160d5..af12590b10 100644
--- a/src/MAT/MAT_Edge.hxx
+++ b/src/MAT/MAT_Edge.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Edge,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Edge,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Graph.cxx b/src/MAT/MAT_Graph.cxx
index 8d390ded38..dcf77cd412 100644
--- a/src/MAT/MAT_Graph.cxx
+++ b/src/MAT/MAT_Graph.cxx
@@ -30,6 +30,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Graph,MMgt_TShared)
+
 //------------------
 // functions static.
 //-------------------
diff --git a/src/MAT/MAT_Graph.hxx b/src/MAT/MAT_Graph.hxx
index 5c3a92e1eb..ca6cfa8971 100644
--- a/src/MAT/MAT_Graph.hxx
+++ b/src/MAT/MAT_Graph.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Graph,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Graph,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_ListOfBisector.hxx b/src/MAT/MAT_ListOfBisector.hxx
index bad78b0bcc..5007d97dd6 100644
--- a/src/MAT/MAT_ListOfBisector.hxx
+++ b/src/MAT/MAT_ListOfBisector.hxx
@@ -94,7 +94,7 @@ Handle(MAT_Bisector) operator() (const Standard_Integer anindex)
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_ListOfBisector,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(MAT_ListOfBisector,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_ListOfEdge.hxx b/src/MAT/MAT_ListOfEdge.hxx
index 7d41f8d54a..76c7ed5389 100644
--- a/src/MAT/MAT_ListOfEdge.hxx
+++ b/src/MAT/MAT_ListOfEdge.hxx
@@ -94,7 +94,7 @@ Handle(MAT_Edge) operator() (const Standard_Integer anindex)
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_ListOfEdge,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(MAT_ListOfEdge,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Node.cxx b/src/MAT/MAT_Node.cxx
index 22142a8fab..1925982748 100644
--- a/src/MAT/MAT_Node.cxx
+++ b/src/MAT/MAT_Node.cxx
@@ -21,6 +21,8 @@
 #include <Precision.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Node,MMgt_TShared)
+
 //=============================================================================
 //function : 
 //Purpose  :
diff --git a/src/MAT/MAT_Node.hxx b/src/MAT/MAT_Node.hxx
index f01c1f369d..96b3d896ab 100644
--- a/src/MAT/MAT_Node.hxx
+++ b/src/MAT/MAT_Node.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Node,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Node,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_TListNodeOfListOfBisector.hxx b/src/MAT/MAT_TListNodeOfListOfBisector.hxx
index de45f658b0..3371804978 100644
--- a/src/MAT/MAT_TListNodeOfListOfBisector.hxx
+++ b/src/MAT/MAT_TListNodeOfListOfBisector.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_TListNodeOfListOfBisector,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(MAT_TListNodeOfListOfBisector,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_TListNodeOfListOfEdge.hxx b/src/MAT/MAT_TListNodeOfListOfEdge.hxx
index 00b44f202c..db70b8ad3b 100644
--- a/src/MAT/MAT_TListNodeOfListOfEdge.hxx
+++ b/src/MAT/MAT_TListNodeOfListOfEdge.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_TListNodeOfListOfEdge,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(MAT_TListNodeOfListOfEdge,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT/MAT_Zone.cxx b/src/MAT/MAT_Zone.cxx
index c91c0652d4..196d17693a 100644
--- a/src/MAT/MAT_Zone.cxx
+++ b/src/MAT/MAT_Zone.cxx
@@ -22,6 +22,8 @@
 #include <MAT_Zone.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT_Zone,MMgt_TShared)
+
 //========================================================================
 // function:
 // purpose :
diff --git a/src/MAT/MAT_Zone.hxx b/src/MAT/MAT_Zone.hxx
index 11290f4399..483334b348 100644
--- a/src/MAT/MAT_Zone.hxx
+++ b/src/MAT/MAT_Zone.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT_Zone,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT_Zone,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT2d/MAT2d_Circuit.hxx b/src/MAT2d/MAT2d_Circuit.hxx
index 76866369bd..10d32dd68f 100644
--- a/src/MAT2d/MAT2d_Circuit.hxx
+++ b/src/MAT2d/MAT2d_Circuit.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT2d_Circuit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT2d_Circuit,MMgt_TShared)
 
 protected:
 
diff --git a/src/MAT2d/MAT2d_Connexion.cxx b/src/MAT2d/MAT2d_Connexion.cxx
index 81c8ee5587..e32ae47d37 100644
--- a/src/MAT2d/MAT2d_Connexion.cxx
+++ b/src/MAT2d/MAT2d_Connexion.cxx
@@ -20,6 +20,8 @@
 #include <MAT2d_Connexion.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MAT2d_Connexion,MMgt_TShared)
+
 //=============================================================================
 //function :
 //purpose  :
diff --git a/src/MAT2d/MAT2d_Connexion.hxx b/src/MAT2d/MAT2d_Connexion.hxx
index d2ef2cc2ed..e07f355655 100644
--- a/src/MAT2d/MAT2d_Connexion.hxx
+++ b/src/MAT2d/MAT2d_Connexion.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MAT2d_Connexion,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MAT2d_Connexion,MMgt_TShared)
 
 protected:
 
diff --git a/src/MMgt/MMgt_TShared.cxx b/src/MMgt/MMgt_TShared.cxx
index 2e8a5fa4fe..d860f6c037 100644
--- a/src/MMgt/MMgt_TShared.cxx
+++ b/src/MMgt/MMgt_TShared.cxx
@@ -17,6 +17,8 @@
 #include <Standard_OutOfMemory.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MMgt_TShared,Standard_Transient)
+
 //=======================================================================
 //function : Delete
 //purpose  : 
diff --git a/src/MMgt/MMgt_TShared.hxx b/src/MMgt/MMgt_TShared.hxx
index 4d66fd55f3..db0cb9073e 100644
--- a/src/MMgt/MMgt_TShared.hxx
+++ b/src/MMgt/MMgt_TShared.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MMgt_TShared,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(MMgt_TShared,Standard_Transient)
 
 protected:
 
diff --git a/src/MeshTest/MeshTest_DrawableMesh.cxx b/src/MeshTest/MeshTest_DrawableMesh.cxx
index e3ef4b2d16..5385c51e55 100644
--- a/src/MeshTest/MeshTest_DrawableMesh.cxx
+++ b/src/MeshTest/MeshTest_DrawableMesh.cxx
@@ -31,6 +31,8 @@
 #include <TopExp_Explorer.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshTest_DrawableMesh,Draw_Drawable3D)
+
 typedef NCollection_Map<BRepMesh_Edge> BRepMesh_MapOfLinks;
 
 static inline void addLink(const Standard_Integer theIndex1,
diff --git a/src/MeshTest/MeshTest_DrawableMesh.hxx b/src/MeshTest/MeshTest_DrawableMesh.hxx
index 38a7df7596..c36a9c2fc1 100644
--- a/src/MeshTest/MeshTest_DrawableMesh.hxx
+++ b/src/MeshTest/MeshTest_DrawableMesh.hxx
@@ -57,7 +57,7 @@ public:
   
   Standard_EXPORT const Handle(BRepMesh_IncrementalMesh)& Mesher() const;
 
-  DEFINE_STANDARD_RTTI(MeshTest_DrawableMesh, Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(MeshTest_DrawableMesh,Draw_Drawable3D)
 
 private: 
 
diff --git a/src/MeshVS/MeshVS_DataSource.cxx b/src/MeshVS/MeshVS_DataSource.cxx
index 7919a9046d..d661053ec9 100644
--- a/src/MeshVS/MeshVS_DataSource.cxx
+++ b/src/MeshVS/MeshVS_DataSource.cxx
@@ -27,6 +27,8 @@
 #include <TColStd_HPackedMapOfInteger.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_DataSource,MMgt_TShared)
+
 //================================================================
 // Function : Get3DGeom
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_DataSource.hxx b/src/MeshVS/MeshVS_DataSource.hxx
index 354479165e..c02e0782a8 100644
--- a/src/MeshVS/MeshVS_DataSource.hxx
+++ b/src/MeshVS/MeshVS_DataSource.hxx
@@ -185,7 +185,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_DataSource,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_DataSource,MMgt_TShared)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_DataSource3D.cxx b/src/MeshVS/MeshVS_DataSource3D.cxx
index 79dbfc885f..68b03bee50 100644
--- a/src/MeshVS/MeshVS_DataSource3D.cxx
+++ b/src/MeshVS/MeshVS_DataSource3D.cxx
@@ -17,6 +17,8 @@
 #include <MeshVS_DataSource3D.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_DataSource3D,MeshVS_DataSource)
+
 //================================================================
 // Function : GetPrismTopology
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_DataSource3D.hxx b/src/MeshVS/MeshVS_DataSource3D.hxx
index ceb29cfe92..d57db6e870 100644
--- a/src/MeshVS/MeshVS_DataSource3D.hxx
+++ b/src/MeshVS/MeshVS_DataSource3D.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_DataSource3D,MeshVS_DataSource)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_DataSource3D,MeshVS_DataSource)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_DeformedDataSource.cxx b/src/MeshVS/MeshVS_DeformedDataSource.cxx
index ae0d968465..d4624e0dc2 100644
--- a/src/MeshVS/MeshVS_DeformedDataSource.cxx
+++ b/src/MeshVS/MeshVS_DeformedDataSource.cxx
@@ -20,6 +20,8 @@
 #include <MeshVS_DeformedDataSource.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_DeformedDataSource,MeshVS_DataSource)
+
 //================================================================
 // Function : Constructor MeshVS_DeformedDataSource
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_DeformedDataSource.hxx b/src/MeshVS/MeshVS_DeformedDataSource.hxx
index 2cf7ce8aad..c82c732723 100644
--- a/src/MeshVS/MeshVS_DeformedDataSource.hxx
+++ b/src/MeshVS/MeshVS_DeformedDataSource.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_DeformedDataSource,MeshVS_DataSource)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_DeformedDataSource,MeshVS_DataSource)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_Drawer.cxx b/src/MeshVS/MeshVS_Drawer.cxx
index 670db27d7a..aeebcb742e 100644
--- a/src/MeshVS/MeshVS_Drawer.cxx
+++ b/src/MeshVS/MeshVS_Drawer.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_Drawer,MMgt_TShared)
+
 //================================================================
 // Function : Assign
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_Drawer.hxx b/src/MeshVS/MeshVS_Drawer.hxx
index a08aedd680..93134ccd0d 100644
--- a/src/MeshVS/MeshVS_Drawer.hxx
+++ b/src/MeshVS/MeshVS_Drawer.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_Drawer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_Drawer,MMgt_TShared)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_DummySensitiveEntity.cxx b/src/MeshVS/MeshVS_DummySensitiveEntity.cxx
index c62efe321d..dcae01aaba 100644
--- a/src/MeshVS/MeshVS_DummySensitiveEntity.cxx
+++ b/src/MeshVS/MeshVS_DummySensitiveEntity.cxx
@@ -20,6 +20,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_DummySensitiveEntity,SelectBasics_SensitiveEntity)
+
 //================================================================
 // Function : Constructor MeshVS_DummySensitiveEntity
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_DummySensitiveEntity.hxx b/src/MeshVS/MeshVS_DummySensitiveEntity.hxx
index f4bf501fe5..f2981598a9 100644
--- a/src/MeshVS/MeshVS_DummySensitiveEntity.hxx
+++ b/src/MeshVS/MeshVS_DummySensitiveEntity.hxx
@@ -51,7 +51,7 @@ public:
 
   Standard_EXPORT virtual gp_Trsf InvInitLocation() const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(MeshVS_DummySensitiveEntity, SelectBasics_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_DummySensitiveEntity,SelectBasics_SensitiveEntity)
 };
 
 DEFINE_STANDARD_HANDLE(MeshVS_DummySensitiveEntity, SelectBasics_SensitiveEntity)
diff --git a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cxx b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cxx
index 848ace4d8e..c3b63ea345 100644
--- a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cxx
@@ -51,6 +51,8 @@
 #include <TColStd_PackedMapOfInteger.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_ElementalColorPrsBuilder,MeshVS_PrsBuilder)
+
 //================================================================
 // Function : Constructor MeshVS_ElementalColorPrsBuilder
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx
index ca533a78ca..c24f715ec6 100644
--- a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_ElementalColorPrsBuilder,MeshVS_PrsBuilder)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_ElementalColorPrsBuilder,MeshVS_PrsBuilder)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_Mesh.cxx b/src/MeshVS/MeshVS_Mesh.cxx
index 894bd96ef0..c4c7a32ee7 100644
--- a/src/MeshVS/MeshVS_Mesh.cxx
+++ b/src/MeshVS/MeshVS_Mesh.cxx
@@ -61,6 +61,8 @@
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_Mesh,AIS_InteractiveObject)
+
 //================================================================
 // Function : Constructor MeshVS_Mesh
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_Mesh.hxx b/src/MeshVS/MeshVS_Mesh.hxx
index c54c7385aa..e726125457 100644
--- a/src/MeshVS/MeshVS_Mesh.hxx
+++ b/src/MeshVS/MeshVS_Mesh.hxx
@@ -187,7 +187,7 @@ public:
 friend class MeshVS_PrsBuilder;
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_Mesh,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_Mesh,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_MeshEntityOwner.cxx b/src/MeshVS/MeshVS_MeshEntityOwner.cxx
index edab8b8b61..39f1be5545 100644
--- a/src/MeshVS/MeshVS_MeshEntityOwner.cxx
+++ b/src/MeshVS/MeshVS_MeshEntityOwner.cxx
@@ -25,6 +25,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_MeshEntityOwner,SelectMgr_EntityOwner)
+
 #ifndef MeshVS_PRSBUILDERHXX
 #include <MeshVS_PrsBuilder.hxx>
 #endif
diff --git a/src/MeshVS/MeshVS_MeshEntityOwner.hxx b/src/MeshVS/MeshVS_MeshEntityOwner.hxx
index 2fbb065c4c..fd98274058 100644
--- a/src/MeshVS/MeshVS_MeshEntityOwner.hxx
+++ b/src/MeshVS/MeshVS_MeshEntityOwner.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_MeshEntityOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_MeshEntityOwner,SelectMgr_EntityOwner)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_MeshOwner.cxx b/src/MeshVS/MeshVS_MeshOwner.cxx
index 6f570c5e39..3a01f700a6 100644
--- a/src/MeshVS/MeshVS_MeshOwner.cxx
+++ b/src/MeshVS/MeshVS_MeshOwner.cxx
@@ -25,6 +25,8 @@
 #include <TColStd_HPackedMapOfInteger.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_MeshOwner,SelectMgr_EntityOwner)
+
 #ifndef MeshVS_PRSBUILDERHXX
 #include <MeshVS_PrsBuilder.hxx>
 #endif
diff --git a/src/MeshVS/MeshVS_MeshOwner.hxx b/src/MeshVS/MeshVS_MeshOwner.hxx
index 29e30ab6d3..4b293a3401 100644
--- a/src/MeshVS/MeshVS_MeshOwner.hxx
+++ b/src/MeshVS/MeshVS_MeshOwner.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_MeshOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_MeshOwner,SelectMgr_EntityOwner)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
index bd7a373dd3..54a8e66288 100644
--- a/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_MeshPrsBuilder.cxx
@@ -54,6 +54,8 @@
 #include <TColStd_PackedMapOfInteger.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_MeshPrsBuilder,MeshVS_PrsBuilder)
+
 //================================================================
 // Function : Constructor MeshVS_MeshPrsBuilder
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.hxx b/src/MeshVS/MeshVS_MeshPrsBuilder.hxx
index 5578480e1d..acdd26d717 100644
--- a/src/MeshVS/MeshVS_MeshPrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_MeshPrsBuilder.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_MeshPrsBuilder,MeshVS_PrsBuilder)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_MeshPrsBuilder,MeshVS_PrsBuilder)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
index c44abaa39b..d83cc63628 100644
--- a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cxx
@@ -61,6 +61,8 @@
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_NodalColorPrsBuilder,MeshVS_PrsBuilder)
+
 /*
   Class       : MeshVS_ImageTexture2D
   Description : Texture for nodal presentation
@@ -77,7 +79,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(MeshVS_ImageTexture2D, Graphic3d_Texture2D)
+  DEFINE_STANDARD_RTTI_INLINE(MeshVS_ImageTexture2D,Graphic3d_Texture2D)
 };
 
 DEFINE_STANDARD_HANDLE    (MeshVS_ImageTexture2D, Graphic3d_Texture2D)
diff --git a/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx b/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx
index 5c3f901d07..c87f836d52 100644
--- a/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_NodalColorPrsBuilder.hxx
@@ -122,7 +122,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_NodalColorPrsBuilder,MeshVS_PrsBuilder)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_NodalColorPrsBuilder,MeshVS_PrsBuilder)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_PrsBuilder.cxx b/src/MeshVS/MeshVS_PrsBuilder.cxx
index 4b06c809bc..4129434bc1 100644
--- a/src/MeshVS/MeshVS_PrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_PrsBuilder.cxx
@@ -24,6 +24,8 @@
 #include <SelectBasics_SensitiveEntity.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_PrsBuilder,MMgt_TShared)
+
 //================================================================
 // Function : Constructor MeshVS_PrsBuilder
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_PrsBuilder.hxx b/src/MeshVS/MeshVS_PrsBuilder.hxx
index 20dd83d715..967a19747b 100644
--- a/src/MeshVS/MeshVS_PrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_PrsBuilder.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_PrsBuilder,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_PrsBuilder,MMgt_TShared)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_SensitiveFace.cxx b/src/MeshVS/MeshVS_SensitiveFace.cxx
index 6107836d8a..105db04a7f 100644
--- a/src/MeshVS/MeshVS_SensitiveFace.cxx
+++ b/src/MeshVS/MeshVS_SensitiveFace.cxx
@@ -18,6 +18,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_SensitiveFace,Select3D_SensitiveFace)
+
 //=======================================================================
 // name    : MeshVS_SensitiveFace::MeshVS_SensitiveFace
 // Purpose :
diff --git a/src/MeshVS/MeshVS_SensitiveFace.hxx b/src/MeshVS/MeshVS_SensitiveFace.hxx
index ecec9c2ed7..b50935ebd3 100644
--- a/src/MeshVS/MeshVS_SensitiveFace.hxx
+++ b/src/MeshVS/MeshVS_SensitiveFace.hxx
@@ -34,7 +34,7 @@ public:
                                         const TColgp_Array1OfPnt& thePoints,
                                         const Select3D_TypeOfSensitivity theSensType = Select3D_TOS_INTERIOR);
 
-  DEFINE_STANDARD_RTTI(MeshVS_SensitiveFace, Select3D_SensitiveFace)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_SensitiveFace,Select3D_SensitiveFace)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_SensitiveMesh.cxx b/src/MeshVS/MeshVS_SensitiveMesh.cxx
index 706c2121b6..29a3944d3b 100644
--- a/src/MeshVS/MeshVS_SensitiveMesh.cxx
+++ b/src/MeshVS/MeshVS_SensitiveMesh.cxx
@@ -26,6 +26,8 @@
 #include <NCollection_Vec4.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_SensitiveMesh,Select3D_SensitiveEntity)
+
 //=======================================================================
 // name    : MeshVS_SensitiveMesh::MeshVS_SensitiveMesh
 // Purpose :
diff --git a/src/MeshVS/MeshVS_SensitiveMesh.hxx b/src/MeshVS/MeshVS_SensitiveMesh.hxx
index b7aab8a9c9..8d460a8c65 100644
--- a/src/MeshVS/MeshVS_SensitiveMesh.hxx
+++ b/src/MeshVS/MeshVS_SensitiveMesh.hxx
@@ -49,7 +49,7 @@ public:
   //! Returns center of mesh
   Standard_EXPORT virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(MeshVS_SensitiveMesh, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_SensitiveMesh,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/MeshVS/MeshVS_SensitivePolyhedron.cxx b/src/MeshVS/MeshVS_SensitivePolyhedron.cxx
index 528303431e..6da927e5a7 100644
--- a/src/MeshVS/MeshVS_SensitivePolyhedron.cxx
+++ b/src/MeshVS/MeshVS_SensitivePolyhedron.cxx
@@ -27,6 +27,8 @@
 #include <TColStd_SequenceOfInteger.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_SensitivePolyhedron,Select3D_SensitiveEntity)
+
 //================================================================
 // Function : Constructor MeshVS_SensitivePolyhedron
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
index e1ec427335..f8075e2f95 100644
--- a/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
+++ b/src/MeshVS/MeshVS_SensitivePolyhedron.hxx
@@ -62,7 +62,7 @@ public:
 
   Standard_EXPORT virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(MeshVS_SensitivePolyhedron, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_SensitivePolyhedron,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/MeshVS/MeshVS_SensitiveSegment.cxx b/src/MeshVS/MeshVS_SensitiveSegment.cxx
index 156c4dd424..7ff7e21ad3 100644
--- a/src/MeshVS/MeshVS_SensitiveSegment.cxx
+++ b/src/MeshVS/MeshVS_SensitiveSegment.cxx
@@ -18,6 +18,8 @@
 #include <SelectBasics_EntityOwner.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_SensitiveSegment,Select3D_SensitiveSegment)
+
 //=======================================================================
 // name    : MeshVS_SensitiveSegment::MeshVS_SensitiveSegment
 // Purpose :
diff --git a/src/MeshVS/MeshVS_SensitiveSegment.hxx b/src/MeshVS/MeshVS_SensitiveSegment.hxx
index a8eebfa1f3..2d047201aa 100644
--- a/src/MeshVS/MeshVS_SensitiveSegment.hxx
+++ b/src/MeshVS/MeshVS_SensitiveSegment.hxx
@@ -35,7 +35,7 @@ public:
                                            const gp_Pnt& theFirstPnt,
                                            const gp_Pnt& theLastPnt);
 
-  DEFINE_STANDARD_RTTI(MeshVS_SensitiveSegment, Select3D_SensitiveSegment)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_SensitiveSegment,Select3D_SensitiveSegment)
 };
 
 DEFINE_STANDARD_HANDLE(MeshVS_SensitiveSegment, Select3D_SensitiveSegment)
diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.cxx b/src/MeshVS/MeshVS_TextPrsBuilder.cxx
index 7793861f71..620fd6a386 100644
--- a/src/MeshVS/MeshVS_TextPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_TextPrsBuilder.cxx
@@ -38,6 +38,8 @@
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_TextPrsBuilder,MeshVS_PrsBuilder)
+
 //================================================================
 // Function : Constructor MeshVS_TextPrsBuilder
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.hxx b/src/MeshVS/MeshVS_TextPrsBuilder.hxx
index c3b7ef66ae..6e3356d0d0 100644
--- a/src/MeshVS/MeshVS_TextPrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_TextPrsBuilder.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_TextPrsBuilder,MeshVS_PrsBuilder)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_TextPrsBuilder,MeshVS_PrsBuilder)
 
 protected:
 
diff --git a/src/MeshVS/MeshVS_VectorPrsBuilder.cxx b/src/MeshVS/MeshVS_VectorPrsBuilder.cxx
index f4a0f96993..a68a322c75 100644
--- a/src/MeshVS/MeshVS_VectorPrsBuilder.cxx
+++ b/src/MeshVS/MeshVS_VectorPrsBuilder.cxx
@@ -47,6 +47,8 @@
 #include <TColStd_HPackedMapOfInteger.hxx>
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MeshVS_VectorPrsBuilder,MeshVS_PrsBuilder)
+
 //================================================================
 // Function : Constructor MeshVS_VectorPrsBuilder
 // Purpose  :
diff --git a/src/MeshVS/MeshVS_VectorPrsBuilder.hxx b/src/MeshVS/MeshVS_VectorPrsBuilder.hxx
index 104c946ebb..4f2bed81b5 100644
--- a/src/MeshVS/MeshVS_VectorPrsBuilder.hxx
+++ b/src/MeshVS/MeshVS_VectorPrsBuilder.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MeshVS_VectorPrsBuilder,MeshVS_PrsBuilder)
+  DEFINE_STANDARD_RTTIEXT(MeshVS_VectorPrsBuilder,MeshVS_PrsBuilder)
 
 protected:
 
diff --git a/src/Message/Message_Algorithm.cxx b/src/Message/Message_Algorithm.cxx
index cc6e00bd87..14847b3db6 100644
--- a/src/Message/Message_Algorithm.cxx
+++ b/src/Message/Message_Algorithm.cxx
@@ -31,6 +31,8 @@
 #include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
 #include <TColStd_SequenceOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Message_Algorithm,MMgt_TShared)
+
 //=======================================================================
 //function : SetMessenger
 //purpose  :
diff --git a/src/Message/Message_Algorithm.hxx b/src/Message/Message_Algorithm.hxx
index 10b7f459bb..8ce54ee711 100644
--- a/src/Message/Message_Algorithm.hxx
+++ b/src/Message/Message_Algorithm.hxx
@@ -200,7 +200,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Message_Algorithm,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Message_Algorithm,MMgt_TShared)
 
 protected:
 
diff --git a/src/Message/Message_Messenger.cxx b/src/Message/Message_Messenger.cxx
index d05a4c166a..3f7e4d658e 100644
--- a/src/Message/Message_Messenger.cxx
+++ b/src/Message/Message_Messenger.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Message_Messenger,MMgt_TShared)
+
 //=======================================================================
 //function : Message_Messenger
 //purpose  : 
diff --git a/src/Message/Message_Messenger.hxx b/src/Message/Message_Messenger.hxx
index 90f24cab47..6ea42e6ee6 100644
--- a/src/Message/Message_Messenger.hxx
+++ b/src/Message/Message_Messenger.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Message_Messenger,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Message_Messenger,MMgt_TShared)
 
 protected:
 
diff --git a/src/Message/Message_Printer.cxx b/src/Message/Message_Printer.cxx
index 73106941d7..7b7a29143f 100644
--- a/src/Message/Message_Printer.cxx
+++ b/src/Message/Message_Printer.cxx
@@ -19,6 +19,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Message_Printer,MMgt_TShared)
+
 //=======================================================================
 //function : Constructor
 //purpose  :
diff --git a/src/Message/Message_Printer.hxx b/src/Message/Message_Printer.hxx
index 262538f90f..2c53e51fa8 100644
--- a/src/Message/Message_Printer.hxx
+++ b/src/Message/Message_Printer.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Message_Printer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Message_Printer,MMgt_TShared)
 
 protected:
 
diff --git a/src/Message/Message_PrinterOStream.cxx b/src/Message/Message_PrinterOStream.cxx
index edf41fc4e9..36be8fe28f 100644
--- a/src/Message/Message_PrinterOStream.cxx
+++ b/src/Message/Message_PrinterOStream.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Message_PrinterOStream,Message_Printer)
+
 #ifndef _WIN32
   #include <strings.h>
 #endif
diff --git a/src/Message/Message_PrinterOStream.hxx b/src/Message/Message_PrinterOStream.hxx
index dc008a09c5..01c6a1c894 100644
--- a/src/Message/Message_PrinterOStream.hxx
+++ b/src/Message/Message_PrinterOStream.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Message_PrinterOStream,Message_Printer)
+  DEFINE_STANDARD_RTTIEXT(Message_PrinterOStream,Message_Printer)
 
 protected:
 
diff --git a/src/Message/Message_ProgressIndicator.cxx b/src/Message/Message_ProgressIndicator.cxx
index 758bfe07c4..9e6ad57c07 100644
--- a/src/Message/Message_ProgressIndicator.cxx
+++ b/src/Message/Message_ProgressIndicator.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Message_ProgressIndicator,MMgt_TShared)
+
 //=======================================================================
 //function : Message_ProgressIndicator
 //purpose  : 
diff --git a/src/Message/Message_ProgressIndicator.hxx b/src/Message/Message_ProgressIndicator.hxx
index 52d3cca7aa..1b45088384 100644
--- a/src/Message/Message_ProgressIndicator.hxx
+++ b/src/Message/Message_ProgressIndicator.hxx
@@ -171,7 +171,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Message_ProgressIndicator,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Message_ProgressIndicator,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_CaseData.cxx b/src/MoniTool/MoniTool_CaseData.cxx
index c3ccb950cd..4e9c1aa720 100644
--- a/src/MoniTool/MoniTool_CaseData.cxx
+++ b/src/MoniTool/MoniTool_CaseData.cxx
@@ -33,6 +33,8 @@
 #include <TopoDS_HShape.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_CaseData,MMgt_TShared)
+
 //#include <GeomTools.hxx>
 // definitions
 static Handle(Dico_DictionaryOfInteger)& defchecks()
diff --git a/src/MoniTool/MoniTool_CaseData.hxx b/src/MoniTool/MoniTool_CaseData.hxx
index 194ae77786..2fc2826f0b 100644
--- a/src/MoniTool/MoniTool_CaseData.hxx
+++ b/src/MoniTool/MoniTool_CaseData.hxx
@@ -286,7 +286,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_CaseData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_CaseData,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_Element.cxx b/src/MoniTool/MoniTool_Element.cxx
index 4361cf9b3c..f855e86511 100644
--- a/src/MoniTool/MoniTool_Element.cxx
+++ b/src/MoniTool/MoniTool_Element.cxx
@@ -16,6 +16,8 @@
 #include <MoniTool_Element.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_Element,MMgt_TShared)
+
 void  MoniTool_Element::SetHashCode (const Standard_Integer code)
       {  thecode = code;  }
 
diff --git a/src/MoniTool/MoniTool_Element.hxx b/src/MoniTool/MoniTool_Element.hxx
index dfcd042ac2..1ad736a0cd 100644
--- a/src/MoniTool/MoniTool_Element.hxx
+++ b/src/MoniTool/MoniTool_Element.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_Element,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_Element,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_IntVal.cxx b/src/MoniTool/MoniTool_IntVal.cxx
index adffc31ab4..54f3da6110 100644
--- a/src/MoniTool/MoniTool_IntVal.cxx
+++ b/src/MoniTool/MoniTool_IntVal.cxx
@@ -15,6 +15,8 @@
 #include <MoniTool_IntVal.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_IntVal,MMgt_TShared)
+
 MoniTool_IntVal::MoniTool_IntVal  (const Standard_Integer val)    {  theval = val;  }
 
 Standard_Integer  MoniTool_IntVal::Value () const  {  return theval;  }
diff --git a/src/MoniTool/MoniTool_IntVal.hxx b/src/MoniTool/MoniTool_IntVal.hxx
index ac78b26470..9d53aa365c 100644
--- a/src/MoniTool/MoniTool_IntVal.hxx
+++ b/src/MoniTool/MoniTool_IntVal.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_IntVal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_IntVal,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_Option.cxx b/src/MoniTool/MoniTool_Option.cxx
index 4481b57cd3..3bdbabdeb0 100644
--- a/src/MoniTool/MoniTool_Option.cxx
+++ b/src/MoniTool/MoniTool_Option.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_Option,MMgt_TShared)
+
 MoniTool_Option::MoniTool_Option
   (const Handle(Standard_Type)& atype, const Standard_CString aname)
     : thename (aname) , thetype (atype) 
diff --git a/src/MoniTool/MoniTool_Option.hxx b/src/MoniTool/MoniTool_Option.hxx
index a40c33fb10..12afd24c28 100644
--- a/src/MoniTool/MoniTool_Option.hxx
+++ b/src/MoniTool/MoniTool_Option.hxx
@@ -145,7 +145,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_Option,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_Option,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_Profile.cxx b/src/MoniTool/MoniTool_Profile.cxx
index d559f7b117..f9e7e8a72b 100644
--- a/src/MoniTool/MoniTool_Profile.cxx
+++ b/src/MoniTool/MoniTool_Profile.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_Profile,MMgt_TShared)
+
 static Standard_Boolean IsCurrent (const Standard_CString name)
 {  return (name[0] == '.' && name[1] == '\0');  }
 
diff --git a/src/MoniTool/MoniTool_Profile.hxx b/src/MoniTool/MoniTool_Profile.hxx
index 62539acaff..66a4a80100 100644
--- a/src/MoniTool/MoniTool_Profile.hxx
+++ b/src/MoniTool/MoniTool_Profile.hxx
@@ -206,7 +206,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_Profile,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_Profile,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_RealVal.cxx b/src/MoniTool/MoniTool_RealVal.cxx
index 8833873986..e828fe3159 100644
--- a/src/MoniTool/MoniTool_RealVal.cxx
+++ b/src/MoniTool/MoniTool_RealVal.cxx
@@ -15,6 +15,8 @@
 #include <MoniTool_RealVal.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_RealVal,MMgt_TShared)
+
 MoniTool_RealVal::MoniTool_RealVal  (const Standard_Real val)    {  theval = val;  }
 
 Standard_Real  MoniTool_RealVal::Value () const  {  return theval;  }
diff --git a/src/MoniTool/MoniTool_RealVal.hxx b/src/MoniTool/MoniTool_RealVal.hxx
index 26d17a0e1d..97b05c976c 100644
--- a/src/MoniTool/MoniTool_RealVal.hxx
+++ b/src/MoniTool/MoniTool_RealVal.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_RealVal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_RealVal,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_SignShape.cxx b/src/MoniTool/MoniTool_SignShape.cxx
index 23532bf9f3..6c9afd8f9a 100644
--- a/src/MoniTool/MoniTool_SignShape.cxx
+++ b/src/MoniTool/MoniTool_SignShape.cxx
@@ -19,6 +19,8 @@
 #include <TopoDS_HShape.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_SignShape,MoniTool_SignText)
+
 MoniTool_SignShape::MoniTool_SignShape ()    {  }
 
     Standard_CString  MoniTool_SignShape::Name () const
diff --git a/src/MoniTool/MoniTool_SignShape.hxx b/src/MoniTool/MoniTool_SignShape.hxx
index d9058327a7..f7835e5708 100644
--- a/src/MoniTool/MoniTool_SignShape.hxx
+++ b/src/MoniTool/MoniTool_SignShape.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_SignShape,MoniTool_SignText)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_SignShape,MoniTool_SignText)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_SignText.cxx b/src/MoniTool/MoniTool_SignText.cxx
index 8a0be6eacf..29d0bd5acd 100644
--- a/src/MoniTool/MoniTool_SignText.cxx
+++ b/src/MoniTool/MoniTool_SignText.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_SignText,MMgt_TShared)
+
 TCollection_AsciiString  MoniTool_SignText::TextAlone
   (const Handle(Standard_Transient)& ent) const
 {
diff --git a/src/MoniTool/MoniTool_SignText.hxx b/src/MoniTool/MoniTool_SignText.hxx
index 3c0060a279..e583b72dcf 100644
--- a/src/MoniTool/MoniTool_SignText.hxx
+++ b/src/MoniTool/MoniTool_SignText.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_SignText,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_SignText,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_Timer.cxx b/src/MoniTool/MoniTool_Timer.cxx
index b3a81a92ca..d666780933 100644
--- a/src/MoniTool/MoniTool_Timer.cxx
+++ b/src/MoniTool/MoniTool_Timer.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_Timer,MMgt_TShared)
+
 //=======================================================================
 //function : Dump
 //purpose  : 
diff --git a/src/MoniTool/MoniTool_Timer.hxx b/src/MoniTool/MoniTool_Timer.hxx
index a8b169172e..0752eb2852 100644
--- a/src/MoniTool/MoniTool_Timer.hxx
+++ b/src/MoniTool/MoniTool_Timer.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_Timer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_Timer,MMgt_TShared)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_TransientElem.cxx b/src/MoniTool/MoniTool_TransientElem.cxx
index c04c0067f0..1509629283 100644
--- a/src/MoniTool/MoniTool_TransientElem.cxx
+++ b/src/MoniTool/MoniTool_TransientElem.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_MapTransientHasher.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_TransientElem,MoniTool_Element)
+
 MoniTool_TransientElem::MoniTool_TransientElem (const Handle(Standard_Transient)& akey)
     : theval (akey)
 {  SetHashCode ( TColStd_MapTransientHasher::HashCode (akey, IntegerLast() ) );  }
diff --git a/src/MoniTool/MoniTool_TransientElem.hxx b/src/MoniTool/MoniTool_TransientElem.hxx
index bc65fc86a0..0d6050a21b 100644
--- a/src/MoniTool/MoniTool_TransientElem.hxx
+++ b/src/MoniTool/MoniTool_TransientElem.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_TransientElem,MoniTool_Element)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_TransientElem,MoniTool_Element)
 
 protected:
 
diff --git a/src/MoniTool/MoniTool_TypedValue.cxx b/src/MoniTool/MoniTool_TypedValue.cxx
index dcbfa7aca9..d08f5ef6fa 100644
--- a/src/MoniTool/MoniTool_TypedValue.cxx
+++ b/src/MoniTool/MoniTool_TypedValue.cxx
@@ -27,6 +27,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(MoniTool_TypedValue,MMgt_TShared)
+
 // Not Used :
 //static  char defmess[30];
 static Handle(Dico_DictionaryOfTransient) libtv()
diff --git a/src/MoniTool/MoniTool_TypedValue.hxx b/src/MoniTool/MoniTool_TypedValue.hxx
index 9b2a13876a..2ac7530a92 100644
--- a/src/MoniTool/MoniTool_TypedValue.hxx
+++ b/src/MoniTool/MoniTool_TypedValue.hxx
@@ -320,7 +320,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(MoniTool_TypedValue,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(MoniTool_TypedValue,MMgt_TShared)
 
 protected:
 
diff --git a/src/NCollection/NCollection_AccAllocator.cxx b/src/NCollection/NCollection_AccAllocator.cxx
index f8f1a4373a..ab0b0b0e55 100644
--- a/src/NCollection/NCollection_AccAllocator.cxx
+++ b/src/NCollection/NCollection_AccAllocator.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_AccAllocator,NCollection_BaseAllocator)
+
 //=======================================================================
 //function : NCollection_AccAllocator
 //purpose  : Constructor
diff --git a/src/NCollection/NCollection_AccAllocator.hxx b/src/NCollection/NCollection_AccAllocator.hxx
index 76049dc88c..67e3178315 100644
--- a/src/NCollection/NCollection_AccAllocator.hxx
+++ b/src/NCollection/NCollection_AccAllocator.hxx
@@ -173,7 +173,7 @@ protected:
 
 // Declaration of CASCADE RTTI
 public:
-  DEFINE_STANDARD_RTTI (NCollection_AccAllocator, NCollection_BaseAllocator)
+  DEFINE_STANDARD_RTTIEXT(NCollection_AccAllocator,NCollection_BaseAllocator)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/NCollection/NCollection_AlignedAllocator.cxx b/src/NCollection/NCollection_AlignedAllocator.cxx
index 8e7b652c05..05f6050243 100644
--- a/src/NCollection/NCollection_AlignedAllocator.cxx
+++ b/src/NCollection/NCollection_AlignedAllocator.cxx
@@ -19,6 +19,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_AlignedAllocator,NCollection_BaseAllocator)
+
 //=======================================================================
 //function : NCollection_AlignedAllocator()
 //purpose  : Constructor
diff --git a/src/NCollection/NCollection_AlignedAllocator.hxx b/src/NCollection/NCollection_AlignedAllocator.hxx
index 2502c5e39b..1e3187ffee 100644
--- a/src/NCollection/NCollection_AlignedAllocator.hxx
+++ b/src/NCollection/NCollection_AlignedAllocator.hxx
@@ -46,7 +46,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (NCollection_AlignedAllocator, NCollection_BaseAllocator)
+  DEFINE_STANDARD_RTTIEXT(NCollection_AlignedAllocator,NCollection_BaseAllocator)
 
 };
 
diff --git a/src/NCollection/NCollection_BaseAllocator.cxx b/src/NCollection/NCollection_BaseAllocator.cxx
index cfc71f58ac..0fcd972b20 100644
--- a/src/NCollection/NCollection_BaseAllocator.cxx
+++ b/src/NCollection/NCollection_BaseAllocator.cxx
@@ -25,6 +25,8 @@
 #include <iomanip>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_BaseAllocator,MMgt_TShared)
+
 //=======================================================================
 //function : Allocate
 //purpose  : Standard allocation
diff --git a/src/NCollection/NCollection_BaseAllocator.hxx b/src/NCollection/NCollection_BaseAllocator.hxx
index a58b56bde0..92de13bad9 100644
--- a/src/NCollection/NCollection_BaseAllocator.hxx
+++ b/src/NCollection/NCollection_BaseAllocator.hxx
@@ -78,7 +78,7 @@ class NCollection_BaseAllocator : public MMgt_TShared
 
  public:
   // ---------- CasCade RunTime Type Information
-  DEFINE_STANDARD_RTTI(NCollection_BaseAllocator, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(NCollection_BaseAllocator,MMgt_TShared)
 };
 
 DEFINE_STANDARD_HANDLE(NCollection_BaseAllocator,MMgt_TShared)
diff --git a/src/NCollection/NCollection_Buffer.hxx b/src/NCollection/NCollection_Buffer.hxx
index ba97296bf3..b51e514a4e 100644
--- a/src/NCollection/NCollection_Buffer.hxx
+++ b/src/NCollection/NCollection_Buffer.hxx
@@ -130,7 +130,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(NCollection_Buffer, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(NCollection_Buffer,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/NCollection/NCollection_DefineHArray1.hxx b/src/NCollection/NCollection_DefineHArray1.hxx
index 796dde0430..0090f999b6 100644
--- a/src/NCollection/NCollection_DefineHArray1.hxx
+++ b/src/NCollection/NCollection_DefineHArray1.hxx
@@ -39,7 +39,7 @@ class HClassName : public _Array1Type_, public MMgt_TShared {                  \
    HClassName  (const _Array1Type_& theOther) : _Array1Type_(theOther) {}      \
    const _Array1Type_& Array1 () const { return *this; }                       \
    _Array1Type_& ChangeArray1 ()       { return *this; }                       \
-   DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared)                              \
+   DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared)                              \
 };                                                                             \
 DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared)
 
diff --git a/src/NCollection/NCollection_DefineHArray2.hxx b/src/NCollection/NCollection_DefineHArray2.hxx
index d2e5a08157..67a6734138 100644
--- a/src/NCollection/NCollection_DefineHArray2.hxx
+++ b/src/NCollection/NCollection_DefineHArray2.hxx
@@ -44,7 +44,7 @@ class HClassName : public _Array2Type_, public MMgt_TShared {                  \
    HClassName  (const _Array2Type_& theOther) : _Array2Type_(theOther) {}      \
    const _Array2Type_& Array2 () const { return *this; }                       \
    _Array2Type_& ChangeArray2 ()       { return *this; }                       \
-   DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared)                              \
+   DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared)                              \
 };                                                                             \
 DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared)
 
diff --git a/src/NCollection/NCollection_DefineHSequence.hxx b/src/NCollection/NCollection_DefineHSequence.hxx
index 8857f1987c..d196f38d9b 100644
--- a/src/NCollection/NCollection_DefineHSequence.hxx
+++ b/src/NCollection/NCollection_DefineHSequence.hxx
@@ -44,7 +44,7 @@ class HClassName : public _SequenceType_, public MMgt_TShared {                \
                 typename std::enable_if<std::is_base_of<HClassName, T>::value>::type * = 0) { \
      _SequenceType_::Append (theOther->ChangeSequence());                      \
    }                                                                           \
-   DEFINE_STANDARD_RTTI (HClassName, MMgt_TShared)                             \
+   DEFINE_STANDARD_RTTI_INLINE(HClassName,MMgt_TShared)                             \
 }; \
 DEFINE_STANDARD_HANDLE (HClassName, MMgt_TShared) 
 
diff --git a/src/NCollection/NCollection_EBTree.hxx b/src/NCollection/NCollection_EBTree.hxx
index bc46ec67c7..961453263a 100644
--- a/src/NCollection/NCollection_EBTree.hxx
+++ b/src/NCollection/NCollection_EBTree.hxx
@@ -208,7 +208,7 @@ class _HEBTREE : public _HUBTREE                                        \
   const EBTree& ETree () const { return (const EBTree&) Tree(); }       \
   EBTree&       ChangeETree () { return (EBTree&) ChangeTree(); }       \
                                                                         \
-  DEFINE_STANDARD_RTTI (_HEBTREE, _HUBTREE)                                       \
+  DEFINE_STANDARD_RTTI_INLINE(_HEBTREE,_HUBTREE)                                       \
   /* Type management */                                                 \
 };                                                                      \
 DEFINE_STANDARD_HANDLE (_HEBTREE, _HUBTREE)
diff --git a/src/NCollection/NCollection_HeapAllocator.cxx b/src/NCollection/NCollection_HeapAllocator.cxx
index 9012b15604..cc34724f44 100644
--- a/src/NCollection/NCollection_HeapAllocator.cxx
+++ b/src/NCollection/NCollection_HeapAllocator.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Mutex.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_HeapAllocator,NCollection_BaseAllocator)
+
 //=======================================================================
 //function : Allocate
 //purpose  : 
diff --git a/src/NCollection/NCollection_HeapAllocator.hxx b/src/NCollection/NCollection_HeapAllocator.hxx
index 2dfb2636d1..d18c726df9 100644
--- a/src/NCollection/NCollection_HeapAllocator.hxx
+++ b/src/NCollection/NCollection_HeapAllocator.hxx
@@ -43,7 +43,7 @@ class NCollection_HeapAllocator : public NCollection_BaseAllocator
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (NCollection_HeapAllocator, NCollection_BaseAllocator)
+DEFINE_STANDARD_RTTIEXT(NCollection_HeapAllocator,NCollection_BaseAllocator)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/NCollection/NCollection_IncAllocator.cxx b/src/NCollection/NCollection_IncAllocator.cxx
index 4461318fb6..c4e29f40e1 100644
--- a/src/NCollection/NCollection_IncAllocator.cxx
+++ b/src/NCollection/NCollection_IncAllocator.cxx
@@ -23,6 +23,8 @@
 #include <iomanip>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_IncAllocator,NCollection_BaseAllocator)
+
 namespace
 {
 
diff --git a/src/NCollection/NCollection_IncAllocator.hxx b/src/NCollection/NCollection_IncAllocator.hxx
index 27a030d7c4..fa6f53f871 100644
--- a/src/NCollection/NCollection_IncAllocator.hxx
+++ b/src/NCollection/NCollection_IncAllocator.hxx
@@ -111,7 +111,7 @@ class NCollection_IncAllocator : public NCollection_BaseAllocator
 
  public:
 // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (NCollection_IncAllocator, NCollection_BaseAllocator)
+  DEFINE_STANDARD_RTTIEXT(NCollection_IncAllocator,NCollection_BaseAllocator)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/NCollection/NCollection_UBTree.hxx b/src/NCollection/NCollection_UBTree.hxx
index 0ee6005226..e39371a140 100644
--- a/src/NCollection/NCollection_UBTree.hxx
+++ b/src/NCollection/NCollection_UBTree.hxx
@@ -482,7 +482,7 @@ class _HUBTREE : public _HPARENT                                        \
   ~_HUBTREE () { delete myTree; }                                       \
   /* Destructor */                                                      \
                                                                         \
-  DEFINE_STANDARD_RTTI (_HUBTREE, _HPARENT)                                       \
+  DEFINE_STANDARD_RTTI_INLINE(_HUBTREE,_HPARENT)                                       \
   /* Type management */                                                 \
                                                                         \
  private:                                                               \
diff --git a/src/NCollection/NCollection_WinHeapAllocator.cxx b/src/NCollection/NCollection_WinHeapAllocator.cxx
index fa28019933..39628f5cae 100644
--- a/src/NCollection/NCollection_WinHeapAllocator.cxx
+++ b/src/NCollection/NCollection_WinHeapAllocator.cxx
@@ -16,6 +16,8 @@
 #include <NCollection_WinHeapAllocator.hxx>
 #include <Standard_OutOfMemory.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NCollection_WinHeapAllocator,NCollection_BaseAllocator)
+
 #if(defined(_WIN32) || defined(__WIN32__))
   #include <windows.h>
 #endif
diff --git a/src/NCollection/NCollection_WinHeapAllocator.hxx b/src/NCollection/NCollection_WinHeapAllocator.hxx
index 625617e13f..3a10fd226e 100644
--- a/src/NCollection/NCollection_WinHeapAllocator.hxx
+++ b/src/NCollection/NCollection_WinHeapAllocator.hxx
@@ -48,7 +48,7 @@ public:
   Standard_EXPORT virtual void  Free (void* theAddress) Standard_OVERRIDE;
 
   // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI(NCollection_WinHeapAllocator, NCollection_BaseAllocator)
+  DEFINE_STANDARD_RTTIEXT(NCollection_WinHeapAllocator,NCollection_BaseAllocator)
 
 private:
   //! Copy constructor - prohibited
diff --git a/src/NLPlate/NLPlate_HGPPConstraint.cxx b/src/NLPlate/NLPlate_HGPPConstraint.cxx
index 4c3b151158..7be610ca59 100644
--- a/src/NLPlate/NLPlate_HGPPConstraint.cxx
+++ b/src/NLPlate/NLPlate_HGPPConstraint.cxx
@@ -23,6 +23,8 @@
 #include <Plate_D3.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HGPPConstraint,MMgt_TShared)
+
 void NLPlate_HGPPConstraint::SetUVFreeSliding(const Standard_Boolean) 
 {
 }
diff --git a/src/NLPlate/NLPlate_HGPPConstraint.hxx b/src/NLPlate/NLPlate_HGPPConstraint.hxx
index ec9a597e7c..43d9e3bfcd 100644
--- a/src/NLPlate/NLPlate_HGPPConstraint.hxx
+++ b/src/NLPlate/NLPlate_HGPPConstraint.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HGPPConstraint,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HGPPConstraint,MMgt_TShared)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG0Constraint.cxx b/src/NLPlate/NLPlate_HPG0Constraint.cxx
index 0a294b0232..fc7c4ae7e3 100644
--- a/src/NLPlate/NLPlate_HPG0Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG0Constraint.cxx
@@ -20,6 +20,8 @@
 #include <NLPlate_HPG0Constraint.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG0Constraint,NLPlate_HGPPConstraint)
+
 NLPlate_HPG0Constraint::NLPlate_HPG0Constraint(const gp_XY& UV,const gp_XYZ& Value)
 :myXYZTarget(Value)
 {
diff --git a/src/NLPlate/NLPlate_HPG0Constraint.hxx b/src/NLPlate/NLPlate_HPG0Constraint.hxx
index bcf1378700..0959d886d2 100644
--- a/src/NLPlate/NLPlate_HPG0Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG0Constraint.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG0Constraint,NLPlate_HGPPConstraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG0Constraint,NLPlate_HGPPConstraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG0G1Constraint.cxx b/src/NLPlate/NLPlate_HPG0G1Constraint.cxx
index 788f863f36..ed808e7fbb 100644
--- a/src/NLPlate/NLPlate_HPG0G1Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG0G1Constraint.cxx
@@ -21,6 +21,8 @@
 #include <Plate_D1.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG0G1Constraint,NLPlate_HPG0Constraint)
+
 NLPlate_HPG0G1Constraint::NLPlate_HPG0G1Constraint(const gp_XY& UV,const gp_XYZ& Value,const Plate_D1& D1T)
 : NLPlate_HPG0Constraint(UV,Value),myG1Target(D1T)
 {
diff --git a/src/NLPlate/NLPlate_HPG0G1Constraint.hxx b/src/NLPlate/NLPlate_HPG0G1Constraint.hxx
index 8c5010a221..ba84013ae5 100644
--- a/src/NLPlate/NLPlate_HPG0G1Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG0G1Constraint.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG0G1Constraint,NLPlate_HPG0Constraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG0G1Constraint,NLPlate_HPG0Constraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG0G2Constraint.cxx b/src/NLPlate/NLPlate_HPG0G2Constraint.cxx
index 69d1619f5a..4d02f12021 100644
--- a/src/NLPlate/NLPlate_HPG0G2Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG0G2Constraint.cxx
@@ -22,6 +22,8 @@
 #include <Plate_D2.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG0G2Constraint,NLPlate_HPG0G1Constraint)
+
 NLPlate_HPG0G2Constraint::NLPlate_HPG0G2Constraint(const gp_XY& UV, const gp_XYZ& Value, const Plate_D1& D1T, const Plate_D2& D2T)
 : NLPlate_HPG0G1Constraint(UV,Value,D1T), myG2Target(D2T)
 {
diff --git a/src/NLPlate/NLPlate_HPG0G2Constraint.hxx b/src/NLPlate/NLPlate_HPG0G2Constraint.hxx
index 7307ee9c1d..164c182500 100644
--- a/src/NLPlate/NLPlate_HPG0G2Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG0G2Constraint.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG0G2Constraint,NLPlate_HPG0G1Constraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG0G2Constraint,NLPlate_HPG0G1Constraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG0G3Constraint.cxx b/src/NLPlate/NLPlate_HPG0G3Constraint.cxx
index 356d21614b..50f4d93e1d 100644
--- a/src/NLPlate/NLPlate_HPG0G3Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG0G3Constraint.cxx
@@ -23,6 +23,8 @@
 #include <Plate_D3.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG0G3Constraint,NLPlate_HPG0G2Constraint)
+
 NLPlate_HPG0G3Constraint::NLPlate_HPG0G3Constraint(const gp_XY& UV,const gp_XYZ& Value,const Plate_D1& D1T,const Plate_D2& D2T,const Plate_D3& D3T)
 : NLPlate_HPG0G2Constraint(UV,Value,D1T,D2T), myG3Target(D3T)
 {
diff --git a/src/NLPlate/NLPlate_HPG0G3Constraint.hxx b/src/NLPlate/NLPlate_HPG0G3Constraint.hxx
index 8f9cdf922b..0893467e53 100644
--- a/src/NLPlate/NLPlate_HPG0G3Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG0G3Constraint.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG0G3Constraint,NLPlate_HPG0G2Constraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG0G3Constraint,NLPlate_HPG0G2Constraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG1Constraint.cxx b/src/NLPlate/NLPlate_HPG1Constraint.cxx
index 9a67b7f3a6..49bafcf383 100644
--- a/src/NLPlate/NLPlate_HPG1Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG1Constraint.cxx
@@ -20,6 +20,8 @@
 #include <Plate_D1.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG1Constraint,NLPlate_HGPPConstraint)
+
 NLPlate_HPG1Constraint::NLPlate_HPG1Constraint(const gp_XY& UV,const Plate_D1& D1T)
 :myG1Target(D1T)
 {
diff --git a/src/NLPlate/NLPlate_HPG1Constraint.hxx b/src/NLPlate/NLPlate_HPG1Constraint.hxx
index 03d3118326..c815bfd715 100644
--- a/src/NLPlate/NLPlate_HPG1Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG1Constraint.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG1Constraint,NLPlate_HGPPConstraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG1Constraint,NLPlate_HGPPConstraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG2Constraint.cxx b/src/NLPlate/NLPlate_HPG2Constraint.cxx
index a6c4d98ff2..7c1c9ed119 100644
--- a/src/NLPlate/NLPlate_HPG2Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG2Constraint.cxx
@@ -21,6 +21,8 @@
 #include <Plate_D2.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG2Constraint,NLPlate_HPG1Constraint)
+
 NLPlate_HPG2Constraint::NLPlate_HPG2Constraint(const gp_XY& UV,const Plate_D1& D1T,const Plate_D2& D2T)
 :NLPlate_HPG1Constraint(UV,D1T),myG2Target(D2T)
 {
diff --git a/src/NLPlate/NLPlate_HPG2Constraint.hxx b/src/NLPlate/NLPlate_HPG2Constraint.hxx
index b1b25149c2..04c76d54e6 100644
--- a/src/NLPlate/NLPlate_HPG2Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG2Constraint.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG2Constraint,NLPlate_HPG1Constraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG2Constraint,NLPlate_HPG1Constraint)
 
 protected:
 
diff --git a/src/NLPlate/NLPlate_HPG3Constraint.cxx b/src/NLPlate/NLPlate_HPG3Constraint.cxx
index 2b334b8ae8..e01041aa84 100644
--- a/src/NLPlate/NLPlate_HPG3Constraint.cxx
+++ b/src/NLPlate/NLPlate_HPG3Constraint.cxx
@@ -22,6 +22,8 @@
 #include <Plate_D3.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(NLPlate_HPG3Constraint,NLPlate_HPG2Constraint)
+
 NLPlate_HPG3Constraint::NLPlate_HPG3Constraint(const gp_XY& UV,const Plate_D1& D1T,const Plate_D2& D2T,const Plate_D3& D3T)
 :NLPlate_HPG2Constraint(UV,D1T,D2T),myG3Target(D3T)
 {
diff --git a/src/NLPlate/NLPlate_HPG3Constraint.hxx b/src/NLPlate/NLPlate_HPG3Constraint.hxx
index b01e026a1f..20bd228278 100644
--- a/src/NLPlate/NLPlate_HPG3Constraint.hxx
+++ b/src/NLPlate/NLPlate_HPG3Constraint.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(NLPlate_HPG3Constraint,NLPlate_HPG2Constraint)
+  DEFINE_STANDARD_RTTIEXT(NLPlate_HPG3Constraint,NLPlate_HPG2Constraint)
 
 protected:
 
diff --git a/src/OpenGl/OpenGl_CappingAlgo.cxx b/src/OpenGl/OpenGl_CappingAlgo.cxx
index 33d6df3b33..636c31898b 100755
--- a/src/OpenGl/OpenGl_CappingAlgo.cxx
+++ b/src/OpenGl/OpenGl_CappingAlgo.cxx
@@ -22,6 +22,8 @@
 #include <OpenGl_Structure.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_CappingAlgoFilter,OpenGl_RenderFilter)
+
 namespace
 {
 #if !defined(GL_ES_VERSION_2_0)
diff --git a/src/OpenGl/OpenGl_CappingAlgo.hxx b/src/OpenGl/OpenGl_CappingAlgo.hxx
index 76e7b2dfff..a2497b17ad 100755
--- a/src/OpenGl/OpenGl_CappingAlgo.hxx
+++ b/src/OpenGl/OpenGl_CappingAlgo.hxx
@@ -59,7 +59,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_CappingAlgoFilter, OpenGl_RenderFilter)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_CappingAlgoFilter,OpenGl_RenderFilter)
 };
 
 #endif
diff --git a/src/OpenGl/OpenGl_CappingPlaneResource.cxx b/src/OpenGl/OpenGl_CappingPlaneResource.cxx
index b88e3fbcac..8cb48cfcbf 100755
--- a/src/OpenGl/OpenGl_CappingPlaneResource.cxx
+++ b/src/OpenGl/OpenGl_CappingPlaneResource.cxx
@@ -19,6 +19,8 @@
 #include <OpenGl_Vec.hxx>
 #include <Precision.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_CappingPlaneResource,OpenGl_Resource)
+
 namespace
 {
   //! 12 plane vertices, interleaved:
diff --git a/src/OpenGl/OpenGl_CappingPlaneResource.hxx b/src/OpenGl/OpenGl_CappingPlaneResource.hxx
index 1a29c331ed..b3f66b1343 100755
--- a/src/OpenGl/OpenGl_CappingPlaneResource.hxx
+++ b/src/OpenGl/OpenGl_CappingPlaneResource.hxx
@@ -81,7 +81,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_CappingPlaneResource, OpenGl_Resource) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_CappingPlaneResource,OpenGl_Resource) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_Caps.cxx b/src/OpenGl/OpenGl_Caps.cxx
index 01a950ec77..76ed855e96 100755
--- a/src/OpenGl/OpenGl_Caps.cxx
+++ b/src/OpenGl/OpenGl_Caps.cxx
@@ -18,6 +18,8 @@
 #include <OpenGl_GlCore20.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Caps,Standard_Transient)
+
 // =======================================================================
 // function : OpenGl_Caps
 // purpose  :
diff --git a/src/OpenGl/OpenGl_Caps.hxx b/src/OpenGl/OpenGl_Caps.hxx
index dc7c5bf26a..6e003394b5 100755
--- a/src/OpenGl/OpenGl_Caps.hxx
+++ b/src/OpenGl/OpenGl_Caps.hxx
@@ -131,7 +131,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Caps, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Caps,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_Context.hxx b/src/OpenGl/OpenGl_Context.hxx
index 90b151b592..4c7024db40 100644
--- a/src/OpenGl/OpenGl_Context.hxx
+++ b/src/OpenGl/OpenGl_Context.hxx
@@ -729,7 +729,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Context, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Context,Standard_Transient) // Type definition
 
   friend class OpenGl_Window;
 
diff --git a/src/OpenGl/OpenGl_Font.cxx b/src/OpenGl/OpenGl_Font.cxx
index f7f1abb761..b302f8459c 100755
--- a/src/OpenGl/OpenGl_Font.cxx
+++ b/src/OpenGl/OpenGl_Font.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_ExtendedString.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Font,OpenGl_Resource)
+
 // =======================================================================
 // function : OpenGl_Font
 // purpose  :
diff --git a/src/OpenGl/OpenGl_Font.hxx b/src/OpenGl/OpenGl_Font.hxx
index aca7c177f9..4977b3f125 100755
--- a/src/OpenGl/OpenGl_Font.hxx
+++ b/src/OpenGl/OpenGl_Font.hxx
@@ -146,7 +146,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Font, OpenGl_Resource) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Font,OpenGl_Resource) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_FrameBuffer.cxx b/src/OpenGl/OpenGl_FrameBuffer.cxx
index d1a11d3434..8b813531ab 100644
--- a/src/OpenGl/OpenGl_FrameBuffer.cxx
+++ b/src/OpenGl/OpenGl_FrameBuffer.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_FrameBuffer,OpenGl_Resource)
+
 namespace
 {
 
diff --git a/src/OpenGl/OpenGl_FrameBuffer.hxx b/src/OpenGl/OpenGl_FrameBuffer.hxx
index b99fd98af4..2e06a728ee 100644
--- a/src/OpenGl/OpenGl_FrameBuffer.hxx
+++ b/src/OpenGl/OpenGl_FrameBuffer.hxx
@@ -210,7 +210,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_FrameBuffer, OpenGl_Resource) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_FrameBuffer,OpenGl_Resource) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_GraphicDriver.cxx b/src/OpenGl/OpenGl_GraphicDriver.cxx
index 3881cfe58c..cb4dc52165 100644
--- a/src/OpenGl/OpenGl_GraphicDriver.cxx
+++ b/src/OpenGl/OpenGl_GraphicDriver.cxx
@@ -30,6 +30,8 @@
 #include <OSD_Environment.hxx>
 #include <Standard_NotImplemented.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_GraphicDriver,Graphic3d_GraphicDriver)
+
 #if defined(_WIN32)
   #include <WNT_Window.hxx>
 #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
diff --git a/src/OpenGl/OpenGl_GraphicDriver.hxx b/src/OpenGl/OpenGl_GraphicDriver.hxx
index 3d990e9da5..00cb6a34d9 100644
--- a/src/OpenGl/OpenGl_GraphicDriver.hxx
+++ b/src/OpenGl/OpenGl_GraphicDriver.hxx
@@ -206,7 +206,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_GraphicDriver, Graphic3d_GraphicDriver)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_GraphicDriver,Graphic3d_GraphicDriver)
 
 protected:
 
diff --git a/src/OpenGl/OpenGl_Group.cxx b/src/OpenGl/OpenGl_Group.cxx
index 917d2836dc..84d3466182 100644
--- a/src/OpenGl/OpenGl_Group.cxx
+++ b/src/OpenGl/OpenGl_Group.cxx
@@ -28,6 +28,8 @@
 #include <Graphic3d_GroupDefinitionError.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Group,Graphic3d_Group)
+
 // =======================================================================
 // function : OpenGl_Group
 // purpose  :
diff --git a/src/OpenGl/OpenGl_Group.hxx b/src/OpenGl/OpenGl_Group.hxx
index 22e41929c3..af592d49fb 100644
--- a/src/OpenGl/OpenGl_Group.hxx
+++ b/src/OpenGl/OpenGl_Group.hxx
@@ -133,7 +133,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Group, Graphic3d_Group) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Group,Graphic3d_Group) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_IndexBuffer.cxx b/src/OpenGl/OpenGl_IndexBuffer.cxx
index e883b6b4ae..30cf5f4687 100644
--- a/src/OpenGl/OpenGl_IndexBuffer.cxx
+++ b/src/OpenGl/OpenGl_IndexBuffer.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_IndexBuffer,OpenGl_VertexBuffer)
+
 // =======================================================================
 // function : OpenGl_IndexBuffer
 // purpose  :
diff --git a/src/OpenGl/OpenGl_IndexBuffer.hxx b/src/OpenGl/OpenGl_IndexBuffer.hxx
index efae415072..8189677c33 100644
--- a/src/OpenGl/OpenGl_IndexBuffer.hxx
+++ b/src/OpenGl/OpenGl_IndexBuffer.hxx
@@ -27,7 +27,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_IndexBuffer, OpenGl_VertexBuffer) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_IndexBuffer,OpenGl_VertexBuffer) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_LineAttributes.cxx b/src/OpenGl/OpenGl_LineAttributes.cxx
index 3ac75e415f..335a4aed75 100644
--- a/src/OpenGl/OpenGl_LineAttributes.cxx
+++ b/src/OpenGl/OpenGl_LineAttributes.cxx
@@ -18,6 +18,8 @@
 #include <OpenGl_LineAttributes.hxx>
 #include <OpenGl_Context.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_LineAttributes,OpenGl_Resource)
+
 static const unsigned int myInteriors[TEL_HS_USER_DEF_START][32] =
 {
   //TEL_HS_SOLID
diff --git a/src/OpenGl/OpenGl_LineAttributes.hxx b/src/OpenGl/OpenGl_LineAttributes.hxx
index 7a9c884d07..8cfca1d184 100644
--- a/src/OpenGl/OpenGl_LineAttributes.hxx
+++ b/src/OpenGl/OpenGl_LineAttributes.hxx
@@ -42,7 +42,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_LineAttributes, OpenGl_Resource)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_LineAttributes,OpenGl_Resource)
 
 };
 
diff --git a/src/OpenGl/OpenGl_PointSprite.cxx b/src/OpenGl/OpenGl_PointSprite.cxx
index df734d3736..57ff6b690e 100755
--- a/src/OpenGl/OpenGl_PointSprite.cxx
+++ b/src/OpenGl/OpenGl_PointSprite.cxx
@@ -20,6 +20,8 @@
 #include <Image_PixMap.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_PointSprite,OpenGl_Texture)
+
 // =======================================================================
 // function : OpenGl_PointSprite
 // purpose  :
diff --git a/src/OpenGl/OpenGl_PointSprite.hxx b/src/OpenGl/OpenGl_PointSprite.hxx
index 92f663337a..bf550ab845 100755
--- a/src/OpenGl/OpenGl_PointSprite.hxx
+++ b/src/OpenGl/OpenGl_PointSprite.hxx
@@ -56,7 +56,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_PointSprite, OpenGl_Texture) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_PointSprite,OpenGl_Texture) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_PrinterContext.cxx b/src/OpenGl/OpenGl_PrinterContext.cxx
index 93eef99c60..a4434378bd 100644
--- a/src/OpenGl/OpenGl_PrinterContext.cxx
+++ b/src/OpenGl/OpenGl_PrinterContext.cxx
@@ -17,6 +17,8 @@
 #include <OpenGl_PrinterContext.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_PrinterContext,Standard_Transient)
+
 //=======================================================================
 //function : OpenGl_PrinterContext
 //purpose  :
diff --git a/src/OpenGl/OpenGl_PrinterContext.hxx b/src/OpenGl/OpenGl_PrinterContext.hxx
index f9e9777f95..943960b2d4 100644
--- a/src/OpenGl/OpenGl_PrinterContext.hxx
+++ b/src/OpenGl/OpenGl_PrinterContext.hxx
@@ -82,7 +82,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_PrinterContext, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_PrinterContext,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_RenderFilter.cxx b/src/OpenGl/OpenGl_RenderFilter.cxx
index 21fd26410d..8e516dd766 100755
--- a/src/OpenGl/OpenGl_RenderFilter.cxx
+++ b/src/OpenGl/OpenGl_RenderFilter.cxx
@@ -16,3 +16,5 @@
 #include <OpenGl_RenderFilter.hxx>
 
 
+
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_RenderFilter,Standard_Transient)
\ No newline at end of file
diff --git a/src/OpenGl/OpenGl_RenderFilter.hxx b/src/OpenGl/OpenGl_RenderFilter.hxx
index 9be8c0564a..a82a1cc445 100755
--- a/src/OpenGl/OpenGl_RenderFilter.hxx
+++ b/src/OpenGl/OpenGl_RenderFilter.hxx
@@ -38,7 +38,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_RenderFilter, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_RenderFilter,Standard_Transient)
 };
 
 #endif
diff --git a/src/OpenGl/OpenGl_Resource.cxx b/src/OpenGl/OpenGl_Resource.cxx
index 2edacf3ec0..802af35e91 100644
--- a/src/OpenGl/OpenGl_Resource.cxx
+++ b/src/OpenGl/OpenGl_Resource.cxx
@@ -16,5 +16,7 @@
 #include <OpenGl_Resource.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Resource,Standard_Transient)
+
 OpenGl_Resource::OpenGl_Resource() {}
 OpenGl_Resource::~OpenGl_Resource() {}
diff --git a/src/OpenGl/OpenGl_Resource.hxx b/src/OpenGl/OpenGl_Resource.hxx
index 5e908d66db..0ebf4b3609 100644
--- a/src/OpenGl/OpenGl_Resource.hxx
+++ b/src/OpenGl/OpenGl_Resource.hxx
@@ -53,7 +53,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Resource, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Resource,Standard_Transient) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_Sampler.cxx b/src/OpenGl/OpenGl_Sampler.cxx
index 13d5b290bf..ea2423bbc1 100644
--- a/src/OpenGl/OpenGl_Sampler.cxx
+++ b/src/OpenGl/OpenGl_Sampler.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Sampler,OpenGl_Resource)
+
 // =======================================================================
 // function : OpenGl_Sampler
 // purpose  :
diff --git a/src/OpenGl/OpenGl_Sampler.hxx b/src/OpenGl/OpenGl_Sampler.hxx
index 4574147aa2..83a7a86995 100644
--- a/src/OpenGl/OpenGl_Sampler.hxx
+++ b/src/OpenGl/OpenGl_Sampler.hxx
@@ -79,7 +79,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Sampler, OpenGl_Resource)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Sampler,OpenGl_Resource)
 
 };
 
diff --git a/src/OpenGl/OpenGl_SetOfShaderPrograms.hxx b/src/OpenGl/OpenGl_SetOfShaderPrograms.hxx
index 0f2ad907a7..abf31697e7 100644
--- a/src/OpenGl/OpenGl_SetOfShaderPrograms.hxx
+++ b/src/OpenGl/OpenGl_SetOfShaderPrograms.hxx
@@ -50,7 +50,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (OpenGl_SetOfShaderPrograms, Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(OpenGl_SetOfShaderPrograms,Standard_Transient)
 
 };
 
diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx
index caf3fec752..c9e5fbb110 100644
--- a/src/OpenGl/OpenGl_ShaderManager.cxx
+++ b/src/OpenGl/OpenGl_ShaderManager.cxx
@@ -31,6 +31,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_ShaderManager,Standard_Transient)
+
 namespace
 {
 
diff --git a/src/OpenGl/OpenGl_ShaderManager.hxx b/src/OpenGl/OpenGl_ShaderManager.hxx
index f5e4d30052..662f094fac 100644
--- a/src/OpenGl/OpenGl_ShaderManager.hxx
+++ b/src/OpenGl/OpenGl_ShaderManager.hxx
@@ -421,7 +421,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI (OpenGl_ShaderManager, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_ShaderManager,Standard_Transient)
 
 };
 
diff --git a/src/OpenGl/OpenGl_ShaderObject.cxx b/src/OpenGl/OpenGl_ShaderObject.cxx
index d0d3bc8680..c9cfd8050a 100755
--- a/src/OpenGl/OpenGl_ShaderObject.cxx
+++ b/src/OpenGl/OpenGl_ShaderObject.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_AsciiString.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_ShaderObject,OpenGl_Resource)
+
 // =======================================================================
 // function : OpenGl_ShaderObject
 // purpose  : Creates uninitialized shader object
diff --git a/src/OpenGl/OpenGl_ShaderObject.hxx b/src/OpenGl/OpenGl_ShaderObject.hxx
index 75bf2dd67b..b6aecbb26f 100755
--- a/src/OpenGl/OpenGl_ShaderObject.hxx
+++ b/src/OpenGl/OpenGl_ShaderObject.hxx
@@ -71,7 +71,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (OpenGl_ShaderObject, OpenGl_Resource)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_ShaderObject,OpenGl_Resource)
   friend class OpenGl_ShaderProgram;
 
 };
diff --git a/src/OpenGl/OpenGl_ShaderProgram.cxx b/src/OpenGl/OpenGl_ShaderProgram.cxx
index aff7a67fc0..edf9ad20e8 100755
--- a/src/OpenGl/OpenGl_ShaderProgram.cxx
+++ b/src/OpenGl/OpenGl_ShaderProgram.cxx
@@ -28,6 +28,8 @@
 
 #include <OpenGl_GlCore32.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_ShaderProgram,OpenGl_Resource)
+
 OpenGl_VariableSetterSelector OpenGl_ShaderProgram::mySetterSelector = OpenGl_VariableSetterSelector();
 
 // Declare OCCT-specific OpenGL/GLSL shader variables
diff --git a/src/OpenGl/OpenGl_ShaderProgram.hxx b/src/OpenGl/OpenGl_ShaderProgram.hxx
index b2d6aa9028..8d86d27687 100755
--- a/src/OpenGl/OpenGl_ShaderProgram.hxx
+++ b/src/OpenGl/OpenGl_ShaderProgram.hxx
@@ -550,7 +550,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI (OpenGl_ShaderProgram, OpenGl_Resource)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_ShaderProgram,OpenGl_Resource)
   friend class OpenGl_ShaderManager;
 
 };
diff --git a/src/OpenGl/OpenGl_Structure.cxx b/src/OpenGl/OpenGl_Structure.cxx
index 01e05467d3..31d7a4de41 100644
--- a/src/OpenGl/OpenGl_Structure.cxx
+++ b/src/OpenGl/OpenGl_Structure.cxx
@@ -28,6 +28,8 @@
 #include <Graphic3d_SequenceOfHClipPlane.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Structure,Graphic3d_CStructure)
+
 //! Auxiliary class for bounding box presentation
 class OpenGl_BndBoxPrs : public OpenGl_Element
 {
diff --git a/src/OpenGl/OpenGl_Structure.hxx b/src/OpenGl/OpenGl_Structure.hxx
index afe02b48cb..6a4f2157c5 100644
--- a/src/OpenGl/OpenGl_Structure.hxx
+++ b/src/OpenGl/OpenGl_Structure.hxx
@@ -225,7 +225,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Structure, Graphic3d_CStructure) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Structure,Graphic3d_CStructure) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_StructureShadow.cxx b/src/OpenGl/OpenGl_StructureShadow.cxx
index 100dca0d11..f53fe405cd 100644
--- a/src/OpenGl/OpenGl_StructureShadow.cxx
+++ b/src/OpenGl/OpenGl_StructureShadow.cxx
@@ -17,6 +17,8 @@
 
 #include <Graphic3d_GraphicDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_StructureShadow,OpenGl_Structure)
+
 //=======================================================================
 //function : OpenGl_StructureShadow
 //purpose  :
diff --git a/src/OpenGl/OpenGl_StructureShadow.hxx b/src/OpenGl/OpenGl_StructureShadow.hxx
index 04c70b1b48..c5a19ec496 100644
--- a/src/OpenGl/OpenGl_StructureShadow.hxx
+++ b/src/OpenGl/OpenGl_StructureShadow.hxx
@@ -51,7 +51,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_StructureShadow, OpenGl_Structure) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_StructureShadow,OpenGl_Structure) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_Texture.cxx b/src/OpenGl/OpenGl_Texture.cxx
index 610b828286..93f7008697 100644
--- a/src/OpenGl/OpenGl_Texture.cxx
+++ b/src/OpenGl/OpenGl_Texture.cxx
@@ -23,6 +23,8 @@
 #include <Image_PixMap.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Texture,OpenGl_Resource)
+
 //! Simple class to reset unpack alignment settings
 struct OpenGl_UnpackAlignmentSentry
 {
diff --git a/src/OpenGl/OpenGl_Texture.hxx b/src/OpenGl/OpenGl_Texture.hxx
index e3433a6afb..34455ce4cd 100644
--- a/src/OpenGl/OpenGl_Texture.hxx
+++ b/src/OpenGl/OpenGl_Texture.hxx
@@ -424,7 +424,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Texture, OpenGl_Resource) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Texture,OpenGl_Resource) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_TextureBufferArb.cxx b/src/OpenGl/OpenGl_TextureBufferArb.cxx
index 359c62befd..5a8ca34b63 100644
--- a/src/OpenGl/OpenGl_TextureBufferArb.cxx
+++ b/src/OpenGl/OpenGl_TextureBufferArb.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_TextureBufferArb,OpenGl_VertexBuffer)
+
 // =======================================================================
 // function : OpenGl_TextureBufferArb
 // purpose  :
diff --git a/src/OpenGl/OpenGl_TextureBufferArb.hxx b/src/OpenGl/OpenGl_TextureBufferArb.hxx
index 4fc82b4f83..7b0a51256c 100644
--- a/src/OpenGl/OpenGl_TextureBufferArb.hxx
+++ b/src/OpenGl/OpenGl_TextureBufferArb.hxx
@@ -91,7 +91,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_TextureBufferArb, OpenGl_VertexBuffer) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_TextureBufferArb,OpenGl_VertexBuffer) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_VertexBuffer.cxx b/src/OpenGl/OpenGl_VertexBuffer.cxx
index aa37f4c861..0934c39d96 100644
--- a/src/OpenGl/OpenGl_VertexBuffer.cxx
+++ b/src/OpenGl/OpenGl_VertexBuffer.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Assert.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_VertexBuffer,OpenGl_Resource)
+
 // =======================================================================
 // function : OpenGl_VertexBuffer
 // purpose  :
diff --git a/src/OpenGl/OpenGl_VertexBuffer.hxx b/src/OpenGl/OpenGl_VertexBuffer.hxx
index 8faf00becb..decacec959 100644
--- a/src/OpenGl/OpenGl_VertexBuffer.hxx
+++ b/src/OpenGl/OpenGl_VertexBuffer.hxx
@@ -327,7 +327,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_VertexBuffer, OpenGl_Resource) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_VertexBuffer,OpenGl_Resource) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_VertexBufferCompat.cxx b/src/OpenGl/OpenGl_VertexBufferCompat.cxx
index f81d2cd206..1b11c3b26f 100644
--- a/src/OpenGl/OpenGl_VertexBufferCompat.cxx
+++ b/src/OpenGl/OpenGl_VertexBufferCompat.cxx
@@ -17,6 +17,8 @@
 #include <NCollection_AlignedAllocator.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_VertexBufferCompat,OpenGl_VertexBuffer)
+
 // =======================================================================
 // function : OpenGl_VertexBufferCompat
 // purpose  :
diff --git a/src/OpenGl/OpenGl_VertexBufferCompat.hxx b/src/OpenGl/OpenGl_VertexBufferCompat.hxx
index 741fcc70b2..7106929c27 100644
--- a/src/OpenGl/OpenGl_VertexBufferCompat.hxx
+++ b/src/OpenGl/OpenGl_VertexBufferCompat.hxx
@@ -85,7 +85,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_VertexBufferCompat, OpenGl_VertexBuffer) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_VertexBufferCompat,OpenGl_VertexBuffer) // Type definition
 
 };
 
diff --git a/src/OpenGl/OpenGl_View.cxx b/src/OpenGl/OpenGl_View.cxx
index c68579f384..d2cc0b99eb 100644
--- a/src/OpenGl/OpenGl_View.cxx
+++ b/src/OpenGl/OpenGl_View.cxx
@@ -34,6 +34,8 @@
 #include <OpenGl_Workspace.hxx>
 #include <Standard_CLocaleSentry.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_View,Graphic3d_CView)
+
 #ifdef HAVE_GL2PS
 #include <gl2ps.h>
 #endif
diff --git a/src/OpenGl/OpenGl_View.hxx b/src/OpenGl/OpenGl_View.hxx
index 0cb0759b2b..026c583469 100644
--- a/src/OpenGl/OpenGl_View.hxx
+++ b/src/OpenGl/OpenGl_View.hxx
@@ -1077,7 +1077,7 @@ protected: //! @name fields related to ray-tracing
 public:
 
   DEFINE_STANDARD_ALLOC
-  DEFINE_STANDARD_RTTI(OpenGl_View, Graphic3d_CView) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_View,Graphic3d_CView) // Type definition
 
   friend class OpenGl_GraphicDriver;
   friend class OpenGl_Workspace;
diff --git a/src/OpenGl/OpenGl_Window.cxx b/src/OpenGl/OpenGl_Window.cxx
index 73955bffcf..593f3eb5c0 100644
--- a/src/OpenGl/OpenGl_Window.cxx
+++ b/src/OpenGl/OpenGl_Window.cxx
@@ -26,6 +26,8 @@
 #include <TCollection_ExtendedString.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Window,MMgt_TShared)
+
 #if defined(HAVE_EGL) || defined(__ANDROID__) || defined(__QNX__)
   #include <EGL/egl.h>
 #endif
diff --git a/src/OpenGl/OpenGl_Window.hxx b/src/OpenGl/OpenGl_Window.hxx
index a3ded8f77c..bf8662227b 100644
--- a/src/OpenGl/OpenGl_Window.hxx
+++ b/src/OpenGl/OpenGl_Window.hxx
@@ -94,7 +94,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_Window, MMgt_TShared) // Type definition
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Window,MMgt_TShared) // Type definition
   DEFINE_STANDARD_ALLOC
 
 };
diff --git a/src/OpenGl/OpenGl_Workspace.cxx b/src/OpenGl/OpenGl_Workspace.cxx
index 640e17ef04..53571c15e4 100644
--- a/src/OpenGl/OpenGl_Workspace.cxx
+++ b/src/OpenGl/OpenGl_Workspace.cxx
@@ -36,6 +36,9 @@
 #include <Graphic3d_TextureParams.hxx>
 #include <Graphic3d_TransformUtils.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Workspace,Standard_Transient)
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_RaytraceFilter,OpenGl_RenderFilter)
+
 #ifdef HAVE_GL2PS
   #include <gl2ps.h>
   /* OCC22216 NOTE: linker dependency can be switched off by undefining macro.
diff --git a/src/OpenGl/OpenGl_Workspace.hxx b/src/OpenGl/OpenGl_Workspace.hxx
index 6da121e3d9..3085c13af8 100644
--- a/src/OpenGl/OpenGl_Workspace.hxx
+++ b/src/OpenGl/OpenGl_Workspace.hxx
@@ -102,7 +102,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(OpenGl_RaytraceFilter, OpenGl_RenderFilter)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_RaytraceFilter,OpenGl_RenderFilter)
 };
 
 class OpenGl_Workspace;
@@ -283,7 +283,7 @@ protected: //! @name fields related to status
 
 public: //! @name type definition
 
-  DEFINE_STANDARD_RTTI(OpenGl_Workspace, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(OpenGl_Workspace,Standard_Transient)
   DEFINE_STANDARD_ALLOC
 
 };
diff --git a/src/PCDM/PCDM_Document.cxx b/src/PCDM/PCDM_Document.cxx
index 353f2b3238..a528c070a4 100644
--- a/src/PCDM/PCDM_Document.cxx
+++ b/src/PCDM/PCDM_Document.cxx
@@ -17,3 +17,5 @@
 
 #include <PCDM_Document.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_Document,Standard_Persistent)
\ No newline at end of file
diff --git a/src/PCDM/PCDM_Document.hxx b/src/PCDM/PCDM_Document.hxx
index 155d0fcd1e..a50efd9363 100644
--- a/src/PCDM/PCDM_Document.hxx
+++ b/src/PCDM/PCDM_Document.hxx
@@ -36,7 +36,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_Document,Standard_Persistent)
+  DEFINE_STANDARD_RTTIEXT(PCDM_Document,Standard_Persistent)
 
 protected:
 
diff --git a/src/PCDM/PCDM_ReadWriter.cxx b/src/PCDM/PCDM_ReadWriter.cxx
index 386f26f243..b210eaebcb 100644
--- a/src/PCDM/PCDM_ReadWriter.cxx
+++ b/src/PCDM/PCDM_ReadWriter.cxx
@@ -33,6 +33,8 @@
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_ReadWriter,Standard_Transient)
+
 #define FILE_FORMAT "FILE_FORMAT: "
 
 static TCollection_ExtendedString TryXmlDriverType
diff --git a/src/PCDM/PCDM_ReadWriter.hxx b/src/PCDM/PCDM_ReadWriter.hxx
index 45277b97bb..564ce9bef5 100644
--- a/src/PCDM/PCDM_ReadWriter.hxx
+++ b/src/PCDM/PCDM_ReadWriter.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_ReadWriter,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(PCDM_ReadWriter,Standard_Transient)
 
 protected:
 
diff --git a/src/PCDM/PCDM_ReadWriter_1.cxx b/src/PCDM/PCDM_ReadWriter_1.cxx
index 323448362d..766d968c26 100644
--- a/src/PCDM/PCDM_ReadWriter_1.cxx
+++ b/src/PCDM/PCDM_ReadWriter_1.cxx
@@ -36,6 +36,8 @@
 #include <TColStd_SequenceOfExtendedString.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_ReadWriter_1,PCDM_ReadWriter)
+
 #define START_REF "START_REF"
 #define END_REF "END_REF"
 #define START_EXT "START_EXT"
diff --git a/src/PCDM/PCDM_ReadWriter_1.hxx b/src/PCDM/PCDM_ReadWriter_1.hxx
index e35029fd13..b04668a64a 100644
--- a/src/PCDM/PCDM_ReadWriter_1.hxx
+++ b/src/PCDM/PCDM_ReadWriter_1.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_ReadWriter_1,PCDM_ReadWriter)
+  DEFINE_STANDARD_RTTIEXT(PCDM_ReadWriter_1,PCDM_ReadWriter)
 
 protected:
 
diff --git a/src/PCDM/PCDM_Reader.cxx b/src/PCDM/PCDM_Reader.cxx
index 5e1e65a835..281ccf6800 100644
--- a/src/PCDM/PCDM_Reader.cxx
+++ b/src/PCDM/PCDM_Reader.cxx
@@ -21,3 +21,5 @@
 #include <PCDM_Reader.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_Reader,Standard_Transient)
\ No newline at end of file
diff --git a/src/PCDM/PCDM_Reader.hxx b/src/PCDM/PCDM_Reader.hxx
index dd288afdb2..447ee8302e 100644
--- a/src/PCDM/PCDM_Reader.hxx
+++ b/src/PCDM/PCDM_Reader.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_Reader,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(PCDM_Reader,Standard_Transient)
 
 protected:
 
diff --git a/src/PCDM/PCDM_ReferenceIterator.cxx b/src/PCDM/PCDM_ReferenceIterator.cxx
index 79b0d8e4da..6327ec09d5 100644
--- a/src/PCDM/PCDM_ReferenceIterator.cxx
+++ b/src/PCDM/PCDM_ReferenceIterator.cxx
@@ -27,6 +27,8 @@
 #include <Storage_Data.hxx>
 #include <UTL.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_ReferenceIterator,Standard_Transient)
+
 #ifdef _MSC_VER
 # include <tchar.h>
 #endif  // _MSC_VER
diff --git a/src/PCDM/PCDM_ReferenceIterator.hxx b/src/PCDM/PCDM_ReferenceIterator.hxx
index c2dea20697..5a1f82adac 100644
--- a/src/PCDM/PCDM_ReferenceIterator.hxx
+++ b/src/PCDM/PCDM_ReferenceIterator.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_ReferenceIterator,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(PCDM_ReferenceIterator,Standard_Transient)
 
 protected:
 
diff --git a/src/PCDM/PCDM_RetrievalDriver.cxx b/src/PCDM/PCDM_RetrievalDriver.cxx
index a8a6b53665..4370a987a6 100644
--- a/src/PCDM/PCDM_RetrievalDriver.cxx
+++ b/src/PCDM/PCDM_RetrievalDriver.cxx
@@ -41,6 +41,8 @@
 #include <TColStd_SequenceOfAsciiString.hxx>
 
 #include <locale.h>
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_RetrievalDriver,PCDM_Reader)
+
 void PCDM_RetrievalDriver::RaiseIfUnknownTypes(const Handle(Storage_Schema)& aSchema, const TCollection_ExtendedString& aFileName) {
 
   PCDM_BaseDriverPointer theFileDriver;
diff --git a/src/PCDM/PCDM_RetrievalDriver.hxx b/src/PCDM/PCDM_RetrievalDriver.hxx
index 509e5d566c..c3a1c4a5d9 100644
--- a/src/PCDM/PCDM_RetrievalDriver.hxx
+++ b/src/PCDM/PCDM_RetrievalDriver.hxx
@@ -78,7 +78,7 @@ friend
   Standard_EXPORT void PCDM_ReferenceIterator::Init (const Handle(CDM_MetaData)& aMetaData);
 
 
-  DEFINE_STANDARD_RTTI(PCDM_RetrievalDriver,PCDM_Reader)
+  DEFINE_STANDARD_RTTIEXT(PCDM_RetrievalDriver,PCDM_Reader)
 
 protected:
 
diff --git a/src/PCDM/PCDM_StorageDriver.cxx b/src/PCDM/PCDM_StorageDriver.cxx
index d42fc1c347..af91ed8afb 100644
--- a/src/PCDM/PCDM_StorageDriver.cxx
+++ b/src/PCDM/PCDM_StorageDriver.cxx
@@ -36,6 +36,8 @@
 #include <TColStd_SequenceOfExtendedString.hxx>
 
 #include <locale.h>
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_StorageDriver,PCDM_Writer)
+
 #define STORAGE_VERSION "STORAGE_VERSION:"
 
 
diff --git a/src/PCDM/PCDM_StorageDriver.hxx b/src/PCDM/PCDM_StorageDriver.hxx
index 8df6be92ba..eb87503b40 100644
--- a/src/PCDM/PCDM_StorageDriver.hxx
+++ b/src/PCDM/PCDM_StorageDriver.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_StorageDriver,PCDM_Writer)
+  DEFINE_STANDARD_RTTIEXT(PCDM_StorageDriver,PCDM_Writer)
 
 protected:
 
diff --git a/src/PCDM/PCDM_Writer.cxx b/src/PCDM/PCDM_Writer.cxx
index ca4dbfe453..f1a443a1fc 100644
--- a/src/PCDM/PCDM_Writer.cxx
+++ b/src/PCDM/PCDM_Writer.cxx
@@ -20,3 +20,5 @@
 #include <PCDM_Writer.hxx>
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(PCDM_Writer,Standard_Transient)
\ No newline at end of file
diff --git a/src/PCDM/PCDM_Writer.hxx b/src/PCDM/PCDM_Writer.hxx
index dbd8f4169d..9905dbcf88 100644
--- a/src/PCDM/PCDM_Writer.hxx
+++ b/src/PCDM/PCDM_Writer.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PCDM_Writer,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(PCDM_Writer,Standard_Transient)
 
 protected:
 
diff --git a/src/PLib/PLib_Base.cxx b/src/PLib/PLib_Base.cxx
index 3701cb12f7..03b3785bc9 100644
--- a/src/PLib/PLib_Base.cxx
+++ b/src/PLib/PLib_Base.cxx
@@ -17,3 +17,5 @@
 
 #include <PLib_Base.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(PLib_Base,MMgt_TShared)
\ No newline at end of file
diff --git a/src/PLib/PLib_Base.hxx b/src/PLib/PLib_Base.hxx
index 649b2cff9f..6ab4daeb95 100644
--- a/src/PLib/PLib_Base.hxx
+++ b/src/PLib/PLib_Base.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PLib_Base,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(PLib_Base,MMgt_TShared)
 
 protected:
 
diff --git a/src/PLib/PLib_HermitJacobi.cxx b/src/PLib/PLib_HermitJacobi.cxx
index f0ca8f63d4..146d02ba78 100644
--- a/src/PLib/PLib_HermitJacobi.cxx
+++ b/src/PLib/PLib_HermitJacobi.cxx
@@ -23,6 +23,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PLib_HermitJacobi,PLib_Base)
+
 //=======================================================================
 //function : PLib_HermitJacobi
 //purpose  : 
diff --git a/src/PLib/PLib_HermitJacobi.hxx b/src/PLib/PLib_HermitJacobi.hxx
index e47267abe2..f44fb9daaa 100644
--- a/src/PLib/PLib_HermitJacobi.hxx
+++ b/src/PLib/PLib_HermitJacobi.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PLib_HermitJacobi,PLib_Base)
+  DEFINE_STANDARD_RTTIEXT(PLib_HermitJacobi,PLib_Base)
 
 protected:
 
diff --git a/src/PLib/PLib_JacobiPolynomial.cxx b/src/PLib/PLib_JacobiPolynomial.cxx
index bec959df3d..e8a418f946 100644
--- a/src/PLib/PLib_JacobiPolynomial.cxx
+++ b/src/PLib/PLib_JacobiPolynomial.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PLib_JacobiPolynomial,PLib_Base)
+
 // The possible values for NbGaussPoints
 const Standard_Integer NDEG8=8,   NDEG10=10, NDEG15=15, NDEG20=20, NDEG25=25, 
                        NDEG30=30, NDEG40=40, NDEG50=50, NDEG61=61;
diff --git a/src/PLib/PLib_JacobiPolynomial.hxx b/src/PLib/PLib_JacobiPolynomial.hxx
index 0839e36a73..2b0543e352 100644
--- a/src/PLib/PLib_JacobiPolynomial.hxx
+++ b/src/PLib/PLib_JacobiPolynomial.hxx
@@ -148,7 +148,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PLib_JacobiPolynomial,PLib_Base)
+  DEFINE_STANDARD_RTTIEXT(PLib_JacobiPolynomial,PLib_Base)
 
 protected:
 
diff --git a/src/Poly/Poly_CoherentTriangulation.cxx b/src/Poly/Poly_CoherentTriangulation.cxx
index 4507fd8bdc..0c2f7617ae 100644
--- a/src/Poly/Poly_CoherentTriangulation.cxx
+++ b/src/Poly/Poly_CoherentTriangulation.cxx
@@ -25,6 +25,8 @@
 #include <TShort_HArray1OfShortReal.hxx> 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Poly_CoherentTriangulation,Standard_Transient)
+
 //=======================================================================
 //function : Poly_CoherentTriangulation
 //purpose  : Empty constructor
diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx
index 8b703185bf..a30c9415cf 100644
--- a/src/Poly/Poly_CoherentTriangulation.hxx
+++ b/src/Poly/Poly_CoherentTriangulation.hxx
@@ -380,7 +380,7 @@ class Poly_CoherentTriangulation : public Standard_Transient
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (Poly_CoherentTriangulation, Standard_Transient)
+DEFINE_STANDARD_RTTIEXT(Poly_CoherentTriangulation,Standard_Transient)
 
   friend class IteratorOfTriangle;
   friend class IteratorOfNode;
diff --git a/src/Poly/Poly_Polygon2D.cxx b/src/Poly/Poly_Polygon2D.cxx
index ca0b83267d..a08c9164c3 100644
--- a/src/Poly/Poly_Polygon2D.cxx
+++ b/src/Poly/Poly_Polygon2D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Poly_Polygon2D,MMgt_TShared)
+
 //=======================================================================
 //function : Poly_Polygon2D
 //purpose  : 
diff --git a/src/Poly/Poly_Polygon2D.hxx b/src/Poly/Poly_Polygon2D.hxx
index 9fe14fcd54..81de9860bc 100644
--- a/src/Poly/Poly_Polygon2D.hxx
+++ b/src/Poly/Poly_Polygon2D.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Poly_Polygon2D,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Poly_Polygon2D,MMgt_TShared)
 
 protected:
 
diff --git a/src/Poly/Poly_Polygon3D.cxx b/src/Poly/Poly_Polygon3D.cxx
index 52a782666e..4ee8606832 100644
--- a/src/Poly/Poly_Polygon3D.cxx
+++ b/src/Poly/Poly_Polygon3D.cxx
@@ -20,6 +20,8 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Poly_Polygon3D,MMgt_TShared)
+
 //=======================================================================
 //function : Poly_Polygon3D
 //purpose  : 
diff --git a/src/Poly/Poly_Polygon3D.hxx b/src/Poly/Poly_Polygon3D.hxx
index d56b78a0b3..8ff69fa4b4 100644
--- a/src/Poly/Poly_Polygon3D.hxx
+++ b/src/Poly/Poly_Polygon3D.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Poly_Polygon3D,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Poly_Polygon3D,MMgt_TShared)
 
 protected:
 
diff --git a/src/Poly/Poly_PolygonOnTriangulation.cxx b/src/Poly/Poly_PolygonOnTriangulation.cxx
index c1b42cacd1..fa26b4365c 100644
--- a/src/Poly/Poly_PolygonOnTriangulation.cxx
+++ b/src/Poly/Poly_PolygonOnTriangulation.cxx
@@ -19,6 +19,8 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Poly_PolygonOnTriangulation,MMgt_TShared)
+
 //=======================================================================
 //function : Poly_PolygonOnTriangulation
 //purpose  : 
diff --git a/src/Poly/Poly_PolygonOnTriangulation.hxx b/src/Poly/Poly_PolygonOnTriangulation.hxx
index b62c4586f2..87f99227fd 100644
--- a/src/Poly/Poly_PolygonOnTriangulation.hxx
+++ b/src/Poly/Poly_PolygonOnTriangulation.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Poly_PolygonOnTriangulation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Poly_PolygonOnTriangulation,MMgt_TShared)
 
 protected:
 
diff --git a/src/Poly/Poly_Triangulation.cxx b/src/Poly/Poly_Triangulation.cxx
index 44a4e8f1a8..5bd7944cdf 100644
--- a/src/Poly/Poly_Triangulation.cxx
+++ b/src/Poly/Poly_Triangulation.cxx
@@ -22,6 +22,8 @@
 #include <Standard_NullObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Poly_Triangulation,MMgt_TShared)
+
 //=======================================================================
 //function : Poly_Triangulation
 //purpose  : 
diff --git a/src/Poly/Poly_Triangulation.hxx b/src/Poly/Poly_Triangulation.hxx
index add28cb013..b4857d28ec 100644
--- a/src/Poly/Poly_Triangulation.hxx
+++ b/src/Poly/Poly_Triangulation.hxx
@@ -163,7 +163,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Poly_Triangulation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Poly_Triangulation,MMgt_TShared)
 
 protected:
 
diff --git a/src/ProjLib/ProjLib_HCompProjectedCurve.hxx b/src/ProjLib/ProjLib_HCompProjectedCurve.hxx
index d475867940..33acf0b40f 100644
--- a/src/ProjLib/ProjLib_HCompProjectedCurve.hxx
+++ b/src/ProjLib/ProjLib_HCompProjectedCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ProjLib_HCompProjectedCurve,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(ProjLib_HCompProjectedCurve,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/ProjLib/ProjLib_HProjectedCurve.hxx b/src/ProjLib/ProjLib_HProjectedCurve.hxx
index 545fb54a6a..05701d7a2d 100644
--- a/src/ProjLib/ProjLib_HProjectedCurve.hxx
+++ b/src/ProjLib/ProjLib_HProjectedCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ProjLib_HProjectedCurve,Adaptor2d_HCurve2d)
+  DEFINE_STANDARD_RTTI_INLINE(ProjLib_HProjectedCurve,Adaptor2d_HCurve2d)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_ArrowAspect.cxx b/src/Prs3d/Prs3d_ArrowAspect.cxx
index fc5f15f8a1..49fff02c3a 100644
--- a/src/Prs3d/Prs3d_ArrowAspect.cxx
+++ b/src/Prs3d/Prs3d_ArrowAspect.cxx
@@ -19,6 +19,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_ArrowAspect,Prs3d_BasicAspect)
+
 Prs3d_ArrowAspect::Prs3d_ArrowAspect () 
      : myAngle(M_PI/180.*10), myLength(1.) {
   myArrowAspect = 
diff --git a/src/Prs3d/Prs3d_ArrowAspect.hxx b/src/Prs3d/Prs3d_ArrowAspect.hxx
index a3da8115b4..f1c448f48e 100644
--- a/src/Prs3d/Prs3d_ArrowAspect.hxx
+++ b/src/Prs3d/Prs3d_ArrowAspect.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_ArrowAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_ArrowAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_BasicAspect.cxx b/src/Prs3d/Prs3d_BasicAspect.cxx
index fb25155077..6e2216850e 100644
--- a/src/Prs3d/Prs3d_BasicAspect.cxx
+++ b/src/Prs3d/Prs3d_BasicAspect.cxx
@@ -14,3 +14,5 @@
 
 #include <Prs3d_BasicAspect.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_BasicAspect,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Prs3d/Prs3d_BasicAspect.hxx b/src/Prs3d/Prs3d_BasicAspect.hxx
index 9c78533f66..6e41ea7c6b 100644
--- a/src/Prs3d/Prs3d_BasicAspect.hxx
+++ b/src/Prs3d/Prs3d_BasicAspect.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_BasicAspect,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_BasicAspect,MMgt_TShared)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_DatumAspect.cxx b/src/Prs3d/Prs3d_DatumAspect.cxx
index 474b7151cf..4736cf515b 100644
--- a/src/Prs3d/Prs3d_DatumAspect.cxx
+++ b/src/Prs3d/Prs3d_DatumAspect.cxx
@@ -17,6 +17,8 @@
 #include <Prs3d_LineAspect.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_DatumAspect,Prs3d_BasicAspect)
+
 Prs3d_DatumAspect::Prs3d_DatumAspect()
 : myDrawFirstAndSecondAxis (Standard_True),
   myDrawThirdAxis (Standard_True),
diff --git a/src/Prs3d/Prs3d_DatumAspect.hxx b/src/Prs3d/Prs3d_DatumAspect.hxx
index 60ae8a4189..50f0b25f65 100644
--- a/src/Prs3d/Prs3d_DatumAspect.hxx
+++ b/src/Prs3d/Prs3d_DatumAspect.hxx
@@ -78,7 +78,7 @@ public:
   //! @return true if axes labels are drawn
   Standard_EXPORT Standard_Boolean ToDrawLabels() const;
 
-  DEFINE_STANDARD_RTTI(Prs3d_DatumAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_DatumAspect,Prs3d_BasicAspect)
 
 private:
 
diff --git a/src/Prs3d/Prs3d_DimensionAspect.cxx b/src/Prs3d/Prs3d_DimensionAspect.cxx
index dd782b5470..2e6af161ec 100755
--- a/src/Prs3d/Prs3d_DimensionAspect.cxx
+++ b/src/Prs3d/Prs3d_DimensionAspect.cxx
@@ -23,6 +23,8 @@
 #include <Quantity_Color.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_DimensionAspect,Prs3d_BasicAspect)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/Prs3d/Prs3d_DimensionAspect.hxx b/src/Prs3d/Prs3d_DimensionAspect.hxx
index 411ac63baa..cafd3a4925 100644
--- a/src/Prs3d/Prs3d_DimensionAspect.hxx
+++ b/src/Prs3d/Prs3d_DimensionAspect.hxx
@@ -131,7 +131,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_DimensionAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_DimensionAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_Drawer.cxx b/src/Prs3d/Prs3d_Drawer.cxx
index ccf8b96381..b3bdcc79c5 100644
--- a/src/Prs3d/Prs3d_Drawer.cxx
+++ b/src/Prs3d/Prs3d_Drawer.cxx
@@ -24,6 +24,8 @@
 #include <Prs3d_TextAspect.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_Drawer,MMgt_TShared)
+
 // =======================================================================
 // function : Prs3d_Drawer
 // purpose  :
diff --git a/src/Prs3d/Prs3d_Drawer.hxx b/src/Prs3d/Prs3d_Drawer.hxx
index ae7938bfab..7f8595cd48 100644
--- a/src/Prs3d/Prs3d_Drawer.hxx
+++ b/src/Prs3d/Prs3d_Drawer.hxx
@@ -930,7 +930,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Prs3d_Drawer, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_Drawer,MMgt_TShared)
 
 };
 
diff --git a/src/Prs3d/Prs3d_IsoAspect.cxx b/src/Prs3d/Prs3d_IsoAspect.cxx
index 7f99cdd35e..f6a4a97de0 100644
--- a/src/Prs3d/Prs3d_IsoAspect.cxx
+++ b/src/Prs3d/Prs3d_IsoAspect.cxx
@@ -17,6 +17,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_IsoAspect,Prs3d_LineAspect)
+
 Prs3d_IsoAspect::Prs3d_IsoAspect(const Quantity_Color &aColor,
 			     const Aspect_TypeOfLine aType,
 			     const Standard_Real aWidth,
diff --git a/src/Prs3d/Prs3d_IsoAspect.hxx b/src/Prs3d/Prs3d_IsoAspect.hxx
index e362814637..867d3c15aa 100644
--- a/src/Prs3d/Prs3d_IsoAspect.hxx
+++ b/src/Prs3d/Prs3d_IsoAspect.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_IsoAspect,Prs3d_LineAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_IsoAspect,Prs3d_LineAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_LineAspect.cxx b/src/Prs3d/Prs3d_LineAspect.cxx
index cc0fabd3df..8225e97b5d 100644
--- a/src/Prs3d/Prs3d_LineAspect.cxx
+++ b/src/Prs3d/Prs3d_LineAspect.cxx
@@ -18,6 +18,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_LineAspect,Prs3d_BasicAspect)
+
 Prs3d_LineAspect::Prs3d_LineAspect (const Quantity_Color &aColor,
 				const Aspect_TypeOfLine aType,
 				const Standard_Real aWidth) {
diff --git a/src/Prs3d/Prs3d_LineAspect.hxx b/src/Prs3d/Prs3d_LineAspect.hxx
index acfeab1fc4..bb49239919 100644
--- a/src/Prs3d/Prs3d_LineAspect.hxx
+++ b/src/Prs3d/Prs3d_LineAspect.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_LineAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_LineAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_PlaneAspect.cxx b/src/Prs3d/Prs3d_PlaneAspect.cxx
index 74eb3c995a..262b13b81d 100644
--- a/src/Prs3d/Prs3d_PlaneAspect.cxx
+++ b/src/Prs3d/Prs3d_PlaneAspect.cxx
@@ -17,6 +17,8 @@
 #include <Prs3d_PlaneAspect.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_PlaneAspect,Prs3d_BasicAspect)
+
 Prs3d_PlaneAspect::Prs3d_PlaneAspect()
 {
   myEdgesAspect = new Prs3d_LineAspect(Quantity_NOC_GREEN,Aspect_TOL_SOLID,1.);
diff --git a/src/Prs3d/Prs3d_PlaneAspect.hxx b/src/Prs3d/Prs3d_PlaneAspect.hxx
index 3fe1256e65..afed7126fc 100644
--- a/src/Prs3d/Prs3d_PlaneAspect.hxx
+++ b/src/Prs3d/Prs3d_PlaneAspect.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_PlaneAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_PlaneAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_PlaneSet.cxx b/src/Prs3d/Prs3d_PlaneSet.cxx
index 19cbf9ceea..c01222d7fc 100644
--- a/src/Prs3d/Prs3d_PlaneSet.cxx
+++ b/src/Prs3d/Prs3d_PlaneSet.cxx
@@ -22,6 +22,8 @@
 #include <Prs3d_PlaneSet.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_PlaneSet,MMgt_TShared)
+
 Prs3d_PlaneSet::Prs3d_PlaneSet(const Standard_Real Xdir,
 			       const Standard_Real Ydir,
 			       const Standard_Real Zdir,
diff --git a/src/Prs3d/Prs3d_PlaneSet.hxx b/src/Prs3d/Prs3d_PlaneSet.hxx
index c047f2edf3..63e08a8814 100644
--- a/src/Prs3d/Prs3d_PlaneSet.hxx
+++ b/src/Prs3d/Prs3d_PlaneSet.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_PlaneSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_PlaneSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_PointAspect.cxx b/src/Prs3d/Prs3d_PointAspect.cxx
index bb031c00f3..5fdf4a3397 100644
--- a/src/Prs3d/Prs3d_PointAspect.cxx
+++ b/src/Prs3d/Prs3d_PointAspect.cxx
@@ -18,6 +18,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_PointAspect,Prs3d_BasicAspect)
+
 Prs3d_PointAspect::Prs3d_PointAspect (const Aspect_TypeOfMarker aType,
 				  const Quantity_Color &aColor,
 				  const Standard_Real aScale) {
diff --git a/src/Prs3d/Prs3d_PointAspect.hxx b/src/Prs3d/Prs3d_PointAspect.hxx
index 6eac270952..25a42de494 100644
--- a/src/Prs3d/Prs3d_PointAspect.hxx
+++ b/src/Prs3d/Prs3d_PointAspect.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_PointAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_PointAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_Presentation.cxx b/src/Prs3d/Prs3d_Presentation.cxx
index 109ad5642a..1c65b63614 100644
--- a/src/Prs3d/Prs3d_Presentation.cxx
+++ b/src/Prs3d/Prs3d_Presentation.cxx
@@ -37,6 +37,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_Array2OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_Presentation,Graphic3d_Structure)
+
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets 
 // OCC4895 SAN 22/03/04 High-level interface for controlling polygon offsets
 static void MakeGraphicTrsf (const Handle(Geom_Transformation)& aGeomTrsf,
diff --git a/src/Prs3d/Prs3d_Presentation.hxx b/src/Prs3d/Prs3d_Presentation.hxx
index 099dd4d092..e195177fed 100644
--- a/src/Prs3d/Prs3d_Presentation.hxx
+++ b/src/Prs3d/Prs3d_Presentation.hxx
@@ -91,7 +91,7 @@ public:
 friend class Prs3d_Root;
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_Presentation,Graphic3d_Structure)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_Presentation,Graphic3d_Structure)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_PresentationShadow.cxx b/src/Prs3d/Prs3d_PresentationShadow.cxx
index 51c8c51cd0..246d85e346 100644
--- a/src/Prs3d/Prs3d_PresentationShadow.cxx
+++ b/src/Prs3d/Prs3d_PresentationShadow.cxx
@@ -16,6 +16,8 @@
 #include <Prs3d_PresentationShadow.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_PresentationShadow,Prs3d_Presentation)
+
 //=======================================================================
 //function : Prs3d_PresentationShadow
 //purpose  :
diff --git a/src/Prs3d/Prs3d_PresentationShadow.hxx b/src/Prs3d/Prs3d_PresentationShadow.hxx
index 6bbb7f9d2e..819b02aad3 100644
--- a/src/Prs3d/Prs3d_PresentationShadow.hxx
+++ b/src/Prs3d/Prs3d_PresentationShadow.hxx
@@ -36,7 +36,7 @@ public:
 
 private: 
 
-  DEFINE_STANDARD_RTTI(Prs3d_PresentationShadow, Prs3d_Presentation)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_PresentationShadow,Prs3d_Presentation)
 
 private:
   Standard_Integer               myParentStructId;
diff --git a/src/Prs3d/Prs3d_Projector.cxx b/src/Prs3d/Prs3d_Projector.cxx
index cb8f241ea7..1c9eed824f 100644
--- a/src/Prs3d/Prs3d_Projector.cxx
+++ b/src/Prs3d/Prs3d_Projector.cxx
@@ -21,6 +21,8 @@
 #include <Prs3d_Projector.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_Projector,MMgt_TShared)
+
 Prs3d_Projector::Prs3d_Projector (const HLRAlgo_Projector& HLPr): MyProjector(HLPr)
 {}
 
diff --git a/src/Prs3d/Prs3d_Projector.hxx b/src/Prs3d/Prs3d_Projector.hxx
index eecb73c068..3e8bb232e1 100644
--- a/src/Prs3d/Prs3d_Projector.hxx
+++ b/src/Prs3d/Prs3d_Projector.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_Projector,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_Projector,MMgt_TShared)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_ShadingAspect.cxx b/src/Prs3d/Prs3d_ShadingAspect.cxx
index cb4d5e1d18..0514b7fff8 100644
--- a/src/Prs3d/Prs3d_ShadingAspect.cxx
+++ b/src/Prs3d/Prs3d_ShadingAspect.cxx
@@ -19,6 +19,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_ShadingAspect,Prs3d_BasicAspect)
+
 //=======================================================================
 //function : Prs3d_ShadingAspect
 //purpose  : 
diff --git a/src/Prs3d/Prs3d_ShadingAspect.hxx b/src/Prs3d/Prs3d_ShadingAspect.hxx
index 6b0a1926d4..e06e921043 100644
--- a/src/Prs3d/Prs3d_ShadingAspect.hxx
+++ b/src/Prs3d/Prs3d_ShadingAspect.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_ShadingAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_ShadingAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/Prs3d/Prs3d_TextAspect.cxx b/src/Prs3d/Prs3d_TextAspect.cxx
index 7e40a9902b..80c874ce3a 100644
--- a/src/Prs3d/Prs3d_TextAspect.cxx
+++ b/src/Prs3d/Prs3d_TextAspect.cxx
@@ -21,6 +21,8 @@
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Prs3d_TextAspect,Prs3d_BasicAspect)
+
 Prs3d_TextAspect::Prs3d_TextAspect () 
 : myAngle(0.),
   myHeight(16.),
diff --git a/src/Prs3d/Prs3d_TextAspect.hxx b/src/Prs3d/Prs3d_TextAspect.hxx
index ccb785eae6..3410d4ecf5 100644
--- a/src/Prs3d/Prs3d_TextAspect.hxx
+++ b/src/Prs3d/Prs3d_TextAspect.hxx
@@ -122,7 +122,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Prs3d_TextAspect,Prs3d_BasicAspect)
+  DEFINE_STANDARD_RTTIEXT(Prs3d_TextAspect,Prs3d_BasicAspect)
 
 protected:
 
diff --git a/src/PrsMgr/PrsMgr_PresentableObject.cxx b/src/PrsMgr/PrsMgr_PresentableObject.cxx
index 459681d85e..f8deec61fe 100644
--- a/src/PrsMgr/PrsMgr_PresentableObject.cxx
+++ b/src/PrsMgr/PrsMgr_PresentableObject.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PrsMgr_PresentableObject,MMgt_TShared)
+
 //=======================================================================
 //function : PrsMgr_PresentableObject
 //purpose  :
diff --git a/src/PrsMgr/PrsMgr_PresentableObject.hxx b/src/PrsMgr/PrsMgr_PresentableObject.hxx
index 7a04b3789c..14af43ad60 100644
--- a/src/PrsMgr/PrsMgr_PresentableObject.hxx
+++ b/src/PrsMgr/PrsMgr_PresentableObject.hxx
@@ -212,7 +212,7 @@ friend
   Standard_EXPORT void PrsMgr_Presentation::Compute (const Handle(Graphic3d_DataStructureManager)& theProjector, const Handle(Geom_Transformation)& theTrsf, const Handle(Graphic3d_Structure)& theGivenStruct);
 
 
-  DEFINE_STANDARD_RTTI(PrsMgr_PresentableObject,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(PrsMgr_PresentableObject,MMgt_TShared)
 
 protected:
 
diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx
index 2daec0fd87..e585398e7d 100644
--- a/src/PrsMgr/PrsMgr_Presentation.cxx
+++ b/src/PrsMgr/PrsMgr_Presentation.cxx
@@ -27,6 +27,9 @@
 #include <PrsMgr_Prs.hxx>
 #include <Quantity_Color.hxx>
 #include <Standard_Type.hxx>
+#include <Graphic3d_CView.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(PrsMgr_Presentation,MMgt_TShared)
 
 namespace
 {
diff --git a/src/PrsMgr/PrsMgr_Presentation.hxx b/src/PrsMgr/PrsMgr_Presentation.hxx
index a351db6167..e04bb1627c 100644
--- a/src/PrsMgr/PrsMgr_Presentation.hxx
+++ b/src/PrsMgr/PrsMgr_Presentation.hxx
@@ -69,7 +69,7 @@ friend class PrsMgr_PresentableObject;
 friend class PrsMgr_Prs;
 
 
-  DEFINE_STANDARD_RTTI(PrsMgr_Presentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(PrsMgr_Presentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/PrsMgr/PrsMgr_PresentationManager.cxx b/src/PrsMgr/PrsMgr_PresentationManager.cxx
index c7f134fa0e..c5ed8164bf 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager.cxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.cxx
@@ -28,6 +28,8 @@
 #include <TColStd_ListIteratorOfListOfTransient.hxx>
 #include <V3d_View.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PrsMgr_PresentationManager,MMgt_TShared)
+
 // =======================================================================
 // function : PrsMgr_PresentationManager
 // purpose  :
diff --git a/src/PrsMgr/PrsMgr_PresentationManager.hxx b/src/PrsMgr/PrsMgr_PresentationManager.hxx
index aa9a36376d..b08a438eea 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager.hxx
+++ b/src/PrsMgr/PrsMgr_PresentationManager.hxx
@@ -165,7 +165,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PrsMgr_PresentationManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(PrsMgr_PresentationManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/PrsMgr/PrsMgr_Prs.cxx b/src/PrsMgr/PrsMgr_Prs.cxx
index bf9aaca99f..c226af0e89 100644
--- a/src/PrsMgr/PrsMgr_Prs.cxx
+++ b/src/PrsMgr/PrsMgr_Prs.cxx
@@ -23,6 +23,8 @@
 #include <PrsMgr_Prs.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(PrsMgr_Prs,Prs3d_Presentation)
+
 PrsMgr_Prs::PrsMgr_Prs (const Handle(Graphic3d_StructureManager)& theStructManager,
                         const PrsMgr_PresentationPointer&         thePrs,
                         const PrsMgr_TypeOfPresentation3d         theTypeOfPresentation)
diff --git a/src/PrsMgr/PrsMgr_Prs.hxx b/src/PrsMgr/PrsMgr_Prs.hxx
index a665020ae7..10a96a1384 100644
--- a/src/PrsMgr/PrsMgr_Prs.hxx
+++ b/src/PrsMgr/PrsMgr_Prs.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(PrsMgr_Prs,Prs3d_Presentation)
+  DEFINE_STANDARD_RTTIEXT(PrsMgr_Prs,Prs3d_Presentation)
 
 protected:
 
diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx
index 2d8b94fd89..32044a532f 100644
--- a/src/QABugs/QABugs_19.cxx
+++ b/src/QABugs/QABugs_19.cxx
@@ -1697,7 +1697,7 @@ public:
     std::cerr << "QABugs_HandleClass[" << this << "] " << theArgVec[0] << "\n";
     return 0;
   }
-  DEFINE_STANDARD_RTTI(QABugs_HandleClass, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTI_INLINE(QABugs_HandleClass,Standard_Transient) // Type definition
 };
 DEFINE_STANDARD_HANDLE    (QABugs_HandleClass, Standard_Transient)
 
@@ -4543,6 +4543,7 @@ static Standard_Integer OCC26750( Draw_Interpretor& theDI,
 //purpose  : Checks if coefficients of the torus are computed properly.
 //=======================================================================
 #include <Geom_ToroidalSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
 static Standard_Integer OCC26746(
   Draw_Interpretor& theDI, 
   Standard_Integer  theNArg, 
diff --git a/src/QABugs/QABugs_MyText.cxx b/src/QABugs/QABugs_MyText.cxx
index 7c25c92c78..06a20b1fa4 100644
--- a/src/QABugs/QABugs_MyText.cxx
+++ b/src/QABugs/QABugs_MyText.cxx
@@ -27,6 +27,8 @@
 #include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(QABugs_MyText,AIS_InteractiveObject)
+
 /*************************************************************************
 *
 * CONSTRUCTION/DESTRUCTION
diff --git a/src/QABugs/QABugs_MyText.hxx b/src/QABugs/QABugs_MyText.hxx
index 20333076f4..fdc5343dcf 100644
--- a/src/QABugs/QABugs_MyText.hxx
+++ b/src/QABugs/QABugs_MyText.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(QABugs_MyText,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(QABugs_MyText,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/QABugs/QABugs_PresentableObject.cxx b/src/QABugs/QABugs_PresentableObject.cxx
index f5b8c4f21f..a77c79da8a 100644
--- a/src/QABugs/QABugs_PresentableObject.cxx
+++ b/src/QABugs/QABugs_PresentableObject.cxx
@@ -27,6 +27,8 @@
 #include <QABugs_PresentableObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(QABugs_PresentableObject,AIS_InteractiveObject)
+
 QABugs_PresentableObject::QABugs_PresentableObject(const PrsMgr_TypeOfPresentation3d theTypeOfPresentation3d)
      :AIS_InteractiveObject(theTypeOfPresentation3d)
 {
diff --git a/src/QABugs/QABugs_PresentableObject.hxx b/src/QABugs/QABugs_PresentableObject.hxx
index 85bd3764db..d5d7dca1a5 100644
--- a/src/QABugs/QABugs_PresentableObject.hxx
+++ b/src/QABugs/QABugs_PresentableObject.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(QABugs_PresentableObject,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTIEXT(QABugs_PresentableObject,AIS_InteractiveObject)
 
 protected:
 
diff --git a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cxx b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cxx
index b741d65c5d..2d8142f4e1 100644
--- a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cxx
+++ b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cxx
@@ -24,6 +24,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(QANewModTopOpe_ReShaper,MMgt_TShared)
+
 QANewModTopOpe_ReShaper::QANewModTopOpe_ReShaper(const TopoDS_Shape& TheInitialShape):
        myInitShape(TheInitialShape)
 {
diff --git a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.hxx b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.hxx
index 79c8ddf3ff..a0ea7f7697 100644
--- a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.hxx
+++ b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.hxx
@@ -57,7 +57,7 @@ Standard_EXPORT operator TopoDS_Shape() const;
 
 
 
-  DEFINE_STANDARD_RTTI(QANewModTopOpe_ReShaper,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(QANewModTopOpe_ReShaper,MMgt_TShared)
 
 protected:
 
diff --git a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx
index c9299b6d9b..64a39431ad 100644
--- a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx
+++ b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cxx
@@ -31,6 +31,8 @@
 #include <StepData_UndefinedEntity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(RWHeaderSection_GeneralModule,StepData_GeneralModule)
+
 RWHeaderSection_GeneralModule::RWHeaderSection_GeneralModule ()
 { 
   Interface_GeneralLib::SetGlobal(this, HeaderSection::Protocol());
diff --git a/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx b/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx
index 3e1c1056dc..cbfd209da2 100644
--- a/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx
+++ b/src/RWHeaderSection/RWHeaderSection_GeneralModule.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(RWHeaderSection_GeneralModule,StepData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(RWHeaderSection_GeneralModule,StepData_GeneralModule)
 
 protected:
 
diff --git a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cxx b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cxx
index 060ef8a1b6..4957a2e2b7 100644
--- a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cxx
+++ b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cxx
@@ -32,6 +32,8 @@
 #include <StepData_WriterLib.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(RWHeaderSection_ReadWriteModule,StepData_ReadWriteModule)
+
 // -- General Declarations (Recognize, StepType) ---
 static TCollection_AsciiString PasReco("");    // neutralise StartEntity de SW
 static TCollection_AsciiString Reco_FileName ("FILE_NAME");
diff --git a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx
index 4af0c4ae8a..4aabee4c33 100644
--- a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx
+++ b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(RWHeaderSection_ReadWriteModule,StepData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(RWHeaderSection_ReadWriteModule,StepData_ReadWriteModule)
 
 protected:
 
diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
index bcea4ad3ad..df36679150 100644
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.cxx
@@ -1093,6 +1093,8 @@
 #include <StepVisual_ViewVolume.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
+
 //#define DeclareAndCast(atype,result,start) \  NON car Name
 // Handle(atype) result = Handle(atype)::DownCast (start)
 // Removed from Rev2 to Rev4 :  <StepVisual_AnnotationCurveOccurrence.hxx>
diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx b/src/RWStepAP214/RWStepAP214_GeneralModule.hxx
index 9f11dbcc54..afc626d11d 100644
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.hxx
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(RWStepAP214_GeneralModule,StepData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 
 protected:
 
diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
index fc56d33443..fc00a868ef 100644
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx
@@ -29,6 +29,8 @@
 #include <StepData_WriterLib.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
+
 //#include <Interface_Macros.hxx>
 #define DeclareAndCast(atype,result,start) \
 Handle(atype) result = Handle(atype)::DownCast (start)
diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx b/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx
index b00928bf7f..75c02ceb21 100644
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 
 protected:
 
diff --git a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
index 13e6ce9628..be4e8819ab 100644
--- a/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWGeometricItemSpecificUsage.cxx
@@ -20,6 +20,7 @@
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
 #include <StepRepr_Representation.hxx>
+#include <StepRepr_RepresentationItem.hxx>
 
 
 RWStepAP242_RWGeometricItemSpecificUsage::RWStepAP242_RWGeometricItemSpecificUsage () {}
diff --git a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
index 2aa1d05a2a..b2009f6ee8 100644
--- a/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
+++ b/src/RWStepAP242/RWStepAP242_RWItemIdentifiedRepresentationUsage.cxx
@@ -21,6 +21,7 @@
 #include <StepAP242_ItemIdentifiedRepresentationUsage.hxx>
 #include <StepAP242_ItemIdentifiedRepresentationUsageDefinition.hxx>
 #include <StepRepr_Representation.hxx>
+#include <StepRepr_RepresentationItem.hxx>
 
 
 RWStepAP242_RWItemIdentifiedRepresentationUsage::RWStepAP242_RWItemIdentifiedRepresentationUsage () {}
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
index 06ffdd7956..591e284c81 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceCompartment.cxx
@@ -23,6 +23,8 @@
 #include <StepDimTol_GeneralDatumReference.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceElement.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
+#include <StepDimTol_DatumReferenceElement.hxx>
+#include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWDatumReferenceCompartment
diff --git a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
index f5656e52c0..2c26640219 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWDatumReferenceElement.cxx
@@ -25,6 +25,7 @@
 #include <StepDimTol_HArray1OfDatumReferenceElement.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceModifier.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
+#include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWDatumReferenceElement
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
index d9ec4603b2..abf4d3a499 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeneralDatumReference.cxx
@@ -23,6 +23,8 @@
 #include <StepDimTol_GeneralDatumReference.hxx>
 #include <StepDimTol_HArray1OfDatumReferenceElement.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
+#include <StepDimTol_DatumReferenceElement.hxx>
+#include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeneralDatumReference
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
index 21e2b319c0..f597d25211 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeometricToleranceWithMaximumTolerance.cxx
@@ -24,6 +24,7 @@
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_GeometricToleranceWithMaximumTolerance.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
+#include <StepBasic_MeasureWithUnit.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWGeometricTolerance
diff --git a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
index 46abb90853..405c65a7ba 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWNonUniformZoneDefinition.cxx
@@ -21,6 +21,7 @@
 #include <StepRepr_HArray1OfShapeAspect.hxx>
 #include <StepDimTol_NonUniformZoneDefinition.hxx>
 #include <StepDimTol_ToleranceZone.hxx>
+#include <StepRepr_ShapeAspect.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWNonUniformZoneDefinition
diff --git a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
index eb170c1678..bd9f209fc9 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWProjectedZoneDefinition.cxx
@@ -22,6 +22,7 @@
 #include <StepRepr_HArray1OfShapeAspect.hxx>
 #include <StepDimTol_ProjectedZoneDefinition.hxx>
 #include <StepDimTol_ToleranceZone.hxx>
+#include <StepRepr_ShapeAspect.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWProjectedZoneDefinition
diff --git a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
index 23cc51e5e8..5ed95b389b 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWRunoutZoneDefinition.cxx
@@ -22,6 +22,7 @@
 #include <StepDimTol_RunoutZoneDefinition.hxx>
 #include <StepDimTol_RunoutZoneOrientation.hxx>
 #include <StepDimTol_ToleranceZone.hxx>
+#include <StepRepr_ShapeAspect.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWRunoutZoneDefinition
diff --git a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
index 6c405154d2..820e147b95 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
+++ b/src/RWStepDimTol/RWStepDimTol_RWToleranceZoneDefinition.cxx
@@ -21,6 +21,7 @@
 #include <StepRepr_HArray1OfShapeAspect.hxx>
 #include <StepDimTol_ToleranceZone.hxx>
 #include <StepDimTol_ToleranceZoneDefinition.hxx>
+#include <StepRepr_ShapeAspect.hxx>
 
 //=======================================================================
 //function : RWStepDimTol_RWToleranceZoneDefinition
diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx
index 2cb506f56a..8186eb9178 100644
--- a/src/Resource/Resource_Manager.cxx
+++ b/src/Resource/Resource_Manager.cxx
@@ -33,6 +33,8 @@
 #include <algorithm>
 #include <errno.h>
 
+IMPLEMENT_STANDARD_RTTIEXT(Resource_Manager,MMgt_TShared)
+
 //! Auxiliary enumeration for function WhatKindOfLine().
 enum Resource_KindOfLine
 {
diff --git a/src/Resource/Resource_Manager.hxx b/src/Resource/Resource_Manager.hxx
index de76bf4b34..c910b45925 100644
--- a/src/Resource/Resource_Manager.hxx
+++ b/src/Resource/Resource_Manager.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Resource_Manager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Resource_Manager,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
index 9871e74943..3cc5205d0a 100644
--- a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cxx
@@ -18,6 +18,8 @@
 #include <STEPCAFControl_ActorWrite.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_ActorWrite,STEPControl_ActorWrite)
+
 //=======================================================================
 //function : STEPCAFControl_ActorWrite
 //purpose  : 
diff --git a/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx b/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
index 12d64fbb70..c86837eb79 100644
--- a/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_ActorWrite.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPCAFControl_ActorWrite,STEPControl_ActorWrite)
+  DEFINE_STANDARD_RTTIEXT(STEPCAFControl_ActorWrite,STEPControl_ActorWrite)
 
 protected:
 
diff --git a/src/STEPCAFControl/STEPCAFControl_Controller.cxx b/src/STEPCAFControl/STEPCAFControl_Controller.cxx
index 57d26ac447..d930938bd4 100644
--- a/src/STEPCAFControl/STEPCAFControl_Controller.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Controller.cxx
@@ -20,6 +20,8 @@
 #include <STEPCAFControl_Controller.hxx>
 #include <XSAlgo.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_Controller,STEPControl_Controller)
+
 //=======================================================================
 //function : STEPCAFControl_Controller
 //purpose  : 
diff --git a/src/STEPCAFControl/STEPCAFControl_Controller.hxx b/src/STEPCAFControl/STEPCAFControl_Controller.hxx
index 5aa007ef91..bf5e782e6a 100644
--- a/src/STEPCAFControl/STEPCAFControl_Controller.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_Controller.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPCAFControl_Controller,STEPControl_Controller)
+  DEFINE_STANDARD_RTTIEXT(STEPCAFControl_Controller,STEPControl_Controller)
 
 protected:
 
diff --git a/src/STEPCAFControl/STEPCAFControl_DictionaryOfExternFile.hxx b/src/STEPCAFControl/STEPCAFControl_DictionaryOfExternFile.hxx
index 36d2c9ba08..62e4091ef0 100644
--- a/src/STEPCAFControl/STEPCAFControl_DictionaryOfExternFile.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_DictionaryOfExternFile.hxx
@@ -129,7 +129,7 @@ public:
 friend class STEPCAFControl_IteratorOfDictionaryOfExternFile;
 
 
-  DEFINE_STANDARD_RTTI(STEPCAFControl_DictionaryOfExternFile,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(STEPCAFControl_DictionaryOfExternFile,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx b/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
index 6cbf739af9..ac824af81e 100644
--- a/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_ExternFile.cxx
@@ -20,6 +20,8 @@
 #include <TDF_Label.hxx>
 #include <XSControl_WorkSession.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_ExternFile,MMgt_TShared)
+
 //=======================================================================
 //function : STEPCAFControl_ExternFile
 //purpose  : 
diff --git a/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx b/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
index 76937776a4..bfe4bcead6 100644
--- a/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_ExternFile.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPCAFControl_ExternFile,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(STEPCAFControl_ExternFile,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPCAFControl/STEPCAFControl_StackItemOfDictionaryOfExternFile.hxx b/src/STEPCAFControl/STEPCAFControl_StackItemOfDictionaryOfExternFile.hxx
index f153fb3399..935d7fb3d4 100644
--- a/src/STEPCAFControl/STEPCAFControl_StackItemOfDictionaryOfExternFile.hxx
+++ b/src/STEPCAFControl/STEPCAFControl_StackItemOfDictionaryOfExternFile.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPCAFControl_StackItemOfDictionaryOfExternFile,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(STEPCAFControl_StackItemOfDictionaryOfExternFile,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx
index ad1763a46b..834ad7ea38 100644
--- a/src/STEPControl/STEPControl_ActorRead.cxx
+++ b/src/STEPControl/STEPControl_ActorRead.cxx
@@ -112,6 +112,8 @@
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPControl_ActorRead,Transfer_ActorOfTransientProcess)
+
 // #include <Interface_InterfaceModel.hxx>  // pour mise au point
 // MappedItem :
 // FaceSurface :
diff --git a/src/STEPControl/STEPControl_ActorRead.hxx b/src/STEPControl/STEPControl_ActorRead.hxx
index 76e50fd5dc..1ea04b9049 100644
--- a/src/STEPControl/STEPControl_ActorRead.hxx
+++ b/src/STEPControl/STEPControl_ActorRead.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPControl_ActorRead,Transfer_ActorOfTransientProcess)
+  DEFINE_STANDARD_RTTIEXT(STEPControl_ActorRead,Transfer_ActorOfTransientProcess)
 
 protected:
 
diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx
index 7fc7769afe..6087575594 100644
--- a/src/STEPControl/STEPControl_ActorWrite.cxx
+++ b/src/STEPControl/STEPControl_ActorWrite.cxx
@@ -105,6 +105,8 @@
 #include <XSAlgo.hxx>
 #include <XSAlgo_AlgoContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPControl_ActorWrite,Transfer_ActorOfFinderProcess)
+
 //  Transfer
 //  TransferShape
 //:d6
diff --git a/src/STEPControl/STEPControl_ActorWrite.hxx b/src/STEPControl/STEPControl_ActorWrite.hxx
index 5dc8d65fe7..be67859393 100644
--- a/src/STEPControl/STEPControl_ActorWrite.hxx
+++ b/src/STEPControl/STEPControl_ActorWrite.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPControl_ActorWrite,Transfer_ActorOfFinderProcess)
+  DEFINE_STANDARD_RTTIEXT(STEPControl_ActorWrite,Transfer_ActorOfFinderProcess)
 
 protected:
 
diff --git a/src/STEPControl/STEPControl_Controller.cxx b/src/STEPControl/STEPControl_Controller.cxx
index 2a7bea7319..18ad6c9836 100644
--- a/src/STEPControl/STEPControl_Controller.cxx
+++ b/src/STEPControl/STEPControl_Controller.cxx
@@ -54,6 +54,8 @@
 #include <XSAlgo.hxx>
 #include <XSControl_WorkSession.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPControl_Controller,XSControl_Controller)
+
 //#include <StepAP214.hxx>
 //  Pour NewModel et Write : definition de produit (temporaire ...)
 STEPControl_Controller::STEPControl_Controller ()
diff --git a/src/STEPControl/STEPControl_Controller.hxx b/src/STEPControl/STEPControl_Controller.hxx
index 15a590a782..973d7c7aef 100644
--- a/src/STEPControl/STEPControl_Controller.hxx
+++ b/src/STEPControl/STEPControl_Controller.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPControl_Controller,XSControl_Controller)
+  DEFINE_STANDARD_RTTIEXT(STEPControl_Controller,XSControl_Controller)
 
 protected:
 
diff --git a/src/STEPEdit/STEPEdit_EditContext.cxx b/src/STEPEdit/STEPEdit_EditContext.cxx
index 47e292743e..f9cf5c83cb 100644
--- a/src/STEPEdit/STEPEdit_EditContext.cxx
+++ b/src/STEPEdit/STEPEdit_EditContext.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPEdit_EditContext,IFSelect_Editor)
+
 STEPEdit_EditContext::STEPEdit_EditContext ()
 : IFSelect_Editor (5)
 {
diff --git a/src/STEPEdit/STEPEdit_EditContext.hxx b/src/STEPEdit/STEPEdit_EditContext.hxx
index 3cdbee9a03..22d3eb76ca 100644
--- a/src/STEPEdit/STEPEdit_EditContext.hxx
+++ b/src/STEPEdit/STEPEdit_EditContext.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPEdit_EditContext,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(STEPEdit_EditContext,IFSelect_Editor)
 
 protected:
 
diff --git a/src/STEPEdit/STEPEdit_EditSDR.cxx b/src/STEPEdit/STEPEdit_EditSDR.cxx
index a46a0ae752..0ef7990146 100644
--- a/src/STEPEdit/STEPEdit_EditSDR.cxx
+++ b/src/STEPEdit/STEPEdit_EditSDR.cxx
@@ -24,6 +24,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPEdit_EditSDR,IFSelect_Editor)
+
 STEPEdit_EditSDR::STEPEdit_EditSDR ()
 : IFSelect_Editor (11)
 {
diff --git a/src/STEPEdit/STEPEdit_EditSDR.hxx b/src/STEPEdit/STEPEdit_EditSDR.hxx
index 73b6fc8b9c..f53c15bc31 100644
--- a/src/STEPEdit/STEPEdit_EditSDR.hxx
+++ b/src/STEPEdit/STEPEdit_EditSDR.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPEdit_EditSDR,IFSelect_Editor)
+  DEFINE_STANDARD_RTTIEXT(STEPEdit_EditSDR,IFSelect_Editor)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_AssemblyComponent.cxx b/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
index 2a717e04f4..4b41c0748e 100644
--- a/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
+++ b/src/STEPSelections/STEPSelections_AssemblyComponent.cxx
@@ -19,6 +19,8 @@
 #include <STEPSelections_AssemblyComponent.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_AssemblyComponent,MMgt_TShared)
+
 STEPSelections_AssemblyComponent::STEPSelections_AssemblyComponent() 
 {
 }
diff --git a/src/STEPSelections/STEPSelections_AssemblyComponent.hxx b/src/STEPSelections/STEPSelections_AssemblyComponent.hxx
index f5487b49de..e516ffc121 100644
--- a/src/STEPSelections/STEPSelections_AssemblyComponent.hxx
+++ b/src/STEPSelections/STEPSelections_AssemblyComponent.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_AssemblyComponent,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_AssemblyComponent,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_AssemblyLink.cxx b/src/STEPSelections/STEPSelections_AssemblyLink.cxx
index d48c786b27..c34281e6e1 100644
--- a/src/STEPSelections/STEPSelections_AssemblyLink.cxx
+++ b/src/STEPSelections/STEPSelections_AssemblyLink.cxx
@@ -21,6 +21,8 @@
 #include <STEPSelections_AssemblyComponent.hxx>
 #include <STEPSelections_AssemblyLink.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_AssemblyLink,MMgt_TShared)
+
 STEPSelections_AssemblyLink::STEPSelections_AssemblyLink()
 {
 }
diff --git a/src/STEPSelections/STEPSelections_AssemblyLink.hxx b/src/STEPSelections/STEPSelections_AssemblyLink.hxx
index 4758deecf1..e0f8e426b5 100644
--- a/src/STEPSelections/STEPSelections_AssemblyLink.hxx
+++ b/src/STEPSelections/STEPSelections_AssemblyLink.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_AssemblyLink,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_AssemblyLink,MMgt_TShared)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectAssembly.cxx b/src/STEPSelections/STEPSelections_SelectAssembly.cxx
index a13984696c..dc92d6d2e0 100644
--- a/src/STEPSelections/STEPSelections_SelectAssembly.cxx
+++ b/src/STEPSelections/STEPSelections_SelectAssembly.cxx
@@ -29,6 +29,8 @@
 #include <StepShape_ShapeRepresentation.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectAssembly,IFSelect_SelectExplore)
+
 STEPSelections_SelectAssembly::STEPSelections_SelectAssembly():IFSelect_SelectExplore (-1){ }
 
 Standard_Boolean STEPSelections_SelectAssembly::Explore(const Standard_Integer /*level*/,
diff --git a/src/STEPSelections/STEPSelections_SelectAssembly.hxx b/src/STEPSelections/STEPSelections_SelectAssembly.hxx
index 6f2f945f79..5a642b242d 100644
--- a/src/STEPSelections/STEPSelections_SelectAssembly.hxx
+++ b/src/STEPSelections/STEPSelections_SelectAssembly.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectAssembly,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectAssembly,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectDerived.cxx b/src/STEPSelections/STEPSelections_SelectDerived.cxx
index d75f7b38ac..6a39a1f974 100644
--- a/src/STEPSelections/STEPSelections_SelectDerived.cxx
+++ b/src/STEPSelections/STEPSelections_SelectDerived.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectDerived,StepSelect_StepType)
+
 STEPSelections_SelectDerived::STEPSelections_SelectDerived():StepSelect_StepType()
 {
 }
diff --git a/src/STEPSelections/STEPSelections_SelectDerived.hxx b/src/STEPSelections/STEPSelections_SelectDerived.hxx
index c843542755..434c405bae 100644
--- a/src/STEPSelections/STEPSelections_SelectDerived.hxx
+++ b/src/STEPSelections/STEPSelections_SelectDerived.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectDerived,StepSelect_StepType)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectDerived,StepSelect_StepType)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectFaces.cxx b/src/STEPSelections/STEPSelections_SelectFaces.cxx
index 1f58b2a652..f1421b319d 100644
--- a/src/STEPSelections/STEPSelections_SelectFaces.cxx
+++ b/src/STEPSelections/STEPSelections_SelectFaces.cxx
@@ -25,6 +25,8 @@
 #include <StepShape_GeometricSet.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectFaces,IFSelect_SelectExplore)
+
 STEPSelections_SelectFaces::STEPSelections_SelectFaces():IFSelect_SelectExplore (-1){ }
 
 Standard_Boolean STEPSelections_SelectFaces::Explore(const Standard_Integer /*level*/,
diff --git a/src/STEPSelections/STEPSelections_SelectFaces.hxx b/src/STEPSelections/STEPSelections_SelectFaces.hxx
index 152a91917b..b83f10467f 100644
--- a/src/STEPSelections/STEPSelections_SelectFaces.hxx
+++ b/src/STEPSelections/STEPSelections_SelectFaces.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectFaces,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectFaces,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectForTransfer.cxx b/src/STEPSelections/STEPSelections_SelectForTransfer.cxx
index ac8d20c280..775d5c9f3d 100644
--- a/src/STEPSelections/STEPSelections_SelectForTransfer.cxx
+++ b/src/STEPSelections/STEPSelections_SelectForTransfer.cxx
@@ -20,6 +20,8 @@
 #include <Transfer_TransientProcess.hxx>
 #include <XSControl_TransferReader.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectForTransfer,XSControl_SelectForTransfer)
+
 //=======================================================================
 //function : STEPSelections_SelectForTransfer
 //purpose  : 
diff --git a/src/STEPSelections/STEPSelections_SelectForTransfer.hxx b/src/STEPSelections/STEPSelections_SelectForTransfer.hxx
index f2211fa58e..ce9dd25f4d 100644
--- a/src/STEPSelections/STEPSelections_SelectForTransfer.hxx
+++ b/src/STEPSelections/STEPSelections_SelectForTransfer.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectForTransfer,XSControl_SelectForTransfer)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectForTransfer,XSControl_SelectForTransfer)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectGSCurves.cxx b/src/STEPSelections/STEPSelections_SelectGSCurves.cxx
index 1d69ab91ac..024ddc4ea2 100644
--- a/src/STEPSelections/STEPSelections_SelectGSCurves.cxx
+++ b/src/STEPSelections/STEPSelections_SelectGSCurves.cxx
@@ -26,6 +26,8 @@
 #include <StepShape_GeometricSet.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectGSCurves,IFSelect_SelectExplore)
+
 static Standard_Integer flag;
 
 STEPSelections_SelectGSCurves::STEPSelections_SelectGSCurves():IFSelect_SelectExplore (-1){ flag = 1;}
diff --git a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
index a8cd649823..a2b5714d7c 100644
--- a/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
+++ b/src/STEPSelections/STEPSelections_SelectGSCurves.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectGSCurves,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectGSCurves,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/STEPSelections/STEPSelections_SelectInstances.cxx b/src/STEPSelections/STEPSelections_SelectInstances.cxx
index 445e706f52..ff263f27b7 100644
--- a/src/STEPSelections/STEPSelections_SelectInstances.cxx
+++ b/src/STEPSelections/STEPSelections_SelectInstances.cxx
@@ -39,6 +39,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_IndexedMapOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(STEPSelections_SelectInstances,IFSelect_SelectExplore)
+
 static Handle(Interface_HGraph) myGraph;
 static Interface_EntityIterator myEntities;
 
diff --git a/src/STEPSelections/STEPSelections_SelectInstances.hxx b/src/STEPSelections/STEPSelections_SelectInstances.hxx
index 1a6732761c..33ea6e8c21 100644
--- a/src/STEPSelections/STEPSelections_SelectInstances.hxx
+++ b/src/STEPSelections/STEPSelections_SelectInstances.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(STEPSelections_SelectInstances,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(STEPSelections_SelectInstances,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.cxx b/src/Select3D/Select3D_InteriorSensitivePointSet.cxx
index a4f3d7c268..4668b72528 100644
--- a/src/Select3D/Select3D_InteriorSensitivePointSet.cxx
+++ b/src/Select3D/Select3D_InteriorSensitivePointSet.cxx
@@ -21,6 +21,8 @@
 
 #include <Select3D_InteriorSensitivePointSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet,Select3D_SensitiveSet)
+
 namespace {
 
 // Internal class for creation of planar polygons
diff --git a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
index b1cc2b8d79..6fb46892f5 100644
--- a/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
+++ b/src/Select3D/Select3D_InteriorSensitivePointSet.hxx
@@ -70,7 +70,7 @@ public:
   //! Returns the amount of points in set
   Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_InteriorSensitivePointSet, Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTIEXT(Select3D_InteriorSensitivePointSet,Select3D_SensitiveSet)
 
 protected:
 
diff --git a/src/Select3D/Select3D_SensitiveBox.cxx b/src/Select3D/Select3D_SensitiveBox.cxx
index 5598d4f4b7..0332dceb92 100644
--- a/src/Select3D/Select3D_SensitiveBox.cxx
+++ b/src/Select3D/Select3D_SensitiveBox.cxx
@@ -21,6 +21,8 @@
 #include <ElCLib.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveBox,Select3D_SensitiveEntity)
+
 //==================================================
 // Function: Select3D_SensitiveBox
 // Purpose :
diff --git a/src/Select3D/Select3D_SensitiveBox.hxx b/src/Select3D/Select3D_SensitiveBox.hxx
index 2990a47087..27e15458e0 100644
--- a/src/Select3D/Select3D_SensitiveBox.hxx
+++ b/src/Select3D/Select3D_SensitiveBox.hxx
@@ -74,7 +74,7 @@ public:
   //! transformation is set, it will be applied
   Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveBox, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveBox,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveCircle.cxx b/src/Select3D/Select3D_SensitiveCircle.cxx
index 77a5cb1d5c..e18c80f289 100644
--- a/src/Select3D/Select3D_SensitiveCircle.cxx
+++ b/src/Select3D/Select3D_SensitiveCircle.cxx
@@ -23,6 +23,8 @@
 #include <Select3D_SensitiveCircle.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveCircle,Select3D_SensitivePoly)
+
 static Standard_Integer GetCircleNbPoints (const Handle(Geom_Circle)& theCircle,
                                            const Standard_Integer theNbPnts)
 {
diff --git a/src/Select3D/Select3D_SensitiveCircle.hxx b/src/Select3D/Select3D_SensitiveCircle.hxx
index 7fb88cb2c0..d559c194f6 100644
--- a/src/Select3D/Select3D_SensitiveCircle.hxx
+++ b/src/Select3D/Select3D_SensitiveCircle.hxx
@@ -99,7 +99,7 @@ public:
   //! Builds BVH tree for a circle's edge segments if needed
   Standard_EXPORT virtual void BVH() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveCircle, Select3D_SensitivePoly)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveCircle,Select3D_SensitivePoly)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveCurve.cxx b/src/Select3D/Select3D_SensitiveCurve.cxx
index eb9d6b60a2..d94a0bca1a 100644
--- a/src/Select3D/Select3D_SensitiveCurve.cxx
+++ b/src/Select3D/Select3D_SensitiveCurve.cxx
@@ -19,6 +19,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveCurve,Select3D_SensitivePoly)
+
 //==================================================
 // Function: Creation
 // Purpose :
diff --git a/src/Select3D/Select3D_SensitiveCurve.hxx b/src/Select3D/Select3D_SensitiveCurve.hxx
index f2a5aa1add..cd18217448 100644
--- a/src/Select3D/Select3D_SensitiveCurve.hxx
+++ b/src/Select3D/Select3D_SensitiveCurve.hxx
@@ -66,7 +66,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveCurve, Select3D_SensitivePoly)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveCurve,Select3D_SensitivePoly)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveEntity.cxx b/src/Select3D/Select3D_SensitiveEntity.cxx
index c421f70ca3..f7387c33a2 100644
--- a/src/Select3D/Select3D_SensitiveEntity.cxx
+++ b/src/Select3D/Select3D_SensitiveEntity.cxx
@@ -21,6 +21,8 @@
 #include <TopLoc_Location.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveEntity,SelectBasics_SensitiveEntity)
+
 //=======================================================================
 //function : Select3D_SensitiveEntity
 //purpose  :
diff --git a/src/Select3D/Select3D_SensitiveEntity.hxx b/src/Select3D/Select3D_SensitiveEntity.hxx
index 0a33a60005..b3fd8bdd38 100644
--- a/src/Select3D/Select3D_SensitiveEntity.hxx
+++ b/src/Select3D/Select3D_SensitiveEntity.hxx
@@ -85,7 +85,7 @@ public:
   //! to this entity has init location set. Otherwise, returns identity matrix.
   Standard_EXPORT virtual gp_Trsf InvInitLocation() const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveEntity, SelectBasics_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveEntity,SelectBasics_SensitiveEntity)
 
 protected:
 
diff --git a/src/Select3D/Select3D_SensitiveFace.cxx b/src/Select3D/Select3D_SensitiveFace.cxx
index dd8c18da92..19c712022e 100644
--- a/src/Select3D/Select3D_SensitiveFace.cxx
+++ b/src/Select3D/Select3D_SensitiveFace.cxx
@@ -26,6 +26,8 @@
 #include <Precision.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveFace,Select3D_SensitiveEntity)
+
 //==================================================
 // Function: Hide this constructor to the next version...
 // Purpose : simply avoid interfering with the version update
diff --git a/src/Select3D/Select3D_SensitiveFace.hxx b/src/Select3D/Select3D_SensitiveFace.hxx
index 85e4e94c43..b6ab2240ff 100644
--- a/src/Select3D/Select3D_SensitiveFace.hxx
+++ b/src/Select3D/Select3D_SensitiveFace.hxx
@@ -84,7 +84,7 @@ public:
   //! Returns the amount of sub-entities (points or planar convex polygons)
   Standard_EXPORT virtual Standard_Integer NbSubElements() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveFace, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveFace,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveGroup.cxx b/src/Select3D/Select3D_SensitiveGroup.cxx
index 185f9df4c8..e3b518e3e0 100644
--- a/src/Select3D/Select3D_SensitiveGroup.cxx
+++ b/src/Select3D/Select3D_SensitiveGroup.cxx
@@ -19,6 +19,8 @@
 #include <TopLoc_Location.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveGroup,Select3D_SensitiveSet)
+
 //=======================================================================
 //function : Creation
 //purpose  :
diff --git a/src/Select3D/Select3D_SensitiveGroup.hxx b/src/Select3D/Select3D_SensitiveGroup.hxx
index 711cf575ea..d64d146ac8 100644
--- a/src/Select3D/Select3D_SensitiveGroup.hxx
+++ b/src/Select3D/Select3D_SensitiveGroup.hxx
@@ -120,7 +120,7 @@ public:
   //! Returns the length of vector of sensitive entities
   Standard_EXPORT virtual Standard_Integer Size() const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveGroup, Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveGroup,Select3D_SensitiveSet)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitivePoint.cxx b/src/Select3D/Select3D_SensitivePoint.cxx
index 758b7b93b0..355f29f45e 100644
--- a/src/Select3D/Select3D_SensitivePoint.cxx
+++ b/src/Select3D/Select3D_SensitivePoint.cxx
@@ -19,6 +19,8 @@
 #include <TopLoc_Location.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitivePoint,Select3D_SensitiveEntity)
+
 //==================================================
 // Function: Creation
 // Purpose :
diff --git a/src/Select3D/Select3D_SensitivePoint.hxx b/src/Select3D/Select3D_SensitivePoint.hxx
index 7d0acd65d5..9a0dd4df48 100644
--- a/src/Select3D/Select3D_SensitivePoint.hxx
+++ b/src/Select3D/Select3D_SensitivePoint.hxx
@@ -61,7 +61,7 @@ public:
   //! transformation is set, it will be applied
   Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitivePoint, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitivePoint,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitivePoly.cxx b/src/Select3D/Select3D_SensitivePoly.cxx
index 3652bbd153..7f7199b703 100644
--- a/src/Select3D/Select3D_SensitivePoly.cxx
+++ b/src/Select3D/Select3D_SensitivePoly.cxx
@@ -19,6 +19,8 @@
 #include <Select3D_SensitivePoly.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitivePoly,Select3D_SensitiveSet)
+
 //==================================================
 // Function: Select3D_SensitivePoly
 // Purpose :
diff --git a/src/Select3D/Select3D_SensitivePoly.hxx b/src/Select3D/Select3D_SensitivePoly.hxx
index 23e48b82ce..f6c368abd1 100644
--- a/src/Select3D/Select3D_SensitivePoly.hxx
+++ b/src/Select3D/Select3D_SensitivePoly.hxx
@@ -93,7 +93,7 @@ public:
   Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1,
                                      const Standard_Integer theIdx2) Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI (Select3D_SensitivePoly, Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitivePoly,Select3D_SensitiveSet)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveSegment.cxx b/src/Select3D/Select3D_SensitiveSegment.cxx
index 6b2a70ffcd..640e328b8f 100644
--- a/src/Select3D/Select3D_SensitiveSegment.cxx
+++ b/src/Select3D/Select3D_SensitiveSegment.cxx
@@ -20,6 +20,8 @@
 #include <Precision.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveSegment,Select3D_SensitiveEntity)
+
 //=====================================================
 // Function : Create
 // Purpose  : Constructor
diff --git a/src/Select3D/Select3D_SensitiveSegment.hxx b/src/Select3D/Select3D_SensitiveSegment.hxx
index 4a86e7f550..4d3cf6492c 100644
--- a/src/Select3D/Select3D_SensitiveSegment.hxx
+++ b/src/Select3D/Select3D_SensitiveSegment.hxx
@@ -73,7 +73,7 @@ public:
   //! transformation is set, it will be applied
   Standard_EXPORT virtual Select3D_BndBox3d BoundingBox() Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveSegment, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveSegment,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveSet.cxx b/src/Select3D/Select3D_SensitiveSet.cxx
index 17cd050b10..73f0378023 100644
--- a/src/Select3D/Select3D_SensitiveSet.cxx
+++ b/src/Select3D/Select3D_SensitiveSet.cxx
@@ -17,6 +17,8 @@
 #include <Select3D_BVHPrimitiveContent.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveSet,Select3D_SensitiveEntity)
+
 //=======================================================================
 // function : Select3D_SensitiveSet
 // purpose  : Creates new empty sensitive set and its content
diff --git a/src/Select3D/Select3D_SensitiveSet.hxx b/src/Select3D/Select3D_SensitiveSet.hxx
index 5a29543df6..319fd115ce 100644
--- a/src/Select3D/Select3D_SensitiveSet.hxx
+++ b/src/Select3D/Select3D_SensitiveSet.hxx
@@ -91,7 +91,7 @@ public:
   Standard_EXPORT Standard_Integer GetLeafNodeSize() const;
 
 public:
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveSet, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveSet,Select3D_SensitiveEntity)
 
 protected:
 
diff --git a/src/Select3D/Select3D_SensitiveTriangle.cxx b/src/Select3D/Select3D_SensitiveTriangle.cxx
index c3dd5c24cc..a16a6a2bc0 100644
--- a/src/Select3D/Select3D_SensitiveTriangle.cxx
+++ b/src/Select3D/Select3D_SensitiveTriangle.cxx
@@ -22,6 +22,8 @@
 #include <TopLoc_Location.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveTriangle,Select3D_SensitiveEntity)
+
 //==================================================
 // Function: Creation
 // Purpose :
diff --git a/src/Select3D/Select3D_SensitiveTriangle.hxx b/src/Select3D/Select3D_SensitiveTriangle.hxx
index f1f6af8d3e..39ffccdd03 100644
--- a/src/Select3D/Select3D_SensitiveTriangle.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangle.hxx
@@ -73,7 +73,7 @@ public:
 
   virtual gp_Pnt CenterOfGeometry() const Standard_OVERRIDE { return myCentroid; }
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangle, Select3D_SensitiveEntity)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveTriangle,Select3D_SensitiveEntity)
 
 private:
 
diff --git a/src/Select3D/Select3D_SensitiveTriangulation.cxx b/src/Select3D/Select3D_SensitiveTriangulation.cxx
index 7472cae3c1..3341f74299 100644
--- a/src/Select3D/Select3D_SensitiveTriangulation.cxx
+++ b/src/Select3D/Select3D_SensitiveTriangulation.cxx
@@ -26,6 +26,8 @@
 #include <Select3D_SensitiveTriangulation.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveTriangulation,Select3D_SensitiveSet)
+
 static Standard_Integer NbOfFreeEdges (const Handle(Poly_Triangulation)& theTriangulation)
 {
   Standard_Integer aNbFree = 0;
diff --git a/src/Select3D/Select3D_SensitiveTriangulation.hxx b/src/Select3D/Select3D_SensitiveTriangulation.hxx
index f8f8938777..fd1f6a3451 100644
--- a/src/Select3D/Select3D_SensitiveTriangulation.hxx
+++ b/src/Select3D/Select3D_SensitiveTriangulation.hxx
@@ -111,7 +111,7 @@ public:
   inline const TopLoc_Location& GetInitLocation() const;
 
 public:
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveTriangulation, Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveTriangulation,Select3D_SensitiveSet)
 
 protected:
 
diff --git a/src/Select3D/Select3D_SensitiveWire.cxx b/src/Select3D/Select3D_SensitiveWire.cxx
index 43d178c4f7..ac1215002c 100644
--- a/src/Select3D/Select3D_SensitiveWire.cxx
+++ b/src/Select3D/Select3D_SensitiveWire.cxx
@@ -22,6 +22,8 @@
 #include <Select3D_SensitiveSegment.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(Select3D_SensitiveWire,Select3D_SensitiveSet)
+
 //=====================================================
 // Function : Select3D_SensitiveWire
 // Purpose  :
diff --git a/src/Select3D/Select3D_SensitiveWire.hxx b/src/Select3D/Select3D_SensitiveWire.hxx
index daf54c846f..0ce5fa2137 100644
--- a/src/Select3D/Select3D_SensitiveWire.hxx
+++ b/src/Select3D/Select3D_SensitiveWire.hxx
@@ -79,7 +79,7 @@ public:
   Standard_EXPORT virtual void Swap (const Standard_Integer theIdx1,
                                      const Standard_Integer theIdx2) Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(Select3D_SensitiveWire, Select3D_SensitiveSet)
+  DEFINE_STANDARD_RTTIEXT(Select3D_SensitiveWire,Select3D_SensitiveSet)
 
 protected:
 
diff --git a/src/SelectBasics/SelectBasics_EntityOwner.cxx b/src/SelectBasics/SelectBasics_EntityOwner.cxx
index a77fb74427..f9473f72bf 100644
--- a/src/SelectBasics/SelectBasics_EntityOwner.cxx
+++ b/src/SelectBasics/SelectBasics_EntityOwner.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectBasics_EntityOwner,MMgt_TShared)
+
 //========================================
 // Function : Create
 // Purpose  : 
diff --git a/src/SelectBasics/SelectBasics_EntityOwner.hxx b/src/SelectBasics/SelectBasics_EntityOwner.hxx
index 9299fd88a8..507e1a006b 100644
--- a/src/SelectBasics/SelectBasics_EntityOwner.hxx
+++ b/src/SelectBasics/SelectBasics_EntityOwner.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectBasics_EntityOwner,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectBasics_EntityOwner,MMgt_TShared)
 
 protected:
 
diff --git a/src/SelectBasics/SelectBasics_SensitiveEntity.cxx b/src/SelectBasics/SelectBasics_SensitiveEntity.cxx
index 02392cc9aa..5a30318b05 100644
--- a/src/SelectBasics/SelectBasics_SensitiveEntity.cxx
+++ b/src/SelectBasics/SelectBasics_SensitiveEntity.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectBasics_SensitiveEntity,MMgt_TShared)
+
 //=======================================================================
 // function : SelectBasics_SensitiveEntity
 // purpose  : Creates new empty sensitive entity instance
diff --git a/src/SelectBasics/SelectBasics_SensitiveEntity.hxx b/src/SelectBasics/SelectBasics_SensitiveEntity.hxx
index 36b5a6cbc3..ae0c684359 100644
--- a/src/SelectBasics/SelectBasics_SensitiveEntity.hxx
+++ b/src/SelectBasics/SelectBasics_SensitiveEntity.hxx
@@ -85,7 +85,7 @@ public:
   //! to this entity has init location set. Otherwise, returns identity matrix.
   virtual gp_Trsf InvInitLocation() const = 0;
 
-  DEFINE_STANDARD_RTTI(SelectBasics_SensitiveEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectBasics_SensitiveEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_AndFilter.cxx b/src/SelectMgr/SelectMgr_AndFilter.cxx
index e988998c70..15425280b5 100644
--- a/src/SelectMgr/SelectMgr_AndFilter.cxx
+++ b/src/SelectMgr/SelectMgr_AndFilter.cxx
@@ -19,6 +19,8 @@
 #include <SelectMgr_ListIteratorOfListOfFilter.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
+
 SelectMgr_AndFilter::SelectMgr_AndFilter()
 {
 }
diff --git a/src/SelectMgr/SelectMgr_AndFilter.hxx b/src/SelectMgr/SelectMgr_AndFilter.hxx
index d2a41fef66..9b76728b4b 100644
--- a/src/SelectMgr/SelectMgr_AndFilter.hxx
+++ b/src/SelectMgr/SelectMgr_AndFilter.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_AndFilter,SelectMgr_CompositionFilter)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_BaseFrustum.cxx b/src/SelectMgr/SelectMgr_BaseFrustum.cxx
index 0adc049402..88ac8d7a5d 100644
--- a/src/SelectMgr/SelectMgr_BaseFrustum.cxx
+++ b/src/SelectMgr/SelectMgr_BaseFrustum.cxx
@@ -15,6 +15,8 @@
 
 #include <SelectMgr_BaseFrustum.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_BaseFrustum,Standard_Transient)
+
 //=======================================================================
 // function : SelectMgr_SelectingVolume
 // purpose  : Creates new selecting volume with pixel toletance set to 2,
diff --git a/src/SelectMgr/SelectMgr_BaseFrustum.hxx b/src/SelectMgr/SelectMgr_BaseFrustum.hxx
index 4a123233e6..b1ba2d5bdb 100644
--- a/src/SelectMgr/SelectMgr_BaseFrustum.hxx
+++ b/src/SelectMgr/SelectMgr_BaseFrustum.hxx
@@ -158,7 +158,7 @@ public:
   Standard_EXPORT virtual Standard_Boolean IsClipped (const Graphic3d_SequenceOfHClipPlane& thePlanes,
                                                       const Standard_Real theDepth);
 
-  DEFINE_STANDARD_RTTI(SelectMgr_BaseFrustum, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_BaseFrustum,Standard_Transient)
 
 protected:
   Standard_Integer    myPixelTolerance;      //!< Pixel tolerance
diff --git a/src/SelectMgr/SelectMgr_CompositionFilter.cxx b/src/SelectMgr/SelectMgr_CompositionFilter.cxx
index e8aad7916a..99d058ccd4 100644
--- a/src/SelectMgr/SelectMgr_CompositionFilter.cxx
+++ b/src/SelectMgr/SelectMgr_CompositionFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_ListIteratorOfListOfFilter.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
+
 void SelectMgr_CompositionFilter::Add(const Handle(SelectMgr_Filter)& afilter)
 {
   myFilters.Append(afilter);
diff --git a/src/SelectMgr/SelectMgr_CompositionFilter.hxx b/src/SelectMgr/SelectMgr_CompositionFilter.hxx
index 98a69d1883..d84bdad3a1 100644
--- a/src/SelectMgr/SelectMgr_CompositionFilter.hxx
+++ b/src/SelectMgr/SelectMgr_CompositionFilter.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_CompositionFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_CompositionFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_EntityOwner.cxx b/src/SelectMgr/SelectMgr_EntityOwner.cxx
index e5eb50882d..fef3faf8e1 100644
--- a/src/SelectMgr/SelectMgr_EntityOwner.cxx
+++ b/src/SelectMgr/SelectMgr_EntityOwner.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
+
 //==================================================
 // Function: 
 // Purpose :
diff --git a/src/SelectMgr/SelectMgr_EntityOwner.hxx b/src/SelectMgr/SelectMgr_EntityOwner.hxx
index 06a962837e..97dcde28bf 100644
--- a/src/SelectMgr/SelectMgr_EntityOwner.hxx
+++ b/src/SelectMgr/SelectMgr_EntityOwner.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_EntityOwner,SelectBasics_EntityOwner)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_Filter.cxx b/src/SelectMgr/SelectMgr_Filter.cxx
index 86153aa555..4d47a124f5 100644
--- a/src/SelectMgr/SelectMgr_Filter.cxx
+++ b/src/SelectMgr/SelectMgr_Filter.cxx
@@ -19,5 +19,7 @@
 #include <SelectMgr_Filter.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_Filter,MMgt_TShared)
+
 Standard_Boolean SelectMgr_Filter::ActsOn(const TopAbs_ShapeEnum /*aStandardMode*/) const 
 {return Standard_False;}
diff --git a/src/SelectMgr/SelectMgr_Filter.hxx b/src/SelectMgr/SelectMgr_Filter.hxx
index 8f97b4426a..fc7bdff8b4 100644
--- a/src/SelectMgr/SelectMgr_Filter.hxx
+++ b/src/SelectMgr/SelectMgr_Filter.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_Filter,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_Filter,MMgt_TShared)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_FrustumBuilder.cxx b/src/SelectMgr/SelectMgr_FrustumBuilder.cxx
index b33d16dcf6..26138fcb94 100644
--- a/src/SelectMgr/SelectMgr_FrustumBuilder.cxx
+++ b/src/SelectMgr/SelectMgr_FrustumBuilder.cxx
@@ -15,6 +15,8 @@
 
 #include <SelectMgr_FrustumBuilder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_FrustumBuilder,Standard_Transient)
+
 #define DOT(A, B) (A.x() * B.x() + A.y() * B.y() + A.z() * B.z())
 #define LENGTH(A) (std::sqrt (A.x() * A.x() + A.y() * A.y() + A.z() * A.z()))
 
diff --git a/src/SelectMgr/SelectMgr_FrustumBuilder.hxx b/src/SelectMgr/SelectMgr_FrustumBuilder.hxx
index ecf45b86c7..c4708acea1 100644
--- a/src/SelectMgr/SelectMgr_FrustumBuilder.hxx
+++ b/src/SelectMgr/SelectMgr_FrustumBuilder.hxx
@@ -74,7 +74,7 @@ public:
                                                 const Standard_Real& theY,
                                                 const Standard_Real& theZ) const;
 
-  DEFINE_STANDARD_RTTI(SelectMgr_FrustumBuilder, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_FrustumBuilder,Standard_Transient)
 
 private:
 
diff --git a/src/SelectMgr/SelectMgr_OrFilter.cxx b/src/SelectMgr/SelectMgr_OrFilter.cxx
index 9b01320d7d..fe84f35b7f 100644
--- a/src/SelectMgr/SelectMgr_OrFilter.cxx
+++ b/src/SelectMgr/SelectMgr_OrFilter.cxx
@@ -20,6 +20,8 @@
 #include <SelectMgr_SelectableObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
+
 //=============================================================================
 //function : SelectMgr_OrFilter
 //purpose  :
diff --git a/src/SelectMgr/SelectMgr_OrFilter.hxx b/src/SelectMgr/SelectMgr_OrFilter.hxx
index 23b2821298..f4625740d3 100644
--- a/src/SelectMgr/SelectMgr_OrFilter.hxx
+++ b/src/SelectMgr/SelectMgr_OrFilter.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_OrFilter,SelectMgr_CompositionFilter)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_SelectableObject.cxx b/src/SelectMgr/SelectMgr_SelectableObject.cxx
index 9c3fe8c770..ab29dbe6e9 100644
--- a/src/SelectMgr/SelectMgr_SelectableObject.cxx
+++ b/src/SelectMgr/SelectMgr_SelectableObject.cxx
@@ -39,6 +39,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
+
 static Standard_Integer Search (const SelectMgr_SequenceOfSelection& seq,
                                 const Handle (SelectMgr_Selection)& theSel)
 {
diff --git a/src/SelectMgr/SelectMgr_SelectableObject.hxx b/src/SelectMgr/SelectMgr_SelectableObject.hxx
index dcaa90cf81..78d20d253f 100644
--- a/src/SelectMgr/SelectMgr_SelectableObject.hxx
+++ b/src/SelectMgr/SelectMgr_SelectableObject.hxx
@@ -199,7 +199,7 @@ public:
 friend class SelectMgr_SelectionManager;
 
 
-  DEFINE_STANDARD_RTTI(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_SelectableObject,PrsMgr_PresentableObject)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_Selection.cxx b/src/SelectMgr/SelectMgr_Selection.cxx
index f473cdfc1a..16193471a0 100644
--- a/src/SelectMgr/SelectMgr_Selection.cxx
+++ b/src/SelectMgr/SelectMgr_Selection.cxx
@@ -19,6 +19,8 @@
 #include <SelectBasics_EntityOwner.hxx>
 #include <SelectMgr_Selection.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_Selection,MMgt_TShared)
+
 //==================================================
 // Function: SelectMgr_Selection
 // Purpose :
diff --git a/src/SelectMgr/SelectMgr_Selection.hxx b/src/SelectMgr/SelectMgr_Selection.hxx
index 776c8d6e7f..2499b7b960 100644
--- a/src/SelectMgr/SelectMgr_Selection.hxx
+++ b/src/SelectMgr/SelectMgr_Selection.hxx
@@ -137,7 +137,7 @@ public:
   //! proper updates use SelectMgr_SelectionManager::SetSelectionSensitivity method.
   Standard_EXPORT void SetSensitivity (const Standard_Integer theNewSens);
 
-  DEFINE_STANDARD_RTTI (SelectMgr_Selection, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_Selection,MMgt_TShared)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_SelectionManager.cxx b/src/SelectMgr/SelectMgr_SelectionManager.cxx
index 8aaffba715..0122caa87e 100644
--- a/src/SelectMgr/SelectMgr_SelectionManager.cxx
+++ b/src/SelectMgr/SelectMgr_SelectionManager.cxx
@@ -28,6 +28,8 @@
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_MapIteratorOfMapOfTransient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SelectionManager,MMgt_TShared)
+
 static Standard_Integer FindIndex (const SelectMgr_SequenceOfSelector& theSelectorsSeq,
                                    const Handle(SelectMgr_ViewerSelector)& theSelector)
 {
diff --git a/src/SelectMgr/SelectMgr_SelectionManager.hxx b/src/SelectMgr/SelectMgr_SelectionManager.hxx
index 16a85c94a0..cb4d5af6f2 100644
--- a/src/SelectMgr/SelectMgr_SelectionManager.hxx
+++ b/src/SelectMgr/SelectMgr_SelectionManager.hxx
@@ -125,7 +125,7 @@ public:
                                                 const Standard_Integer theMode,
                                                 const Standard_Integer theNewSens);
 
-  DEFINE_STANDARD_RTTI(SelectMgr_SelectionManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_SelectionManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.cxx b/src/SelectMgr/SelectMgr_SensitiveEntity.cxx
index 0649be0298..06cf93380b 100644
--- a/src/SelectMgr/SelectMgr_SensitiveEntity.cxx
+++ b/src/SelectMgr/SelectMgr_SensitiveEntity.cxx
@@ -16,6 +16,8 @@
 #include <SelectMgr_SensitiveEntity.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient)
+
 //=======================================================================
 // function : SelectMgr_SensitiveEntity
 // purpose  : Creates new inactive for selection object with base entity
diff --git a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
index f6b06edfe4..893115b0a4 100644
--- a/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
+++ b/src/SelectMgr/SelectMgr_SensitiveEntity.hxx
@@ -47,7 +47,7 @@ public:
   //! Marks entity as active for selection
   Standard_EXPORT void SetActiveForSelection() const;
 
-  DEFINE_STANDARD_RTTI(SelectMgr_SensitiveEntity, Standard_Transient) // Type definition
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_SensitiveEntity,Standard_Transient) // Type definition
 
 private:
 
diff --git a/src/SelectMgr/SelectMgr_TriangularFrustum.cxx b/src/SelectMgr/SelectMgr_TriangularFrustum.cxx
index a815a484f7..ca0e6756eb 100644
--- a/src/SelectMgr/SelectMgr_TriangularFrustum.cxx
+++ b/src/SelectMgr/SelectMgr_TriangularFrustum.cxx
@@ -15,6 +15,8 @@
 
 #include <SelectMgr_TriangularFrustum.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,Standard_Transient)
+
 SelectMgr_TriangularFrustum::~SelectMgr_TriangularFrustum()
 {
   Clear();
diff --git a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
index c8c37dc7c1..b829de846d 100644
--- a/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
+++ b/src/SelectMgr/SelectMgr_TriangularFrustum.hxx
@@ -88,7 +88,7 @@ private:
 
   void cacheVertexProjections (SelectMgr_TriangularFrustum* theFrustum);
 
-  DEFINE_STANDARD_RTTI(SelectMgr_TriangularFrustum,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_TriangularFrustum,Standard_Transient)
 };
 
 #endif // _SelectMgr_TriangularFrustum_HeaderFile
diff --git a/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx b/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx
index 6a4684ad57..b22152470b 100644
--- a/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx
+++ b/src/SelectMgr/SelectMgr_TriangularFrustumSet.cxx
@@ -18,6 +18,7 @@
 #include <NCollection_IncAllocator.hxx>
 
 #include <SelectMgr_TriangularFrustumSet.hxx>
+#include <SelectMgr_TriangularFrustum.hxx>
 
 #define MEMORY_BLOCK_SIZE 512 * 7
 
diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.cxx b/src/SelectMgr/SelectMgr_ViewerSelector.cxx
index 551ab88a16..94c2bf4348 100644
--- a/src/SelectMgr/SelectMgr_ViewerSelector.cxx
+++ b/src/SelectMgr/SelectMgr_ViewerSelector.cxx
@@ -36,6 +36,8 @@
 
 #include <algorithm>
 
+IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_ViewerSelector,MMgt_TShared)
+
 namespace {
   // Comparison operator for sorting selection results
   class CompareResults
diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.hxx b/src/SelectMgr/SelectMgr_ViewerSelector.hxx
index ccf5c9d144..15a42716fe 100644
--- a/src/SelectMgr/SelectMgr_ViewerSelector.hxx
+++ b/src/SelectMgr/SelectMgr_ViewerSelector.hxx
@@ -261,7 +261,7 @@ public:
 
   friend class SelectMgr_SelectionManager;
 
-  DEFINE_STANDARD_RTTI(SelectMgr_ViewerSelector, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(SelectMgr_ViewerSelector,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx
index d7ad117808..b19fcb0fe6 100644
--- a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx
+++ b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cxx
@@ -58,6 +58,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAlgo_AlgoContainer,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeAlgo_AlgoContainer
 //purpose  : 
diff --git a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.hxx b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.hxx
index 93ce15c18c..9da610ef5a 100644
--- a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.hxx
+++ b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.hxx
@@ -110,7 +110,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAlgo_AlgoContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAlgo_AlgoContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAlgo/ShapeAlgo_ToolContainer.cxx b/src/ShapeAlgo/ShapeAlgo_ToolContainer.cxx
index cad683d7e8..71a6351445 100644
--- a/src/ShapeAlgo/ShapeAlgo_ToolContainer.cxx
+++ b/src/ShapeAlgo/ShapeAlgo_ToolContainer.cxx
@@ -19,6 +19,8 @@
 #include <ShapeFix_Shape.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAlgo_ToolContainer,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeAlgo_ToolContainer
 //purpose  : 
diff --git a/src/ShapeAlgo/ShapeAlgo_ToolContainer.hxx b/src/ShapeAlgo/ShapeAlgo_ToolContainer.hxx
index b4859444cc..6eb0bf341c 100644
--- a/src/ShapeAlgo/ShapeAlgo_ToolContainer.hxx
+++ b/src/ShapeAlgo/ShapeAlgo_ToolContainer.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAlgo_ToolContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAlgo_ToolContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cxx b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cxx
index 6ebf8c1a94..09f4ec33e7 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cxx
@@ -21,6 +21,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAnalysis_FreeBoundData,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeAnalysis_FreeBoundData
 //purpose  : Empty constructor
diff --git a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.hxx b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.hxx
index acaa52b564..207c6c44f8 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.hxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.hxx
@@ -117,7 +117,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAnalysis_FreeBoundData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAnalysis_FreeBoundData,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
index da7c80acc2..405ec64f96 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
@@ -58,6 +58,8 @@
 #include <Standard_NoSuchObject.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAnalysis_Surface,MMgt_TShared)
+
 //S4135
 //S4135
 //=======================================================================
diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.hxx b/src/ShapeAnalysis/ShapeAnalysis_Surface.hxx
index 83e7749307..3e821f30d6 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Surface.hxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.hxx
@@ -287,7 +287,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAnalysis_Surface,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAnalysis_Surface,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cxx b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cxx
index 60632b4064..424e595c05 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cxx
@@ -24,6 +24,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAnalysis_TransferParameters,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeAnalysis_TransferParameters
 //purpose  : 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.hxx b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.hxx
index 2762993f3d..9db35cfbc5 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.hxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAnalysis_TransferParameters,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAnalysis_TransferParameters,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx
index c01099221e..dca87ddd0e 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cxx
@@ -51,6 +51,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAnalysis_TransferParametersProj,ShapeAnalysis_TransferParameters)
+
 //=======================================================================
 //function : ShapeAnalysis_TransferParametersProj
 //purpose  : 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.hxx b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.hxx
index c9a9818923..39dc6745a9 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.hxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAnalysis_TransferParametersProj,ShapeAnalysis_TransferParameters)
+  DEFINE_STANDARD_RTTIEXT(ShapeAnalysis_TransferParametersProj,ShapeAnalysis_TransferParameters)
 
 protected:
 
diff --git a/src/ShapeAnalysis/ShapeAnalysis_Wire.cxx b/src/ShapeAnalysis/ShapeAnalysis_Wire.cxx
index 3b6a4f8770..8032e2f5e2 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Wire.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Wire.cxx
@@ -87,6 +87,8 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeAnalysis_Wire,MMgt_TShared)
+
 //szvsh addition
 //=======================================================================
 //function : ShapeAnalysis_Wire
diff --git a/src/ShapeAnalysis/ShapeAnalysis_Wire.hxx b/src/ShapeAnalysis/ShapeAnalysis_Wire.hxx
index 39c372111a..aaaacce1ed 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Wire.hxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Wire.hxx
@@ -515,7 +515,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeAnalysis_Wire,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeAnalysis_Wire,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeBuild/ShapeBuild_ReShape.cxx b/src/ShapeBuild/ShapeBuild_ReShape.cxx
index baf7422288..1dd735f0d4 100644
--- a/src/ShapeBuild/ShapeBuild_ReShape.cxx
+++ b/src/ShapeBuild/ShapeBuild_ReShape.cxx
@@ -27,6 +27,8 @@
 #include <TopoDS_Shell.hxx>
 #include <TopoDS_Solid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeBuild_ReShape,BRepTools_ReShape)
+
 //=======================================================================
 //function : ShapeBuild_ReShape
 //purpose  : 
diff --git a/src/ShapeBuild/ShapeBuild_ReShape.hxx b/src/ShapeBuild/ShapeBuild_ReShape.hxx
index 7b549efed7..0d51af8151 100644
--- a/src/ShapeBuild/ShapeBuild_ReShape.hxx
+++ b/src/ShapeBuild/ShapeBuild_ReShape.hxx
@@ -103,7 +103,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeBuild_ReShape,BRepTools_ReShape)
+  DEFINE_STANDARD_RTTIEXT(ShapeBuild_ReShape,BRepTools_ReShape)
 
 protected:
 
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
index 783c7b1b4d..df3f83dc2f 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
@@ -74,6 +74,8 @@
 #include <TColStd_Array1OfInteger.hxx>
 
 #include <algorithm>
+IMPLEMENT_STANDARD_RTTIEXT(ShapeConstruct_ProjectCurveOnSurface,MMgt_TShared)
+
 #define NCONTROL 23
 
 //=======================================================================
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
index 25ca3e95c6..c28f8ceeaf 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx
@@ -135,7 +135,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeConstruct_ProjectCurveOnSurface,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeConstruct_ProjectCurveOnSurface,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
index f15ff36e98..0943af57a6 100644
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
@@ -81,6 +81,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_BSplineRestriction,ShapeCustom_Modification)
+
 static GeomAbs_Shape IntegerToGeomAbsShape(const Standard_Integer i)
 {
   GeomAbs_Shape result = GeomAbs_C0;
diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
index fec4bb8419..1f0f6bfe40 100644
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.hxx
@@ -186,7 +186,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_BSplineRestriction,ShapeCustom_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_BSplineRestriction,ShapeCustom_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
index 3f4f542b1d..16bd8e9fbe 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_ConvertToBSpline,ShapeCustom_Modification)
+
 //=======================================================================
 //function : ShapeCustom_ConvertToBSpline
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
index 7c9b2ac3d2..3ae0eda192 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.hxx
@@ -116,7 +116,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_ConvertToBSpline,ShapeCustom_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_ConvertToBSpline,ShapeCustom_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
index 2d8e1f99be..3812257d55 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_ConvertToRevolution,ShapeCustom_Modification)
+
 //=======================================================================
 //function : ShapeCustom_ConvertToRevolution
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
index 1fbfab3cd7..963669e891 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
+++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_ConvertToRevolution,ShapeCustom_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_ConvertToRevolution,ShapeCustom_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.cxx b/src/ShapeCustom/ShapeCustom_DirectModification.cxx
index 46a2c02bfd..bbe58ea511 100644
--- a/src/ShapeCustom/ShapeCustom_DirectModification.cxx
+++ b/src/ShapeCustom/ShapeCustom_DirectModification.cxx
@@ -42,6 +42,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_DirectModification,ShapeCustom_Modification)
+
 //=======================================================================
 //function : ShapeCustom_DirectModification
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.hxx b/src/ShapeCustom/ShapeCustom_DirectModification.hxx
index bb7f7874c9..b1eecaf58e 100644
--- a/src/ShapeCustom/ShapeCustom_DirectModification.hxx
+++ b/src/ShapeCustom/ShapeCustom_DirectModification.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_DirectModification,ShapeCustom_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_DirectModification,ShapeCustom_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_Modification.cxx b/src/ShapeCustom/ShapeCustom_Modification.cxx
index 3e69ac9e8a..9f9fcb3cc8 100644
--- a/src/ShapeCustom/ShapeCustom_Modification.cxx
+++ b/src/ShapeCustom/ShapeCustom_Modification.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_Modification,BRepTools_Modification)
+
 //=======================================================================
 //function : SetMsgRegistrator
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_Modification.hxx b/src/ShapeCustom/ShapeCustom_Modification.hxx
index 404239bee5..85d8b789e3 100644
--- a/src/ShapeCustom/ShapeCustom_Modification.hxx
+++ b/src/ShapeCustom/ShapeCustom_Modification.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_Modification,BRepTools_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_Modification,BRepTools_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_RestrictionParameters.cxx b/src/ShapeCustom/ShapeCustom_RestrictionParameters.cxx
index 066ec4b8b8..2b210d6199 100644
--- a/src/ShapeCustom/ShapeCustom_RestrictionParameters.cxx
+++ b/src/ShapeCustom/ShapeCustom_RestrictionParameters.cxx
@@ -17,6 +17,8 @@
 #include <ShapeCustom_RestrictionParameters.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_RestrictionParameters,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeCustom_RestrictionParameters
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx b/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
index bd714dadbe..9777f9add6 100644
--- a/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
+++ b/src/ShapeCustom/ShapeCustom_RestrictionParameters.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_RestrictionParameters,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_RestrictionParameters,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx b/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
index 833ba0e33a..ffc9b71d12 100644
--- a/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
+++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.cxx
@@ -49,6 +49,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_SweptToElementary,ShapeCustom_Modification)
+
 //=======================================================================
 //function : ShapeCustom_SweptToElementary
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
index f073346544..4a9b51ea6f 100644
--- a/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
+++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.hxx
@@ -100,7 +100,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_SweptToElementary,ShapeCustom_Modification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_SweptToElementary,ShapeCustom_Modification)
 
 protected:
 
diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.cxx b/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
index ffe0063afe..c7d064d35a 100644
--- a/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
+++ b/src/ShapeCustom/ShapeCustom_TrsfModification.cxx
@@ -30,6 +30,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeCustom_TrsfModification,BRepTools_TrsfModification)
+
 //=======================================================================
 //function : ShapeCustom_TrsfModification
 //purpose  : 
diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
index f8ca3f4b31..3f469028cc 100644
--- a/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
+++ b/src/ShapeCustom/ShapeCustom_TrsfModification.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeCustom_TrsfModification,BRepTools_TrsfModification)
+  DEFINE_STANDARD_RTTIEXT(ShapeCustom_TrsfModification,BRepTools_TrsfModification)
 
 protected:
 
diff --git a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cxx b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cxx
index 0ae00bccfc..d93ac6a344 100644
--- a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cxx
+++ b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cxx
@@ -20,6 +20,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeExtend_BasicMsgRegistrator,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeExtend_BasicMsgRegistrator
 //purpose  : 
diff --git a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.hxx b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.hxx
index d9002549f4..f16250f49a 100644
--- a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.hxx
+++ b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeExtend_BasicMsgRegistrator,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeExtend_BasicMsgRegistrator,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx b/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
index 2136198451..4d85258685 100644
--- a/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
+++ b/src/ShapeExtend/ShapeExtend_ComplexCurve.cxx
@@ -24,6 +24,8 @@
 #include <ShapeExtend_ComplexCurve.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeExtend_ComplexCurve,Geom_Curve)
+
 //=======================================================================
 //function : ShapeExtend_ComplexCurve
 //purpose  : 
diff --git a/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx b/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
index 645a225163..434057035b 100644
--- a/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
+++ b/src/ShapeExtend/ShapeExtend_ComplexCurve.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeExtend_ComplexCurve,Geom_Curve)
+  DEFINE_STANDARD_RTTIEXT(ShapeExtend_ComplexCurve,Geom_Curve)
 
 protected:
 
diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
index 9a96a1fd36..c493274dba 100644
--- a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
+++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx
@@ -27,6 +27,8 @@
 #include <ShapeExtend_CompositeSurface.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeExtend_CompositeSurface,Geom_Surface)
+
 //=======================================================================
 //function : ShapeExtend_CompositeSurface
 //purpose  : 
diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx b/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
index 79a49afe02..f30d083ccf 100644
--- a/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
+++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.hxx
@@ -292,7 +292,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeExtend_CompositeSurface,Geom_Surface)
+  DEFINE_STANDARD_RTTIEXT(ShapeExtend_CompositeSurface,Geom_Surface)
 
 protected:
 
diff --git a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
index 1826bcf5bb..0d00565d1d 100644
--- a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
+++ b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeExtend_MsgRegistrator,ShapeExtend_BasicMsgRegistrator)
+
 //=======================================================================
 //function : ShapeExtend_MsgRegistrator
 //purpose  : 
diff --git a/src/ShapeExtend/ShapeExtend_MsgRegistrator.hxx b/src/ShapeExtend/ShapeExtend_MsgRegistrator.hxx
index d03fa1857d..e304853684 100644
--- a/src/ShapeExtend/ShapeExtend_MsgRegistrator.hxx
+++ b/src/ShapeExtend/ShapeExtend_MsgRegistrator.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeExtend_MsgRegistrator,ShapeExtend_BasicMsgRegistrator)
+  DEFINE_STANDARD_RTTIEXT(ShapeExtend_MsgRegistrator,ShapeExtend_BasicMsgRegistrator)
 
 protected:
 
diff --git a/src/ShapeExtend/ShapeExtend_WireData.cxx b/src/ShapeExtend/ShapeExtend_WireData.cxx
index 29e020658e..e13f89c585 100644
--- a/src/ShapeExtend/ShapeExtend_WireData.cxx
+++ b/src/ShapeExtend/ShapeExtend_WireData.cxx
@@ -32,6 +32,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeExtend_WireData,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeExtend_WireData
 //purpose  : 
diff --git a/src/ShapeExtend/ShapeExtend_WireData.hxx b/src/ShapeExtend/ShapeExtend_WireData.hxx
index 071e5cd40c..0981ae331b 100644
--- a/src/ShapeExtend/ShapeExtend_WireData.hxx
+++ b/src/ShapeExtend/ShapeExtend_WireData.hxx
@@ -220,7 +220,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeExtend_WireData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeExtend_WireData,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx
index 49a561e04a..348736c99b 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.cxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx
@@ -77,6 +77,8 @@
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_ComposeShell,ShapeFix_Root)
+
 //=======================================================================
 //function : ShapeFix_ComposeShell
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_ComposeShell.hxx b/src/ShapeFix/ShapeFix_ComposeShell.hxx
index 0869173fe0..666cb24685 100644
--- a/src/ShapeFix/ShapeFix_ComposeShell.hxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.hxx
@@ -149,7 +149,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_ComposeShell,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_ComposeShell,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx
index 2723c57f1e..639e7173f8 100644
--- a/src/ShapeFix/ShapeFix_Edge.cxx
+++ b/src/ShapeFix/ShapeFix_Edge.cxx
@@ -61,6 +61,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <ShapeBuild_ReShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Edge,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeFix_Edge
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_Edge.hxx b/src/ShapeFix/ShapeFix_Edge.hxx
index c7dd6d27e4..2dd4da99fe 100644
--- a/src/ShapeFix/ShapeFix_Edge.hxx
+++ b/src/ShapeFix/ShapeFix_Edge.hxx
@@ -220,7 +220,7 @@ public:
   //! Returns context
   Standard_EXPORT Handle(ShapeBuild_ReShape) Context() const;
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Edge,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Edge,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
index 1b1d124517..08b0065445 100644
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
@@ -44,6 +44,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_EdgeProjAux,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeFix_EdgeProjAux
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.hxx b/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
index d83e3cc37f..92657c143a 100644
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_EdgeProjAux,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_EdgeProjAux,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx
index dd4762265e..8536e4c201 100644
--- a/src/ShapeFix/ShapeFix_Face.cxx
+++ b/src/ShapeFix/ShapeFix_Face.cxx
@@ -101,6 +101,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Face,ShapeFix_Root)
+
 #ifdef OCCT_DEBUG
 #define DEBUG
 #endif
diff --git a/src/ShapeFix/ShapeFix_Face.hxx b/src/ShapeFix/ShapeFix_Face.hxx
index 9404c4ab41..dcb6f8d29b 100644
--- a/src/ShapeFix/ShapeFix_Face.hxx
+++ b/src/ShapeFix/ShapeFix_Face.hxx
@@ -245,7 +245,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Face,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Face,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_FixSmallFace.cxx b/src/ShapeFix/ShapeFix_FixSmallFace.cxx
index 9334be3f3a..f1a940feec 100644
--- a/src/ShapeFix/ShapeFix_FixSmallFace.cxx
+++ b/src/ShapeFix/ShapeFix_FixSmallFace.cxx
@@ -60,6 +60,8 @@
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_FixSmallFace,ShapeFix_Root)
+
 //#include <GeomLProp_SLProps.hxx>
 //#include <TColStd_Array2OfReal.hxx>
 //#include <TColStd_Array1OfReal.hxx>
diff --git a/src/ShapeFix/ShapeFix_FixSmallFace.hxx b/src/ShapeFix/ShapeFix_FixSmallFace.hxx
index 8e0328ece6..5f7074f77e 100644
--- a/src/ShapeFix/ShapeFix_FixSmallFace.hxx
+++ b/src/ShapeFix/ShapeFix_FixSmallFace.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_FixSmallFace,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_FixSmallFace,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
index 78e5663d0b..cbb2ae6a66 100644
--- a/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
+++ b/src/ShapeFix/ShapeFix_FixSmallSolid.cxx
@@ -34,6 +34,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_FixSmallSolid,ShapeFix_Root)
+
 //=======================================================================
 //function : ShapeFix_FixSmallSolid
 //purpose  : Construct
diff --git a/src/ShapeFix/ShapeFix_FixSmallSolid.hxx b/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
index b5005d1df6..4c718156e7 100644
--- a/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
+++ b/src/ShapeFix/ShapeFix_FixSmallSolid.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_FixSmallSolid,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_FixSmallSolid,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Root.cxx b/src/ShapeFix/ShapeFix_Root.cxx
index ebf82f2bee..0cfe64c1ef 100644
--- a/src/ShapeFix/ShapeFix_Root.cxx
+++ b/src/ShapeFix/ShapeFix_Root.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Root,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeFix_Root
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_Root.hxx b/src/ShapeFix/ShapeFix_Root.hxx
index f12bcbd1c0..0cc987ecad 100644
--- a/src/ShapeFix/ShapeFix_Root.hxx
+++ b/src/ShapeFix/ShapeFix_Root.hxx
@@ -113,7 +113,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Root,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Root,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Shape.cxx b/src/ShapeFix/ShapeFix_Shape.cxx
index 5c884f03f9..80dd61422b 100644
--- a/src/ShapeFix/ShapeFix_Shape.cxx
+++ b/src/ShapeFix/ShapeFix_Shape.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Shape,ShapeFix_Root)
+
 //=======================================================================
 //function : ShapeFix_Shape
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_Shape.hxx b/src/ShapeFix/ShapeFix_Shape.hxx
index 19c3625e44..121004c846 100644
--- a/src/ShapeFix/ShapeFix_Shape.hxx
+++ b/src/ShapeFix/ShapeFix_Shape.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Shape,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Shape,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Shell.cxx b/src/ShapeFix/ShapeFix_Shell.cxx
index 75ca24ea42..27e921f8e1 100644
--- a/src/ShapeFix/ShapeFix_Shell.cxx
+++ b/src/ShapeFix/ShapeFix_Shell.cxx
@@ -57,6 +57,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Shell,ShapeFix_Root)
+
 //=======================================================================
 //function : ShapeFix_Shell
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_Shell.hxx b/src/ShapeFix/ShapeFix_Shell.hxx
index 2454a7dd0e..73e8c7fa2c 100644
--- a/src/ShapeFix/ShapeFix_Shell.hxx
+++ b/src/ShapeFix/ShapeFix_Shell.hxx
@@ -115,7 +115,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Shell,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Shell,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Solid.cxx b/src/ShapeFix/ShapeFix_Solid.cxx
index f134f04750..550d518ea2 100644
--- a/src/ShapeFix/ShapeFix_Solid.cxx
+++ b/src/ShapeFix/ShapeFix_Solid.cxx
@@ -60,6 +60,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Solid,ShapeFix_Root)
+
 //======================================================
 //function : ShapeFix_Solid
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_Solid.hxx b/src/ShapeFix/ShapeFix_Solid.hxx
index 4481343749..e9d1123842 100644
--- a/src/ShapeFix/ShapeFix_Solid.hxx
+++ b/src/ShapeFix/ShapeFix_Solid.hxx
@@ -102,7 +102,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Solid,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Solid,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_SplitCommonVertex.cxx b/src/ShapeFix/ShapeFix_SplitCommonVertex.cxx
index aa9a929d41..b2dd1d72fa 100644
--- a/src/ShapeFix/ShapeFix_SplitCommonVertex.cxx
+++ b/src/ShapeFix/ShapeFix_SplitCommonVertex.cxx
@@ -34,6 +34,8 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_SplitCommonVertex,ShapeFix_Root)
+
 //=======================================================================
 //function : ShapeFix_SplitCommonVertex
 //purpose  : 
diff --git a/src/ShapeFix/ShapeFix_SplitCommonVertex.hxx b/src/ShapeFix/ShapeFix_SplitCommonVertex.hxx
index 8396c3e6f7..0364b7be8e 100644
--- a/src/ShapeFix/ShapeFix_SplitCommonVertex.hxx
+++ b/src/ShapeFix/ShapeFix_SplitCommonVertex.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_SplitCommonVertex,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_SplitCommonVertex,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx
index e73ed13201..d475e9129b 100644
--- a/src/ShapeFix/ShapeFix_Wire.cxx
+++ b/src/ShapeFix/ShapeFix_Wire.cxx
@@ -118,6 +118,8 @@
 #include <TopTools_Array1OfShape.hxx>
 #include <TopTools_HSequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Wire,ShapeFix_Root)
+
 //S4135
 //#######################################################################
 //  Constructors, initializations, modes, querying
diff --git a/src/ShapeFix/ShapeFix_Wire.hxx b/src/ShapeFix/ShapeFix_Wire.hxx
index fa728c5a62..7f7d4ce400 100644
--- a/src/ShapeFix/ShapeFix_Wire.hxx
+++ b/src/ShapeFix/ShapeFix_Wire.hxx
@@ -454,7 +454,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Wire,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Wire,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeFix/ShapeFix_Wireframe.cxx b/src/ShapeFix/ShapeFix_Wireframe.cxx
index 7f0f14e97f..d699ec3b58 100644
--- a/src/ShapeFix/ShapeFix_Wireframe.cxx
+++ b/src/ShapeFix/ShapeFix_Wireframe.cxx
@@ -55,6 +55,8 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeFix_Wireframe,ShapeFix_Root)
+
 //#include <Geom2dConvert_CompCurveToBSplineCurve.hxx>
 //=======================================================================
 //function : ShapeFix_Wireframe
diff --git a/src/ShapeFix/ShapeFix_Wireframe.hxx b/src/ShapeFix/ShapeFix_Wireframe.hxx
index 04eea3febf..b8681c3fbf 100644
--- a/src/ShapeFix/ShapeFix_Wireframe.hxx
+++ b/src/ShapeFix/ShapeFix_Wireframe.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeFix_Wireframe,ShapeFix_Root)
+  DEFINE_STANDARD_RTTIEXT(ShapeFix_Wireframe,ShapeFix_Root)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_Context.cxx b/src/ShapeProcess/ShapeProcess_Context.cxx
index 4506961c72..aff1c02c7a 100644
--- a/src/ShapeProcess/ShapeProcess_Context.cxx
+++ b/src/ShapeProcess/ShapeProcess_Context.cxx
@@ -26,6 +26,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <sys/stat.h>
+IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_Context,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeProcess_Context
 //purpose  : 
diff --git a/src/ShapeProcess/ShapeProcess_Context.hxx b/src/ShapeProcess/ShapeProcess_Context.hxx
index ebada97e48..89e841b43f 100644
--- a/src/ShapeProcess/ShapeProcess_Context.hxx
+++ b/src/ShapeProcess/ShapeProcess_Context.hxx
@@ -123,7 +123,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_Context,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeProcess_Context,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_DictionaryOfOperator.hxx b/src/ShapeProcess/ShapeProcess_DictionaryOfOperator.hxx
index 189c07bef6..b6b8840fca 100644
--- a/src/ShapeProcess/ShapeProcess_DictionaryOfOperator.hxx
+++ b/src/ShapeProcess/ShapeProcess_DictionaryOfOperator.hxx
@@ -129,7 +129,7 @@ public:
 friend class ShapeProcess_IteratorOfDictionaryOfOperator;
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_DictionaryOfOperator,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(ShapeProcess_DictionaryOfOperator,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_Operator.cxx b/src/ShapeProcess/ShapeProcess_Operator.cxx
index 5d239644e3..22fe9439e3 100644
--- a/src/ShapeProcess/ShapeProcess_Operator.cxx
+++ b/src/ShapeProcess/ShapeProcess_Operator.cxx
@@ -17,3 +17,5 @@
 #include <ShapeProcess_Context.hxx>
 #include <ShapeProcess_Operator.hxx>
 #include <Standard_Type.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_Operator,MMgt_TShared)
\ No newline at end of file
diff --git a/src/ShapeProcess/ShapeProcess_Operator.hxx b/src/ShapeProcess/ShapeProcess_Operator.hxx
index aaad22f1e6..b3e2cc55f1 100644
--- a/src/ShapeProcess/ShapeProcess_Operator.hxx
+++ b/src/ShapeProcess/ShapeProcess_Operator.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_Operator,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeProcess_Operator,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
index 9c634050c4..526dcaa71f 100644
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.cxx
@@ -30,6 +30,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_ShapeContext,ShapeProcess_Context)
+
 //=======================================================================
 //function : ShapeProcess_ShapeContext
 //purpose  : 
diff --git a/src/ShapeProcess/ShapeProcess_ShapeContext.hxx b/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
index f37fee7d1e..eba7b310cd 100644
--- a/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
+++ b/src/ShapeProcess/ShapeProcess_ShapeContext.hxx
@@ -129,7 +129,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_ShapeContext,ShapeProcess_Context)
+  DEFINE_STANDARD_RTTIEXT(ShapeProcess_ShapeContext,ShapeProcess_Context)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_StackItemOfDictionaryOfOperator.hxx b/src/ShapeProcess/ShapeProcess_StackItemOfDictionaryOfOperator.hxx
index 9d9fb4afd7..0d10cbf0ee 100644
--- a/src/ShapeProcess/ShapeProcess_StackItemOfDictionaryOfOperator.hxx
+++ b/src/ShapeProcess/ShapeProcess_StackItemOfDictionaryOfOperator.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_StackItemOfDictionaryOfOperator,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(ShapeProcess_StackItemOfDictionaryOfOperator,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeProcess/ShapeProcess_UOperator.cxx b/src/ShapeProcess/ShapeProcess_UOperator.cxx
index 1f212dbe74..0d2c8c2fbf 100644
--- a/src/ShapeProcess/ShapeProcess_UOperator.cxx
+++ b/src/ShapeProcess/ShapeProcess_UOperator.cxx
@@ -18,6 +18,8 @@
 #include <ShapeProcess_UOperator.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeProcess_UOperator,ShapeProcess_Operator)
+
 //=======================================================================
 //function : ShapeProcess_UOperator
 //purpose  : 
diff --git a/src/ShapeProcess/ShapeProcess_UOperator.hxx b/src/ShapeProcess/ShapeProcess_UOperator.hxx
index 401243adbc..ba01ad4049 100644
--- a/src/ShapeProcess/ShapeProcess_UOperator.hxx
+++ b/src/ShapeProcess/ShapeProcess_UOperator.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeProcess_UOperator,ShapeProcess_Operator)
+  DEFINE_STANDARD_RTTIEXT(ShapeProcess_UOperator,ShapeProcess_Operator)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.cxx
index f0cfd19e8b..38b5dc6e53 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.cxx
@@ -29,6 +29,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_ClosedEdgeDivide,ShapeUpgrade_EdgeDivide)
+
 //=======================================================================
 //function : ShapeUpgrade_ClosedEdgeDivide
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
index 329eecc398..5d64264cfe 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedEdgeDivide.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_ClosedEdgeDivide,ShapeUpgrade_EdgeDivide)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_ClosedEdgeDivide,ShapeUpgrade_EdgeDivide)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
index b223e11dcd..c534bce6a3 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Wire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_ClosedFaceDivide,ShapeUpgrade_FaceDivide)
+
 //=======================================================================
 //function : ShapeUpgrade_ClosedFaceDivide
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
index c9c8ddf587..1b73d0af8c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ClosedFaceDivide.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_ClosedFaceDivide,ShapeUpgrade_FaceDivide)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_ClosedFaceDivide,ShapeUpgrade_FaceDivide)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
index ae3a43a7a5..7a766b1074 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx
@@ -34,6 +34,8 @@
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_ConvertCurve2dToBezier,ShapeUpgrade_SplitCurve2d)
+
 ShapeUpgrade_ConvertCurve2dToBezier::ShapeUpgrade_ConvertCurve2dToBezier()
 {
   mySegments = new TColGeom2d_HSequenceOfCurve;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
index 673f94cf5c..a635c9a879 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_ConvertCurve2dToBezier,ShapeUpgrade_SplitCurve2d)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_ConvertCurve2dToBezier,ShapeUpgrade_SplitCurve2d)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
index c1c9bdd733..c12a7388bc 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.cxx
@@ -33,6 +33,8 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_ConvertCurve3dToBezier,ShapeUpgrade_SplitCurve3d)
+
 ShapeUpgrade_ConvertCurve3dToBezier::ShapeUpgrade_ConvertCurve3dToBezier()
 {
   mySegments = new TColGeom_HSequenceOfCurve;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
index fc19f9f8f9..ff5da44eac 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve3dToBezier.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_ConvertCurve3dToBezier,ShapeUpgrade_SplitCurve3d)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_ConvertCurve3dToBezier,ShapeUpgrade_SplitCurve3d)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
index 8165b2d42e..25da8ee064 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cxx
@@ -44,6 +44,8 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_ConvertSurfaceToBezierBasis,ShapeUpgrade_SplitSurface)
+
 ShapeUpgrade_ConvertSurfaceToBezierBasis::ShapeUpgrade_ConvertSurfaceToBezierBasis()
 {
   myPlaneMode      = Standard_True;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
index 4793c7b972..cc35bed8fe 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_ConvertSurfaceToBezierBasis,ShapeUpgrade_SplitSurface)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_ConvertSurfaceToBezierBasis,ShapeUpgrade_SplitSurface)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cxx
index d98a2dc0fc..1a477dfe32 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cxx
@@ -23,6 +23,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_EdgeDivide,ShapeUpgrade_Tool)
+
 //=======================================================================
 //function : ShapeUpgrade_EdgeDivide
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
index 0ab7797eca..11fb17fb05 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_EdgeDivide,ShapeUpgrade_Tool)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_EdgeDivide,ShapeUpgrade_Tool)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
index 02de278f53..baaf0e025b 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.cxx
@@ -40,6 +40,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_FaceDivide,ShapeUpgrade_Tool)
+
 //=======================================================================
 //function : ShapeUpgrade_FaceDivide
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
index 9833263f5b..4a52e2df3c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx
@@ -111,7 +111,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_FaceDivide,ShapeUpgrade_Tool)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_FaceDivide,ShapeUpgrade_Tool)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
index d33b25958c..6399d63da3 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
@@ -26,6 +26,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_FaceDivideArea,ShapeUpgrade_FaceDivide)
+
 //=======================================================================
 //function : ShapeUpgrade_FaceDivideArea
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
index 04cbe8f5e8..9b04ca60e3 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_FaceDivideArea,ShapeUpgrade_FaceDivide)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_FaceDivideArea,ShapeUpgrade_FaceDivide)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
index 8d3c9329f0..1ee2355db4 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.cxx
@@ -44,6 +44,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_FixSmallBezierCurves,ShapeUpgrade_FixSmallCurves)
+
 ShapeUpgrade_FixSmallBezierCurves::ShapeUpgrade_FixSmallBezierCurves()
 {
 }
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
index 689fad0241..2bc19bfcd1 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallBezierCurves.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_FixSmallBezierCurves,ShapeUpgrade_FixSmallCurves)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_FixSmallBezierCurves,ShapeUpgrade_FixSmallCurves)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
index 3bb5f6d403..d678acedf8 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.cxx
@@ -23,6 +23,8 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_FixSmallCurves,ShapeUpgrade_Tool)
+
 //#include <TColGeom_HArray1OfCurve.hxx>
 //#include <TColStd_HSequenceOfReal.hxx>
 #//include <TColGeom2d_HArray1OfCurve.hxx>
diff --git a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
index 0c35582d35..3599e0ee6a 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_FixSmallCurves,ShapeUpgrade_Tool)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_FixSmallCurves,ShapeUpgrade_Tool)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
index 9436201ac8..d6608f5055 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.cxx
@@ -33,6 +33,8 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_RemoveInternalWires,ShapeUpgrade_Tool)
+
 //=======================================================================
 //function : ShapeUpgrade_RemoveInternalWires
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
index 4d2ec7d347..d9fe9312f1 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx
@@ -85,7 +85,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_RemoveInternalWires,ShapeUpgrade_Tool)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_RemoveInternalWires,ShapeUpgrade_Tool)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
index 62291ee168..0ecd994aaa 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
@@ -42,6 +42,8 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_RemoveLocations,MMgt_TShared)
+
 //#include <ShapeUpgrade_DataMapOfShapeListOfTransient.hxx>
 //=======================================================================
 //function : ShapeUpgrade_RemoveLocations
diff --git a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
index c681910fa8..39c9548aa5 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_RemoveLocations,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_RemoveLocations,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
index 2153f9c258..9ed6b7a4a8 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cxx
@@ -26,6 +26,8 @@
 #include <TColStd_HSequenceOfReal.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitCurve
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
index 00a1249def..1840898f92 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitCurve,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
index 56a0b3196a..07d5e78124 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HSequenceOfReal.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2d,ShapeUpgrade_SplitCurve)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitCurve2d
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
index 60d1616a53..e6a6e180fc 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitCurve2d,ShapeUpgrade_SplitCurve)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2d,ShapeUpgrade_SplitCurve)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
index 45d10f5c40..b831f7471b 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx
@@ -28,6 +28,8 @@
 #include <TColGeom2d_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2dContinuity,ShapeUpgrade_SplitCurve2d)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitCurve2dContinuity
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
index 21f51bc2d7..4fdf595ee0 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitCurve2dContinuity,ShapeUpgrade_SplitCurve2d)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve2dContinuity,ShapeUpgrade_SplitCurve2d)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
index 29e5fac367..5a639166dc 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cxx
@@ -32,6 +32,8 @@
 #include <TColStd_HSequenceOfReal.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3d,ShapeUpgrade_SplitCurve)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitCurve3d
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
index d8a506f806..c305a048a5 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitCurve3d,ShapeUpgrade_SplitCurve)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3d,ShapeUpgrade_SplitCurve)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
index 5e06705d7b..588c7be101 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx
@@ -29,6 +29,8 @@
 #include <TColGeom_HArray1OfCurve.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3dContinuity,ShapeUpgrade_SplitCurve3d)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitCurve3dContinuity
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
index 4db5a723c6..58b53e6422 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitCurve3dContinuity,ShapeUpgrade_SplitCurve3d)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitCurve3dContinuity,ShapeUpgrade_SplitCurve3d)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
index 8a57681519..0b8d7056be 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx
@@ -38,6 +38,8 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurface,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitSurface
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
index 69792b7bcb..7da763ce5c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitSurface,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurface,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cxx
index 07a83d3ac0..b8ab399aad 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cxx
@@ -28,6 +28,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceAngle,ShapeUpgrade_SplitSurface)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitSurfaceAngle
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
index 9d24419018..134efd1f74 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitSurfaceAngle,ShapeUpgrade_SplitSurface)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceAngle,ShapeUpgrade_SplitSurface)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cxx
index b86ef8ae45..c746b9d2f0 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceArea,ShapeUpgrade_SplitSurface)
+
 //=======================================================================
 //function : ShapeUpgrade_SplitSurfaceArea
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
index efaa0f40e8..5681cb4901 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitSurfaceArea,ShapeUpgrade_SplitSurface)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceArea,ShapeUpgrade_SplitSurface)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
index 2601afa44c..1c7ce5baab 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx
@@ -33,6 +33,8 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HSequenceOfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceContinuity,ShapeUpgrade_SplitSurface)
+
 //======================================================================
 //function : ShapeUpgrade_SplitSurface
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
index c7bfa51ae9..7109639332 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_SplitSurfaceContinuity,ShapeUpgrade_SplitSurface)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_SplitSurfaceContinuity,ShapeUpgrade_SplitSurface)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_Tool.cxx b/src/ShapeUpgrade/ShapeUpgrade_Tool.cxx
index 9dfd8ca155..34e3a5fff9 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_Tool.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_Tool.cxx
@@ -20,6 +20,8 @@
 #include <ShapeUpgrade_Tool.hxx>
 #include <Standard_Type.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_Tool,MMgt_TShared)
+
 //=======================================================================
 //function : ShapeUpgrade_Tool
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx b/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
index 8297871e74..c90829bb4e 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_Tool.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_Tool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_Tool,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
index 74128f5392..ec8e54e6d2 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
@@ -87,6 +87,8 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepClass_FaceClassifier.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_UnifySameDomain,MMgt_TShared)
+
 struct SubSequenceOfEdges
 {
   TopTools_SequenceOfShape SeqsEdges;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
index c578406072..4fe417684c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_UnifySameDomain,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_UnifySameDomain,MMgt_TShared)
 
 protected:
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
index 693dc3f893..518f0e9752 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
@@ -63,6 +63,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ShapeUpgrade_WireDivide,ShapeUpgrade_Tool)
+
 //=======================================================================
 //function : ShapeUpgrade_WireDivide
 //purpose  : 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
index d523b9481e..cd78a06296 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx
@@ -135,7 +135,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ShapeUpgrade_WireDivide,ShapeUpgrade_Tool)
+  DEFINE_STANDARD_RTTIEXT(ShapeUpgrade_WireDivide,ShapeUpgrade_Tool)
 
 protected:
 
diff --git a/src/Standard/Standard_DefineException.hxx b/src/Standard/Standard_DefineException.hxx
index 9abf9670bd..cea1a19e0b 100644
--- a/src/Standard/Standard_DefineException.hxx
+++ b/src/Standard/Standard_DefineException.hxx
@@ -42,7 +42,7 @@ public: \
     _E->Reraise (theMessage); \
   } \
   static Handle(C1) NewInstance(const Standard_CString theMessage = "") { return new C1(theMessage); } \
-  DEFINE_STANDARD_RTTI(C1,C2) \
+  DEFINE_STANDARD_RTTI_INLINE(C1,C2) \
 };
 
 //! Obsolete macro, kept for compatibility with old code
diff --git a/src/Standard/Standard_Failure.cxx b/src/Standard/Standard_Failure.cxx
index 24dedcfdfc..31be9c34bd 100644
--- a/src/Standard/Standard_Failure.cxx
+++ b/src/Standard/Standard_Failure.cxx
@@ -22,6 +22,8 @@
 #include <Standard_TypeMismatch.hxx>
 
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(Standard_Failure,Standard_Transient)
+
 static Standard_CString allocate_message(const Standard_CString AString)
 {
   Standard_CString aStr = 0;
diff --git a/src/Standard/Standard_Failure.hxx b/src/Standard/Standard_Failure.hxx
index 111ac0b508..b48db08c8e 100644
--- a/src/Standard/Standard_Failure.hxx
+++ b/src/Standard/Standard_Failure.hxx
@@ -112,7 +112,7 @@ void operator<< (Standard_OStream& s) const
 
 
 
-  DEFINE_STANDARD_RTTI(Standard_Failure,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Standard_Failure,Standard_Transient)
 
 protected:
 
diff --git a/src/Standard/Standard_Persistent.cxx b/src/Standard/Standard_Persistent.cxx
index e1c10af8be..93a5909590 100644
--- a/src/Standard/Standard_Persistent.cxx
+++ b/src/Standard/Standard_Persistent.cxx
@@ -14,3 +14,5 @@
 
 #include <Standard_Persistent.hxx>
 
+
+IMPLEMENT_STANDARD_RTTIEXT(Standard_Persistent,Standard_Transient)
\ No newline at end of file
diff --git a/src/Standard/Standard_Persistent.hxx b/src/Standard/Standard_Persistent.hxx
index 7bc372e676..73cfaa304e 100644
--- a/src/Standard/Standard_Persistent.hxx
+++ b/src/Standard/Standard_Persistent.hxx
@@ -26,7 +26,7 @@ public:
   
   Standard_Persistent() : _typenum(0), _refnum(0) {}
 
-  DEFINE_STANDARD_RTTI(Standard_Persistent,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(Standard_Persistent,Standard_Transient)
 
 private:
   Standard_Integer _typenum;
diff --git a/src/StdPrs/StdPrs_Isolines.cxx b/src/StdPrs/StdPrs_Isolines.cxx
index 739c97c7e5..cc3211ca8e 100644
--- a/src/StdPrs/StdPrs_Isolines.cxx
+++ b/src/StdPrs/StdPrs_Isolines.cxx
@@ -55,6 +55,7 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_SequenceOfPnt2d.hxx>
 #include <Standard_ErrorHandler.hxx>
+#include <Geom_Surface.hxx>
 
 typedef NCollection_Sequence<Handle(TColgp_HSequenceOfPnt)> Prs3d_NSequenceOfSequenceOfPnt;
 
diff --git a/src/StdSelect/StdSelect_BRepOwner.cxx b/src/StdSelect/StdSelect_BRepOwner.cxx
index b3f9398294..4f258a9789 100644
--- a/src/StdSelect/StdSelect_BRepOwner.cxx
+++ b/src/StdSelect/StdSelect_BRepOwner.cxx
@@ -26,6 +26,8 @@
 #include <TopLoc_Location.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_BRepOwner,SelectMgr_EntityOwner)
+
 //==================================================
 // Function: 
 // Purpose :
diff --git a/src/StdSelect/StdSelect_BRepOwner.hxx b/src/StdSelect/StdSelect_BRepOwner.hxx
index 38073bc1be..aad8db7da4 100644
--- a/src/StdSelect/StdSelect_BRepOwner.hxx
+++ b/src/StdSelect/StdSelect_BRepOwner.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_BRepOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_BRepOwner,SelectMgr_EntityOwner)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.hxx b/src/StdSelect/StdSelect_BRepSelectionTool.hxx
index f2795a3338..4d5e997a75 100644
--- a/src/StdSelect/StdSelect_BRepSelectionTool.hxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.hxx
@@ -28,6 +28,7 @@
 #include <Standard_Integer.hxx>
 #include <Select3D_SensitiveEntity.hxx>
 #include <Select3D_EntitySequence.hxx>
+#include <StdSelect_BRepOwner.hxx>
 class TopoDS_Shape;
 class SelectMgr_SelectableObject;
 class StdSelect_BRepOwner;
diff --git a/src/StdSelect/StdSelect_EdgeFilter.cxx b/src/StdSelect/StdSelect_EdgeFilter.cxx
index 60378e6391..9cc950728e 100644
--- a/src/StdSelect/StdSelect_EdgeFilter.cxx
+++ b/src/StdSelect/StdSelect_EdgeFilter.cxx
@@ -24,6 +24,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_EdgeFilter,SelectMgr_Filter)
+
 /*#include <.hxx>
 #include <.hxx>
 #include <.hxx>
diff --git a/src/StdSelect/StdSelect_EdgeFilter.hxx b/src/StdSelect/StdSelect_EdgeFilter.hxx
index bf3473d250..7116dc9f61 100644
--- a/src/StdSelect/StdSelect_EdgeFilter.hxx
+++ b/src/StdSelect/StdSelect_EdgeFilter.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_EdgeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_EdgeFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_FaceFilter.cxx b/src/StdSelect/StdSelect_FaceFilter.cxx
index 62134f67d4..dd792610c6 100644
--- a/src/StdSelect/StdSelect_FaceFilter.cxx
+++ b/src/StdSelect/StdSelect_FaceFilter.cxx
@@ -25,6 +25,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_FaceFilter,SelectMgr_Filter)
+
 /*#include <.hxx>
 #include <.hxx>
 #include <.hxx>
diff --git a/src/StdSelect/StdSelect_FaceFilter.hxx b/src/StdSelect/StdSelect_FaceFilter.hxx
index 8b63310284..307aff939a 100644
--- a/src/StdSelect/StdSelect_FaceFilter.hxx
+++ b/src/StdSelect/StdSelect_FaceFilter.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_FaceFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_FaceFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_Prs.cxx b/src/StdSelect/StdSelect_Prs.cxx
index 9f7d11538b..7875b35957 100644
--- a/src/StdSelect/StdSelect_Prs.cxx
+++ b/src/StdSelect/StdSelect_Prs.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <StdSelect_Prs.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_Prs,Prs3d_Presentation)
+
 StdSelect_Prs::
 StdSelect_Prs(const Handle(Graphic3d_StructureManager)& aStructureManager):
 Prs3d_Presentation(aStructureManager),
diff --git a/src/StdSelect/StdSelect_Prs.hxx b/src/StdSelect/StdSelect_Prs.hxx
index 50e57e03ec..7dc4dcda67 100644
--- a/src/StdSelect/StdSelect_Prs.hxx
+++ b/src/StdSelect/StdSelect_Prs.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_Prs,Prs3d_Presentation)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_Prs,Prs3d_Presentation)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_Shape.cxx b/src/StdSelect/StdSelect_Shape.cxx
index 613974575e..de07e0a655 100644
--- a/src/StdSelect/StdSelect_Shape.cxx
+++ b/src/StdSelect/StdSelect_Shape.cxx
@@ -26,6 +26,8 @@
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_Shape,PrsMgr_PresentableObject)
+
 StdSelect_Shape::StdSelect_Shape (const TopoDS_Shape& theShape, const Handle(Prs3d_Drawer)& theDrawer):
   mysh     (theShape),
   myDrawer (theDrawer)
diff --git a/src/StdSelect/StdSelect_Shape.hxx b/src/StdSelect/StdSelect_Shape.hxx
index 2fefca60d6..73bf5e0e5b 100644
--- a/src/StdSelect/StdSelect_Shape.hxx
+++ b/src/StdSelect/StdSelect_Shape.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_Shape,PrsMgr_PresentableObject)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_Shape,PrsMgr_PresentableObject)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_ShapeTypeFilter.cxx b/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
index 781d6870de..28a6bd9310 100644
--- a/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
+++ b/src/StdSelect/StdSelect_ShapeTypeFilter.cxx
@@ -20,6 +20,8 @@
 #include <StdSelect_BRepOwner.hxx>
 #include <StdSelect_ShapeTypeFilter.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_ShapeTypeFilter,SelectMgr_Filter)
+
 //==================================================
 // Function: StdSelect_ShapeTypeFilter
 // Purpose : Constructeur
diff --git a/src/StdSelect/StdSelect_ShapeTypeFilter.hxx b/src/StdSelect/StdSelect_ShapeTypeFilter.hxx
index 1c87934329..2ee69535dc 100644
--- a/src/StdSelect/StdSelect_ShapeTypeFilter.hxx
+++ b/src/StdSelect/StdSelect_ShapeTypeFilter.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StdSelect_ShapeTypeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_ShapeTypeFilter,SelectMgr_Filter)
 
 protected:
 
diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.cxx b/src/StdSelect/StdSelect_ViewerSelector3d.cxx
index 4239c923b3..d9021b30c2 100644
--- a/src/StdSelect/StdSelect_ViewerSelector3d.cxx
+++ b/src/StdSelect/StdSelect_ViewerSelector3d.cxx
@@ -66,6 +66,8 @@
 #include <OSD_Timer.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(StdSelect_ViewerSelector3d,SelectMgr_ViewerSelector)
+
 static Standard_Integer StdSel_NumberOfFreeEdges (const Handle(Poly_Triangulation)& Trg)
 {
   Standard_Integer nFree = 0;
diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.hxx b/src/StdSelect/StdSelect_ViewerSelector3d.hxx
index 6af71f5de7..d68f95d71a 100644
--- a/src/StdSelect/StdSelect_ViewerSelector3d.hxx
+++ b/src/StdSelect/StdSelect_ViewerSelector3d.hxx
@@ -81,7 +81,7 @@ public:
 
   Standard_EXPORT virtual Standard_Boolean HasDepthClipping (const Handle(SelectMgr_EntityOwner)& theOwner) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(StdSelect_ViewerSelector3d, SelectMgr_ViewerSelector)
+  DEFINE_STANDARD_RTTIEXT(StdSelect_ViewerSelector3d,SelectMgr_ViewerSelector)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignApproval.cxx b/src/StepAP203/StepAP203_CcDesignApproval.cxx
index 2a0d986a93..0bafbc1312 100644
--- a/src/StepAP203/StepAP203_CcDesignApproval.cxx
+++ b/src/StepAP203/StepAP203_CcDesignApproval.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_CcDesignApproval.hxx>
 #include <StepBasic_Approval.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignApproval,StepBasic_ApprovalAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignApproval
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignApproval.hxx b/src/StepAP203/StepAP203_CcDesignApproval.hxx
index ad3912d557..028338ba49 100644
--- a/src/StepAP203/StepAP203_CcDesignApproval.hxx
+++ b/src/StepAP203/StepAP203_CcDesignApproval.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignApproval,StepBasic_ApprovalAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignApproval,StepBasic_ApprovalAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignCertification.cxx b/src/StepAP203/StepAP203_CcDesignCertification.cxx
index d08f5df3d0..70ce058036 100644
--- a/src/StepAP203/StepAP203_CcDesignCertification.cxx
+++ b/src/StepAP203/StepAP203_CcDesignCertification.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_CcDesignCertification.hxx>
 #include <StepBasic_Certification.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignCertification,StepBasic_CertificationAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignCertification
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignCertification.hxx b/src/StepAP203/StepAP203_CcDesignCertification.hxx
index 91e19b02db..f22e58e092 100644
--- a/src/StepAP203/StepAP203_CcDesignCertification.hxx
+++ b/src/StepAP203/StepAP203_CcDesignCertification.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignCertification,StepBasic_CertificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignCertification,StepBasic_CertificationAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignContract.cxx b/src/StepAP203/StepAP203_CcDesignContract.cxx
index 0e8edf11a8..054f6cb91b 100644
--- a/src/StepAP203/StepAP203_CcDesignContract.cxx
+++ b/src/StepAP203/StepAP203_CcDesignContract.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_CcDesignContract.hxx>
 #include <StepBasic_Contract.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignContract,StepBasic_ContractAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignContract
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignContract.hxx b/src/StepAP203/StepAP203_CcDesignContract.hxx
index eee179ffee..dead6a7813 100644
--- a/src/StepAP203/StepAP203_CcDesignContract.hxx
+++ b/src/StepAP203/StepAP203_CcDesignContract.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignContract,StepBasic_ContractAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignContract,StepBasic_ContractAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
index 9f2a02a3dd..8ec254ddcc 100644
--- a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
+++ b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignDateAndTimeAssignment
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
index 2b726b7b8e..5c8aafffd6 100644
--- a/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
+++ b/src/StepAP203/StepAP203_CcDesignDateAndTimeAssignment.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
index baf3ce43df..c6014be61b 100644
--- a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignPersonAndOrganizationAssignment
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
index bba9d750f2..01f1464504 100644
--- a/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP203/StepAP203_CcDesignPersonAndOrganizationAssignment.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx b/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
index d386839046..d6d61a900f 100644
--- a/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
+++ b/src/StepAP203/StepAP203_CcDesignSecurityClassification.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_CcDesignSecurityClassification.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignSecurityClassification,StepBasic_SecurityClassificationAssignment)
+
 //=======================================================================
 //function : StepAP203_CcDesignSecurityClassification
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx b/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
index faa570a99b..fa2b33f40b 100644
--- a/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
+++ b/src/StepAP203/StepAP203_CcDesignSecurityClassification.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignSecurityClassification,StepBasic_SecurityClassificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignSecurityClassification,StepBasic_SecurityClassificationAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx b/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
index c02f40fe5f..4f8d11f2a1 100644
--- a/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
+++ b/src/StepAP203/StepAP203_CcDesignSpecificationReference.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_Document.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_CcDesignSpecificationReference,StepBasic_DocumentReference)
+
 //=======================================================================
 //function : StepAP203_CcDesignSpecificationReference
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx b/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
index 8cea42b9a6..713329bed2 100644
--- a/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
+++ b/src/StepAP203/StepAP203_CcDesignSpecificationReference.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_CcDesignSpecificationReference,StepBasic_DocumentReference)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_CcDesignSpecificationReference,StepBasic_DocumentReference)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_Change.cxx b/src/StepAP203/StepAP203_Change.cxx
index bbbcfc979b..3115d056f7 100644
--- a/src/StepAP203/StepAP203_Change.cxx
+++ b/src/StepAP203/StepAP203_Change.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_Change.hxx>
 #include <StepBasic_Action.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_Change,StepBasic_ActionAssignment)
+
 //=======================================================================
 //function : StepAP203_Change
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_Change.hxx b/src/StepAP203/StepAP203_Change.hxx
index 1a9f824b9e..99307bc834 100644
--- a/src/StepAP203/StepAP203_Change.hxx
+++ b/src/StepAP203/StepAP203_Change.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_Change,StepBasic_ActionAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_Change,StepBasic_ActionAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_ChangeRequest.cxx b/src/StepAP203/StepAP203_ChangeRequest.cxx
index db93a651b4..56696dbe7e 100644
--- a/src/StepAP203/StepAP203_ChangeRequest.cxx
+++ b/src/StepAP203/StepAP203_ChangeRequest.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_ChangeRequest.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_ChangeRequest,StepBasic_ActionRequestAssignment)
+
 //=======================================================================
 //function : StepAP203_ChangeRequest
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_ChangeRequest.hxx b/src/StepAP203/StepAP203_ChangeRequest.hxx
index 2b5c642f4d..aa640e14a3 100644
--- a/src/StepAP203/StepAP203_ChangeRequest.hxx
+++ b/src/StepAP203/StepAP203_ChangeRequest.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_ChangeRequest,StepBasic_ActionRequestAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_ChangeRequest,StepBasic_ActionRequestAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_StartRequest.cxx b/src/StepAP203/StepAP203_StartRequest.cxx
index 876c760d57..43a0bb41ca 100644
--- a/src/StepAP203/StepAP203_StartRequest.cxx
+++ b/src/StepAP203/StepAP203_StartRequest.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_StartRequest.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_StartRequest,StepBasic_ActionRequestAssignment)
+
 //=======================================================================
 //function : StepAP203_StartRequest
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_StartRequest.hxx b/src/StepAP203/StepAP203_StartRequest.hxx
index 4b1e4d259d..5c8f08af4d 100644
--- a/src/StepAP203/StepAP203_StartRequest.hxx
+++ b/src/StepAP203/StepAP203_StartRequest.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_StartRequest,StepBasic_ActionRequestAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_StartRequest,StepBasic_ActionRequestAssignment)
 
 protected:
 
diff --git a/src/StepAP203/StepAP203_StartWork.cxx b/src/StepAP203/StepAP203_StartWork.cxx
index 580bca5a68..3ec36c9bcb 100644
--- a/src/StepAP203/StepAP203_StartWork.cxx
+++ b/src/StepAP203/StepAP203_StartWork.cxx
@@ -20,6 +20,8 @@
 #include <StepAP203_StartWork.hxx>
 #include <StepBasic_Action.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP203_StartWork,StepBasic_ActionAssignment)
+
 //=======================================================================
 //function : StepAP203_StartWork
 //purpose  : 
diff --git a/src/StepAP203/StepAP203_StartWork.hxx b/src/StepAP203/StepAP203_StartWork.hxx
index 5c0bf1ed33..32956b6c15 100644
--- a/src/StepAP203/StepAP203_StartWork.hxx
+++ b/src/StepAP203/StepAP203_StartWork.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP203_StartWork,StepBasic_ActionAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP203_StartWork,StepBasic_ActionAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
index 7a86ddd8e3..4fdaf7d994 100644
--- a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepAP214_ApprovalItem.hxx>
 #include <StepBasic_Approval.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedApprovalAssignment,StepBasic_ApprovalAssignment)
+
 StepAP214_AppliedApprovalAssignment::StepAP214_AppliedApprovalAssignment ()  {}
 
 void StepAP214_AppliedApprovalAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx b/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
index f1ec48748d..2e723192fc 100644
--- a/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedApprovalAssignment.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedApprovalAssignment,StepBasic_ApprovalAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedApprovalAssignment,StepBasic_ApprovalAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
index f58697ef1b..1a1130e3e4 100644
--- a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+
 StepAP214_AppliedDateAndTimeAssignment::StepAP214_AppliedDateAndTimeAssignment ()  {}
 
 void StepAP214_AppliedDateAndTimeAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
index f6cd518c02..180b2a7fda 100644
--- a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedDateAssignment.cxx b/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
index 2936e42816..e4235b5c2a 100644
--- a/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedDateAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Date.hxx>
 #include <StepBasic_DateRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedDateAssignment,StepBasic_DateAssignment)
+
 StepAP214_AppliedDateAssignment::StepAP214_AppliedDateAssignment ()  {}
 
 void StepAP214_AppliedDateAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedDateAssignment.hxx b/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
index 456b2fe047..14ffa2e8a4 100644
--- a/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedDateAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedDateAssignment,StepBasic_DateAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedDateAssignment,StepBasic_DateAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedDocumentReference.cxx b/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
index 8e73f4eb4b..c9b341639c 100644
--- a/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
+++ b/src/StepAP214/StepAP214_AppliedDocumentReference.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Document.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedDocumentReference,StepBasic_DocumentReference)
+
 StepAP214_AppliedDocumentReference::StepAP214_AppliedDocumentReference ()    {  }
 
 void  StepAP214_AppliedDocumentReference::Init
diff --git a/src/StepAP214/StepAP214_AppliedDocumentReference.hxx b/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
index 1f04b8194a..7ab8ded142 100644
--- a/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
+++ b/src/StepAP214/StepAP214_AppliedDocumentReference.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedDocumentReference,StepBasic_DocumentReference)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedDocumentReference,StepBasic_DocumentReference)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
index 39aba9ccef..aec2e166ec 100644
--- a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedExternalIdentificationAssignment,StepBasic_ExternalIdentificationAssignment)
+
 //=======================================================================
 //function : StepAP214_AppliedExternalIdentificationAssignment
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
index fc0fe77dd3..8c043f05a9 100644
--- a/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedExternalIdentificationAssignment.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedExternalIdentificationAssignment,StepBasic_ExternalIdentificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedExternalIdentificationAssignment,StepBasic_ExternalIdentificationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx b/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
index 2d94b1681d..223072b209 100644
--- a/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedGroupAssignment.cxx
@@ -19,6 +19,8 @@
 #include <StepAP214_AppliedGroupAssignment.hxx>
 #include <StepBasic_Group.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedGroupAssignment,StepBasic_GroupAssignment)
+
 //=======================================================================
 //function : StepAP214_AppliedGroupAssignment
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx b/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
index 486687f3de..4f10bada48 100644
--- a/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedGroupAssignment.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedGroupAssignment,StepBasic_GroupAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedGroupAssignment,StepBasic_GroupAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
index c707c14354..5c6d1126a8 100644
--- a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedOrganizationAssignment,StepBasic_OrganizationAssignment)
+
 StepAP214_AppliedOrganizationAssignment::StepAP214_AppliedOrganizationAssignment ()  {}
 
 void StepAP214_AppliedOrganizationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
index 81e6d0c461..f2de37764f 100644
--- a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedOrganizationAssignment,StepBasic_OrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedOrganizationAssignment,StepBasic_OrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
index 98352bc762..d68918e706 100644
--- a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+
 StepAP214_AppliedPersonAndOrganizationAssignment::StepAP214_AppliedPersonAndOrganizationAssignment ()  {}
 
 void StepAP214_AppliedPersonAndOrganizationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
index a8a4ba2f5b..8cda04b115 100644
--- a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedPresentedItem.cxx b/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
index 2571715610..af6e2c4bda 100644
--- a/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
+++ b/src/StepAP214/StepAP214_AppliedPresentedItem.cxx
@@ -16,6 +16,8 @@
 #include <StepAP214_AppliedPresentedItem.hxx>
 #include <StepAP214_PresentedItemSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedPresentedItem,StepVisual_PresentedItem)
+
 StepAP214_AppliedPresentedItem::StepAP214_AppliedPresentedItem ()  {}
 
 void StepAP214_AppliedPresentedItem::Init(
diff --git a/src/StepAP214/StepAP214_AppliedPresentedItem.hxx b/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
index ac7ec75e58..080d3145d0 100644
--- a/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
+++ b/src/StepAP214/StepAP214_AppliedPresentedItem.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedPresentedItem,StepVisual_PresentedItem)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedPresentedItem,StepVisual_PresentedItem)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
index b4359f4203..0e9ee245ab 100644
--- a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepAP214_SecurityClassificationItem.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AppliedSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
+
 StepAP214_AppliedSecurityClassificationAssignment::StepAP214_AppliedSecurityClassificationAssignment ()  {}
 
 void StepAP214_AppliedSecurityClassificationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
index e13e90dfe4..500df71d65 100644
--- a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AppliedSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AppliedSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
index 9364fca47e..ec65e2931e 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignActualDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+
 StepAP214_AutoDesignActualDateAndTimeAssignment::StepAP214_AutoDesignActualDateAndTimeAssignment ()  {}
 
 void StepAP214_AutoDesignActualDateAndTimeAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
index 5ab198c744..ea8724bc88 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignActualDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignActualDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
index 4c6d02d4dd..445dd2a29c 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Date.hxx>
 #include <StepBasic_DateRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignActualDateAssignment,StepBasic_DateAssignment)
+
 StepAP214_AutoDesignActualDateAssignment::StepAP214_AutoDesignActualDateAssignment ()  {}
 
 void StepAP214_AutoDesignActualDateAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
index a956e1a627..cc84f0e5e1 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignActualDateAssignment,StepBasic_DateAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignActualDateAssignment,StepBasic_DateAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
index 9c4022ef53..8b865f2a13 100644
--- a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepAP214_AutoDesignGeneralOrgItem.hxx>
 #include <StepBasic_Approval.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignApprovalAssignment,StepBasic_ApprovalAssignment)
+
 StepAP214_AutoDesignApprovalAssignment::StepAP214_AutoDesignApprovalAssignment ()  {}
 
 void StepAP214_AutoDesignApprovalAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
index 5c4850072b..6f0e088a99 100644
--- a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignApprovalAssignment,StepBasic_ApprovalAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignApprovalAssignment,StepBasic_ApprovalAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
index 52f13133f5..ca11de9723 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignDateAndPersonAssignment,StepBasic_PersonAndOrganizationAssignment)
+
 StepAP214_AutoDesignDateAndPersonAssignment::StepAP214_AutoDesignDateAndPersonAssignment ()  {}
 
 void StepAP214_AutoDesignDateAndPersonAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
index 554d5d28cc..4204fccf9d 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignDateAndPersonAssignment,StepBasic_PersonAndOrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignDateAndPersonAssignment,StepBasic_PersonAndOrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx b/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
index 6fb4db49d0..8f505e97fe 100644
--- a/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignDocumentReference.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Document.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignDocumentReference,StepBasic_DocumentReference)
+
 StepAP214_AutoDesignDocumentReference::StepAP214_AutoDesignDocumentReference ()    {  }
 
 void  StepAP214_AutoDesignDocumentReference::Init
diff --git a/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx b/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
index 2bb1b7199f..53e9a922ef 100644
--- a/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignDocumentReference.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignDocumentReference,StepBasic_DocumentReference)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignDocumentReference,StepBasic_DocumentReference)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
index 90262e6aff..250f450818 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepAP214_AutoDesignGroupedItem.hxx>
 #include <StepBasic_Group.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignGroupAssignment,StepBasic_GroupAssignment)
+
 StepAP214_AutoDesignGroupAssignment::StepAP214_AutoDesignGroupAssignment ()  {}
 
 void StepAP214_AutoDesignGroupAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
index 0f72de5313..99dc37dd99 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignGroupAssignment,StepBasic_GroupAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignGroupAssignment,StepBasic_GroupAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
index 6a4870881f..20b1e9d91a 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignNominalDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+
 StepAP214_AutoDesignNominalDateAndTimeAssignment::StepAP214_AutoDesignNominalDateAndTimeAssignment ()  {}
 
 void StepAP214_AutoDesignNominalDateAndTimeAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
index fcf02ce2b1..a485e99589 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignNominalDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignNominalDateAndTimeAssignment,StepBasic_DateAndTimeAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
index 0adafeb3f1..34b91e2aaf 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Date.hxx>
 #include <StepBasic_DateRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignNominalDateAssignment,StepBasic_DateAssignment)
+
 StepAP214_AutoDesignNominalDateAssignment::StepAP214_AutoDesignNominalDateAssignment ()  {}
 
 void StepAP214_AutoDesignNominalDateAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
index 2edad5bdf3..e4f9cf8eb5 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignNominalDateAssignment,StepBasic_DateAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignNominalDateAssignment,StepBasic_DateAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
index a808ae9607..61855de0c5 100644
--- a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Organization.hxx>
 #include <StepBasic_OrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignOrganizationAssignment,StepBasic_OrganizationAssignment)
+
 StepAP214_AutoDesignOrganizationAssignment::StepAP214_AutoDesignOrganizationAssignment ()  {}
 
 void StepAP214_AutoDesignOrganizationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
index a5dbb61c3f..704de72a2c 100644
--- a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignOrganizationAssignment,StepBasic_OrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignOrganizationAssignment,StepBasic_OrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
index 62e4096530..86b5bf67ac 100644
--- a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_PersonAndOrganization.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+
 StepAP214_AutoDesignPersonAndOrganizationAssignment::StepAP214_AutoDesignPersonAndOrganizationAssignment ()  {}
 
 void StepAP214_AutoDesignPersonAndOrganizationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
index 18493d59ad..0a49cb0fe4 100644
--- a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignPersonAndOrganizationAssignment,StepBasic_PersonAndOrganizationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
index a1bb69767f..e13cb82a3d 100644
--- a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cxx
@@ -16,6 +16,8 @@
 #include <StepAP214_AutoDesignPresentedItem.hxx>
 #include <StepAP214_AutoDesignPresentedItemSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignPresentedItem,StepVisual_PresentedItem)
+
 StepAP214_AutoDesignPresentedItem::StepAP214_AutoDesignPresentedItem ()  {}
 
 void StepAP214_AutoDesignPresentedItem::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx b/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
index 35877095cf..e514f1d1cd 100644
--- a/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignPresentedItem.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignPresentedItem,StepVisual_PresentedItem)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignPresentedItem,StepVisual_PresentedItem)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cxx
index 15d9b7eb43..f75c63aafe 100644
--- a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_SecurityClassification.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_AutoDesignSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
+
 StepAP214_AutoDesignSecurityClassificationAssignment::StepAP214_AutoDesignSecurityClassificationAssignment ()  {}
 
 void StepAP214_AutoDesignSecurityClassificationAssignment::Init(
diff --git a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.hxx b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.hxx
index b7837ab974..26ed76f1a8 100644
--- a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.hxx
+++ b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_AutoDesignSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_AutoDesignSecurityClassificationAssignment,StepBasic_SecurityClassificationAssignment)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_Class.cxx b/src/StepAP214/StepAP214_Class.cxx
index 3c8cbdaa5d..161390cd3d 100644
--- a/src/StepAP214/StepAP214_Class.cxx
+++ b/src/StepAP214/StepAP214_Class.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepAP214_Class.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_Class,StepBasic_Group)
+
 //=======================================================================
 //function : StepAP214_Class
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_Class.hxx b/src/StepAP214/StepAP214_Class.hxx
index 4db2379781..93ef0099d6 100644
--- a/src/StepAP214/StepAP214_Class.hxx
+++ b/src/StepAP214/StepAP214_Class.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_Class,StepBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_Class,StepBasic_Group)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx b/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
index 6c9e7bdff4..8caefe8236 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedClass.cxx
@@ -22,6 +22,8 @@
 #include <StepBasic_SourceItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_ExternallyDefinedClass,StepAP214_Class)
+
 //=======================================================================
 //function : StepAP214_ExternallyDefinedClass
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedClass.hxx b/src/StepAP214/StepAP214_ExternallyDefinedClass.hxx
index 2b63e401c8..52cefdc97e 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedClass.hxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedClass.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_ExternallyDefinedClass,StepAP214_Class)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_ExternallyDefinedClass,StepAP214_Class)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
index 17bfbeb025..2f23480d54 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.cxx
@@ -22,6 +22,8 @@
 #include <StepBasic_SourceItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_ExternallyDefinedGeneralProperty,StepBasic_GeneralProperty)
+
 //=======================================================================
 //function : StepAP214_ExternallyDefinedGeneralProperty
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.hxx b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.hxx
index effd86758e..388931dd63 100644
--- a/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.hxx
+++ b/src/StepAP214/StepAP214_ExternallyDefinedGeneralProperty.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_ExternallyDefinedGeneralProperty,StepBasic_GeneralProperty)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_ExternallyDefinedGeneralProperty,StepBasic_GeneralProperty)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_Protocol.cxx b/src/StepAP214/StepAP214_Protocol.cxx
index f2d6ea8d7d..28e8560439 100644
--- a/src/StepAP214/StepAP214_Protocol.cxx
+++ b/src/StepAP214/StepAP214_Protocol.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <StepAP214_Protocol.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_Protocol,StepData_Protocol)
+
 static Standard_CString schemaAP214CD  = "AUTOMOTIVE_DESIGN_CC2 { 1 2 10303 214 -1 1 5 4 }";
 static Standard_CString schemaAP214DIS = "AUTOMOTIVE_DESIGN { 1 2 10303 214 0 1 1 1 }";
 static Standard_CString schemaAP214IS  = "AUTOMOTIVE_DESIGN { 1 0 10303 214 1 1 1 1 }";
diff --git a/src/StepAP214/StepAP214_Protocol.hxx b/src/StepAP214/StepAP214_Protocol.hxx
index 2cc8eefb8f..ab13ff90e8 100644
--- a/src/StepAP214/StepAP214_Protocol.hxx
+++ b/src/StepAP214/StepAP214_Protocol.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_Protocol,StepData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_Protocol,StepData_Protocol)
 
 protected:
 
diff --git a/src/StepAP214/StepAP214_RepItemGroup.cxx b/src/StepAP214/StepAP214_RepItemGroup.cxx
index a0e7384869..5c4f458a92 100644
--- a/src/StepAP214/StepAP214_RepItemGroup.cxx
+++ b/src/StepAP214/StepAP214_RepItemGroup.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP214_RepItemGroup,StepBasic_Group)
+
 //=======================================================================
 //function : StepAP214_RepItemGroup
 //purpose  : 
diff --git a/src/StepAP214/StepAP214_RepItemGroup.hxx b/src/StepAP214/StepAP214_RepItemGroup.hxx
index 2ae653675b..bb7073cd19 100644
--- a/src/StepAP214/StepAP214_RepItemGroup.hxx
+++ b/src/StepAP214/StepAP214_RepItemGroup.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepAP214_RepItemGroup,StepBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(StepAP214_RepItemGroup,StepBasic_Group)
 
 protected:
 
diff --git a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.cxx b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.cxx
index 96454cb4ea..7acd31f012 100644
--- a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.cxx
+++ b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.cxx
@@ -15,4 +15,6 @@
 
 #include <StepAP242_GeometricItemSpecificUsage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP242_GeometricItemSpecificUsage,StepAP242_ItemIdentifiedRepresentationUsage)
+
 StepAP242_GeometricItemSpecificUsage::StepAP242_GeometricItemSpecificUsage ()    {  }
diff --git a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
index 96146c60ab..8acfa00e92 100644
--- a/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
+++ b/src/StepAP242/StepAP242_GeometricItemSpecificUsage.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepAP242_GeometricItemSpecificUsage();
 
-  DEFINE_STANDARD_RTTI(StepAP242_GeometricItemSpecificUsage, StepAP242_ItemIdentifiedRepresentationUsage)
+  DEFINE_STANDARD_RTTIEXT(StepAP242_GeometricItemSpecificUsage,StepAP242_ItemIdentifiedRepresentationUsage)
 
 private: 
 };
diff --git a/src/StepAP242/StepAP242_IdAttribute.cxx b/src/StepAP242/StepAP242_IdAttribute.cxx
index 8ffe8a2d5b..844e0b6222 100644
--- a/src/StepAP242/StepAP242_IdAttribute.cxx
+++ b/src/StepAP242/StepAP242_IdAttribute.cxx
@@ -15,6 +15,8 @@
 
 #include <StepAP242_IdAttribute.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP242_IdAttribute,MMgt_TShared)
+
 //=======================================================================
 //function : StepAP242_IdAttribute
 //purpose  : 
diff --git a/src/StepAP242/StepAP242_IdAttribute.hxx b/src/StepAP242/StepAP242_IdAttribute.hxx
index dd07f90db9..eb0de4db06 100644
--- a/src/StepAP242/StepAP242_IdAttribute.hxx
+++ b/src/StepAP242/StepAP242_IdAttribute.hxx
@@ -61,7 +61,7 @@ public:
     return identifiedItem;
   }
 
-  DEFINE_STANDARD_RTTI(StepAP242_IdAttribute, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepAP242_IdAttribute,MMgt_TShared)
 
 private: 
   Handle(TCollection_HAsciiString) attributeValue;
diff --git a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.cxx b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.cxx
index 36d0635724..5da6eeced8 100644
--- a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.cxx
+++ b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.cxx
@@ -18,6 +18,8 @@
 #include <StepAP242_ItemIdentifiedRepresentationUsageDefinition.hxx>
 #include <StepRepr_HArray1OfRepresentationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepAP242_ItemIdentifiedRepresentationUsage,MMgt_TShared)
+
 //=======================================================================
 //function : StepAP242_ItemIdentifiedRepresentationUsage
 //purpose  : 
diff --git a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
index 43c7b359bc..7c0b017100 100644
--- a/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
+++ b/src/StepAP242/StepAP242_ItemIdentifiedRepresentationUsage.hxx
@@ -121,7 +121,7 @@ public:
     identifiedItem->SetValue (num, theItem);
   }
 
-  DEFINE_STANDARD_RTTI(StepAP242_ItemIdentifiedRepresentationUsage, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepAP242_ItemIdentifiedRepresentationUsage,MMgt_TShared)
 
 private: 
   Handle(TCollection_HAsciiString) name;
diff --git a/src/StepBasic/StepBasic_Action.cxx b/src/StepBasic/StepBasic_Action.cxx
index 4a36f1f714..1bb47dade8 100644
--- a/src/StepBasic/StepBasic_Action.cxx
+++ b/src/StepBasic/StepBasic_Action.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ActionMethod.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Action,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_Action
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_Action.hxx b/src/StepBasic/StepBasic_Action.hxx
index 020b6ad1ca..09b4f8a7ea 100644
--- a/src/StepBasic/StepBasic_Action.hxx
+++ b/src/StepBasic/StepBasic_Action.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Action,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Action,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ActionAssignment.cxx b/src/StepBasic/StepBasic_ActionAssignment.cxx
index 47ff80eb4b..424a57a78b 100644
--- a/src/StepBasic/StepBasic_ActionAssignment.cxx
+++ b/src/StepBasic/StepBasic_ActionAssignment.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_Action.hxx>
 #include <StepBasic_ActionAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ActionAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ActionAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ActionAssignment.hxx b/src/StepBasic/StepBasic_ActionAssignment.hxx
index 270fcde4d0..19ef2f2bf9 100644
--- a/src/StepBasic/StepBasic_ActionAssignment.hxx
+++ b/src/StepBasic/StepBasic_ActionAssignment.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ActionAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ActionAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ActionMethod.cxx b/src/StepBasic/StepBasic_ActionMethod.cxx
index d86d52b3d8..1858d1e26f 100644
--- a/src/StepBasic/StepBasic_ActionMethod.cxx
+++ b/src/StepBasic/StepBasic_ActionMethod.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ActionMethod.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ActionMethod,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ActionMethod
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ActionMethod.hxx b/src/StepBasic/StepBasic_ActionMethod.hxx
index 53e5d462dc..f14f021a75 100644
--- a/src/StepBasic/StepBasic_ActionMethod.hxx
+++ b/src/StepBasic/StepBasic_ActionMethod.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ActionMethod,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ActionMethod,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ActionRequestAssignment.cxx b/src/StepBasic/StepBasic_ActionRequestAssignment.cxx
index 73c4b33308..d3c03abc2f 100644
--- a/src/StepBasic/StepBasic_ActionRequestAssignment.cxx
+++ b/src/StepBasic/StepBasic_ActionRequestAssignment.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ActionRequestAssignment.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ActionRequestAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ActionRequestAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ActionRequestAssignment.hxx b/src/StepBasic/StepBasic_ActionRequestAssignment.hxx
index 60068f1e7b..aa24963e1d 100644
--- a/src/StepBasic/StepBasic_ActionRequestAssignment.hxx
+++ b/src/StepBasic/StepBasic_ActionRequestAssignment.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ActionRequestAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ActionRequestAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ActionRequestSolution.cxx b/src/StepBasic/StepBasic_ActionRequestSolution.cxx
index c368fde830..9f235331cd 100644
--- a/src/StepBasic/StepBasic_ActionRequestSolution.cxx
+++ b/src/StepBasic/StepBasic_ActionRequestSolution.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ActionRequestSolution.hxx>
 #include <StepBasic_VersionedActionRequest.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ActionRequestSolution,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ActionRequestSolution
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ActionRequestSolution.hxx b/src/StepBasic/StepBasic_ActionRequestSolution.hxx
index dd79acebc1..49332629ae 100644
--- a/src/StepBasic/StepBasic_ActionRequestSolution.hxx
+++ b/src/StepBasic/StepBasic_ActionRequestSolution.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ActionRequestSolution,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ActionRequestSolution,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Address.cxx b/src/StepBasic/StepBasic_Address.cxx
index 632871dde7..b8bb65854a 100644
--- a/src/StepBasic/StepBasic_Address.cxx
+++ b/src/StepBasic/StepBasic_Address.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_Address.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Address,MMgt_TShared)
+
 StepBasic_Address::StepBasic_Address ()  {}
 
 void StepBasic_Address::Init(
diff --git a/src/StepBasic/StepBasic_Address.hxx b/src/StepBasic/StepBasic_Address.hxx
index 8be4cb1b33..668c7103b8 100644
--- a/src/StepBasic/StepBasic_Address.hxx
+++ b/src/StepBasic/StepBasic_Address.hxx
@@ -139,7 +139,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Address,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Address,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApplicationContext.cxx b/src/StepBasic/StepBasic_ApplicationContext.cxx
index 3ab8a92386..b09677c6f7 100644
--- a/src/StepBasic/StepBasic_ApplicationContext.cxx
+++ b/src/StepBasic/StepBasic_ApplicationContext.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_ApplicationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApplicationContext,MMgt_TShared)
+
 StepBasic_ApplicationContext::StepBasic_ApplicationContext ()  {}
 
 void StepBasic_ApplicationContext::Init(
diff --git a/src/StepBasic/StepBasic_ApplicationContext.hxx b/src/StepBasic/StepBasic_ApplicationContext.hxx
index c656bd96dd..02b74c1a59 100644
--- a/src/StepBasic/StepBasic_ApplicationContext.hxx
+++ b/src/StepBasic/StepBasic_ApplicationContext.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApplicationContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApplicationContext,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApplicationContextElement.cxx b/src/StepBasic/StepBasic_ApplicationContextElement.cxx
index 0b0bafb044..70313ac276 100644
--- a/src/StepBasic/StepBasic_ApplicationContextElement.cxx
+++ b/src/StepBasic/StepBasic_ApplicationContextElement.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ApplicationContextElement.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApplicationContextElement,MMgt_TShared)
+
 StepBasic_ApplicationContextElement::StepBasic_ApplicationContextElement ()  {}
 
 void StepBasic_ApplicationContextElement::Init(
diff --git a/src/StepBasic/StepBasic_ApplicationContextElement.hxx b/src/StepBasic/StepBasic_ApplicationContextElement.hxx
index 6714cee490..60e7627140 100644
--- a/src/StepBasic/StepBasic_ApplicationContextElement.hxx
+++ b/src/StepBasic/StepBasic_ApplicationContextElement.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApplicationContextElement,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApplicationContextElement,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
index e49a03d0c4..9ea1fa5793 100644
--- a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
+++ b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ApplicationProtocolDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApplicationProtocolDefinition,MMgt_TShared)
+
 StepBasic_ApplicationProtocolDefinition::StepBasic_ApplicationProtocolDefinition ()  {}
 
 void StepBasic_ApplicationProtocolDefinition::Init(
diff --git a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx
index 866eb57f38..cdfcc786eb 100644
--- a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx
+++ b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApplicationProtocolDefinition,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApplicationProtocolDefinition,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Approval.cxx b/src/StepBasic/StepBasic_Approval.cxx
index 69d5c3716a..41ac96aae5 100644
--- a/src/StepBasic/StepBasic_Approval.cxx
+++ b/src/StepBasic/StepBasic_Approval.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ApprovalStatus.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Approval,MMgt_TShared)
+
 StepBasic_Approval::StepBasic_Approval ()  {}
 
 void StepBasic_Approval::Init(
diff --git a/src/StepBasic/StepBasic_Approval.hxx b/src/StepBasic/StepBasic_Approval.hxx
index 9d40bfc1b5..404e81f678 100644
--- a/src/StepBasic/StepBasic_Approval.hxx
+++ b/src/StepBasic/StepBasic_Approval.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Approval,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Approval,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalAssignment.cxx b/src/StepBasic/StepBasic_ApprovalAssignment.cxx
index fb049274e7..50a7aa3d7d 100644
--- a/src/StepBasic/StepBasic_ApprovalAssignment.cxx
+++ b/src/StepBasic/StepBasic_ApprovalAssignment.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_Approval.hxx>
 #include <StepBasic_ApprovalAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalAssignment,MMgt_TShared)
+
 void StepBasic_ApprovalAssignment::Init(
 	const Handle(StepBasic_Approval)& aAssignedApproval)
 {
diff --git a/src/StepBasic/StepBasic_ApprovalAssignment.hxx b/src/StepBasic/StepBasic_ApprovalAssignment.hxx
index 61181309ec..8492ab9b5f 100644
--- a/src/StepBasic/StepBasic_ApprovalAssignment.hxx
+++ b/src/StepBasic/StepBasic_ApprovalAssignment.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalDateTime.cxx b/src/StepBasic/StepBasic_ApprovalDateTime.cxx
index 47294f4825..e42189682b 100644
--- a/src/StepBasic/StepBasic_ApprovalDateTime.cxx
+++ b/src/StepBasic/StepBasic_ApprovalDateTime.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ApprovalDateTime.hxx>
 #include <StepBasic_DateTimeSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalDateTime,MMgt_TShared)
+
 StepBasic_ApprovalDateTime::StepBasic_ApprovalDateTime ()  {  }
 
 void  StepBasic_ApprovalDateTime::Init (const StepBasic_DateTimeSelect& aDateTime, const Handle(StepBasic_Approval)& aDatedApproval)
diff --git a/src/StepBasic/StepBasic_ApprovalDateTime.hxx b/src/StepBasic/StepBasic_ApprovalDateTime.hxx
index cc4d402673..cdd849c717 100644
--- a/src/StepBasic/StepBasic_ApprovalDateTime.hxx
+++ b/src/StepBasic/StepBasic_ApprovalDateTime.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalDateTime,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalDateTime,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
index 714dccdb4d..7e4bdfc904 100644
--- a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
+++ b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_ApprovalRole.hxx>
 #include <StepBasic_PersonOrganizationSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalPersonOrganization,MMgt_TShared)
+
 StepBasic_ApprovalPersonOrganization::StepBasic_ApprovalPersonOrganization ()  {}
 
 void StepBasic_ApprovalPersonOrganization::Init(
diff --git a/src/StepBasic/StepBasic_ApprovalPersonOrganization.hxx b/src/StepBasic/StepBasic_ApprovalPersonOrganization.hxx
index 4cfc4996bd..38a5f6cca1 100644
--- a/src/StepBasic/StepBasic_ApprovalPersonOrganization.hxx
+++ b/src/StepBasic/StepBasic_ApprovalPersonOrganization.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalPersonOrganization,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalPersonOrganization,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalRelationship.cxx b/src/StepBasic/StepBasic_ApprovalRelationship.cxx
index cd7713d1fb..7f7186d5c8 100644
--- a/src/StepBasic/StepBasic_ApprovalRelationship.cxx
+++ b/src/StepBasic/StepBasic_ApprovalRelationship.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ApprovalRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalRelationship,MMgt_TShared)
+
 StepBasic_ApprovalRelationship::StepBasic_ApprovalRelationship ()  {}
 
 void StepBasic_ApprovalRelationship::Init(
diff --git a/src/StepBasic/StepBasic_ApprovalRelationship.hxx b/src/StepBasic/StepBasic_ApprovalRelationship.hxx
index 81ab55342a..f65b6d2975 100644
--- a/src/StepBasic/StepBasic_ApprovalRelationship.hxx
+++ b/src/StepBasic/StepBasic_ApprovalRelationship.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalRole.cxx b/src/StepBasic/StepBasic_ApprovalRole.cxx
index c2fe62757c..425a25eb91 100644
--- a/src/StepBasic/StepBasic_ApprovalRole.cxx
+++ b/src/StepBasic/StepBasic_ApprovalRole.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_ApprovalRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalRole,MMgt_TShared)
+
 StepBasic_ApprovalRole::StepBasic_ApprovalRole ()  {}
 
 void StepBasic_ApprovalRole::Init(
diff --git a/src/StepBasic/StepBasic_ApprovalRole.hxx b/src/StepBasic/StepBasic_ApprovalRole.hxx
index 5648c5ba16..96c161356a 100644
--- a/src/StepBasic/StepBasic_ApprovalRole.hxx
+++ b/src/StepBasic/StepBasic_ApprovalRole.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ApprovalStatus.cxx b/src/StepBasic/StepBasic_ApprovalStatus.cxx
index 77a36130ba..4be0d6aba2 100644
--- a/src/StepBasic/StepBasic_ApprovalStatus.cxx
+++ b/src/StepBasic/StepBasic_ApprovalStatus.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_ApprovalStatus.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ApprovalStatus,MMgt_TShared)
+
 StepBasic_ApprovalStatus::StepBasic_ApprovalStatus ()  {}
 
 void StepBasic_ApprovalStatus::Init(
diff --git a/src/StepBasic/StepBasic_ApprovalStatus.hxx b/src/StepBasic/StepBasic_ApprovalStatus.hxx
index 443b4d2a9d..de330d5878 100644
--- a/src/StepBasic/StepBasic_ApprovalStatus.hxx
+++ b/src/StepBasic/StepBasic_ApprovalStatus.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ApprovalStatus,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ApprovalStatus,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_AreaUnit.cxx b/src/StepBasic/StepBasic_AreaUnit.cxx
index f9718aa104..207b095d18 100644
--- a/src/StepBasic/StepBasic_AreaUnit.cxx
+++ b/src/StepBasic/StepBasic_AreaUnit.cxx
@@ -18,4 +18,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_AreaUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_AreaUnit,StepBasic_NamedUnit)
+
 StepBasic_AreaUnit::StepBasic_AreaUnit () {}
diff --git a/src/StepBasic/StepBasic_AreaUnit.hxx b/src/StepBasic/StepBasic_AreaUnit.hxx
index ff0a9fcff4..257f2b1da7 100644
--- a/src/StepBasic/StepBasic_AreaUnit.hxx
+++ b/src/StepBasic/StepBasic_AreaUnit.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_AreaUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_AreaUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_CalendarDate.cxx b/src/StepBasic/StepBasic_CalendarDate.cxx
index d53b2e3959..b6def2d0d7 100644
--- a/src/StepBasic/StepBasic_CalendarDate.cxx
+++ b/src/StepBasic/StepBasic_CalendarDate.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_CalendarDate.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_CalendarDate,StepBasic_Date)
+
 StepBasic_CalendarDate::StepBasic_CalendarDate ()  {}
 
 void StepBasic_CalendarDate::Init(
diff --git a/src/StepBasic/StepBasic_CalendarDate.hxx b/src/StepBasic/StepBasic_CalendarDate.hxx
index d236de564b..a0e0797e26 100644
--- a/src/StepBasic/StepBasic_CalendarDate.hxx
+++ b/src/StepBasic/StepBasic_CalendarDate.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_CalendarDate,StepBasic_Date)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_CalendarDate,StepBasic_Date)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Certification.cxx b/src/StepBasic/StepBasic_Certification.cxx
index a8753c3ab7..b47ac8934c 100644
--- a/src/StepBasic/StepBasic_Certification.cxx
+++ b/src/StepBasic/StepBasic_Certification.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_CertificationType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Certification,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_Certification
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_Certification.hxx b/src/StepBasic/StepBasic_Certification.hxx
index 7c74ec5b62..bef8185233 100644
--- a/src/StepBasic/StepBasic_Certification.hxx
+++ b/src/StepBasic/StepBasic_Certification.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Certification,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Certification,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_CertificationAssignment.cxx b/src/StepBasic/StepBasic_CertificationAssignment.cxx
index 1392822998..f760890bc5 100644
--- a/src/StepBasic/StepBasic_CertificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_CertificationAssignment.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_Certification.hxx>
 #include <StepBasic_CertificationAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_CertificationAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_CertificationAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_CertificationAssignment.hxx b/src/StepBasic/StepBasic_CertificationAssignment.hxx
index aae42d6ed0..e78ed39e02 100644
--- a/src/StepBasic/StepBasic_CertificationAssignment.hxx
+++ b/src/StepBasic/StepBasic_CertificationAssignment.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_CertificationAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_CertificationAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_CertificationType.cxx b/src/StepBasic/StepBasic_CertificationType.cxx
index 364106035d..a02928c7a3 100644
--- a/src/StepBasic/StepBasic_CertificationType.cxx
+++ b/src/StepBasic/StepBasic_CertificationType.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_CertificationType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_CertificationType,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_CertificationType
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_CertificationType.hxx b/src/StepBasic/StepBasic_CertificationType.hxx
index eb13955001..48fb0fdce8 100644
--- a/src/StepBasic/StepBasic_CertificationType.hxx
+++ b/src/StepBasic/StepBasic_CertificationType.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_CertificationType,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_CertificationType,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_CharacterizedObject.cxx b/src/StepBasic/StepBasic_CharacterizedObject.cxx
index 39bd2d1973..992b09f39d 100644
--- a/src/StepBasic/StepBasic_CharacterizedObject.cxx
+++ b/src/StepBasic/StepBasic_CharacterizedObject.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_CharacterizedObject.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_CharacterizedObject,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_CharacterizedObject
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_CharacterizedObject.hxx b/src/StepBasic/StepBasic_CharacterizedObject.hxx
index b516175750..23af1e787f 100644
--- a/src/StepBasic/StepBasic_CharacterizedObject.hxx
+++ b/src/StepBasic/StepBasic_CharacterizedObject.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_CharacterizedObject,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_CharacterizedObject,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Contract.cxx b/src/StepBasic/StepBasic_Contract.cxx
index 6fda697a6a..8de54758aa 100644
--- a/src/StepBasic/StepBasic_Contract.cxx
+++ b/src/StepBasic/StepBasic_Contract.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ContractType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Contract,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_Contract
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_Contract.hxx b/src/StepBasic/StepBasic_Contract.hxx
index 46f33f6634..a1c8c5653f 100644
--- a/src/StepBasic/StepBasic_Contract.hxx
+++ b/src/StepBasic/StepBasic_Contract.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Contract,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Contract,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ContractAssignment.cxx b/src/StepBasic/StepBasic_ContractAssignment.cxx
index ca85ea1f82..bbe03e2a30 100644
--- a/src/StepBasic/StepBasic_ContractAssignment.cxx
+++ b/src/StepBasic/StepBasic_ContractAssignment.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_Contract.hxx>
 #include <StepBasic_ContractAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ContractAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ContractAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ContractAssignment.hxx b/src/StepBasic/StepBasic_ContractAssignment.hxx
index 0183d15dcc..e57658d2aa 100644
--- a/src/StepBasic/StepBasic_ContractAssignment.hxx
+++ b/src/StepBasic/StepBasic_ContractAssignment.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ContractAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ContractAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ContractType.cxx b/src/StepBasic/StepBasic_ContractType.cxx
index 9cbacb25a5..51c4e379f6 100644
--- a/src/StepBasic/StepBasic_ContractType.cxx
+++ b/src/StepBasic/StepBasic_ContractType.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ContractType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ContractType,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ContractType
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ContractType.hxx b/src/StepBasic/StepBasic_ContractType.hxx
index aecacfd437..ae3741f4d4 100644
--- a/src/StepBasic/StepBasic_ContractType.hxx
+++ b/src/StepBasic/StepBasic_ContractType.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ContractType,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ContractType,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
index de0147505f..d7e43646c6 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnit,StepBasic_NamedUnit)
+
 StepBasic_ConversionBasedUnit::StepBasic_ConversionBasedUnit ()  {}
 
 void StepBasic_ConversionBasedUnit::Init(
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnit.hxx
index e943189f71..12d604a60e 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnit.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cxx
index a4057b6e90..dfa9e35757 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_AreaUnit.hxx>
 #include <StepBasic_ConversionBasedUnitAndAreaUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndAreaUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndAreaUnit::StepBasic_ConversionBasedUnitAndAreaUnit()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.hxx
index d60a86ff31..0e3e7851d9 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndAreaUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndAreaUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
index 71e1321da9..836f8711c6 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndLengthUnit::StepBasic_ConversionBasedUnitAndLengthUnit ()  {}
 
 void StepBasic_ConversionBasedUnitAndLengthUnit::Init(const Handle(StepBasic_DimensionalExponents)& aDimensions)
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx
index 7b7e544888..836ad5564c 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndLengthUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
index b19fea922b..adbce3d629 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit)
+
 //=======================================================================
 //function : StepBasic_ConversionBasedUnitAndMassUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx
index 114f23fd5f..7a5831dcb1 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndMassUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
index 2e921b1377..483a97272a 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_PlaneAngleUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndPlaneAngleUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndPlaneAngleUnit::StepBasic_ConversionBasedUnitAndPlaneAngleUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx
index aa8436a805..7761df29d7 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndPlaneAngleUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndPlaneAngleUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
index 858d175132..09dace3dc3 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_RatioUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndRatioUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndRatioUnit::StepBasic_ConversionBasedUnitAndRatioUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx
index 68658fc212..862ecd5a3b 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndRatioUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndRatioUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
index 2c89cc001d..8810859d9e 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_SolidAngleUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndSolidAngleUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndSolidAngleUnit::StepBasic_ConversionBasedUnitAndSolidAngleUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx
index 7c5744de92..76f41aaf4c 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndSolidAngleUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndSolidAngleUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
index b14c65ad76..eee7b6b8e7 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_TimeUnit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndTimeUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndTimeUnit::StepBasic_ConversionBasedUnitAndTimeUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx
index a1fbcc78ca..583c4cab50 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndTimeUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndTimeUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cxx
index bdbeb3514c..9d6128d343 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_ConversionBasedUnitAndVolumeUnit.hxx>
 #include <StepBasic_VolumeUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndVolumeUnit,StepBasic_ConversionBasedUnit)
+
 StepBasic_ConversionBasedUnitAndVolumeUnit::StepBasic_ConversionBasedUnitAndVolumeUnit()
 {
 }
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.hxx b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.hxx
index d5bc98286e..00a3e896f4 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.hxx
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ConversionBasedUnitAndVolumeUnit,StepBasic_ConversionBasedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ConversionBasedUnitAndVolumeUnit,StepBasic_ConversionBasedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cxx b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cxx
index 96aee76b60..0932af5816 100644
--- a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cxx
+++ b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_CoordinatedUniversalTimeOffset.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_CoordinatedUniversalTimeOffset,MMgt_TShared)
+
 StepBasic_CoordinatedUniversalTimeOffset::StepBasic_CoordinatedUniversalTimeOffset ()  {}
 
 void StepBasic_CoordinatedUniversalTimeOffset::Init(
diff --git a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
index 8d89402e38..687e3cc6ee 100644
--- a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
+++ b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_CoordinatedUniversalTimeOffset,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_CoordinatedUniversalTimeOffset,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Date.cxx b/src/StepBasic/StepBasic_Date.cxx
index cfc8d66f34..01ce4216e1 100644
--- a/src/StepBasic/StepBasic_Date.cxx
+++ b/src/StepBasic/StepBasic_Date.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_Date.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Date,MMgt_TShared)
+
 StepBasic_Date::StepBasic_Date ()  {}
 
 void StepBasic_Date::Init(
diff --git a/src/StepBasic/StepBasic_Date.hxx b/src/StepBasic/StepBasic_Date.hxx
index da9300825c..8120b21412 100644
--- a/src/StepBasic/StepBasic_Date.hxx
+++ b/src/StepBasic/StepBasic_Date.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Date,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Date,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DateAndTime.cxx b/src/StepBasic/StepBasic_DateAndTime.cxx
index 00528d9693..833107f974 100644
--- a/src/StepBasic/StepBasic_DateAndTime.cxx
+++ b/src/StepBasic/StepBasic_DateAndTime.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DateAndTime.hxx>
 #include <StepBasic_LocalTime.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DateAndTime,MMgt_TShared)
+
 StepBasic_DateAndTime::StepBasic_DateAndTime ()  {}
 
 void StepBasic_DateAndTime::Init(
diff --git a/src/StepBasic/StepBasic_DateAndTime.hxx b/src/StepBasic/StepBasic_DateAndTime.hxx
index bdc6d7595f..6b57b9acf4 100644
--- a/src/StepBasic/StepBasic_DateAndTime.hxx
+++ b/src/StepBasic/StepBasic_DateAndTime.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DateAndTime,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DateAndTime,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DateAndTimeAssignment.cxx b/src/StepBasic/StepBasic_DateAndTimeAssignment.cxx
index ab46df8cfd..469fc680d1 100644
--- a/src/StepBasic/StepBasic_DateAndTimeAssignment.cxx
+++ b/src/StepBasic/StepBasic_DateAndTimeAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DateAndTimeAssignment.hxx>
 #include <StepBasic_DateTimeRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DateAndTimeAssignment,MMgt_TShared)
+
 void StepBasic_DateAndTimeAssignment::Init(
 	const Handle(StepBasic_DateAndTime)& aAssignedDateAndTime,
 	const Handle(StepBasic_DateTimeRole)& aRole)
diff --git a/src/StepBasic/StepBasic_DateAndTimeAssignment.hxx b/src/StepBasic/StepBasic_DateAndTimeAssignment.hxx
index 8c4c7dbac8..1a1a2b0a56 100644
--- a/src/StepBasic/StepBasic_DateAndTimeAssignment.hxx
+++ b/src/StepBasic/StepBasic_DateAndTimeAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DateAndTimeAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DateAndTimeAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DateAssignment.cxx b/src/StepBasic/StepBasic_DateAssignment.cxx
index 555a52a4c3..0ccddcefd8 100644
--- a/src/StepBasic/StepBasic_DateAssignment.cxx
+++ b/src/StepBasic/StepBasic_DateAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DateAssignment.hxx>
 #include <StepBasic_DateRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DateAssignment,MMgt_TShared)
+
 void StepBasic_DateAssignment::Init(
 	const Handle(StepBasic_Date)& aAssignedDate,
 	const Handle(StepBasic_DateRole)& aRole)
diff --git a/src/StepBasic/StepBasic_DateAssignment.hxx b/src/StepBasic/StepBasic_DateAssignment.hxx
index 7962438221..38c620cac1 100644
--- a/src/StepBasic/StepBasic_DateAssignment.hxx
+++ b/src/StepBasic/StepBasic_DateAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DateAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DateAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DateRole.cxx b/src/StepBasic/StepBasic_DateRole.cxx
index 7e799566fc..363998133d 100644
--- a/src/StepBasic/StepBasic_DateRole.cxx
+++ b/src/StepBasic/StepBasic_DateRole.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DateRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DateRole,MMgt_TShared)
+
 StepBasic_DateRole::StepBasic_DateRole ()  {}
 
 void StepBasic_DateRole::Init(
diff --git a/src/StepBasic/StepBasic_DateRole.hxx b/src/StepBasic/StepBasic_DateRole.hxx
index bb9fa20596..21cd8c0512 100644
--- a/src/StepBasic/StepBasic_DateRole.hxx
+++ b/src/StepBasic/StepBasic_DateRole.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DateRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DateRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DateTimeRole.cxx b/src/StepBasic/StepBasic_DateTimeRole.cxx
index 4f02fe1b9e..0f74aa58c4 100644
--- a/src/StepBasic/StepBasic_DateTimeRole.cxx
+++ b/src/StepBasic/StepBasic_DateTimeRole.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DateTimeRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DateTimeRole,MMgt_TShared)
+
 StepBasic_DateTimeRole::StepBasic_DateTimeRole ()  {}
 
 void StepBasic_DateTimeRole::Init(
diff --git a/src/StepBasic/StepBasic_DateTimeRole.hxx b/src/StepBasic/StepBasic_DateTimeRole.hxx
index b156be4c09..fff6b2ce0f 100644
--- a/src/StepBasic/StepBasic_DateTimeRole.hxx
+++ b/src/StepBasic/StepBasic_DateTimeRole.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DateTimeRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DateTimeRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DerivedUnit.cxx b/src/StepBasic/StepBasic_DerivedUnit.cxx
index 37083ad6d4..d8ce559ce3 100644
--- a/src/StepBasic/StepBasic_DerivedUnit.cxx
+++ b/src/StepBasic/StepBasic_DerivedUnit.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DerivedUnit.hxx>
 #include <StepBasic_DerivedUnitElement.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DerivedUnit,MMgt_TShared)
+
 StepBasic_DerivedUnit::StepBasic_DerivedUnit  ()    {  }
 
 void  StepBasic_DerivedUnit::Init (const Handle(StepBasic_HArray1OfDerivedUnitElement)& elements)
diff --git a/src/StepBasic/StepBasic_DerivedUnit.hxx b/src/StepBasic/StepBasic_DerivedUnit.hxx
index 094bce9bb8..4fc7377d22 100644
--- a/src/StepBasic/StepBasic_DerivedUnit.hxx
+++ b/src/StepBasic/StepBasic_DerivedUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DerivedUnit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DerivedUnit,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DerivedUnitElement.cxx b/src/StepBasic/StepBasic_DerivedUnitElement.cxx
index 2ee392318e..6012e04d87 100644
--- a/src/StepBasic/StepBasic_DerivedUnitElement.cxx
+++ b/src/StepBasic/StepBasic_DerivedUnitElement.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DerivedUnitElement.hxx>
 #include <StepBasic_NamedUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DerivedUnitElement,MMgt_TShared)
+
 StepBasic_DerivedUnitElement::StepBasic_DerivedUnitElement ()    {  }
 
 void  StepBasic_DerivedUnitElement::Init (const Handle(StepBasic_NamedUnit)& aUnit, const Standard_Real aExponent)
diff --git a/src/StepBasic/StepBasic_DerivedUnitElement.hxx b/src/StepBasic/StepBasic_DerivedUnitElement.hxx
index d39ca28e3c..4b74c21472 100644
--- a/src/StepBasic/StepBasic_DerivedUnitElement.hxx
+++ b/src/StepBasic/StepBasic_DerivedUnitElement.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DerivedUnitElement,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DerivedUnitElement,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DesignContext.cxx b/src/StepBasic/StepBasic_DesignContext.cxx
index 6ce004ae7a..d3cfdc1a42 100644
--- a/src/StepBasic/StepBasic_DesignContext.cxx
+++ b/src/StepBasic/StepBasic_DesignContext.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DesignContext.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DesignContext,StepBasic_ProductDefinitionContext)
+
 StepBasic_DesignContext::StepBasic_DesignContext  ()    {  }
diff --git a/src/StepBasic/StepBasic_DesignContext.hxx b/src/StepBasic/StepBasic_DesignContext.hxx
index f6df7dfa4c..bc2ab31a2b 100644
--- a/src/StepBasic/StepBasic_DesignContext.hxx
+++ b/src/StepBasic/StepBasic_DesignContext.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DesignContext,StepBasic_ProductDefinitionContext)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DesignContext,StepBasic_ProductDefinitionContext)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DigitalDocument.cxx b/src/StepBasic/StepBasic_DigitalDocument.cxx
index a6b4e763ef..f16d6af2da 100644
--- a/src/StepBasic/StepBasic_DigitalDocument.cxx
+++ b/src/StepBasic/StepBasic_DigitalDocument.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DigitalDocument.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DigitalDocument,StepBasic_Document)
+
 StepBasic_DigitalDocument::StepBasic_DigitalDocument  ()    {  }
diff --git a/src/StepBasic/StepBasic_DigitalDocument.hxx b/src/StepBasic/StepBasic_DigitalDocument.hxx
index 221e8f5875..240f2771ab 100644
--- a/src/StepBasic/StepBasic_DigitalDocument.hxx
+++ b/src/StepBasic/StepBasic_DigitalDocument.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DigitalDocument,StepBasic_Document)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DigitalDocument,StepBasic_Document)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DimensionalExponents.cxx b/src/StepBasic/StepBasic_DimensionalExponents.cxx
index 9c22c3a82c..aed4615f0f 100644
--- a/src/StepBasic/StepBasic_DimensionalExponents.cxx
+++ b/src/StepBasic/StepBasic_DimensionalExponents.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DimensionalExponents.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DimensionalExponents,MMgt_TShared)
+
 StepBasic_DimensionalExponents::StepBasic_DimensionalExponents ()  {}
 
 void StepBasic_DimensionalExponents::Init(
diff --git a/src/StepBasic/StepBasic_DimensionalExponents.hxx b/src/StepBasic/StepBasic_DimensionalExponents.hxx
index 26322385a7..26253a40ef 100644
--- a/src/StepBasic/StepBasic_DimensionalExponents.hxx
+++ b/src/StepBasic/StepBasic_DimensionalExponents.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DimensionalExponents,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DimensionalExponents,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Document.cxx b/src/StepBasic/StepBasic_Document.cxx
index a83ea2deb7..18a3bdce4d 100644
--- a/src/StepBasic/StepBasic_Document.cxx
+++ b/src/StepBasic/StepBasic_Document.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_DocumentType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Document,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_Document
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_Document.hxx b/src/StepBasic/StepBasic_Document.hxx
index 21b2da71a6..40fd8b4f09 100644
--- a/src/StepBasic/StepBasic_Document.hxx
+++ b/src/StepBasic/StepBasic_Document.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Document,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Document,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentFile.cxx b/src/StepBasic/StepBasic_DocumentFile.cxx
index 9c8f0b096b..681b8f44f5 100644
--- a/src/StepBasic/StepBasic_DocumentFile.cxx
+++ b/src/StepBasic/StepBasic_DocumentFile.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_DocumentType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentFile,StepBasic_Document)
+
 //=======================================================================
 //function : StepBasic_DocumentFile
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_DocumentFile.hxx b/src/StepBasic/StepBasic_DocumentFile.hxx
index d441274355..420679f181 100644
--- a/src/StepBasic/StepBasic_DocumentFile.hxx
+++ b/src/StepBasic/StepBasic_DocumentFile.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentFile,StepBasic_Document)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentFile,StepBasic_Document)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentProductAssociation.cxx b/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
index ba74196c73..4d376052b8 100644
--- a/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
+++ b/src/StepBasic/StepBasic_DocumentProductAssociation.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ProductOrFormationOrDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentProductAssociation,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_DocumentProductAssociation
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_DocumentProductAssociation.hxx b/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
index f05f7f95f4..d20f0ba4d2 100644
--- a/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
+++ b/src/StepBasic/StepBasic_DocumentProductAssociation.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentProductAssociation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentProductAssociation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx b/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
index dc33aa46b6..72773a7cd3 100644
--- a/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
+++ b/src/StepBasic/StepBasic_DocumentProductEquivalence.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_DocumentProductEquivalence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentProductEquivalence,StepBasic_DocumentProductAssociation)
+
 //=======================================================================
 //function : StepBasic_DocumentProductEquivalence
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx b/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
index c0e1c21c22..e684ef08b6 100644
--- a/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
+++ b/src/StepBasic/StepBasic_DocumentProductEquivalence.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentProductEquivalence,StepBasic_DocumentProductAssociation)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentProductEquivalence,StepBasic_DocumentProductAssociation)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentReference.cxx b/src/StepBasic/StepBasic_DocumentReference.cxx
index 22c3035bbe..576728bffd 100644
--- a/src/StepBasic/StepBasic_DocumentReference.cxx
+++ b/src/StepBasic/StepBasic_DocumentReference.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DocumentReference.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentReference,MMgt_TShared)
+
 void  StepBasic_DocumentReference::Init0
   (const Handle(StepBasic_Document)& aAssignedDocument,
    const Handle(TCollection_HAsciiString)& aSource)
diff --git a/src/StepBasic/StepBasic_DocumentReference.hxx b/src/StepBasic/StepBasic_DocumentReference.hxx
index 4031db9a45..c034aea2fb 100644
--- a/src/StepBasic/StepBasic_DocumentReference.hxx
+++ b/src/StepBasic/StepBasic_DocumentReference.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentReference,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentReference,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentRelationship.cxx b/src/StepBasic/StepBasic_DocumentRelationship.cxx
index 93a7eb5a11..24589d6f68 100644
--- a/src/StepBasic/StepBasic_DocumentRelationship.cxx
+++ b/src/StepBasic/StepBasic_DocumentRelationship.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DocumentRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentRelationship,MMgt_TShared)
+
 StepBasic_DocumentRelationship::StepBasic_DocumentRelationship  ()    {  }
 
 void  StepBasic_DocumentRelationship::Init
diff --git a/src/StepBasic/StepBasic_DocumentRelationship.hxx b/src/StepBasic/StepBasic_DocumentRelationship.hxx
index b86274e2dd..6af1a4ca8f 100644
--- a/src/StepBasic/StepBasic_DocumentRelationship.hxx
+++ b/src/StepBasic/StepBasic_DocumentRelationship.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentRepresentationType.cxx b/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
index b9e27f6db5..4e787053e8 100644
--- a/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
+++ b/src/StepBasic/StepBasic_DocumentRepresentationType.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_DocumentRepresentationType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentRepresentationType,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_DocumentRepresentationType
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_DocumentRepresentationType.hxx b/src/StepBasic/StepBasic_DocumentRepresentationType.hxx
index ce4e801908..ac20eb2f41 100644
--- a/src/StepBasic/StepBasic_DocumentRepresentationType.hxx
+++ b/src/StepBasic/StepBasic_DocumentRepresentationType.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentRepresentationType,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentRepresentationType,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentType.cxx b/src/StepBasic/StepBasic_DocumentType.cxx
index 93c14ea2d0..9d474d30d7 100644
--- a/src/StepBasic/StepBasic_DocumentType.cxx
+++ b/src/StepBasic/StepBasic_DocumentType.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DocumentType.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentType,MMgt_TShared)
+
 StepBasic_DocumentType::StepBasic_DocumentType  ()    {  }
 
 void  StepBasic_DocumentType::Init (const Handle(TCollection_HAsciiString)& apdt)
diff --git a/src/StepBasic/StepBasic_DocumentType.hxx b/src/StepBasic/StepBasic_DocumentType.hxx
index 3c018b15e7..bd8a32d4fc 100644
--- a/src/StepBasic/StepBasic_DocumentType.hxx
+++ b/src/StepBasic/StepBasic_DocumentType.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentType,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentType,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx b/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
index c85960fec8..772ee20bec 100644
--- a/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
+++ b/src/StepBasic/StepBasic_DocumentUsageConstraint.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_DocumentUsageConstraint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_DocumentUsageConstraint,MMgt_TShared)
+
 StepBasic_DocumentUsageConstraint::StepBasic_DocumentUsageConstraint  ()    {  }
 
 void  StepBasic_DocumentUsageConstraint::Init
diff --git a/src/StepBasic/StepBasic_DocumentUsageConstraint.hxx b/src/StepBasic/StepBasic_DocumentUsageConstraint.hxx
index 16fbe198bd..2972f0a6e1 100644
--- a/src/StepBasic/StepBasic_DocumentUsageConstraint.hxx
+++ b/src/StepBasic/StepBasic_DocumentUsageConstraint.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_DocumentUsageConstraint,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_DocumentUsageConstraint,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Effectivity.cxx b/src/StepBasic/StepBasic_Effectivity.cxx
index fef3ea1546..40b6fbe226 100644
--- a/src/StepBasic/StepBasic_Effectivity.cxx
+++ b/src/StepBasic/StepBasic_Effectivity.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_Effectivity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Effectivity,MMgt_TShared)
+
 StepBasic_Effectivity::StepBasic_Effectivity  ()    {  }
 
 void  StepBasic_Effectivity::Init (const Handle(TCollection_HAsciiString)& aid)
diff --git a/src/StepBasic/StepBasic_Effectivity.hxx b/src/StepBasic/StepBasic_Effectivity.hxx
index 827f1bb31f..4cbf265e4c 100644
--- a/src/StepBasic/StepBasic_Effectivity.hxx
+++ b/src/StepBasic/StepBasic_Effectivity.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Effectivity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Effectivity,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_EffectivityAssignment.cxx b/src/StepBasic/StepBasic_EffectivityAssignment.cxx
index 2c4c401230..0fa7d28a9a 100644
--- a/src/StepBasic/StepBasic_EffectivityAssignment.cxx
+++ b/src/StepBasic/StepBasic_EffectivityAssignment.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_Effectivity.hxx>
 #include <StepBasic_EffectivityAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_EffectivityAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_EffectivityAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_EffectivityAssignment.hxx b/src/StepBasic/StepBasic_EffectivityAssignment.hxx
index 770f514436..f7f31cd706 100644
--- a/src/StepBasic/StepBasic_EffectivityAssignment.hxx
+++ b/src/StepBasic/StepBasic_EffectivityAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_EffectivityAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_EffectivityAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_EulerAngles.cxx b/src/StepBasic/StepBasic_EulerAngles.cxx
index ad40ee739b..d80eb1c470 100644
--- a/src/StepBasic/StepBasic_EulerAngles.cxx
+++ b/src/StepBasic/StepBasic_EulerAngles.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_EulerAngles.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_EulerAngles,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_EulerAngles
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_EulerAngles.hxx b/src/StepBasic/StepBasic_EulerAngles.hxx
index 8a7171e701..daa1d4763d 100644
--- a/src/StepBasic/StepBasic_EulerAngles.hxx
+++ b/src/StepBasic/StepBasic_EulerAngles.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_EulerAngles,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_EulerAngles,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
index 89ed02e7cf..50385882e2 100644
--- a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ExternalIdentificationAssignment,StepBasic_IdentificationAssignment)
+
 //=======================================================================
 //function : StepBasic_ExternalIdentificationAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.hxx b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.hxx
index bc577945f9..68505dec22 100644
--- a/src/StepBasic/StepBasic_ExternalIdentificationAssignment.hxx
+++ b/src/StepBasic/StepBasic_ExternalIdentificationAssignment.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ExternalIdentificationAssignment,StepBasic_IdentificationAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ExternalIdentificationAssignment,StepBasic_IdentificationAssignment)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ExternalSource.cxx b/src/StepBasic/StepBasic_ExternalSource.cxx
index 5be05a467b..1a16f53534 100644
--- a/src/StepBasic/StepBasic_ExternalSource.cxx
+++ b/src/StepBasic/StepBasic_ExternalSource.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_SourceItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ExternalSource,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ExternalSource
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ExternalSource.hxx b/src/StepBasic/StepBasic_ExternalSource.hxx
index 219436a6a6..f3c5650233 100644
--- a/src/StepBasic/StepBasic_ExternalSource.hxx
+++ b/src/StepBasic/StepBasic_ExternalSource.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ExternalSource,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ExternalSource,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx b/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
index 2f42ec6756..30a5dad1ed 100644
--- a/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
+++ b/src/StepBasic/StepBasic_ExternallyDefinedItem.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ExternalSource.hxx>
 #include <StepBasic_SourceItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ExternallyDefinedItem,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ExternallyDefinedItem
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx b/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
index 4fae42645a..fc7ea5e883 100644
--- a/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
+++ b/src/StepBasic/StepBasic_ExternallyDefinedItem.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ExternallyDefinedItem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ExternallyDefinedItem,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_GeneralProperty.cxx b/src/StepBasic/StepBasic_GeneralProperty.cxx
index dbc09fb631..564c5c726f 100644
--- a/src/StepBasic/StepBasic_GeneralProperty.cxx
+++ b/src/StepBasic/StepBasic_GeneralProperty.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_GeneralProperty.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GeneralProperty,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_GeneralProperty
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_GeneralProperty.hxx b/src/StepBasic/StepBasic_GeneralProperty.hxx
index 46e0f66bc6..26b14faa39 100644
--- a/src/StepBasic/StepBasic_GeneralProperty.hxx
+++ b/src/StepBasic/StepBasic_GeneralProperty.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_GeneralProperty,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_GeneralProperty,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Group.cxx b/src/StepBasic/StepBasic_Group.cxx
index 3b7997cae8..c52425024f 100644
--- a/src/StepBasic/StepBasic_Group.cxx
+++ b/src/StepBasic/StepBasic_Group.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_Group.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Group,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_Group
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_Group.hxx b/src/StepBasic/StepBasic_Group.hxx
index 0dc8e67c6d..ac03a01ccd 100644
--- a/src/StepBasic/StepBasic_Group.hxx
+++ b/src/StepBasic/StepBasic_Group.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Group,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Group,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_GroupAssignment.cxx b/src/StepBasic/StepBasic_GroupAssignment.cxx
index 2206b5addc..5646bb6459 100644
--- a/src/StepBasic/StepBasic_GroupAssignment.cxx
+++ b/src/StepBasic/StepBasic_GroupAssignment.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_Group.hxx>
 #include <StepBasic_GroupAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GroupAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_GroupAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_GroupAssignment.hxx b/src/StepBasic/StepBasic_GroupAssignment.hxx
index 74291fc732..c1acad70df 100644
--- a/src/StepBasic/StepBasic_GroupAssignment.hxx
+++ b/src/StepBasic/StepBasic_GroupAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_GroupAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_GroupAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_GroupRelationship.cxx b/src/StepBasic/StepBasic_GroupRelationship.cxx
index 69d52d0319..2acaef271d 100644
--- a/src/StepBasic/StepBasic_GroupRelationship.cxx
+++ b/src/StepBasic/StepBasic_GroupRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_GroupRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_GroupRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_GroupRelationship
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_GroupRelationship.hxx b/src/StepBasic/StepBasic_GroupRelationship.hxx
index 0b8dc920fd..d577434b51 100644
--- a/src/StepBasic/StepBasic_GroupRelationship.hxx
+++ b/src/StepBasic/StepBasic_GroupRelationship.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_GroupRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_GroupRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_IdentificationAssignment.cxx b/src/StepBasic/StepBasic_IdentificationAssignment.cxx
index b9116a4c80..6b648d0827 100644
--- a/src/StepBasic/StepBasic_IdentificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_IdentificationAssignment.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_IdentificationAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_IdentificationAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_IdentificationAssignment.hxx b/src/StepBasic/StepBasic_IdentificationAssignment.hxx
index 57ee3258c9..4d0475d294 100644
--- a/src/StepBasic/StepBasic_IdentificationAssignment.hxx
+++ b/src/StepBasic/StepBasic_IdentificationAssignment.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_IdentificationAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_IdentificationAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_IdentificationRole.cxx b/src/StepBasic/StepBasic_IdentificationRole.cxx
index 1d25cb4011..ce4bd00b0d 100644
--- a/src/StepBasic/StepBasic_IdentificationRole.cxx
+++ b/src/StepBasic/StepBasic_IdentificationRole.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_IdentificationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_IdentificationRole,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_IdentificationRole
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_IdentificationRole.hxx b/src/StepBasic/StepBasic_IdentificationRole.hxx
index d7e567a0a8..a90a92cb7d 100644
--- a/src/StepBasic/StepBasic_IdentificationRole.hxx
+++ b/src/StepBasic/StepBasic_IdentificationRole.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_IdentificationRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_IdentificationRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
index 302466dcc6..c932e08e3d 100644
--- a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_LengthMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_LengthMeasureWithUnit::StepBasic_LengthMeasureWithUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx b/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
index e5a763e8b2..43df031300 100644
--- a/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_LengthMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_LengthMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_LengthMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_LengthUnit.cxx b/src/StepBasic/StepBasic_LengthUnit.cxx
index 085a5d2560..9c05024113 100644
--- a/src/StepBasic/StepBasic_LengthUnit.cxx
+++ b/src/StepBasic/StepBasic_LengthUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_LengthUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_LengthUnit,StepBasic_NamedUnit)
+
 StepBasic_LengthUnit::StepBasic_LengthUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_LengthUnit.hxx b/src/StepBasic/StepBasic_LengthUnit.hxx
index 0a7b18dd17..b0354332e7 100644
--- a/src/StepBasic/StepBasic_LengthUnit.hxx
+++ b/src/StepBasic/StepBasic_LengthUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_LengthUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_LengthUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_LocalTime.cxx b/src/StepBasic/StepBasic_LocalTime.cxx
index 65892c5157..62b13a4b9e 100644
--- a/src/StepBasic/StepBasic_LocalTime.cxx
+++ b/src/StepBasic/StepBasic_LocalTime.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_CoordinatedUniversalTimeOffset.hxx>
 #include <StepBasic_LocalTime.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_LocalTime,MMgt_TShared)
+
 StepBasic_LocalTime::StepBasic_LocalTime ()  {}
 
 void StepBasic_LocalTime::Init(
diff --git a/src/StepBasic/StepBasic_LocalTime.hxx b/src/StepBasic/StepBasic_LocalTime.hxx
index fb16ab0c23..4eee9a3c75 100644
--- a/src/StepBasic/StepBasic_LocalTime.hxx
+++ b/src/StepBasic/StepBasic_LocalTime.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_LocalTime,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_LocalTime,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx b/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
index 761e5ef54a..7a0732cf89 100644
--- a/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_MassMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_MassMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MassMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_MassMeasureWithUnit::StepBasic_MassMeasureWithUnit()  {}
 
diff --git a/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx b/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
index ff9e60ca6a..b9b61ae4cb 100644
--- a/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_MassMeasureWithUnit.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_MassMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_MassMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_MassUnit.cxx b/src/StepBasic/StepBasic_MassUnit.cxx
index 427a302680..074e3aa0e5 100644
--- a/src/StepBasic/StepBasic_MassUnit.cxx
+++ b/src/StepBasic/StepBasic_MassUnit.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_MassUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MassUnit,StepBasic_NamedUnit)
+
 //=======================================================================
 //function : StepBasic_MassUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_MassUnit.hxx b/src/StepBasic/StepBasic_MassUnit.hxx
index 3b1e3d64e8..1aec494c19 100644
--- a/src/StepBasic/StepBasic_MassUnit.hxx
+++ b/src/StepBasic/StepBasic_MassUnit.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_MassUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_MassUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_MeasureValueMember.cxx b/src/StepBasic/StepBasic_MeasureValueMember.cxx
index 43f0890748..b4814dd362 100644
--- a/src/StepBasic/StepBasic_MeasureValueMember.cxx
+++ b/src/StepBasic/StepBasic_MeasureValueMember.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_MeasureValueMember.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MeasureValueMember,StepData_SelectReal)
+
 //=======================================================================
 //function : StepBasic_MeasureValueMember
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_MeasureValueMember.hxx b/src/StepBasic/StepBasic_MeasureValueMember.hxx
index 05912a9a68..3722d4fa1d 100644
--- a/src/StepBasic/StepBasic_MeasureValueMember.hxx
+++ b/src/StepBasic/StepBasic_MeasureValueMember.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_MeasureValueMember,StepData_SelectReal)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_MeasureValueMember,StepData_SelectReal)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_MeasureWithUnit.cxx b/src/StepBasic/StepBasic_MeasureWithUnit.cxx
index a990b87450..73872334af 100644
--- a/src/StepBasic/StepBasic_MeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_MeasureWithUnit.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepBasic_Unit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MeasureWithUnit,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_MeasureWithUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_MeasureWithUnit.hxx b/src/StepBasic/StepBasic_MeasureWithUnit.hxx
index 44e5016c87..dd11d88103 100644
--- a/src/StepBasic/StepBasic_MeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_MeasureWithUnit.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_MeasureWithUnit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_MeasureWithUnit,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_MechanicalContext.cxx b/src/StepBasic/StepBasic_MechanicalContext.cxx
index df94b704f9..56b5b7d2d4 100644
--- a/src/StepBasic/StepBasic_MechanicalContext.cxx
+++ b/src/StepBasic/StepBasic_MechanicalContext.cxx
@@ -18,5 +18,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_MechanicalContext.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_MechanicalContext,StepBasic_ProductContext)
+
 StepBasic_MechanicalContext::StepBasic_MechanicalContext ()  
 {}
diff --git a/src/StepBasic/StepBasic_MechanicalContext.hxx b/src/StepBasic/StepBasic_MechanicalContext.hxx
index 18779350bb..4d7fdc59e0 100644
--- a/src/StepBasic/StepBasic_MechanicalContext.hxx
+++ b/src/StepBasic/StepBasic_MechanicalContext.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_MechanicalContext,StepBasic_ProductContext)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_MechanicalContext,StepBasic_ProductContext)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_NameAssignment.cxx b/src/StepBasic/StepBasic_NameAssignment.cxx
index 3963450e5f..fd0821440b 100644
--- a/src/StepBasic/StepBasic_NameAssignment.cxx
+++ b/src/StepBasic/StepBasic_NameAssignment.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_NameAssignment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_NameAssignment,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_NameAssignment
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_NameAssignment.hxx b/src/StepBasic/StepBasic_NameAssignment.hxx
index 9777f2e2f7..5db5ef1814 100644
--- a/src/StepBasic/StepBasic_NameAssignment.hxx
+++ b/src/StepBasic/StepBasic_NameAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_NameAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_NameAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_NamedUnit.cxx b/src/StepBasic/StepBasic_NamedUnit.cxx
index a35c36404d..525402694d 100644
--- a/src/StepBasic/StepBasic_NamedUnit.cxx
+++ b/src/StepBasic/StepBasic_NamedUnit.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_NamedUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_NamedUnit,MMgt_TShared)
+
 StepBasic_NamedUnit::StepBasic_NamedUnit ()  {}
 
 void StepBasic_NamedUnit::Init(
diff --git a/src/StepBasic/StepBasic_NamedUnit.hxx b/src/StepBasic/StepBasic_NamedUnit.hxx
index 5dcec1c903..f0992ab891 100644
--- a/src/StepBasic/StepBasic_NamedUnit.hxx
+++ b/src/StepBasic/StepBasic_NamedUnit.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_NamedUnit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_NamedUnit,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ObjectRole.cxx b/src/StepBasic/StepBasic_ObjectRole.cxx
index 81786d7e86..9a4d444058 100644
--- a/src/StepBasic/StepBasic_ObjectRole.cxx
+++ b/src/StepBasic/StepBasic_ObjectRole.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_ObjectRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ObjectRole,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ObjectRole
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ObjectRole.hxx b/src/StepBasic/StepBasic_ObjectRole.hxx
index 3cd6f1106a..ffd62edbf9 100644
--- a/src/StepBasic/StepBasic_ObjectRole.hxx
+++ b/src/StepBasic/StepBasic_ObjectRole.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ObjectRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ObjectRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_OrdinalDate.cxx b/src/StepBasic/StepBasic_OrdinalDate.cxx
index 14caee8609..92c0657f21 100644
--- a/src/StepBasic/StepBasic_OrdinalDate.cxx
+++ b/src/StepBasic/StepBasic_OrdinalDate.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_OrdinalDate.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_OrdinalDate,StepBasic_Date)
+
 StepBasic_OrdinalDate::StepBasic_OrdinalDate ()  {}
 
 void StepBasic_OrdinalDate::Init(
diff --git a/src/StepBasic/StepBasic_OrdinalDate.hxx b/src/StepBasic/StepBasic_OrdinalDate.hxx
index 5a3a37f136..956432451a 100644
--- a/src/StepBasic/StepBasic_OrdinalDate.hxx
+++ b/src/StepBasic/StepBasic_OrdinalDate.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_OrdinalDate,StepBasic_Date)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_OrdinalDate,StepBasic_Date)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Organization.cxx b/src/StepBasic/StepBasic_Organization.cxx
index 6854c6e8ce..a0abad43ea 100644
--- a/src/StepBasic/StepBasic_Organization.cxx
+++ b/src/StepBasic/StepBasic_Organization.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_Organization.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Organization,MMgt_TShared)
+
 StepBasic_Organization::StepBasic_Organization ()  {}
 
 void StepBasic_Organization::Init(
diff --git a/src/StepBasic/StepBasic_Organization.hxx b/src/StepBasic/StepBasic_Organization.hxx
index 549884067f..6918a85ee2 100644
--- a/src/StepBasic/StepBasic_Organization.hxx
+++ b/src/StepBasic/StepBasic_Organization.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Organization,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Organization,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_OrganizationAssignment.cxx b/src/StepBasic/StepBasic_OrganizationAssignment.cxx
index 8b5eda282d..20e5644ffb 100644
--- a/src/StepBasic/StepBasic_OrganizationAssignment.cxx
+++ b/src/StepBasic/StepBasic_OrganizationAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_OrganizationAssignment.hxx>
 #include <StepBasic_OrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_OrganizationAssignment,MMgt_TShared)
+
 void StepBasic_OrganizationAssignment::Init(
 	const Handle(StepBasic_Organization)& aAssignedOrganization,
 	const Handle(StepBasic_OrganizationRole)& aRole)
diff --git a/src/StepBasic/StepBasic_OrganizationAssignment.hxx b/src/StepBasic/StepBasic_OrganizationAssignment.hxx
index bd75ca17b1..e237d8d8e6 100644
--- a/src/StepBasic/StepBasic_OrganizationAssignment.hxx
+++ b/src/StepBasic/StepBasic_OrganizationAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_OrganizationAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_OrganizationAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_OrganizationRole.cxx b/src/StepBasic/StepBasic_OrganizationRole.cxx
index 2bbc164cc2..b55690a123 100644
--- a/src/StepBasic/StepBasic_OrganizationRole.cxx
+++ b/src/StepBasic/StepBasic_OrganizationRole.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_OrganizationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_OrganizationRole,MMgt_TShared)
+
 StepBasic_OrganizationRole::StepBasic_OrganizationRole ()  {}
 
 void StepBasic_OrganizationRole::Init(
diff --git a/src/StepBasic/StepBasic_OrganizationRole.hxx b/src/StepBasic/StepBasic_OrganizationRole.hxx
index 95a41e2fc0..01a98b55b2 100644
--- a/src/StepBasic/StepBasic_OrganizationRole.hxx
+++ b/src/StepBasic/StepBasic_OrganizationRole.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_OrganizationRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_OrganizationRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_OrganizationalAddress.cxx b/src/StepBasic/StepBasic_OrganizationalAddress.cxx
index 168b6aac3c..b801efe734 100644
--- a/src/StepBasic/StepBasic_OrganizationalAddress.cxx
+++ b/src/StepBasic/StepBasic_OrganizationalAddress.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_OrganizationalAddress.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_OrganizationalAddress,StepBasic_Address)
+
 StepBasic_OrganizationalAddress::StepBasic_OrganizationalAddress ()  {}
 
 void StepBasic_OrganizationalAddress::Init(
diff --git a/src/StepBasic/StepBasic_OrganizationalAddress.hxx b/src/StepBasic/StepBasic_OrganizationalAddress.hxx
index f7fc3c8cec..56a6602b23 100644
--- a/src/StepBasic/StepBasic_OrganizationalAddress.hxx
+++ b/src/StepBasic/StepBasic_OrganizationalAddress.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_OrganizationalAddress,StepBasic_Address)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_OrganizationalAddress,StepBasic_Address)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Person.cxx b/src/StepBasic/StepBasic_Person.cxx
index b6dd30b369..b7e273e96b 100644
--- a/src/StepBasic/StepBasic_Person.cxx
+++ b/src/StepBasic/StepBasic_Person.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_Person.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Person,MMgt_TShared)
+
 StepBasic_Person::StepBasic_Person ()  {}
 
 void StepBasic_Person::Init(
diff --git a/src/StepBasic/StepBasic_Person.hxx b/src/StepBasic/StepBasic_Person.hxx
index f00c1f369d..c7bc137c74 100644
--- a/src/StepBasic/StepBasic_Person.hxx
+++ b/src/StepBasic/StepBasic_Person.hxx
@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Person,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Person,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PersonAndOrganization.cxx b/src/StepBasic/StepBasic_PersonAndOrganization.cxx
index faff1c4cf3..5cc5e15a45 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganization.cxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganization.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_Person.hxx>
 #include <StepBasic_PersonAndOrganization.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PersonAndOrganization,MMgt_TShared)
+
 StepBasic_PersonAndOrganization::StepBasic_PersonAndOrganization ()  {}
 
 void StepBasic_PersonAndOrganization::Init(
diff --git a/src/StepBasic/StepBasic_PersonAndOrganization.hxx b/src/StepBasic/StepBasic_PersonAndOrganization.hxx
index de0e94ad03..6ddc74219b 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganization.hxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganization.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PersonAndOrganization,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PersonAndOrganization,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cxx b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cxx
index 57080be004..5c15f68d83 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_PersonAndOrganizationAssignment.hxx>
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PersonAndOrganizationAssignment,MMgt_TShared)
+
 void StepBasic_PersonAndOrganizationAssignment::Init(
 	const Handle(StepBasic_PersonAndOrganization)& aAssignedPersonAndOrganization,
 	const Handle(StepBasic_PersonAndOrganizationRole)& aRole)
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.hxx b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.hxx
index 5dd8b3ea01..f774f9ed9a 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.hxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PersonAndOrganizationAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PersonAndOrganizationAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
index 54b0ea7694..eeab174706 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_PersonAndOrganizationRole.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PersonAndOrganizationRole,MMgt_TShared)
+
 StepBasic_PersonAndOrganizationRole::StepBasic_PersonAndOrganizationRole ()  {}
 
 void StepBasic_PersonAndOrganizationRole::Init(
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationRole.hxx b/src/StepBasic/StepBasic_PersonAndOrganizationRole.hxx
index 9f261f1bae..2fbd1dadeb 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationRole.hxx
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationRole.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PersonAndOrganizationRole,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PersonAndOrganizationRole,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PersonalAddress.cxx b/src/StepBasic/StepBasic_PersonalAddress.cxx
index 4c7920627c..2022a2decd 100644
--- a/src/StepBasic/StepBasic_PersonalAddress.cxx
+++ b/src/StepBasic/StepBasic_PersonalAddress.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_PersonalAddress.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PersonalAddress,StepBasic_Address)
+
 StepBasic_PersonalAddress::StepBasic_PersonalAddress ()  {}
 
 void StepBasic_PersonalAddress::Init(
diff --git a/src/StepBasic/StepBasic_PersonalAddress.hxx b/src/StepBasic/StepBasic_PersonalAddress.hxx
index fa57e803d2..ae3276be76 100644
--- a/src/StepBasic/StepBasic_PersonalAddress.hxx
+++ b/src/StepBasic/StepBasic_PersonalAddress.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PersonalAddress,StepBasic_Address)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PersonalAddress,StepBasic_Address)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.cxx b/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.cxx
index 58aa1278d6..10769c35be 100644
--- a/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.cxx
+++ b/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_PhysicallyModeledProductDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PhysicallyModeledProductDefinition,StepBasic_ProductDefinition)
+
 StepBasic_PhysicallyModeledProductDefinition::StepBasic_PhysicallyModeledProductDefinition  ()    {  }
diff --git a/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.hxx b/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.hxx
index 6f4d3c636a..7a6344bce2 100644
--- a/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.hxx
+++ b/src/StepBasic/StepBasic_PhysicallyModeledProductDefinition.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PhysicallyModeledProductDefinition,StepBasic_ProductDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PhysicallyModeledProductDefinition,StepBasic_ProductDefinition)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
index 43c895c221..4a9f99af3a 100644
--- a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PlaneAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_PlaneAngleMeasureWithUnit::StepBasic_PlaneAngleMeasureWithUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
index 0d4e3eed8b..4971ca5f65 100644
--- a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PlaneAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PlaneAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleUnit.cxx b/src/StepBasic/StepBasic_PlaneAngleUnit.cxx
index f128401673..967f081cfb 100644
--- a/src/StepBasic/StepBasic_PlaneAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_PlaneAngleUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_PlaneAngleUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_PlaneAngleUnit,StepBasic_NamedUnit)
+
 StepBasic_PlaneAngleUnit::StepBasic_PlaneAngleUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleUnit.hxx b/src/StepBasic/StepBasic_PlaneAngleUnit.hxx
index bfef606e1c..14a5b448d7 100644
--- a/src/StepBasic/StepBasic_PlaneAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_PlaneAngleUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_PlaneAngleUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_PlaneAngleUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_Product.cxx b/src/StepBasic/StepBasic_Product.cxx
index cd90006856..56ac17a6a6 100644
--- a/src/StepBasic/StepBasic_Product.cxx
+++ b/src/StepBasic/StepBasic_Product.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_Product,MMgt_TShared)
+
 StepBasic_Product::StepBasic_Product ()  {}
 
 void StepBasic_Product::Init(
diff --git a/src/StepBasic/StepBasic_Product.hxx b/src/StepBasic/StepBasic_Product.hxx
index 31acea984e..7fbcfca8f1 100644
--- a/src/StepBasic/StepBasic_Product.hxx
+++ b/src/StepBasic/StepBasic_Product.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_Product,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_Product,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductCategory.cxx b/src/StepBasic/StepBasic_ProductCategory.cxx
index 1125e2f4c6..7ad12a5b06 100644
--- a/src/StepBasic/StepBasic_ProductCategory.cxx
+++ b/src/StepBasic/StepBasic_ProductCategory.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_ProductCategory.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductCategory,MMgt_TShared)
+
 StepBasic_ProductCategory::StepBasic_ProductCategory ()  {}
 
 void StepBasic_ProductCategory::Init(
diff --git a/src/StepBasic/StepBasic_ProductCategory.hxx b/src/StepBasic/StepBasic_ProductCategory.hxx
index e631c535d8..d3d5351943 100644
--- a/src/StepBasic/StepBasic_ProductCategory.hxx
+++ b/src/StepBasic/StepBasic_ProductCategory.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductCategory,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductCategory,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx b/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
index 441f526533..6beb50d740 100644
--- a/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductCategoryRelationship.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ProductCategoryRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductCategoryRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ProductCategoryRelationship
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx b/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
index 8484e2e176..5edfcbecae 100644
--- a/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
+++ b/src/StepBasic/StepBasic_ProductCategoryRelationship.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductCategoryRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductCategoryRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductConceptContext.cxx b/src/StepBasic/StepBasic_ProductConceptContext.cxx
index 97b1b948c6..57db27ca25 100644
--- a/src/StepBasic/StepBasic_ProductConceptContext.cxx
+++ b/src/StepBasic/StepBasic_ProductConceptContext.cxx
@@ -21,6 +21,8 @@
 #include <StepBasic_ProductConceptContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductConceptContext,StepBasic_ApplicationContextElement)
+
 //=======================================================================
 //function : StepBasic_ProductConceptContext
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ProductConceptContext.hxx b/src/StepBasic/StepBasic_ProductConceptContext.hxx
index 20d0dabd69..ac4663fc71 100644
--- a/src/StepBasic/StepBasic_ProductConceptContext.hxx
+++ b/src/StepBasic/StepBasic_ProductConceptContext.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductConceptContext,StepBasic_ApplicationContextElement)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductConceptContext,StepBasic_ApplicationContextElement)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductContext.cxx b/src/StepBasic/StepBasic_ProductContext.cxx
index 64113886a1..08fba85fcd 100644
--- a/src/StepBasic/StepBasic_ProductContext.cxx
+++ b/src/StepBasic/StepBasic_ProductContext.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductContext,StepBasic_ApplicationContextElement)
+
 StepBasic_ProductContext::StepBasic_ProductContext ()  {}
 
 void StepBasic_ProductContext::Init(
diff --git a/src/StepBasic/StepBasic_ProductContext.hxx b/src/StepBasic/StepBasic_ProductContext.hxx
index 0579e2ce60..0b019bac0c 100644
--- a/src/StepBasic/StepBasic_ProductContext.hxx
+++ b/src/StepBasic/StepBasic_ProductContext.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductContext,StepBasic_ApplicationContextElement)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductContext,StepBasic_ApplicationContextElement)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinition.cxx b/src/StepBasic/StepBasic_ProductDefinition.cxx
index b7b7b55188..aefb1270d4 100644
--- a/src/StepBasic/StepBasic_ProductDefinition.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinition.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinition,MMgt_TShared)
+
 StepBasic_ProductDefinition::StepBasic_ProductDefinition ()  {}
 
 void StepBasic_ProductDefinition::Init(
diff --git a/src/StepBasic/StepBasic_ProductDefinition.hxx b/src/StepBasic/StepBasic_ProductDefinition.hxx
index 86c39afe65..ffb16d6b37 100644
--- a/src/StepBasic/StepBasic_ProductDefinition.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinition.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinition,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinition,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionContext.cxx b/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
index 04a87a708d..6eaa3f0de2 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionContext.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductDefinitionContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionContext,StepBasic_ApplicationContextElement)
+
 StepBasic_ProductDefinitionContext::StepBasic_ProductDefinitionContext ()  {}
 
 void StepBasic_ProductDefinitionContext::Init(
diff --git a/src/StepBasic/StepBasic_ProductDefinitionContext.hxx b/src/StepBasic/StepBasic_ProductDefinitionContext.hxx
index b762fe4d5d..272abd8b8b 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionContext.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionContext.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionContext,StepBasic_ApplicationContextElement)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionContext,StepBasic_ApplicationContextElement)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
index bf952f38dd..15ea1b9539 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionEffectivity,StepBasic_Effectivity)
+
 StepBasic_ProductDefinitionEffectivity::StepBasic_ProductDefinitionEffectivity  ()    {  }
 
 void  StepBasic_ProductDefinitionEffectivity::Init
diff --git a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.hxx b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.hxx
index 4197ec3b23..f0b1dc8055 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionEffectivity,StepBasic_Effectivity)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionEffectivity,StepBasic_Effectivity)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
index ab8e9e40d2..f8aa6153ac 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormation.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductDefinitionFormation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormation,MMgt_TShared)
+
 StepBasic_ProductDefinitionFormation::StepBasic_ProductDefinitionFormation ()  {}
 
 void StepBasic_ProductDefinitionFormation::Init(
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormation.hxx b/src/StepBasic/StepBasic_ProductDefinitionFormation.hxx
index b7a2d31bf3..1d74660ecf 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormation.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormation.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionFormation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
index 92bb7fc52b..582f4ea8ad 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ProductDefinitionFormationRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormationRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ProductDefinitionFormationRelationship
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.hxx b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.hxx
index 1b7fae2a97..b15d1a646d 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationRelationship.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionFormationRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormationRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
index c565c14af3..b82fca3817 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormationWithSpecifiedSource,StepBasic_ProductDefinitionFormation)
+
 StepBasic_ProductDefinitionFormationWithSpecifiedSource::StepBasic_ProductDefinitionFormationWithSpecifiedSource ()  {}
 
 void StepBasic_ProductDefinitionFormationWithSpecifiedSource::Init(
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx
index e52528fbc5..841165c8ce 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionFormationWithSpecifiedSource,StepBasic_ProductDefinitionFormation)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionFormationWithSpecifiedSource,StepBasic_ProductDefinitionFormation)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx b/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
index 58a324738a..be3b80423f 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_ProductDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_ProductDefinitionRelationship
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx b/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
index 421b44e2f6..6e81ee4b7c 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionRelationship.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
index e3bfcb34fc..9a3f2221dd 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.cxx
@@ -19,6 +19,8 @@
 #include <StepBasic_ProductDefinitionWithAssociatedDocuments.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductDefinitionWithAssociatedDocuments,StepBasic_ProductDefinition)
+
 StepBasic_ProductDefinitionWithAssociatedDocuments::StepBasic_ProductDefinitionWithAssociatedDocuments  ()    {  }
 
 void  StepBasic_ProductDefinitionWithAssociatedDocuments::Init
diff --git a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.hxx b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.hxx
index c0e9c51eb7..32a3cd33bf 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.hxx
+++ b/src/StepBasic/StepBasic_ProductDefinitionWithAssociatedDocuments.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductDefinitionWithAssociatedDocuments,StepBasic_ProductDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductDefinitionWithAssociatedDocuments,StepBasic_ProductDefinition)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
index e3e58544fb..4e0782d613 100644
--- a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
+++ b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_ProductRelatedProductCategory.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductRelatedProductCategory,StepBasic_ProductCategory)
+
 StepBasic_ProductRelatedProductCategory::StepBasic_ProductRelatedProductCategory ()  {}
 
 void StepBasic_ProductRelatedProductCategory::Init(
diff --git a/src/StepBasic/StepBasic_ProductRelatedProductCategory.hxx b/src/StepBasic/StepBasic_ProductRelatedProductCategory.hxx
index 5d0300081e..23f252bb92 100644
--- a/src/StepBasic/StepBasic_ProductRelatedProductCategory.hxx
+++ b/src/StepBasic/StepBasic_ProductRelatedProductCategory.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductRelatedProductCategory,StepBasic_ProductCategory)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductRelatedProductCategory,StepBasic_ProductCategory)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ProductType.cxx b/src/StepBasic/StepBasic_ProductType.cxx
index f8b2ee81af..d12978af38 100644
--- a/src/StepBasic/StepBasic_ProductType.cxx
+++ b/src/StepBasic/StepBasic_ProductType.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ProductType.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ProductType,StepBasic_ProductRelatedProductCategory)
+
 StepBasic_ProductType::StepBasic_ProductType ()  {}
 
diff --git a/src/StepBasic/StepBasic_ProductType.hxx b/src/StepBasic/StepBasic_ProductType.hxx
index 8c916b7394..78920f11dd 100644
--- a/src/StepBasic/StepBasic_ProductType.hxx
+++ b/src/StepBasic/StepBasic_ProductType.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ProductType,StepBasic_ProductRelatedProductCategory)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ProductType,StepBasic_ProductRelatedProductCategory)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
index d34f05ac8e..f44de4af19 100644
--- a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_RatioMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_RatioMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_RatioMeasureWithUnit::StepBasic_RatioMeasureWithUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx b/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
index a4b00b7d23..512164ecc2 100644
--- a/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_RatioMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_RatioMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_RatioMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_RatioUnit.cxx b/src/StepBasic/StepBasic_RatioUnit.cxx
index 1b28d00334..122f149501 100644
--- a/src/StepBasic/StepBasic_RatioUnit.cxx
+++ b/src/StepBasic/StepBasic_RatioUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_RatioUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_RatioUnit,StepBasic_NamedUnit)
+
 StepBasic_RatioUnit::StepBasic_RatioUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_RatioUnit.hxx b/src/StepBasic/StepBasic_RatioUnit.hxx
index 390679f859..7694167876 100644
--- a/src/StepBasic/StepBasic_RatioUnit.hxx
+++ b/src/StepBasic/StepBasic_RatioUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_RatioUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_RatioUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_RoleAssociation.cxx b/src/StepBasic/StepBasic_RoleAssociation.cxx
index c745c4ca66..3ff20cb8ee 100644
--- a/src/StepBasic/StepBasic_RoleAssociation.cxx
+++ b/src/StepBasic/StepBasic_RoleAssociation.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_RoleAssociation.hxx>
 #include <StepBasic_RoleSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_RoleAssociation,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_RoleAssociation
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_RoleAssociation.hxx b/src/StepBasic/StepBasic_RoleAssociation.hxx
index 9d6e1fe759..2656ea6054 100644
--- a/src/StepBasic/StepBasic_RoleAssociation.hxx
+++ b/src/StepBasic/StepBasic_RoleAssociation.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_RoleAssociation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_RoleAssociation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SecurityClassification.cxx b/src/StepBasic/StepBasic_SecurityClassification.cxx
index ba017d9bae..4960184b30 100644
--- a/src/StepBasic/StepBasic_SecurityClassification.cxx
+++ b/src/StepBasic/StepBasic_SecurityClassification.cxx
@@ -17,6 +17,8 @@
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SecurityClassification,MMgt_TShared)
+
 StepBasic_SecurityClassification::StepBasic_SecurityClassification ()  {}
 
 void StepBasic_SecurityClassification::Init(
diff --git a/src/StepBasic/StepBasic_SecurityClassification.hxx b/src/StepBasic/StepBasic_SecurityClassification.hxx
index d3a5a3ba96..06ea1ce12c 100644
--- a/src/StepBasic/StepBasic_SecurityClassification.hxx
+++ b/src/StepBasic/StepBasic_SecurityClassification.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SecurityClassification,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SecurityClassification,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SecurityClassificationAssignment.cxx b/src/StepBasic/StepBasic_SecurityClassificationAssignment.cxx
index c8b5c07445..ed956b49cf 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationAssignment.cxx
+++ b/src/StepBasic/StepBasic_SecurityClassificationAssignment.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_SecurityClassification.hxx>
 #include <StepBasic_SecurityClassificationAssignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SecurityClassificationAssignment,MMgt_TShared)
+
 void StepBasic_SecurityClassificationAssignment::Init(
 	const Handle(StepBasic_SecurityClassification)& aAssignedSecurityClassification)
 {
diff --git a/src/StepBasic/StepBasic_SecurityClassificationAssignment.hxx b/src/StepBasic/StepBasic_SecurityClassificationAssignment.hxx
index 5933c7f039..94ee6605b2 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationAssignment.hxx
+++ b/src/StepBasic/StepBasic_SecurityClassificationAssignment.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SecurityClassificationAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SecurityClassificationAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx b/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
index 8bf9427b51..65135705d1 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
+++ b/src/StepBasic/StepBasic_SecurityClassificationLevel.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_SecurityClassificationLevel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SecurityClassificationLevel,MMgt_TShared)
+
 StepBasic_SecurityClassificationLevel::StepBasic_SecurityClassificationLevel ()  {}
 
 void StepBasic_SecurityClassificationLevel::Init(
diff --git a/src/StepBasic/StepBasic_SecurityClassificationLevel.hxx b/src/StepBasic/StepBasic_SecurityClassificationLevel.hxx
index 9e91086b43..ac330fceaa 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationLevel.hxx
+++ b/src/StepBasic/StepBasic_SecurityClassificationLevel.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SecurityClassificationLevel,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SecurityClassificationLevel,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnit.cxx b/src/StepBasic/StepBasic_SiUnit.cxx
index 5bdca05e61..cdd32bd84a 100644
--- a/src/StepBasic/StepBasic_SiUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnit.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnit,StepBasic_NamedUnit)
+
 StepBasic_SiUnit::StepBasic_SiUnit ()  {}
 
 void StepBasic_SiUnit::Init(
diff --git a/src/StepBasic/StepBasic_SiUnit.hxx b/src/StepBasic/StepBasic_SiUnit.hxx
index f69dbffc2c..12253b9e98 100644
--- a/src/StepBasic/StepBasic_SiUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnit.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cxx
index 087b8fab15..f8a0be049d 100644
--- a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_DimensionalExponents.hxx>
 #include <StepBasic_SiUnitAndAreaUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndAreaUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndAreaUnit::StepBasic_SiUnitAndAreaUnit () 
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.hxx
index c63db045f6..5c54de55b1 100644
--- a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndAreaUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndAreaUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
index dfcc039a76..eb740252b5 100644
--- a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndLengthUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndLengthUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndLengthUnit::StepBasic_SiUnitAndLengthUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
index c0de0d8125..47782e496e 100644
--- a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndLengthUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndLengthUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
index 79c3bce10c..65b0c00b50 100644
--- a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndMassUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndMassUnit,StepBasic_SiUnit)
+
 //=======================================================================
 //function : StepBasic_SiUnitAndLengthUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
index 5e702a5fdc..9a1932a569 100644
--- a/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndMassUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndMassUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndMassUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
index 378e20489b..9e81ac426f 100644
--- a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndPlaneAngleUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndPlaneAngleUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndPlaneAngleUnit::StepBasic_SiUnitAndPlaneAngleUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
index fa762c5d39..78ae586ae4 100644
--- a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndPlaneAngleUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndPlaneAngleUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
index 03cb89b7ce..9b37ee5597 100644
--- a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnit.hxx>
 #include <StepBasic_SiUnitAndRatioUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndRatioUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndRatioUnit::StepBasic_SiUnitAndRatioUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
index 00163845e2..ae23470f34 100644
--- a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndRatioUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndRatioUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
index d9c28ef46e..3a1b4e8b09 100644
--- a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnitAndSolidAngleUnit.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndSolidAngleUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndSolidAngleUnit::StepBasic_SiUnitAndSolidAngleUnit ()
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
index 92e88c84c3..f9b45eab98 100644
--- a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndSolidAngleUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndSolidAngleUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
index 40326d1f38..8ad6ac0e4d 100644
--- a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx>
 #include <StepBasic_ThermodynamicTemperatureUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndThermodynamicTemperatureUnit,StepBasic_SiUnit)
+
 //=======================================================================
 //function : StepBasic_SiUnitAndThermodynamicTemperatureUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
index 888655e632..3f1ad553d3 100644
--- a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndThermodynamicTemperatureUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndThermodynamicTemperatureUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
index 671502554e..a8cb9157fc 100644
--- a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_SiUnitAndTimeUnit.hxx>
 #include <StepBasic_TimeUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndTimeUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndTimeUnit::StepBasic_SiUnitAndTimeUnit ()  
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
index c68f1f452b..abe3226072 100644
--- a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndTimeUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndTimeUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cxx b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cxx
index 1ff5e42b95..fd801e2fc4 100644
--- a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cxx
+++ b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_SiUnitAndVolumeUnit.hxx>
 #include <StepBasic_VolumeUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SiUnitAndVolumeUnit,StepBasic_SiUnit)
+
 StepBasic_SiUnitAndVolumeUnit::StepBasic_SiUnitAndVolumeUnit()
 {
 }
diff --git a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.hxx b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.hxx
index 8ba2d2c2ae..f36fb22941 100644
--- a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.hxx
+++ b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SiUnitAndVolumeUnit,StepBasic_SiUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SiUnitAndVolumeUnit,StepBasic_SiUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SizeMember.cxx b/src/StepBasic/StepBasic_SizeMember.cxx
index c00be03706..bbb11c6b0e 100644
--- a/src/StepBasic/StepBasic_SizeMember.cxx
+++ b/src/StepBasic/StepBasic_SizeMember.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_SizeMember.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SizeMember,StepData_SelectReal)
+
 StepBasic_SizeMember::StepBasic_SizeMember  ()    {  }
 
     Standard_Boolean  StepBasic_SizeMember::HasName () const
diff --git a/src/StepBasic/StepBasic_SizeMember.hxx b/src/StepBasic/StepBasic_SizeMember.hxx
index 133fe7534f..6c444db3a4 100644
--- a/src/StepBasic/StepBasic_SizeMember.hxx
+++ b/src/StepBasic/StepBasic_SizeMember.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SizeMember,StepData_SelectReal)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SizeMember,StepData_SelectReal)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
index dbf20f182e..7d9926ea3d 100644
--- a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_SolidAngleMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SolidAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_SolidAngleMeasureWithUnit::StepBasic_SolidAngleMeasureWithUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
index f382994209..7063882b71 100644
--- a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SolidAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SolidAngleMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_SolidAngleUnit.cxx b/src/StepBasic/StepBasic_SolidAngleUnit.cxx
index 290f74f84d..0f8e3c43e1 100644
--- a/src/StepBasic/StepBasic_SolidAngleUnit.cxx
+++ b/src/StepBasic/StepBasic_SolidAngleUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_SolidAngleUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_SolidAngleUnit,StepBasic_NamedUnit)
+
 StepBasic_SolidAngleUnit::StepBasic_SolidAngleUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_SolidAngleUnit.hxx b/src/StepBasic/StepBasic_SolidAngleUnit.hxx
index 7ebd0e0591..5d214394ca 100644
--- a/src/StepBasic/StepBasic_SolidAngleUnit.hxx
+++ b/src/StepBasic/StepBasic_SolidAngleUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_SolidAngleUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_SolidAngleUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.cxx b/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.cxx
index 9b48a2a795..917e154a34 100644
--- a/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.cxx
+++ b/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_ThermodynamicTemperatureUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_ThermodynamicTemperatureUnit,StepBasic_NamedUnit)
+
 //=======================================================================
 //function : StepBasic_ThermodynamicTemperatureUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.hxx b/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.hxx
index b6dfeb1702..58d7c57147 100644
--- a/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.hxx
+++ b/src/StepBasic/StepBasic_ThermodynamicTemperatureUnit.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_ThermodynamicTemperatureUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_ThermodynamicTemperatureUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
index e01ecd79a5..b91b1c6121 100644
--- a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_TimeMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_TimeMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 StepBasic_TimeMeasureWithUnit::StepBasic_TimeMeasureWithUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx b/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
index b5ec56871f..90d9077d77 100644
--- a/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_TimeMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_TimeMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_TimeMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_TimeUnit.cxx b/src/StepBasic/StepBasic_TimeUnit.cxx
index 194d614b44..1006a8bc9e 100644
--- a/src/StepBasic/StepBasic_TimeUnit.cxx
+++ b/src/StepBasic/StepBasic_TimeUnit.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_TimeUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_TimeUnit,StepBasic_NamedUnit)
+
 StepBasic_TimeUnit::StepBasic_TimeUnit ()  {}
 
diff --git a/src/StepBasic/StepBasic_TimeUnit.hxx b/src/StepBasic/StepBasic_TimeUnit.hxx
index 88d85659e7..573733a5f6 100644
--- a/src/StepBasic/StepBasic_TimeUnit.hxx
+++ b/src/StepBasic/StepBasic_TimeUnit.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_TimeUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_TimeUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
index 28396c46c4..7f0bf13425 100644
--- a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
+++ b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_Unit.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_UncertaintyMeasureWithUnit,StepBasic_MeasureWithUnit)
+
 //=======================================================================
 //function : StepBasic_UncertaintyMeasureWithUnit
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.hxx b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.hxx
index d19dfdbfac..0dcade022d 100644
--- a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.hxx
+++ b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_UncertaintyMeasureWithUnit,StepBasic_MeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_UncertaintyMeasureWithUnit,StepBasic_MeasureWithUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_VersionedActionRequest.cxx b/src/StepBasic/StepBasic_VersionedActionRequest.cxx
index 102d7595e4..271a543a44 100644
--- a/src/StepBasic/StepBasic_VersionedActionRequest.cxx
+++ b/src/StepBasic/StepBasic_VersionedActionRequest.cxx
@@ -20,6 +20,8 @@
 #include <StepBasic_VersionedActionRequest.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_VersionedActionRequest,MMgt_TShared)
+
 //=======================================================================
 //function : StepBasic_VersionedActionRequest
 //purpose  : 
diff --git a/src/StepBasic/StepBasic_VersionedActionRequest.hxx b/src/StepBasic/StepBasic_VersionedActionRequest.hxx
index a3077894d3..e0eb978c75 100644
--- a/src/StepBasic/StepBasic_VersionedActionRequest.hxx
+++ b/src/StepBasic/StepBasic_VersionedActionRequest.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_VersionedActionRequest,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_VersionedActionRequest,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_VolumeUnit.cxx b/src/StepBasic/StepBasic_VolumeUnit.cxx
index 853d2a8345..c7a8bdc332 100644
--- a/src/StepBasic/StepBasic_VolumeUnit.cxx
+++ b/src/StepBasic/StepBasic_VolumeUnit.cxx
@@ -18,4 +18,6 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_VolumeUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_VolumeUnit,StepBasic_NamedUnit)
+
 StepBasic_VolumeUnit::StepBasic_VolumeUnit () {}
diff --git a/src/StepBasic/StepBasic_VolumeUnit.hxx b/src/StepBasic/StepBasic_VolumeUnit.hxx
index 68b8bed1bf..16eb5928ca 100644
--- a/src/StepBasic/StepBasic_VolumeUnit.hxx
+++ b/src/StepBasic/StepBasic_VolumeUnit.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_VolumeUnit,StepBasic_NamedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_VolumeUnit,StepBasic_NamedUnit)
 
 protected:
 
diff --git a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cxx b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cxx
index 366644d903..4802a3f9d2 100644
--- a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cxx
+++ b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepBasic_WeekOfYearAndDayDate.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepBasic_WeekOfYearAndDayDate,StepBasic_Date)
+
 StepBasic_WeekOfYearAndDayDate::StepBasic_WeekOfYearAndDayDate ()  {}
 
 void StepBasic_WeekOfYearAndDayDate::Init(
diff --git a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
index 3936e03475..2925987e8c 100644
--- a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
+++ b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepBasic_WeekOfYearAndDayDate,StepBasic_Date)
+  DEFINE_STANDARD_RTTIEXT(StepBasic_WeekOfYearAndDayDate,StepBasic_Date)
 
 protected:
 
diff --git a/src/StepData/StepData_DefaultGeneral.cxx b/src/StepData/StepData_DefaultGeneral.cxx
index 2afdacd67b..68c9f23ac5 100644
--- a/src/StepData/StepData_DefaultGeneral.cxx
+++ b/src/StepData/StepData_DefaultGeneral.cxx
@@ -27,6 +27,8 @@
 #include <StepData_Protocol.hxx>
 #include <StepData_UndefinedEntity.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_DefaultGeneral,StepData_GeneralModule)
+
 //  DefaultGeneral de StepData  reconnait  UN SEUL TYPE : UndefinedEntity
 StepData_DefaultGeneral::StepData_DefaultGeneral ()
 {
diff --git a/src/StepData/StepData_DefaultGeneral.hxx b/src/StepData/StepData_DefaultGeneral.hxx
index 5896caf70e..7ebe56b15f 100644
--- a/src/StepData/StepData_DefaultGeneral.hxx
+++ b/src/StepData/StepData_DefaultGeneral.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_DefaultGeneral,StepData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(StepData_DefaultGeneral,StepData_GeneralModule)
 
 protected:
 
diff --git a/src/StepData/StepData_DescrGeneral.cxx b/src/StepData/StepData_DescrGeneral.cxx
index 9d6aa47d92..b7e4956c66 100644
--- a/src/StepData/StepData_DescrGeneral.cxx
+++ b/src/StepData/StepData_DescrGeneral.cxx
@@ -23,6 +23,8 @@
 #include <StepData_EDescr.hxx>
 #include <StepData_Protocol.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_DescrGeneral,StepData_GeneralModule)
+
 StepData_DescrGeneral::StepData_DescrGeneral
   (const Handle(StepData_Protocol)& proto)
     :  theproto (proto)    {  }
diff --git a/src/StepData/StepData_DescrGeneral.hxx b/src/StepData/StepData_DescrGeneral.hxx
index bad8d33b35..b729213a73 100644
--- a/src/StepData/StepData_DescrGeneral.hxx
+++ b/src/StepData/StepData_DescrGeneral.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_DescrGeneral,StepData_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(StepData_DescrGeneral,StepData_GeneralModule)
 
 protected:
 
diff --git a/src/StepData/StepData_DescrProtocol.cxx b/src/StepData/StepData_DescrProtocol.cxx
index d0312664e0..b69a82db12 100644
--- a/src/StepData/StepData_DescrProtocol.cxx
+++ b/src/StepData/StepData_DescrProtocol.cxx
@@ -20,6 +20,8 @@
 #include <StepData_DescrReadWrite.hxx>
 #include <StepData_WriterLib.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_DescrProtocol,StepData_FileProtocol)
+
 StepData_DescrProtocol::StepData_DescrProtocol ()    {  }
 
     void  StepData_DescrProtocol::SetSchemaName (const Standard_CString name)
diff --git a/src/StepData/StepData_DescrProtocol.hxx b/src/StepData/StepData_DescrProtocol.hxx
index 9529b09dc0..6005e09198 100644
--- a/src/StepData/StepData_DescrProtocol.hxx
+++ b/src/StepData/StepData_DescrProtocol.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_DescrProtocol,StepData_FileProtocol)
+  DEFINE_STANDARD_RTTIEXT(StepData_DescrProtocol,StepData_FileProtocol)
 
 protected:
 
diff --git a/src/StepData/StepData_DescrReadWrite.cxx b/src/StepData/StepData_DescrReadWrite.cxx
index e1322f3a80..8104858067 100644
--- a/src/StepData/StepData_DescrReadWrite.cxx
+++ b/src/StepData/StepData_DescrReadWrite.cxx
@@ -29,6 +29,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_DescrReadWrite,StepData_ReadWriteModule)
+
 static TCollection_AsciiString nocp("?");
 
 
diff --git a/src/StepData/StepData_DescrReadWrite.hxx b/src/StepData/StepData_DescrReadWrite.hxx
index c3562e2f2c..5248f70001 100644
--- a/src/StepData/StepData_DescrReadWrite.hxx
+++ b/src/StepData/StepData_DescrReadWrite.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_DescrReadWrite,StepData_ReadWriteModule)
+  DEFINE_STANDARD_RTTIEXT(StepData_DescrReadWrite,StepData_ReadWriteModule)
 
 protected:
 
diff --git a/src/StepData/StepData_Described.cxx b/src/StepData/StepData_Described.cxx
index a719d14b4f..6ca02a2685 100644
--- a/src/StepData/StepData_Described.cxx
+++ b/src/StepData/StepData_Described.cxx
@@ -21,6 +21,8 @@
 #include <StepData_Field.hxx>
 #include <StepData_Simple.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_Described,MMgt_TShared)
+
 StepData_Described::StepData_Described  (const Handle(StepData_EDescr)& descr)
 : thedescr (descr)    {  }
 
diff --git a/src/StepData/StepData_Described.hxx b/src/StepData/StepData_Described.hxx
index e77a11f171..858978e4c9 100644
--- a/src/StepData/StepData_Described.hxx
+++ b/src/StepData/StepData_Described.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_Described,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_Described,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_ECDescr.cxx b/src/StepData/StepData_ECDescr.cxx
index afd9ed2dd8..8139a80877 100644
--- a/src/StepData/StepData_ECDescr.cxx
+++ b/src/StepData/StepData_ECDescr.cxx
@@ -20,6 +20,8 @@
 #include <StepData_Simple.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_ECDescr,StepData_EDescr)
+
 StepData_ECDescr::StepData_ECDescr  ()    {  }
 
     void  StepData_ECDescr::Add (const Handle(StepData_ESDescr)& member)
diff --git a/src/StepData/StepData_ECDescr.hxx b/src/StepData/StepData_ECDescr.hxx
index c46faf2b4d..43e9aae78f 100644
--- a/src/StepData/StepData_ECDescr.hxx
+++ b/src/StepData/StepData_ECDescr.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_ECDescr,StepData_EDescr)
+  DEFINE_STANDARD_RTTIEXT(StepData_ECDescr,StepData_EDescr)
 
 protected:
 
diff --git a/src/StepData/StepData_EDescr.cxx b/src/StepData/StepData_EDescr.cxx
index e5df8f518d..bfa844184a 100644
--- a/src/StepData/StepData_EDescr.cxx
+++ b/src/StepData/StepData_EDescr.cxx
@@ -15,3 +15,5 @@
 #include <Standard_Type.hxx>
 #include <StepData_Described.hxx>
 #include <StepData_EDescr.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepData_EDescr,MMgt_TShared)
\ No newline at end of file
diff --git a/src/StepData/StepData_EDescr.hxx b/src/StepData/StepData_EDescr.hxx
index f5c85dde4c..eb44c9287e 100644
--- a/src/StepData/StepData_EDescr.hxx
+++ b/src/StepData/StepData_EDescr.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_EDescr,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_EDescr,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_ESDescr.cxx b/src/StepData/StepData_ESDescr.cxx
index d9df9c7f62..596b003c8a 100644
--- a/src/StepData/StepData_ESDescr.cxx
+++ b/src/StepData/StepData_ESDescr.cxx
@@ -21,6 +21,8 @@
 #include <StepData_Simple.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_ESDescr,StepData_EDescr)
+
 StepData_ESDescr::StepData_ESDescr  (const Standard_CString name)
 :  thenom (name)    {  thenames = new Dico_DictionaryOfInteger;  }
 
diff --git a/src/StepData/StepData_ESDescr.hxx b/src/StepData/StepData_ESDescr.hxx
index 1ea82ee918..fd265dc671 100644
--- a/src/StepData/StepData_ESDescr.hxx
+++ b/src/StepData/StepData_ESDescr.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_ESDescr,StepData_EDescr)
+  DEFINE_STANDARD_RTTIEXT(StepData_ESDescr,StepData_EDescr)
 
 protected:
 
diff --git a/src/StepData/StepData_FileProtocol.cxx b/src/StepData/StepData_FileProtocol.cxx
index a8e0727e12..212ac03eee 100644
--- a/src/StepData/StepData_FileProtocol.cxx
+++ b/src/StepData/StepData_FileProtocol.cxx
@@ -19,6 +19,8 @@
 #include <StepData_FileProtocol.hxx>
 #include <StepData_Protocol.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_FileProtocol,StepData_Protocol)
+
 //static TCollection_AsciiString  thename("");
 static Standard_CString  thename = "";
 
diff --git a/src/StepData/StepData_FileProtocol.hxx b/src/StepData/StepData_FileProtocol.hxx
index fe4b557999..5f83066d24 100644
--- a/src/StepData/StepData_FileProtocol.hxx
+++ b/src/StepData/StepData_FileProtocol.hxx
@@ -79,7 +79,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_FileProtocol,StepData_Protocol)
+  DEFINE_STANDARD_RTTIEXT(StepData_FileProtocol,StepData_Protocol)
 
 protected:
 
diff --git a/src/StepData/StepData_FileRecognizer.hxx b/src/StepData/StepData_FileRecognizer.hxx
index dfb76af1a1..ca425986a2 100644
--- a/src/StepData/StepData_FileRecognizer.hxx
+++ b/src/StepData/StepData_FileRecognizer.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_FileRecognizer,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(StepData_FileRecognizer,Standard_Transient)
 
 protected:
 
diff --git a/src/StepData/StepData_FreeFormEntity.cxx b/src/StepData/StepData_FreeFormEntity.cxx
index 0a7190c5b9..3fd0ed647e 100644
--- a/src/StepData/StepData_FreeFormEntity.cxx
+++ b/src/StepData/StepData_FreeFormEntity.cxx
@@ -19,6 +19,8 @@
 #include <StepData_Field.hxx>
 #include <StepData_FreeFormEntity.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_FreeFormEntity,MMgt_TShared)
+
 void StepData_FreeFormEntity::SetStepType (const Standard_CString typenam)
       {  thetype.Clear();  thetype.AssignCat (typenam);  }
 
diff --git a/src/StepData/StepData_FreeFormEntity.hxx b/src/StepData/StepData_FreeFormEntity.hxx
index adefc4ba48..223ca0957c 100644
--- a/src/StepData/StepData_FreeFormEntity.hxx
+++ b/src/StepData/StepData_FreeFormEntity.hxx
@@ -98,7 +98,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_FreeFormEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_FreeFormEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_GeneralModule.cxx b/src/StepData/StepData_GeneralModule.cxx
index 24cc88cf01..f6b8d90103 100644
--- a/src/StepData/StepData_GeneralModule.cxx
+++ b/src/StepData/StepData_GeneralModule.cxx
@@ -19,3 +19,5 @@
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 #include <StepData_GeneralModule.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepData_GeneralModule,Interface_GeneralModule)
\ No newline at end of file
diff --git a/src/StepData/StepData_GeneralModule.hxx b/src/StepData/StepData_GeneralModule.hxx
index 44d4812a2e..aca57dbf0d 100644
--- a/src/StepData/StepData_GeneralModule.hxx
+++ b/src/StepData/StepData_GeneralModule.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_GeneralModule,Interface_GeneralModule)
+  DEFINE_STANDARD_RTTIEXT(StepData_GeneralModule,Interface_GeneralModule)
 
 protected:
 
diff --git a/src/StepData/StepData_GlobalNodeOfWriterLib.hxx b/src/StepData/StepData_GlobalNodeOfWriterLib.hxx
index ef1f05f2f0..ee99849f0f 100644
--- a/src/StepData/StepData_GlobalNodeOfWriterLib.hxx
+++ b/src/StepData/StepData_GlobalNodeOfWriterLib.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_GlobalNodeOfWriterLib,Standard_Transient)
+  DEFINE_STANDARD_RTTI_INLINE(StepData_GlobalNodeOfWriterLib,Standard_Transient)
 
 protected:
 
diff --git a/src/StepData/StepData_NodeOfWriterLib.hxx b/src/StepData/StepData_NodeOfWriterLib.hxx
index cef2c02ecf..2410688f65 100644
--- a/src/StepData/StepData_NodeOfWriterLib.hxx
+++ b/src/StepData/StepData_NodeOfWriterLib.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_NodeOfWriterLib,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(StepData_NodeOfWriterLib,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_PDescr.cxx b/src/StepData/StepData_PDescr.cxx
index 2920cc3052..419cfc1907 100644
--- a/src/StepData/StepData_PDescr.cxx
+++ b/src/StepData/StepData_PDescr.cxx
@@ -18,6 +18,8 @@
 #include <StepData_Field.hxx>
 #include <StepData_PDescr.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_PDescr,MMgt_TShared)
+
 #define KindInteger 1
 #define KindBoolean 2
 #define KindLogical 3
diff --git a/src/StepData/StepData_PDescr.hxx b/src/StepData/StepData_PDescr.hxx
index 6d67aa118e..1ad9fbc0dc 100644
--- a/src/StepData/StepData_PDescr.hxx
+++ b/src/StepData/StepData_PDescr.hxx
@@ -213,7 +213,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_PDescr,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_PDescr,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_Plex.cxx b/src/StepData/StepData_Plex.cxx
index c243c3fc44..cf9d85c659 100644
--- a/src/StepData/StepData_Plex.cxx
+++ b/src/StepData/StepData_Plex.cxx
@@ -22,6 +22,8 @@
 #include <StepData_Simple.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_Plex,StepData_Described)
+
 static StepData_Field bid;
 
     StepData_Plex::StepData_Plex  (const Handle(StepData_ECDescr)& descr)
diff --git a/src/StepData/StepData_Plex.hxx b/src/StepData/StepData_Plex.hxx
index fa0da4c68a..921b94d203 100644
--- a/src/StepData/StepData_Plex.hxx
+++ b/src/StepData/StepData_Plex.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_Plex,StepData_Described)
+  DEFINE_STANDARD_RTTIEXT(StepData_Plex,StepData_Described)
 
 protected:
 
diff --git a/src/StepData/StepData_Protocol.cxx b/src/StepData/StepData_Protocol.cxx
index 12429d04c2..a018c8e103 100644
--- a/src/StepData/StepData_Protocol.cxx
+++ b/src/StepData/StepData_Protocol.cxx
@@ -28,6 +28,8 @@
 #include <StepData_UndefinedEntity.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(StepData_Protocol,Interface_Protocol)
+
 //  Le Protocol de base reconnait UnknownEntity
 //static TCollection_AsciiString  thename("(DEFAULT)");
 static Standard_CString thename = "(DEFAULT)";
diff --git a/src/StepData/StepData_Protocol.hxx b/src/StepData/StepData_Protocol.hxx
index 9588d6401e..7e905b1903 100644
--- a/src/StepData/StepData_Protocol.hxx
+++ b/src/StepData/StepData_Protocol.hxx
@@ -138,7 +138,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_Protocol,Interface_Protocol)
+  DEFINE_STANDARD_RTTIEXT(StepData_Protocol,Interface_Protocol)
 
 protected:
 
diff --git a/src/StepData/StepData_ReadWriteModule.cxx b/src/StepData/StepData_ReadWriteModule.cxx
index 08226a0562..3f71c2ab4f 100644
--- a/src/StepData/StepData_ReadWriteModule.cxx
+++ b/src/StepData/StepData_ReadWriteModule.cxx
@@ -23,6 +23,8 @@
 #include <StepData_StepWriter.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_ReadWriteModule,Interface_ReaderModule)
+
 Standard_Integer  StepData_ReadWriteModule::CaseNum
   (const Handle(Interface_FileReaderData)& data,
    const Standard_Integer num) const
diff --git a/src/StepData/StepData_ReadWriteModule.hxx b/src/StepData/StepData_ReadWriteModule.hxx
index 4b69f901d4..2de7f06139 100644
--- a/src/StepData/StepData_ReadWriteModule.hxx
+++ b/src/StepData/StepData_ReadWriteModule.hxx
@@ -110,7 +110,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_ReadWriteModule,Interface_ReaderModule)
+  DEFINE_STANDARD_RTTIEXT(StepData_ReadWriteModule,Interface_ReaderModule)
 
 protected:
 
diff --git a/src/StepData/StepData_SelectArrReal.cxx b/src/StepData/StepData_SelectArrReal.cxx
index 7a69eaa58d..e752ef50be 100644
--- a/src/StepData/StepData_SelectArrReal.cxx
+++ b/src/StepData/StepData_SelectArrReal.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepData_SelectArrReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectArrReal,StepData_SelectNamed)
+
 //  Definitions : cf Field
 #define myKindArrReal 8
 
diff --git a/src/StepData/StepData_SelectArrReal.hxx b/src/StepData/StepData_SelectArrReal.hxx
index ccc978ecbc..1101317c07 100644
--- a/src/StepData/StepData_SelectArrReal.hxx
+++ b/src/StepData/StepData_SelectArrReal.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_SelectArrReal,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepData_SelectArrReal,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepData/StepData_SelectInt.cxx b/src/StepData/StepData_SelectInt.cxx
index f853c13ca2..6517ab9301 100644
--- a/src/StepData/StepData_SelectInt.cxx
+++ b/src/StepData/StepData_SelectInt.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepData_SelectInt.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectInt,StepData_SelectMember)
+
 StepData_SelectInt::StepData_SelectInt  ()    {  thekind = 0;  theval = 0;  }
 
 Standard_Integer  StepData_SelectInt::Kind () const    {  return thekind;  }
diff --git a/src/StepData/StepData_SelectInt.hxx b/src/StepData/StepData_SelectInt.hxx
index afa0c04b95..a04edbfe4a 100644
--- a/src/StepData/StepData_SelectInt.hxx
+++ b/src/StepData/StepData_SelectInt.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_SelectInt,StepData_SelectMember)
+  DEFINE_STANDARD_RTTIEXT(StepData_SelectInt,StepData_SelectMember)
 
 protected:
 
diff --git a/src/StepData/StepData_SelectMember.cxx b/src/StepData/StepData_SelectMember.cxx
index aef41c7afa..8c0df5d6d3 100644
--- a/src/StepData/StepData_SelectMember.cxx
+++ b/src/StepData/StepData_SelectMember.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepData_SelectMember.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectMember,MMgt_TShared)
+
 //  Definitions reprises de Field :
 #define KindInteger 1
 #define KindBoolean 2
diff --git a/src/StepData/StepData_SelectMember.hxx b/src/StepData/StepData_SelectMember.hxx
index 8ef985171c..3ed29ba21c 100644
--- a/src/StepData/StepData_SelectMember.hxx
+++ b/src/StepData/StepData_SelectMember.hxx
@@ -119,7 +119,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_SelectMember,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_SelectMember,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepData/StepData_SelectNamed.cxx b/src/StepData/StepData_SelectNamed.cxx
index f712c7c112..674d15e257 100644
--- a/src/StepData/StepData_SelectNamed.cxx
+++ b/src/StepData/StepData_SelectNamed.cxx
@@ -16,6 +16,8 @@
 #include <StepData_Field.hxx>
 #include <StepData_SelectNamed.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectNamed,StepData_SelectMember)
+
 //  Definitions reprises de Field :
 #define KindInteger 1
 #define KindBoolean 2
diff --git a/src/StepData/StepData_SelectNamed.hxx b/src/StepData/StepData_SelectNamed.hxx
index 8ad96e7c7b..262d4c3d11 100644
--- a/src/StepData/StepData_SelectNamed.hxx
+++ b/src/StepData/StepData_SelectNamed.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_SelectNamed,StepData_SelectMember)
+  DEFINE_STANDARD_RTTIEXT(StepData_SelectNamed,StepData_SelectMember)
 
 protected:
 
diff --git a/src/StepData/StepData_SelectReal.cxx b/src/StepData/StepData_SelectReal.cxx
index 6dddbab09c..65063744a8 100644
--- a/src/StepData/StepData_SelectReal.cxx
+++ b/src/StepData/StepData_SelectReal.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepData_SelectReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_SelectReal,StepData_SelectMember)
+
 //  Definitions : cf Field
 #define KindReal 5
 
diff --git a/src/StepData/StepData_SelectReal.hxx b/src/StepData/StepData_SelectReal.hxx
index 91538a54d7..912bf63813 100644
--- a/src/StepData/StepData_SelectReal.hxx
+++ b/src/StepData/StepData_SelectReal.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_SelectReal,StepData_SelectMember)
+  DEFINE_STANDARD_RTTIEXT(StepData_SelectReal,StepData_SelectMember)
 
 protected:
 
diff --git a/src/StepData/StepData_Simple.cxx b/src/StepData/StepData_Simple.cxx
index 6844e202a6..6f29a06adf 100644
--- a/src/StepData/StepData_Simple.cxx
+++ b/src/StepData/StepData_Simple.cxx
@@ -21,6 +21,8 @@
 #include <StepData_FieldListN.hxx>
 #include <StepData_Simple.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_Simple,StepData_Described)
+
 StepData_Simple::StepData_Simple (const Handle(StepData_ESDescr)& descr)
     : StepData_Described (descr) , thefields (descr->NbFields())    {  }
 
diff --git a/src/StepData/StepData_Simple.hxx b/src/StepData/StepData_Simple.hxx
index f431a3b41e..dbe30d2269 100644
--- a/src/StepData/StepData_Simple.hxx
+++ b/src/StepData/StepData_Simple.hxx
@@ -99,7 +99,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_Simple,StepData_Described)
+  DEFINE_STANDARD_RTTIEXT(StepData_Simple,StepData_Described)
 
 protected:
 
diff --git a/src/StepData/StepData_StepModel.cxx b/src/StepData/StepData_StepModel.cxx
index ecac49bcd2..306609cea8 100644
--- a/src/StepData/StepData_StepModel.cxx
+++ b/src/StepData/StepData_StepModel.cxx
@@ -31,6 +31,8 @@
 #include <TCollection_HAsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(StepData_StepModel,Interface_InterfaceModel)
+
 // Entete de fichier : liste d entites
 StepData_StepModel::StepData_StepModel ()  {  }
 
diff --git a/src/StepData/StepData_StepModel.hxx b/src/StepData/StepData_StepModel.hxx
index dfea65d3cb..3a54fa7b90 100644
--- a/src/StepData/StepData_StepModel.hxx
+++ b/src/StepData/StepData_StepModel.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_StepModel,Interface_InterfaceModel)
+  DEFINE_STANDARD_RTTIEXT(StepData_StepModel,Interface_InterfaceModel)
 
 protected:
 
diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index ba6daae838..cc0b497fe5 100644
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -48,6 +48,8 @@
 #include <TColStd_SequenceOfInteger.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(StepData_StepReaderData,Interface_FileReaderData)
+
 // Le Header est constitue d entites analogues dans leur principe a celles
 // du Data, a ceci pres qu elles sont sans identifieur, et ne peuvent ni
 // referencer, ni etre referencees (que ce soit avec Header ou avec Data)
diff --git a/src/StepData/StepData_StepReaderData.hxx b/src/StepData/StepData_StepReaderData.hxx
index 5fdbca2d95..65be5790b6 100644
--- a/src/StepData/StepData_StepReaderData.hxx
+++ b/src/StepData/StepData_StepReaderData.hxx
@@ -318,7 +318,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_StepReaderData,Interface_FileReaderData)
+  DEFINE_STANDARD_RTTIEXT(StepData_StepReaderData,Interface_FileReaderData)
 
 protected:
 
diff --git a/src/StepData/StepData_UndefinedEntity.cxx b/src/StepData/StepData_UndefinedEntity.cxx
index 079fcbd8aa..fdbadedb53 100644
--- a/src/StepData/StepData_UndefinedEntity.cxx
+++ b/src/StepData/StepData_UndefinedEntity.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepData_UndefinedEntity,MMgt_TShared)
+
 StepData_UndefinedEntity::StepData_UndefinedEntity ()
       {  thecont = new Interface_UndefinedContent;  thesub = Standard_False;  }
 
diff --git a/src/StepData/StepData_UndefinedEntity.hxx b/src/StepData/StepData_UndefinedEntity.hxx
index f1b84f35d3..281db09d00 100644
--- a/src/StepData/StepData_UndefinedEntity.hxx
+++ b/src/StepData/StepData_UndefinedEntity.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepData_UndefinedEntity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepData_UndefinedEntity,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_AngularityTolerance.cxx b/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
index 4bc56d39bc..c45e240f27 100644
--- a/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_AngularityTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_AngularityTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_AngularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_AngularityTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_AngularityTolerance.hxx b/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
index 521eda10b5..510f144be5 100644
--- a/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_AngularityTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_AngularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_AngularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
index 455f2762b4..24866c4daa 100644
--- a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_CircularRunoutTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CircularRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_CircularRunoutTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
index 8c9c62f3d1..edb83ee445 100644
--- a/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CircularRunoutTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_CircularRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_CircularRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx b/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
index 9647af68e6..f25bc0e5bd 100644
--- a/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CoaxialityTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_CoaxialityTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CoaxialityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_CoaxialityTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx b/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
index 616d330ffa..bed36cac44 100644
--- a/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CoaxialityTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_CoaxialityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_CoaxialityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_CommonDatum.cxx b/src/StepDimTol/StepDimTol_CommonDatum.cxx
index cea590a1ee..1ff71f6cc7 100644
--- a/src/StepDimTol/StepDimTol_CommonDatum.cxx
+++ b/src/StepDimTol/StepDimTol_CommonDatum.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CommonDatum,StepRepr_CompositeShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_CommonDatum
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_CommonDatum.hxx b/src/StepDimTol/StepDimTol_CommonDatum.hxx
index 9da4ff6ce4..f0c2cb58e7 100644
--- a/src/StepDimTol/StepDimTol_CommonDatum.hxx
+++ b/src/StepDimTol/StepDimTol_CommonDatum.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_CommonDatum,StepRepr_CompositeShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_CommonDatum,StepRepr_CompositeShapeAspect)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx b/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
index 831913e4c5..37d9a52b43 100644
--- a/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ConcentricityTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_ConcentricityTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ConcentricityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_ConcentricityTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx b/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
index 9aa3fb278f..f371ec1f3a 100644
--- a/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ConcentricityTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_ConcentricityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ConcentricityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx b/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
index d6957bc057..145ae061ab 100644
--- a/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_CylindricityTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_CylindricityTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_CylindricityTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_CylindricityTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx b/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
index ce6223bef6..be8fa2a397 100644
--- a/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_CylindricityTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_CylindricityTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_CylindricityTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_Datum.cxx b/src/StepDimTol/StepDimTol_Datum.cxx
index ac817793f3..91b6ce8b98 100644
--- a/src/StepDimTol/StepDimTol_Datum.cxx
+++ b/src/StepDimTol/StepDimTol_Datum.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_Datum,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_Datum
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_Datum.hxx b/src/StepDimTol/StepDimTol_Datum.hxx
index 16adce6577..505768c0af 100644
--- a/src/StepDimTol/StepDimTol_Datum.hxx
+++ b/src/StepDimTol/StepDimTol_Datum.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_Datum,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_Datum,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_DatumFeature.cxx b/src/StepDimTol/StepDimTol_DatumFeature.cxx
index 86d24cf3c0..202d15f85a 100644
--- a/src/StepDimTol/StepDimTol_DatumFeature.cxx
+++ b/src/StepDimTol/StepDimTol_DatumFeature.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_DatumFeature.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumFeature,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_DatumFeature
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumFeature.hxx b/src/StepDimTol/StepDimTol_DatumFeature.hxx
index cd5c45a0d5..b77cf2a3e9 100644
--- a/src/StepDimTol/StepDimTol_DatumFeature.hxx
+++ b/src/StepDimTol/StepDimTol_DatumFeature.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumFeature,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumFeature,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_DatumReference.cxx b/src/StepDimTol/StepDimTol_DatumReference.cxx
index 05199f3229..1e34e29095 100644
--- a/src/StepDimTol/StepDimTol_DatumReference.cxx
+++ b/src/StepDimTol/StepDimTol_DatumReference.cxx
@@ -19,6 +19,8 @@
 #include <StepDimTol_Datum.hxx>
 #include <StepDimTol_DatumReference.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumReference,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_DatumReference
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumReference.hxx b/src/StepDimTol/StepDimTol_DatumReference.hxx
index 0c5972aed9..2a4913a589 100644
--- a/src/StepDimTol/StepDimTol_DatumReference.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReference.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumReference,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumReference,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.cxx b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.cxx
index 48b5e710d6..6e6ccceb35 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.cxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_DatumReferenceCompartment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumReferenceCompartment,StepDimTol_GeneralDatumReference)
+
 //=======================================================================
 //function : StepDimTol_DatumReferenceCompartment
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
index 449edb54ff..f241989b10 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceCompartment.hxx
@@ -32,6 +32,6 @@ public:
   //! Empty constructor
   Standard_EXPORT StepDimTol_DatumReferenceCompartment();
 
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumReferenceCompartment, StepDimTol_GeneralDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumReferenceCompartment,StepDimTol_GeneralDatumReference)
 };
 #endif // _StepDimTol_DatumReferenceCompartment_HeaderFile
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceElement.cxx b/src/StepDimTol/StepDimTol_DatumReferenceElement.cxx
index 1f675158fb..b1647b712e 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceElement.cxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceElement.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_DatumReferenceElement.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumReferenceElement,StepDimTol_GeneralDatumReference)
+
 //=======================================================================
 //function : StepDimTol_DatumReferenceElement
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx b/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
index c395772b47..a3b3c8bf88 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceElement.hxx
@@ -33,6 +33,6 @@ public:
   //! Empty constructor
   Standard_EXPORT StepDimTol_DatumReferenceElement();
 
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumReferenceElement, StepDimTol_GeneralDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumReferenceElement,StepDimTol_GeneralDatumReference)
 };
 #endif // _StepDimTol_DatumReferenceElement_HeaderFile
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.cxx b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.cxx
index 6df2cffde4..5d4e37fbb9 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.cxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_DatumReferenceModifierWithValue.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumReferenceModifierWithValue,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_DatumReferenceModifierWithValue
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
index 98420b7355..bdb9b3542f 100644
--- a/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
+++ b/src/StepDimTol/StepDimTol_DatumReferenceModifierWithValue.hxx
@@ -64,7 +64,7 @@ public:
     myModifierValue = theModifierValue;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumReferenceModifierWithValue, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumReferenceModifierWithValue,MMgt_TShared)
 
 private: 
   StepDimTol_DatumReferenceModifierType myModifierType;
diff --git a/src/StepDimTol/StepDimTol_DatumSystem.cxx b/src/StepDimTol/StepDimTol_DatumSystem.cxx
index c35be0a226..320407b58f 100644
--- a/src/StepDimTol/StepDimTol_DatumSystem.cxx
+++ b/src/StepDimTol/StepDimTol_DatumSystem.cxx
@@ -17,6 +17,8 @@
 
 #include <StepDimTol_HArray1OfDatumReferenceCompartment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumSystem,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_DatumSystem
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumSystem.hxx b/src/StepDimTol/StepDimTol_DatumSystem.hxx
index 37ecc6d914..6f06e7f5cd 100644
--- a/src/StepDimTol/StepDimTol_DatumSystem.hxx
+++ b/src/StepDimTol/StepDimTol_DatumSystem.hxx
@@ -71,7 +71,7 @@ public:
     myConstituents->SetValue (num, theItem);
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumSystem, StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumSystem,StepRepr_ShapeAspect)
 
 private: 
   Handle(StepDimTol_HArray1OfDatumReferenceCompartment) myConstituents;
diff --git a/src/StepDimTol/StepDimTol_DatumTarget.cxx b/src/StepDimTol/StepDimTol_DatumTarget.cxx
index 530493cf45..662147ad07 100644
--- a/src/StepDimTol/StepDimTol_DatumTarget.cxx
+++ b/src/StepDimTol/StepDimTol_DatumTarget.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_ProductDefinitionShape.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_DatumTarget,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_DatumTarget
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_DatumTarget.hxx b/src/StepDimTol/StepDimTol_DatumTarget.hxx
index 6b843ac043..fcd31f3796 100644
--- a/src/StepDimTol/StepDimTol_DatumTarget.hxx
+++ b/src/StepDimTol/StepDimTol_DatumTarget.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_DatumTarget,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_DatumTarget,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx b/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
index 6e4b05ba91..b46908458b 100644
--- a/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_FlatnessTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_FlatnessTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_FlatnessTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_FlatnessTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx b/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
index 22dd4a7a94..88bdba8b28 100644
--- a/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_FlatnessTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_FlatnessTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_FlatnessTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_GeneralDatumReference.cxx b/src/StepDimTol/StepDimTol_GeneralDatumReference.cxx
index a2038b8f4a..1f20e91a0a 100644
--- a/src/StepDimTol/StepDimTol_GeneralDatumReference.cxx
+++ b/src/StepDimTol/StepDimTol_GeneralDatumReference.cxx
@@ -17,6 +17,8 @@
 
 #include <StepDimTol_HArray1OfDatumReferenceModifier.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeneralDatumReference,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_GeneralDatumReference
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx b/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
index 297a8cb2b2..a9af7e2684 100644
--- a/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
+++ b/src/StepDimTol/StepDimTol_GeneralDatumReference.hxx
@@ -92,7 +92,7 @@ public:
     myModifiers->SetValue (theNum, theItem);
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_GeneralDatumReference, StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeneralDatumReference,StepRepr_ShapeAspect)
 
 private: 
   StepDimTol_DatumOrCommonDatum myBase;
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
index 9d643b4661..9bca2414f4 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRef,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthDatRef
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
index 609a078e69..aa12704a83 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRef.hxx
@@ -69,7 +69,7 @@ public:
     return myToleranceType;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthDatRef,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRef,StepDimTol_GeometricTolerance)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
index 32fbb61ad8..ca0d8e29d9 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.cxx
@@ -24,6 +24,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol,StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
index 4ac710a52a..96fe2be374 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx
@@ -67,7 +67,7 @@ public:
     return myMaxTol;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod,StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol,StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
index c5cbedb955..3f56ccfa5e 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.cxx
@@ -23,6 +23,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
index 37c76d1c5a..cd52c67e9c 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod.hxx
@@ -80,7 +80,7 @@ public:
     return myToleranceType;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMod,StepDimTol_GeometricTolerance)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
index 825ea2f480..1c2eaba55c 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
index 15d67cc5b8..24d1045d26 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
index 179e586427..42272790da 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.cxx
@@ -23,6 +23,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol,StepDimTol_GeoTolAndGeoTolWthDatRef)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
index 0fcc97dd4a..94276eb6e4 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol.hxx
@@ -63,7 +63,7 @@ public:
     return myUnequallyDisposedGeometricTolerance;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol,StepDimTol_GeoTolAndGeoTolWthDatRef)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthDatRefAndUneqDisGeoTol,StepDimTol_GeoTolAndGeoTolWthDatRef)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
index 3fdb63c04c..151f056d94 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.cxx
@@ -23,6 +23,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthMaxTol,StepDimTol_GeoTolAndGeoTolWthMod)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthMaxTol
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
index 328386b5f5..078c953651 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx
@@ -64,7 +64,7 @@ public:
     return myMaxTol;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthMod,StepDimTol_GeoTolAndGeoTolWthMod)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthMaxTol,StepDimTol_GeoTolAndGeoTolWthMod)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
index bc450b8838..870f3116f3 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthMod,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeoTolAndGeoTolWthMod
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
index d2754bad5b..efa750620b 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthMod.hxx
@@ -69,7 +69,7 @@ public:
     return myToleranceType;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeoTolAndGeoTolWthMod,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeoTolAndGeoTolWthMod,StepDimTol_GeometricTolerance)
 
 private:
 
diff --git a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
index c2b71e49c6..e085ebce3b 100644
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricTolerance.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricTolerance,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_GeometricTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx b/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
index 7d66bad465..65c70a3e13 100644
--- a/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricTolerance.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricTolerance,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricTolerance,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
index 19d5bdb7db..1b2e92f7c9 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepDimTol_GeometricToleranceRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceRelationship
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.hxx
index e1cb6cee74..e9d6b3eafe 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceRelationship.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
index 46c6f7acb9..b9635a9546 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDatumReference,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceWithDatumReference
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
index 424d544887..a0a1aa3390 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDatumReference.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceWithDatumReference,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDatumReference,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
index 160ff458ce..fc731cbed3 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDefinedAreaUnit,StepDimTol_GeometricToleranceWithDefinedUnit)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceWithDefinedAreaUnit
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
index 2cdbab68aa..cacc2069e9 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedAreaUnit.hxx
@@ -79,7 +79,7 @@ public:
     return mySecondUnitSize.IsNull();
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceWithDefinedAreaUnit, StepDimTol_GeometricToleranceWithDefinedUnit)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDefinedAreaUnit,StepDimTol_GeometricToleranceWithDefinedUnit)
 
 private: 
   StepDimTol_AreaUnitType myAreaType;
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
index 9582bd0942..3a2deaaf3e 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepRepr_ShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDefinedUnit,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceWithDefinedUnit
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
index eaee99a0b0..b990cb03ae 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithDefinedUnit.hxx
@@ -56,7 +56,7 @@ public:
     myUnitSize = theUnitSize;
   } 
   
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceWithDefinedUnit, StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithDefinedUnit,StepDimTol_GeometricTolerance)
 
 private: 
   Handle(StepBasic_LengthMeasureWithUnit) myUnitSize;
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
index d84962e92d..498faf79f5 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithMaximumTolerance,StepDimTol_GeometricToleranceWithModifiers)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceWithModifiers
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
index 6ef9cc55f7..79f4ad1ba1 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithMaximumTolerance.hxx
@@ -53,7 +53,7 @@ public:
     myMaximumUpperTolerance = theMaximumUpperTolerance;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceWithMaximumTolerance, StepDimTol_GeometricToleranceWithModifiers)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithMaximumTolerance,StepDimTol_GeometricToleranceWithModifiers)
 
 private:
   Handle(StepBasic_LengthMeasureWithUnit) myMaximumUpperTolerance;
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
index ddae79df06..ddd197903f 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.cxx
@@ -18,6 +18,8 @@
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepDimTol_HArray1OfGeometricToleranceModifier.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithModifiers,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_GeometricToleranceWithModifiers
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
index c9eae7b37b..f66d662807 100644
--- a/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
+++ b/src/StepDimTol/StepDimTol_GeometricToleranceWithModifiers.hxx
@@ -76,7 +76,7 @@ public:
   {  
     myModifiers->SetValue (theNum, theItem);
   }
-  DEFINE_STANDARD_RTTI(StepDimTol_GeometricToleranceWithModifiers, StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_GeometricToleranceWithModifiers,StepDimTol_GeometricTolerance)
 
 private: 
   Handle(StepDimTol_HArray1OfGeometricToleranceModifier) myModifiers;
diff --git a/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx b/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
index e7de58dff6..2b7abfc0fc 100644
--- a/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_LineProfileTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_LineProfileTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_LineProfileTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_LineProfileTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx b/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
index 582a1325ee..e21f8e1015 100644
--- a/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_LineProfileTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_LineProfileTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_LineProfileTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
index 864266228b..15543fb670 100644
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ModifiedGeometricTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_ModifiedGeometricTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
index 49078a9d36..80923be07f 100644
--- a/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ModifiedGeometricTolerance.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_ModifiedGeometricTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ModifiedGeometricTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.cxx b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.cxx
index 88e9600733..94549e924e 100644
--- a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.cxx
+++ b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_NonUniformZoneDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_NonUniformZoneDefinition,StepDimTol_ToleranceZoneDefinition)
+
 //=======================================================================
 //function : StepDimTol_NonUniformZoneDefinition
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
index f20fd3c6d7..07bd75c843 100644
--- a/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_NonUniformZoneDefinition.hxx
@@ -32,6 +32,6 @@ public:
   //! Empty constructor
   Standard_EXPORT StepDimTol_NonUniformZoneDefinition();
 
-  DEFINE_STANDARD_RTTI(StepDimTol_NonUniformZoneDefinition, StepDimTol_ToleranceZoneDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_NonUniformZoneDefinition,StepDimTol_ToleranceZoneDefinition)
 };
 #endif // _StepDimTol_NonUniformZoneDefinition_HeaderFile
diff --git a/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx b/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
index 30727ebbdd..b21fb6d27f 100644
--- a/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_ParallelismTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_ParallelismTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ParallelismTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_ParallelismTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx b/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
index 422ee619cc..f9ef11d562 100644
--- a/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_ParallelismTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_ParallelismTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ParallelismTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
index 589262ef87..e7168e2030 100644
--- a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_PerpendicularityTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_PerpendicularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_PerpendicularityTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
index 2081992461..4ce3b28888 100644
--- a/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_PerpendicularityTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_PerpendicularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_PerpendicularityTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.cxx b/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.cxx
index 9c4f99ea99..81c749b26a 100644
--- a/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.cxx
+++ b/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_PlacedDatumTargetFeature.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_PlacedDatumTargetFeature,StepDimTol_DatumTarget)
+
 //=======================================================================
 //function : StepDimTol_PlacedDatumTargetFeature
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.hxx b/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.hxx
index eeaf4f0618..d9d0fb0e56 100644
--- a/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.hxx
+++ b/src/StepDimTol/StepDimTol_PlacedDatumTargetFeature.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_PlacedDatumTargetFeature,StepDimTol_DatumTarget)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_PlacedDatumTargetFeature,StepDimTol_DatumTarget)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_PositionTolerance.cxx b/src/StepDimTol/StepDimTol_PositionTolerance.cxx
index ab1d4b956f..75f2889352 100644
--- a/src/StepDimTol/StepDimTol_PositionTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_PositionTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_PositionTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_PositionTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_PositionTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_PositionTolerance.hxx b/src/StepDimTol/StepDimTol_PositionTolerance.hxx
index 0d13f45a86..345da8872b 100644
--- a/src/StepDimTol/StepDimTol_PositionTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_PositionTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_PositionTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_PositionTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.cxx b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.cxx
index 09fe090dcc..c27b83f933 100644
--- a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.cxx
+++ b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_ProjectedZoneDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ProjectedZoneDefinition,StepDimTol_ToleranceZoneDefinition)
+
 //=======================================================================
 //function : StepDimTol_ProjectedZoneDefinition
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
index f30eae8702..e9df3e0a49 100644
--- a/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_ProjectedZoneDefinition.hxx
@@ -65,7 +65,7 @@ public:
     myProjectionLength = theProjectionLength;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_ProjectedZoneDefinition, StepDimTol_ToleranceZoneDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ProjectedZoneDefinition,StepDimTol_ToleranceZoneDefinition)
 
 private: 
   Handle(StepRepr_ShapeAspect) myProjectionEnd;
diff --git a/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx b/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
index 89bde16213..49c15687d9 100644
--- a/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_RoundnessTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_RoundnessTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_RoundnessTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_RoundnessTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx b/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
index 8ad9fa0ce4..cc974e9615 100644
--- a/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_RoundnessTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_RoundnessTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_RoundnessTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.cxx b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.cxx
index 5a23b636a1..2744b3b5ad 100644
--- a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.cxx
+++ b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_RunoutZoneOrientation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_RunoutZoneOrientation,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_RunoutZoneOrientation
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
index 3ffe9b99d1..8b51082117 100644
--- a/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
+++ b/src/StepDimTol/StepDimTol_RunoutZoneOrientation.hxx
@@ -48,7 +48,7 @@ public:
     myAngle = theAngle;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_RunoutZoneOrientation, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_RunoutZoneOrientation,MMgt_TShared)
   
 private:
   Handle(StepBasic_PlaneAngleMeasureWithUnit) myAngle;
diff --git a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.cxx b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.cxx
index 4350c4200a..2883ea438a 100644
--- a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.cxx
+++ b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.cxx
@@ -17,6 +17,8 @@
 #include <StepData_EnumTool.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_SimpleDatumReferenceModifierMember,StepData_SelectInt)
+
 static StepData_EnumTool tool
   (".ANY_CROSS_SECTION.",
    ".ANY_LONGITUDINAL_SECTION.",
diff --git a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx
index 40a69c55dd..50df780d7d 100644
--- a/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx
+++ b/src/StepDimTol/StepDimTol_SimpleDatumReferenceModifierMember.hxx
@@ -56,6 +56,6 @@ public:
   
   Standard_EXPORT   StepDimTol_SimpleDatumReferenceModifier Value()  const;
 
-  DEFINE_STANDARD_RTTI(StepDimTol_SimpleDatumReferenceModifierMember, StepData_SelectInt)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_SimpleDatumReferenceModifierMember,StepData_SelectInt)
 };
 #endif // _StepDimTol_SimpleDatumReferenceModifierMember_HeaderFile
diff --git a/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx b/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
index a731592617..8a29dfca4e 100644
--- a/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_StraightnessTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_StraightnessTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_StraightnessTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_StraightnessTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx b/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
index ecc527fc16..b11567715b 100644
--- a/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_StraightnessTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_StraightnessTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_StraightnessTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
index 59146b5b0b..4865e4b511 100644
--- a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_SurfaceProfileTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_SurfaceProfileTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_SurfaceProfileTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
index 8ba70effcd..9740c41c35 100644
--- a/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_SurfaceProfileTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_SurfaceProfileTolerance,StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_SurfaceProfileTolerance,StepDimTol_GeometricTolerance)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx b/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
index f603073a73..15611770bd 100644
--- a/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_SymmetryTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_SymmetryTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_SymmetryTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_SymmetryTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx b/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
index 1f0229969e..d107897ca9 100644
--- a/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_SymmetryTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_SymmetryTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_SymmetryTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_ToleranceZone.cxx b/src/StepDimTol/StepDimTol_ToleranceZone.cxx
index 508c04c05c..c0480f169e 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZone.cxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZone.cxx
@@ -17,6 +17,8 @@
 
 #include <StepDimTol_HArray1OfToleranceZoneTarget.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ToleranceZone,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepDimTol_ToleranceZone
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ToleranceZone.hxx b/src/StepDimTol/StepDimTol_ToleranceZone.hxx
index 77548901d7..49ddde966a 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZone.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZone.hxx
@@ -90,7 +90,7 @@ public:
     myForm = theForm;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_ToleranceZone, StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ToleranceZone,StepRepr_ShapeAspect)
 
 private: 
   Handle(StepDimTol_HArray1OfToleranceZoneTarget) myDefiningTolerance;
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.cxx b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.cxx
index 5a09e4393f..272f39ec4e 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.cxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.cxx
@@ -17,6 +17,8 @@
 
 #include <StepRepr_HArray1OfShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ToleranceZoneDefinition,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_ToleranceZoneDefinition
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
index 0d70c749d8..9651ae55dd 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneDefinition.hxx
@@ -84,7 +84,7 @@ public:
     myZone = theZone;
   }
   
-  DEFINE_STANDARD_RTTI(StepDimTol_ToleranceZoneDefinition, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ToleranceZoneDefinition,MMgt_TShared)
 
 private: 
   Handle(StepRepr_HArray1OfShapeAspect) myBoundaries;
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneForm.cxx b/src/StepDimTol/StepDimTol_ToleranceZoneForm.cxx
index 080f48a7c3..eea7a244a3 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneForm.cxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneForm.cxx
@@ -15,6 +15,8 @@
 
 #include <StepDimTol_ToleranceZoneForm.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_ToleranceZoneForm,MMgt_TShared)
+
 //=======================================================================
 //function : StepDimTol_ToleranceZoneForm
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx b/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
index c7ed73f85d..de35fe9592 100644
--- a/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
+++ b/src/StepDimTol/StepDimTol_ToleranceZoneForm.hxx
@@ -50,7 +50,7 @@ public:
     myName = theName;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_ToleranceZoneForm, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_ToleranceZoneForm,MMgt_TShared)
   
 private:
   Handle(TCollection_HAsciiString) myName;
diff --git a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
index 9870b84fe7..89dcc19069 100644
--- a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepDimTol_TotalRunoutTolerance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_TotalRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+
 //=======================================================================
 //function : StepDimTol_TotalRunoutTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
index c77c362aa8..b5ea090740 100644
--- a/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_TotalRunoutTolerance.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepDimTol_TotalRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_TotalRunoutTolerance,StepDimTol_GeometricToleranceWithDatumReference)
 
 protected:
 
diff --git a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
index 879b1f3331..6e749feb20 100644
--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
+++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.cxx
@@ -18,6 +18,8 @@
 #include <StepDimTol_GeometricToleranceTarget.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepDimTol_UnequallyDisposedGeometricTolerance,StepDimTol_GeometricTolerance)
+
 //=======================================================================
 //function : StepDimTol_UnequallyDisposedGeometricTolerance
 //purpose  : 
diff --git a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
index f3331b7bf9..de9d3d8186 100644
--- a/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
+++ b/src/StepDimTol/StepDimTol_UnequallyDisposedGeometricTolerance.hxx
@@ -52,7 +52,7 @@ public:
     myDisplacement = theDisplacement;
   }
 
-  DEFINE_STANDARD_RTTI(StepDimTol_UnequallyDisposedGeometricTolerance, StepDimTol_GeometricTolerance)
+  DEFINE_STANDARD_RTTIEXT(StepDimTol_UnequallyDisposedGeometricTolerance,StepDimTol_GeometricTolerance)
 
 private: 
   Handle(StepBasic_LengthMeasureWithUnit) myDisplacement;
diff --git a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
index 5149bc0a14..e26b7fe6fa 100644
--- a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
+++ b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_AnalysisItemWithinRepresentation,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_AnalysisItemWithinRepresentation
 //purpose  : 
diff --git a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.hxx b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.hxx
index 18c7d4817f..1971ba2267 100644
--- a/src/StepElement/StepElement_AnalysisItemWithinRepresentation.hxx
+++ b/src/StepElement/StepElement_AnalysisItemWithinRepresentation.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_AnalysisItemWithinRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_AnalysisItemWithinRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_Curve3dElementDescriptor.cxx b/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
index 0c65efb899..571f12ef90 100644
--- a/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Curve3dElementDescriptor.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_Curve3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_Curve3dElementDescriptor,StepElement_ElementDescriptor)
+
 //=======================================================================
 //function : StepElement_Curve3dElementDescriptor
 //purpose  : 
diff --git a/src/StepElement/StepElement_Curve3dElementDescriptor.hxx b/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
index 24e145b1c9..6b430afa90 100644
--- a/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Curve3dElementDescriptor.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_Curve3dElementDescriptor,StepElement_ElementDescriptor)
+  DEFINE_STANDARD_RTTIEXT(StepElement_Curve3dElementDescriptor,StepElement_ElementDescriptor)
 
 protected:
 
diff --git a/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx b/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
index 0ea7410912..38f9f29c36 100644
--- a/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
+++ b/src/StepElement/StepElement_CurveElementEndReleasePacket.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_CurveElementEndReleasePacket.hxx>
 #include <StepElement_CurveElementFreedom.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_CurveElementEndReleasePacket,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_CurveElementEndReleasePacket
 //purpose  : 
diff --git a/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx b/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
index 954c39c63a..58df968676 100644
--- a/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
+++ b/src/StepElement/StepElement_CurveElementEndReleasePacket.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_CurveElementEndReleasePacket,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_CurveElementEndReleasePacket,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_CurveElementFreedomMember.cxx b/src/StepElement/StepElement_CurveElementFreedomMember.cxx
index 7f9af1d63b..adf4e83f9d 100644
--- a/src/StepElement/StepElement_CurveElementFreedomMember.cxx
+++ b/src/StepElement/StepElement_CurveElementFreedomMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_CurveElementFreedomMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_CurveElementFreedomMember,StepData_SelectNamed)
+
 static Standard_CString ECEF = "ENUMERATED_CURVE_ELEMENT_FREEDOM";
 static Standard_CString ADDF = "APPLICATION_DEFINED_DEGREE_OF_FREEDOM";
 
diff --git a/src/StepElement/StepElement_CurveElementFreedomMember.hxx b/src/StepElement/StepElement_CurveElementFreedomMember.hxx
index f95bd75e00..b51509bd1e 100644
--- a/src/StepElement/StepElement_CurveElementFreedomMember.hxx
+++ b/src/StepElement/StepElement_CurveElementFreedomMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_CurveElementFreedomMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_CurveElementFreedomMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepElement/StepElement_CurveElementPurposeMember.cxx b/src/StepElement/StepElement_CurveElementPurposeMember.cxx
index 588c176656..a14e973dbb 100644
--- a/src/StepElement/StepElement_CurveElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_CurveElementPurposeMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_CurveElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_CurveElementPurposeMember,StepData_SelectNamed)
+
 static Standard_CString ECEP = "ENUMERATED_CURVE_ELEMENT_PURPOSE";
 static Standard_CString ADEP = "APPLICATION_DEFINED_ELEMENT_PURPOSE";
 
diff --git a/src/StepElement/StepElement_CurveElementPurposeMember.hxx b/src/StepElement/StepElement_CurveElementPurposeMember.hxx
index f53a22dbbb..6b5deb4a98 100644
--- a/src/StepElement/StepElement_CurveElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_CurveElementPurposeMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_CurveElementPurposeMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_CurveElementPurposeMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepElement/StepElement_CurveElementSectionDefinition.cxx b/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
index 6e17ce47c5..e0e2bb2f54 100644
--- a/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
+++ b/src/StepElement/StepElement_CurveElementSectionDefinition.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_CurveElementSectionDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_CurveElementSectionDefinition,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_CurveElementSectionDefinition
 //purpose  : 
diff --git a/src/StepElement/StepElement_CurveElementSectionDefinition.hxx b/src/StepElement/StepElement_CurveElementSectionDefinition.hxx
index 0056bc8786..9d860d4558 100644
--- a/src/StepElement/StepElement_CurveElementSectionDefinition.hxx
+++ b/src/StepElement/StepElement_CurveElementSectionDefinition.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_CurveElementSectionDefinition,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_CurveElementSectionDefinition,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
index 6c6ed27e98..4274ae83b4 100644
--- a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
+++ b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.cxx
@@ -20,6 +20,8 @@
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_CurveElementSectionDerivedDefinitions,StepElement_CurveElementSectionDefinition)
+
 //=======================================================================
 //function : StepElement_CurveElementSectionDerivedDefinitions
 //purpose  : 
diff --git a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
index 96872991aa..41dd6f4fd8 100644
--- a/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
+++ b/src/StepElement/StepElement_CurveElementSectionDerivedDefinitions.hxx
@@ -107,7 +107,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_CurveElementSectionDerivedDefinitions,StepElement_CurveElementSectionDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepElement_CurveElementSectionDerivedDefinitions,StepElement_CurveElementSectionDefinition)
 
 protected:
 
diff --git a/src/StepElement/StepElement_ElementAspectMember.cxx b/src/StepElement/StepElement_ElementAspectMember.cxx
index 05346c1f19..0661a5d59a 100644
--- a/src/StepElement/StepElement_ElementAspectMember.cxx
+++ b/src/StepElement/StepElement_ElementAspectMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_ElementAspectMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_ElementAspectMember,StepData_SelectNamed)
+
 static Standard_CString aElementVolume = "ELEMENT_VOLUME";
 static Standard_CString aVolume3dFace = "VOLUME_3D_FACE";
 static Standard_CString aVolume2dFace = "VOLUME_2D_FACE";
diff --git a/src/StepElement/StepElement_ElementAspectMember.hxx b/src/StepElement/StepElement_ElementAspectMember.hxx
index 0160dbd632..150b872b3d 100644
--- a/src/StepElement/StepElement_ElementAspectMember.hxx
+++ b/src/StepElement/StepElement_ElementAspectMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_ElementAspectMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_ElementAspectMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepElement/StepElement_ElementDescriptor.cxx b/src/StepElement/StepElement_ElementDescriptor.cxx
index 6e9af238aa..96740447ba 100644
--- a/src/StepElement/StepElement_ElementDescriptor.cxx
+++ b/src/StepElement/StepElement_ElementDescriptor.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_ElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_ElementDescriptor,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_ElementDescriptor
 //purpose  : 
diff --git a/src/StepElement/StepElement_ElementDescriptor.hxx b/src/StepElement/StepElement_ElementDescriptor.hxx
index 09a57a2ecf..99bb7d1083 100644
--- a/src/StepElement/StepElement_ElementDescriptor.hxx
+++ b/src/StepElement/StepElement_ElementDescriptor.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_ElementDescriptor,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_ElementDescriptor,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_ElementMaterial.cxx b/src/StepElement/StepElement_ElementMaterial.cxx
index 4faf6d3ec8..c667202e30 100644
--- a/src/StepElement/StepElement_ElementMaterial.cxx
+++ b/src/StepElement/StepElement_ElementMaterial.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_ElementMaterial.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_ElementMaterial,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_ElementMaterial
 //purpose  : 
diff --git a/src/StepElement/StepElement_ElementMaterial.hxx b/src/StepElement/StepElement_ElementMaterial.hxx
index e551480a3c..2da541f527 100644
--- a/src/StepElement/StepElement_ElementMaterial.hxx
+++ b/src/StepElement/StepElement_ElementMaterial.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_ElementMaterial,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_ElementMaterial,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
index 16b61d79e3..ccbea30eea 100644
--- a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
+++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_MeasureOrUnspecifiedValueMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_MeasureOrUnspecifiedValueMember,StepData_SelectNamed)
+
 static Standard_CString aContextDependedMeasure = "CONTEXT_DEPENDENT_MEASURE";
 static Standard_CString anUnspecifiedValue = "UNSPECIFIED_VALUE";
 
diff --git a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
index 788b563588..f1e2c7764e 100644
--- a/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
+++ b/src/StepElement/StepElement_MeasureOrUnspecifiedValueMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_MeasureOrUnspecifiedValueMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_MeasureOrUnspecifiedValueMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepElement/StepElement_Surface3dElementDescriptor.cxx b/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
index 2854ada5b3..a8e8effb65 100644
--- a/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Surface3dElementDescriptor.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_Surface3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_Surface3dElementDescriptor,StepElement_ElementDescriptor)
+
 //=======================================================================
 //function : StepElement_Surface3dElementDescriptor
 //purpose  : 
diff --git a/src/StepElement/StepElement_Surface3dElementDescriptor.hxx b/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
index 71b420d644..56bd054255 100644
--- a/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Surface3dElementDescriptor.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_Surface3dElementDescriptor,StepElement_ElementDescriptor)
+  DEFINE_STANDARD_RTTIEXT(StepElement_Surface3dElementDescriptor,StepElement_ElementDescriptor)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceElementProperty.cxx b/src/StepElement/StepElement_SurfaceElementProperty.cxx
index 3268201048..662c10cab9 100644
--- a/src/StepElement/StepElement_SurfaceElementProperty.cxx
+++ b/src/StepElement/StepElement_SurfaceElementProperty.cxx
@@ -20,6 +20,8 @@
 #include <StepElement_SurfaceSectionField.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceElementProperty,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_SurfaceElementProperty
 //purpose  : 
diff --git a/src/StepElement/StepElement_SurfaceElementProperty.hxx b/src/StepElement/StepElement_SurfaceElementProperty.hxx
index 8d6e259873..497a533490 100644
--- a/src/StepElement/StepElement_SurfaceElementProperty.hxx
+++ b/src/StepElement/StepElement_SurfaceElementProperty.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceElementProperty,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceElementProperty,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx b/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
index 089213c0c9..e00852104d 100644
--- a/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_SurfaceElementPurposeMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_SurfaceElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceElementPurposeMember,StepData_SelectNamed)
+
 static Standard_CString ESEP = "ENUMERATED_SURFACE_ELEMENT_PURPOSE";
 static Standard_CString ADEP = "APPLICATION_DEFINED_ELEMENT_PURPOSE";
 
diff --git a/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx b/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
index 6924259e1a..3ebb7431fd 100644
--- a/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_SurfaceElementPurposeMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceElementPurposeMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceElementPurposeMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceSection.cxx b/src/StepElement/StepElement_SurfaceSection.cxx
index e4f501ffcc..968aff75ce 100644
--- a/src/StepElement/StepElement_SurfaceSection.cxx
+++ b/src/StepElement/StepElement_SurfaceSection.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_SurfaceSection.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSection,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_SurfaceSection
 //purpose  : 
diff --git a/src/StepElement/StepElement_SurfaceSection.hxx b/src/StepElement/StepElement_SurfaceSection.hxx
index 1fc4c38551..32c638cf20 100644
--- a/src/StepElement/StepElement_SurfaceSection.hxx
+++ b/src/StepElement/StepElement_SurfaceSection.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceSection,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceSection,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceSectionField.cxx b/src/StepElement/StepElement_SurfaceSectionField.cxx
index 15dc500dc2..be9ff9126d 100644
--- a/src/StepElement/StepElement_SurfaceSectionField.cxx
+++ b/src/StepElement/StepElement_SurfaceSectionField.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepElement_SurfaceSectionField.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSectionField,MMgt_TShared)
+
 //=======================================================================
 //function : StepElement_SurfaceSectionField
 //purpose  : 
diff --git a/src/StepElement/StepElement_SurfaceSectionField.hxx b/src/StepElement/StepElement_SurfaceSectionField.hxx
index 5f73968826..5a6cf12269 100644
--- a/src/StepElement/StepElement_SurfaceSectionField.hxx
+++ b/src/StepElement/StepElement_SurfaceSectionField.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceSectionField,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceSectionField,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx b/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
index afff5c90ae..b36a3c427c 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldConstant.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_SurfaceSection.hxx>
 #include <StepElement_SurfaceSectionFieldConstant.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSectionFieldConstant,StepElement_SurfaceSectionField)
+
 //=======================================================================
 //function : StepElement_SurfaceSectionFieldConstant
 //purpose  : 
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldConstant.hxx b/src/StepElement/StepElement_SurfaceSectionFieldConstant.hxx
index 66decc7027..678317952c 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldConstant.hxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldConstant.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceSectionFieldConstant,StepElement_SurfaceSectionField)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceSectionFieldConstant,StepElement_SurfaceSectionField)
 
 protected:
 
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx b/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
index fea1f4482b..ed276f0327 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldVarying.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepElement_SurfaceSectionFieldVarying.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_SurfaceSectionFieldVarying,StepElement_SurfaceSectionField)
+
 //=======================================================================
 //function : StepElement_SurfaceSectionFieldVarying
 //purpose  : 
diff --git a/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx b/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
index d0e25269b6..f2f870d4ce 100644
--- a/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
+++ b/src/StepElement/StepElement_SurfaceSectionFieldVarying.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_SurfaceSectionFieldVarying,StepElement_SurfaceSectionField)
+  DEFINE_STANDARD_RTTIEXT(StepElement_SurfaceSectionFieldVarying,StepElement_SurfaceSectionField)
 
 protected:
 
diff --git a/src/StepElement/StepElement_UniformSurfaceSection.cxx b/src/StepElement/StepElement_UniformSurfaceSection.cxx
index 7ae3fc5b55..b7de763609 100644
--- a/src/StepElement/StepElement_UniformSurfaceSection.cxx
+++ b/src/StepElement/StepElement_UniformSurfaceSection.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_MeasureOrUnspecifiedValue.hxx>
 #include <StepElement_UniformSurfaceSection.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_UniformSurfaceSection,StepElement_SurfaceSection)
+
 //=======================================================================
 //function : StepElement_UniformSurfaceSection
 //purpose  : 
diff --git a/src/StepElement/StepElement_UniformSurfaceSection.hxx b/src/StepElement/StepElement_UniformSurfaceSection.hxx
index 5571b5223f..7eb573bdf0 100644
--- a/src/StepElement/StepElement_UniformSurfaceSection.hxx
+++ b/src/StepElement/StepElement_UniformSurfaceSection.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_UniformSurfaceSection,StepElement_SurfaceSection)
+  DEFINE_STANDARD_RTTIEXT(StepElement_UniformSurfaceSection,StepElement_SurfaceSection)
 
 protected:
 
diff --git a/src/StepElement/StepElement_Volume3dElementDescriptor.cxx b/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
index dfb04c3f5d..2659294fb9 100644
--- a/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
+++ b/src/StepElement/StepElement_Volume3dElementDescriptor.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_Volume3dElementDescriptor.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_Volume3dElementDescriptor,StepElement_ElementDescriptor)
+
 //=======================================================================
 //function : StepElement_Volume3dElementDescriptor
 //purpose  : 
diff --git a/src/StepElement/StepElement_Volume3dElementDescriptor.hxx b/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
index 87fdf9f7cd..fdeb765cf1 100644
--- a/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
+++ b/src/StepElement/StepElement_Volume3dElementDescriptor.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_Volume3dElementDescriptor,StepElement_ElementDescriptor)
+  DEFINE_STANDARD_RTTIEXT(StepElement_Volume3dElementDescriptor,StepElement_ElementDescriptor)
 
 protected:
 
diff --git a/src/StepElement/StepElement_VolumeElementPurposeMember.cxx b/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
index 5740f670ef..c3c6e3eec9 100644
--- a/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
+++ b/src/StepElement/StepElement_VolumeElementPurposeMember.cxx
@@ -19,6 +19,8 @@
 #include <StepElement_VolumeElementPurposeMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepElement_VolumeElementPurposeMember,StepData_SelectNamed)
+
 static Standard_CString EVEP = "ENUMERATED_VOLUME_ELEMENT_PURPOSE";
 static Standard_CString ADEP = "APPLICATION_DEFINED_ELEMENT_PURPOSE";
 
diff --git a/src/StepElement/StepElement_VolumeElementPurposeMember.hxx b/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
index 24133ac384..83258f5c0e 100644
--- a/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
+++ b/src/StepElement/StepElement_VolumeElementPurposeMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepElement_VolumeElementPurposeMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepElement_VolumeElementPurposeMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
index 365f79c617..48cbcbcc6f 100644
--- a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_AlignedCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_AlignedCurve3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.hxx
index 75036e0a1c..c7bce71666 100644
--- a/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_AlignedCurve3dElementCoordinateSystem.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_AlignedCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_AlignedCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
index 0fb2f1ab30..258c28c5f3 100644
--- a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_AlignedSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_AlignedSurface3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.hxx
index b73fd2b7a0..bf044a39d2 100644
--- a/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_AlignedSurface3dElementCoordinateSystem.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_AlignedSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_AlignedSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
index 162975b61f..c9747932a8 100644
--- a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_FeaAxis2Placement3d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ArbitraryVolume3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_ArbitraryVolume3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx
index 8e97f7e890..c37be93d4b 100644
--- a/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_ArbitraryVolume3dElementCoordinateSystem.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ArbitraryVolume3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ArbitraryVolume3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
index 2683e17c43..c987462e7a 100644
--- a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_ConstantSurface3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ConstantSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_ConstantSurface3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.hxx
index 7f5755f3f5..d4430739f3 100644
--- a/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_ConstantSurface3dElementCoordinateSystem.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ConstantSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ConstantSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_Curve3dElementProperty.cxx b/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
index 559ea446fa..031785da44 100644
--- a/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
+++ b/src/StepFEA/StepFEA_Curve3dElementProperty.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_Curve3dElementProperty.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_Curve3dElementProperty,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_Curve3dElementProperty
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_Curve3dElementProperty.hxx b/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
index 950830f368..703261cda1 100644
--- a/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
+++ b/src/StepFEA/StepFEA_Curve3dElementProperty.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_Curve3dElementProperty,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_Curve3dElementProperty,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
index 89cfcdbe15..bf7fd092c7 100644
--- a/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Curve3dElementRepresentation.cxx
@@ -24,6 +24,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_Curve3dElementRepresentation,StepFEA_ElementRepresentation)
+
 //=======================================================================
 //function : StepFEA_Curve3dElementRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_Curve3dElementRepresentation.hxx b/src/StepFEA/StepFEA_Curve3dElementRepresentation.hxx
index a2d86df280..1e7c29fa75 100644
--- a/src/StepFEA/StepFEA_Curve3dElementRepresentation.hxx
+++ b/src/StepFEA/StepFEA_Curve3dElementRepresentation.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_Curve3dElementRepresentation,StepFEA_ElementRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_Curve3dElementRepresentation,StepFEA_ElementRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementEndOffset.cxx b/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
index 79dddd35de..9de6e1e754 100644
--- a/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
+++ b/src/StepFEA/StepFEA_CurveElementEndOffset.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <StepFEA_CurveElementEndOffset.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementEndOffset,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_CurveElementEndOffset
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementEndOffset.hxx b/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
index 7170c1eeca..bd784a15ac 100644
--- a/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
+++ b/src/StepFEA/StepFEA_CurveElementEndOffset.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementEndOffset,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementEndOffset,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementEndRelease.cxx b/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
index 727a2f298f..1fb67f6c59 100644
--- a/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
+++ b/src/StepFEA/StepFEA_CurveElementEndRelease.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_CurveElementEndCoordinateSystem.hxx>
 #include <StepFEA_CurveElementEndRelease.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementEndRelease,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_CurveElementEndRelease
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementEndRelease.hxx b/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
index 8fbcf85a77..87cac53e42 100644
--- a/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
+++ b/src/StepFEA/StepFEA_CurveElementEndRelease.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementEndRelease,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementEndRelease,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementInterval.cxx b/src/StepFEA/StepFEA_CurveElementInterval.cxx
index 217d1a4c6c..a1811136de 100644
--- a/src/StepFEA/StepFEA_CurveElementInterval.cxx
+++ b/src/StepFEA/StepFEA_CurveElementInterval.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_CurveElementInterval.hxx>
 #include <StepFEA_CurveElementLocation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementInterval,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_CurveElementInterval
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementInterval.hxx b/src/StepFEA/StepFEA_CurveElementInterval.hxx
index 9391368bad..2a215dd6ca 100644
--- a/src/StepFEA/StepFEA_CurveElementInterval.hxx
+++ b/src/StepFEA/StepFEA_CurveElementInterval.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementInterval,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementInterval,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementIntervalConstant.cxx b/src/StepFEA/StepFEA_CurveElementIntervalConstant.cxx
index 4aaae08c76..be378a90f0 100644
--- a/src/StepFEA/StepFEA_CurveElementIntervalConstant.cxx
+++ b/src/StepFEA/StepFEA_CurveElementIntervalConstant.cxx
@@ -21,6 +21,8 @@
 #include <StepFEA_CurveElementIntervalConstant.hxx>
 #include <StepFEA_CurveElementLocation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementIntervalConstant,StepFEA_CurveElementInterval)
+
 //=======================================================================
 //function : StepFEA_CurveElementIntervalConstant
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementIntervalConstant.hxx b/src/StepFEA/StepFEA_CurveElementIntervalConstant.hxx
index f2de114280..f6f6558647 100644
--- a/src/StepFEA/StepFEA_CurveElementIntervalConstant.hxx
+++ b/src/StepFEA/StepFEA_CurveElementIntervalConstant.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementIntervalConstant,StepFEA_CurveElementInterval)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementIntervalConstant,StepFEA_CurveElementInterval)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.cxx b/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.cxx
index a1a6d7046f..8017629fb4 100644
--- a/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.cxx
+++ b/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_CurveElementIntervalLinearlyVarying.hxx>
 #include <StepFEA_CurveElementLocation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementIntervalLinearlyVarying,StepFEA_CurveElementInterval)
+
 //=======================================================================
 //function : StepFEA_CurveElementIntervalLinearlyVarying
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.hxx b/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.hxx
index 2046f3c0d8..285471ec9f 100644
--- a/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.hxx
+++ b/src/StepFEA/StepFEA_CurveElementIntervalLinearlyVarying.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementIntervalLinearlyVarying,StepFEA_CurveElementInterval)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementIntervalLinearlyVarying,StepFEA_CurveElementInterval)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_CurveElementLocation.cxx b/src/StepFEA/StepFEA_CurveElementLocation.cxx
index 407495ac4c..0347442ce3 100644
--- a/src/StepFEA/StepFEA_CurveElementLocation.cxx
+++ b/src/StepFEA/StepFEA_CurveElementLocation.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_CurveElementLocation.hxx>
 #include <StepFEA_FeaParametricPoint.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_CurveElementLocation,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_CurveElementLocation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_CurveElementLocation.hxx b/src/StepFEA/StepFEA_CurveElementLocation.hxx
index a383823de1..a6ac286dff 100644
--- a/src/StepFEA/StepFEA_CurveElementLocation.hxx
+++ b/src/StepFEA/StepFEA_CurveElementLocation.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_CurveElementLocation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_CurveElementLocation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx b/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
index eaef9bc941..8c5e4bb1dd 100644
--- a/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
+++ b/src/StepFEA/StepFEA_DegreeOfFreedomMember.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_DegreeOfFreedomMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_DegreeOfFreedomMember,StepData_SelectNamed)
+
 static Standard_CString anEnumeratedCurveElementFreedom = "ENUMERATED_DEGREE_OF_FREEDOM";
 static Standard_CString anApplicationDefinedDegreeOfFreedom ="APPLICATION_DEFINED_DEGREE_OF_FREEDOM";
 
diff --git a/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx b/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
index 57b580f28c..f31d90cde7 100644
--- a/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
+++ b/src/StepFEA/StepFEA_DegreeOfFreedomMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_DegreeOfFreedomMember,StepData_SelectNamed)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_DegreeOfFreedomMember,StepData_SelectNamed)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_DummyNode.cxx b/src/StepFEA/StepFEA_DummyNode.cxx
index 33313b78df..b8c4cb95d4 100644
--- a/src/StepFEA/StepFEA_DummyNode.cxx
+++ b/src/StepFEA/StepFEA_DummyNode.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_DummyNode.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_DummyNode,StepFEA_NodeRepresentation)
+
 //=======================================================================
 //function : StepFEA_DummyNode
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_DummyNode.hxx b/src/StepFEA/StepFEA_DummyNode.hxx
index afbcf3d730..d6363b8ef3 100644
--- a/src/StepFEA/StepFEA_DummyNode.hxx
+++ b/src/StepFEA/StepFEA_DummyNode.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_DummyNode,StepFEA_NodeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_DummyNode,StepFEA_NodeRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx b/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
index e03dfc0d6c..7a0a2e5ece 100644
--- a/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
+++ b/src/StepFEA/StepFEA_ElementGeometricRelationship.cxx
@@ -21,6 +21,8 @@
 #include <StepFEA_ElementGeometricRelationship.hxx>
 #include <StepFEA_ElementOrElementGroup.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ElementGeometricRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_ElementGeometricRelationship
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ElementGeometricRelationship.hxx b/src/StepFEA/StepFEA_ElementGeometricRelationship.hxx
index 00d5a74680..8f54862818 100644
--- a/src/StepFEA/StepFEA_ElementGeometricRelationship.hxx
+++ b/src/StepFEA/StepFEA_ElementGeometricRelationship.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ElementGeometricRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ElementGeometricRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ElementGroup.cxx b/src/StepFEA/StepFEA_ElementGroup.cxx
index 7ea0cda02b..4210367619 100644
--- a/src/StepFEA/StepFEA_ElementGroup.cxx
+++ b/src/StepFEA/StepFEA_ElementGroup.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_FeaModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ElementGroup,StepFEA_FeaGroup)
+
 //=======================================================================
 //function : StepFEA_ElementGroup
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ElementGroup.hxx b/src/StepFEA/StepFEA_ElementGroup.hxx
index 1f3a34e160..0d17f9e3f4 100644
--- a/src/StepFEA/StepFEA_ElementGroup.hxx
+++ b/src/StepFEA/StepFEA_ElementGroup.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ElementGroup,StepFEA_FeaGroup)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ElementGroup,StepFEA_FeaGroup)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ElementRepresentation.cxx b/src/StepFEA/StepFEA_ElementRepresentation.cxx
index 14acab1718..b58276bfc0 100644
--- a/src/StepFEA/StepFEA_ElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_ElementRepresentation.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ElementRepresentation,StepRepr_Representation)
+
 //=======================================================================
 //function : StepFEA_ElementRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ElementRepresentation.hxx b/src/StepFEA/StepFEA_ElementRepresentation.hxx
index 750bc70164..1d7f40efa0 100644
--- a/src/StepFEA/StepFEA_ElementRepresentation.hxx
+++ b/src/StepFEA/StepFEA_ElementRepresentation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ElementRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ElementRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaAreaDensity.cxx b/src/StepFEA/StepFEA_FeaAreaDensity.cxx
index e3cb85dfa7..878c4c054d 100644
--- a/src/StepFEA/StepFEA_FeaAreaDensity.cxx
+++ b/src/StepFEA/StepFEA_FeaAreaDensity.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_FeaAreaDensity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaAreaDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaAreaDensity
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaAreaDensity.hxx b/src/StepFEA/StepFEA_FeaAreaDensity.hxx
index 6c77beeee9..21cc753bb6 100644
--- a/src/StepFEA/StepFEA_FeaAreaDensity.hxx
+++ b/src/StepFEA/StepFEA_FeaAreaDensity.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaAreaDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaAreaDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx b/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
index 7530c02b3f..1727aa72c3 100644
--- a/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
+++ b/src/StepFEA/StepFEA_FeaAxis2Placement3d.cxx
@@ -21,6 +21,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaAxis2Placement3d,StepGeom_Axis2Placement3d)
+
 //=======================================================================
 //function : StepFEA_FeaAxis2Placement3d
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaAxis2Placement3d.hxx b/src/StepFEA/StepFEA_FeaAxis2Placement3d.hxx
index e2555727ce..7ec827766b 100644
--- a/src/StepFEA/StepFEA_FeaAxis2Placement3d.hxx
+++ b/src/StepFEA/StepFEA_FeaAxis2Placement3d.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaAxis2Placement3d,StepGeom_Axis2Placement3d)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaAxis2Placement3d,StepGeom_Axis2Placement3d)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.cxx b/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.cxx
index 1bce6f2ff9..01daf4717c 100644
--- a/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.cxx
+++ b/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepElement_CurveElementSectionDefinition.hxx>
 #include <StepFEA_FeaCurveSectionGeometricRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaCurveSectionGeometricRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_FeaCurveSectionGeometricRelationship
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.hxx b/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.hxx
index 4bb8b38cfb..745addabd5 100644
--- a/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.hxx
+++ b/src/StepFEA/StepFEA_FeaCurveSectionGeometricRelationship.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaCurveSectionGeometricRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaCurveSectionGeometricRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaGroup.cxx b/src/StepFEA/StepFEA_FeaGroup.cxx
index 9896f42e10..9aa28e2cac 100644
--- a/src/StepFEA/StepFEA_FeaGroup.cxx
+++ b/src/StepFEA/StepFEA_FeaGroup.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_FeaModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaGroup,StepBasic_Group)
+
 //=======================================================================
 //function : StepFEA_FeaGroup
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaGroup.hxx b/src/StepFEA/StepFEA_FeaGroup.hxx
index ff3ad87f6f..189a0280e4 100644
--- a/src/StepFEA/StepFEA_FeaGroup.hxx
+++ b/src/StepFEA/StepFEA_FeaGroup.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaGroup,StepBasic_Group)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaGroup,StepBasic_Group)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaLinearElasticity.cxx b/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
index 9369f62d0c..b301d93bab 100644
--- a/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
+++ b/src/StepFEA/StepFEA_FeaLinearElasticity.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor43d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaLinearElasticity,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaLinearElasticity
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaLinearElasticity.hxx b/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
index 05dc57f54b..91b9176c35 100644
--- a/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
+++ b/src/StepFEA/StepFEA_FeaLinearElasticity.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaLinearElasticity,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaLinearElasticity,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaMassDensity.cxx b/src/StepFEA/StepFEA_FeaMassDensity.cxx
index 50b76b9a1a..b76ee9d3bd 100644
--- a/src/StepFEA/StepFEA_FeaMassDensity.cxx
+++ b/src/StepFEA/StepFEA_FeaMassDensity.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_FeaMassDensity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaMassDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaMassDensity
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaMassDensity.hxx b/src/StepFEA/StepFEA_FeaMassDensity.hxx
index cafe042238..1127a580c3 100644
--- a/src/StepFEA/StepFEA_FeaMassDensity.hxx
+++ b/src/StepFEA/StepFEA_FeaMassDensity.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaMassDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaMassDensity,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
index 9effa28b8b..dff4a25b25 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaMaterialPropertyRepresentation,StepRepr_MaterialPropertyRepresentation)
+
 //=======================================================================
 //function : StepFEA_FeaMaterialPropertyRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
index bd6b3733a3..d73ca3c14c 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaMaterialPropertyRepresentation,StepRepr_MaterialPropertyRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaMaterialPropertyRepresentation,StepRepr_MaterialPropertyRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.cxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.cxx
index b6cbe187be..ccda517fb8 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.cxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FeaMaterialPropertyRepresentationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaMaterialPropertyRepresentationItem,StepRepr_RepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaMaterialPropertyRepresentationItem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.hxx b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.hxx
index 70eebdd54a..1ed4a94017 100644
--- a/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.hxx
+++ b/src/StepFEA/StepFEA_FeaMaterialPropertyRepresentationItem.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaMaterialPropertyRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaMaterialPropertyRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaModel.cxx b/src/StepFEA/StepFEA_FeaModel.cxx
index 65c40904c2..8bfad2ea5a 100644
--- a/src/StepFEA/StepFEA_FeaModel.cxx
+++ b/src/StepFEA/StepFEA_FeaModel.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaModel,StepRepr_Representation)
+
 //=======================================================================
 //function : StepFEA_FeaModel
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaModel.hxx b/src/StepFEA/StepFEA_FeaModel.hxx
index d67b547369..66b0efcad1 100644
--- a/src/StepFEA/StepFEA_FeaModel.hxx
+++ b/src/StepFEA/StepFEA_FeaModel.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaModel,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaModel,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaModel3d.cxx b/src/StepFEA/StepFEA_FeaModel3d.cxx
index 1a6ec37221..10851fb24d 100644
--- a/src/StepFEA/StepFEA_FeaModel3d.cxx
+++ b/src/StepFEA/StepFEA_FeaModel3d.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FeaModel3d.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaModel3d,StepFEA_FeaModel)
+
 //=======================================================================
 //function : StepFEA_FeaModel3d
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaModel3d.hxx b/src/StepFEA/StepFEA_FeaModel3d.hxx
index 565082d389..66916c8185 100644
--- a/src/StepFEA/StepFEA_FeaModel3d.hxx
+++ b/src/StepFEA/StepFEA_FeaModel3d.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaModel3d,StepFEA_FeaModel)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaModel3d,StepFEA_FeaModel)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaModelDefinition.cxx b/src/StepFEA/StepFEA_FeaModelDefinition.cxx
index ae7ababc5d..a049493495 100644
--- a/src/StepFEA/StepFEA_FeaModelDefinition.cxx
+++ b/src/StepFEA/StepFEA_FeaModelDefinition.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FeaModelDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaModelDefinition,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepFEA_FeaModelDefinition
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaModelDefinition.hxx b/src/StepFEA/StepFEA_FeaModelDefinition.hxx
index 738b148d6c..4091416486 100644
--- a/src/StepFEA/StepFEA_FeaModelDefinition.hxx
+++ b/src/StepFEA/StepFEA_FeaModelDefinition.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaModelDefinition,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaModelDefinition,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx b/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
index 828e89bddd..c92a21d043 100644
--- a/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
+++ b/src/StepFEA/StepFEA_FeaMoistureAbsorption.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaMoistureAbsorption,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaMoistureAbsorption
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx b/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
index 25dfc60bd0..7e192a3faa 100644
--- a/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
+++ b/src/StepFEA/StepFEA_FeaMoistureAbsorption.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaMoistureAbsorption,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaMoistureAbsorption,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaParametricPoint.cxx b/src/StepFEA/StepFEA_FeaParametricPoint.cxx
index dd4ad37e90..f9d7925298 100644
--- a/src/StepFEA/StepFEA_FeaParametricPoint.cxx
+++ b/src/StepFEA/StepFEA_FeaParametricPoint.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_FeaParametricPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaParametricPoint,StepGeom_Point)
+
 //=======================================================================
 //function : StepFEA_FeaParametricPoint
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaParametricPoint.hxx b/src/StepFEA/StepFEA_FeaParametricPoint.hxx
index b56e3ce56b..cd6d6430f2 100644
--- a/src/StepFEA/StepFEA_FeaParametricPoint.hxx
+++ b/src/StepFEA/StepFEA_FeaParametricPoint.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaParametricPoint,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaParametricPoint,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaRepresentationItem.cxx b/src/StepFEA/StepFEA_FeaRepresentationItem.cxx
index 19f1c1569e..2a44e9ca32 100644
--- a/src/StepFEA/StepFEA_FeaRepresentationItem.cxx
+++ b/src/StepFEA/StepFEA_FeaRepresentationItem.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FeaRepresentationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaRepresentationItem,StepRepr_RepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaRepresentationItem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaRepresentationItem.hxx b/src/StepFEA/StepFEA_FeaRepresentationItem.hxx
index a21e2b77b4..be5a1fa65d 100644
--- a/src/StepFEA/StepFEA_FeaRepresentationItem.hxx
+++ b/src/StepFEA/StepFEA_FeaRepresentationItem.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
index d7be0917a0..ff5e857619 100644
--- a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
+++ b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaSecantCoefficientOfLinearThermalExpansion
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
index 1d9f573313..1aa5111bb1 100644
--- a/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
+++ b/src/StepFEA/StepFEA_FeaSecantCoefficientOfLinearThermalExpansion.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaSecantCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx b/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
index aba0d91158..38d34eef98 100644
--- a/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellBendingStiffness.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaShellBendingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaShellBendingStiffness
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx b/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
index 3ec496ef52..2aba0ad712 100644
--- a/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellBendingStiffness.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaShellBendingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaShellBendingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
index d47eb25518..0e32b65bc2 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaShellMembraneBendingCouplingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaShellMembraneBendingCouplingStiffness
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
index b82c0c243f..d52354d6b1 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneBendingCouplingStiffness.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaShellMembraneBendingCouplingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaShellMembraneBendingCouplingStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
index c99c6caf7e..5827f59bd5 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor42d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaShellMembraneStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaShellMembraneStiffness
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
index df45725aab..b66a4da1ea 100644
--- a/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellMembraneStiffness.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaShellMembraneStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaShellMembraneStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx b/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
index b35624581c..39449923d9 100644
--- a/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
+++ b/src/StepFEA/StepFEA_FeaShellShearStiffness.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor22d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaShellShearStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaShellShearStiffness
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx b/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
index 16570fdead..80be3ab24d 100644
--- a/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
+++ b/src/StepFEA/StepFEA_FeaShellShearStiffness.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaShellShearStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaShellShearStiffness,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
index 0a34a86330..5ddd2bfb72 100644
--- a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
+++ b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepElement_SurfaceSection.hxx>
 #include <StepFEA_FeaSurfaceSectionGeometricRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaSurfaceSectionGeometricRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_FeaSurfaceSectionGeometricRelationship
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.hxx b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.hxx
index 25ad2e5dda..2c7b7e96fb 100644
--- a/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.hxx
+++ b/src/StepFEA/StepFEA_FeaSurfaceSectionGeometricRelationship.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaSurfaceSectionGeometricRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaSurfaceSectionGeometricRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
index 0e926e869e..64140ac5d1 100644
--- a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
+++ b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_SymmetricTensor23d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
index 73bc10d408..f8a9d4212b 100644
--- a/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
+++ b/src/StepFEA/StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FeaTangentialCoefficientOfLinearThermalExpansion,StepFEA_FeaMaterialPropertyRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx b/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
index 1cc5514831..667103232e 100644
--- a/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
+++ b/src/StepFEA/StepFEA_FreedomAndCoefficient.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_DegreeOfFreedom.hxx>
 #include <StepFEA_FreedomAndCoefficient.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FreedomAndCoefficient,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_FreedomAndCoefficient
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx b/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
index 0a539e50c6..60add271e4 100644
--- a/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
+++ b/src/StepFEA/StepFEA_FreedomAndCoefficient.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FreedomAndCoefficient,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FreedomAndCoefficient,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_FreedomsList.cxx b/src/StepFEA/StepFEA_FreedomsList.cxx
index 9527602048..ee9ae16518 100644
--- a/src/StepFEA/StepFEA_FreedomsList.cxx
+++ b/src/StepFEA/StepFEA_FreedomsList.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_FreedomsList.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_FreedomsList,MMgt_TShared)
+
 //=======================================================================
 //function : StepFEA_FreedomsList
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_FreedomsList.hxx b/src/StepFEA/StepFEA_FreedomsList.hxx
index d41be79bec..9b39dcd08e 100644
--- a/src/StepFEA/StepFEA_FreedomsList.hxx
+++ b/src/StepFEA/StepFEA_FreedomsList.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_FreedomsList,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_FreedomsList,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_GeometricNode.cxx b/src/StepFEA/StepFEA_GeometricNode.cxx
index 97775a4f74..75326c1e0e 100644
--- a/src/StepFEA/StepFEA_GeometricNode.cxx
+++ b/src/StepFEA/StepFEA_GeometricNode.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_GeometricNode.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_GeometricNode,StepFEA_NodeRepresentation)
+
 //=======================================================================
 //function : StepFEA_GeometricNode
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_GeometricNode.hxx b/src/StepFEA/StepFEA_GeometricNode.hxx
index 78c79260b9..8a19224cb8 100644
--- a/src/StepFEA/StepFEA_GeometricNode.hxx
+++ b/src/StepFEA/StepFEA_GeometricNode.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_GeometricNode,StepFEA_NodeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_GeometricNode,StepFEA_NodeRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_Node.cxx b/src/StepFEA/StepFEA_Node.cxx
index 5e36dc45f3..af9419f561 100644
--- a/src/StepFEA/StepFEA_Node.cxx
+++ b/src/StepFEA/StepFEA_Node.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_Node.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_Node,StepFEA_NodeRepresentation)
+
 //=======================================================================
 //function : StepFEA_Node
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_Node.hxx b/src/StepFEA/StepFEA_Node.hxx
index a536d9e5ed..2498bef4ae 100644
--- a/src/StepFEA/StepFEA_Node.hxx
+++ b/src/StepFEA/StepFEA_Node.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_Node,StepFEA_NodeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_Node,StepFEA_NodeRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeDefinition.cxx b/src/StepFEA/StepFEA_NodeDefinition.cxx
index d031aa25e0..7dab2cfb5d 100644
--- a/src/StepFEA/StepFEA_NodeDefinition.cxx
+++ b/src/StepFEA/StepFEA_NodeDefinition.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_NodeDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeDefinition,StepRepr_ShapeAspect)
+
 //=======================================================================
 //function : StepFEA_NodeDefinition
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeDefinition.hxx b/src/StepFEA/StepFEA_NodeDefinition.hxx
index 2bffc0528a..44da0acea0 100644
--- a/src/StepFEA/StepFEA_NodeDefinition.hxx
+++ b/src/StepFEA/StepFEA_NodeDefinition.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeDefinition,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeDefinition,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeGroup.cxx b/src/StepFEA/StepFEA_NodeGroup.cxx
index 96d01a2210..dabcafcf16 100644
--- a/src/StepFEA/StepFEA_NodeGroup.cxx
+++ b/src/StepFEA/StepFEA_NodeGroup.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_NodeGroup.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeGroup,StepFEA_FeaGroup)
+
 //=======================================================================
 //function : StepFEA_NodeGroup
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeGroup.hxx b/src/StepFEA/StepFEA_NodeGroup.hxx
index 619a01b0eb..73e3d71db9 100644
--- a/src/StepFEA/StepFEA_NodeGroup.hxx
+++ b/src/StepFEA/StepFEA_NodeGroup.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeGroup,StepFEA_FeaGroup)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeGroup,StepFEA_FeaGroup)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeRepresentation.cxx b/src/StepFEA/StepFEA_NodeRepresentation.cxx
index d1779205d4..b8062fa8b3 100644
--- a/src/StepFEA/StepFEA_NodeRepresentation.cxx
+++ b/src/StepFEA/StepFEA_NodeRepresentation.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeRepresentation,StepRepr_Representation)
+
 //=======================================================================
 //function : StepFEA_NodeRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeRepresentation.hxx b/src/StepFEA/StepFEA_NodeRepresentation.hxx
index 7f2bee26ec..6a1c598cf1 100644
--- a/src/StepFEA/StepFEA_NodeRepresentation.hxx
+++ b/src/StepFEA/StepFEA_NodeRepresentation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeSet.cxx b/src/StepFEA/StepFEA_NodeSet.cxx
index bcaea92753..7ebff82b8d 100644
--- a/src/StepFEA/StepFEA_NodeSet.cxx
+++ b/src/StepFEA/StepFEA_NodeSet.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_NodeSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeSet,StepGeom_GeometricRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_NodeSet
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeSet.hxx b/src/StepFEA/StepFEA_NodeSet.hxx
index af0144debc..568ae89c37 100644
--- a/src/StepFEA/StepFEA_NodeSet.hxx
+++ b/src/StepFEA/StepFEA_NodeSet.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeSet,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeSet,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.cxx b/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.cxx
index 833ae4916e..16a3beba32 100644
--- a/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_NodeWithSolutionCoordinateSystem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeWithSolutionCoordinateSystem,StepFEA_Node)
+
 //=======================================================================
 //function : StepFEA_NodeWithSolutionCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.hxx b/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.hxx
index a06b1f6ebc..56494a79c6 100644
--- a/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_NodeWithSolutionCoordinateSystem.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeWithSolutionCoordinateSystem,StepFEA_Node)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeWithSolutionCoordinateSystem,StepFEA_Node)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_NodeWithVector.cxx b/src/StepFEA/StepFEA_NodeWithVector.cxx
index 96ebae05ce..4ea97412d3 100644
--- a/src/StepFEA/StepFEA_NodeWithVector.cxx
+++ b/src/StepFEA/StepFEA_NodeWithVector.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepFEA_NodeWithVector.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_NodeWithVector,StepFEA_Node)
+
 //=======================================================================
 //function : StepFEA_NodeWithVector
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_NodeWithVector.hxx b/src/StepFEA/StepFEA_NodeWithVector.hxx
index 8ac140086a..ef2642d299 100644
--- a/src/StepFEA/StepFEA_NodeWithVector.hxx
+++ b/src/StepFEA/StepFEA_NodeWithVector.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_NodeWithVector,StepFEA_Node)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_NodeWithVector,StepFEA_Node)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
index e822785c0d..303b0ac10f 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.cxx
@@ -20,6 +20,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ParametricCurve3dElementCoordinateDirection,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_ParametricCurve3dElementCoordinateDirection
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.hxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.hxx
index a9353ed940..87699ceb23 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.hxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateDirection.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ParametricCurve3dElementCoordinateDirection,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ParametricCurve3dElementCoordinateDirection,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
index 13e1394624..d164663e62 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.cxx
@@ -20,6 +20,8 @@
 #include <StepFEA_ParametricCurve3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ParametricCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_ParametricCurve3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.hxx
index d800d4bae3..fd21c5379c 100644
--- a/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_ParametricCurve3dElementCoordinateSystem.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ParametricCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ParametricCurve3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
index 3c0236a09a..863d50a02f 100644
--- a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
+++ b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_ParametricSurface3dElementCoordinateSystem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_ParametricSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+
 //=======================================================================
 //function : StepFEA_ParametricSurface3dElementCoordinateSystem
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.hxx b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.hxx
index 8584d16fd3..0b284d0efa 100644
--- a/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.hxx
+++ b/src/StepFEA/StepFEA_ParametricSurface3dElementCoordinateSystem.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_ParametricSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_ParametricSurface3dElementCoordinateSystem,StepFEA_FeaRepresentationItem)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
index f78de79d00..7a3117b033 100644
--- a/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Surface3dElementRepresentation.cxx
@@ -24,6 +24,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_Surface3dElementRepresentation,StepFEA_ElementRepresentation)
+
 //=======================================================================
 //function : StepFEA_Surface3dElementRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_Surface3dElementRepresentation.hxx b/src/StepFEA/StepFEA_Surface3dElementRepresentation.hxx
index a704a75351..b5417c54a5 100644
--- a/src/StepFEA/StepFEA_Surface3dElementRepresentation.hxx
+++ b/src/StepFEA/StepFEA_Surface3dElementRepresentation.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_Surface3dElementRepresentation,StepFEA_ElementRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_Surface3dElementRepresentation,StepFEA_ElementRepresentation)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx b/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
index eabafc46fe..897f092be3 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor23dMember.cxx
@@ -19,6 +19,8 @@
 #include <StepFEA_SymmetricTensor23dMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_SymmetricTensor23dMember,StepData_SelectArrReal)
+
 static Standard_CString IST = "ISOTROPIC_SYMMETRIC_TENSOR2_3D";
 static Standard_CString OST = "ORTHOTROPIC_SYMMETRIC_TENSOR2_3D";
 static Standard_CString AST = "ANISOTROPIC_SYMMETRIC_TENSOR2_3D";
diff --git a/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx b/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
index ea42759f89..9f55b8ab14 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor23dMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_SymmetricTensor23dMember,StepData_SelectArrReal)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_SymmetricTensor23dMember,StepData_SelectArrReal)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx b/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
index d80860824b..cbfa9ed78c 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor43dMember.cxx
@@ -16,6 +16,8 @@
 #include <StepFEA_SymmetricTensor43dMember.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_SymmetricTensor43dMember,StepData_SelectArrReal)
+
 static Standard_CString AST = "ANISOTROPIC_SYMMETRIC_TENSOR4_3D";
 static Standard_CString IST = "FEA_ISOTROPIC_SYMMETRIC_TENSOR4_3D";
 static Standard_CString IOST = "FEA_ISO_ORTHOTROPIC_SYMMETRIC_TENSOR4_3D";
diff --git a/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx b/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
index 02d1a85305..69c4a4a13d 100644
--- a/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
+++ b/src/StepFEA/StepFEA_SymmetricTensor43dMember.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_SymmetricTensor43dMember,StepData_SelectArrReal)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_SymmetricTensor43dMember,StepData_SelectArrReal)
 
 protected:
 
diff --git a/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx b/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
index be129df06f..05c2cd00b4 100644
--- a/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
+++ b/src/StepFEA/StepFEA_Volume3dElementRepresentation.cxx
@@ -23,6 +23,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepFEA_Volume3dElementRepresentation,StepFEA_ElementRepresentation)
+
 //=======================================================================
 //function : StepFEA_Volume3dElementRepresentation
 //purpose  : 
diff --git a/src/StepFEA/StepFEA_Volume3dElementRepresentation.hxx b/src/StepFEA/StepFEA_Volume3dElementRepresentation.hxx
index 1b354332e2..4c19a6521c 100644
--- a/src/StepFEA/StepFEA_Volume3dElementRepresentation.hxx
+++ b/src/StepFEA/StepFEA_Volume3dElementRepresentation.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepFEA_Volume3dElementRepresentation,StepFEA_ElementRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepFEA_Volume3dElementRepresentation,StepFEA_ElementRepresentation)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Axis1Placement.cxx b/src/StepGeom/StepGeom_Axis1Placement.cxx
index ec46087611..aadfd21228 100644
--- a/src/StepGeom/StepGeom_Axis1Placement.cxx
+++ b/src/StepGeom/StepGeom_Axis1Placement.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Axis1Placement,StepGeom_Placement)
+
 StepGeom_Axis1Placement::StepGeom_Axis1Placement ()  {}
 
 void StepGeom_Axis1Placement::Init(
diff --git a/src/StepGeom/StepGeom_Axis1Placement.hxx b/src/StepGeom/StepGeom_Axis1Placement.hxx
index 72a06ec377..0b7c32736b 100644
--- a/src/StepGeom/StepGeom_Axis1Placement.hxx
+++ b/src/StepGeom/StepGeom_Axis1Placement.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Axis1Placement,StepGeom_Placement)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Axis1Placement,StepGeom_Placement)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Axis2Placement2d.cxx b/src/StepGeom/StepGeom_Axis2Placement2d.cxx
index 3d359eebc6..0b5a732602 100644
--- a/src/StepGeom/StepGeom_Axis2Placement2d.cxx
+++ b/src/StepGeom/StepGeom_Axis2Placement2d.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Axis2Placement2d,StepGeom_Placement)
+
 StepGeom_Axis2Placement2d::StepGeom_Axis2Placement2d ()  {}
 
 void StepGeom_Axis2Placement2d::Init(
diff --git a/src/StepGeom/StepGeom_Axis2Placement2d.hxx b/src/StepGeom/StepGeom_Axis2Placement2d.hxx
index e560021422..444209319e 100644
--- a/src/StepGeom/StepGeom_Axis2Placement2d.hxx
+++ b/src/StepGeom/StepGeom_Axis2Placement2d.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Axis2Placement2d,StepGeom_Placement)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Axis2Placement2d,StepGeom_Placement)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Axis2Placement3d.cxx b/src/StepGeom/StepGeom_Axis2Placement3d.cxx
index ae805262a9..15b9ff8901 100644
--- a/src/StepGeom/StepGeom_Axis2Placement3d.cxx
+++ b/src/StepGeom/StepGeom_Axis2Placement3d.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Axis2Placement3d,StepGeom_Placement)
+
 StepGeom_Axis2Placement3d::StepGeom_Axis2Placement3d ()  {}
 
 void StepGeom_Axis2Placement3d::Init(
diff --git a/src/StepGeom/StepGeom_Axis2Placement3d.hxx b/src/StepGeom/StepGeom_Axis2Placement3d.hxx
index cf807c5c81..878e721af8 100644
--- a/src/StepGeom/StepGeom_Axis2Placement3d.hxx
+++ b/src/StepGeom/StepGeom_Axis2Placement3d.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Axis2Placement3d,StepGeom_Placement)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Axis2Placement3d,StepGeom_Placement)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineCurve.cxx b/src/StepGeom/StepGeom_BSplineCurve.cxx
index 8140519936..c4e24c801b 100644
--- a/src/StepGeom/StepGeom_BSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_BSplineCurve.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_CartesianPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineCurve,StepGeom_BoundedCurve)
+
 StepGeom_BSplineCurve::StepGeom_BSplineCurve ()  {}
 
 void StepGeom_BSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_BSplineCurve.hxx b/src/StepGeom/StepGeom_BSplineCurve.hxx
index a2c8f4d88c..a1543b5eb0 100644
--- a/src/StepGeom/StepGeom_BSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_BSplineCurve.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineCurve,StepGeom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineCurve,StepGeom_BoundedCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
index f7a3674ded..bbf4617b08 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_BSplineCurveWithKnots.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineCurveWithKnots,StepGeom_BSplineCurve)
+
 StepGeom_BSplineCurveWithKnots::StepGeom_BSplineCurveWithKnots ()  {}
 
 void StepGeom_BSplineCurveWithKnots::Init(
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx b/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
index a229ec4c98..a1a6334544 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnots.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineCurveWithKnots,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineCurveWithKnots,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cxx b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cxx
index 30830ef907..e13665c965 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve,StepGeom_BSplineCurve)
+
 StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve::StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve ()  {}
 
 void StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
index 1b696f1c2d..1f71b9032d 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineSurface.cxx b/src/StepGeom/StepGeom_BSplineSurface.cxx
index 3832eebd27..7dd47b9fee 100644
--- a/src/StepGeom/StepGeom_BSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_BSplineSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_CartesianPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineSurface,StepGeom_BoundedSurface)
+
 StepGeom_BSplineSurface::StepGeom_BSplineSurface ()  {}
 
 void StepGeom_BSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_BSplineSurface.hxx b/src/StepGeom/StepGeom_BSplineSurface.hxx
index 6831965ab1..2050f06d65 100644
--- a/src/StepGeom/StepGeom_BSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_BSplineSurface.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineSurface,StepGeom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineSurface,StepGeom_BoundedSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
index ba079ee022..c6f645d2ae 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_BSplineSurfaceWithKnots.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineSurfaceWithKnots,StepGeom_BSplineSurface)
+
 StepGeom_BSplineSurfaceWithKnots::StepGeom_BSplineSurfaceWithKnots ()  {}
 
 void StepGeom_BSplineSurfaceWithKnots::Init(
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
index c266476838..ee8754d000 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineSurfaceWithKnots,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineSurfaceWithKnots,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
index 3c23177c00..81299b1b38 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface,StepGeom_BSplineSurface)
+
 StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface::StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface ()  {}
 
 void StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
index eedef6d416..c036fb54ca 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.hxx
@@ -111,7 +111,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BezierCurve.cxx b/src/StepGeom/StepGeom_BezierCurve.cxx
index 4dd31fd17b..d0e7892280 100644
--- a/src/StepGeom/StepGeom_BezierCurve.cxx
+++ b/src/StepGeom/StepGeom_BezierCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_BezierCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BezierCurve,StepGeom_BSplineCurve)
+
 StepGeom_BezierCurve::StepGeom_BezierCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_BezierCurve.hxx b/src/StepGeom/StepGeom_BezierCurve.hxx
index 622a326bcd..f9dfa30d59 100644
--- a/src/StepGeom/StepGeom_BezierCurve.hxx
+++ b/src/StepGeom/StepGeom_BezierCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BezierCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BezierCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cxx b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cxx
index c1ad3f6691..61c2315820 100644
--- a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BezierCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+
 StepGeom_BezierCurveAndRationalBSplineCurve::StepGeom_BezierCurveAndRationalBSplineCurve ()  {}
 
 void StepGeom_BezierCurveAndRationalBSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
index 1331cef1cf..6d82bca44a 100644
--- a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BezierCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BezierCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BezierSurface.cxx b/src/StepGeom/StepGeom_BezierSurface.cxx
index 056f804565..b71952efda 100644
--- a/src/StepGeom/StepGeom_BezierSurface.cxx
+++ b/src/StepGeom/StepGeom_BezierSurface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_BezierSurface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BezierSurface,StepGeom_BSplineSurface)
+
 StepGeom_BezierSurface::StepGeom_BezierSurface ()  {}
 
diff --git a/src/StepGeom/StepGeom_BezierSurface.hxx b/src/StepGeom/StepGeom_BezierSurface.hxx
index 777a95e94d..58130c7121 100644
--- a/src/StepGeom/StepGeom_BezierSurface.hxx
+++ b/src/StepGeom/StepGeom_BezierSurface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BezierSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BezierSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cxx b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cxx
index deaff66094..86e8a4fc60 100644
--- a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BezierSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+
 StepGeom_BezierSurfaceAndRationalBSplineSurface::StepGeom_BezierSurfaceAndRationalBSplineSurface ()  {}
 
 void StepGeom_BezierSurfaceAndRationalBSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
index d768ed42ed..e83b8a3c0a 100644
--- a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BezierSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BezierSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BoundaryCurve.cxx b/src/StepGeom/StepGeom_BoundaryCurve.cxx
index d5c93b1dfd..a5cb5323b7 100644
--- a/src/StepGeom/StepGeom_BoundaryCurve.cxx
+++ b/src/StepGeom/StepGeom_BoundaryCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_BoundaryCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BoundaryCurve,StepGeom_CompositeCurveOnSurface)
+
 StepGeom_BoundaryCurve::StepGeom_BoundaryCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_BoundaryCurve.hxx b/src/StepGeom/StepGeom_BoundaryCurve.hxx
index 7dac2e75b6..c73381ffe8 100644
--- a/src/StepGeom/StepGeom_BoundaryCurve.hxx
+++ b/src/StepGeom/StepGeom_BoundaryCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BoundaryCurve,StepGeom_CompositeCurveOnSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BoundaryCurve,StepGeom_CompositeCurveOnSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BoundedCurve.cxx b/src/StepGeom/StepGeom_BoundedCurve.cxx
index 28fcc8896b..11804d367a 100644
--- a/src/StepGeom/StepGeom_BoundedCurve.cxx
+++ b/src/StepGeom/StepGeom_BoundedCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_BoundedCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BoundedCurve,StepGeom_Curve)
+
 StepGeom_BoundedCurve::StepGeom_BoundedCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_BoundedCurve.hxx b/src/StepGeom/StepGeom_BoundedCurve.hxx
index ef2ea67f2d..aabaabc1d2 100644
--- a/src/StepGeom/StepGeom_BoundedCurve.hxx
+++ b/src/StepGeom/StepGeom_BoundedCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BoundedCurve,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BoundedCurve,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_BoundedSurface.cxx b/src/StepGeom/StepGeom_BoundedSurface.cxx
index 12d10afdd2..6c0a0c2b1b 100644
--- a/src/StepGeom/StepGeom_BoundedSurface.cxx
+++ b/src/StepGeom/StepGeom_BoundedSurface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_BoundedSurface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_BoundedSurface,StepGeom_Surface)
+
 StepGeom_BoundedSurface::StepGeom_BoundedSurface ()  {}
 
diff --git a/src/StepGeom/StepGeom_BoundedSurface.hxx b/src/StepGeom/StepGeom_BoundedSurface.hxx
index b10e903833..e9adbf31ca 100644
--- a/src/StepGeom/StepGeom_BoundedSurface.hxx
+++ b/src/StepGeom/StepGeom_BoundedSurface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_BoundedSurface,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_BoundedSurface,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CartesianPoint.cxx b/src/StepGeom/StepGeom_CartesianPoint.cxx
index 0d701fb05c..bef9ba7924 100644
--- a/src/StepGeom/StepGeom_CartesianPoint.cxx
+++ b/src/StepGeom/StepGeom_CartesianPoint.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_CartesianPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CartesianPoint,StepGeom_Point)
+
 StepGeom_CartesianPoint::StepGeom_CartesianPoint ()  {}
 
 void StepGeom_CartesianPoint::Init(
diff --git a/src/StepGeom/StepGeom_CartesianPoint.hxx b/src/StepGeom/StepGeom_CartesianPoint.hxx
index 7dfed78544..0df662d410 100644
--- a/src/StepGeom/StepGeom_CartesianPoint.hxx
+++ b/src/StepGeom/StepGeom_CartesianPoint.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CartesianPoint,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CartesianPoint,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx b/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
index 347e8dac10..71ace259a3 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator,StepGeom_GeometricRepresentationItem)
+
 StepGeom_CartesianTransformationOperator::StepGeom_CartesianTransformationOperator ()  {}
 
 void StepGeom_CartesianTransformationOperator::Init(
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx b/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
index d143059607..b00b8970fb 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CartesianTransformationOperator,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cxx b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cxx
index 1d27a19993..81783cf63f 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_CartesianTransformationOperator2d.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator2d,StepGeom_CartesianTransformationOperator)
+
 StepGeom_CartesianTransformationOperator2d::StepGeom_CartesianTransformationOperator2d  ()    {  }
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.hxx b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.hxx
index 0607355796..0f8a322fe3 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.hxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CartesianTransformationOperator2d,StepGeom_CartesianTransformationOperator)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator2d,StepGeom_CartesianTransformationOperator)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
index 55ab044fff..224c9afdb4 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator3d,StepGeom_CartesianTransformationOperator)
+
 StepGeom_CartesianTransformationOperator3d::StepGeom_CartesianTransformationOperator3d ()  {}
 
 void StepGeom_CartesianTransformationOperator3d::Init(
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
index 1dc751ec34..66336bbdc5 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CartesianTransformationOperator3d,StepGeom_CartesianTransformationOperator)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CartesianTransformationOperator3d,StepGeom_CartesianTransformationOperator)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Circle.cxx b/src/StepGeom/StepGeom_Circle.cxx
index 7e01d8836a..460ed4af1f 100644
--- a/src/StepGeom/StepGeom_Circle.cxx
+++ b/src/StepGeom/StepGeom_Circle.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Circle.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Circle,StepGeom_Conic)
+
 StepGeom_Circle::StepGeom_Circle ()  {}
 
 void StepGeom_Circle::Init(
diff --git a/src/StepGeom/StepGeom_Circle.hxx b/src/StepGeom/StepGeom_Circle.hxx
index 3a20516f81..78ccced7c5 100644
--- a/src/StepGeom/StepGeom_Circle.hxx
+++ b/src/StepGeom/StepGeom_Circle.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Circle,StepGeom_Conic)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Circle,StepGeom_Conic)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CompositeCurve.cxx b/src/StepGeom/StepGeom_CompositeCurve.cxx
index b78e80ebb2..8647dae677 100644
--- a/src/StepGeom/StepGeom_CompositeCurve.cxx
+++ b/src/StepGeom/StepGeom_CompositeCurve.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_CompositeCurveSegment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CompositeCurve,StepGeom_BoundedCurve)
+
 StepGeom_CompositeCurve::StepGeom_CompositeCurve ()  {}
 
 void StepGeom_CompositeCurve::Init(
diff --git a/src/StepGeom/StepGeom_CompositeCurve.hxx b/src/StepGeom/StepGeom_CompositeCurve.hxx
index 3321f3c791..57cc5f4cbc 100644
--- a/src/StepGeom/StepGeom_CompositeCurve.hxx
+++ b/src/StepGeom/StepGeom_CompositeCurve.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CompositeCurve,StepGeom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CompositeCurve,StepGeom_BoundedCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CompositeCurveOnSurface.cxx b/src/StepGeom/StepGeom_CompositeCurveOnSurface.cxx
index 3c3f56d2e1..2d5d1fbfb2 100644
--- a/src/StepGeom/StepGeom_CompositeCurveOnSurface.cxx
+++ b/src/StepGeom/StepGeom_CompositeCurveOnSurface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_CompositeCurveOnSurface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CompositeCurveOnSurface,StepGeom_CompositeCurve)
+
 StepGeom_CompositeCurveOnSurface::StepGeom_CompositeCurveOnSurface ()  {}
 
diff --git a/src/StepGeom/StepGeom_CompositeCurveOnSurface.hxx b/src/StepGeom/StepGeom_CompositeCurveOnSurface.hxx
index 715c3a997e..a4da60120e 100644
--- a/src/StepGeom/StepGeom_CompositeCurveOnSurface.hxx
+++ b/src/StepGeom/StepGeom_CompositeCurveOnSurface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CompositeCurveOnSurface,StepGeom_CompositeCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CompositeCurveOnSurface,StepGeom_CompositeCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CompositeCurveSegment.cxx b/src/StepGeom/StepGeom_CompositeCurveSegment.cxx
index d17b3268e9..9c39965947 100644
--- a/src/StepGeom/StepGeom_CompositeCurveSegment.cxx
+++ b/src/StepGeom/StepGeom_CompositeCurveSegment.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_CompositeCurveSegment.hxx>
 #include <StepGeom_Curve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CompositeCurveSegment,MMgt_TShared)
+
 StepGeom_CompositeCurveSegment::StepGeom_CompositeCurveSegment ()  {}
 
 void StepGeom_CompositeCurveSegment::Init(
diff --git a/src/StepGeom/StepGeom_CompositeCurveSegment.hxx b/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
index 46e2ca3221..38106ccf2f 100644
--- a/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
+++ b/src/StepGeom/StepGeom_CompositeCurveSegment.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CompositeCurveSegment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CompositeCurveSegment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Conic.cxx b/src/StepGeom/StepGeom_Conic.cxx
index 5f531cbc70..f397b6a3f0 100644
--- a/src/StepGeom/StepGeom_Conic.cxx
+++ b/src/StepGeom/StepGeom_Conic.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Conic.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Conic,StepGeom_Curve)
+
 StepGeom_Conic::StepGeom_Conic ()  {}
 
 void StepGeom_Conic::Init(
diff --git a/src/StepGeom/StepGeom_Conic.hxx b/src/StepGeom/StepGeom_Conic.hxx
index 191e7076cf..8c72278e4f 100644
--- a/src/StepGeom/StepGeom_Conic.hxx
+++ b/src/StepGeom/StepGeom_Conic.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Conic,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Conic,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_ConicalSurface.cxx b/src/StepGeom/StepGeom_ConicalSurface.cxx
index 5a9d58a6fb..dc51865422 100644
--- a/src/StepGeom/StepGeom_ConicalSurface.cxx
+++ b/src/StepGeom/StepGeom_ConicalSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_ConicalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_ConicalSurface,StepGeom_ElementarySurface)
+
 StepGeom_ConicalSurface::StepGeom_ConicalSurface ()  {}
 
 void StepGeom_ConicalSurface::Init(
diff --git a/src/StepGeom/StepGeom_ConicalSurface.hxx b/src/StepGeom/StepGeom_ConicalSurface.hxx
index 1f9dddc719..06674251b6 100644
--- a/src/StepGeom/StepGeom_ConicalSurface.hxx
+++ b/src/StepGeom/StepGeom_ConicalSurface.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_ConicalSurface,StepGeom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_ConicalSurface,StepGeom_ElementarySurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Curve.cxx b/src/StepGeom/StepGeom_Curve.cxx
index d06d03dfed..db38813eb2 100644
--- a/src/StepGeom/StepGeom_Curve.cxx
+++ b/src/StepGeom/StepGeom_Curve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_Curve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Curve,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Curve::StepGeom_Curve ()  {}
 
diff --git a/src/StepGeom/StepGeom_Curve.hxx b/src/StepGeom/StepGeom_Curve.hxx
index 28b8f6a112..71c919a302 100644
--- a/src/StepGeom/StepGeom_Curve.hxx
+++ b/src/StepGeom/StepGeom_Curve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Curve,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Curve,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CurveBoundedSurface.cxx b/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
index d30c6d91c3..2b20f09786 100644
--- a/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
+++ b/src/StepGeom/StepGeom_CurveBoundedSurface.cxx
@@ -21,6 +21,8 @@
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CurveBoundedSurface,StepGeom_BoundedSurface)
+
 //=======================================================================
 //function : StepGeom_CurveBoundedSurface
 //purpose  : 
diff --git a/src/StepGeom/StepGeom_CurveBoundedSurface.hxx b/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
index 133cbb5162..5b1336c8c6 100644
--- a/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
+++ b/src/StepGeom/StepGeom_CurveBoundedSurface.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CurveBoundedSurface,StepGeom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CurveBoundedSurface,StepGeom_BoundedSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CurveReplica.cxx b/src/StepGeom/StepGeom_CurveReplica.cxx
index 77e49c7743..801c6886e2 100644
--- a/src/StepGeom/StepGeom_CurveReplica.cxx
+++ b/src/StepGeom/StepGeom_CurveReplica.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_CurveReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CurveReplica,StepGeom_Curve)
+
 StepGeom_CurveReplica::StepGeom_CurveReplica ()  {}
 
 void StepGeom_CurveReplica::Init(
diff --git a/src/StepGeom/StepGeom_CurveReplica.hxx b/src/StepGeom/StepGeom_CurveReplica.hxx
index f09e98aed2..798d1551f7 100644
--- a/src/StepGeom/StepGeom_CurveReplica.hxx
+++ b/src/StepGeom/StepGeom_CurveReplica.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CurveReplica,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CurveReplica,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_CylindricalSurface.cxx b/src/StepGeom/StepGeom_CylindricalSurface.cxx
index ecc6d88865..d60a9ab8fb 100644
--- a/src/StepGeom/StepGeom_CylindricalSurface.cxx
+++ b/src/StepGeom/StepGeom_CylindricalSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_CylindricalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_CylindricalSurface,StepGeom_ElementarySurface)
+
 StepGeom_CylindricalSurface::StepGeom_CylindricalSurface ()  {}
 
 void StepGeom_CylindricalSurface::Init(
diff --git a/src/StepGeom/StepGeom_CylindricalSurface.hxx b/src/StepGeom/StepGeom_CylindricalSurface.hxx
index a0dda584c9..50ad997c10 100644
--- a/src/StepGeom/StepGeom_CylindricalSurface.hxx
+++ b/src/StepGeom/StepGeom_CylindricalSurface.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_CylindricalSurface,StepGeom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_CylindricalSurface,StepGeom_ElementarySurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_DegeneratePcurve.cxx b/src/StepGeom/StepGeom_DegeneratePcurve.cxx
index b8e86469f5..e86a7dc8d8 100644
--- a/src/StepGeom/StepGeom_DegeneratePcurve.cxx
+++ b/src/StepGeom/StepGeom_DegeneratePcurve.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_DefinitionalRepresentation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_DegeneratePcurve,StepGeom_Point)
+
 StepGeom_DegeneratePcurve::StepGeom_DegeneratePcurve ()  {}
 
 void StepGeom_DegeneratePcurve::Init(
diff --git a/src/StepGeom/StepGeom_DegeneratePcurve.hxx b/src/StepGeom/StepGeom_DegeneratePcurve.hxx
index dbb3dd95f5..864c730e88 100644
--- a/src/StepGeom/StepGeom_DegeneratePcurve.hxx
+++ b/src/StepGeom/StepGeom_DegeneratePcurve.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_DegeneratePcurve,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_DegeneratePcurve,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
index f9714585fb..a8b65e21e1 100644
--- a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
+++ b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_DegenerateToroidalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_DegenerateToroidalSurface,StepGeom_ToroidalSurface)
+
 StepGeom_DegenerateToroidalSurface::StepGeom_DegenerateToroidalSurface ()  {}
 
 void StepGeom_DegenerateToroidalSurface::Init(
diff --git a/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx b/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
index c82d36427c..bbe29c5590 100644
--- a/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
+++ b/src/StepGeom/StepGeom_DegenerateToroidalSurface.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_DegenerateToroidalSurface,StepGeom_ToroidalSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_DegenerateToroidalSurface,StepGeom_ToroidalSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Direction.cxx b/src/StepGeom/StepGeom_Direction.cxx
index b1560c8bca..85cc1099ed 100644
--- a/src/StepGeom/StepGeom_Direction.cxx
+++ b/src/StepGeom/StepGeom_Direction.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_Direction.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Direction,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Direction::StepGeom_Direction ()  {}
 
 void StepGeom_Direction::Init(
diff --git a/src/StepGeom/StepGeom_Direction.hxx b/src/StepGeom/StepGeom_Direction.hxx
index d286443e6a..426336267b 100644
--- a/src/StepGeom/StepGeom_Direction.hxx
+++ b/src/StepGeom/StepGeom_Direction.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Direction,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Direction,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_ElementarySurface.cxx b/src/StepGeom/StepGeom_ElementarySurface.cxx
index eb9ee7ac32..7edf38e337 100644
--- a/src/StepGeom/StepGeom_ElementarySurface.cxx
+++ b/src/StepGeom/StepGeom_ElementarySurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_ElementarySurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_ElementarySurface,StepGeom_Surface)
+
 StepGeom_ElementarySurface::StepGeom_ElementarySurface ()  {}
 
 void StepGeom_ElementarySurface::Init(
diff --git a/src/StepGeom/StepGeom_ElementarySurface.hxx b/src/StepGeom/StepGeom_ElementarySurface.hxx
index 203e51d014..7f425d802f 100644
--- a/src/StepGeom/StepGeom_ElementarySurface.hxx
+++ b/src/StepGeom/StepGeom_ElementarySurface.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_ElementarySurface,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_ElementarySurface,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Ellipse.cxx b/src/StepGeom/StepGeom_Ellipse.cxx
index a4d4ea2ca9..fec59beed9 100644
--- a/src/StepGeom/StepGeom_Ellipse.cxx
+++ b/src/StepGeom/StepGeom_Ellipse.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Ellipse.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Ellipse,StepGeom_Conic)
+
 StepGeom_Ellipse::StepGeom_Ellipse ()  {}
 
 void StepGeom_Ellipse::Init(
diff --git a/src/StepGeom/StepGeom_Ellipse.hxx b/src/StepGeom/StepGeom_Ellipse.hxx
index bb9eff92e7..e40360ae3a 100644
--- a/src/StepGeom/StepGeom_Ellipse.hxx
+++ b/src/StepGeom/StepGeom_Ellipse.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Ellipse,StepGeom_Conic)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Ellipse,StepGeom_Conic)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
index db088b150e..546a435aeb 100644
--- a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
+++ b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cxx
@@ -19,6 +19,8 @@
 #include <StepRepr_DefinitionalRepresentation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_EvaluatedDegeneratePcurve,StepGeom_DegeneratePcurve)
+
 StepGeom_EvaluatedDegeneratePcurve::StepGeom_EvaluatedDegeneratePcurve ()  {}
 
 void StepGeom_EvaluatedDegeneratePcurve::Init(
diff --git a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.hxx b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.hxx
index f0bdbea7bd..a4a55eac55 100644
--- a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.hxx
+++ b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_EvaluatedDegeneratePcurve,StepGeom_DegeneratePcurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_EvaluatedDegeneratePcurve,StepGeom_DegeneratePcurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
index 53452ed0e2..02ef525084 100644
--- a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
+++ b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cxx
@@ -24,6 +24,8 @@
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx,StepRepr_RepresentationContext)
+
 // --------------------------------------------------------------------------------------------------
 // Method  :
 // Purpose :
diff --git a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
index cf73f37635..17b0523c6f 100644
--- a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
+++ b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.hxx
@@ -85,7 +85,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx b/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
index 63187b436e..44e393c2ef 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContext.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_GeometricRepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContext,StepRepr_RepresentationContext)
+
 StepGeom_GeometricRepresentationContext::StepGeom_GeometricRepresentationContext ()  {}
 
 void StepGeom_GeometricRepresentationContext::Init(
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContext.hxx b/src/StepGeom/StepGeom_GeometricRepresentationContext.hxx
index 53c97262dd..6858f145b6 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContext.hxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContext.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_GeometricRepresentationContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
index 2bc99d921e..729e6d9c0d 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cxx
@@ -19,6 +19,8 @@
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext,StepRepr_RepresentationContext)
+
 StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext::StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext ()  {}
 
 void StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext::Init(
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
index b80e154c50..1057efaad9 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cxx b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cxx
index d1b98f9c32..c455cebd73 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cxx
@@ -19,6 +19,8 @@
 #include <StepRepr_ParametricRepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext,StepRepr_RepresentationContext)
+
 StepGeom_GeometricRepresentationContextAndParametricRepresentationContext::StepGeom_GeometricRepresentationContextAndParametricRepresentationContext ()  {}
 
 void StepGeom_GeometricRepresentationContextAndParametricRepresentationContext::Init(
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.hxx b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.hxx
index 4571afca05..72dcaee035 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.hxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationContextAndParametricRepresentationContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationItem.cxx b/src/StepGeom/StepGeom_GeometricRepresentationItem.cxx
index 18a5ac44aa..4cc8c6bbd8 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationItem.cxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationItem.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_GeometricRepresentationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationItem,StepRepr_RepresentationItem)
+
 StepGeom_GeometricRepresentationItem::StepGeom_GeometricRepresentationItem ()  {}
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationItem.hxx b/src/StepGeom/StepGeom_GeometricRepresentationItem.hxx
index ca91ce7f44..290dde09d9 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationItem.hxx
+++ b/src/StepGeom/StepGeom_GeometricRepresentationItem.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_GeometricRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_GeometricRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Hyperbola.cxx b/src/StepGeom/StepGeom_Hyperbola.cxx
index 723ea0abd0..e8bed7cddd 100644
--- a/src/StepGeom/StepGeom_Hyperbola.cxx
+++ b/src/StepGeom/StepGeom_Hyperbola.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Hyperbola.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Hyperbola,StepGeom_Conic)
+
 StepGeom_Hyperbola::StepGeom_Hyperbola ()  {}
 
 void StepGeom_Hyperbola::Init(
diff --git a/src/StepGeom/StepGeom_Hyperbola.hxx b/src/StepGeom/StepGeom_Hyperbola.hxx
index bba7a25b1f..4ae2a7671c 100644
--- a/src/StepGeom/StepGeom_Hyperbola.hxx
+++ b/src/StepGeom/StepGeom_Hyperbola.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Hyperbola,StepGeom_Conic)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Hyperbola,StepGeom_Conic)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_IntersectionCurve.cxx b/src/StepGeom/StepGeom_IntersectionCurve.cxx
index e691e74a0f..fcbbe23e46 100644
--- a/src/StepGeom/StepGeom_IntersectionCurve.cxx
+++ b/src/StepGeom/StepGeom_IntersectionCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_IntersectionCurve,StepGeom_SurfaceCurve)
+
 StepGeom_IntersectionCurve::StepGeom_IntersectionCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_IntersectionCurve.hxx b/src/StepGeom/StepGeom_IntersectionCurve.hxx
index 5677227e4b..6a608bd949 100644
--- a/src/StepGeom/StepGeom_IntersectionCurve.hxx
+++ b/src/StepGeom/StepGeom_IntersectionCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_IntersectionCurve,StepGeom_SurfaceCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_IntersectionCurve,StepGeom_SurfaceCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Line.cxx b/src/StepGeom/StepGeom_Line.cxx
index ddb0d6c435..1e37c8cc74 100644
--- a/src/StepGeom/StepGeom_Line.cxx
+++ b/src/StepGeom/StepGeom_Line.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Vector.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Line,StepGeom_Curve)
+
 StepGeom_Line::StepGeom_Line ()  {}
 
 void StepGeom_Line::Init(
diff --git a/src/StepGeom/StepGeom_Line.hxx b/src/StepGeom/StepGeom_Line.hxx
index df78da5f75..892516c3a6 100644
--- a/src/StepGeom/StepGeom_Line.hxx
+++ b/src/StepGeom/StepGeom_Line.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Line,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Line,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_OffsetCurve3d.cxx b/src/StepGeom/StepGeom_OffsetCurve3d.cxx
index 01522f1e6a..93f8515be5 100644
--- a/src/StepGeom/StepGeom_OffsetCurve3d.cxx
+++ b/src/StepGeom/StepGeom_OffsetCurve3d.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_OffsetCurve3d.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_OffsetCurve3d,StepGeom_Curve)
+
 StepGeom_OffsetCurve3d::StepGeom_OffsetCurve3d ()  {}
 
 void StepGeom_OffsetCurve3d::Init(
diff --git a/src/StepGeom/StepGeom_OffsetCurve3d.hxx b/src/StepGeom/StepGeom_OffsetCurve3d.hxx
index d0d96912da..6e8ee89d34 100644
--- a/src/StepGeom/StepGeom_OffsetCurve3d.hxx
+++ b/src/StepGeom/StepGeom_OffsetCurve3d.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_OffsetCurve3d,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_OffsetCurve3d,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_OffsetSurface.cxx b/src/StepGeom/StepGeom_OffsetSurface.cxx
index af0994a1ba..6538106107 100644
--- a/src/StepGeom/StepGeom_OffsetSurface.cxx
+++ b/src/StepGeom/StepGeom_OffsetSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_OffsetSurface,StepGeom_Surface)
+
 StepGeom_OffsetSurface::StepGeom_OffsetSurface ()  {}
 
 void StepGeom_OffsetSurface::Init(
diff --git a/src/StepGeom/StepGeom_OffsetSurface.hxx b/src/StepGeom/StepGeom_OffsetSurface.hxx
index c692a54f20..71555cc590 100644
--- a/src/StepGeom/StepGeom_OffsetSurface.hxx
+++ b/src/StepGeom/StepGeom_OffsetSurface.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_OffsetSurface,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_OffsetSurface,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_OrientedSurface.cxx b/src/StepGeom/StepGeom_OrientedSurface.cxx
index d4daa7ded3..ab4b07e527 100644
--- a/src/StepGeom/StepGeom_OrientedSurface.cxx
+++ b/src/StepGeom/StepGeom_OrientedSurface.cxx
@@ -19,6 +19,8 @@
 #include <StepGeom_OrientedSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_OrientedSurface,StepGeom_Surface)
+
 //=======================================================================
 //function : StepGeom_OrientedSurface
 //purpose  : 
diff --git a/src/StepGeom/StepGeom_OrientedSurface.hxx b/src/StepGeom/StepGeom_OrientedSurface.hxx
index 5b3c383c42..0f746f501e 100644
--- a/src/StepGeom/StepGeom_OrientedSurface.hxx
+++ b/src/StepGeom/StepGeom_OrientedSurface.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_OrientedSurface,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_OrientedSurface,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_OuterBoundaryCurve.cxx b/src/StepGeom/StepGeom_OuterBoundaryCurve.cxx
index 903298008f..19d7f13fb7 100644
--- a/src/StepGeom/StepGeom_OuterBoundaryCurve.cxx
+++ b/src/StepGeom/StepGeom_OuterBoundaryCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_OuterBoundaryCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_OuterBoundaryCurve,StepGeom_BoundaryCurve)
+
 StepGeom_OuterBoundaryCurve::StepGeom_OuterBoundaryCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_OuterBoundaryCurve.hxx b/src/StepGeom/StepGeom_OuterBoundaryCurve.hxx
index 22e2a3bd58..0551d39b89 100644
--- a/src/StepGeom/StepGeom_OuterBoundaryCurve.hxx
+++ b/src/StepGeom/StepGeom_OuterBoundaryCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_OuterBoundaryCurve,StepGeom_BoundaryCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_OuterBoundaryCurve,StepGeom_BoundaryCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Parabola.cxx b/src/StepGeom/StepGeom_Parabola.cxx
index 3fafba03ef..b6c1c1896c 100644
--- a/src/StepGeom/StepGeom_Parabola.cxx
+++ b/src/StepGeom/StepGeom_Parabola.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Parabola.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Parabola,StepGeom_Conic)
+
 StepGeom_Parabola::StepGeom_Parabola ()  {}
 
 void StepGeom_Parabola::Init(
diff --git a/src/StepGeom/StepGeom_Parabola.hxx b/src/StepGeom/StepGeom_Parabola.hxx
index cbecd97261..eef4036fb0 100644
--- a/src/StepGeom/StepGeom_Parabola.hxx
+++ b/src/StepGeom/StepGeom_Parabola.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Parabola,StepGeom_Conic)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Parabola,StepGeom_Conic)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Pcurve.cxx b/src/StepGeom/StepGeom_Pcurve.cxx
index 45e1c852fa..779b429f9e 100644
--- a/src/StepGeom/StepGeom_Pcurve.cxx
+++ b/src/StepGeom/StepGeom_Pcurve.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_DefinitionalRepresentation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Pcurve,StepGeom_Curve)
+
 StepGeom_Pcurve::StepGeom_Pcurve ()  {}
 
 void StepGeom_Pcurve::Init(
diff --git a/src/StepGeom/StepGeom_Pcurve.hxx b/src/StepGeom/StepGeom_Pcurve.hxx
index f48ac04dbe..4a75bf19f8 100644
--- a/src/StepGeom/StepGeom_Pcurve.hxx
+++ b/src/StepGeom/StepGeom_Pcurve.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Pcurve,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Pcurve,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Placement.cxx b/src/StepGeom/StepGeom_Placement.cxx
index 288e2bedff..fa9aefde09 100644
--- a/src/StepGeom/StepGeom_Placement.cxx
+++ b/src/StepGeom/StepGeom_Placement.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Placement.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Placement,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Placement::StepGeom_Placement ()  {}
 
 void StepGeom_Placement::Init(
diff --git a/src/StepGeom/StepGeom_Placement.hxx b/src/StepGeom/StepGeom_Placement.hxx
index 3ac28b1542..52a5cafa70 100644
--- a/src/StepGeom/StepGeom_Placement.hxx
+++ b/src/StepGeom/StepGeom_Placement.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Placement,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Placement,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Plane.cxx b/src/StepGeom/StepGeom_Plane.cxx
index 84e2bf470b..e227b15af4 100644
--- a/src/StepGeom/StepGeom_Plane.cxx
+++ b/src/StepGeom/StepGeom_Plane.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_Plane.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Plane,StepGeom_ElementarySurface)
+
 StepGeom_Plane::StepGeom_Plane ()  {}
 
diff --git a/src/StepGeom/StepGeom_Plane.hxx b/src/StepGeom/StepGeom_Plane.hxx
index 8403e24a5c..aaab9b70bf 100644
--- a/src/StepGeom/StepGeom_Plane.hxx
+++ b/src/StepGeom/StepGeom_Plane.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Plane,StepGeom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Plane,StepGeom_ElementarySurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Point.cxx b/src/StepGeom/StepGeom_Point.cxx
index ec53e6ed95..58805f6517 100644
--- a/src/StepGeom/StepGeom_Point.cxx
+++ b/src/StepGeom/StepGeom_Point.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_Point.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Point,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Point::StepGeom_Point ()  {}
 
diff --git a/src/StepGeom/StepGeom_Point.hxx b/src/StepGeom/StepGeom_Point.hxx
index 6c912f88ca..6e518cb4ce 100644
--- a/src/StepGeom/StepGeom_Point.hxx
+++ b/src/StepGeom/StepGeom_Point.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Point,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Point,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_PointOnCurve.cxx b/src/StepGeom/StepGeom_PointOnCurve.cxx
index 2058bb5846..c4c3f2ef74 100644
--- a/src/StepGeom/StepGeom_PointOnCurve.cxx
+++ b/src/StepGeom/StepGeom_PointOnCurve.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_PointOnCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_PointOnCurve,StepGeom_Point)
+
 StepGeom_PointOnCurve::StepGeom_PointOnCurve ()  {}
 
 void StepGeom_PointOnCurve::Init(
diff --git a/src/StepGeom/StepGeom_PointOnCurve.hxx b/src/StepGeom/StepGeom_PointOnCurve.hxx
index ab7ffaa7b7..d72f1ee39e 100644
--- a/src/StepGeom/StepGeom_PointOnCurve.hxx
+++ b/src/StepGeom/StepGeom_PointOnCurve.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_PointOnCurve,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_PointOnCurve,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_PointOnSurface.cxx b/src/StepGeom/StepGeom_PointOnSurface.cxx
index 11755483c2..1fb6720610 100644
--- a/src/StepGeom/StepGeom_PointOnSurface.cxx
+++ b/src/StepGeom/StepGeom_PointOnSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_PointOnSurface,StepGeom_Point)
+
 StepGeom_PointOnSurface::StepGeom_PointOnSurface ()  {}
 
 void StepGeom_PointOnSurface::Init(
diff --git a/src/StepGeom/StepGeom_PointOnSurface.hxx b/src/StepGeom/StepGeom_PointOnSurface.hxx
index 0c29a3c521..02e509e6a2 100644
--- a/src/StepGeom/StepGeom_PointOnSurface.hxx
+++ b/src/StepGeom/StepGeom_PointOnSurface.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_PointOnSurface,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_PointOnSurface,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_PointReplica.cxx b/src/StepGeom/StepGeom_PointReplica.cxx
index a2d7c2da77..95e9a7a0eb 100644
--- a/src/StepGeom/StepGeom_PointReplica.cxx
+++ b/src/StepGeom/StepGeom_PointReplica.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_PointReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_PointReplica,StepGeom_Point)
+
 StepGeom_PointReplica::StepGeom_PointReplica ()  {}
 
 void StepGeom_PointReplica::Init(
diff --git a/src/StepGeom/StepGeom_PointReplica.hxx b/src/StepGeom/StepGeom_PointReplica.hxx
index 6f5abf518b..51603357f2 100644
--- a/src/StepGeom/StepGeom_PointReplica.hxx
+++ b/src/StepGeom/StepGeom_PointReplica.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_PointReplica,StepGeom_Point)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_PointReplica,StepGeom_Point)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Polyline.cxx b/src/StepGeom/StepGeom_Polyline.cxx
index a2207b505b..63dc941b04 100644
--- a/src/StepGeom/StepGeom_Polyline.cxx
+++ b/src/StepGeom/StepGeom_Polyline.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Polyline.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Polyline,StepGeom_BoundedCurve)
+
 StepGeom_Polyline::StepGeom_Polyline ()  {}
 
 void StepGeom_Polyline::Init(
diff --git a/src/StepGeom/StepGeom_Polyline.hxx b/src/StepGeom/StepGeom_Polyline.hxx
index 51822a9687..697720beec 100644
--- a/src/StepGeom/StepGeom_Polyline.hxx
+++ b/src/StepGeom/StepGeom_Polyline.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Polyline,StepGeom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Polyline,StepGeom_BoundedCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurve.cxx b/src/StepGeom/StepGeom_QuasiUniformCurve.cxx
index 85b2fe5c23..74b44c5588 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurve.cxx
+++ b/src/StepGeom/StepGeom_QuasiUniformCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_QuasiUniformCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_QuasiUniformCurve,StepGeom_BSplineCurve)
+
 StepGeom_QuasiUniformCurve::StepGeom_QuasiUniformCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurve.hxx b/src/StepGeom/StepGeom_QuasiUniformCurve.hxx
index bfcc811e2d..e7ec28b595 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurve.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_QuasiUniformCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_QuasiUniformCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cxx b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cxx
index 36796db867..4d59d687d6 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_QuasiUniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+
 StepGeom_QuasiUniformCurveAndRationalBSplineCurve::StepGeom_QuasiUniformCurveAndRationalBSplineCurve ()  {}
 
 void StepGeom_QuasiUniformCurveAndRationalBSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
index 054c40cbcf..dada265863 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_QuasiUniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_QuasiUniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurface.cxx b/src/StepGeom/StepGeom_QuasiUniformSurface.cxx
index 6e3c614754..b75985cbc1 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurface.cxx
+++ b/src/StepGeom/StepGeom_QuasiUniformSurface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_QuasiUniformSurface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_QuasiUniformSurface,StepGeom_BSplineSurface)
+
 StepGeom_QuasiUniformSurface::StepGeom_QuasiUniformSurface ()  {}
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurface.hxx b/src/StepGeom/StepGeom_QuasiUniformSurface.hxx
index 94ffc9c8ae..96b872e334 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurface.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformSurface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_QuasiUniformSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_QuasiUniformSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cxx b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cxx
index df5ba6e71f..a659332a13 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+
 StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface::StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface ()  {}
 
 void StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
index 5a79eb030c..540deb67d9 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_RationalBSplineCurve.cxx b/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
index e7e216aed0..02bef79d5b 100644
--- a/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_RationalBSplineCurve.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_RationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_RationalBSplineCurve,StepGeom_BSplineCurve)
+
 StepGeom_RationalBSplineCurve::StepGeom_RationalBSplineCurve ()  {}
 
 void StepGeom_RationalBSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_RationalBSplineCurve.hxx b/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
index 2a59a6797d..79a7cf3f57 100644
--- a/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_RationalBSplineCurve.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_RationalBSplineCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_RationalBSplineCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_RationalBSplineSurface.cxx b/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
index f582ba9381..d6c25a2ead 100644
--- a/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_RationalBSplineSurface.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_RationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_RationalBSplineSurface,StepGeom_BSplineSurface)
+
 StepGeom_RationalBSplineSurface::StepGeom_RationalBSplineSurface ()  {}
 
 void StepGeom_RationalBSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_RationalBSplineSurface.hxx b/src/StepGeom/StepGeom_RationalBSplineSurface.hxx
index 7a27f44df2..3dfff60da6 100644
--- a/src/StepGeom/StepGeom_RationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_RationalBSplineSurface.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_RationalBSplineSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_RationalBSplineSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx b/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
index 6f477880e0..5992b26499 100644
--- a/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
+++ b/src/StepGeom/StepGeom_RectangularCompositeSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_SurfacePatch.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_RectangularCompositeSurface,StepGeom_BoundedSurface)
+
 StepGeom_RectangularCompositeSurface::StepGeom_RectangularCompositeSurface ()  {}
 
 void StepGeom_RectangularCompositeSurface::Init(
diff --git a/src/StepGeom/StepGeom_RectangularCompositeSurface.hxx b/src/StepGeom/StepGeom_RectangularCompositeSurface.hxx
index 46644ce953..0fd7e237bd 100644
--- a/src/StepGeom/StepGeom_RectangularCompositeSurface.hxx
+++ b/src/StepGeom/StepGeom_RectangularCompositeSurface.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_RectangularCompositeSurface,StepGeom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_RectangularCompositeSurface,StepGeom_BoundedSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
index c1ae5e620b..64eb33a95c 100644
--- a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
+++ b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Surface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_RectangularTrimmedSurface,StepGeom_BoundedSurface)
+
 StepGeom_RectangularTrimmedSurface::StepGeom_RectangularTrimmedSurface ()  {}
 
 void StepGeom_RectangularTrimmedSurface::Init(
diff --git a/src/StepGeom/StepGeom_RectangularTrimmedSurface.hxx b/src/StepGeom/StepGeom_RectangularTrimmedSurface.hxx
index 9b68d095cd..f42459e894 100644
--- a/src/StepGeom/StepGeom_RectangularTrimmedSurface.hxx
+++ b/src/StepGeom/StepGeom_RectangularTrimmedSurface.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_RectangularTrimmedSurface,StepGeom_BoundedSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_RectangularTrimmedSurface,StepGeom_BoundedSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cxx b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cxx
index f1d685941e..5c12569bc5 100644
--- a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cxx
+++ b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_Curve.hxx>
 #include <StepGeom_ReparametrisedCompositeCurveSegment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_ReparametrisedCompositeCurveSegment,StepGeom_CompositeCurveSegment)
+
 StepGeom_ReparametrisedCompositeCurveSegment::StepGeom_ReparametrisedCompositeCurveSegment ()  {}
 
 void StepGeom_ReparametrisedCompositeCurveSegment::Init(
diff --git a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
index 0947b23629..7c07e4535b 100644
--- a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
+++ b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_ReparametrisedCompositeCurveSegment,StepGeom_CompositeCurveSegment)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_ReparametrisedCompositeCurveSegment,StepGeom_CompositeCurveSegment)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SeamCurve.cxx b/src/StepGeom/StepGeom_SeamCurve.cxx
index 340c9de27a..be9d0935e5 100644
--- a/src/StepGeom/StepGeom_SeamCurve.cxx
+++ b/src/StepGeom/StepGeom_SeamCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_SeamCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SeamCurve,StepGeom_SurfaceCurve)
+
 StepGeom_SeamCurve::StepGeom_SeamCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_SeamCurve.hxx b/src/StepGeom/StepGeom_SeamCurve.hxx
index 3cf025edf5..ddd4d5f13d 100644
--- a/src/StepGeom/StepGeom_SeamCurve.hxx
+++ b/src/StepGeom/StepGeom_SeamCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SeamCurve,StepGeom_SurfaceCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SeamCurve,StepGeom_SurfaceCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SphericalSurface.cxx b/src/StepGeom/StepGeom_SphericalSurface.cxx
index 319c3d2fcd..3f9abd6a38 100644
--- a/src/StepGeom/StepGeom_SphericalSurface.cxx
+++ b/src/StepGeom/StepGeom_SphericalSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_SphericalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SphericalSurface,StepGeom_ElementarySurface)
+
 StepGeom_SphericalSurface::StepGeom_SphericalSurface ()  {}
 
 void StepGeom_SphericalSurface::Init(
diff --git a/src/StepGeom/StepGeom_SphericalSurface.hxx b/src/StepGeom/StepGeom_SphericalSurface.hxx
index ede3ccb91a..7cca10ccd2 100644
--- a/src/StepGeom/StepGeom_SphericalSurface.hxx
+++ b/src/StepGeom/StepGeom_SphericalSurface.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SphericalSurface,StepGeom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SphericalSurface,StepGeom_ElementarySurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Surface.cxx b/src/StepGeom/StepGeom_Surface.cxx
index 90b052ddfd..eb1345435e 100644
--- a/src/StepGeom/StepGeom_Surface.cxx
+++ b/src/StepGeom/StepGeom_Surface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_Surface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Surface,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Surface::StepGeom_Surface ()  {}
 
diff --git a/src/StepGeom/StepGeom_Surface.hxx b/src/StepGeom/StepGeom_Surface.hxx
index a56809767f..5dc89cd525 100644
--- a/src/StepGeom/StepGeom_Surface.hxx
+++ b/src/StepGeom/StepGeom_Surface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Surface,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Surface,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfaceCurve.cxx b/src/StepGeom/StepGeom_SurfaceCurve.cxx
index 9dfe4a3229..8f653aa230 100644
--- a/src/StepGeom/StepGeom_SurfaceCurve.cxx
+++ b/src/StepGeom/StepGeom_SurfaceCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_SurfaceCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfaceCurve,StepGeom_Curve)
+
 StepGeom_SurfaceCurve::StepGeom_SurfaceCurve ()  {}
 
 void StepGeom_SurfaceCurve::Init(
diff --git a/src/StepGeom/StepGeom_SurfaceCurve.hxx b/src/StepGeom/StepGeom_SurfaceCurve.hxx
index efc3936627..55cba17369 100644
--- a/src/StepGeom/StepGeom_SurfaceCurve.hxx
+++ b/src/StepGeom/StepGeom_SurfaceCurve.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfaceCurve,StepGeom_Curve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfaceCurve,StepGeom_Curve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
index dd4930cb50..2b3d4ea74c 100644
--- a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
+++ b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cxx
@@ -19,6 +19,8 @@
 #include <StepGeom_BoundedCurve.hxx>
 #include <StepGeom_SurfaceCurveAndBoundedCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfaceCurveAndBoundedCurve,StepGeom_SurfaceCurve)
+
 StepGeom_SurfaceCurveAndBoundedCurve::StepGeom_SurfaceCurveAndBoundedCurve () 
 {
 }
diff --git a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.hxx b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.hxx
index 7e90deb196..f02ff4f68c 100644
--- a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.hxx
+++ b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfaceCurveAndBoundedCurve,StepGeom_SurfaceCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfaceCurveAndBoundedCurve,StepGeom_SurfaceCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
index ae6f14c2da..c1a4eebec0 100644
--- a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
+++ b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_Vector.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfaceOfLinearExtrusion,StepGeom_SweptSurface)
+
 StepGeom_SurfaceOfLinearExtrusion::StepGeom_SurfaceOfLinearExtrusion ()  {}
 
 void StepGeom_SurfaceOfLinearExtrusion::Init(
diff --git a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.hxx b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.hxx
index 2e67b8d450..19e6438d60 100644
--- a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.hxx
+++ b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfaceOfLinearExtrusion,StepGeom_SweptSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfaceOfLinearExtrusion,StepGeom_SweptSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx b/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
index 60200f0c90..ebab290652 100644
--- a/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
+++ b/src/StepGeom/StepGeom_SurfaceOfRevolution.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_SurfaceOfRevolution.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfaceOfRevolution,StepGeom_SweptSurface)
+
 StepGeom_SurfaceOfRevolution::StepGeom_SurfaceOfRevolution ()  {}
 
 void StepGeom_SurfaceOfRevolution::Init(
diff --git a/src/StepGeom/StepGeom_SurfaceOfRevolution.hxx b/src/StepGeom/StepGeom_SurfaceOfRevolution.hxx
index 8e76a7b54b..d25ffbd632 100644
--- a/src/StepGeom/StepGeom_SurfaceOfRevolution.hxx
+++ b/src/StepGeom/StepGeom_SurfaceOfRevolution.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfaceOfRevolution,StepGeom_SweptSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfaceOfRevolution,StepGeom_SweptSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfacePatch.cxx b/src/StepGeom/StepGeom_SurfacePatch.cxx
index 5f0e2f8ccd..7ee8ea8454 100644
--- a/src/StepGeom/StepGeom_SurfacePatch.cxx
+++ b/src/StepGeom/StepGeom_SurfacePatch.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_BoundedSurface.hxx>
 #include <StepGeom_SurfacePatch.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfacePatch,MMgt_TShared)
+
 StepGeom_SurfacePatch::StepGeom_SurfacePatch ()  {}
 
 void StepGeom_SurfacePatch::Init(
diff --git a/src/StepGeom/StepGeom_SurfacePatch.hxx b/src/StepGeom/StepGeom_SurfacePatch.hxx
index e60c81fb8f..7f6615394a 100644
--- a/src/StepGeom/StepGeom_SurfacePatch.hxx
+++ b/src/StepGeom/StepGeom_SurfacePatch.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfacePatch,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfacePatch,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SurfaceReplica.cxx b/src/StepGeom/StepGeom_SurfaceReplica.cxx
index e95c2bc8f8..910f636304 100644
--- a/src/StepGeom/StepGeom_SurfaceReplica.cxx
+++ b/src/StepGeom/StepGeom_SurfaceReplica.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_SurfaceReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SurfaceReplica,StepGeom_Surface)
+
 StepGeom_SurfaceReplica::StepGeom_SurfaceReplica ()  {}
 
 void StepGeom_SurfaceReplica::Init(
diff --git a/src/StepGeom/StepGeom_SurfaceReplica.hxx b/src/StepGeom/StepGeom_SurfaceReplica.hxx
index 13828e905a..0168efee4f 100644
--- a/src/StepGeom/StepGeom_SurfaceReplica.hxx
+++ b/src/StepGeom/StepGeom_SurfaceReplica.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SurfaceReplica,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SurfaceReplica,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_SweptSurface.cxx b/src/StepGeom/StepGeom_SweptSurface.cxx
index 18053e7ac7..6f31a9ddaf 100644
--- a/src/StepGeom/StepGeom_SweptSurface.cxx
+++ b/src/StepGeom/StepGeom_SweptSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_SweptSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_SweptSurface,StepGeom_Surface)
+
 StepGeom_SweptSurface::StepGeom_SweptSurface ()  {}
 
 void StepGeom_SweptSurface::Init(
diff --git a/src/StepGeom/StepGeom_SweptSurface.hxx b/src/StepGeom/StepGeom_SweptSurface.hxx
index 69e7e28620..a26b5d6f5b 100644
--- a/src/StepGeom/StepGeom_SweptSurface.hxx
+++ b/src/StepGeom/StepGeom_SweptSurface.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_SweptSurface,StepGeom_Surface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_SweptSurface,StepGeom_Surface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_ToroidalSurface.cxx b/src/StepGeom/StepGeom_ToroidalSurface.cxx
index ccd73d18e3..78de2d96e8 100644
--- a/src/StepGeom/StepGeom_ToroidalSurface.cxx
+++ b/src/StepGeom/StepGeom_ToroidalSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_ToroidalSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_ToroidalSurface,StepGeom_ElementarySurface)
+
 StepGeom_ToroidalSurface::StepGeom_ToroidalSurface ()  {}
 
 void StepGeom_ToroidalSurface::Init(
diff --git a/src/StepGeom/StepGeom_ToroidalSurface.hxx b/src/StepGeom/StepGeom_ToroidalSurface.hxx
index 27957c2fbf..f3c9955483 100644
--- a/src/StepGeom/StepGeom_ToroidalSurface.hxx
+++ b/src/StepGeom/StepGeom_ToroidalSurface.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_ToroidalSurface,StepGeom_ElementarySurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_ToroidalSurface,StepGeom_ElementarySurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_TrimmedCurve.cxx b/src/StepGeom/StepGeom_TrimmedCurve.cxx
index 19a2f8ce66..4b7b7e2e3a 100644
--- a/src/StepGeom/StepGeom_TrimmedCurve.cxx
+++ b/src/StepGeom/StepGeom_TrimmedCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_TrimmingSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_TrimmedCurve,StepGeom_BoundedCurve)
+
 StepGeom_TrimmedCurve::StepGeom_TrimmedCurve ()  {}
 
 void StepGeom_TrimmedCurve::Init(
diff --git a/src/StepGeom/StepGeom_TrimmedCurve.hxx b/src/StepGeom/StepGeom_TrimmedCurve.hxx
index c7613caaff..81f966842e 100644
--- a/src/StepGeom/StepGeom_TrimmedCurve.hxx
+++ b/src/StepGeom/StepGeom_TrimmedCurve.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_TrimmedCurve,StepGeom_BoundedCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_TrimmedCurve,StepGeom_BoundedCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_TrimmingMember.cxx b/src/StepGeom/StepGeom_TrimmingMember.cxx
index 4db1a2d041..2856ac0194 100644
--- a/src/StepGeom/StepGeom_TrimmingMember.cxx
+++ b/src/StepGeom/StepGeom_TrimmingMember.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_TrimmingMember.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_TrimmingMember,StepData_SelectReal)
+
 StepGeom_TrimmingMember::StepGeom_TrimmingMember  ()    {  }
 
     Standard_Boolean  StepGeom_TrimmingMember::HasName () const
diff --git a/src/StepGeom/StepGeom_TrimmingMember.hxx b/src/StepGeom/StepGeom_TrimmingMember.hxx
index daf11d6b7a..7759986f5d 100644
--- a/src/StepGeom/StepGeom_TrimmingMember.hxx
+++ b/src/StepGeom/StepGeom_TrimmingMember.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_TrimmingMember,StepData_SelectReal)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_TrimmingMember,StepData_SelectReal)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_UniformCurve.cxx b/src/StepGeom/StepGeom_UniformCurve.cxx
index ca0bc81e27..3c10047992 100644
--- a/src/StepGeom/StepGeom_UniformCurve.cxx
+++ b/src/StepGeom/StepGeom_UniformCurve.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_UniformCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_UniformCurve,StepGeom_BSplineCurve)
+
 StepGeom_UniformCurve::StepGeom_UniformCurve ()  {}
 
diff --git a/src/StepGeom/StepGeom_UniformCurve.hxx b/src/StepGeom/StepGeom_UniformCurve.hxx
index 6964a1a119..a8223dcb63 100644
--- a/src/StepGeom/StepGeom_UniformCurve.hxx
+++ b/src/StepGeom/StepGeom_UniformCurve.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_UniformCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_UniformCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cxx b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cxx
index a7dca3a62a..838f60a61a 100644
--- a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cxx
+++ b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_UniformCurveAndRationalBSplineCurve.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_UniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+
 StepGeom_UniformCurveAndRationalBSplineCurve::StepGeom_UniformCurveAndRationalBSplineCurve ()  {}
 
 void StepGeom_UniformCurveAndRationalBSplineCurve::Init(
diff --git a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
index 2870af5d6e..5b271f03c3 100644
--- a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
+++ b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_UniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_UniformCurveAndRationalBSplineCurve,StepGeom_BSplineCurve)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_UniformSurface.cxx b/src/StepGeom/StepGeom_UniformSurface.cxx
index f887f4ba2b..afc250cb95 100644
--- a/src/StepGeom/StepGeom_UniformSurface.cxx
+++ b/src/StepGeom/StepGeom_UniformSurface.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepGeom_UniformSurface.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_UniformSurface,StepGeom_BSplineSurface)
+
 StepGeom_UniformSurface::StepGeom_UniformSurface ()  {}
 
diff --git a/src/StepGeom/StepGeom_UniformSurface.hxx b/src/StepGeom/StepGeom_UniformSurface.hxx
index ca4ec5751d..d8ee1135a7 100644
--- a/src/StepGeom/StepGeom_UniformSurface.hxx
+++ b/src/StepGeom/StepGeom_UniformSurface.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_UniformSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_UniformSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cxx b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cxx
index b2b776b12d..4efca8356d 100644
--- a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cxx
+++ b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cxx
@@ -18,6 +18,8 @@
 #include <StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_UniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+
 StepGeom_UniformSurfaceAndRationalBSplineSurface::StepGeom_UniformSurfaceAndRationalBSplineSurface ()  {}
 
 void StepGeom_UniformSurfaceAndRationalBSplineSurface::Init(
diff --git a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
index b7bdd56421..6fb96d1252 100644
--- a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
+++ b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_UniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_UniformSurfaceAndRationalBSplineSurface,StepGeom_BSplineSurface)
 
 protected:
 
diff --git a/src/StepGeom/StepGeom_Vector.cxx b/src/StepGeom/StepGeom_Vector.cxx
index 571344deaf..57b79daff4 100644
--- a/src/StepGeom/StepGeom_Vector.cxx
+++ b/src/StepGeom/StepGeom_Vector.cxx
@@ -17,6 +17,8 @@
 #include <StepGeom_Vector.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepGeom_Vector,StepGeom_GeometricRepresentationItem)
+
 StepGeom_Vector::StepGeom_Vector ()  {}
 
 void StepGeom_Vector::Init(
diff --git a/src/StepGeom/StepGeom_Vector.hxx b/src/StepGeom/StepGeom_Vector.hxx
index 5dc03788bc..4b4106dd74 100644
--- a/src/StepGeom/StepGeom_Vector.hxx
+++ b/src/StepGeom/StepGeom_Vector.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepGeom_Vector,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepGeom_Vector,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_AllAroundShapeAspect.cxx b/src/StepRepr/StepRepr_AllAroundShapeAspect.cxx
index 1456bc4a24..cc8ca1d8de 100644
--- a/src/StepRepr/StepRepr_AllAroundShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_AllAroundShapeAspect.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_AllAroundShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_AllAroundShapeAspect,StepRepr_ContinuosShapeAspect)
+
 StepRepr_AllAroundShapeAspect::StepRepr_AllAroundShapeAspect ()    {  }
diff --git a/src/StepRepr/StepRepr_AllAroundShapeAspect.hxx b/src/StepRepr/StepRepr_AllAroundShapeAspect.hxx
index a24e7a2532..e281c13174 100644
--- a/src/StepRepr/StepRepr_AllAroundShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_AllAroundShapeAspect.hxx
@@ -31,6 +31,6 @@ public:
   
   Standard_EXPORT StepRepr_AllAroundShapeAspect();
   
-  DEFINE_STANDARD_RTTI(StepRepr_AllAroundShapeAspect, StepRepr_ContinuosShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_AllAroundShapeAspect,StepRepr_ContinuosShapeAspect)
 };
 #endif // _StepRepr_AllAroundShapeAspect_HeaderFile
diff --git a/src/StepRepr/StepRepr_Apex.cxx b/src/StepRepr/StepRepr_Apex.cxx
index e2cca238e9..bc731fdc0a 100644
--- a/src/StepRepr/StepRepr_Apex.cxx
+++ b/src/StepRepr/StepRepr_Apex.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_Apex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_Apex,StepRepr_DerivedShapeAspect)
+
 StepRepr_Apex::StepRepr_Apex ()    {  }
diff --git a/src/StepRepr/StepRepr_Apex.hxx b/src/StepRepr/StepRepr_Apex.hxx
index 4f5821a6f4..70c19ed251 100644
--- a/src/StepRepr/StepRepr_Apex.hxx
+++ b/src/StepRepr/StepRepr_Apex.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepRepr_Apex();
 
-  DEFINE_STANDARD_RTTI(StepRepr_Apex, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_Apex,StepRepr_DerivedShapeAspect)
 
 };
 #endif // _StepRepr_Apex_HeaderFile
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx b/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
index 058b0e4c2b..995efe4c35 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsage.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_AssemblyComponentUsage.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_AssemblyComponentUsage,StepRepr_ProductDefinitionUsage)
+
 //=======================================================================
 //function : StepRepr_AssemblyComponentUsage
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx b/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
index c43e25096d..7bebc6788a 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsage.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_AssemblyComponentUsage,StepRepr_ProductDefinitionUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_AssemblyComponentUsage,StepRepr_ProductDefinitionUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
index 5ef6c05b3b..86a406b1ee 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_AssemblyComponentUsageSubstitute.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_AssemblyComponentUsageSubstitute,MMgt_TShared)
+
 StepRepr_AssemblyComponentUsageSubstitute::StepRepr_AssemblyComponentUsageSubstitute ()    {  }
 
 void  StepRepr_AssemblyComponentUsageSubstitute::Init
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.hxx b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.hxx
index cfb5d78af9..909f989394 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.hxx
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_AssemblyComponentUsageSubstitute,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_AssemblyComponentUsageSubstitute,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_BetweenShapeAspect.cxx b/src/StepRepr/StepRepr_BetweenShapeAspect.cxx
index 9d5516f6d2..1573225d13 100644
--- a/src/StepRepr/StepRepr_BetweenShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_BetweenShapeAspect.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_BetweenShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_BetweenShapeAspect,StepRepr_ContinuosShapeAspect)
+
 StepRepr_BetweenShapeAspect::StepRepr_BetweenShapeAspect ()    {  }
diff --git a/src/StepRepr/StepRepr_BetweenShapeAspect.hxx b/src/StepRepr/StepRepr_BetweenShapeAspect.hxx
index 832a4b835e..6ab303ee19 100644
--- a/src/StepRepr/StepRepr_BetweenShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_BetweenShapeAspect.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepRepr_BetweenShapeAspect();
 
-  DEFINE_STANDARD_RTTI(StepRepr_BetweenShapeAspect, StepRepr_ContinuosShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_BetweenShapeAspect,StepRepr_ContinuosShapeAspect)
 
 };
 #endif // _StepRepr_BetweenShapeAspect_HeaderFile
diff --git a/src/StepRepr/StepRepr_CentreOfSymmetry.cxx b/src/StepRepr/StepRepr_CentreOfSymmetry.cxx
index 0b955d9a2b..55c86658b3 100644
--- a/src/StepRepr/StepRepr_CentreOfSymmetry.cxx
+++ b/src/StepRepr/StepRepr_CentreOfSymmetry.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_CentreOfSymmetry.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CentreOfSymmetry,StepRepr_DerivedShapeAspect)
+
 StepRepr_CentreOfSymmetry::StepRepr_CentreOfSymmetry ()    {  }
diff --git a/src/StepRepr/StepRepr_CentreOfSymmetry.hxx b/src/StepRepr/StepRepr_CentreOfSymmetry.hxx
index b071121d67..a29e031f2f 100644
--- a/src/StepRepr/StepRepr_CentreOfSymmetry.hxx
+++ b/src/StepRepr/StepRepr_CentreOfSymmetry.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepRepr_CentreOfSymmetry();
 
-  DEFINE_STANDARD_RTTI(StepRepr_CentreOfSymmetry, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CentreOfSymmetry,StepRepr_DerivedShapeAspect)
 
 };
 #endif // _StepRepr_CentreOfSymmetry_HeaderFile
diff --git a/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx b/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
index 2ee9bc3100..d4b5d51fdf 100644
--- a/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
+++ b/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp,StepRepr_CompShAspAndDatumFeatAndShAsp)
+
 StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp::StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp ()    {  }
diff --git a/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx b/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
index bc804e1248..858c9972df 100644
--- a/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
+++ b/src/StepRepr/StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp.hxx
@@ -31,6 +31,6 @@ public:
   
   Standard_EXPORT StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp();
   
-  DEFINE_STANDARD_RTTI(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp, StepRepr_CompShAspAndDatumFeatAndShAsp)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp,StepRepr_CompShAspAndDatumFeatAndShAsp)
 };
 #endif // _StepRepr_CompGroupShAspAndCompShAspAndDatumFeatAndShAsp_HeaderFile
diff --git a/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.cxx b/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.cxx
index 5c1e72735f..572e305fec 100644
--- a/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.cxx
+++ b/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_CompShAspAndDatumFeatAndShAsp.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CompShAspAndDatumFeatAndShAsp,StepRepr_ShapeAspect)
+
 StepRepr_CompShAspAndDatumFeatAndShAsp::StepRepr_CompShAspAndDatumFeatAndShAsp ()    {  }
diff --git a/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.hxx b/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.hxx
index 81d47f8435..e0594427ce 100644
--- a/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.hxx
+++ b/src/StepRepr/StepRepr_CompShAspAndDatumFeatAndShAsp.hxx
@@ -31,6 +31,6 @@ public:
   
   Standard_EXPORT StepRepr_CompShAspAndDatumFeatAndShAsp();
   
-  DEFINE_STANDARD_RTTI(StepRepr_CompShAspAndDatumFeatAndShAsp, StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CompShAspAndDatumFeatAndShAsp,StepRepr_ShapeAspect)
 };
 #endif // _StepRepr_CompShAspAndDatumFeatAndShAsp_HeaderFile
diff --git a/src/StepRepr/StepRepr_CompositeGroupShapeAspect.cxx b/src/StepRepr/StepRepr_CompositeGroupShapeAspect.cxx
index 26d6a37e87..ab67ed623e 100644
--- a/src/StepRepr/StepRepr_CompositeGroupShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_CompositeGroupShapeAspect.cxx
@@ -14,4 +14,6 @@
 // commercial license or contractual agreement.
 #include <StepRepr_CompositeGroupShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CompositeGroupShapeAspect,StepRepr_CompositeShapeAspect)
+
 StepRepr_CompositeGroupShapeAspect::StepRepr_CompositeGroupShapeAspect ()    {  }
diff --git a/src/StepRepr/StepRepr_CompositeGroupShapeAspect.hxx b/src/StepRepr/StepRepr_CompositeGroupShapeAspect.hxx
index 73941620d8..3e8b31df51 100644
--- a/src/StepRepr/StepRepr_CompositeGroupShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_CompositeGroupShapeAspect.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepRepr_CompositeGroupShapeAspect();
 
-  DEFINE_STANDARD_RTTI(StepRepr_CompositeGroupShapeAspect, StepRepr_CompositeShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CompositeGroupShapeAspect,StepRepr_CompositeShapeAspect)
 
 };
 #endif // _StepRepr_CompositeGroupShapeAspect_HeaderFile
diff --git a/src/StepRepr/StepRepr_CompositeShapeAspect.cxx b/src/StepRepr/StepRepr_CompositeShapeAspect.cxx
index eab88e82cb..5b2c821146 100644
--- a/src/StepRepr/StepRepr_CompositeShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_CompositeShapeAspect.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_CompositeShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CompositeShapeAspect,StepRepr_ShapeAspect)
+
 StepRepr_CompositeShapeAspect::StepRepr_CompositeShapeAspect ()    {  }
diff --git a/src/StepRepr/StepRepr_CompositeShapeAspect.hxx b/src/StepRepr/StepRepr_CompositeShapeAspect.hxx
index 9377437952..55d961db6d 100644
--- a/src/StepRepr/StepRepr_CompositeShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_CompositeShapeAspect.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_CompositeShapeAspect,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CompositeShapeAspect,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx b/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
index 9c584d8824..638bbfc657 100644
--- a/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_CompoundRepresentationItem.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_CompoundRepresentationItem,StepRepr_RepresentationItem)
+
 StepRepr_CompoundRepresentationItem::StepRepr_CompoundRepresentationItem  ()    {  }
 
 void  StepRepr_CompoundRepresentationItem::Init
diff --git a/src/StepRepr/StepRepr_CompoundRepresentationItem.hxx b/src/StepRepr/StepRepr_CompoundRepresentationItem.hxx
index d21dda2a89..acd2e6bdfb 100644
--- a/src/StepRepr/StepRepr_CompoundRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_CompoundRepresentationItem.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_CompoundRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_CompoundRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ConfigurationDesign.cxx b/src/StepRepr/StepRepr_ConfigurationDesign.cxx
index feb2c459ba..c525727d9d 100644
--- a/src/StepRepr/StepRepr_ConfigurationDesign.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationDesign.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_ConfigurationDesignItem.hxx>
 #include <StepRepr_ConfigurationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ConfigurationDesign,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_ConfigurationDesign
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ConfigurationDesign.hxx b/src/StepRepr/StepRepr_ConfigurationDesign.hxx
index c5443d66a8..92b67adb88 100644
--- a/src/StepRepr/StepRepr_ConfigurationDesign.hxx
+++ b/src/StepRepr/StepRepr_ConfigurationDesign.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ConfigurationDesign,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ConfigurationDesign,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx b/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
index 61511083fe..5d8cef5b6b 100644
--- a/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationEffectivity.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_ConfigurationEffectivity.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ConfigurationEffectivity,StepBasic_ProductDefinitionEffectivity)
+
 //=======================================================================
 //function : StepRepr_ConfigurationEffectivity
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ConfigurationEffectivity.hxx b/src/StepRepr/StepRepr_ConfigurationEffectivity.hxx
index 321f533351..0756fd23af 100644
--- a/src/StepRepr/StepRepr_ConfigurationEffectivity.hxx
+++ b/src/StepRepr/StepRepr_ConfigurationEffectivity.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ConfigurationEffectivity,StepBasic_ProductDefinitionEffectivity)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ConfigurationEffectivity,StepBasic_ProductDefinitionEffectivity)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ConfigurationItem.cxx b/src/StepRepr/StepRepr_ConfigurationItem.cxx
index b8d4c454cc..661cfb5050 100644
--- a/src/StepRepr/StepRepr_ConfigurationItem.cxx
+++ b/src/StepRepr/StepRepr_ConfigurationItem.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_ProductConcept.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ConfigurationItem,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_ConfigurationItem
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ConfigurationItem.hxx b/src/StepRepr/StepRepr_ConfigurationItem.hxx
index 1a25b37b02..2a926e7265 100644
--- a/src/StepRepr/StepRepr_ConfigurationItem.hxx
+++ b/src/StepRepr/StepRepr_ConfigurationItem.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ConfigurationItem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ConfigurationItem,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ContinuosShapeAspect.cxx b/src/StepRepr/StepRepr_ContinuosShapeAspect.cxx
index 5e377d596f..6895efd33e 100644
--- a/src/StepRepr/StepRepr_ContinuosShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_ContinuosShapeAspect.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_ContinuosShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ContinuosShapeAspect,StepRepr_CompositeShapeAspect)
+
 StepRepr_ContinuosShapeAspect::StepRepr_ContinuosShapeAspect ()    {  }
diff --git a/src/StepRepr/StepRepr_ContinuosShapeAspect.hxx b/src/StepRepr/StepRepr_ContinuosShapeAspect.hxx
index 28b466b4f1..5efd678338 100644
--- a/src/StepRepr/StepRepr_ContinuosShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_ContinuosShapeAspect.hxx
@@ -31,6 +31,6 @@ public:
   
   Standard_EXPORT StepRepr_ContinuosShapeAspect();
 
-  DEFINE_STANDARD_RTTI(StepRepr_ContinuosShapeAspect, StepRepr_CompositeShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ContinuosShapeAspect,StepRepr_CompositeShapeAspect)
 };
 #endif // _StepRepr_ContinuosShapeAspect_HeaderFile
diff --git a/src/StepRepr/StepRepr_DataEnvironment.cxx b/src/StepRepr/StepRepr_DataEnvironment.cxx
index b9077ac86c..8f4d711c91 100644
--- a/src/StepRepr/StepRepr_DataEnvironment.cxx
+++ b/src/StepRepr/StepRepr_DataEnvironment.cxx
@@ -19,6 +19,8 @@
 #include <StepRepr_DataEnvironment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_DataEnvironment,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_DataEnvironment
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_DataEnvironment.hxx b/src/StepRepr/StepRepr_DataEnvironment.hxx
index 288ae5f107..b7d55dcdb7 100644
--- a/src/StepRepr/StepRepr_DataEnvironment.hxx
+++ b/src/StepRepr/StepRepr_DataEnvironment.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_DataEnvironment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_DataEnvironment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_DefinitionalRepresentation.cxx b/src/StepRepr/StepRepr_DefinitionalRepresentation.cxx
index efb7ad2628..3f3dfc91ed 100644
--- a/src/StepRepr/StepRepr_DefinitionalRepresentation.cxx
+++ b/src/StepRepr/StepRepr_DefinitionalRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_DefinitionalRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_DefinitionalRepresentation,StepRepr_Representation)
+
 StepRepr_DefinitionalRepresentation::StepRepr_DefinitionalRepresentation ()  {}
 
diff --git a/src/StepRepr/StepRepr_DefinitionalRepresentation.hxx b/src/StepRepr/StepRepr_DefinitionalRepresentation.hxx
index 8e550555fb..5d7c12a385 100644
--- a/src/StepRepr/StepRepr_DefinitionalRepresentation.hxx
+++ b/src/StepRepr/StepRepr_DefinitionalRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_DefinitionalRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_DefinitionalRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_DerivedShapeAspect.cxx b/src/StepRepr/StepRepr_DerivedShapeAspect.cxx
index 1ad192db2a..0b7575fbb3 100644
--- a/src/StepRepr/StepRepr_DerivedShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_DerivedShapeAspect.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_DerivedShapeAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_DerivedShapeAspect,StepRepr_ShapeAspect)
+
 StepRepr_DerivedShapeAspect::StepRepr_DerivedShapeAspect  ()    {  }
diff --git a/src/StepRepr/StepRepr_DerivedShapeAspect.hxx b/src/StepRepr/StepRepr_DerivedShapeAspect.hxx
index 4bce9edd3e..6cf811b1f6 100644
--- a/src/StepRepr/StepRepr_DerivedShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_DerivedShapeAspect.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_DerivedShapeAspect,StepRepr_ShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_DerivedShapeAspect,StepRepr_ShapeAspect)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
index 418f49ed1e..f07e9aebbf 100644
--- a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cxx
@@ -16,6 +16,8 @@
 #include <StepRepr_DescriptiveRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_DescriptiveRepresentationItem,StepRepr_RepresentationItem)
+
 StepRepr_DescriptiveRepresentationItem::StepRepr_DescriptiveRepresentationItem ()  {}
 
 void StepRepr_DescriptiveRepresentationItem::Init(
diff --git a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.hxx b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.hxx
index 5ebf788562..437b1c0c4e 100644
--- a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_DescriptiveRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_DescriptiveRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_Extension.cxx b/src/StepRepr/StepRepr_Extension.cxx
index 4229527f1d..4627195388 100644
--- a/src/StepRepr/StepRepr_Extension.cxx
+++ b/src/StepRepr/StepRepr_Extension.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_Extension.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_Extension,StepRepr_DerivedShapeAspect)
+
 StepRepr_Extension::StepRepr_Extension ()    {  }
diff --git a/src/StepRepr/StepRepr_Extension.hxx b/src/StepRepr/StepRepr_Extension.hxx
index 3b17395ef9..f405f61fbe 100644
--- a/src/StepRepr/StepRepr_Extension.hxx
+++ b/src/StepRepr/StepRepr_Extension.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_Extension,StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_Extension,StepRepr_DerivedShapeAspect)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cxx b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cxx
index 1066246be3..9d00b3588f 100644
--- a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cxx
+++ b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ExternallyDefinedRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ExternallyDefinedRepresentation,StepRepr_Representation)
+
 StepRepr_ExternallyDefinedRepresentation::StepRepr_ExternallyDefinedRepresentation ()    {  }
diff --git a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.hxx b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.hxx
index ba4a66e71d..7c75890896 100644
--- a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.hxx
+++ b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ExternallyDefinedRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ExternallyDefinedRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx
index 4e2bb8af94..47d4ceb700 100644
--- a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx
+++ b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.cxx
@@ -19,6 +19,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <StepRepr_FeatureForDatumTargetRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_FeatureForDatumTargetRelationship,StepRepr_ShapeAspectRelationship)
+
 //=======================================================================
 //function : StepRepr_FeatureForDatumtargetRelationship
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx
index 887e6ac754..414666b2e2 100644
--- a/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx
+++ b/src/StepRepr/StepRepr_FeatureForDatumTargetRelationship.hxx
@@ -36,7 +36,7 @@ public:
   Standard_EXPORT StepRepr_FeatureForDatumTargetRelationship();
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_FeatureForDatumTargetRelationship,StepRepr_ShapeAspectRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_FeatureForDatumTargetRelationship,StepRepr_ShapeAspectRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
index e4f783656e..d972be9072 100644
--- a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
+++ b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cxx
@@ -16,6 +16,8 @@
 #include <StepRepr_FunctionallyDefinedTransformation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_FunctionallyDefinedTransformation,MMgt_TShared)
+
 StepRepr_FunctionallyDefinedTransformation::StepRepr_FunctionallyDefinedTransformation ()  {}
 
 void StepRepr_FunctionallyDefinedTransformation::Init(
diff --git a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.hxx b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.hxx
index 8e07d30563..84b5e55132 100644
--- a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.hxx
+++ b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_FunctionallyDefinedTransformation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_FunctionallyDefinedTransformation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_GeometricAlignment.cxx b/src/StepRepr/StepRepr_GeometricAlignment.cxx
index c8938909e2..3c1a5858f0 100644
--- a/src/StepRepr/StepRepr_GeometricAlignment.cxx
+++ b/src/StepRepr/StepRepr_GeometricAlignment.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_GeometricAlignment.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_GeometricAlignment,StepRepr_DerivedShapeAspect)
+
 StepRepr_GeometricAlignment::StepRepr_GeometricAlignment ()    {  }
diff --git a/src/StepRepr/StepRepr_GeometricAlignment.hxx b/src/StepRepr/StepRepr_GeometricAlignment.hxx
index b2186106d1..12f938866d 100644
--- a/src/StepRepr/StepRepr_GeometricAlignment.hxx
+++ b/src/StepRepr/StepRepr_GeometricAlignment.hxx
@@ -30,6 +30,6 @@ public:
   
   Standard_EXPORT StepRepr_GeometricAlignment();
   
-  DEFINE_STANDARD_RTTI(StepRepr_GeometricAlignment, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_GeometricAlignment,StepRepr_DerivedShapeAspect)
 };
 #endif // _StepRepr_GeometricAlignment_HeaderFile
diff --git a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
index d8ac0cff90..3282db5229 100644
--- a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
+++ b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_GlobalUncertaintyAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_GlobalUncertaintyAssignedContext,StepRepr_RepresentationContext)
+
 StepRepr_GlobalUncertaintyAssignedContext::StepRepr_GlobalUncertaintyAssignedContext ()  {}
 
 void StepRepr_GlobalUncertaintyAssignedContext::Init(
diff --git a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
index befc05883d..66d1f7c36b 100644
--- a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
+++ b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_GlobalUncertaintyAssignedContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_GlobalUncertaintyAssignedContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
index 19467b8a77..4785e4e9d7 100644
--- a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
+++ b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_GlobalUnitAssignedContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_GlobalUnitAssignedContext,StepRepr_RepresentationContext)
+
 StepRepr_GlobalUnitAssignedContext::StepRepr_GlobalUnitAssignedContext ()  {}
 
 void StepRepr_GlobalUnitAssignedContext::Init(
diff --git a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.hxx b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.hxx
index 0c7dadea5b..669fa1e877 100644
--- a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.hxx
+++ b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_GlobalUnitAssignedContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_GlobalUnitAssignedContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx b/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx
index 90e96bf1b7..67d50f281d 100644
--- a/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_IntegerRepresentationItem.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_IntegerRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_IntegerRepresentationItem,StepRepr_RepresentationItem)
+
 StepRepr_IntegerRepresentationItem::StepRepr_IntegerRepresentationItem ()  {}
 
 void StepRepr_IntegerRepresentationItem::Init(
diff --git a/src/StepRepr/StepRepr_IntegerRepresentationItem.hxx b/src/StepRepr/StepRepr_IntegerRepresentationItem.hxx
index 531c5549fc..f6de8f6b3d 100644
--- a/src/StepRepr/StepRepr_IntegerRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_IntegerRepresentationItem.hxx
@@ -48,7 +48,7 @@ public:
     return value;
   }
 
-  DEFINE_STANDARD_RTTI(StepRepr_IntegerRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_IntegerRepresentationItem,StepRepr_RepresentationItem)
 
 private:
   Standard_Integer value;
diff --git a/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx b/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
index fa0efffbab..866b58a805 100644
--- a/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
+++ b/src/StepRepr/StepRepr_ItemDefinedTransformation.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ItemDefinedTransformation,MMgt_TShared)
+
 StepRepr_ItemDefinedTransformation::StepRepr_ItemDefinedTransformation ()    {  }
 
 void  StepRepr_ItemDefinedTransformation::Init
diff --git a/src/StepRepr/StepRepr_ItemDefinedTransformation.hxx b/src/StepRepr/StepRepr_ItemDefinedTransformation.hxx
index 9c751b5dff..de5367cd23 100644
--- a/src/StepRepr/StepRepr_ItemDefinedTransformation.hxx
+++ b/src/StepRepr/StepRepr_ItemDefinedTransformation.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ItemDefinedTransformation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ItemDefinedTransformation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
index 6300776d1f..88546c794b 100644
--- a/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
+++ b/src/StepRepr/StepRepr_MakeFromUsageOption.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_MakeFromUsageOption.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MakeFromUsageOption,StepRepr_ProductDefinitionUsage)
+
 //=======================================================================
 //function : StepRepr_MakeFromUsageOption
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
index ab4f87bd2d..c7e6442aa6 100644
--- a/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
+++ b/src/StepRepr/StepRepr_MakeFromUsageOption.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MakeFromUsageOption,StepRepr_ProductDefinitionUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MakeFromUsageOption,StepRepr_ProductDefinitionUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MappedItem.cxx b/src/StepRepr/StepRepr_MappedItem.cxx
index ae706f83cf..4a986a65de 100644
--- a/src/StepRepr/StepRepr_MappedItem.cxx
+++ b/src/StepRepr/StepRepr_MappedItem.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_RepresentationMap.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MappedItem,StepRepr_RepresentationItem)
+
 StepRepr_MappedItem::StepRepr_MappedItem ()  {}
 
 void StepRepr_MappedItem::Init(
diff --git a/src/StepRepr/StepRepr_MappedItem.hxx b/src/StepRepr/StepRepr_MappedItem.hxx
index 8a0d21f332..bcc586159c 100644
--- a/src/StepRepr/StepRepr_MappedItem.hxx
+++ b/src/StepRepr/StepRepr_MappedItem.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MappedItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MappedItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MaterialDesignation.cxx b/src/StepRepr/StepRepr_MaterialDesignation.cxx
index 39eb5bbec0..72f35c728b 100644
--- a/src/StepRepr/StepRepr_MaterialDesignation.cxx
+++ b/src/StepRepr/StepRepr_MaterialDesignation.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_MaterialDesignation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MaterialDesignation,MMgt_TShared)
+
 StepRepr_MaterialDesignation::StepRepr_MaterialDesignation  ()    {  }
 
 void  StepRepr_MaterialDesignation::Init
diff --git a/src/StepRepr/StepRepr_MaterialDesignation.hxx b/src/StepRepr/StepRepr_MaterialDesignation.hxx
index 2c1c130fa5..aa0f5dc4c7 100644
--- a/src/StepRepr/StepRepr_MaterialDesignation.hxx
+++ b/src/StepRepr/StepRepr_MaterialDesignation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MaterialDesignation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MaterialDesignation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MaterialProperty.cxx b/src/StepRepr/StepRepr_MaterialProperty.cxx
index 2744a88ce8..397d452647 100644
--- a/src/StepRepr/StepRepr_MaterialProperty.cxx
+++ b/src/StepRepr/StepRepr_MaterialProperty.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_MaterialProperty.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MaterialProperty,StepRepr_PropertyDefinition)
+
 //=======================================================================
 //function : StepRepr_MaterialProperty
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_MaterialProperty.hxx b/src/StepRepr/StepRepr_MaterialProperty.hxx
index ffa7187d1d..5724f8cc9b 100644
--- a/src/StepRepr/StepRepr_MaterialProperty.hxx
+++ b/src/StepRepr/StepRepr_MaterialProperty.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MaterialProperty,StepRepr_PropertyDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MaterialProperty,StepRepr_PropertyDefinition)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
index 5456ada37d..50f023d170 100644
--- a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
+++ b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentedDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MaterialPropertyRepresentation,StepRepr_PropertyDefinitionRepresentation)
+
 //=======================================================================
 //function : StepRepr_MaterialPropertyRepresentation
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.hxx b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.hxx
index 2edf9b520d..08684f3830 100644
--- a/src/StepRepr/StepRepr_MaterialPropertyRepresentation.hxx
+++ b/src/StepRepr/StepRepr_MaterialPropertyRepresentation.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MaterialPropertyRepresentation,StepRepr_PropertyDefinitionRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MaterialPropertyRepresentation,StepRepr_PropertyDefinitionRepresentation)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_MeasureRepresentationItem.cxx b/src/StepRepr/StepRepr_MeasureRepresentationItem.cxx
index 1f425c5b0a..88a45d878d 100644
--- a/src/StepRepr/StepRepr_MeasureRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_MeasureRepresentationItem.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_MeasureRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_MeasureRepresentationItem,StepRepr_RepresentationItem)
+
 //=======================================================================
 //function : StepRepr_MeasureRepresentationItem
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_MeasureRepresentationItem.hxx b/src/StepRepr/StepRepr_MeasureRepresentationItem.hxx
index 076120eadd..32f33e6f3d 100644
--- a/src/StepRepr/StepRepr_MeasureRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_MeasureRepresentationItem.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_MeasureRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_MeasureRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
index edf21ee7eb..67ea2766d7 100644
--- a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_NextAssemblyUsageOccurrence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_NextAssemblyUsageOccurrence,StepRepr_AssemblyComponentUsage)
+
 //=======================================================================
 //function : StepRepr_NextAssemblyUsageOccurrence
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
index 0df5158e12..3f9c29013b 100644
--- a/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_NextAssemblyUsageOccurrence.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_NextAssemblyUsageOccurrence,StepRepr_AssemblyComponentUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_NextAssemblyUsageOccurrence,StepRepr_AssemblyComponentUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ParallelOffset.cxx b/src/StepRepr/StepRepr_ParallelOffset.cxx
index b14c2e2008..d6ab382242 100644
--- a/src/StepRepr/StepRepr_ParallelOffset.cxx
+++ b/src/StepRepr/StepRepr_ParallelOffset.cxx
@@ -15,6 +15,8 @@
 
 #include <StepRepr_ParallelOffset.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ParallelOffset,StepRepr_DerivedShapeAspect)
+
 StepRepr_ParallelOffset::StepRepr_ParallelOffset ()    {  }
 
 //=======================================================================
diff --git a/src/StepRepr/StepRepr_ParallelOffset.hxx b/src/StepRepr/StepRepr_ParallelOffset.hxx
index 5f65313fe6..e261980431 100644
--- a/src/StepRepr/StepRepr_ParallelOffset.hxx
+++ b/src/StepRepr/StepRepr_ParallelOffset.hxx
@@ -50,7 +50,7 @@ public:
     offset = theOffset;
   }
 
-  DEFINE_STANDARD_RTTI(StepRepr_ParallelOffset, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ParallelOffset,StepRepr_DerivedShapeAspect)
 
 private:
   Handle(StepBasic_MeasureWithUnit) offset;
diff --git a/src/StepRepr/StepRepr_ParametricRepresentationContext.cxx b/src/StepRepr/StepRepr_ParametricRepresentationContext.cxx
index 7280fcf5f8..cbab4527e7 100644
--- a/src/StepRepr/StepRepr_ParametricRepresentationContext.cxx
+++ b/src/StepRepr/StepRepr_ParametricRepresentationContext.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ParametricRepresentationContext.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ParametricRepresentationContext,StepRepr_RepresentationContext)
+
 StepRepr_ParametricRepresentationContext::StepRepr_ParametricRepresentationContext ()  {}
 
diff --git a/src/StepRepr/StepRepr_ParametricRepresentationContext.hxx b/src/StepRepr/StepRepr_ParametricRepresentationContext.hxx
index 5e49883e94..3e11aee8b9 100644
--- a/src/StepRepr/StepRepr_ParametricRepresentationContext.hxx
+++ b/src/StepRepr/StepRepr_ParametricRepresentationContext.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ParametricRepresentationContext,StepRepr_RepresentationContext)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ParametricRepresentationContext,StepRepr_RepresentationContext)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_PerpendicularTo.cxx b/src/StepRepr/StepRepr_PerpendicularTo.cxx
index cf278dc181..897af54614 100644
--- a/src/StepRepr/StepRepr_PerpendicularTo.cxx
+++ b/src/StepRepr/StepRepr_PerpendicularTo.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_PerpendicularTo.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PerpendicularTo,StepRepr_DerivedShapeAspect)
+
 StepRepr_PerpendicularTo::StepRepr_PerpendicularTo ()    {  }
diff --git a/src/StepRepr/StepRepr_PerpendicularTo.hxx b/src/StepRepr/StepRepr_PerpendicularTo.hxx
index f487ff9458..2d6feb13c0 100644
--- a/src/StepRepr/StepRepr_PerpendicularTo.hxx
+++ b/src/StepRepr/StepRepr_PerpendicularTo.hxx
@@ -30,6 +30,6 @@ public:
   
   Standard_EXPORT StepRepr_PerpendicularTo();
 
-  DEFINE_STANDARD_RTTI(StepRepr_PerpendicularTo, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_PerpendicularTo,StepRepr_DerivedShapeAspect)
 };
 #endif // _StepRepr_PerpendicularTo_HeaderFile
diff --git a/src/StepRepr/StepRepr_ProductConcept.cxx b/src/StepRepr/StepRepr_ProductConcept.cxx
index 98702e801d..ead279ae57 100644
--- a/src/StepRepr/StepRepr_ProductConcept.cxx
+++ b/src/StepRepr/StepRepr_ProductConcept.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_ProductConcept.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ProductConcept,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_ProductConcept
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ProductConcept.hxx b/src/StepRepr/StepRepr_ProductConcept.hxx
index 3b456a1201..15926fc471 100644
--- a/src/StepRepr/StepRepr_ProductConcept.hxx
+++ b/src/StepRepr/StepRepr_ProductConcept.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ProductConcept,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ProductConcept,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ProductDefinitionShape.cxx b/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
index ebaebd8bdf..d34f919d49 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionShape.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ProductDefinitionShape,StepRepr_PropertyDefinition)
+
 //=======================================================================
 //function : StepRepr_ProductDefinitionShape
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ProductDefinitionShape.hxx b/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
index a764625523..7bb4b0dc9b 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionShape.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ProductDefinitionShape,StepRepr_PropertyDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ProductDefinitionShape,StepRepr_PropertyDefinition)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx b/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
index 81bdab55f8..d262a8c10f 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionUsage.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ProductDefinitionUsage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ProductDefinitionUsage,StepBasic_ProductDefinitionRelationship)
+
 //=======================================================================
 //function : StepRepr_ProductDefinitionUsage
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx b/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
index f25565cada..832ebd4e6d 100644
--- a/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
+++ b/src/StepRepr/StepRepr_ProductDefinitionUsage.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ProductDefinitionUsage,StepBasic_ProductDefinitionRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ProductDefinitionUsage,StepBasic_ProductDefinitionRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
index 6fb95c2429..f5ac809c6f 100644
--- a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_PromissoryUsageOccurrence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PromissoryUsageOccurrence,StepRepr_AssemblyComponentUsage)
+
 StepRepr_PromissoryUsageOccurrence::StepRepr_PromissoryUsageOccurrence ()    {  }
diff --git a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
index aac789a7c0..739871be3c 100644
--- a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_PromissoryUsageOccurrence,StepRepr_AssemblyComponentUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_PromissoryUsageOccurrence,StepRepr_AssemblyComponentUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_PropertyDefinition.cxx b/src/StepRepr/StepRepr_PropertyDefinition.cxx
index c6683641e3..942759cdbf 100644
--- a/src/StepRepr/StepRepr_PropertyDefinition.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinition.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_PropertyDefinition.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PropertyDefinition,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_PropertyDefinition
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_PropertyDefinition.hxx b/src/StepRepr/StepRepr_PropertyDefinition.hxx
index 36f340cdf5..fad606a087 100644
--- a/src/StepRepr/StepRepr_PropertyDefinition.hxx
+++ b/src/StepRepr/StepRepr_PropertyDefinition.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_PropertyDefinition,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_PropertyDefinition,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
index b68322fcd8..0b741b4bb0 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_PropertyDefinitionRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PropertyDefinitionRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_PropertyDefinitionRelationship
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.hxx b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.hxx
index 995a065d3f..87d17c76d3 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRelationship.hxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRelationship.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_PropertyDefinitionRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_PropertyDefinitionRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
index cb8ba2a14b..f7a5f35477 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_Representation.hxx>
 #include <StepRepr_RepresentedDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_PropertyDefinitionRepresentation,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_PropertyDefinitionRepresentation
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
index 52d6f00ab5..dc5ac33390 100644
--- a/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
+++ b/src/StepRepr/StepRepr_PropertyDefinitionRepresentation.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_PropertyDefinitionRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_PropertyDefinitionRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
index 7bba64889d..aae6faea42 100644
--- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
+++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.cxx
@@ -21,6 +21,8 @@
 #include <StepRepr_QuantifiedAssemblyComponentUsage.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_QuantifiedAssemblyComponentUsage,StepRepr_AssemblyComponentUsage)
+
 //=======================================================================
 //function : StepRepr_QuantifiedAssemblyComponentUsage
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
index 52b267c660..25fc137cc5 100644
--- a/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
+++ b/src/StepRepr/StepRepr_QuantifiedAssemblyComponentUsage.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_QuantifiedAssemblyComponentUsage,StepRepr_AssemblyComponentUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_QuantifiedAssemblyComponentUsage,StepRepr_AssemblyComponentUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cxx b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cxx
index 17414c1f7a..821b856c99 100644
--- a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndLengthMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
+
 //=======================================================================
 //function : StepRepr_ReprItemAndLengthMeasureWithUnit
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.hxx b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.hxx
index e3cf5c5ac0..fd86968148 100644
--- a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.hxx
@@ -39,7 +39,7 @@ public:
   
   Standard_EXPORT Handle(StepBasic_LengthMeasureWithUnit) GetLengthMeasureWithUnit() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndLengthMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndLengthMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
 
 private:
   Handle(StepBasic_LengthMeasureWithUnit) myLengthMeasureWithUnit;
diff --git a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.cxx b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.cxx
index e52d98159f..2a61ce9b75 100644
--- a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
+
 //=======================================================================
 //function : StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx
index e551e6a33e..1dcb6ac6ca 100644
--- a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI.hxx
@@ -39,7 +39,7 @@ public:
   
   Standard_EXPORT Handle(StepBasic_LengthMeasureWithUnit) GetLengthMeasureWithUnit() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndLengthMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
 
 private:
   Handle(StepBasic_LengthMeasureWithUnit) myLengthMeasureWithUnit;
diff --git a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.cxx b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.cxx
index 5b70d7f08c..b881f28d0a 100644
--- a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_ReprItemAndMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndMeasureWithUnit,StepRepr_RepresentationItem)
+
 //=======================================================================
 //function : StepRepr_ReprItemAndMeasureWithUnit
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.hxx b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.hxx
index aab646d1b5..ed8641cf6d 100644
--- a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnit.hxx
@@ -48,7 +48,7 @@ public:
   
   Standard_EXPORT Handle(StepRepr_RepresentationItem) GetRepresentationItem() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndMeasureWithUnit,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndMeasureWithUnit,StepRepr_RepresentationItem)
 
 private:
 
diff --git a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.cxx b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.cxx
index 838ea5a519..b03f5f3575 100644
--- a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_QualifiedRepresentationItem.hxx>
 #include <StepRepr_ReprItemAndMeasureWithUnitAndQRI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnit)
+
 //=======================================================================
 //function : Init
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.hxx b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.hxx
index b9398d4102..961a8165dd 100644
--- a/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndMeasureWithUnitAndQRI.hxx
@@ -41,7 +41,7 @@ public:
   
   Standard_EXPORT Handle(StepShape_QualifiedRepresentationItem) GetQualifiedRepresentationItem() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnit)
 
 private:
   Handle(StepShape_QualifiedRepresentationItem) myQualifiedRepresentationItem;
diff --git a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.cxx b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.cxx
index 8da2f140eb..7e9aa19115 100644
--- a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
+
 //=======================================================================
 //function : StepRepr_ReprItemAndPlaneAngleMeasureWithUnit
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx
index 02429dc10d..37d23eb5fd 100644
--- a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnit.hxx
@@ -38,7 +38,7 @@ public:
   
   Standard_EXPORT Handle(StepBasic_PlaneAngleMeasureWithUnit) GetPlaneAngleMeasureWithUnit() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndPlaneAngleMeasureWithUnit,StepRepr_ReprItemAndMeasureWithUnit)
 
 private:
   Handle(StepBasic_PlaneAngleMeasureWithUnit) myPlaneAngleMeasureWithUnit;
diff --git a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
index b01b5c1007..fd72a32493 100644
--- a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
+++ b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.cxx
@@ -18,6 +18,8 @@
 #include <StepBasic_PlaneAngleMeasureWithUnit.hxx>
 #include <StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
+
 //=======================================================================
 //function : StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
index 5f69a6d96e..b3506208da 100644
--- a/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
+++ b/src/StepRepr/StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI.hxx
@@ -38,7 +38,7 @@ public:
   
   Standard_EXPORT Handle(StepBasic_PlaneAngleMeasureWithUnit) GetPlaneAngleMeasureWithUnit() const;
 
-  DEFINE_STANDARD_RTTI(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ReprItemAndPlaneAngleMeasureWithUnitAndQRI,StepRepr_ReprItemAndMeasureWithUnitAndQRI)
 
 private:
   Handle(StepBasic_PlaneAngleMeasureWithUnit) myPlaneAngleMeasureWithUnit;
diff --git a/src/StepRepr/StepRepr_Representation.cxx b/src/StepRepr/StepRepr_Representation.cxx
index 120e09f4a3..ff9c5dafd8 100644
--- a/src/StepRepr/StepRepr_Representation.cxx
+++ b/src/StepRepr/StepRepr_Representation.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_Representation,MMgt_TShared)
+
 StepRepr_Representation::StepRepr_Representation ()  {}
 
 void StepRepr_Representation::Init(
diff --git a/src/StepRepr/StepRepr_Representation.hxx b/src/StepRepr/StepRepr_Representation.hxx
index be9020df5b..599cf300f2 100644
--- a/src/StepRepr/StepRepr_Representation.hxx
+++ b/src/StepRepr/StepRepr_Representation.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_Representation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_Representation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_RepresentationContext.cxx b/src/StepRepr/StepRepr_RepresentationContext.cxx
index 1a7eeb416c..4202b8ae3c 100644
--- a/src/StepRepr/StepRepr_RepresentationContext.cxx
+++ b/src/StepRepr/StepRepr_RepresentationContext.cxx
@@ -16,6 +16,8 @@
 #include <StepRepr_RepresentationContext.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RepresentationContext,MMgt_TShared)
+
 StepRepr_RepresentationContext::StepRepr_RepresentationContext ()  {}
 
 void StepRepr_RepresentationContext::Init(
diff --git a/src/StepRepr/StepRepr_RepresentationContext.hxx b/src/StepRepr/StepRepr_RepresentationContext.hxx
index 6740fe681c..98ea3e8e17 100644
--- a/src/StepRepr/StepRepr_RepresentationContext.hxx
+++ b/src/StepRepr/StepRepr_RepresentationContext.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_RepresentationContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_RepresentationContext,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_RepresentationItem.cxx b/src/StepRepr/StepRepr_RepresentationItem.cxx
index 2f3e71b11d..0a6760a590 100644
--- a/src/StepRepr/StepRepr_RepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_RepresentationItem.cxx
@@ -16,6 +16,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RepresentationItem,MMgt_TShared)
+
 StepRepr_RepresentationItem::StepRepr_RepresentationItem ()  {}
 
 void StepRepr_RepresentationItem::Init(
diff --git a/src/StepRepr/StepRepr_RepresentationItem.hxx b/src/StepRepr/StepRepr_RepresentationItem.hxx
index 26d49c51fb..f8c54e9c02 100644
--- a/src/StepRepr/StepRepr_RepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_RepresentationItem.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_RepresentationItem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_RepresentationItem,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_RepresentationMap.cxx b/src/StepRepr/StepRepr_RepresentationMap.cxx
index cd2b035a66..fd434f5382 100644
--- a/src/StepRepr/StepRepr_RepresentationMap.cxx
+++ b/src/StepRepr/StepRepr_RepresentationMap.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_RepresentationItem.hxx>
 #include <StepRepr_RepresentationMap.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RepresentationMap,MMgt_TShared)
+
 StepRepr_RepresentationMap::StepRepr_RepresentationMap ()  {}
 
 void StepRepr_RepresentationMap::Init(
diff --git a/src/StepRepr/StepRepr_RepresentationMap.hxx b/src/StepRepr/StepRepr_RepresentationMap.hxx
index e67d751e13..19c09aaa99 100644
--- a/src/StepRepr/StepRepr_RepresentationMap.hxx
+++ b/src/StepRepr/StepRepr_RepresentationMap.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_RepresentationMap,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_RepresentationMap,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_RepresentationRelationship.cxx b/src/StepRepr/StepRepr_RepresentationRelationship.cxx
index dbccca4422..ec3bc97b65 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationship.cxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationship.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_RepresentationRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RepresentationRelationship,MMgt_TShared)
+
 StepRepr_RepresentationRelationship::StepRepr_RepresentationRelationship ()  {}
 
 void StepRepr_RepresentationRelationship::Init(
diff --git a/src/StepRepr/StepRepr_RepresentationRelationship.hxx b/src/StepRepr/StepRepr_RepresentationRelationship.hxx
index 53aa31df12..3e04d99445 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationship.hxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationship.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_RepresentationRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_RepresentationRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
index 5540e91834..3561603103 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_Transformation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_RepresentationRelationshipWithTransformation,StepRepr_ShapeRepresentationRelationship)
+
 StepRepr_RepresentationRelationshipWithTransformation::StepRepr_RepresentationRelationshipWithTransformation ()    {  }
 
 void  StepRepr_RepresentationRelationshipWithTransformation::Init
diff --git a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.hxx b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.hxx
index b185454df0..8113478305 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.hxx
+++ b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_RepresentationRelationshipWithTransformation,StepRepr_ShapeRepresentationRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_RepresentationRelationshipWithTransformation,StepRepr_ShapeRepresentationRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeAspect.cxx b/src/StepRepr/StepRepr_ShapeAspect.cxx
index 82789b5ae6..e96bc7b5ba 100644
--- a/src/StepRepr/StepRepr_ShapeAspect.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspect.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_ShapeAspect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeAspect,MMgt_TShared)
+
 StepRepr_ShapeAspect::StepRepr_ShapeAspect ()  {}
 
 void StepRepr_ShapeAspect::Init(
diff --git a/src/StepRepr/StepRepr_ShapeAspect.hxx b/src/StepRepr/StepRepr_ShapeAspect.hxx
index 0f44c6d975..2135fa11a4 100644
--- a/src/StepRepr/StepRepr_ShapeAspect.hxx
+++ b/src/StepRepr/StepRepr_ShapeAspect.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeAspect,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeAspect,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cxx b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cxx
index 922868ac51..f5029ea758 100644
--- a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspectDerivingRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeAspectDerivingRelationship,StepRepr_ShapeAspectRelationship)
+
 StepRepr_ShapeAspectDerivingRelationship::StepRepr_ShapeAspectDerivingRelationship  ()    {  }
diff --git a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.hxx b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.hxx
index 8166f6c42b..cc2538b9d7 100644
--- a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.hxx
+++ b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeAspectDerivingRelationship,StepRepr_ShapeAspectRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeAspectDerivingRelationship,StepRepr_ShapeAspectRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx b/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
index 9b252f6c4f..1fe33f22d3 100644
--- a/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspectRelationship.cxx
@@ -20,6 +20,8 @@
 #include <StepRepr_ShapeAspectRelationship.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeAspectRelationship,MMgt_TShared)
+
 //=======================================================================
 //function : StepRepr_ShapeAspectRelationship
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx b/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
index aabb56d348..33d478a38d 100644
--- a/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
+++ b/src/StepRepr/StepRepr_ShapeAspectRelationship.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeAspectRelationship,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeAspectRelationship,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeAspectTransition.cxx b/src/StepRepr/StepRepr_ShapeAspectTransition.cxx
index 3d7728d702..0b5cf21d9f 100644
--- a/src/StepRepr/StepRepr_ShapeAspectTransition.cxx
+++ b/src/StepRepr/StepRepr_ShapeAspectTransition.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ShapeAspectTransition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeAspectTransition,StepRepr_ShapeAspectRelationship)
+
 //=======================================================================
 //function : StepRepr_ShapeAspectTransition
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_ShapeAspectTransition.hxx b/src/StepRepr/StepRepr_ShapeAspectTransition.hxx
index eebf229874..ec59f5f835 100644
--- a/src/StepRepr/StepRepr_ShapeAspectTransition.hxx
+++ b/src/StepRepr/StepRepr_ShapeAspectTransition.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeAspectTransition,StepRepr_ShapeAspectRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeAspectTransition,StepRepr_ShapeAspectRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cxx
index 0155e1dea3..16696682e3 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cxx
@@ -16,4 +16,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeRepresentationRelationship,StepRepr_RepresentationRelationship)
+
 StepRepr_ShapeRepresentationRelationship::StepRepr_ShapeRepresentationRelationship ()    {  }
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.hxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.hxx
index 93f631cb3e..16d875f0f1 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.hxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeRepresentationRelationship,StepRepr_RepresentationRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeRepresentationRelationship,StepRepr_RepresentationRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
index 423111f736..36887e00aa 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ShapeRepresentationRelationshipWithTransformation,StepRepr_RepresentationRelationshipWithTransformation)
+
 StepRepr_ShapeRepresentationRelationshipWithTransformation::StepRepr_ShapeRepresentationRelationshipWithTransformation ()    {  }
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
index 490841940b..9659f9fd12 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ShapeRepresentationRelationshipWithTransformation,StepRepr_RepresentationRelationshipWithTransformation)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ShapeRepresentationRelationshipWithTransformation,StepRepr_RepresentationRelationshipWithTransformation)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
index 193e25a226..b3b70845bc 100644
--- a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
+++ b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.cxx
@@ -22,6 +22,8 @@
 #include <StepRepr_SpecifiedHigherUsageOccurrence.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_SpecifiedHigherUsageOccurrence,StepRepr_AssemblyComponentUsage)
+
 //=======================================================================
 //function : StepRepr_SpecifiedHigherUsageOccurrence
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
index 87ec796415..9814eeb743 100644
--- a/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
+++ b/src/StepRepr/StepRepr_SpecifiedHigherUsageOccurrence.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_SpecifiedHigherUsageOccurrence,StepRepr_AssemblyComponentUsage)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_SpecifiedHigherUsageOccurrence,StepRepr_AssemblyComponentUsage)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_StructuralResponseProperty.cxx b/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
index 70088a2a8c..9a54da59ae 100644
--- a/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
+++ b/src/StepRepr/StepRepr_StructuralResponseProperty.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_StructuralResponseProperty.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_StructuralResponseProperty,StepRepr_PropertyDefinition)
+
 //=======================================================================
 //function : StepRepr_StructuralResponseProperty
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_StructuralResponseProperty.hxx b/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
index 12fb5b23c3..60116ae09e 100644
--- a/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
+++ b/src/StepRepr/StepRepr_StructuralResponseProperty.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_StructuralResponseProperty,StepRepr_PropertyDefinition)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_StructuralResponseProperty,StepRepr_PropertyDefinition)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
index 3cee87ba71..d7c12487dc 100644
--- a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
+++ b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_StructuralResponsePropertyDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
+
 //=======================================================================
 //function : StepRepr_StructuralResponsePropertyDefinitionRepresentation
 //purpose  : 
diff --git a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
index 8af5c0ef69..cba52049b9 100644
--- a/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
+++ b/src/StepRepr/StepRepr_StructuralResponsePropertyDefinitionRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_StructuralResponsePropertyDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_StructuralResponsePropertyDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx b/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
index 6192e1d97a..e17892d4d4 100644
--- a/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
+++ b/src/StepRepr/StepRepr_SuppliedPartRelationship.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_SuppliedPartRelationship.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_SuppliedPartRelationship,StepBasic_ProductDefinitionRelationship)
+
 StepRepr_SuppliedPartRelationship::StepRepr_SuppliedPartRelationship ()    {  }
diff --git a/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx b/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
index 02c2e4c240..99ed863bdc 100644
--- a/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
+++ b/src/StepRepr/StepRepr_SuppliedPartRelationship.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_SuppliedPartRelationship,StepBasic_ProductDefinitionRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_SuppliedPartRelationship,StepBasic_ProductDefinitionRelationship)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_Tangent.cxx b/src/StepRepr/StepRepr_Tangent.cxx
index 863eeb112a..95f836d1e3 100644
--- a/src/StepRepr/StepRepr_Tangent.cxx
+++ b/src/StepRepr/StepRepr_Tangent.cxx
@@ -15,4 +15,6 @@
 
 #include <StepRepr_Tangent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_Tangent,StepRepr_DerivedShapeAspect)
+
 StepRepr_Tangent::StepRepr_Tangent ()    {  }
diff --git a/src/StepRepr/StepRepr_Tangent.hxx b/src/StepRepr/StepRepr_Tangent.hxx
index 708f46de3d..8725ef6443 100644
--- a/src/StepRepr/StepRepr_Tangent.hxx
+++ b/src/StepRepr/StepRepr_Tangent.hxx
@@ -31,7 +31,7 @@ public:
   
   Standard_EXPORT StepRepr_Tangent();
 
-  DEFINE_STANDARD_RTTI(StepRepr_Tangent, StepRepr_DerivedShapeAspect)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_Tangent,StepRepr_DerivedShapeAspect)
 
 };
 #endif // _StepRepr_Tangent_HeaderFile
diff --git a/src/StepRepr/StepRepr_ValueRange.cxx b/src/StepRepr/StepRepr_ValueRange.cxx
index 1e2ca9bf75..2f229802ee 100644
--- a/src/StepRepr/StepRepr_ValueRange.cxx
+++ b/src/StepRepr/StepRepr_ValueRange.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepRepr_ValueRange.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ValueRange,StepRepr_CompoundRepresentationItem)
+
 StepRepr_ValueRange::StepRepr_ValueRange  ()    {  }
diff --git a/src/StepRepr/StepRepr_ValueRange.hxx b/src/StepRepr/StepRepr_ValueRange.hxx
index 5f8d0a0809..79cccfb0fc 100644
--- a/src/StepRepr/StepRepr_ValueRange.hxx
+++ b/src/StepRepr/StepRepr_ValueRange.hxx
@@ -37,7 +37,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepRepr_ValueRange,StepRepr_CompoundRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ValueRange,StepRepr_CompoundRepresentationItem)
 
 protected:
 
diff --git a/src/StepRepr/StepRepr_ValueRepresentationItem.cxx b/src/StepRepr/StepRepr_ValueRepresentationItem.cxx
index dbb3619ce9..3568187b0e 100644
--- a/src/StepRepr/StepRepr_ValueRepresentationItem.cxx
+++ b/src/StepRepr/StepRepr_ValueRepresentationItem.cxx
@@ -18,6 +18,8 @@
 #include <StepRepr_ValueRepresentationItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepRepr_ValueRepresentationItem,StepRepr_RepresentationItem)
+
 StepRepr_ValueRepresentationItem::StepRepr_ValueRepresentationItem ()  {}
 
 void StepRepr_ValueRepresentationItem::Init(
diff --git a/src/StepRepr/StepRepr_ValueRepresentationItem.hxx b/src/StepRepr/StepRepr_ValueRepresentationItem.hxx
index c8d7b80b68..6c6b27cbdc 100644
--- a/src/StepRepr/StepRepr_ValueRepresentationItem.hxx
+++ b/src/StepRepr/StepRepr_ValueRepresentationItem.hxx
@@ -50,7 +50,7 @@ public:
     return valueComponentMember;
   }
 
-  DEFINE_STANDARD_RTTI(StepRepr_ValueRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepRepr_ValueRepresentationItem,StepRepr_RepresentationItem)
 
 private:
   Handle(StepBasic_MeasureValueMember) valueComponentMember;
diff --git a/src/StepSelect/StepSelect_Activator.cxx b/src/StepSelect/StepSelect_Activator.cxx
index f9a7e2c581..a3087a3dad 100644
--- a/src/StepSelect/StepSelect_Activator.cxx
+++ b/src/StepSelect/StepSelect_Activator.cxx
@@ -24,6 +24,8 @@
 #include <StepSelect_Activator.hxx>
 #include <StepSelect_FloatFormat.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepSelect_Activator,IFSelect_Activator)
+
 static int initActivator = 0;
 
 
diff --git a/src/StepSelect/StepSelect_Activator.hxx b/src/StepSelect/StepSelect_Activator.hxx
index 11c0a11e94..c915234988 100644
--- a/src/StepSelect/StepSelect_Activator.hxx
+++ b/src/StepSelect/StepSelect_Activator.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_Activator,IFSelect_Activator)
+  DEFINE_STANDARD_RTTIEXT(StepSelect_Activator,IFSelect_Activator)
 
 protected:
 
diff --git a/src/StepSelect/StepSelect_FileModifier.hxx b/src/StepSelect/StepSelect_FileModifier.hxx
index 71a92e5546..0a3a26fd1f 100644
--- a/src/StepSelect/StepSelect_FileModifier.hxx
+++ b/src/StepSelect/StepSelect_FileModifier.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_FileModifier,IFSelect_GeneralModifier)
+  DEFINE_STANDARD_RTTI_INLINE(StepSelect_FileModifier,IFSelect_GeneralModifier)
 
 protected:
 
diff --git a/src/StepSelect/StepSelect_FloatFormat.cxx b/src/StepSelect/StepSelect_FloatFormat.cxx
index a4f6c836cb..1971942f64 100644
--- a/src/StepSelect/StepSelect_FloatFormat.cxx
+++ b/src/StepSelect/StepSelect_FloatFormat.cxx
@@ -20,6 +20,8 @@
 #include <TCollection_AsciiString.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(StepSelect_FloatFormat,StepSelect_FileModifier)
+
 StepSelect_FloatFormat::StepSelect_FloatFormat ()
     : thezerosup (Standard_True) , themainform ("%E") ,
       theformrange ("%f") , therangemin (0.1) , therangemax (1000.)
diff --git a/src/StepSelect/StepSelect_FloatFormat.hxx b/src/StepSelect/StepSelect_FloatFormat.hxx
index 6a83f1d0cd..0832978b11 100644
--- a/src/StepSelect/StepSelect_FloatFormat.hxx
+++ b/src/StepSelect/StepSelect_FloatFormat.hxx
@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_FloatFormat,StepSelect_FileModifier)
+  DEFINE_STANDARD_RTTIEXT(StepSelect_FloatFormat,StepSelect_FileModifier)
 
 protected:
 
diff --git a/src/StepSelect/StepSelect_ModelModifier.hxx b/src/StepSelect/StepSelect_ModelModifier.hxx
index 13e3d8f9fb..173f77628a 100644
--- a/src/StepSelect/StepSelect_ModelModifier.hxx
+++ b/src/StepSelect/StepSelect_ModelModifier.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_ModelModifier,IFSelect_Modifier)
+  DEFINE_STANDARD_RTTI_INLINE(StepSelect_ModelModifier,IFSelect_Modifier)
 
 protected:
 
diff --git a/src/StepSelect/StepSelect_StepType.cxx b/src/StepSelect/StepSelect_StepType.cxx
index 1f9f9d0fa1..8363e536cb 100644
--- a/src/StepSelect/StepSelect_StepType.cxx
+++ b/src/StepSelect/StepSelect_StepType.cxx
@@ -24,6 +24,8 @@
 #include <StepSelect_StepType.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepSelect_StepType,IFSelect_Signature)
+
 static TCollection_AsciiString lastvalue;
 
 
diff --git a/src/StepSelect/StepSelect_StepType.hxx b/src/StepSelect/StepSelect_StepType.hxx
index 65858d9ecf..e0e98f55c6 100644
--- a/src/StepSelect/StepSelect_StepType.hxx
+++ b/src/StepSelect/StepSelect_StepType.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_StepType,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(StepSelect_StepType,IFSelect_Signature)
 
 protected:
 
diff --git a/src/StepSelect/StepSelect_WorkLibrary.cxx b/src/StepSelect/StepSelect_WorkLibrary.cxx
index e369ca3de1..272f079a0b 100644
--- a/src/StepSelect/StepSelect_WorkLibrary.cxx
+++ b/src/StepSelect/StepSelect_WorkLibrary.cxx
@@ -42,6 +42,8 @@
 
 #include <errno.h>
 #include <sys/stat.h>
+IMPLEMENT_STANDARD_RTTIEXT(StepSelect_WorkLibrary,IFSelect_WorkLibrary)
+
 StepSelect_WorkLibrary::StepSelect_WorkLibrary
   (const Standard_Boolean copymode)
   : thecopymode (copymode) , thelabmode (0)
diff --git a/src/StepSelect/StepSelect_WorkLibrary.hxx b/src/StepSelect/StepSelect_WorkLibrary.hxx
index 43468da833..4f09ef3943 100644
--- a/src/StepSelect/StepSelect_WorkLibrary.hxx
+++ b/src/StepSelect/StepSelect_WorkLibrary.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepSelect_WorkLibrary,IFSelect_WorkLibrary)
+  DEFINE_STANDARD_RTTIEXT(StepSelect_WorkLibrary,IFSelect_WorkLibrary)
 
 protected:
 
diff --git a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cxx b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cxx
index d812bb1199..d0b06b6641 100644
--- a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_AdvancedBrepShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_AdvancedBrepShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_AdvancedBrepShapeRepresentation::StepShape_AdvancedBrepShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.hxx b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.hxx
index e742bead13..55c7e929ec 100644
--- a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_AdvancedBrepShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_AdvancedBrepShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_AdvancedFace.cxx b/src/StepShape/StepShape_AdvancedFace.cxx
index 9cdde1c422..706cd25919 100644
--- a/src/StepShape/StepShape_AdvancedFace.cxx
+++ b/src/StepShape/StepShape_AdvancedFace.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_AdvancedFace.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_AdvancedFace,StepShape_FaceSurface)
+
 StepShape_AdvancedFace::StepShape_AdvancedFace ()  {}
 
diff --git a/src/StepShape/StepShape_AdvancedFace.hxx b/src/StepShape/StepShape_AdvancedFace.hxx
index bdad894385..a9cc21fbc3 100644
--- a/src/StepShape/StepShape_AdvancedFace.hxx
+++ b/src/StepShape/StepShape_AdvancedFace.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_AdvancedFace,StepShape_FaceSurface)
+  DEFINE_STANDARD_RTTIEXT(StepShape_AdvancedFace,StepShape_FaceSurface)
 
 protected:
 
diff --git a/src/StepShape/StepShape_AngularLocation.cxx b/src/StepShape/StepShape_AngularLocation.cxx
index 7517e6a81c..02451b9e2b 100644
--- a/src/StepShape/StepShape_AngularLocation.cxx
+++ b/src/StepShape/StepShape_AngularLocation.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_AngularLocation.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_AngularLocation,StepShape_DimensionalLocation)
+
 //=======================================================================
 //function : StepShape_AngularLocation
 //purpose  : 
diff --git a/src/StepShape/StepShape_AngularLocation.hxx b/src/StepShape/StepShape_AngularLocation.hxx
index d406811e68..8c34cdb54f 100644
--- a/src/StepShape/StepShape_AngularLocation.hxx
+++ b/src/StepShape/StepShape_AngularLocation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_AngularLocation,StepShape_DimensionalLocation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_AngularLocation,StepShape_DimensionalLocation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_AngularSize.cxx b/src/StepShape/StepShape_AngularSize.cxx
index 252a92bcce..98603fe8dc 100644
--- a/src/StepShape/StepShape_AngularSize.cxx
+++ b/src/StepShape/StepShape_AngularSize.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_AngularSize.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_AngularSize,StepShape_DimensionalSize)
+
 //=======================================================================
 //function : StepShape_AngularSize
 //purpose  : 
diff --git a/src/StepShape/StepShape_AngularSize.hxx b/src/StepShape/StepShape_AngularSize.hxx
index cd3fa19c05..199a68d9b6 100644
--- a/src/StepShape/StepShape_AngularSize.hxx
+++ b/src/StepShape/StepShape_AngularSize.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_AngularSize,StepShape_DimensionalSize)
+  DEFINE_STANDARD_RTTIEXT(StepShape_AngularSize,StepShape_DimensionalSize)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Block.cxx b/src/StepShape/StepShape_Block.cxx
index feb01f7db4..3e90927b1e 100644
--- a/src/StepShape/StepShape_Block.cxx
+++ b/src/StepShape/StepShape_Block.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Block.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Block,StepGeom_GeometricRepresentationItem)
+
 StepShape_Block::StepShape_Block ()  {}
 
 void StepShape_Block::Init(
diff --git a/src/StepShape/StepShape_Block.hxx b/src/StepShape/StepShape_Block.hxx
index 7982a3ed57..882fb225c1 100644
--- a/src/StepShape/StepShape_Block.hxx
+++ b/src/StepShape/StepShape_Block.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Block,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Block,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_BooleanResult.cxx b/src/StepShape/StepShape_BooleanResult.cxx
index 0be32499cf..04caf7e0f8 100644
--- a/src/StepShape/StepShape_BooleanResult.cxx
+++ b/src/StepShape/StepShape_BooleanResult.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_BooleanResult.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_BooleanResult,StepGeom_GeometricRepresentationItem)
+
 StepShape_BooleanResult::StepShape_BooleanResult ()  {}
 
 void StepShape_BooleanResult::Init(
diff --git a/src/StepShape/StepShape_BooleanResult.hxx b/src/StepShape/StepShape_BooleanResult.hxx
index e1857195b3..239d7a7445 100644
--- a/src/StepShape/StepShape_BooleanResult.hxx
+++ b/src/StepShape/StepShape_BooleanResult.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_BooleanResult,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_BooleanResult,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_BoxDomain.cxx b/src/StepShape/StepShape_BoxDomain.cxx
index 9c8b469c13..ddf986411a 100644
--- a/src/StepShape/StepShape_BoxDomain.cxx
+++ b/src/StepShape/StepShape_BoxDomain.cxx
@@ -16,6 +16,8 @@
 #include <StepGeom_CartesianPoint.hxx>
 #include <StepShape_BoxDomain.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_BoxDomain,MMgt_TShared)
+
 StepShape_BoxDomain::StepShape_BoxDomain ()  {}
 
 void StepShape_BoxDomain::Init(
diff --git a/src/StepShape/StepShape_BoxDomain.hxx b/src/StepShape/StepShape_BoxDomain.hxx
index 971bc98056..e450a9a433 100644
--- a/src/StepShape/StepShape_BoxDomain.hxx
+++ b/src/StepShape/StepShape_BoxDomain.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_BoxDomain,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_BoxDomain,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_BoxedHalfSpace.cxx b/src/StepShape/StepShape_BoxedHalfSpace.cxx
index 8730027279..60819f9117 100644
--- a/src/StepShape/StepShape_BoxedHalfSpace.cxx
+++ b/src/StepShape/StepShape_BoxedHalfSpace.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_BoxedHalfSpace.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_BoxedHalfSpace,StepShape_HalfSpaceSolid)
+
 StepShape_BoxedHalfSpace::StepShape_BoxedHalfSpace ()  {}
 
 void StepShape_BoxedHalfSpace::Init(
diff --git a/src/StepShape/StepShape_BoxedHalfSpace.hxx b/src/StepShape/StepShape_BoxedHalfSpace.hxx
index 5e9e992d10..6bdfaecf2e 100644
--- a/src/StepShape/StepShape_BoxedHalfSpace.hxx
+++ b/src/StepShape/StepShape_BoxedHalfSpace.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_BoxedHalfSpace,StepShape_HalfSpaceSolid)
+  DEFINE_STANDARD_RTTIEXT(StepShape_BoxedHalfSpace,StepShape_HalfSpaceSolid)
 
 protected:
 
diff --git a/src/StepShape/StepShape_BrepWithVoids.cxx b/src/StepShape/StepShape_BrepWithVoids.cxx
index bf7c08c4cc..4d2452af91 100644
--- a/src/StepShape/StepShape_BrepWithVoids.cxx
+++ b/src/StepShape/StepShape_BrepWithVoids.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_OrientedClosedShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_BrepWithVoids,StepShape_ManifoldSolidBrep)
+
 StepShape_BrepWithVoids::StepShape_BrepWithVoids ()  {}
 
 void StepShape_BrepWithVoids::Init(
diff --git a/src/StepShape/StepShape_BrepWithVoids.hxx b/src/StepShape/StepShape_BrepWithVoids.hxx
index 56e49d9872..1b2e4feee7 100644
--- a/src/StepShape/StepShape_BrepWithVoids.hxx
+++ b/src/StepShape/StepShape_BrepWithVoids.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_BrepWithVoids,StepShape_ManifoldSolidBrep)
+  DEFINE_STANDARD_RTTIEXT(StepShape_BrepWithVoids,StepShape_ManifoldSolidBrep)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ClosedShell.cxx b/src/StepShape/StepShape_ClosedShell.cxx
index 79fac598b0..34d288d661 100644
--- a/src/StepShape/StepShape_ClosedShell.cxx
+++ b/src/StepShape/StepShape_ClosedShell.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ClosedShell.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ClosedShell,StepShape_ConnectedFaceSet)
+
 StepShape_ClosedShell::StepShape_ClosedShell ()  {}
 
diff --git a/src/StepShape/StepShape_ClosedShell.hxx b/src/StepShape/StepShape_ClosedShell.hxx
index 46cd02558d..47236a4aaa 100644
--- a/src/StepShape/StepShape_ClosedShell.hxx
+++ b/src/StepShape/StepShape_ClosedShell.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ClosedShell,StepShape_ConnectedFaceSet)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ClosedShell,StepShape_ConnectedFaceSet)
 
 protected:
 
diff --git a/src/StepShape/StepShape_CompoundShapeRepresentation.cxx b/src/StepShape/StepShape_CompoundShapeRepresentation.cxx
index 29cd57fc5a..649f967a26 100644
--- a/src/StepShape/StepShape_CompoundShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_CompoundShapeRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_CompoundShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_CompoundShapeRepresentation,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_CompoundShapeRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_CompoundShapeRepresentation.hxx b/src/StepShape/StepShape_CompoundShapeRepresentation.hxx
index 0717ad322a..1233e998ef 100644
--- a/src/StepShape/StepShape_CompoundShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_CompoundShapeRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_CompoundShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_CompoundShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ConnectedEdgeSet.cxx b/src/StepShape/StepShape_ConnectedEdgeSet.cxx
index c48c6b2a51..d35202c1be 100644
--- a/src/StepShape/StepShape_ConnectedEdgeSet.cxx
+++ b/src/StepShape/StepShape_ConnectedEdgeSet.cxx
@@ -19,6 +19,8 @@
 #include <StepShape_ConnectedEdgeSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ConnectedEdgeSet,StepShape_TopologicalRepresentationItem)
+
 //=======================================================================
 //function : StepShape_ConnectedEdgeSet
 //purpose  : 
diff --git a/src/StepShape/StepShape_ConnectedEdgeSet.hxx b/src/StepShape/StepShape_ConnectedEdgeSet.hxx
index 28e9db35a8..2d6161d0f0 100644
--- a/src/StepShape/StepShape_ConnectedEdgeSet.hxx
+++ b/src/StepShape/StepShape_ConnectedEdgeSet.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ConnectedEdgeSet,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ConnectedEdgeSet,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ConnectedFaceSet.cxx b/src/StepShape/StepShape_ConnectedFaceSet.cxx
index c755b87a0f..13e16d4537 100644
--- a/src/StepShape/StepShape_ConnectedFaceSet.cxx
+++ b/src/StepShape/StepShape_ConnectedFaceSet.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Face.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ConnectedFaceSet,StepShape_TopologicalRepresentationItem)
+
 StepShape_ConnectedFaceSet::StepShape_ConnectedFaceSet ()  {}
 
 void StepShape_ConnectedFaceSet::Init(
diff --git a/src/StepShape/StepShape_ConnectedFaceSet.hxx b/src/StepShape/StepShape_ConnectedFaceSet.hxx
index 46ba8b09d3..5ca8aa3c98 100644
--- a/src/StepShape/StepShape_ConnectedFaceSet.hxx
+++ b/src/StepShape/StepShape_ConnectedFaceSet.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ConnectedFaceSet,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ConnectedFaceSet,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.cxx b/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.cxx
index 3c84ede57e..a3b4621728 100644
--- a/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ConnectedFaceShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ConnectedFaceShapeRepresentation,StepRepr_Representation)
+
 //=======================================================================
 //function : StepShape_ConnectedFaceShapeRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.hxx b/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.hxx
index bc6697dfce..45af758105 100644
--- a/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_ConnectedFaceShapeRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ConnectedFaceShapeRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ConnectedFaceShapeRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ConnectedFaceSubSet.cxx b/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
index 0129e8af75..c37288a19b 100644
--- a/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
+++ b/src/StepShape/StepShape_ConnectedFaceSubSet.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_ConnectedFaceSubSet.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ConnectedFaceSubSet,StepShape_ConnectedFaceSet)
+
 //=======================================================================
 //function : StepShape_ConnectedFaceSubSet
 //purpose  : 
diff --git a/src/StepShape/StepShape_ConnectedFaceSubSet.hxx b/src/StepShape/StepShape_ConnectedFaceSubSet.hxx
index e603bc8863..01f421543f 100644
--- a/src/StepShape/StepShape_ConnectedFaceSubSet.hxx
+++ b/src/StepShape/StepShape_ConnectedFaceSubSet.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ConnectedFaceSubSet,StepShape_ConnectedFaceSet)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ConnectedFaceSubSet,StepShape_ConnectedFaceSet)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
index 9c6d1a9ef0..80c3389ec6 100644
--- a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cxx
@@ -17,6 +17,8 @@
 #include <StepRepr_ShapeRepresentationRelationship.hxx>
 #include <StepShape_ContextDependentShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ContextDependentShapeRepresentation,MMgt_TShared)
+
 StepShape_ContextDependentShapeRepresentation::StepShape_ContextDependentShapeRepresentation ()    {  }
 
 void  StepShape_ContextDependentShapeRepresentation::Init
diff --git a/src/StepShape/StepShape_ContextDependentShapeRepresentation.hxx b/src/StepShape/StepShape_ContextDependentShapeRepresentation.hxx
index 01a0baa3c0..b3282da2f7 100644
--- a/src/StepShape/StepShape_ContextDependentShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_ContextDependentShapeRepresentation.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ContextDependentShapeRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ContextDependentShapeRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_CsgShapeRepresentation.cxx b/src/StepShape/StepShape_CsgShapeRepresentation.cxx
index eae5ce6f74..29959f6405 100644
--- a/src/StepShape/StepShape_CsgShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_CsgShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_CsgShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_CsgShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_CsgShapeRepresentation::StepShape_CsgShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_CsgShapeRepresentation.hxx b/src/StepShape/StepShape_CsgShapeRepresentation.hxx
index 247f8f098a..3084e222c4 100644
--- a/src/StepShape/StepShape_CsgShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_CsgShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_CsgShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_CsgShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_CsgSolid.cxx b/src/StepShape/StepShape_CsgSolid.cxx
index 12d10a054a..51aaa2814d 100644
--- a/src/StepShape/StepShape_CsgSolid.cxx
+++ b/src/StepShape/StepShape_CsgSolid.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_CsgSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_CsgSolid,StepShape_SolidModel)
+
 StepShape_CsgSolid::StepShape_CsgSolid ()  {}
 
 void StepShape_CsgSolid::Init(
diff --git a/src/StepShape/StepShape_CsgSolid.hxx b/src/StepShape/StepShape_CsgSolid.hxx
index ba3220b026..a66477e1f7 100644
--- a/src/StepShape/StepShape_CsgSolid.hxx
+++ b/src/StepShape/StepShape_CsgSolid.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_CsgSolid,StepShape_SolidModel)
+  DEFINE_STANDARD_RTTIEXT(StepShape_CsgSolid,StepShape_SolidModel)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.cxx b/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.cxx
index 6ffc9de1cd..30a62ef8a0 100644
--- a/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DefinitionalRepresentationAndShapeRepresentation,StepRepr_DefinitionalRepresentation)
+
 StepShape_DefinitionalRepresentationAndShapeRepresentation::StepShape_DefinitionalRepresentationAndShapeRepresentation () 
 {
 }
diff --git a/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx b/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx
index e0ca644c3c..b4db6eba8c 100644
--- a/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_DefinitionalRepresentationAndShapeRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DefinitionalRepresentationAndShapeRepresentation,StepRepr_DefinitionalRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DefinitionalRepresentationAndShapeRepresentation,StepRepr_DefinitionalRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
index db3c234926..7da5dd109b 100644
--- a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
+++ b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_DimensionalCharacteristicRepresentation.hxx>
 #include <StepShape_ShapeDimensionRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DimensionalCharacteristicRepresentation,MMgt_TShared)
+
 //=======================================================================
 //function : StepShape_DimensionalCharacteristicRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
index a58dc1f3b2..916eabeac4 100644
--- a/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
+++ b/src/StepShape/StepShape_DimensionalCharacteristicRepresentation.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DimensionalCharacteristicRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DimensionalCharacteristicRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DimensionalLocation.cxx b/src/StepShape/StepShape_DimensionalLocation.cxx
index c1e8e2bc24..3013704bb4 100644
--- a/src/StepShape/StepShape_DimensionalLocation.cxx
+++ b/src/StepShape/StepShape_DimensionalLocation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_DimensionalLocation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DimensionalLocation,StepRepr_ShapeAspectRelationship)
+
 //=======================================================================
 //function : StepShape_DimensionalLocation
 //purpose  : 
diff --git a/src/StepShape/StepShape_DimensionalLocation.hxx b/src/StepShape/StepShape_DimensionalLocation.hxx
index f4df7f5063..5cdf513b58 100644
--- a/src/StepShape/StepShape_DimensionalLocation.hxx
+++ b/src/StepShape/StepShape_DimensionalLocation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DimensionalLocation,StepRepr_ShapeAspectRelationship)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DimensionalLocation,StepRepr_ShapeAspectRelationship)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DimensionalLocationWithPath.cxx b/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
index e544599de7..dfa9890ab0 100644
--- a/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
+++ b/src/StepShape/StepShape_DimensionalLocationWithPath.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_DimensionalLocationWithPath.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DimensionalLocationWithPath,StepShape_DimensionalLocation)
+
 //=======================================================================
 //function : StepShape_DimensionalLocationWithPath
 //purpose  : 
diff --git a/src/StepShape/StepShape_DimensionalLocationWithPath.hxx b/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
index a5f4c24af5..51d27c1ee3 100644
--- a/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
+++ b/src/StepShape/StepShape_DimensionalLocationWithPath.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DimensionalLocationWithPath,StepShape_DimensionalLocation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DimensionalLocationWithPath,StepShape_DimensionalLocation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DimensionalSize.cxx b/src/StepShape/StepShape_DimensionalSize.cxx
index 5bf660fcf3..6d78a85134 100644
--- a/src/StepShape/StepShape_DimensionalSize.cxx
+++ b/src/StepShape/StepShape_DimensionalSize.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_DimensionalSize.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DimensionalSize,MMgt_TShared)
+
 //=======================================================================
 //function : StepShape_DimensionalSize
 //purpose  : 
diff --git a/src/StepShape/StepShape_DimensionalSize.hxx b/src/StepShape/StepShape_DimensionalSize.hxx
index 7f01fd5743..efec497b29 100644
--- a/src/StepShape/StepShape_DimensionalSize.hxx
+++ b/src/StepShape/StepShape_DimensionalSize.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DimensionalSize,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DimensionalSize,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DimensionalSizeWithPath.cxx b/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
index 89d653e70e..02467870b8 100644
--- a/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
+++ b/src/StepShape/StepShape_DimensionalSizeWithPath.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_DimensionalSizeWithPath.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DimensionalSizeWithPath,StepShape_DimensionalSize)
+
 //=======================================================================
 //function : StepShape_DimensionalSizeWithPath
 //purpose  : 
diff --git a/src/StepShape/StepShape_DimensionalSizeWithPath.hxx b/src/StepShape/StepShape_DimensionalSizeWithPath.hxx
index 0f2fd53985..5e769d3c5b 100644
--- a/src/StepShape/StepShape_DimensionalSizeWithPath.hxx
+++ b/src/StepShape/StepShape_DimensionalSizeWithPath.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DimensionalSizeWithPath,StepShape_DimensionalSize)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DimensionalSizeWithPath,StepShape_DimensionalSize)
 
 protected:
 
diff --git a/src/StepShape/StepShape_DirectedDimensionalLocation.cxx b/src/StepShape/StepShape_DirectedDimensionalLocation.cxx
index b6763c25e0..fba62b2ad3 100644
--- a/src/StepShape/StepShape_DirectedDimensionalLocation.cxx
+++ b/src/StepShape/StepShape_DirectedDimensionalLocation.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepShape_DirectedDimensionalLocation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_DirectedDimensionalLocation,StepShape_DimensionalLocation)
+
 StepShape_DirectedDimensionalLocation::StepShape_DirectedDimensionalLocation  ()    {  }
diff --git a/src/StepShape/StepShape_DirectedDimensionalLocation.hxx b/src/StepShape/StepShape_DirectedDimensionalLocation.hxx
index 46266c7989..3e2d4dc1a4 100644
--- a/src/StepShape/StepShape_DirectedDimensionalLocation.hxx
+++ b/src/StepShape/StepShape_DirectedDimensionalLocation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_DirectedDimensionalLocation,StepShape_DimensionalLocation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_DirectedDimensionalLocation,StepShape_DimensionalLocation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Edge.cxx b/src/StepShape/StepShape_Edge.cxx
index 670e675ced..43d470b57f 100644
--- a/src/StepShape/StepShape_Edge.cxx
+++ b/src/StepShape/StepShape_Edge.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Edge,StepShape_TopologicalRepresentationItem)
+
 StepShape_Edge::StepShape_Edge ()  {}
 
 void StepShape_Edge::Init(
diff --git a/src/StepShape/StepShape_Edge.hxx b/src/StepShape/StepShape_Edge.hxx
index d839c39eda..d43a8705a3 100644
--- a/src/StepShape/StepShape_Edge.hxx
+++ b/src/StepShape/StepShape_Edge.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Edge,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Edge,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx b/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
index ff959fd0f6..bfe6e1a5e0 100644
--- a/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
+++ b/src/StepShape/StepShape_EdgeBasedWireframeModel.cxx
@@ -19,6 +19,8 @@
 #include <StepShape_EdgeBasedWireframeModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_EdgeBasedWireframeModel,StepGeom_GeometricRepresentationItem)
+
 //=======================================================================
 //function : StepShape_EdgeBasedWireframeModel
 //purpose  : 
diff --git a/src/StepShape/StepShape_EdgeBasedWireframeModel.hxx b/src/StepShape/StepShape_EdgeBasedWireframeModel.hxx
index 75b9f51581..83ead256e0 100644
--- a/src/StepShape/StepShape_EdgeBasedWireframeModel.hxx
+++ b/src/StepShape/StepShape_EdgeBasedWireframeModel.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_EdgeBasedWireframeModel,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_EdgeBasedWireframeModel,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.cxx b/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.cxx
index 56f00c24e9..291fe065ab 100644
--- a/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_EdgeBasedWireframeShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_EdgeBasedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_EdgeBasedWireframeShapeRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.hxx b/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.hxx
index 3bc775ab64..5ab724de7f 100644
--- a/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_EdgeBasedWireframeShapeRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_EdgeBasedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_EdgeBasedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_EdgeCurve.cxx b/src/StepShape/StepShape_EdgeCurve.cxx
index 9e1811c544..74f52fc959 100644
--- a/src/StepShape/StepShape_EdgeCurve.cxx
+++ b/src/StepShape/StepShape_EdgeCurve.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_EdgeCurve,StepShape_Edge)
+
 StepShape_EdgeCurve::StepShape_EdgeCurve ()  {}
 
 void StepShape_EdgeCurve::Init(
diff --git a/src/StepShape/StepShape_EdgeCurve.hxx b/src/StepShape/StepShape_EdgeCurve.hxx
index 1c977a9328..4ee25fee82 100644
--- a/src/StepShape/StepShape_EdgeCurve.hxx
+++ b/src/StepShape/StepShape_EdgeCurve.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_EdgeCurve,StepShape_Edge)
+  DEFINE_STANDARD_RTTIEXT(StepShape_EdgeCurve,StepShape_Edge)
 
 protected:
 
diff --git a/src/StepShape/StepShape_EdgeLoop.cxx b/src/StepShape/StepShape_EdgeLoop.cxx
index ae2bc267cf..eaa77e7554 100644
--- a/src/StepShape/StepShape_EdgeLoop.cxx
+++ b/src/StepShape/StepShape_EdgeLoop.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_OrientedEdge.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_EdgeLoop,StepShape_Loop)
+
 StepShape_EdgeLoop::StepShape_EdgeLoop ()  {}
 
 void StepShape_EdgeLoop::Init(const Handle(TCollection_HAsciiString)& aName)
diff --git a/src/StepShape/StepShape_EdgeLoop.hxx b/src/StepShape/StepShape_EdgeLoop.hxx
index d5d59de2e7..ff5a34d00c 100644
--- a/src/StepShape/StepShape_EdgeLoop.hxx
+++ b/src/StepShape/StepShape_EdgeLoop.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_EdgeLoop,StepShape_Loop)
+  DEFINE_STANDARD_RTTIEXT(StepShape_EdgeLoop,StepShape_Loop)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ExtrudedAreaSolid.cxx b/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
index a6ea0f1889..a5e394460c 100644
--- a/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
+++ b/src/StepShape/StepShape_ExtrudedAreaSolid.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_ExtrudedAreaSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ExtrudedAreaSolid,StepShape_SweptAreaSolid)
+
 StepShape_ExtrudedAreaSolid::StepShape_ExtrudedAreaSolid ()  {}
 
 void StepShape_ExtrudedAreaSolid::Init(
diff --git a/src/StepShape/StepShape_ExtrudedAreaSolid.hxx b/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
index e4279f2117..a3af763562 100644
--- a/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
+++ b/src/StepShape/StepShape_ExtrudedAreaSolid.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ExtrudedAreaSolid,StepShape_SweptAreaSolid)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ExtrudedAreaSolid,StepShape_SweptAreaSolid)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ExtrudedFaceSolid.cxx b/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
index 7a4ccf6d5c..7dffca5615 100644
--- a/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
+++ b/src/StepShape/StepShape_ExtrudedFaceSolid.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_FaceSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ExtrudedFaceSolid,StepShape_SweptFaceSolid)
+
 StepShape_ExtrudedFaceSolid::StepShape_ExtrudedFaceSolid ()  {}
 
 void StepShape_ExtrudedFaceSolid::Init(
diff --git a/src/StepShape/StepShape_ExtrudedFaceSolid.hxx b/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
index 03ded74ea6..0b87d0536a 100644
--- a/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
+++ b/src/StepShape/StepShape_ExtrudedFaceSolid.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ExtrudedFaceSolid,StepShape_SweptFaceSolid)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ExtrudedFaceSolid,StepShape_SweptFaceSolid)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Face.cxx b/src/StepShape/StepShape_Face.cxx
index 9e1db16878..a1e6454355 100644
--- a/src/StepShape/StepShape_Face.cxx
+++ b/src/StepShape/StepShape_Face.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_FaceBound.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Face,StepShape_TopologicalRepresentationItem)
+
 StepShape_Face::StepShape_Face ()  {}
 
 void StepShape_Face::Init(
diff --git a/src/StepShape/StepShape_Face.hxx b/src/StepShape/StepShape_Face.hxx
index 9d663095c8..af6128af93 100644
--- a/src/StepShape/StepShape_Face.hxx
+++ b/src/StepShape/StepShape_Face.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Face,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Face,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx b/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
index c5bf524f41..f929b4637b 100644
--- a/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
+++ b/src/StepShape/StepShape_FaceBasedSurfaceModel.cxx
@@ -19,6 +19,8 @@
 #include <StepShape_FaceBasedSurfaceModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FaceBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
+
 //=======================================================================
 //function : StepShape_FaceBasedSurfaceModel
 //purpose  : 
diff --git a/src/StepShape/StepShape_FaceBasedSurfaceModel.hxx b/src/StepShape/StepShape_FaceBasedSurfaceModel.hxx
index 11303035c4..ee35924cee 100644
--- a/src/StepShape/StepShape_FaceBasedSurfaceModel.hxx
+++ b/src/StepShape/StepShape_FaceBasedSurfaceModel.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FaceBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FaceBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FaceBound.cxx b/src/StepShape/StepShape_FaceBound.cxx
index a5c7a68b83..a8e102c97f 100644
--- a/src/StepShape/StepShape_FaceBound.cxx
+++ b/src/StepShape/StepShape_FaceBound.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Loop.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FaceBound,StepShape_TopologicalRepresentationItem)
+
 StepShape_FaceBound::StepShape_FaceBound ()  {}
 
 void StepShape_FaceBound::Init(
diff --git a/src/StepShape/StepShape_FaceBound.hxx b/src/StepShape/StepShape_FaceBound.hxx
index fdfb7afd3e..38e66828c7 100644
--- a/src/StepShape/StepShape_FaceBound.hxx
+++ b/src/StepShape/StepShape_FaceBound.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FaceBound,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FaceBound,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FaceOuterBound.cxx b/src/StepShape/StepShape_FaceOuterBound.cxx
index 1f57f9bce4..c32d0e05b0 100644
--- a/src/StepShape/StepShape_FaceOuterBound.cxx
+++ b/src/StepShape/StepShape_FaceOuterBound.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_FaceOuterBound.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FaceOuterBound,StepShape_FaceBound)
+
 StepShape_FaceOuterBound::StepShape_FaceOuterBound ()  {}
 
diff --git a/src/StepShape/StepShape_FaceOuterBound.hxx b/src/StepShape/StepShape_FaceOuterBound.hxx
index d35d556b59..4e6d3acd9b 100644
--- a/src/StepShape/StepShape_FaceOuterBound.hxx
+++ b/src/StepShape/StepShape_FaceOuterBound.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FaceOuterBound,StepShape_FaceBound)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FaceOuterBound,StepShape_FaceBound)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FaceSurface.cxx b/src/StepShape/StepShape_FaceSurface.cxx
index e4a695ccec..e1d84880ea 100644
--- a/src/StepShape/StepShape_FaceSurface.cxx
+++ b/src/StepShape/StepShape_FaceSurface.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_FaceSurface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FaceSurface,StepShape_Face)
+
 StepShape_FaceSurface::StepShape_FaceSurface ()  {}
 
 void StepShape_FaceSurface::Init(
diff --git a/src/StepShape/StepShape_FaceSurface.hxx b/src/StepShape/StepShape_FaceSurface.hxx
index 49811a1eea..8e02edfd2d 100644
--- a/src/StepShape/StepShape_FaceSurface.hxx
+++ b/src/StepShape/StepShape_FaceSurface.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FaceSurface,StepShape_Face)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FaceSurface,StepShape_Face)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FacetedBrep.cxx b/src/StepShape/StepShape_FacetedBrep.cxx
index 3d87b95f4c..683da4b79e 100644
--- a/src/StepShape/StepShape_FacetedBrep.cxx
+++ b/src/StepShape/StepShape_FacetedBrep.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_FacetedBrep.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FacetedBrep,StepShape_ManifoldSolidBrep)
+
 StepShape_FacetedBrep::StepShape_FacetedBrep ()  {}
 
diff --git a/src/StepShape/StepShape_FacetedBrep.hxx b/src/StepShape/StepShape_FacetedBrep.hxx
index 56f08bbb62..70b0936e09 100644
--- a/src/StepShape/StepShape_FacetedBrep.hxx
+++ b/src/StepShape/StepShape_FacetedBrep.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FacetedBrep,StepShape_ManifoldSolidBrep)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FacetedBrep,StepShape_ManifoldSolidBrep)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cxx b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cxx
index d1117c885d..f38f32fcf4 100644
--- a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cxx
+++ b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_OrientedClosedShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FacetedBrepAndBrepWithVoids,StepShape_ManifoldSolidBrep)
+
 StepShape_FacetedBrepAndBrepWithVoids::StepShape_FacetedBrepAndBrepWithVoids ()  {}
 
 void StepShape_FacetedBrepAndBrepWithVoids::Init
diff --git a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.hxx b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.hxx
index 4bf1b12331..d426c82ccc 100644
--- a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.hxx
+++ b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FacetedBrepAndBrepWithVoids,StepShape_ManifoldSolidBrep)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FacetedBrepAndBrepWithVoids,StepShape_ManifoldSolidBrep)
 
 protected:
 
diff --git a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cxx b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cxx
index 28d28e4a9a..c52aa416b5 100644
--- a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_FacetedBrepShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_FacetedBrepShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_FacetedBrepShapeRepresentation::StepShape_FacetedBrepShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.hxx b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.hxx
index d97f260cb8..8c60e66bc2 100644
--- a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_FacetedBrepShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_FacetedBrepShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_GeometricCurveSet.cxx b/src/StepShape/StepShape_GeometricCurveSet.cxx
index 74889597a9..47acbcc69f 100644
--- a/src/StepShape/StepShape_GeometricCurveSet.cxx
+++ b/src/StepShape/StepShape_GeometricCurveSet.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_GeometricCurveSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_GeometricCurveSet,StepShape_GeometricSet)
+
 StepShape_GeometricCurveSet::StepShape_GeometricCurveSet ()  {}
 
diff --git a/src/StepShape/StepShape_GeometricCurveSet.hxx b/src/StepShape/StepShape_GeometricCurveSet.hxx
index b649bb7c76..13a6bdfe7c 100644
--- a/src/StepShape/StepShape_GeometricCurveSet.hxx
+++ b/src/StepShape/StepShape_GeometricCurveSet.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_GeometricCurveSet,StepShape_GeometricSet)
+  DEFINE_STANDARD_RTTIEXT(StepShape_GeometricCurveSet,StepShape_GeometricSet)
 
 protected:
 
diff --git a/src/StepShape/StepShape_GeometricSet.cxx b/src/StepShape/StepShape_GeometricSet.cxx
index 20edcb1612..61fbd238ce 100644
--- a/src/StepShape/StepShape_GeometricSet.cxx
+++ b/src/StepShape/StepShape_GeometricSet.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_GeometricSetSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_GeometricSet,StepGeom_GeometricRepresentationItem)
+
 StepShape_GeometricSet::StepShape_GeometricSet ()  {}
 
 void StepShape_GeometricSet::Init(
diff --git a/src/StepShape/StepShape_GeometricSet.hxx b/src/StepShape/StepShape_GeometricSet.hxx
index 870100d8b2..305d1c8520 100644
--- a/src/StepShape/StepShape_GeometricSet.hxx
+++ b/src/StepShape/StepShape_GeometricSet.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_GeometricSet,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_GeometricSet,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cxx b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cxx
index b8f862e9f6..4d8bec6b37 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_GeometricallyBoundedSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_GeometricallyBoundedSurfaceShapeRepresentation::StepShape_GeometricallyBoundedSurfaceShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx
index e2fd87d3a1..16180f0316 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_GeometricallyBoundedSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_GeometricallyBoundedSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cxx b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cxx
index 84571520b0..b572138ba2 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_GeometricallyBoundedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_GeometricallyBoundedWireframeShapeRepresentation::StepShape_GeometricallyBoundedWireframeShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx
index 7055e99d59..ed47a88cfb 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_GeometricallyBoundedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_GeometricallyBoundedWireframeShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_HalfSpaceSolid.cxx b/src/StepShape/StepShape_HalfSpaceSolid.cxx
index f69f35264d..2af7b0333d 100644
--- a/src/StepShape/StepShape_HalfSpaceSolid.cxx
+++ b/src/StepShape/StepShape_HalfSpaceSolid.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_HalfSpaceSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_HalfSpaceSolid,StepGeom_GeometricRepresentationItem)
+
 StepShape_HalfSpaceSolid::StepShape_HalfSpaceSolid ()  {}
 
 void StepShape_HalfSpaceSolid::Init(
diff --git a/src/StepShape/StepShape_HalfSpaceSolid.hxx b/src/StepShape/StepShape_HalfSpaceSolid.hxx
index 709a75abcc..40599f5353 100644
--- a/src/StepShape/StepShape_HalfSpaceSolid.hxx
+++ b/src/StepShape/StepShape_HalfSpaceSolid.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_HalfSpaceSolid,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_HalfSpaceSolid,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_LimitsAndFits.cxx b/src/StepShape/StepShape_LimitsAndFits.cxx
index ce5ee374bf..dae9e6e088 100644
--- a/src/StepShape/StepShape_LimitsAndFits.cxx
+++ b/src/StepShape/StepShape_LimitsAndFits.cxx
@@ -16,6 +16,8 @@
 #include <StepShape_LimitsAndFits.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_LimitsAndFits,MMgt_TShared)
+
 StepShape_LimitsAndFits::StepShape_LimitsAndFits ()    {  }
 
 void  StepShape_LimitsAndFits::Init
diff --git a/src/StepShape/StepShape_LimitsAndFits.hxx b/src/StepShape/StepShape_LimitsAndFits.hxx
index c92010576e..9183d30d66 100644
--- a/src/StepShape/StepShape_LimitsAndFits.hxx
+++ b/src/StepShape/StepShape_LimitsAndFits.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_LimitsAndFits,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_LimitsAndFits,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Loop.cxx b/src/StepShape/StepShape_Loop.cxx
index 7cf71517a5..e4e17fc9e7 100644
--- a/src/StepShape/StepShape_Loop.cxx
+++ b/src/StepShape/StepShape_Loop.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_Loop.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Loop,StepShape_TopologicalRepresentationItem)
+
 StepShape_Loop::StepShape_Loop ()  {}
 
diff --git a/src/StepShape/StepShape_Loop.hxx b/src/StepShape/StepShape_Loop.hxx
index 7ae5748a5c..f35554de22 100644
--- a/src/StepShape/StepShape_Loop.hxx
+++ b/src/StepShape/StepShape_Loop.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Loop,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Loop,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_LoopAndPath.cxx b/src/StepShape/StepShape_LoopAndPath.cxx
index f1c038c03a..b8b868059f 100644
--- a/src/StepShape/StepShape_LoopAndPath.cxx
+++ b/src/StepShape/StepShape_LoopAndPath.cxx
@@ -19,6 +19,8 @@
 #include <StepShape_Path.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_LoopAndPath,StepShape_TopologicalRepresentationItem)
+
 StepShape_LoopAndPath::StepShape_LoopAndPath ()  {}
 
 void StepShape_LoopAndPath::Init(
diff --git a/src/StepShape/StepShape_LoopAndPath.hxx b/src/StepShape/StepShape_LoopAndPath.hxx
index 2cbe93ead1..38bf9c3370 100644
--- a/src/StepShape/StepShape_LoopAndPath.hxx
+++ b/src/StepShape/StepShape_LoopAndPath.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_LoopAndPath,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_LoopAndPath,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ManifoldSolidBrep.cxx b/src/StepShape/StepShape_ManifoldSolidBrep.cxx
index 7d94676dd6..9dfabf5a39 100644
--- a/src/StepShape/StepShape_ManifoldSolidBrep.cxx
+++ b/src/StepShape/StepShape_ManifoldSolidBrep.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_ManifoldSolidBrep.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ManifoldSolidBrep,StepShape_SolidModel)
+
 StepShape_ManifoldSolidBrep::StepShape_ManifoldSolidBrep ()  {}
 
 void StepShape_ManifoldSolidBrep::Init(
diff --git a/src/StepShape/StepShape_ManifoldSolidBrep.hxx b/src/StepShape/StepShape_ManifoldSolidBrep.hxx
index 2db0cab5c4..1bd12b49d2 100644
--- a/src/StepShape/StepShape_ManifoldSolidBrep.hxx
+++ b/src/StepShape/StepShape_ManifoldSolidBrep.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ManifoldSolidBrep,StepShape_SolidModel)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ManifoldSolidBrep,StepShape_SolidModel)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cxx b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cxx
index 3ef3c6c270..51d5bfea31 100644
--- a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ManifoldSurfaceShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_ManifoldSurfaceShapeRepresentation::StepShape_ManifoldSurfaceShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.hxx b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.hxx
index aaa8f1538b..0c5f4f5a66 100644
--- a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_MeasureQualification.cxx b/src/StepShape/StepShape_MeasureQualification.cxx
index 14a269958d..043d919981 100644
--- a/src/StepShape/StepShape_MeasureQualification.cxx
+++ b/src/StepShape/StepShape_MeasureQualification.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_ValueQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_MeasureQualification,MMgt_TShared)
+
 StepShape_MeasureQualification::StepShape_MeasureQualification  ()    {  }
 
 void  StepShape_MeasureQualification::Init
diff --git a/src/StepShape/StepShape_MeasureQualification.hxx b/src/StepShape/StepShape_MeasureQualification.hxx
index ffaa2350f5..23fbbb4dc5 100644
--- a/src/StepShape/StepShape_MeasureQualification.hxx
+++ b/src/StepShape/StepShape_MeasureQualification.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_MeasureQualification,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_MeasureQualification,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cxx b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cxx
index a3acfe4a75..8d5c033d6b 100644
--- a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cxx
+++ b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_ValueQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem,StepRepr_RepresentationItem)
+
 StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem::StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem  ()
 {
   myMeasure = new StepBasic_MeasureWithUnit;
diff --git a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.hxx b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.hxx
index 32455fd95b..badf32f18d 100644
--- a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.hxx
+++ b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.cxx b/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.cxx
index 88ff60e028..c68a317f84 100644
--- a/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_NonManifoldSurfaceShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_NonManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_NonManifoldSurfaceShapeRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.hxx b/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.hxx
index e2f05a5dd4..2965cd6fb9 100644
--- a/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_NonManifoldSurfaceShapeRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_NonManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_NonManifoldSurfaceShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OpenShell.cxx b/src/StepShape/StepShape_OpenShell.cxx
index 74448a074d..91d709a9d6 100644
--- a/src/StepShape/StepShape_OpenShell.cxx
+++ b/src/StepShape/StepShape_OpenShell.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_OpenShell.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OpenShell,StepShape_ConnectedFaceSet)
+
 StepShape_OpenShell::StepShape_OpenShell ()  {}
 
diff --git a/src/StepShape/StepShape_OpenShell.hxx b/src/StepShape/StepShape_OpenShell.hxx
index d0f556f2f5..92395aec0d 100644
--- a/src/StepShape/StepShape_OpenShell.hxx
+++ b/src/StepShape/StepShape_OpenShell.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OpenShell,StepShape_ConnectedFaceSet)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OpenShell,StepShape_ConnectedFaceSet)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OrientedClosedShell.cxx b/src/StepShape/StepShape_OrientedClosedShell.cxx
index 45474c9f11..46bbac4186 100644
--- a/src/StepShape/StepShape_OrientedClosedShell.cxx
+++ b/src/StepShape/StepShape_OrientedClosedShell.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_OrientedClosedShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OrientedClosedShell,StepShape_ClosedShell)
+
 StepShape_OrientedClosedShell::StepShape_OrientedClosedShell ()  {}
 
 void StepShape_OrientedClosedShell::Init(
diff --git a/src/StepShape/StepShape_OrientedClosedShell.hxx b/src/StepShape/StepShape_OrientedClosedShell.hxx
index 9e11953420..74f97c75b2 100644
--- a/src/StepShape/StepShape_OrientedClosedShell.hxx
+++ b/src/StepShape/StepShape_OrientedClosedShell.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OrientedClosedShell,StepShape_ClosedShell)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OrientedClosedShell,StepShape_ClosedShell)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OrientedEdge.cxx b/src/StepShape/StepShape_OrientedEdge.cxx
index 49845ccdd2..62cd57cb31 100644
--- a/src/StepShape/StepShape_OrientedEdge.cxx
+++ b/src/StepShape/StepShape_OrientedEdge.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OrientedEdge,StepShape_Edge)
+
 StepShape_OrientedEdge::StepShape_OrientedEdge ()  {}
 
 
diff --git a/src/StepShape/StepShape_OrientedEdge.hxx b/src/StepShape/StepShape_OrientedEdge.hxx
index 6ce336d430..824db5088b 100644
--- a/src/StepShape/StepShape_OrientedEdge.hxx
+++ b/src/StepShape/StepShape_OrientedEdge.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OrientedEdge,StepShape_Edge)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OrientedEdge,StepShape_Edge)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OrientedFace.cxx b/src/StepShape/StepShape_OrientedFace.cxx
index 9f446e642e..bca6234f5b 100644
--- a/src/StepShape/StepShape_OrientedFace.cxx
+++ b/src/StepShape/StepShape_OrientedFace.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_OrientedFace.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OrientedFace,StepShape_Face)
+
 StepShape_OrientedFace::StepShape_OrientedFace ()  {}
 
 void StepShape_OrientedFace::Init(
diff --git a/src/StepShape/StepShape_OrientedFace.hxx b/src/StepShape/StepShape_OrientedFace.hxx
index 70db90058f..39773e7912 100644
--- a/src/StepShape/StepShape_OrientedFace.hxx
+++ b/src/StepShape/StepShape_OrientedFace.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OrientedFace,StepShape_Face)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OrientedFace,StepShape_Face)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OrientedOpenShell.cxx b/src/StepShape/StepShape_OrientedOpenShell.cxx
index 33570e8826..db0ee1cf55 100644
--- a/src/StepShape/StepShape_OrientedOpenShell.cxx
+++ b/src/StepShape/StepShape_OrientedOpenShell.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_OrientedOpenShell.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OrientedOpenShell,StepShape_OpenShell)
+
 StepShape_OrientedOpenShell::StepShape_OrientedOpenShell ()  {}
 
 void StepShape_OrientedOpenShell::Init(
diff --git a/src/StepShape/StepShape_OrientedOpenShell.hxx b/src/StepShape/StepShape_OrientedOpenShell.hxx
index 0e5516fb85..5aa843c11b 100644
--- a/src/StepShape/StepShape_OrientedOpenShell.hxx
+++ b/src/StepShape/StepShape_OrientedOpenShell.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OrientedOpenShell,StepShape_OpenShell)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OrientedOpenShell,StepShape_OpenShell)
 
 protected:
 
diff --git a/src/StepShape/StepShape_OrientedPath.cxx b/src/StepShape/StepShape_OrientedPath.cxx
index 030e9c34fe..51a2d26f42 100644
--- a/src/StepShape/StepShape_OrientedPath.cxx
+++ b/src/StepShape/StepShape_OrientedPath.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_OrientedPath.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_OrientedPath,StepShape_Path)
+
 StepShape_OrientedPath::StepShape_OrientedPath ()  {}
 
 void StepShape_OrientedPath::Init(
diff --git a/src/StepShape/StepShape_OrientedPath.hxx b/src/StepShape/StepShape_OrientedPath.hxx
index e08ef29eb8..c91f8e25a3 100644
--- a/src/StepShape/StepShape_OrientedPath.hxx
+++ b/src/StepShape/StepShape_OrientedPath.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_OrientedPath,StepShape_Path)
+  DEFINE_STANDARD_RTTIEXT(StepShape_OrientedPath,StepShape_Path)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Path.cxx b/src/StepShape/StepShape_Path.cxx
index 3621abb808..634d6e71a3 100644
--- a/src/StepShape/StepShape_Path.cxx
+++ b/src/StepShape/StepShape_Path.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Path.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Path,StepShape_TopologicalRepresentationItem)
+
 StepShape_Path::StepShape_Path ()  {}
 
 void StepShape_Path::Init(
diff --git a/src/StepShape/StepShape_Path.hxx b/src/StepShape/StepShape_Path.hxx
index 0b86fd415d..1b7b36fabb 100644
--- a/src/StepShape/StepShape_Path.hxx
+++ b/src/StepShape/StepShape_Path.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Path,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Path,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_PlusMinusTolerance.cxx b/src/StepShape/StepShape_PlusMinusTolerance.cxx
index 4f80941844..cb6fabca0c 100644
--- a/src/StepShape/StepShape_PlusMinusTolerance.cxx
+++ b/src/StepShape/StepShape_PlusMinusTolerance.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_PlusMinusTolerance.hxx>
 #include <StepShape_ToleranceMethodDefinition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_PlusMinusTolerance,MMgt_TShared)
+
 StepShape_PlusMinusTolerance::StepShape_PlusMinusTolerance  ()    {  }
 
 void  StepShape_PlusMinusTolerance::Init
diff --git a/src/StepShape/StepShape_PlusMinusTolerance.hxx b/src/StepShape/StepShape_PlusMinusTolerance.hxx
index b0cca87d16..a49a1eb49f 100644
--- a/src/StepShape/StepShape_PlusMinusTolerance.hxx
+++ b/src/StepShape/StepShape_PlusMinusTolerance.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_PlusMinusTolerance,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_PlusMinusTolerance,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_PointRepresentation.cxx b/src/StepShape/StepShape_PointRepresentation.cxx
index 2532e02d80..f7f32e05fa 100644
--- a/src/StepShape/StepShape_PointRepresentation.cxx
+++ b/src/StepShape/StepShape_PointRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_PointRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_PointRepresentation,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_PointRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_PointRepresentation.hxx b/src/StepShape/StepShape_PointRepresentation.hxx
index 35c651df7b..8877155c5e 100644
--- a/src/StepShape/StepShape_PointRepresentation.hxx
+++ b/src/StepShape/StepShape_PointRepresentation.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_PointRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_PointRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_PolyLoop.cxx b/src/StepShape/StepShape_PolyLoop.cxx
index d4e62e94fe..0de6ee324b 100644
--- a/src/StepShape/StepShape_PolyLoop.cxx
+++ b/src/StepShape/StepShape_PolyLoop.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_PolyLoop.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_PolyLoop,StepShape_Loop)
+
 StepShape_PolyLoop::StepShape_PolyLoop ()  {}
 
 void StepShape_PolyLoop::Init(
diff --git a/src/StepShape/StepShape_PolyLoop.hxx b/src/StepShape/StepShape_PolyLoop.hxx
index f206d6f02b..b197c2db06 100644
--- a/src/StepShape/StepShape_PolyLoop.hxx
+++ b/src/StepShape/StepShape_PolyLoop.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_PolyLoop,StepShape_Loop)
+  DEFINE_STANDARD_RTTIEXT(StepShape_PolyLoop,StepShape_Loop)
 
 protected:
 
diff --git a/src/StepShape/StepShape_PrecisionQualifier.cxx b/src/StepShape/StepShape_PrecisionQualifier.cxx
index 0d3f8535e8..b7f886c11b 100644
--- a/src/StepShape/StepShape_PrecisionQualifier.cxx
+++ b/src/StepShape/StepShape_PrecisionQualifier.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_PrecisionQualifier.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_PrecisionQualifier,MMgt_TShared)
+
 StepShape_PrecisionQualifier::StepShape_PrecisionQualifier  ()    {  }
 
 void  StepShape_PrecisionQualifier::Init
diff --git a/src/StepShape/StepShape_PrecisionQualifier.hxx b/src/StepShape/StepShape_PrecisionQualifier.hxx
index f7d611ed80..2c5a50904e 100644
--- a/src/StepShape/StepShape_PrecisionQualifier.hxx
+++ b/src/StepShape/StepShape_PrecisionQualifier.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_PrecisionQualifier,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_PrecisionQualifier,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_QualifiedRepresentationItem.cxx b/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
index 67b9551dbe..22db354a8e 100644
--- a/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
+++ b/src/StepShape/StepShape_QualifiedRepresentationItem.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_ValueQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_QualifiedRepresentationItem,StepRepr_RepresentationItem)
+
 StepShape_QualifiedRepresentationItem::StepShape_QualifiedRepresentationItem  ()    {  }
 
 void  StepShape_QualifiedRepresentationItem::Init
diff --git a/src/StepShape/StepShape_QualifiedRepresentationItem.hxx b/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
index 570771b662..eba40b438a 100644
--- a/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
+++ b/src/StepShape/StepShape_QualifiedRepresentationItem.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_QualifiedRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_QualifiedRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_RevolvedAreaSolid.cxx b/src/StepShape/StepShape_RevolvedAreaSolid.cxx
index 3b3d3ab197..e9c5808747 100644
--- a/src/StepShape/StepShape_RevolvedAreaSolid.cxx
+++ b/src/StepShape/StepShape_RevolvedAreaSolid.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_RevolvedAreaSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_RevolvedAreaSolid,StepShape_SweptAreaSolid)
+
 StepShape_RevolvedAreaSolid::StepShape_RevolvedAreaSolid ()  {}
 
 void StepShape_RevolvedAreaSolid::Init(
diff --git a/src/StepShape/StepShape_RevolvedAreaSolid.hxx b/src/StepShape/StepShape_RevolvedAreaSolid.hxx
index aeddaaf48a..27a7c97654 100644
--- a/src/StepShape/StepShape_RevolvedAreaSolid.hxx
+++ b/src/StepShape/StepShape_RevolvedAreaSolid.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_RevolvedAreaSolid,StepShape_SweptAreaSolid)
+  DEFINE_STANDARD_RTTIEXT(StepShape_RevolvedAreaSolid,StepShape_SweptAreaSolid)
 
 protected:
 
diff --git a/src/StepShape/StepShape_RevolvedFaceSolid.cxx b/src/StepShape/StepShape_RevolvedFaceSolid.cxx
index f790c6e440..c7de0db790 100644
--- a/src/StepShape/StepShape_RevolvedFaceSolid.cxx
+++ b/src/StepShape/StepShape_RevolvedFaceSolid.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_RevolvedFaceSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_RevolvedFaceSolid,StepShape_SweptFaceSolid)
+
 StepShape_RevolvedFaceSolid::StepShape_RevolvedFaceSolid ()  {}
 
 void StepShape_RevolvedFaceSolid::Init(
diff --git a/src/StepShape/StepShape_RevolvedFaceSolid.hxx b/src/StepShape/StepShape_RevolvedFaceSolid.hxx
index 4ede230b0c..cf4719b4f1 100644
--- a/src/StepShape/StepShape_RevolvedFaceSolid.hxx
+++ b/src/StepShape/StepShape_RevolvedFaceSolid.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_RevolvedFaceSolid,StepShape_SweptFaceSolid)
+  DEFINE_STANDARD_RTTIEXT(StepShape_RevolvedFaceSolid,StepShape_SweptFaceSolid)
 
 protected:
 
diff --git a/src/StepShape/StepShape_RightAngularWedge.cxx b/src/StepShape/StepShape_RightAngularWedge.cxx
index 6524540270..6ffddc32af 100644
--- a/src/StepShape/StepShape_RightAngularWedge.cxx
+++ b/src/StepShape/StepShape_RightAngularWedge.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_RightAngularWedge.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_RightAngularWedge,StepGeom_GeometricRepresentationItem)
+
 StepShape_RightAngularWedge::StepShape_RightAngularWedge ()  {}
 
 void StepShape_RightAngularWedge::Init(
diff --git a/src/StepShape/StepShape_RightAngularWedge.hxx b/src/StepShape/StepShape_RightAngularWedge.hxx
index 8cc3178222..537c3b17e9 100644
--- a/src/StepShape/StepShape_RightAngularWedge.hxx
+++ b/src/StepShape/StepShape_RightAngularWedge.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_RightAngularWedge,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_RightAngularWedge,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_RightCircularCone.cxx b/src/StepShape/StepShape_RightCircularCone.cxx
index 48785ef233..913e4ddb2c 100644
--- a/src/StepShape/StepShape_RightCircularCone.cxx
+++ b/src/StepShape/StepShape_RightCircularCone.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_RightCircularCone.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_RightCircularCone,StepGeom_GeometricRepresentationItem)
+
 StepShape_RightCircularCone::StepShape_RightCircularCone ()  {}
 
 void StepShape_RightCircularCone::Init(
diff --git a/src/StepShape/StepShape_RightCircularCone.hxx b/src/StepShape/StepShape_RightCircularCone.hxx
index d46b68d80e..62a7411db9 100644
--- a/src/StepShape/StepShape_RightCircularCone.hxx
+++ b/src/StepShape/StepShape_RightCircularCone.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_RightCircularCone,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_RightCircularCone,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_RightCircularCylinder.cxx b/src/StepShape/StepShape_RightCircularCylinder.cxx
index 9fb095161e..c9d813b166 100644
--- a/src/StepShape/StepShape_RightCircularCylinder.cxx
+++ b/src/StepShape/StepShape_RightCircularCylinder.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_RightCircularCylinder.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_RightCircularCylinder,StepGeom_GeometricRepresentationItem)
+
 StepShape_RightCircularCylinder::StepShape_RightCircularCylinder ()  {}
 
 void StepShape_RightCircularCylinder::Init(
diff --git a/src/StepShape/StepShape_RightCircularCylinder.hxx b/src/StepShape/StepShape_RightCircularCylinder.hxx
index aef85e1cbd..bb4e838c01 100644
--- a/src/StepShape/StepShape_RightCircularCylinder.hxx
+++ b/src/StepShape/StepShape_RightCircularCylinder.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_RightCircularCylinder,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_RightCircularCylinder,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_SeamEdge.cxx b/src/StepShape/StepShape_SeamEdge.cxx
index fa498658c3..ae8bb9f5dc 100644
--- a/src/StepShape/StepShape_SeamEdge.cxx
+++ b/src/StepShape/StepShape_SeamEdge.cxx
@@ -21,6 +21,8 @@
 #include <StepShape_SeamEdge.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_SeamEdge,StepShape_OrientedEdge)
+
 //=======================================================================
 //function : StepShape_SeamEdge
 //purpose  : 
diff --git a/src/StepShape/StepShape_SeamEdge.hxx b/src/StepShape/StepShape_SeamEdge.hxx
index 469952cdf3..c0ee6c5973 100644
--- a/src/StepShape/StepShape_SeamEdge.hxx
+++ b/src/StepShape/StepShape_SeamEdge.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_SeamEdge,StepShape_OrientedEdge)
+  DEFINE_STANDARD_RTTIEXT(StepShape_SeamEdge,StepShape_OrientedEdge)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx b/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
index fdcc8da048..ce4b3c789b 100644
--- a/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
+++ b/src/StepShape/StepShape_ShapeDefinitionRepresentation.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ShapeDefinitionRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
+
 //=======================================================================
 //function : StepShape_ShapeDefinitionRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx b/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
index 0e726d8f44..cb1c72318f 100644
--- a/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
+++ b/src/StepShape/StepShape_ShapeDefinitionRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ShapeDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ShapeDefinitionRepresentation,StepRepr_PropertyDefinitionRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx b/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
index 418fa22283..2274f9389c 100644
--- a/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
+++ b/src/StepShape/StepShape_ShapeDimensionRepresentation.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ShapeDimensionRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeDimensionRepresentation,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_ShapeDimensionRepresentation
 //purpose  : 
diff --git a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
index 77ab6dab29..0f7955b9bf 100644
--- a/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
+++ b/src/StepShape/StepShape_ShapeDimensionRepresentation.hxx
@@ -46,7 +46,7 @@ public:
   
   Standard_EXPORT Handle(StepShape_HArray1OfShapeDimensionRepresentationItem) ItemsAP242() const;
   
-  DEFINE_STANDARD_RTTI(StepShape_ShapeDimensionRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ShapeDimensionRepresentation,StepShape_ShapeRepresentation)
 private:
 
   Handle(StepShape_HArray1OfShapeDimensionRepresentationItem) itemsAP242;
diff --git a/src/StepShape/StepShape_ShapeRepresentation.cxx b/src/StepShape/StepShape_ShapeRepresentation.cxx
index 5a88d3e69e..8918ffd1e8 100644
--- a/src/StepShape/StepShape_ShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_ShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeRepresentation,StepRepr_Representation)
+
 StepShape_ShapeRepresentation::StepShape_ShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_ShapeRepresentation.hxx b/src/StepShape/StepShape_ShapeRepresentation.hxx
index 75fa955ba7..07f5ebd933 100644
--- a/src/StepShape/StepShape_ShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_ShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ShapeRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ShapeRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ShapeRepresentationWithParameters.cxx b/src/StepShape/StepShape_ShapeRepresentationWithParameters.cxx
index 4b4c4e07f8..132b324c7c 100644
--- a/src/StepShape/StepShape_ShapeRepresentationWithParameters.cxx
+++ b/src/StepShape/StepShape_ShapeRepresentationWithParameters.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepShape_ShapeRepresentationWithParameters.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShapeRepresentationWithParameters,StepShape_ShapeRepresentation)
+
 //=======================================================================
 //function : StepShape_ShapeRepresentationWithParameters
 //purpose  : 
diff --git a/src/StepShape/StepShape_ShapeRepresentationWithParameters.hxx b/src/StepShape/StepShape_ShapeRepresentationWithParameters.hxx
index 5ff0d58484..e1cc1148f4 100644
--- a/src/StepShape/StepShape_ShapeRepresentationWithParameters.hxx
+++ b/src/StepShape/StepShape_ShapeRepresentationWithParameters.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ShapeRepresentationWithParameters,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ShapeRepresentationWithParameters,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx b/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
index 39fba2d1e5..6fb7c92139 100644
--- a/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
+++ b/src/StepShape/StepShape_ShellBasedSurfaceModel.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_ShellBasedSurfaceModel.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ShellBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
+
 StepShape_ShellBasedSurfaceModel::StepShape_ShellBasedSurfaceModel ()  {}
 
 void StepShape_ShellBasedSurfaceModel::Init(
diff --git a/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx b/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
index 48ccdce862..4f45b591e9 100644
--- a/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
+++ b/src/StepShape/StepShape_ShellBasedSurfaceModel.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ShellBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ShellBasedSurfaceModel,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_SolidModel.cxx b/src/StepShape/StepShape_SolidModel.cxx
index 3d9e4e963e..6ce358d28c 100644
--- a/src/StepShape/StepShape_SolidModel.cxx
+++ b/src/StepShape/StepShape_SolidModel.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_SolidModel.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_SolidModel,StepGeom_GeometricRepresentationItem)
+
 StepShape_SolidModel::StepShape_SolidModel ()  {}
 
diff --git a/src/StepShape/StepShape_SolidModel.hxx b/src/StepShape/StepShape_SolidModel.hxx
index 5bb741c7a3..cea81dcadc 100644
--- a/src/StepShape/StepShape_SolidModel.hxx
+++ b/src/StepShape/StepShape_SolidModel.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_SolidModel,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_SolidModel,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_SolidReplica.cxx b/src/StepShape/StepShape_SolidReplica.cxx
index 5bee8bd713..057ad7e867 100644
--- a/src/StepShape/StepShape_SolidReplica.cxx
+++ b/src/StepShape/StepShape_SolidReplica.cxx
@@ -18,6 +18,8 @@
 #include <StepShape_SolidReplica.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_SolidReplica,StepShape_SolidModel)
+
 StepShape_SolidReplica::StepShape_SolidReplica ()  {}
 
 void StepShape_SolidReplica::Init(
diff --git a/src/StepShape/StepShape_SolidReplica.hxx b/src/StepShape/StepShape_SolidReplica.hxx
index b519b6c00b..5c0bb67ac4 100644
--- a/src/StepShape/StepShape_SolidReplica.hxx
+++ b/src/StepShape/StepShape_SolidReplica.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_SolidReplica,StepShape_SolidModel)
+  DEFINE_STANDARD_RTTIEXT(StepShape_SolidReplica,StepShape_SolidModel)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Sphere.cxx b/src/StepShape/StepShape_Sphere.cxx
index 9fe202d1b1..45dad7ecb7 100644
--- a/src/StepShape/StepShape_Sphere.cxx
+++ b/src/StepShape/StepShape_Sphere.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Sphere.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Sphere,StepGeom_GeometricRepresentationItem)
+
 StepShape_Sphere::StepShape_Sphere ()  {}
 
 void StepShape_Sphere::Init(
diff --git a/src/StepShape/StepShape_Sphere.hxx b/src/StepShape/StepShape_Sphere.hxx
index 6beb9b6150..7cc256a853 100644
--- a/src/StepShape/StepShape_Sphere.hxx
+++ b/src/StepShape/StepShape_Sphere.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Sphere,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Sphere,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Subedge.cxx b/src/StepShape/StepShape_Subedge.cxx
index c187804f74..5e2fc7b11c 100644
--- a/src/StepShape/StepShape_Subedge.cxx
+++ b/src/StepShape/StepShape_Subedge.cxx
@@ -21,6 +21,8 @@
 #include <StepShape_Vertex.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Subedge,StepShape_Edge)
+
 //=======================================================================
 //function : StepShape_Subedge
 //purpose  : 
diff --git a/src/StepShape/StepShape_Subedge.hxx b/src/StepShape/StepShape_Subedge.hxx
index 8ca2cb9263..24f571f2ad 100644
--- a/src/StepShape/StepShape_Subedge.hxx
+++ b/src/StepShape/StepShape_Subedge.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Subedge,StepShape_Edge)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Subedge,StepShape_Edge)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Subface.cxx b/src/StepShape/StepShape_Subface.cxx
index a6fbbfdfe1..c5b79a7c24 100644
--- a/src/StepShape/StepShape_Subface.cxx
+++ b/src/StepShape/StepShape_Subface.cxx
@@ -20,6 +20,8 @@
 #include <StepShape_Subface.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Subface,StepShape_Face)
+
 //=======================================================================
 //function : StepShape_Subface
 //purpose  : 
diff --git a/src/StepShape/StepShape_Subface.hxx b/src/StepShape/StepShape_Subface.hxx
index 9303f47afd..dc26d37f5b 100644
--- a/src/StepShape/StepShape_Subface.hxx
+++ b/src/StepShape/StepShape_Subface.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Subface,StepShape_Face)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Subface,StepShape_Face)
 
 protected:
 
diff --git a/src/StepShape/StepShape_SweptAreaSolid.cxx b/src/StepShape/StepShape_SweptAreaSolid.cxx
index 93f4de1675..185d27456e 100644
--- a/src/StepShape/StepShape_SweptAreaSolid.cxx
+++ b/src/StepShape/StepShape_SweptAreaSolid.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_SweptAreaSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_SweptAreaSolid,StepShape_SolidModel)
+
 StepShape_SweptAreaSolid::StepShape_SweptAreaSolid ()  {}
 
 void StepShape_SweptAreaSolid::Init(
diff --git a/src/StepShape/StepShape_SweptAreaSolid.hxx b/src/StepShape/StepShape_SweptAreaSolid.hxx
index 936a32ca86..a89bd6fb42 100644
--- a/src/StepShape/StepShape_SweptAreaSolid.hxx
+++ b/src/StepShape/StepShape_SweptAreaSolid.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_SweptAreaSolid,StepShape_SolidModel)
+  DEFINE_STANDARD_RTTIEXT(StepShape_SweptAreaSolid,StepShape_SolidModel)
 
 protected:
 
diff --git a/src/StepShape/StepShape_SweptFaceSolid.cxx b/src/StepShape/StepShape_SweptFaceSolid.cxx
index 31c1002206..609a186b3b 100644
--- a/src/StepShape/StepShape_SweptFaceSolid.cxx
+++ b/src/StepShape/StepShape_SweptFaceSolid.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_SweptFaceSolid.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_SweptFaceSolid,StepShape_SolidModel)
+
 StepShape_SweptFaceSolid::StepShape_SweptFaceSolid ()  {}
 
 void StepShape_SweptFaceSolid::Init(
diff --git a/src/StepShape/StepShape_SweptFaceSolid.hxx b/src/StepShape/StepShape_SweptFaceSolid.hxx
index 1957410e2b..9ceb734009 100644
--- a/src/StepShape/StepShape_SweptFaceSolid.hxx
+++ b/src/StepShape/StepShape_SweptFaceSolid.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_SweptFaceSolid,StepShape_SolidModel)
+  DEFINE_STANDARD_RTTIEXT(StepShape_SweptFaceSolid,StepShape_SolidModel)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ToleranceValue.cxx b/src/StepShape/StepShape_ToleranceValue.cxx
index 6a8aa41581..9867897a76 100644
--- a/src/StepShape/StepShape_ToleranceValue.cxx
+++ b/src/StepShape/StepShape_ToleranceValue.cxx
@@ -16,6 +16,8 @@
 #include <StepBasic_MeasureWithUnit.hxx>
 #include <StepShape_ToleranceValue.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ToleranceValue,MMgt_TShared)
+
 StepShape_ToleranceValue::StepShape_ToleranceValue  ()    {  }
 
 void  StepShape_ToleranceValue::Init
diff --git a/src/StepShape/StepShape_ToleranceValue.hxx b/src/StepShape/StepShape_ToleranceValue.hxx
index 5f79655c11..6f99bb47b9 100644
--- a/src/StepShape/StepShape_ToleranceValue.hxx
+++ b/src/StepShape/StepShape_ToleranceValue.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_ToleranceValue,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ToleranceValue,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_TopologicalRepresentationItem.cxx b/src/StepShape/StepShape_TopologicalRepresentationItem.cxx
index 9a02e403d2..1dea1e9d85 100644
--- a/src/StepShape/StepShape_TopologicalRepresentationItem.cxx
+++ b/src/StepShape/StepShape_TopologicalRepresentationItem.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_TopologicalRepresentationItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_TopologicalRepresentationItem,StepRepr_RepresentationItem)
+
 StepShape_TopologicalRepresentationItem::StepShape_TopologicalRepresentationItem ()  {}
 
diff --git a/src/StepShape/StepShape_TopologicalRepresentationItem.hxx b/src/StepShape/StepShape_TopologicalRepresentationItem.hxx
index 70bba07b07..5c643b0d2c 100644
--- a/src/StepShape/StepShape_TopologicalRepresentationItem.hxx
+++ b/src/StepShape/StepShape_TopologicalRepresentationItem.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_TopologicalRepresentationItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_TopologicalRepresentationItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_Torus.cxx b/src/StepShape/StepShape_Torus.cxx
index 2e11980651..939e2c6d79 100644
--- a/src/StepShape/StepShape_Torus.cxx
+++ b/src/StepShape/StepShape_Torus.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_Torus.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Torus,StepGeom_GeometricRepresentationItem)
+
 StepShape_Torus::StepShape_Torus ()  {}
 
 void StepShape_Torus::Init(
diff --git a/src/StepShape/StepShape_Torus.hxx b/src/StepShape/StepShape_Torus.hxx
index 8cbd4e1805..83dd3cf915 100644
--- a/src/StepShape/StepShape_Torus.hxx
+++ b/src/StepShape/StepShape_Torus.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Torus,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Torus,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_TransitionalShapeRepresentation.cxx b/src/StepShape/StepShape_TransitionalShapeRepresentation.cxx
index 3fbe45accd..167f5d2fb8 100644
--- a/src/StepShape/StepShape_TransitionalShapeRepresentation.cxx
+++ b/src/StepShape/StepShape_TransitionalShapeRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_TransitionalShapeRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_TransitionalShapeRepresentation,StepShape_ShapeRepresentation)
+
 StepShape_TransitionalShapeRepresentation::StepShape_TransitionalShapeRepresentation ()  {}
 
diff --git a/src/StepShape/StepShape_TransitionalShapeRepresentation.hxx b/src/StepShape/StepShape_TransitionalShapeRepresentation.hxx
index 631c70f336..308bc1b697 100644
--- a/src/StepShape/StepShape_TransitionalShapeRepresentation.hxx
+++ b/src/StepShape/StepShape_TransitionalShapeRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_TransitionalShapeRepresentation,StepShape_ShapeRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepShape_TransitionalShapeRepresentation,StepShape_ShapeRepresentation)
 
 protected:
 
diff --git a/src/StepShape/StepShape_TypeQualifier.cxx b/src/StepShape/StepShape_TypeQualifier.cxx
index 7d2951f1a2..edf88d0b63 100644
--- a/src/StepShape/StepShape_TypeQualifier.cxx
+++ b/src/StepShape/StepShape_TypeQualifier.cxx
@@ -16,6 +16,8 @@
 #include <StepShape_TypeQualifier.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_TypeQualifier,MMgt_TShared)
+
 StepShape_TypeQualifier::StepShape_TypeQualifier  ()    {  }
 
 void  StepShape_TypeQualifier::Init
diff --git a/src/StepShape/StepShape_TypeQualifier.hxx b/src/StepShape/StepShape_TypeQualifier.hxx
index 61822b1ad3..d239e4cdf5 100644
--- a/src/StepShape/StepShape_TypeQualifier.hxx
+++ b/src/StepShape/StepShape_TypeQualifier.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_TypeQualifier,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_TypeQualifier,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepShape/StepShape_ValueFormatTypeQualifier.cxx b/src/StepShape/StepShape_ValueFormatTypeQualifier.cxx
index 429acfb755..5b088d0ec3 100644
--- a/src/StepShape/StepShape_ValueFormatTypeQualifier.cxx
+++ b/src/StepShape/StepShape_ValueFormatTypeQualifier.cxx
@@ -15,6 +15,8 @@
 
 #include <StepShape_ValueFormatTypeQualifier.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_ValueFormatTypeQualifier,MMgt_TShared)
+
 //=======================================================================
 //function : StepShape_ValueFormatTypeQualifier
 //purpose  : 
diff --git a/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx b/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
index 0b1a703013..4c235a9f42 100644
--- a/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
+++ b/src/StepShape/StepShape_ValueFormatTypeQualifier.hxx
@@ -50,7 +50,7 @@ public:
     formatType = theFormatType;
   }
 
-  DEFINE_STANDARD_RTTI(StepShape_ValueFormatTypeQualifier, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepShape_ValueFormatTypeQualifier,MMgt_TShared)
   
 private:
   Handle(TCollection_HAsciiString) formatType;
diff --git a/src/StepShape/StepShape_Vertex.cxx b/src/StepShape/StepShape_Vertex.cxx
index 7bdba3b719..79ac89f023 100644
--- a/src/StepShape/StepShape_Vertex.cxx
+++ b/src/StepShape/StepShape_Vertex.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepShape_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_Vertex,StepShape_TopologicalRepresentationItem)
+
 StepShape_Vertex::StepShape_Vertex ()  {}
 
diff --git a/src/StepShape/StepShape_Vertex.hxx b/src/StepShape/StepShape_Vertex.hxx
index a2cc7eaadd..22ae6b09cd 100644
--- a/src/StepShape/StepShape_Vertex.hxx
+++ b/src/StepShape/StepShape_Vertex.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_Vertex,StepShape_TopologicalRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepShape_Vertex,StepShape_TopologicalRepresentationItem)
 
 protected:
 
diff --git a/src/StepShape/StepShape_VertexLoop.cxx b/src/StepShape/StepShape_VertexLoop.cxx
index 32c5ed70d8..4dbd4f9c7e 100644
--- a/src/StepShape/StepShape_VertexLoop.cxx
+++ b/src/StepShape/StepShape_VertexLoop.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_VertexLoop.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_VertexLoop,StepShape_Loop)
+
 StepShape_VertexLoop::StepShape_VertexLoop ()  {}
 
 void StepShape_VertexLoop::Init(
diff --git a/src/StepShape/StepShape_VertexLoop.hxx b/src/StepShape/StepShape_VertexLoop.hxx
index 8a139c2757..4247b86bb2 100644
--- a/src/StepShape/StepShape_VertexLoop.hxx
+++ b/src/StepShape/StepShape_VertexLoop.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_VertexLoop,StepShape_Loop)
+  DEFINE_STANDARD_RTTIEXT(StepShape_VertexLoop,StepShape_Loop)
 
 protected:
 
diff --git a/src/StepShape/StepShape_VertexPoint.cxx b/src/StepShape/StepShape_VertexPoint.cxx
index 19b90528b8..38f5b7e4fe 100644
--- a/src/StepShape/StepShape_VertexPoint.cxx
+++ b/src/StepShape/StepShape_VertexPoint.cxx
@@ -17,6 +17,8 @@
 #include <StepShape_VertexPoint.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepShape_VertexPoint,StepShape_Vertex)
+
 StepShape_VertexPoint::StepShape_VertexPoint ()  {}
 
 void StepShape_VertexPoint::Init(
diff --git a/src/StepShape/StepShape_VertexPoint.hxx b/src/StepShape/StepShape_VertexPoint.hxx
index 01948eb79a..f1343074d7 100644
--- a/src/StepShape/StepShape_VertexPoint.hxx
+++ b/src/StepShape/StepShape_VertexPoint.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepShape_VertexPoint,StepShape_Vertex)
+  DEFINE_STANDARD_RTTIEXT(StepShape_VertexPoint,StepShape_Vertex)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_AnnotationOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
index 21c7344541..6ac10ae417 100644
--- a/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationOccurrence.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_AnnotationOccurrence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationOccurrence,StepVisual_StyledItem)
+
 StepVisual_AnnotationOccurrence::StepVisual_AnnotationOccurrence ()  {}
 
diff --git a/src/StepVisual/StepVisual_AnnotationOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
index 535b4f826b..ce1b8a693b 100644
--- a/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationOccurrence.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_AnnotationOccurrence,StepVisual_StyledItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationOccurrence,StepVisual_StyledItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_AnnotationText.cxx b/src/StepVisual/StepVisual_AnnotationText.cxx
index 07667fdc89..75682bf8e4 100644
--- a/src/StepVisual/StepVisual_AnnotationText.cxx
+++ b/src/StepVisual/StepVisual_AnnotationText.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_AnnotationText.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationText,StepRepr_MappedItem)
+
 StepVisual_AnnotationText::StepVisual_AnnotationText ()  {}
 
diff --git a/src/StepVisual/StepVisual_AnnotationText.hxx b/src/StepVisual/StepVisual_AnnotationText.hxx
index d1d22fa8fa..2980c558b3 100644
--- a/src/StepVisual/StepVisual_AnnotationText.hxx
+++ b/src/StepVisual/StepVisual_AnnotationText.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_AnnotationText,StepRepr_MappedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationText,StepRepr_MappedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
index e4a735e1ca..b287d89943 100644
--- a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
+++ b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_AnnotationTextOccurrence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationTextOccurrence,StepVisual_AnnotationOccurrence)
+
 StepVisual_AnnotationTextOccurrence::StepVisual_AnnotationTextOccurrence ()  {}
 
diff --git a/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx b/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
index b229d76a1a..611b7d01cb 100644
--- a/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
+++ b/src/StepVisual/StepVisual_AnnotationTextOccurrence.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_AnnotationTextOccurrence,StepVisual_AnnotationOccurrence)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationTextOccurrence,StepVisual_AnnotationOccurrence)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_AreaInSet.cxx b/src/StepVisual/StepVisual_AreaInSet.cxx
index e05908e6df..5f59232a5c 100644
--- a/src/StepVisual/StepVisual_AreaInSet.cxx
+++ b/src/StepVisual/StepVisual_AreaInSet.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PresentationArea.hxx>
 #include <StepVisual_PresentationSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AreaInSet,MMgt_TShared)
+
 StepVisual_AreaInSet::StepVisual_AreaInSet ()  {}
 
 void StepVisual_AreaInSet::Init(
diff --git a/src/StepVisual/StepVisual_AreaInSet.hxx b/src/StepVisual/StepVisual_AreaInSet.hxx
index 4e30904fd1..d0bd766a0c 100644
--- a/src/StepVisual/StepVisual_AreaInSet.hxx
+++ b/src/StepVisual/StepVisual_AreaInSet.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_AreaInSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_AreaInSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_BackgroundColour.cxx b/src/StepVisual/StepVisual_BackgroundColour.cxx
index 1773e866cb..3f69e6d95e 100644
--- a/src/StepVisual/StepVisual_BackgroundColour.cxx
+++ b/src/StepVisual/StepVisual_BackgroundColour.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_AreaOrView.hxx>
 #include <StepVisual_BackgroundColour.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_BackgroundColour,StepVisual_Colour)
+
 StepVisual_BackgroundColour::StepVisual_BackgroundColour ()  {}
 
 void StepVisual_BackgroundColour::Init(
diff --git a/src/StepVisual/StepVisual_BackgroundColour.hxx b/src/StepVisual/StepVisual_BackgroundColour.hxx
index 5aa99ef9a3..0f4040090c 100644
--- a/src/StepVisual/StepVisual_BackgroundColour.hxx
+++ b/src/StepVisual/StepVisual_BackgroundColour.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_BackgroundColour,StepVisual_Colour)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_BackgroundColour,StepVisual_Colour)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraImage.cxx b/src/StepVisual/StepVisual_CameraImage.cxx
index 7d04f1a3c9..29e43c858a 100644
--- a/src/StepVisual/StepVisual_CameraImage.cxx
+++ b/src/StepVisual/StepVisual_CameraImage.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CameraImage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraImage,StepRepr_MappedItem)
+
 StepVisual_CameraImage::StepVisual_CameraImage ()  {}
 
diff --git a/src/StepVisual/StepVisual_CameraImage.hxx b/src/StepVisual/StepVisual_CameraImage.hxx
index a040a3086c..7d3db3c691 100644
--- a/src/StepVisual/StepVisual_CameraImage.hxx
+++ b/src/StepVisual/StepVisual_CameraImage.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraImage,StepRepr_MappedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraImage,StepRepr_MappedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraImage2dWithScale.cxx b/src/StepVisual/StepVisual_CameraImage2dWithScale.cxx
index 3c0104ff46..0b37d08f54 100644
--- a/src/StepVisual/StepVisual_CameraImage2dWithScale.cxx
+++ b/src/StepVisual/StepVisual_CameraImage2dWithScale.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CameraImage2dWithScale.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraImage2dWithScale,StepVisual_CameraImage)
+
 StepVisual_CameraImage2dWithScale::StepVisual_CameraImage2dWithScale ()   {  }
diff --git a/src/StepVisual/StepVisual_CameraImage2dWithScale.hxx b/src/StepVisual/StepVisual_CameraImage2dWithScale.hxx
index 37e7466455..ae741e5887 100644
--- a/src/StepVisual/StepVisual_CameraImage2dWithScale.hxx
+++ b/src/StepVisual/StepVisual_CameraImage2dWithScale.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraImage2dWithScale,StepVisual_CameraImage)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraImage2dWithScale,StepVisual_CameraImage)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraImage3dWithScale.cxx b/src/StepVisual/StepVisual_CameraImage3dWithScale.cxx
index a89ff9552e..0b291f32cc 100644
--- a/src/StepVisual/StepVisual_CameraImage3dWithScale.cxx
+++ b/src/StepVisual/StepVisual_CameraImage3dWithScale.cxx
@@ -15,4 +15,6 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CameraImage3dWithScale.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraImage3dWithScale,StepVisual_CameraImage)
+
 StepVisual_CameraImage3dWithScale::StepVisual_CameraImage3dWithScale ()   {  }
diff --git a/src/StepVisual/StepVisual_CameraImage3dWithScale.hxx b/src/StepVisual/StepVisual_CameraImage3dWithScale.hxx
index f3911c5f9c..539467ad11 100644
--- a/src/StepVisual/StepVisual_CameraImage3dWithScale.hxx
+++ b/src/StepVisual/StepVisual_CameraImage3dWithScale.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraImage3dWithScale,StepVisual_CameraImage)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraImage3dWithScale,StepVisual_CameraImage)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraModel.cxx b/src/StepVisual/StepVisual_CameraModel.cxx
index ee90693630..11bf628cb2 100644
--- a/src/StepVisual/StepVisual_CameraModel.cxx
+++ b/src/StepVisual/StepVisual_CameraModel.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CameraModel.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraModel,StepGeom_GeometricRepresentationItem)
+
 StepVisual_CameraModel::StepVisual_CameraModel ()  {}
 
diff --git a/src/StepVisual/StepVisual_CameraModel.hxx b/src/StepVisual/StepVisual_CameraModel.hxx
index a712abd036..3c5ee506ff 100644
--- a/src/StepVisual/StepVisual_CameraModel.hxx
+++ b/src/StepVisual/StepVisual_CameraModel.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraModel,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraModel,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraModelD2.cxx b/src/StepVisual/StepVisual_CameraModelD2.cxx
index 400c7352a7..0f58a4c186 100644
--- a/src/StepVisual/StepVisual_CameraModelD2.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD2.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PlanarBox.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraModelD2,StepVisual_CameraModel)
+
 StepVisual_CameraModelD2::StepVisual_CameraModelD2 ()  {}
 
 void StepVisual_CameraModelD2::Init(
diff --git a/src/StepVisual/StepVisual_CameraModelD2.hxx b/src/StepVisual/StepVisual_CameraModelD2.hxx
index dfa3fe4f6e..a765401582 100644
--- a/src/StepVisual/StepVisual_CameraModelD2.hxx
+++ b/src/StepVisual/StepVisual_CameraModelD2.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraModelD2,StepVisual_CameraModel)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraModelD2,StepVisual_CameraModel)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraModelD3.cxx b/src/StepVisual/StepVisual_CameraModelD3.cxx
index 931e2926bd..ca2c62828e 100644
--- a/src/StepVisual/StepVisual_CameraModelD3.cxx
+++ b/src/StepVisual/StepVisual_CameraModelD3.cxx
@@ -18,6 +18,8 @@
 #include <StepVisual_ViewVolume.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraModelD3,StepVisual_CameraModel)
+
 StepVisual_CameraModelD3::StepVisual_CameraModelD3 ()  {}
 
 void StepVisual_CameraModelD3::Init(
diff --git a/src/StepVisual/StepVisual_CameraModelD3.hxx b/src/StepVisual/StepVisual_CameraModelD3.hxx
index 8cc938e0a5..cbd17441d9 100644
--- a/src/StepVisual/StepVisual_CameraModelD3.hxx
+++ b/src/StepVisual/StepVisual_CameraModelD3.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraModelD3,StepVisual_CameraModel)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraModelD3,StepVisual_CameraModel)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CameraUsage.cxx b/src/StepVisual/StepVisual_CameraUsage.cxx
index 1b4a5881c5..70325145e8 100644
--- a/src/StepVisual/StepVisual_CameraUsage.cxx
+++ b/src/StepVisual/StepVisual_CameraUsage.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CameraUsage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CameraUsage,StepRepr_RepresentationMap)
+
 StepVisual_CameraUsage::StepVisual_CameraUsage ()  {}
 
diff --git a/src/StepVisual/StepVisual_CameraUsage.hxx b/src/StepVisual/StepVisual_CameraUsage.hxx
index 197b8061a3..19ec121a25 100644
--- a/src/StepVisual/StepVisual_CameraUsage.hxx
+++ b/src/StepVisual/StepVisual_CameraUsage.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CameraUsage,StepRepr_RepresentationMap)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CameraUsage,StepRepr_RepresentationMap)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_Colour.cxx b/src/StepVisual/StepVisual_Colour.cxx
index 24703c1bf6..0d7b372a01 100644
--- a/src/StepVisual/StepVisual_Colour.cxx
+++ b/src/StepVisual/StepVisual_Colour.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_Colour.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_Colour,MMgt_TShared)
+
 StepVisual_Colour::StepVisual_Colour ()  {}
 
diff --git a/src/StepVisual/StepVisual_Colour.hxx b/src/StepVisual/StepVisual_Colour.hxx
index bb08c11e0d..5584e3a49d 100644
--- a/src/StepVisual/StepVisual_Colour.hxx
+++ b/src/StepVisual/StepVisual_Colour.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_Colour,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_Colour,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ColourRgb.cxx b/src/StepVisual/StepVisual_ColourRgb.cxx
index 4d2cd3e2f3..ae0d87a9e2 100644
--- a/src/StepVisual/StepVisual_ColourRgb.cxx
+++ b/src/StepVisual/StepVisual_ColourRgb.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_ColourRgb.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ColourRgb,StepVisual_ColourSpecification)
+
 StepVisual_ColourRgb::StepVisual_ColourRgb ()  {}
 
 void StepVisual_ColourRgb::Init(
diff --git a/src/StepVisual/StepVisual_ColourRgb.hxx b/src/StepVisual/StepVisual_ColourRgb.hxx
index ee00bf740a..f514650d56 100644
--- a/src/StepVisual/StepVisual_ColourRgb.hxx
+++ b/src/StepVisual/StepVisual_ColourRgb.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ColourRgb,StepVisual_ColourSpecification)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ColourRgb,StepVisual_ColourSpecification)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ColourSpecification.cxx b/src/StepVisual/StepVisual_ColourSpecification.cxx
index de826d1b6e..1456b9f8bc 100644
--- a/src/StepVisual/StepVisual_ColourSpecification.cxx
+++ b/src/StepVisual/StepVisual_ColourSpecification.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_ColourSpecification.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ColourSpecification,StepVisual_Colour)
+
 StepVisual_ColourSpecification::StepVisual_ColourSpecification ()  {}
 
 void StepVisual_ColourSpecification::Init(
diff --git a/src/StepVisual/StepVisual_ColourSpecification.hxx b/src/StepVisual/StepVisual_ColourSpecification.hxx
index 3f489625bf..b3753a7a61 100644
--- a/src/StepVisual/StepVisual_ColourSpecification.hxx
+++ b/src/StepVisual/StepVisual_ColourSpecification.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ColourSpecification,StepVisual_Colour)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ColourSpecification,StepVisual_Colour)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CompositeText.cxx b/src/StepVisual/StepVisual_CompositeText.cxx
index 96a8a660a2..2fa9b3cacc 100644
--- a/src/StepVisual/StepVisual_CompositeText.cxx
+++ b/src/StepVisual/StepVisual_CompositeText.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_TextOrCharacter.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CompositeText,StepGeom_GeometricRepresentationItem)
+
 StepVisual_CompositeText::StepVisual_CompositeText ()  {}
 
 void StepVisual_CompositeText::Init(
diff --git a/src/StepVisual/StepVisual_CompositeText.hxx b/src/StepVisual/StepVisual_CompositeText.hxx
index 94c30eb9d8..98e9953314 100644
--- a/src/StepVisual/StepVisual_CompositeText.hxx
+++ b/src/StepVisual/StepVisual_CompositeText.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CompositeText,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CompositeText,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx b/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
index 5e1b6a0ae9..0168497833 100644
--- a/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
+++ b/src/StepVisual/StepVisual_CompositeTextWithExtent.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PlanarExtent.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CompositeTextWithExtent,StepVisual_CompositeText)
+
 StepVisual_CompositeTextWithExtent::StepVisual_CompositeTextWithExtent ()  {}
 
 void StepVisual_CompositeTextWithExtent::Init(
diff --git a/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx b/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
index 0cf142f0a5..556854c6d8 100644
--- a/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
+++ b/src/StepVisual/StepVisual_CompositeTextWithExtent.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CompositeTextWithExtent,StepVisual_CompositeText)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CompositeTextWithExtent,StepVisual_CompositeText)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx b/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
index 3c2df4a2a2..daad91c1b0 100644
--- a/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
+++ b/src/StepVisual/StepVisual_ContextDependentInvisibility.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_ContextDependentInvisibility.hxx>
 #include <StepVisual_InvisibilityContext.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ContextDependentInvisibility,StepVisual_Invisibility)
+
 StepVisual_ContextDependentInvisibility::StepVisual_ContextDependentInvisibility ()  {}
 
 void StepVisual_ContextDependentInvisibility::Init(
diff --git a/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx b/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
index dec0ce1e8c..17c539855b 100644
--- a/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
+++ b/src/StepVisual/StepVisual_ContextDependentInvisibility.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ContextDependentInvisibility,StepVisual_Invisibility)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ContextDependentInvisibility,StepVisual_Invisibility)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
index 261c5ec7d6..c46d4ac0a8 100644
--- a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
+++ b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cxx
@@ -19,6 +19,8 @@
 #include <StepVisual_StyledItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ContextDependentOverRidingStyledItem,StepVisual_OverRidingStyledItem)
+
 StepVisual_ContextDependentOverRidingStyledItem::StepVisual_ContextDependentOverRidingStyledItem ()  {}
 
 void StepVisual_ContextDependentOverRidingStyledItem::Init(
diff --git a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
index e9a3cfea50..ad653e29e3 100644
--- a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
+++ b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ContextDependentOverRidingStyledItem,StepVisual_OverRidingStyledItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ContextDependentOverRidingStyledItem,StepVisual_OverRidingStyledItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CurveStyle.cxx b/src/StepVisual/StepVisual_CurveStyle.cxx
index c53cc7c990..ea26a1bae4 100644
--- a/src/StepVisual/StepVisual_CurveStyle.cxx
+++ b/src/StepVisual/StepVisual_CurveStyle.cxx
@@ -19,6 +19,8 @@
 #include <StepVisual_CurveStyleFontSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CurveStyle,MMgt_TShared)
+
 StepVisual_CurveStyle::StepVisual_CurveStyle ()  {}
 
 void StepVisual_CurveStyle::Init(
diff --git a/src/StepVisual/StepVisual_CurveStyle.hxx b/src/StepVisual/StepVisual_CurveStyle.hxx
index 80ffcad03a..67c1c690a3 100644
--- a/src/StepVisual/StepVisual_CurveStyle.hxx
+++ b/src/StepVisual/StepVisual_CurveStyle.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CurveStyle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CurveStyle,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CurveStyleFont.cxx b/src/StepVisual/StepVisual_CurveStyleFont.cxx
index c565a7d86c..5805a2434e 100644
--- a/src/StepVisual/StepVisual_CurveStyleFont.cxx
+++ b/src/StepVisual/StepVisual_CurveStyleFont.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_CurveStyleFontPattern.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CurveStyleFont,MMgt_TShared)
+
 StepVisual_CurveStyleFont::StepVisual_CurveStyleFont ()  {}
 
 void StepVisual_CurveStyleFont::Init(
diff --git a/src/StepVisual/StepVisual_CurveStyleFont.hxx b/src/StepVisual/StepVisual_CurveStyleFont.hxx
index bcef99b1eb..41bbfbec6e 100644
--- a/src/StepVisual/StepVisual_CurveStyleFont.hxx
+++ b/src/StepVisual/StepVisual_CurveStyleFont.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CurveStyleFont,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CurveStyleFont,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_CurveStyleFontPattern.cxx b/src/StepVisual/StepVisual_CurveStyleFontPattern.cxx
index c718857788..1edf3e0980 100644
--- a/src/StepVisual/StepVisual_CurveStyleFontPattern.cxx
+++ b/src/StepVisual/StepVisual_CurveStyleFontPattern.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_CurveStyleFontPattern.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_CurveStyleFontPattern,MMgt_TShared)
+
 StepVisual_CurveStyleFontPattern::StepVisual_CurveStyleFontPattern ()  {}
 
 void StepVisual_CurveStyleFontPattern::Init(
diff --git a/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx b/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
index 800f44ad4e..d870313c40 100644
--- a/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
+++ b/src/StepVisual/StepVisual_CurveStyleFontPattern.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_CurveStyleFontPattern,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_CurveStyleFontPattern,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
index 21ec23324e..62f052e59c 100644
--- a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
+++ b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_DraughtingAnnotationOccurrence.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingAnnotationOccurrence,StepVisual_AnnotationOccurrence)
+
 StepVisual_DraughtingAnnotationOccurrence::StepVisual_DraughtingAnnotationOccurrence ()  {}
 
diff --git a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
index 76f756d1cb..071a8a9df2 100644
--- a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
+++ b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_DraughtingAnnotationOccurrence,StepVisual_AnnotationOccurrence)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_DraughtingAnnotationOccurrence,StepVisual_AnnotationOccurrence)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_DraughtingModel.cxx b/src/StepVisual/StepVisual_DraughtingModel.cxx
index 3f70ed579c..e1c4144734 100644
--- a/src/StepVisual/StepVisual_DraughtingModel.cxx
+++ b/src/StepVisual/StepVisual_DraughtingModel.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_DraughtingModel.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingModel,StepRepr_Representation)
+
 //=======================================================================
 //function : StepVisual_DraughtingModel
 //purpose  : 
diff --git a/src/StepVisual/StepVisual_DraughtingModel.hxx b/src/StepVisual/StepVisual_DraughtingModel.hxx
index cd5f64c7bf..4f3f87a987 100644
--- a/src/StepVisual/StepVisual_DraughtingModel.hxx
+++ b/src/StepVisual/StepVisual_DraughtingModel.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_DraughtingModel,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_DraughtingModel,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cxx b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cxx
index 7921d72fb6..d7f2690f25 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cxx
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_DraughtingPreDefinedColour.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingPreDefinedColour,StepVisual_PreDefinedColour)
+
 StepVisual_DraughtingPreDefinedColour::StepVisual_DraughtingPreDefinedColour ()  {}
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.hxx b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.hxx
index 9ee40ccea4..038fdc9370 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.hxx
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_DraughtingPreDefinedColour,StepVisual_PreDefinedColour)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_DraughtingPreDefinedColour,StepVisual_PreDefinedColour)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cxx b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cxx
index 0905b43cbd..123a40623b 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cxx
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_DraughtingPreDefinedCurveFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_DraughtingPreDefinedCurveFont,StepVisual_PreDefinedCurveFont)
+
 StepVisual_DraughtingPreDefinedCurveFont::StepVisual_DraughtingPreDefinedCurveFont ()  {}
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.hxx b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.hxx
index 68d71c61dc..9bb559e7f8 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.hxx
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_DraughtingPreDefinedCurveFont,StepVisual_PreDefinedCurveFont)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_DraughtingPreDefinedCurveFont,StepVisual_PreDefinedCurveFont)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
index 3be596f0de..4ba14177c4 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_ExternallyDefinedCurveFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedCurveFont,StepBasic_ExternallyDefinedItem)
+
 //=======================================================================
 //function : StepVisual_ExternallyDefinedCurveFont
 //purpose  : 
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
index 1ee11f55ff..847cfbdd39 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedCurveFont.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ExternallyDefinedCurveFont,StepBasic_ExternallyDefinedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedCurveFont,StepBasic_ExternallyDefinedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
index 8041ba2b41..53790405ce 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_ExternallyDefinedTextFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedTextFont,StepBasic_ExternallyDefinedItem)
+
 //=======================================================================
 //function : StepVisual_ExternallyDefinedTextFont
 //purpose  : 
diff --git a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
index 987d15ed97..09f45724f9 100644
--- a/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
+++ b/src/StepVisual/StepVisual_ExternallyDefinedTextFont.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ExternallyDefinedTextFont,StepBasic_ExternallyDefinedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ExternallyDefinedTextFont,StepBasic_ExternallyDefinedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_FillAreaStyle.cxx b/src/StepVisual/StepVisual_FillAreaStyle.cxx
index 43d5391301..d519b35251 100644
--- a/src/StepVisual/StepVisual_FillAreaStyle.cxx
+++ b/src/StepVisual/StepVisual_FillAreaStyle.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_FillStyleSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_FillAreaStyle,MMgt_TShared)
+
 StepVisual_FillAreaStyle::StepVisual_FillAreaStyle ()  {}
 
 void StepVisual_FillAreaStyle::Init(
diff --git a/src/StepVisual/StepVisual_FillAreaStyle.hxx b/src/StepVisual/StepVisual_FillAreaStyle.hxx
index badf7b8930..2e90b352a0 100644
--- a/src/StepVisual/StepVisual_FillAreaStyle.hxx
+++ b/src/StepVisual/StepVisual_FillAreaStyle.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_FillAreaStyle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_FillAreaStyle,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_FillAreaStyleColour.cxx b/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
index fafa1bb151..3c3a8013a9 100644
--- a/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
+++ b/src/StepVisual/StepVisual_FillAreaStyleColour.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_FillAreaStyleColour.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_FillAreaStyleColour,MMgt_TShared)
+
 StepVisual_FillAreaStyleColour::StepVisual_FillAreaStyleColour ()  {}
 
 void StepVisual_FillAreaStyleColour::Init(
diff --git a/src/StepVisual/StepVisual_FillAreaStyleColour.hxx b/src/StepVisual/StepVisual_FillAreaStyleColour.hxx
index 244006dca3..b69bbf0f98 100644
--- a/src/StepVisual/StepVisual_FillAreaStyleColour.hxx
+++ b/src/StepVisual/StepVisual_FillAreaStyleColour.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_FillAreaStyleColour,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_FillAreaStyleColour,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_Invisibility.cxx b/src/StepVisual/StepVisual_Invisibility.cxx
index 6efcc72221..21b1af18c3 100644
--- a/src/StepVisual/StepVisual_Invisibility.cxx
+++ b/src/StepVisual/StepVisual_Invisibility.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_Invisibility.hxx>
 #include <StepVisual_InvisibleItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_Invisibility,MMgt_TShared)
+
 StepVisual_Invisibility::StepVisual_Invisibility ()  {}
 
 void StepVisual_Invisibility::Init(
diff --git a/src/StepVisual/StepVisual_Invisibility.hxx b/src/StepVisual/StepVisual_Invisibility.hxx
index cf4ff5ce74..c2468a4ba5 100644
--- a/src/StepVisual/StepVisual_Invisibility.hxx
+++ b/src/StepVisual/StepVisual_Invisibility.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_Invisibility,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_Invisibility,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_MarkerMember.cxx b/src/StepVisual/StepVisual_MarkerMember.cxx
index 0b8c168952..6efe172bd9 100644
--- a/src/StepVisual/StepVisual_MarkerMember.cxx
+++ b/src/StepVisual/StepVisual_MarkerMember.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_MarkerMember.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_MarkerMember,StepData_SelectInt)
+
 static StepData_EnumTool tool
   (".DOT.",".X.",".PLUS.",".ASTERISK.",".RING.",".SQUARE.",".TRIANGLE.");
 
diff --git a/src/StepVisual/StepVisual_MarkerMember.hxx b/src/StepVisual/StepVisual_MarkerMember.hxx
index 80651611f5..af0facabdc 100644
--- a/src/StepVisual/StepVisual_MarkerMember.hxx
+++ b/src/StepVisual/StepVisual_MarkerMember.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_MarkerMember,StepData_SelectInt)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_MarkerMember,StepData_SelectInt)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cxx b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cxx
index 58377e33cf..11c525f728 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cxx
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationArea.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_MechanicalDesignGeometricPresentationArea,StepVisual_PresentationArea)
+
 StepVisual_MechanicalDesignGeometricPresentationArea::StepVisual_MechanicalDesignGeometricPresentationArea ()  {}
 
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.hxx b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.hxx
index 4db9c956c8..9fe302b325 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.hxx
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_MechanicalDesignGeometricPresentationArea,StepVisual_PresentationArea)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_MechanicalDesignGeometricPresentationArea,StepVisual_PresentationArea)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cxx b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cxx
index 256fbdc598..555ab4a335 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cxx
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_MechanicalDesignGeometricPresentationRepresentation,StepVisual_PresentationRepresentation)
+
 StepVisual_MechanicalDesignGeometricPresentationRepresentation::StepVisual_MechanicalDesignGeometricPresentationRepresentation ()  {}
 
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx
index 09c13a8a43..f5abb497b1 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_MechanicalDesignGeometricPresentationRepresentation,StepVisual_PresentationRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_MechanicalDesignGeometricPresentationRepresentation,StepVisual_PresentationRepresentation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_OverRidingStyledItem.cxx b/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
index 0e2006acc2..82a09c4384 100644
--- a/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
+++ b/src/StepVisual/StepVisual_OverRidingStyledItem.cxx
@@ -18,6 +18,8 @@
 #include <StepVisual_StyledItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_OverRidingStyledItem,StepVisual_StyledItem)
+
 StepVisual_OverRidingStyledItem::StepVisual_OverRidingStyledItem ()  {}
 
 void StepVisual_OverRidingStyledItem::Init(
diff --git a/src/StepVisual/StepVisual_OverRidingStyledItem.hxx b/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
index 1e35b851cd..a32f788e75 100644
--- a/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
+++ b/src/StepVisual/StepVisual_OverRidingStyledItem.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_OverRidingStyledItem,StepVisual_StyledItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_OverRidingStyledItem,StepVisual_StyledItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PlanarBox.cxx b/src/StepVisual/StepVisual_PlanarBox.cxx
index e55a4fc815..c00f01360d 100644
--- a/src/StepVisual/StepVisual_PlanarBox.cxx
+++ b/src/StepVisual/StepVisual_PlanarBox.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PlanarBox.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PlanarBox,StepVisual_PlanarExtent)
+
 StepVisual_PlanarBox::StepVisual_PlanarBox ()  {}
 
 void StepVisual_PlanarBox::Init(
diff --git a/src/StepVisual/StepVisual_PlanarBox.hxx b/src/StepVisual/StepVisual_PlanarBox.hxx
index 95fab15381..72bfd65a5e 100644
--- a/src/StepVisual/StepVisual_PlanarBox.hxx
+++ b/src/StepVisual/StepVisual_PlanarBox.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PlanarBox,StepVisual_PlanarExtent)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PlanarBox,StepVisual_PlanarExtent)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PlanarExtent.cxx b/src/StepVisual/StepVisual_PlanarExtent.cxx
index 85326a0be2..c635b31989 100644
--- a/src/StepVisual/StepVisual_PlanarExtent.cxx
+++ b/src/StepVisual/StepVisual_PlanarExtent.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_PlanarExtent.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PlanarExtent,StepGeom_GeometricRepresentationItem)
+
 StepVisual_PlanarExtent::StepVisual_PlanarExtent ()  {}
 
 void StepVisual_PlanarExtent::Init(
diff --git a/src/StepVisual/StepVisual_PlanarExtent.hxx b/src/StepVisual/StepVisual_PlanarExtent.hxx
index 16f974b3c2..3a9af611cd 100644
--- a/src/StepVisual/StepVisual_PlanarExtent.hxx
+++ b/src/StepVisual/StepVisual_PlanarExtent.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PlanarExtent,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PlanarExtent,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PointStyle.cxx b/src/StepVisual/StepVisual_PointStyle.cxx
index ef2fe6b153..a7b7d5edbd 100644
--- a/src/StepVisual/StepVisual_PointStyle.cxx
+++ b/src/StepVisual/StepVisual_PointStyle.cxx
@@ -19,6 +19,8 @@
 #include <StepVisual_PointStyle.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PointStyle,MMgt_TShared)
+
 StepVisual_PointStyle::StepVisual_PointStyle ()  {}
 
 void StepVisual_PointStyle::Init(
diff --git a/src/StepVisual/StepVisual_PointStyle.hxx b/src/StepVisual/StepVisual_PointStyle.hxx
index eb11147e29..f81170612e 100644
--- a/src/StepVisual/StepVisual_PointStyle.hxx
+++ b/src/StepVisual/StepVisual_PointStyle.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PointStyle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PointStyle,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PreDefinedColour.cxx b/src/StepVisual/StepVisual_PreDefinedColour.cxx
index 25ea260fe1..26577ec0b9 100644
--- a/src/StepVisual/StepVisual_PreDefinedColour.cxx
+++ b/src/StepVisual/StepVisual_PreDefinedColour.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_PreDefinedColour.hxx>
 #include <StepVisual_PreDefinedItem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PreDefinedColour,StepVisual_Colour)
+
 StepVisual_PreDefinedColour::StepVisual_PreDefinedColour ()  
 {
   myItem = new StepVisual_PreDefinedItem;
diff --git a/src/StepVisual/StepVisual_PreDefinedColour.hxx b/src/StepVisual/StepVisual_PreDefinedColour.hxx
index f405b6b33f..57e77c3ca9 100644
--- a/src/StepVisual/StepVisual_PreDefinedColour.hxx
+++ b/src/StepVisual/StepVisual_PreDefinedColour.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PreDefinedColour,StepVisual_Colour)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PreDefinedColour,StepVisual_Colour)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PreDefinedCurveFont.cxx b/src/StepVisual/StepVisual_PreDefinedCurveFont.cxx
index 29f7f61980..6687092418 100644
--- a/src/StepVisual/StepVisual_PreDefinedCurveFont.cxx
+++ b/src/StepVisual/StepVisual_PreDefinedCurveFont.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PreDefinedCurveFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PreDefinedCurveFont,StepVisual_PreDefinedItem)
+
 StepVisual_PreDefinedCurveFont::StepVisual_PreDefinedCurveFont ()  {}
 
diff --git a/src/StepVisual/StepVisual_PreDefinedCurveFont.hxx b/src/StepVisual/StepVisual_PreDefinedCurveFont.hxx
index adbb12beb8..f9900ceec3 100644
--- a/src/StepVisual/StepVisual_PreDefinedCurveFont.hxx
+++ b/src/StepVisual/StepVisual_PreDefinedCurveFont.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PreDefinedCurveFont,StepVisual_PreDefinedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PreDefinedCurveFont,StepVisual_PreDefinedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PreDefinedItem.cxx b/src/StepVisual/StepVisual_PreDefinedItem.cxx
index 3e6ee3f72c..e0ad1e9c10 100644
--- a/src/StepVisual/StepVisual_PreDefinedItem.cxx
+++ b/src/StepVisual/StepVisual_PreDefinedItem.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_PreDefinedItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PreDefinedItem,MMgt_TShared)
+
 StepVisual_PreDefinedItem::StepVisual_PreDefinedItem ()  {}
 
 void StepVisual_PreDefinedItem::Init(
diff --git a/src/StepVisual/StepVisual_PreDefinedItem.hxx b/src/StepVisual/StepVisual_PreDefinedItem.hxx
index fb8324e409..8f0988a9df 100644
--- a/src/StepVisual/StepVisual_PreDefinedItem.hxx
+++ b/src/StepVisual/StepVisual_PreDefinedItem.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PreDefinedItem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PreDefinedItem,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PreDefinedTextFont.cxx b/src/StepVisual/StepVisual_PreDefinedTextFont.cxx
index 95e6f9cb99..704635e1df 100644
--- a/src/StepVisual/StepVisual_PreDefinedTextFont.cxx
+++ b/src/StepVisual/StepVisual_PreDefinedTextFont.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PreDefinedTextFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PreDefinedTextFont,StepVisual_PreDefinedItem)
+
 StepVisual_PreDefinedTextFont::StepVisual_PreDefinedTextFont ()  {}
 
diff --git a/src/StepVisual/StepVisual_PreDefinedTextFont.hxx b/src/StepVisual/StepVisual_PreDefinedTextFont.hxx
index f3a214c70b..57cd77421a 100644
--- a/src/StepVisual/StepVisual_PreDefinedTextFont.hxx
+++ b/src/StepVisual/StepVisual_PreDefinedTextFont.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PreDefinedTextFont,StepVisual_PreDefinedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PreDefinedTextFont,StepVisual_PreDefinedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationArea.cxx b/src/StepVisual/StepVisual_PresentationArea.cxx
index 88ba63d8a4..f3f03fe137 100644
--- a/src/StepVisual/StepVisual_PresentationArea.cxx
+++ b/src/StepVisual/StepVisual_PresentationArea.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PresentationArea.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationArea,StepVisual_PresentationRepresentation)
+
 StepVisual_PresentationArea::StepVisual_PresentationArea ()  {}
 
diff --git a/src/StepVisual/StepVisual_PresentationArea.hxx b/src/StepVisual/StepVisual_PresentationArea.hxx
index 4a12763e06..6b28bf0fff 100644
--- a/src/StepVisual/StepVisual_PresentationArea.hxx
+++ b/src/StepVisual/StepVisual_PresentationArea.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationArea,StepVisual_PresentationRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationArea,StepVisual_PresentationRepresentation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
index 8938fe81a5..ee0115d883 100644
--- a/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
+++ b/src/StepVisual/StepVisual_PresentationLayerAssignment.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PresentationLayerAssignment.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationLayerAssignment,MMgt_TShared)
+
 StepVisual_PresentationLayerAssignment::StepVisual_PresentationLayerAssignment ()  {}
 
 void StepVisual_PresentationLayerAssignment::Init(
diff --git a/src/StepVisual/StepVisual_PresentationLayerAssignment.hxx b/src/StepVisual/StepVisual_PresentationLayerAssignment.hxx
index 05f572b9ac..e9b358b50b 100644
--- a/src/StepVisual/StepVisual_PresentationLayerAssignment.hxx
+++ b/src/StepVisual/StepVisual_PresentationLayerAssignment.hxx
@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationLayerAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationLayerAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationLayerUsage.cxx b/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
index 9804599f65..6ac5fa4117 100644
--- a/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
+++ b/src/StepVisual/StepVisual_PresentationLayerUsage.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PresentationLayerUsage.hxx>
 #include <StepVisual_PresentationRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationLayerUsage,MMgt_TShared)
+
 StepVisual_PresentationLayerUsage::StepVisual_PresentationLayerUsage  ()    {  }
 
 void  StepVisual_PresentationLayerUsage::Init
diff --git a/src/StepVisual/StepVisual_PresentationLayerUsage.hxx b/src/StepVisual/StepVisual_PresentationLayerUsage.hxx
index 42738adbd9..96c1969ec3 100644
--- a/src/StepVisual/StepVisual_PresentationLayerUsage.hxx
+++ b/src/StepVisual/StepVisual_PresentationLayerUsage.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationLayerUsage,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationLayerUsage,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationRepresentation.cxx b/src/StepVisual/StepVisual_PresentationRepresentation.cxx
index 67fa97b143..b1ddee72d8 100644
--- a/src/StepVisual/StepVisual_PresentationRepresentation.cxx
+++ b/src/StepVisual/StepVisual_PresentationRepresentation.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PresentationRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationRepresentation,StepRepr_Representation)
+
 StepVisual_PresentationRepresentation::StepVisual_PresentationRepresentation ()  {}
 
diff --git a/src/StepVisual/StepVisual_PresentationRepresentation.hxx b/src/StepVisual/StepVisual_PresentationRepresentation.hxx
index c8536cdf6c..7e08b12851 100644
--- a/src/StepVisual/StepVisual_PresentationRepresentation.hxx
+++ b/src/StepVisual/StepVisual_PresentationRepresentation.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationRepresentation,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationRepresentation,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationSet.cxx b/src/StepVisual/StepVisual_PresentationSet.cxx
index 0ae98de2ce..6567c829a8 100644
--- a/src/StepVisual/StepVisual_PresentationSet.cxx
+++ b/src/StepVisual/StepVisual_PresentationSet.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PresentationSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationSet,MMgt_TShared)
+
 StepVisual_PresentationSet::StepVisual_PresentationSet ()  {}
 
diff --git a/src/StepVisual/StepVisual_PresentationSet.hxx b/src/StepVisual/StepVisual_PresentationSet.hxx
index 23f6df093f..e27e8d4be5 100644
--- a/src/StepVisual/StepVisual_PresentationSet.hxx
+++ b/src/StepVisual/StepVisual_PresentationSet.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationSize.cxx b/src/StepVisual/StepVisual_PresentationSize.cxx
index b8d95687e9..7c15b18e46 100644
--- a/src/StepVisual/StepVisual_PresentationSize.cxx
+++ b/src/StepVisual/StepVisual_PresentationSize.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PresentationSize.hxx>
 #include <StepVisual_PresentationSizeAssignmentSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationSize,MMgt_TShared)
+
 StepVisual_PresentationSize::StepVisual_PresentationSize ()  {}
 
 void StepVisual_PresentationSize::Init(
diff --git a/src/StepVisual/StepVisual_PresentationSize.hxx b/src/StepVisual/StepVisual_PresentationSize.hxx
index 5f61d53780..cf5e88c7dc 100644
--- a/src/StepVisual/StepVisual_PresentationSize.hxx
+++ b/src/StepVisual/StepVisual_PresentationSize.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationSize,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationSize,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx b/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
index cb58ea8ade..83532f1df9 100644
--- a/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
+++ b/src/StepVisual/StepVisual_PresentationStyleAssignment.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_PresentationStyleAssignment.hxx>
 #include <StepVisual_PresentationStyleSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationStyleAssignment,MMgt_TShared)
+
 StepVisual_PresentationStyleAssignment::StepVisual_PresentationStyleAssignment ()  {}
 
 void StepVisual_PresentationStyleAssignment::Init(
diff --git a/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx b/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
index c0cbf9ffbd..dce7c8ba43 100644
--- a/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
+++ b/src/StepVisual/StepVisual_PresentationStyleAssignment.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationStyleAssignment,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationStyleAssignment,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleByContext.cxx b/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
index 1284777138..5f92b386c2 100644
--- a/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
+++ b/src/StepVisual/StepVisual_PresentationStyleByContext.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_PresentationStyleByContext.hxx>
 #include <StepVisual_StyleContextSelect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationStyleByContext,StepVisual_PresentationStyleAssignment)
+
 StepVisual_PresentationStyleByContext::StepVisual_PresentationStyleByContext ()  {}
 
 void StepVisual_PresentationStyleByContext::Init(
diff --git a/src/StepVisual/StepVisual_PresentationStyleByContext.hxx b/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
index 2fdc18041e..16a72c63eb 100644
--- a/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
+++ b/src/StepVisual/StepVisual_PresentationStyleByContext.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationStyleByContext,StepVisual_PresentationStyleAssignment)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationStyleByContext,StepVisual_PresentationStyleAssignment)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentationView.cxx b/src/StepVisual/StepVisual_PresentationView.cxx
index 47f0c63a5e..e4a34a7944 100644
--- a/src/StepVisual/StepVisual_PresentationView.cxx
+++ b/src/StepVisual/StepVisual_PresentationView.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_PresentationView.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentationView,StepVisual_PresentationRepresentation)
+
 StepVisual_PresentationView::StepVisual_PresentationView ()  {}
 
diff --git a/src/StepVisual/StepVisual_PresentationView.hxx b/src/StepVisual/StepVisual_PresentationView.hxx
index 03eeea133e..6c6c20f6ad 100644
--- a/src/StepVisual/StepVisual_PresentationView.hxx
+++ b/src/StepVisual/StepVisual_PresentationView.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentationView,StepVisual_PresentationRepresentation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentationView,StepVisual_PresentationRepresentation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentedItem.cxx b/src/StepVisual/StepVisual_PresentedItem.cxx
index 9e03072010..a80337ada8 100644
--- a/src/StepVisual/StepVisual_PresentedItem.cxx
+++ b/src/StepVisual/StepVisual_PresentedItem.cxx
@@ -14,3 +14,5 @@
 
 #include <Standard_Type.hxx>
 #include <StepVisual_PresentedItem.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentedItem,MMgt_TShared)
\ No newline at end of file
diff --git a/src/StepVisual/StepVisual_PresentedItem.hxx b/src/StepVisual/StepVisual_PresentedItem.hxx
index 6cc4d7b290..0a7300cf9d 100644
--- a/src/StepVisual/StepVisual_PresentedItem.hxx
+++ b/src/StepVisual/StepVisual_PresentedItem.hxx
@@ -36,7 +36,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentedItem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentedItem,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx b/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
index 212bc52a8f..23edbfdaaf 100644
--- a/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
+++ b/src/StepVisual/StepVisual_PresentedItemRepresentation.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PresentedItem.hxx>
 #include <StepVisual_PresentedItemRepresentation.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_PresentedItemRepresentation,MMgt_TShared)
+
 StepVisual_PresentedItemRepresentation::StepVisual_PresentedItemRepresentation  ()    {  }
 
 void  StepVisual_PresentedItemRepresentation::Init
diff --git a/src/StepVisual/StepVisual_PresentedItemRepresentation.hxx b/src/StepVisual/StepVisual_PresentedItemRepresentation.hxx
index da6a8cc82d..23b551c8b8 100644
--- a/src/StepVisual/StepVisual_PresentedItemRepresentation.hxx
+++ b/src/StepVisual/StepVisual_PresentedItemRepresentation.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_PresentedItemRepresentation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_PresentedItemRepresentation,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_StyledItem.cxx b/src/StepVisual/StepVisual_StyledItem.cxx
index 9376402c2f..6c58bdc7e5 100644
--- a/src/StepVisual/StepVisual_StyledItem.cxx
+++ b/src/StepVisual/StepVisual_StyledItem.cxx
@@ -18,6 +18,8 @@
 #include <StepVisual_StyledItem.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_StyledItem,StepRepr_RepresentationItem)
+
 StepVisual_StyledItem::StepVisual_StyledItem ()  {}
 
 void StepVisual_StyledItem::Init(
diff --git a/src/StepVisual/StepVisual_StyledItem.hxx b/src/StepVisual/StepVisual_StyledItem.hxx
index a7794173c5..1d69b6d0ba 100644
--- a/src/StepVisual/StepVisual_StyledItem.hxx
+++ b/src/StepVisual/StepVisual_StyledItem.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_StyledItem,StepRepr_RepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_StyledItem,StepRepr_RepresentationItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceSideStyle.cxx b/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
index 3e6e7a2e24..8ffc5ab221 100644
--- a/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
+++ b/src/StepVisual/StepVisual_SurfaceSideStyle.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_SurfaceStyleElementSelect.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceSideStyle,MMgt_TShared)
+
 StepVisual_SurfaceSideStyle::StepVisual_SurfaceSideStyle ()  {}
 
 void StepVisual_SurfaceSideStyle::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceSideStyle.hxx b/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
index 5186307b00..3c6d473c2f 100644
--- a/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
+++ b/src/StepVisual/StepVisual_SurfaceSideStyle.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceSideStyle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceSideStyle,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
index ed42ecc787..eefbc6cc46 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleBoundary.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleBoundary,MMgt_TShared)
+
 StepVisual_SurfaceStyleBoundary::StepVisual_SurfaceStyleBoundary ()  {}
 
 void StepVisual_SurfaceStyleBoundary::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleBoundary.hxx b/src/StepVisual/StepVisual_SurfaceStyleBoundary.hxx
index ee7ac6b3b3..33e7128985 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleBoundary.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleBoundary.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleBoundary,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleBoundary,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
index dc66aef73b..1966c1893a 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleControlGrid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleControlGrid,MMgt_TShared)
+
 StepVisual_SurfaceStyleControlGrid::StepVisual_SurfaceStyleControlGrid ()  {}
 
 void StepVisual_SurfaceStyleControlGrid::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.hxx b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.hxx
index d1c3781aa7..fa633d1147 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleControlGrid,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleControlGrid,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
index 9fb4e13530..e194103b0c 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_FillAreaStyle.hxx>
 #include <StepVisual_SurfaceStyleFillArea.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleFillArea,MMgt_TShared)
+
 StepVisual_SurfaceStyleFillArea::StepVisual_SurfaceStyleFillArea ()  {}
 
 void StepVisual_SurfaceStyleFillArea::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleFillArea.hxx b/src/StepVisual/StepVisual_SurfaceStyleFillArea.hxx
index f7a1e1ea1e..58c3425bcd 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleFillArea.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleFillArea.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleFillArea,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleFillArea,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
index d87ce66421..4818594f7e 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_DirectionCountSelect.hxx>
 #include <StepVisual_SurfaceStyleParameterLine.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleParameterLine,MMgt_TShared)
+
 StepVisual_SurfaceStyleParameterLine::StepVisual_SurfaceStyleParameterLine ()  {}
 
 void StepVisual_SurfaceStyleParameterLine::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.hxx b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.hxx
index 3223742383..63dbf6a6de 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleParameterLine,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleParameterLine,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
index c8503df8f0..6e3879d2ae 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleSegmentationCurve.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleSegmentationCurve,MMgt_TShared)
+
 StepVisual_SurfaceStyleSegmentationCurve::StepVisual_SurfaceStyleSegmentationCurve ()  {}
 
 void StepVisual_SurfaceStyleSegmentationCurve::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.hxx b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.hxx
index 3527e1b79c..c32b098bc3 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleSegmentationCurve,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleSegmentationCurve,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
index aeba6dd912..601da04940 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_CurveStyle.hxx>
 #include <StepVisual_SurfaceStyleSilhouette.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleSilhouette,MMgt_TShared)
+
 StepVisual_SurfaceStyleSilhouette::StepVisual_SurfaceStyleSilhouette ()  {}
 
 void StepVisual_SurfaceStyleSilhouette::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.hxx b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.hxx
index 8dd2ab923a..5db10c8852 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleSilhouette,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleSilhouette,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx b/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
index 6fac9f391c..b6a4f93259 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleUsage.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_SurfaceSideStyle.hxx>
 #include <StepVisual_SurfaceStyleUsage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_SurfaceStyleUsage,MMgt_TShared)
+
 StepVisual_SurfaceStyleUsage::StepVisual_SurfaceStyleUsage ()  {}
 
 void StepVisual_SurfaceStyleUsage::Init(
diff --git a/src/StepVisual/StepVisual_SurfaceStyleUsage.hxx b/src/StepVisual/StepVisual_SurfaceStyleUsage.hxx
index 60d3dfb996..cc55607daf 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleUsage.hxx
+++ b/src/StepVisual/StepVisual_SurfaceStyleUsage.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_SurfaceStyleUsage,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_SurfaceStyleUsage,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_Template.cxx b/src/StepVisual/StepVisual_Template.cxx
index 7ea976b190..0445311eec 100644
--- a/src/StepVisual/StepVisual_Template.cxx
+++ b/src/StepVisual/StepVisual_Template.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_Template.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_Template,StepRepr_Representation)
+
 StepVisual_Template::StepVisual_Template ()  {}
 
diff --git a/src/StepVisual/StepVisual_Template.hxx b/src/StepVisual/StepVisual_Template.hxx
index a5a79cacf4..f296a51b72 100644
--- a/src/StepVisual/StepVisual_Template.hxx
+++ b/src/StepVisual/StepVisual_Template.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_Template,StepRepr_Representation)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_Template,StepRepr_Representation)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_TemplateInstance.cxx b/src/StepVisual/StepVisual_TemplateInstance.cxx
index 49e37b3800..97ea117a40 100644
--- a/src/StepVisual/StepVisual_TemplateInstance.cxx
+++ b/src/StepVisual/StepVisual_TemplateInstance.cxx
@@ -15,5 +15,7 @@
 #include <Standard_Type.hxx>
 #include <StepVisual_TemplateInstance.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TemplateInstance,StepRepr_MappedItem)
+
 StepVisual_TemplateInstance::StepVisual_TemplateInstance ()  {}
 
diff --git a/src/StepVisual/StepVisual_TemplateInstance.hxx b/src/StepVisual/StepVisual_TemplateInstance.hxx
index 87cba4f4c9..d284614228 100644
--- a/src/StepVisual/StepVisual_TemplateInstance.hxx
+++ b/src/StepVisual/StepVisual_TemplateInstance.hxx
@@ -39,7 +39,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_TemplateInstance,StepRepr_MappedItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_TemplateInstance,StepRepr_MappedItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_TextLiteral.cxx b/src/StepVisual/StepVisual_TextLiteral.cxx
index a61bdb3927..75ed1f7afc 100644
--- a/src/StepVisual/StepVisual_TextLiteral.cxx
+++ b/src/StepVisual/StepVisual_TextLiteral.cxx
@@ -18,6 +18,8 @@
 #include <StepVisual_TextLiteral.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TextLiteral,StepGeom_GeometricRepresentationItem)
+
 StepVisual_TextLiteral::StepVisual_TextLiteral ()  {}
 
 void StepVisual_TextLiteral::Init(
diff --git a/src/StepVisual/StepVisual_TextLiteral.hxx b/src/StepVisual/StepVisual_TextLiteral.hxx
index 5764966201..3903725bd4 100644
--- a/src/StepVisual/StepVisual_TextLiteral.hxx
+++ b/src/StepVisual/StepVisual_TextLiteral.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_TextLiteral,StepGeom_GeometricRepresentationItem)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_TextLiteral,StepGeom_GeometricRepresentationItem)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_TextStyle.cxx b/src/StepVisual/StepVisual_TextStyle.cxx
index ff0027a23e..5d63c5385f 100644
--- a/src/StepVisual/StepVisual_TextStyle.cxx
+++ b/src/StepVisual/StepVisual_TextStyle.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_TextStyleForDefinedFont.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TextStyle,MMgt_TShared)
+
 StepVisual_TextStyle::StepVisual_TextStyle ()  {}
 
 void StepVisual_TextStyle::Init(
diff --git a/src/StepVisual/StepVisual_TextStyle.hxx b/src/StepVisual/StepVisual_TextStyle.hxx
index b2caddbb01..5e2a376c24 100644
--- a/src/StepVisual/StepVisual_TextStyle.hxx
+++ b/src/StepVisual/StepVisual_TextStyle.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_TextStyle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_TextStyle,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_TextStyleForDefinedFont.cxx b/src/StepVisual/StepVisual_TextStyleForDefinedFont.cxx
index cffab7bfd9..de1c15d692 100644
--- a/src/StepVisual/StepVisual_TextStyleForDefinedFont.cxx
+++ b/src/StepVisual/StepVisual_TextStyleForDefinedFont.cxx
@@ -16,6 +16,8 @@
 #include <StepVisual_Colour.hxx>
 #include <StepVisual_TextStyleForDefinedFont.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TextStyleForDefinedFont,MMgt_TShared)
+
 StepVisual_TextStyleForDefinedFont::StepVisual_TextStyleForDefinedFont ()  {}
 
 void StepVisual_TextStyleForDefinedFont::Init(
diff --git a/src/StepVisual/StepVisual_TextStyleForDefinedFont.hxx b/src/StepVisual/StepVisual_TextStyleForDefinedFont.hxx
index 920ca21ddf..ca24167679 100644
--- a/src/StepVisual/StepVisual_TextStyleForDefinedFont.hxx
+++ b/src/StepVisual/StepVisual_TextStyleForDefinedFont.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_TextStyleForDefinedFont,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_TextStyleForDefinedFont,MMgt_TShared)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
index 5b2d330732..1a472d6d5b 100644
--- a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
+++ b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cxx
@@ -18,6 +18,8 @@
 #include <StepVisual_TextStyleWithBoxCharacteristics.hxx>
 #include <TCollection_HAsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_TextStyleWithBoxCharacteristics,StepVisual_TextStyle)
+
 StepVisual_TextStyleWithBoxCharacteristics::StepVisual_TextStyleWithBoxCharacteristics ()  {}
 
 void StepVisual_TextStyleWithBoxCharacteristics::Init(
diff --git a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.hxx b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.hxx
index f9b5212604..bd8e3190af 100644
--- a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.hxx
+++ b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_TextStyleWithBoxCharacteristics,StepVisual_TextStyle)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_TextStyleWithBoxCharacteristics,StepVisual_TextStyle)
 
 protected:
 
diff --git a/src/StepVisual/StepVisual_ViewVolume.cxx b/src/StepVisual/StepVisual_ViewVolume.cxx
index a5073e33e1..42e1d9fd64 100644
--- a/src/StepVisual/StepVisual_ViewVolume.cxx
+++ b/src/StepVisual/StepVisual_ViewVolume.cxx
@@ -17,6 +17,8 @@
 #include <StepVisual_PlanarBox.hxx>
 #include <StepVisual_ViewVolume.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StepVisual_ViewVolume,MMgt_TShared)
+
 StepVisual_ViewVolume::StepVisual_ViewVolume ()  {}
 
 void StepVisual_ViewVolume::Init(
diff --git a/src/StepVisual/StepVisual_ViewVolume.hxx b/src/StepVisual/StepVisual_ViewVolume.hxx
index c4e5c86950..63624ea811 100644
--- a/src/StepVisual/StepVisual_ViewVolume.hxx
+++ b/src/StepVisual/StepVisual_ViewVolume.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StepVisual_ViewVolume,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StepVisual_ViewVolume,MMgt_TShared)
 
 protected:
 
diff --git a/src/StlMesh/StlMesh_Mesh.cxx b/src/StlMesh/StlMesh_Mesh.cxx
index 2f73981734..065b5c4179 100644
--- a/src/StlMesh/StlMesh_Mesh.cxx
+++ b/src/StlMesh/StlMesh_Mesh.cxx
@@ -25,6 +25,8 @@
 #include <StlMesh_Mesh.hxx>
 #include <StlMesh_MeshDomain.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StlMesh_Mesh,MMgt_TShared)
+
 //=======================================================================
 //function : StlMesh_Mesh
 //design   : 
diff --git a/src/StlMesh/StlMesh_Mesh.hxx b/src/StlMesh/StlMesh_Mesh.hxx
index b2e95cf85f..8a29b1088a 100644
--- a/src/StlMesh/StlMesh_Mesh.hxx
+++ b/src/StlMesh/StlMesh_Mesh.hxx
@@ -131,7 +131,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StlMesh_Mesh,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StlMesh_Mesh,MMgt_TShared)
 
 protected:
 
diff --git a/src/StlMesh/StlMesh_MeshDomain.cxx b/src/StlMesh/StlMesh_MeshDomain.cxx
index 1437d3443b..1da782c929 100644
--- a/src/StlMesh/StlMesh_MeshDomain.cxx
+++ b/src/StlMesh/StlMesh_MeshDomain.cxx
@@ -24,6 +24,8 @@
 #include <StlMesh_MeshDomain.hxx>
 #include <StlMesh_MeshTriangle.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StlMesh_MeshDomain,MMgt_TShared)
+
 //=======================================================================
 //function : StlMesh_MeshDomain
 //design   : 
diff --git a/src/StlMesh/StlMesh_MeshDomain.hxx b/src/StlMesh/StlMesh_MeshDomain.hxx
index c9efb6f3ca..a6f805d225 100644
--- a/src/StlMesh/StlMesh_MeshDomain.hxx
+++ b/src/StlMesh/StlMesh_MeshDomain.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StlMesh_MeshDomain,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StlMesh_MeshDomain,MMgt_TShared)
 
 protected:
 
diff --git a/src/StlMesh/StlMesh_MeshTriangle.cxx b/src/StlMesh/StlMesh_MeshTriangle.cxx
index 97eef88cfb..bb6bf881b1 100644
--- a/src/StlMesh/StlMesh_MeshTriangle.cxx
+++ b/src/StlMesh/StlMesh_MeshTriangle.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <StlMesh_MeshTriangle.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(StlMesh_MeshTriangle,MMgt_TShared)
+
 //=======================================================================
 //function : StlMesh_MeshTriangle
 //design   : 
diff --git a/src/StlMesh/StlMesh_MeshTriangle.hxx b/src/StlMesh/StlMesh_MeshTriangle.hxx
index 6a8a41821b..25b9cd6e3d 100644
--- a/src/StlMesh/StlMesh_MeshTriangle.hxx
+++ b/src/StlMesh/StlMesh_MeshTriangle.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(StlMesh_MeshTriangle,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(StlMesh_MeshTriangle,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_CallBack.cxx b/src/Storage/Storage_CallBack.cxx
index 8d1ab98fb4..59c3be05a9 100644
--- a/src/Storage/Storage_CallBack.cxx
+++ b/src/Storage/Storage_CallBack.cxx
@@ -18,3 +18,5 @@
 #include <Storage_BaseDriver.hxx>
 #include <Storage_CallBack.hxx>
 #include <Storage_Schema.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(Storage_CallBack,MMgt_TShared)
\ No newline at end of file
diff --git a/src/Storage/Storage_CallBack.hxx b/src/Storage/Storage_CallBack.hxx
index 2189b039a6..b7e75da31e 100644
--- a/src/Storage/Storage_CallBack.hxx
+++ b/src/Storage/Storage_CallBack.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Storage_CallBack,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_CallBack,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_Data.cxx b/src/Storage/Storage_Data.cxx
index 9e2c3ac3d7..f832d16347 100644
--- a/src/Storage/Storage_Data.cxx
+++ b/src/Storage/Storage_Data.cxx
@@ -25,6 +25,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_Data,MMgt_TShared)
+
 Storage_Data::Storage_Data()
 {
   myRootData = new Storage_RootData;
diff --git a/src/Storage/Storage_Data.hxx b/src/Storage/Storage_Data.hxx
index 2a31248c9f..e5be252c54 100644
--- a/src/Storage/Storage_Data.hxx
+++ b/src/Storage/Storage_Data.hxx
@@ -228,7 +228,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_Data,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_Data,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_DefaultCallBack.cxx b/src/Storage/Storage_DefaultCallBack.cxx
index b93d359d56..931b47a1d1 100644
--- a/src/Storage/Storage_DefaultCallBack.cxx
+++ b/src/Storage/Storage_DefaultCallBack.cxx
@@ -19,6 +19,8 @@
 #include <Storage_DefaultCallBack.hxx>
 #include <Storage_Schema.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_DefaultCallBack,Storage_CallBack)
+
 Storage_DefaultCallBack::Storage_DefaultCallBack()
 {
 }
diff --git a/src/Storage/Storage_DefaultCallBack.hxx b/src/Storage/Storage_DefaultCallBack.hxx
index 99a8e9b1ed..4f27d2929a 100644
--- a/src/Storage/Storage_DefaultCallBack.hxx
+++ b/src/Storage/Storage_DefaultCallBack.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Storage_DefaultCallBack,Storage_CallBack)
+  DEFINE_STANDARD_RTTIEXT(Storage_DefaultCallBack,Storage_CallBack)
 
 protected:
 
diff --git a/src/Storage/Storage_HeaderData.cxx b/src/Storage/Storage_HeaderData.cxx
index e4ec071d5d..c29a4827fa 100644
--- a/src/Storage/Storage_HeaderData.cxx
+++ b/src/Storage/Storage_HeaderData.cxx
@@ -19,6 +19,8 @@
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_HeaderData,MMgt_TShared)
+
 Storage_HeaderData::Storage_HeaderData() : myNBObj(0), myErrorStatus(Storage_VSOk)
 {
 }
diff --git a/src/Storage/Storage_HeaderData.hxx b/src/Storage/Storage_HeaderData.hxx
index 33be840f2d..aa437f1337 100644
--- a/src/Storage/Storage_HeaderData.hxx
+++ b/src/Storage/Storage_HeaderData.hxx
@@ -101,7 +101,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_HeaderData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_HeaderData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_InternalData.cxx b/src/Storage/Storage_InternalData.cxx
index 61e442c2fd..ad76467cf0 100644
--- a/src/Storage/Storage_InternalData.cxx
+++ b/src/Storage/Storage_InternalData.cxx
@@ -17,6 +17,8 @@
 #include <Storage_InternalData.hxx>
 #include <Storage_Schema.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_InternalData,MMgt_TShared)
+
 Storage_InternalData::Storage_InternalData() : myObjId(1), myTypeId(1)
 {
 }
diff --git a/src/Storage/Storage_InternalData.hxx b/src/Storage/Storage_InternalData.hxx
index 08ac8c8014..3ff9c99ac6 100644
--- a/src/Storage/Storage_InternalData.hxx
+++ b/src/Storage/Storage_InternalData.hxx
@@ -46,7 +46,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_InternalData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_InternalData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_Root.cxx b/src/Storage/Storage_Root.cxx
index 3c62c1e0aa..c0b6da4892 100644
--- a/src/Storage/Storage_Root.cxx
+++ b/src/Storage/Storage_Root.cxx
@@ -19,6 +19,8 @@
 #include <Storage_Schema.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_Root,MMgt_TShared)
+
 Storage_Root::Storage_Root() : myRef(0)
 {
 }
diff --git a/src/Storage/Storage_Root.hxx b/src/Storage/Storage_Root.hxx
index f85799c715..4cee1f32e4 100644
--- a/src/Storage/Storage_Root.hxx
+++ b/src/Storage/Storage_Root.hxx
@@ -87,7 +87,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_Root,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_Root,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_RootData.cxx b/src/Storage/Storage_RootData.cxx
index b3a6783a37..6588486cd1 100644
--- a/src/Storage/Storage_RootData.cxx
+++ b/src/Storage/Storage_RootData.cxx
@@ -22,6 +22,8 @@
 #include <Storage_Schema.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_RootData,MMgt_TShared)
+
 Storage_RootData::Storage_RootData() : myErrorStatus(Storage_VSOk)
 {
 }
diff --git a/src/Storage/Storage_RootData.hxx b/src/Storage/Storage_RootData.hxx
index ffd351ded2..cecb68fe64 100644
--- a/src/Storage/Storage_RootData.hxx
+++ b/src/Storage/Storage_RootData.hxx
@@ -74,7 +74,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_RootData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_RootData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx
index f3fa1b44d8..0e9bbddba4 100644
--- a/src/Storage/Storage_Schema.cxx
+++ b/src/Storage/Storage_Schema.cxx
@@ -46,6 +46,8 @@
 
 #include <locale.h>
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(Storage_Schema,MMgt_TShared)
+
 #define DATATYPE_MIGRATION
 
 #ifdef DATATYPE_MIGRATION
diff --git a/src/Storage/Storage_Schema.hxx b/src/Storage/Storage_Schema.hxx
index 72b1b05060..9b9b3c400a 100644
--- a/src/Storage/Storage_Schema.hxx
+++ b/src/Storage/Storage_Schema.hxx
@@ -223,7 +223,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Storage_Schema,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_Schema,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_TypeData.cxx b/src/Storage/Storage_TypeData.cxx
index 1caa0e63d1..4922f41419 100644
--- a/src/Storage/Storage_TypeData.cxx
+++ b/src/Storage/Storage_TypeData.cxx
@@ -19,6 +19,8 @@
 #include <Storage_TypeData.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_TypeData,MMgt_TShared)
+
 Storage_TypeData::Storage_TypeData() : myErrorStatus(Storage_VSOk)
 {
 }
diff --git a/src/Storage/Storage_TypeData.hxx b/src/Storage/Storage_TypeData.hxx
index 46e3747fa5..f1805a913c 100644
--- a/src/Storage/Storage_TypeData.hxx
+++ b/src/Storage/Storage_TypeData.hxx
@@ -62,7 +62,7 @@ public:
 friend class Storage_Schema;
 
 
-  DEFINE_STANDARD_RTTI(Storage_TypeData,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_TypeData,MMgt_TShared)
 
 protected:
 
diff --git a/src/Storage/Storage_TypedCallBack.cxx b/src/Storage/Storage_TypedCallBack.cxx
index dfdaf7e424..87bfa0f5c3 100644
--- a/src/Storage/Storage_TypedCallBack.cxx
+++ b/src/Storage/Storage_TypedCallBack.cxx
@@ -18,6 +18,8 @@
 #include <Storage_TypedCallBack.hxx>
 #include <TCollection_AsciiString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Storage_TypedCallBack,MMgt_TShared)
+
 Storage_TypedCallBack::Storage_TypedCallBack() : myIndex(0)
 {
 }
diff --git a/src/Storage/Storage_TypedCallBack.hxx b/src/Storage/Storage_TypedCallBack.hxx
index aa7d488555..20a82b96b3 100644
--- a/src/Storage/Storage_TypedCallBack.hxx
+++ b/src/Storage/Storage_TypedCallBack.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Storage_TypedCallBack,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Storage_TypedCallBack,MMgt_TShared)
 
 protected:
 
diff --git a/src/TColStd/TColStd_HPackedMapOfInteger.cxx b/src/TColStd/TColStd_HPackedMapOfInteger.cxx
index 676b51b58d..76d0db73e7 100644
--- a/src/TColStd/TColStd_HPackedMapOfInteger.cxx
+++ b/src/TColStd/TColStd_HPackedMapOfInteger.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TColStd_HPackedMapOfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TColStd_HPackedMapOfInteger,MMgt_TShared)
+
 //! Constructor of empty map
 TColStd_HPackedMapOfInteger::TColStd_HPackedMapOfInteger (const Standard_Integer NbBuckets)
 {
diff --git a/src/TColStd/TColStd_HPackedMapOfInteger.hxx b/src/TColStd/TColStd_HPackedMapOfInteger.hxx
index f717327c4d..d9c7499eeb 100644
--- a/src/TColStd/TColStd_HPackedMapOfInteger.hxx
+++ b/src/TColStd/TColStd_HPackedMapOfInteger.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TColStd_HPackedMapOfInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TColStd_HPackedMapOfInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/TCollection/TCollection_HAsciiString.cxx b/src/TCollection/TCollection_HAsciiString.cxx
index 2c160031ad..9945fcb598 100644
--- a/src/TCollection/TCollection_HAsciiString.cxx
+++ b/src/TCollection/TCollection_HAsciiString.cxx
@@ -22,6 +22,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TCollection_HExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TCollection_HAsciiString,MMgt_TShared)
+
 // ----------------------------------------------------------------------------
 // Create
 // ----------------------------------------------------------------------------
diff --git a/src/TCollection/TCollection_HAsciiString.hxx b/src/TCollection/TCollection_HAsciiString.hxx
index 234671052d..f7838f399c 100644
--- a/src/TCollection/TCollection_HAsciiString.hxx
+++ b/src/TCollection/TCollection_HAsciiString.hxx
@@ -471,7 +471,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TCollection_HAsciiString,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TCollection_HAsciiString,MMgt_TShared)
 
 protected:
 
diff --git a/src/TCollection/TCollection_HExtendedString.cxx b/src/TCollection/TCollection_HExtendedString.cxx
index e1f4bd49ab..1969fda0a5 100644
--- a/src/TCollection/TCollection_HExtendedString.cxx
+++ b/src/TCollection/TCollection_HExtendedString.cxx
@@ -26,6 +26,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <TCollection_HExtendedString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TCollection_HExtendedString,MMgt_TShared)
+
 // ----------------------------------------------------------------------------
 // Create
 // ----------------------------------------------------------------------------
diff --git a/src/TCollection/TCollection_HExtendedString.hxx b/src/TCollection/TCollection_HExtendedString.hxx
index a037adfee0..86ee9423bd 100644
--- a/src/TCollection/TCollection_HExtendedString.hxx
+++ b/src/TCollection/TCollection_HExtendedString.hxx
@@ -208,7 +208,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TCollection_HExtendedString,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TCollection_HExtendedString,MMgt_TShared)
 
 protected:
 
diff --git a/src/TCollection/TCollection_MapNode.cxx b/src/TCollection/TCollection_MapNode.cxx
index 571781d0b4..0bd35e9aa4 100644
--- a/src/TCollection/TCollection_MapNode.cxx
+++ b/src/TCollection/TCollection_MapNode.cxx
@@ -15,3 +15,5 @@
 
 #include <Standard_Type.hxx>
 #include <TCollection_MapNode.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(TCollection_MapNode,MMgt_TShared)
\ No newline at end of file
diff --git a/src/TCollection/TCollection_MapNode.hxx b/src/TCollection/TCollection_MapNode.hxx
index b66f0bbc2f..8c3b9f9b28 100644
--- a/src/TCollection/TCollection_MapNode.hxx
+++ b/src/TCollection/TCollection_MapNode.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TCollection_MapNode,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TCollection_MapNode,MMgt_TShared)
 
 protected:
 
diff --git a/src/TCollection/TCollection_SeqNode.cxx b/src/TCollection/TCollection_SeqNode.cxx
index 93bcc8bb47..a16a03a30f 100644
--- a/src/TCollection/TCollection_SeqNode.cxx
+++ b/src/TCollection/TCollection_SeqNode.cxx
@@ -15,3 +15,5 @@
 
 #include <Standard_Type.hxx>
 #include <TCollection_SeqNode.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(TCollection_SeqNode,MMgt_TShared)
\ No newline at end of file
diff --git a/src/TCollection/TCollection_SeqNode.hxx b/src/TCollection/TCollection_SeqNode.hxx
index a779d96470..3b82318709 100644
--- a/src/TCollection/TCollection_SeqNode.hxx
+++ b/src/TCollection/TCollection_SeqNode.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TCollection_SeqNode,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TCollection_SeqNode,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_Attribute.cxx b/src/TDF/TDF_Attribute.cxx
index c4c0301108..570619befd 100644
--- a/src/TDF/TDF_Attribute.cxx
+++ b/src/TDF/TDF_Attribute.cxx
@@ -41,6 +41,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_Attribute,MMgt_TShared)
+
 #undef TDF_DATA_COMMIT_OPTIMIZED
 
 //=======================================================================
diff --git a/src/TDF/TDF_Attribute.hxx b/src/TDF/TDF_Attribute.hxx
index 8137fc4f1a..d8c42fad20 100644
--- a/src/TDF/TDF_Attribute.hxx
+++ b/src/TDF/TDF_Attribute.hxx
@@ -365,7 +365,7 @@ friend class TDF_AttributeIterator;
 friend class TDF_DeltaOnForget;
 
 
-  DEFINE_STANDARD_RTTI(TDF_Attribute,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_Attribute,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_AttributeDelta.cxx b/src/TDF/TDF_AttributeDelta.cxx
index 759e85df18..77d3733c72 100644
--- a/src/TDF/TDF_AttributeDelta.cxx
+++ b/src/TDF/TDF_AttributeDelta.cxx
@@ -26,6 +26,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_AttributeDelta,MMgt_TShared)
+
 //=======================================================================
 //function : TDF_AttributeDelta
 //purpose  : 
diff --git a/src/TDF/TDF_AttributeDelta.hxx b/src/TDF/TDF_AttributeDelta.hxx
index 8d981608a0..ae70fd2b37 100644
--- a/src/TDF/TDF_AttributeDelta.hxx
+++ b/src/TDF/TDF_AttributeDelta.hxx
@@ -70,7 +70,7 @@ Standard_OStream& operator<< (Standard_OStream& OS) const
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_AttributeDelta,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_AttributeDelta,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_Data.cxx b/src/TDF/TDF_Data.cxx
index 4991ca8033..e9f232bac6 100644
--- a/src/TDF/TDF_Data.cxx
+++ b/src/TDF/TDF_Data.cxx
@@ -37,6 +37,8 @@
 #include <TDF_Tool.hxx>
 #include <TDF_Transaction.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_Data,MMgt_TShared)
+
 #undef DEB_DELTA_CREATION
 #undef TDF_DATA_COMMIT_OPTIMIZED
 
diff --git a/src/TDF/TDF_Data.hxx b/src/TDF/TDF_Data.hxx
index 3248c227de..7dc4d3a424 100644
--- a/src/TDF/TDF_Data.hxx
+++ b/src/TDF/TDF_Data.hxx
@@ -138,7 +138,7 @@ friend class TDF_Transaction;
 friend class TDF_LabelNode;
 
 
-  DEFINE_STANDARD_RTTI(TDF_Data,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_Data,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_DataSet.cxx b/src/TDF/TDF_DataSet.cxx
index 8f9474f3f7..664d0bbd0a 100644
--- a/src/TDF/TDF_DataSet.cxx
+++ b/src/TDF/TDF_DataSet.cxx
@@ -26,6 +26,8 @@
 #include <TDF_MapIteratorOfAttributeMap.hxx>
 #include <TDF_MapIteratorOfLabelMap.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DataSet,MMgt_TShared)
+
 //=======================================================================
 //function : TDF_DataSet
 //purpose  : Creates a DataSet.
diff --git a/src/TDF/TDF_DataSet.hxx b/src/TDF/TDF_DataSet.hxx
index 76e74c6eb8..bd5bef7b07 100644
--- a/src/TDF/TDF_DataSet.hxx
+++ b/src/TDF/TDF_DataSet.hxx
@@ -87,7 +87,7 @@ Standard_OStream& operator<< (Standard_OStream& anOS) const
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DataSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_DataSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_DefaultDeltaOnModification.cxx b/src/TDF/TDF_DefaultDeltaOnModification.cxx
index 3a5b0aea66..7952bb21be 100644
--- a/src/TDF/TDF_DefaultDeltaOnModification.cxx
+++ b/src/TDF/TDF_DefaultDeltaOnModification.cxx
@@ -24,6 +24,8 @@
 #include <TDF_DefaultDeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DefaultDeltaOnModification,TDF_DeltaOnModification)
+
 //=======================================================================
 //function : TDF_DefaultDeltaOnModification
 //purpose  : 
diff --git a/src/TDF/TDF_DefaultDeltaOnModification.hxx b/src/TDF/TDF_DefaultDeltaOnModification.hxx
index a4dae38148..0e0c544ea4 100644
--- a/src/TDF/TDF_DefaultDeltaOnModification.hxx
+++ b/src/TDF/TDF_DefaultDeltaOnModification.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DefaultDeltaOnModification,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDF_DefaultDeltaOnModification,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDF/TDF_DefaultDeltaOnRemoval.cxx b/src/TDF/TDF_DefaultDeltaOnRemoval.cxx
index 232d3f3388..ca4a45b7fd 100644
--- a/src/TDF/TDF_DefaultDeltaOnRemoval.cxx
+++ b/src/TDF/TDF_DefaultDeltaOnRemoval.cxx
@@ -23,6 +23,8 @@
 #include <TDF_DefaultDeltaOnRemoval.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DefaultDeltaOnRemoval,TDF_DeltaOnRemoval)
+
 //=======================================================================
 //function : TDF_DefaultDeltaOnRemoval
 //purpose  : 
diff --git a/src/TDF/TDF_DefaultDeltaOnRemoval.hxx b/src/TDF/TDF_DefaultDeltaOnRemoval.hxx
index 48d5098bc4..d6df9f935e 100644
--- a/src/TDF/TDF_DefaultDeltaOnRemoval.hxx
+++ b/src/TDF/TDF_DefaultDeltaOnRemoval.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DefaultDeltaOnRemoval,TDF_DeltaOnRemoval)
+  DEFINE_STANDARD_RTTIEXT(TDF_DefaultDeltaOnRemoval,TDF_DeltaOnRemoval)
 
 protected:
 
diff --git a/src/TDF/TDF_Delta.cxx b/src/TDF/TDF_Delta.cxx
index dc588017cd..9ec23b4105 100644
--- a/src/TDF/TDF_Delta.cxx
+++ b/src/TDF/TDF_Delta.cxx
@@ -29,6 +29,8 @@
 #include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDF_MapIteratorOfLabelMap.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_Delta,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 #include <Standard_ConstructionError.hxx>
 #endif
diff --git a/src/TDF/TDF_Delta.hxx b/src/TDF/TDF_Delta.hxx
index 3281e78828..7ea04e2c99 100644
--- a/src/TDF/TDF_Delta.hxx
+++ b/src/TDF/TDF_Delta.hxx
@@ -81,7 +81,7 @@ public:
 friend class TDF_Data;
 
 
-  DEFINE_STANDARD_RTTI(TDF_Delta,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_Delta,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_DeltaOnAddition.cxx b/src/TDF/TDF_DeltaOnAddition.cxx
index 2738b921a4..fefc18630e 100644
--- a/src/TDF/TDF_DeltaOnAddition.cxx
+++ b/src/TDF/TDF_DeltaOnAddition.cxx
@@ -24,6 +24,8 @@
 #include <TDF_DeltaOnAddition.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnAddition,TDF_AttributeDelta)
+
 //=======================================================================
 //function : TDF_DeltaOnAddition
 //purpose  : 
diff --git a/src/TDF/TDF_DeltaOnAddition.hxx b/src/TDF/TDF_DeltaOnAddition.hxx
index ff0370186d..92059de199 100644
--- a/src/TDF/TDF_DeltaOnAddition.hxx
+++ b/src/TDF/TDF_DeltaOnAddition.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DeltaOnAddition,TDF_AttributeDelta)
+  DEFINE_STANDARD_RTTIEXT(TDF_DeltaOnAddition,TDF_AttributeDelta)
 
 protected:
 
diff --git a/src/TDF/TDF_DeltaOnForget.cxx b/src/TDF/TDF_DeltaOnForget.cxx
index 5b37498898..05e845b1a6 100644
--- a/src/TDF/TDF_DeltaOnForget.cxx
+++ b/src/TDF/TDF_DeltaOnForget.cxx
@@ -23,6 +23,8 @@
 #include <TDF_DeltaOnForget.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnForget,TDF_AttributeDelta)
+
 //=======================================================================
 //function : TDF_DeltaOnForget
 //purpose  : 
diff --git a/src/TDF/TDF_DeltaOnForget.hxx b/src/TDF/TDF_DeltaOnForget.hxx
index faac73544a..e39c4407f3 100644
--- a/src/TDF/TDF_DeltaOnForget.hxx
+++ b/src/TDF/TDF_DeltaOnForget.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DeltaOnForget,TDF_AttributeDelta)
+  DEFINE_STANDARD_RTTIEXT(TDF_DeltaOnForget,TDF_AttributeDelta)
 
 protected:
 
diff --git a/src/TDF/TDF_DeltaOnModification.cxx b/src/TDF/TDF_DeltaOnModification.cxx
index e6b7f4c544..33330a968e 100644
--- a/src/TDF/TDF_DeltaOnModification.cxx
+++ b/src/TDF/TDF_DeltaOnModification.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_DeltaOnModification.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnModification,TDF_AttributeDelta)
+
 //=======================================================================
 //function : TDF_DeltaOnModification
 //purpose  : 
diff --git a/src/TDF/TDF_DeltaOnModification.hxx b/src/TDF/TDF_DeltaOnModification.hxx
index 1e100eaf9a..7fbc0a081d 100644
--- a/src/TDF/TDF_DeltaOnModification.hxx
+++ b/src/TDF/TDF_DeltaOnModification.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DeltaOnModification,TDF_AttributeDelta)
+  DEFINE_STANDARD_RTTIEXT(TDF_DeltaOnModification,TDF_AttributeDelta)
 
 protected:
 
diff --git a/src/TDF/TDF_DeltaOnRemoval.cxx b/src/TDF/TDF_DeltaOnRemoval.cxx
index e49119794b..e3a2dbd9a9 100644
--- a/src/TDF/TDF_DeltaOnRemoval.cxx
+++ b/src/TDF/TDF_DeltaOnRemoval.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Attribute.hxx>
 #include <TDF_DeltaOnRemoval.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnRemoval,TDF_AttributeDelta)
+
 //=======================================================================
 //function : TDF_DeltaOnRemoval
 //purpose  : 
diff --git a/src/TDF/TDF_DeltaOnRemoval.hxx b/src/TDF/TDF_DeltaOnRemoval.hxx
index 0a6097cc03..8c1200656a 100644
--- a/src/TDF/TDF_DeltaOnRemoval.hxx
+++ b/src/TDF/TDF_DeltaOnRemoval.hxx
@@ -40,7 +40,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DeltaOnRemoval,TDF_AttributeDelta)
+  DEFINE_STANDARD_RTTIEXT(TDF_DeltaOnRemoval,TDF_AttributeDelta)
 
 protected:
 
diff --git a/src/TDF/TDF_DeltaOnResume.cxx b/src/TDF/TDF_DeltaOnResume.cxx
index f53c28a2aa..9a909d03ac 100644
--- a/src/TDF/TDF_DeltaOnResume.cxx
+++ b/src/TDF/TDF_DeltaOnResume.cxx
@@ -23,6 +23,8 @@
 #include <TDF_DeltaOnResume.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_DeltaOnResume,TDF_AttributeDelta)
+
 //=======================================================================
 //function : TDF_DeltaOnResume
 //purpose  : 
diff --git a/src/TDF/TDF_DeltaOnResume.hxx b/src/TDF/TDF_DeltaOnResume.hxx
index 4dd5c2ef38..19c5c4143d 100644
--- a/src/TDF/TDF_DeltaOnResume.hxx
+++ b/src/TDF/TDF_DeltaOnResume.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_DeltaOnResume,TDF_AttributeDelta)
+  DEFINE_STANDARD_RTTIEXT(TDF_DeltaOnResume,TDF_AttributeDelta)
 
 protected:
 
diff --git a/src/TDF/TDF_Reference.cxx b/src/TDF/TDF_Reference.cxx
index 63ae85f8a2..9e96f5737e 100644
--- a/src/TDF/TDF_Reference.cxx
+++ b/src/TDF/TDF_Reference.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Reference.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_Reference,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDF/TDF_Reference.hxx b/src/TDF/TDF_Reference.hxx
index 2504d8d3bb..6d9028b181 100644
--- a/src/TDF/TDF_Reference.hxx
+++ b/src/TDF/TDF_Reference.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_Reference,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDF_Reference,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDF/TDF_RelocationTable.cxx b/src/TDF/TDF_RelocationTable.cxx
index 6dd2f76119..5d8c435c8b 100644
--- a/src/TDF/TDF_RelocationTable.cxx
+++ b/src/TDF/TDF_RelocationTable.cxx
@@ -26,6 +26,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_RelocationTable,MMgt_TShared)
+
 //=======================================================================
 //function : TDF_RelocationTable
 //purpose  : 
diff --git a/src/TDF/TDF_RelocationTable.hxx b/src/TDF/TDF_RelocationTable.hxx
index f64d8e4156..5594a7f365 100644
--- a/src/TDF/TDF_RelocationTable.hxx
+++ b/src/TDF/TDF_RelocationTable.hxx
@@ -145,7 +145,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_RelocationTable,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDF_RelocationTable,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDF/TDF_TagSource.cxx b/src/TDF/TDF_TagSource.cxx
index 307a7f9cb0..b4561f574a 100644
--- a/src/TDF/TDF_TagSource.cxx
+++ b/src/TDF/TDF_TagSource.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_TagSource.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDF_TagSource,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDF/TDF_TagSource.hxx b/src/TDF/TDF_TagSource.hxx
index 63168f5dae..54bbe10996 100644
--- a/src/TDF/TDF_TagSource.hxx
+++ b/src/TDF/TDF_TagSource.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDF_TagSource,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDF_TagSource,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_AsciiString.cxx b/src/TDataStd/TDataStd_AsciiString.cxx
index f6a457633b..44b969d5ce 100644
--- a/src/TDataStd/TDataStd_AsciiString.cxx
+++ b/src/TDataStd/TDataStd_AsciiString.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_AsciiString,TDF_Attribute)
+
 //=======================================================================
 //function : TDataStd_AsciiString
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_AsciiString.hxx b/src/TDataStd/TDataStd_AsciiString.hxx
index aaeaf2a910..52a837ebf5 100644
--- a/src/TDataStd/TDataStd_AsciiString.hxx
+++ b/src/TDataStd/TDataStd_AsciiString.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_AsciiString,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_AsciiString,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_BooleanArray.cxx b/src/TDataStd/TDataStd_BooleanArray.cxx
index 489c37cee2..39b0df2b2e 100644
--- a/src/TDataStd/TDataStd_BooleanArray.cxx
+++ b/src/TDataStd/TDataStd_BooleanArray.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_BooleanArray,TDF_Attribute)
+
 static Standard_Integer DegreeOf2(const Standard_Integer degree)
 {
   switch (degree)
diff --git a/src/TDataStd/TDataStd_BooleanArray.hxx b/src/TDataStd/TDataStd_BooleanArray.hxx
index ba835ffd2b..0080cd6ac3 100644
--- a/src/TDataStd/TDataStd_BooleanArray.hxx
+++ b/src/TDataStd/TDataStd_BooleanArray.hxx
@@ -90,7 +90,7 @@ Standard_Boolean operator () (const Standard_Integer Index) const
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_BooleanArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_BooleanArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_BooleanList.cxx b/src/TDataStd/TDataStd_BooleanList.cxx
index bcc5ece9bd..21d9812c82 100644
--- a/src/TDataStd/TDataStd_BooleanList.cxx
+++ b/src/TDataStd/TDataStd_BooleanList.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_BooleanList,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_BooleanList.hxx b/src/TDataStd/TDataStd_BooleanList.hxx
index 3814406f4b..0fcb69949e 100644
--- a/src/TDataStd/TDataStd_BooleanList.hxx
+++ b/src/TDataStd/TDataStd_BooleanList.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_BooleanList,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_BooleanList,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_ByteArray.cxx b/src/TDataStd/TDataStd_ByteArray.cxx
index 017a0dc2d8..441ad0e4b9 100644
--- a/src/TDataStd/TDataStd_ByteArray.cxx
+++ b/src/TDataStd/TDataStd_ByteArray.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ByteArray,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_ByteArray.hxx b/src/TDataStd/TDataStd_ByteArray.hxx
index d18bf31506..c270aa4dbb 100644
--- a/src/TDataStd/TDataStd_ByteArray.hxx
+++ b/src/TDataStd/TDataStd_ByteArray.hxx
@@ -113,7 +113,7 @@ Standard_Byte operator () (const Standard_Integer Index) const
 friend class TDataStd_DeltaOnModificationOfByteArray;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_ByteArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_ByteArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Comment.cxx b/src/TDataStd/TDataStd_Comment.cxx
index a4781c4598..a827f0d9be 100644
--- a/src/TDataStd/TDataStd_Comment.cxx
+++ b/src/TDataStd/TDataStd_Comment.cxx
@@ -29,6 +29,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Comment,TDF_Attribute)
+
 #define lid1 45
 #define lid2 36
 
diff --git a/src/TDataStd/TDataStd_Comment.hxx b/src/TDataStd/TDataStd_Comment.hxx
index 204681994a..9bb96df0ec 100644
--- a/src/TDataStd/TDataStd_Comment.hxx
+++ b/src/TDataStd/TDataStd_Comment.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Comment,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Comment,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Current.cxx b/src/TDataStd/TDataStd_Current.cxx
index 28c2907fad..46f1df2d59 100644
--- a/src/TDataStd/TDataStd_Current.cxx
+++ b/src/TDataStd/TDataStd_Current.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Current,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Current.hxx b/src/TDataStd/TDataStd_Current.hxx
index 54620ae0c8..06a032c533 100644
--- a/src/TDataStd/TDataStd_Current.hxx
+++ b/src/TDataStd/TDataStd_Current.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Current,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Current,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx
index 168d1ccd23..d830575265 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cxx
@@ -25,6 +25,8 @@
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfByteArray,TDF_DeltaOnModification)
+
 #ifdef OCCT_DEBUG
 #define MAXUP 1000
 #endif
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.hxx b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.hxx
index 9b80ecc4ab..2ac2558fbd 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.hxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_DeltaOnModificationOfByteArray,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfByteArray,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx
index d57fbdb2ab..c4627115dc 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx
@@ -24,6 +24,8 @@
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfExtStringArray,TDF_DeltaOnModification)
+
 #ifdef OCCT_DEBUG
 #define MAXUP 1000
 #endif
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.hxx b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.hxx
index a9745a3e2f..3225fc3834 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.hxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_DeltaOnModificationOfExtStringArray,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfExtStringArray,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx
index 6414cf526e..8f1b22a8ac 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx
@@ -24,6 +24,8 @@
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfIntArray,TDF_DeltaOnModification)
+
 #ifdef OCCT_DEBUG
 #define MAXUP 1000
 #endif
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.hxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.hxx
index c229055f43..e8edd6c428 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.hxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.hxx
@@ -45,7 +45,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_DeltaOnModificationOfIntArray,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfIntArray,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
index 438f8a418b..9b121e0aec 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx
@@ -23,6 +23,8 @@
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfIntPackedMap,TDF_DeltaOnModification)
+
 #ifdef OCCT_DEBUG
 #define MAXUP 1000
 #endif
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.hxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.hxx
index 6b38731452..a6b1237e5c 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.hxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_DeltaOnModificationOfIntPackedMap,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfIntPackedMap,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx
index dc52823310..1acde06af1 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cxx
@@ -24,6 +24,8 @@
 #include <TDF_DeltaOnModification.hxx>
 #include <TDF_Label.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfRealArray,TDF_DeltaOnModification)
+
 #ifdef OCCT_DEBUG
 #define MAXUP 1000
 #endif
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.hxx b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.hxx
index 58f0f40e9d..2f163ec730 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.hxx
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_DeltaOnModificationOfRealArray,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_DeltaOnModificationOfRealArray,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Directory.cxx b/src/TDataStd/TDataStd_Directory.cxx
index 90d052b567..2ddfc1d19b 100644
--- a/src/TDataStd/TDataStd_Directory.cxx
+++ b/src/TDataStd/TDataStd_Directory.cxx
@@ -26,6 +26,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_TagSource.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Directory,TDF_Attribute)
+
 //=======================================================================
 //function : Find
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Directory.hxx b/src/TDataStd/TDataStd_Directory.hxx
index e43d13b451..a459f35b35 100644
--- a/src/TDataStd/TDataStd_Directory.hxx
+++ b/src/TDataStd/TDataStd_Directory.hxx
@@ -84,7 +84,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Directory,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Directory,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Expression.cxx b/src/TDataStd/TDataStd_Expression.cxx
index 6804c2deda..b200ad4ca1 100644
--- a/src/TDataStd/TDataStd_Expression.cxx
+++ b/src/TDataStd/TDataStd_Expression.cxx
@@ -26,6 +26,8 @@
 #include <TDF_ListIteratorOfAttributeList.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Expression,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Expression.hxx b/src/TDataStd/TDataStd_Expression.hxx
index fef2f4c406..38a6fa152a 100644
--- a/src/TDataStd/TDataStd_Expression.hxx
+++ b/src/TDataStd/TDataStd_Expression.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Expression,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Expression,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_ExtStringArray.cxx b/src/TDataStd/TDataStd_ExtStringArray.cxx
index 97e2b3c504..e35f56a56d 100644
--- a/src/TDataStd/TDataStd_ExtStringArray.cxx
+++ b/src/TDataStd/TDataStd_ExtStringArray.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ExtStringArray,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_ExtStringArray.hxx b/src/TDataStd/TDataStd_ExtStringArray.hxx
index af69b51d69..4b68df2626 100644
--- a/src/TDataStd/TDataStd_ExtStringArray.hxx
+++ b/src/TDataStd/TDataStd_ExtStringArray.hxx
@@ -116,7 +116,7 @@ const TCollection_ExtendedString& operator () (const Standard_Integer Index) con
 friend class TDataStd_DeltaOnModificationOfExtStringArray;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_ExtStringArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_ExtStringArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_ExtStringList.cxx b/src/TDataStd/TDataStd_ExtStringList.cxx
index 68657b58f4..7b66911553 100644
--- a/src/TDataStd/TDataStd_ExtStringList.cxx
+++ b/src/TDataStd/TDataStd_ExtStringList.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ExtStringList,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_ExtStringList.hxx b/src/TDataStd/TDataStd_ExtStringList.hxx
index 5f1ed236f3..19fde2bd80 100644
--- a/src/TDataStd/TDataStd_ExtStringList.hxx
+++ b/src/TDataStd/TDataStd_ExtStringList.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_ExtStringList,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_ExtStringList,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx b/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx
index 9c26247b59..a0d8293042 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringByte.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringByte.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringByte,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringByte
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx b/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx
index 8560f7672e..1e0e3cf96d 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringByte.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringByte,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringByte,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx
index 4d1db07323..0d76a2cb55 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringHArray1OfInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfInteger,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringHArray1OfInteger
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx
index b879f6b228..fd8fde9a61 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringHArray1OfInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx
index 4c9d895437..39f9c5c27f 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringHArray1OfReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfReal,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringHArray1OfReal
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx
index e446c70182..bb4e9e0e7d 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringHArray1OfReal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringHArray1OfReal,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx
index 7cf59250c4..abca819349 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringInteger,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringInteger
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx b/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx
index ca968b3450..bc79f9e75d 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringInteger.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringInteger,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringInteger,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx b/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx
index bc1a3291bb..60386cb516 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringReal.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringReal,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringReal
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx b/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx
index 1a81b05772..110ee8b033 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringReal.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringReal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringReal,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.cxx b/src/TDataStd/TDataStd_HDataMapOfStringString.cxx
index c0d22de7bc..d1675a5847 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringString.cxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringString.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <TDataStd_HDataMapOfStringString.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringString,MMgt_TShared)
+
 //=======================================================================
 //function : TDataStd_HDataMapOfStringString
 //purpose  : Constructor of empty map
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.hxx b/src/TDataStd/TDataStd_HDataMapOfStringString.hxx
index 6c940e38e4..51b625e513 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringString.hxx
+++ b/src/TDataStd/TDataStd_HDataMapOfStringString.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_HDataMapOfStringString,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_HDataMapOfStringString,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_IntPackedMap.cxx b/src/TDataStd/TDataStd_IntPackedMap.cxx
index aed7673889..74db1b6821 100644
--- a/src/TDataStd/TDataStd_IntPackedMap.cxx
+++ b/src/TDataStd/TDataStd_IntPackedMap.cxx
@@ -26,6 +26,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_IntPackedMap,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_IntPackedMap.hxx b/src/TDataStd/TDataStd_IntPackedMap.hxx
index 3b8dff5dc8..088d245bdd 100644
--- a/src/TDataStd/TDataStd_IntPackedMap.hxx
+++ b/src/TDataStd/TDataStd_IntPackedMap.hxx
@@ -100,7 +100,7 @@ public:
 friend class TDataStd_DeltaOnModificationOfIntPackedMap;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_IntPackedMap,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_IntPackedMap,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Integer.cxx b/src/TDataStd/TDataStd_Integer.cxx
index 60ebf92e6a..ccf1e3ba7d 100644
--- a/src/TDataStd/TDataStd_Integer.cxx
+++ b/src/TDataStd/TDataStd_Integer.cxx
@@ -23,6 +23,8 @@
 #include <TDF_Reference.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Integer,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Integer.hxx b/src/TDataStd/TDataStd_Integer.hxx
index 5da5ff030a..f18b587d15 100644
--- a/src/TDataStd/TDataStd_Integer.hxx
+++ b/src/TDataStd/TDataStd_Integer.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Integer,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Integer,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_IntegerArray.cxx b/src/TDataStd/TDataStd_IntegerArray.cxx
index 292427bc24..1e7c5e8b74 100644
--- a/src/TDataStd/TDataStd_IntegerArray.cxx
+++ b/src/TDataStd/TDataStd_IntegerArray.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_IntegerArray,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_IntegerArray.hxx b/src/TDataStd/TDataStd_IntegerArray.hxx
index a6fa2339b6..72b83b1ef8 100644
--- a/src/TDataStd/TDataStd_IntegerArray.hxx
+++ b/src/TDataStd/TDataStd_IntegerArray.hxx
@@ -117,7 +117,7 @@ Standard_Integer operator () (const Standard_Integer Index) const
 friend class TDataStd_DeltaOnModificationOfIntArray;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_IntegerArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_IntegerArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_IntegerList.cxx b/src/TDataStd/TDataStd_IntegerList.cxx
index abf5cffd0a..88972eb087 100644
--- a/src/TDataStd/TDataStd_IntegerList.cxx
+++ b/src/TDataStd/TDataStd_IntegerList.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_IntegerList,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_IntegerList.hxx b/src/TDataStd/TDataStd_IntegerList.hxx
index f1b313c215..7befe2a809 100644
--- a/src/TDataStd/TDataStd_IntegerList.hxx
+++ b/src/TDataStd/TDataStd_IntegerList.hxx
@@ -88,7 +88,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_IntegerList,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_IntegerList,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Name.cxx b/src/TDataStd/TDataStd_Name.cxx
index 64568417ed..46afe8b63f 100644
--- a/src/TDataStd/TDataStd_Name.cxx
+++ b/src/TDataStd/TDataStd_Name.cxx
@@ -28,6 +28,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_Tool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Name,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Name.hxx b/src/TDataStd/TDataStd_Name.hxx
index bafa2ceeea..727f69432f 100644
--- a/src/TDataStd/TDataStd_Name.hxx
+++ b/src/TDataStd/TDataStd_Name.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Name,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Name,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_NamedData.cxx b/src/TDataStd/TDataStd_NamedData.cxx
index 14f7c8e568..1b8e92f14b 100644
--- a/src/TDataStd/TDataStd_NamedData.cxx
+++ b/src/TDataStd/TDataStd_NamedData.cxx
@@ -34,6 +34,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_NamedData,TDF_Attribute)
+
 #ifdef _WIN32
 #define EXCEPTION ...
 #else
diff --git a/src/TDataStd/TDataStd_NamedData.hxx b/src/TDataStd/TDataStd_NamedData.hxx
index 0c6e8e5304..2cd8ae84e0 100644
--- a/src/TDataStd/TDataStd_NamedData.hxx
+++ b/src/TDataStd/TDataStd_NamedData.hxx
@@ -208,7 +208,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_NamedData,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_NamedData,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_NoteBook.cxx b/src/TDataStd/TDataStd_NoteBook.cxx
index 6c05566729..36b846b55e 100644
--- a/src/TDataStd/TDataStd_NoteBook.cxx
+++ b/src/TDataStd/TDataStd_NoteBook.cxx
@@ -26,6 +26,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDF_TagSource.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_NoteBook,TDF_Attribute)
+
 //=======================================================================
 //function : Find
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_NoteBook.hxx b/src/TDataStd/TDataStd_NoteBook.hxx
index b4862bd769..38d6af6559 100644
--- a/src/TDataStd/TDataStd_NoteBook.hxx
+++ b/src/TDataStd/TDataStd_NoteBook.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_NoteBook,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_NoteBook,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Real.cxx b/src/TDataStd/TDataStd_Real.cxx
index 3b62c69c34..1cd67b15d6 100644
--- a/src/TDataStd/TDataStd_Real.cxx
+++ b/src/TDataStd/TDataStd_Real.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Reference.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Real,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Real.hxx b/src/TDataStd/TDataStd_Real.hxx
index 4bf0b4615b..f76752d124 100644
--- a/src/TDataStd/TDataStd_Real.hxx
+++ b/src/TDataStd/TDataStd_Real.hxx
@@ -83,7 +83,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Real,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Real,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_RealArray.cxx b/src/TDataStd/TDataStd_RealArray.cxx
index 8a4803003c..752e081ea1 100644
--- a/src/TDataStd/TDataStd_RealArray.cxx
+++ b/src/TDataStd/TDataStd_RealArray.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_RealArray,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_RealArray.hxx b/src/TDataStd/TDataStd_RealArray.hxx
index 1fc619f7bf..6d8dd44d5f 100644
--- a/src/TDataStd/TDataStd_RealArray.hxx
+++ b/src/TDataStd/TDataStd_RealArray.hxx
@@ -118,7 +118,7 @@ Standard_Real operator () (const Standard_Integer Index) const
 friend class TDataStd_DeltaOnModificationOfRealArray;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_RealArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_RealArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_RealList.cxx b/src/TDataStd/TDataStd_RealList.cxx
index 8c3694f188..bb9e5510c0 100644
--- a/src/TDataStd/TDataStd_RealList.cxx
+++ b/src/TDataStd/TDataStd_RealList.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_RealList,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_RealList.hxx b/src/TDataStd/TDataStd_RealList.hxx
index d4d7024fcd..a577afbf3a 100644
--- a/src/TDataStd/TDataStd_RealList.hxx
+++ b/src/TDataStd/TDataStd_RealList.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_RealList,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_RealList,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_ReferenceArray.cxx b/src/TDataStd/TDataStd_ReferenceArray.cxx
index d1f01546d5..3825ca4be5 100644
--- a/src/TDataStd/TDataStd_ReferenceArray.cxx
+++ b/src/TDataStd/TDataStd_ReferenceArray.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ReferenceArray,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_ReferenceArray.hxx b/src/TDataStd/TDataStd_ReferenceArray.hxx
index e078735a46..5cd655a4eb 100644
--- a/src/TDataStd/TDataStd_ReferenceArray.hxx
+++ b/src/TDataStd/TDataStd_ReferenceArray.hxx
@@ -94,7 +94,7 @@ TDF_Label operator () (const Standard_Integer Index) const
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_ReferenceArray,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_ReferenceArray,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_ReferenceList.cxx b/src/TDataStd/TDataStd_ReferenceList.cxx
index cbc5b1c74a..45b4291d67 100644
--- a/src/TDataStd/TDataStd_ReferenceList.cxx
+++ b/src/TDataStd/TDataStd_ReferenceList.cxx
@@ -23,6 +23,8 @@
 #include <TDF_ListIteratorOfLabelList.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_ReferenceList,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_ReferenceList.hxx b/src/TDataStd/TDataStd_ReferenceList.hxx
index bf09726b31..8cb98737f0 100644
--- a/src/TDataStd/TDataStd_ReferenceList.hxx
+++ b/src/TDataStd/TDataStd_ReferenceList.hxx
@@ -91,7 +91,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_ReferenceList,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_ReferenceList,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Relation.cxx b/src/TDataStd/TDataStd_Relation.cxx
index 8b0203f3bb..68aeb672c0 100644
--- a/src/TDataStd/TDataStd_Relation.cxx
+++ b/src/TDataStd/TDataStd_Relation.cxx
@@ -26,6 +26,8 @@
 #include <TDF_ListIteratorOfAttributeList.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Relation,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Relation.hxx b/src/TDataStd/TDataStd_Relation.hxx
index 56a46533f5..b96be1d8dc 100644
--- a/src/TDataStd/TDataStd_Relation.hxx
+++ b/src/TDataStd/TDataStd_Relation.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Relation,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Relation,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Tick.cxx b/src/TDataStd/TDataStd_Tick.cxx
index d2ff76639e..8c1150141a 100644
--- a/src/TDataStd/TDataStd_Tick.cxx
+++ b/src/TDataStd/TDataStd_Tick.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Tick,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Tick.hxx b/src/TDataStd/TDataStd_Tick.hxx
index d837084244..44a346d3d7 100644
--- a/src/TDataStd/TDataStd_Tick.hxx
+++ b/src/TDataStd/TDataStd_Tick.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Tick,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Tick,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_TreeNode.cxx b/src/TDataStd/TDataStd_TreeNode.cxx
index 25a0916bc5..e8fbd717b2 100644
--- a/src/TDataStd/TDataStd_TreeNode.cxx
+++ b/src/TDataStd/TDataStd_TreeNode.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <Standard_DomainError.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_TreeNode,TDF_Attribute)
+
 //=======================================================================
 //function : Find
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_TreeNode.hxx b/src/TDataStd/TDataStd_TreeNode.hxx
index 54ee708b6e..a8c90b7789 100644
--- a/src/TDataStd/TDataStd_TreeNode.hxx
+++ b/src/TDataStd/TDataStd_TreeNode.hxx
@@ -218,7 +218,7 @@ public:
 friend class TDataStd_ChildNodeIterator;
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_TreeNode,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_TreeNode,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_UAttribute.cxx b/src/TDataStd/TDataStd_UAttribute.cxx
index f885d4fd40..530f2d7484 100644
--- a/src/TDataStd/TDataStd_UAttribute.cxx
+++ b/src/TDataStd/TDataStd_UAttribute.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_UAttribute,TDF_Attribute)
+
 //=======================================================================
 //function : Set
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_UAttribute.hxx b/src/TDataStd/TDataStd_UAttribute.hxx
index 6f9eb655d9..79f98fbc69 100644
--- a/src/TDataStd/TDataStd_UAttribute.hxx
+++ b/src/TDataStd/TDataStd_UAttribute.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_UAttribute,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_UAttribute,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataStd/TDataStd_Variable.cxx b/src/TDataStd/TDataStd_Variable.cxx
index 4179ad58ae..79411553dd 100644
--- a/src/TDataStd/TDataStd_Variable.cxx
+++ b/src/TDataStd/TDataStd_Variable.cxx
@@ -29,6 +29,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataStd_Variable,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataStd/TDataStd_Variable.hxx b/src/TDataStd/TDataStd_Variable.hxx
index c92ee51fc2..4ae0279cd6 100644
--- a/src/TDataStd/TDataStd_Variable.hxx
+++ b/src/TDataStd/TDataStd_Variable.hxx
@@ -140,7 +140,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataStd_Variable,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataStd_Variable,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Axis.cxx b/src/TDataXtd/TDataXtd_Axis.cxx
index de312c2546..b64dcf6a4f 100644
--- a/src/TDataXtd/TDataXtd_Axis.cxx
+++ b/src/TDataXtd/TDataXtd_Axis.cxx
@@ -37,6 +37,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Axis,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Axis.hxx b/src/TDataXtd/TDataXtd_Axis.hxx
index a3458ceb72..1fd6a24b8c 100644
--- a/src/TDataXtd/TDataXtd_Axis.hxx
+++ b/src/TDataXtd/TDataXtd_Axis.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Axis,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Axis,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Constraint.cxx b/src/TDataXtd/TDataXtd_Constraint.cxx
index 32122528bb..9c066f792b 100644
--- a/src/TDataXtd/TDataXtd_Constraint.cxx
+++ b/src/TDataXtd/TDataXtd_Constraint.cxx
@@ -28,6 +28,8 @@
 #include <TNaming_NamedShape.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Constraint,TDF_Attribute)
+
 // for symmetry midpoint the third argument is the axis or the point
 //=======================================================================
 //function : GetID
diff --git a/src/TDataXtd/TDataXtd_Constraint.hxx b/src/TDataXtd/TDataXtd_Constraint.hxx
index 35d75683de..6c3005cdbf 100644
--- a/src/TDataXtd/TDataXtd_Constraint.hxx
+++ b/src/TDataXtd/TDataXtd_Constraint.hxx
@@ -195,7 +195,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Constraint,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Constraint,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Geometry.cxx b/src/TDataXtd/TDataXtd_Geometry.cxx
index 9660add2d8..bf476b4e31 100644
--- a/src/TDataXtd/TDataXtd_Geometry.cxx
+++ b/src/TDataXtd/TDataXtd_Geometry.cxx
@@ -47,6 +47,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Geometry,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Geometry.hxx b/src/TDataXtd/TDataXtd_Geometry.hxx
index 5bfaeba100..d498d761cc 100644
--- a/src/TDataXtd/TDataXtd_Geometry.hxx
+++ b/src/TDataXtd/TDataXtd_Geometry.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Geometry,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Geometry,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Pattern.cxx b/src/TDataXtd/TDataXtd_Pattern.cxx
index f9c9a0c756..65603878ea 100644
--- a/src/TDataXtd/TDataXtd_Pattern.cxx
+++ b/src/TDataXtd/TDataXtd_Pattern.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TDataXtd_Pattern.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Pattern,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Pattern.hxx b/src/TDataXtd/TDataXtd_Pattern.hxx
index 0603f850e5..0e1663a9cf 100644
--- a/src/TDataXtd/TDataXtd_Pattern.hxx
+++ b/src/TDataXtd/TDataXtd_Pattern.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Pattern,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Pattern,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_PatternStd.cxx b/src/TDataXtd/TDataXtd_PatternStd.cxx
index d12d1adb1d..058c9e9ac5 100644
--- a/src/TDataXtd/TDataXtd_PatternStd.cxx
+++ b/src/TDataXtd/TDataXtd_PatternStd.cxx
@@ -33,6 +33,8 @@
 #include <TNaming_NamedShape.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_PatternStd,TDataXtd_Pattern)
+
 //=======================================================================
 //function : GetPatternID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_PatternStd.hxx b/src/TDataXtd/TDataXtd_PatternStd.hxx
index 08f1e4a711..a41975edb6 100644
--- a/src/TDataXtd/TDataXtd_PatternStd.hxx
+++ b/src/TDataXtd/TDataXtd_PatternStd.hxx
@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_PatternStd,TDataXtd_Pattern)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_PatternStd,TDataXtd_Pattern)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Placement.cxx b/src/TDataXtd/TDataXtd_Placement.cxx
index c430d2ce61..a652cfa93f 100644
--- a/src/TDataXtd/TDataXtd_Placement.cxx
+++ b/src/TDataXtd/TDataXtd_Placement.cxx
@@ -21,6 +21,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Placement,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Placement.hxx b/src/TDataXtd/TDataXtd_Placement.hxx
index 8eb08f3dd1..0176acb75c 100644
--- a/src/TDataXtd/TDataXtd_Placement.hxx
+++ b/src/TDataXtd/TDataXtd_Placement.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Placement,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Placement,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Plane.cxx b/src/TDataXtd/TDataXtd_Plane.cxx
index 49ea0744f2..bd928a6a32 100644
--- a/src/TDataXtd/TDataXtd_Plane.cxx
+++ b/src/TDataXtd/TDataXtd_Plane.cxx
@@ -35,6 +35,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Plane,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Plane.hxx b/src/TDataXtd/TDataXtd_Plane.hxx
index e23a1366de..fef5d02fc1 100644
--- a/src/TDataXtd/TDataXtd_Plane.hxx
+++ b/src/TDataXtd/TDataXtd_Plane.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Plane,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Plane,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Point.cxx b/src/TDataXtd/TDataXtd_Point.cxx
index 648710913d..6fc5eb6f57 100644
--- a/src/TDataXtd/TDataXtd_Point.cxx
+++ b/src/TDataXtd/TDataXtd_Point.cxx
@@ -33,6 +33,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Point,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Point.hxx b/src/TDataXtd/TDataXtd_Point.hxx
index 47b5e2a35e..c0793837d7 100644
--- a/src/TDataXtd/TDataXtd_Point.hxx
+++ b/src/TDataXtd/TDataXtd_Point.hxx
@@ -77,7 +77,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Point,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Point,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Position.cxx b/src/TDataXtd/TDataXtd_Position.cxx
index fd985973f9..e55c7d15ad 100644
--- a/src/TDataXtd/TDataXtd_Position.cxx
+++ b/src/TDataXtd/TDataXtd_Position.cxx
@@ -22,6 +22,8 @@
 #include <TDF_Label.hxx>
 #include <TDF_RelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Position,TDF_Attribute)
+
 //=======================================================================
 //function : Set (class method)
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Position.hxx b/src/TDataXtd/TDataXtd_Position.hxx
index 46b9ae3a23..405f9cabe7 100644
--- a/src/TDataXtd/TDataXtd_Position.hxx
+++ b/src/TDataXtd/TDataXtd_Position.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Position,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Position,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDataXtd/TDataXtd_Shape.cxx b/src/TDataXtd/TDataXtd_Shape.cxx
index 30d880f6ca..76ba7cb821 100644
--- a/src/TDataXtd/TDataXtd_Shape.cxx
+++ b/src/TDataXtd/TDataXtd_Shape.cxx
@@ -31,6 +31,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Solid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Shape,TDF_Attribute)
+
 //=======================================================================
 //function : Find
 //purpose  : 
diff --git a/src/TDataXtd/TDataXtd_Shape.hxx b/src/TDataXtd/TDataXtd_Shape.hxx
index 712119d077..5764f3445b 100644
--- a/src/TDataXtd/TDataXtd_Shape.hxx
+++ b/src/TDataXtd/TDataXtd_Shape.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDataXtd_Shape,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDataXtd_Shape,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_Application.cxx b/src/TDocStd/TDocStd_Application.cxx
index 0f6ab90975..f0e314d909 100644
--- a/src/TDocStd/TDocStd_Application.cxx
+++ b/src/TDocStd/TDocStd_Application.cxx
@@ -34,6 +34,8 @@
 #include <TDocStd_Owner.hxx>
 #include <TDocStd_PathParser.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Application,CDF_Application)
+
 // TDocStd_Owner attribute have pointer of closed TDocStd_Document
 //=======================================================================
 //function : TDocStd_Application
diff --git a/src/TDocStd/TDocStd_Application.hxx b/src/TDocStd/TDocStd_Application.hxx
index 8bb856ba4d..dae631394a 100644
--- a/src/TDocStd/TDocStd_Application.hxx
+++ b/src/TDocStd/TDocStd_Application.hxx
@@ -199,7 +199,7 @@ public:
 friend class TDocStd_Document;
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_Application,CDF_Application)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_Application,CDF_Application)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_ApplicationDelta.cxx b/src/TDocStd/TDocStd_ApplicationDelta.cxx
index 0009ac1b30..a79f52747e 100644
--- a/src/TDocStd/TDocStd_ApplicationDelta.cxx
+++ b/src/TDocStd/TDocStd_ApplicationDelta.cxx
@@ -20,6 +20,8 @@
 #include <TDocStd_ApplicationDelta.hxx>
 #include <TDocStd_Document.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_ApplicationDelta,MMgt_TShared)
+
 //=======================================================================
 //function : TDocStd_ApplicationDelta
 //purpose  : 
diff --git a/src/TDocStd/TDocStd_ApplicationDelta.hxx b/src/TDocStd/TDocStd_ApplicationDelta.hxx
index f5ae6496b8..9853318194 100644
--- a/src/TDocStd/TDocStd_ApplicationDelta.hxx
+++ b/src/TDocStd/TDocStd_ApplicationDelta.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_ApplicationDelta,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_ApplicationDelta,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_CompoundDelta.cxx b/src/TDocStd/TDocStd_CompoundDelta.cxx
index 7788516d8b..073b09d176 100644
--- a/src/TDocStd/TDocStd_CompoundDelta.cxx
+++ b/src/TDocStd/TDocStd_CompoundDelta.cxx
@@ -18,6 +18,8 @@
 #include <TDocStd_CompoundDelta.hxx>
 #include <TDocStd_Document.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_CompoundDelta,TDF_Delta)
+
 //=======================================================================
 //function : TDocStd_CompoundDelta
 //purpose  : 
diff --git a/src/TDocStd/TDocStd_CompoundDelta.hxx b/src/TDocStd/TDocStd_CompoundDelta.hxx
index 9d017faf9d..6495fb6063 100644
--- a/src/TDocStd/TDocStd_CompoundDelta.hxx
+++ b/src/TDocStd/TDocStd_CompoundDelta.hxx
@@ -44,7 +44,7 @@ public:
 friend class TDocStd_Document;
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_CompoundDelta,TDF_Delta)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_CompoundDelta,TDF_Delta)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_Document.cxx b/src/TDocStd/TDocStd_Document.cxx
index efa3fcfc2a..d9eb141505 100644
--- a/src/TDocStd/TDocStd_Document.cxx
+++ b/src/TDocStd/TDocStd_Document.cxx
@@ -40,6 +40,8 @@
 #include <TDocStd_XLink.hxx>
 #include <TDocStd_XLinkIterator.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Document,CDM_Document)
+
 // List should have a RemoveLast...
 #define TDocStd_List_RemoveLast(theList) \
 TDF_ListIteratorOfDeltaList it(theList); \
diff --git a/src/TDocStd/TDocStd_Document.hxx b/src/TDocStd/TDocStd_Document.hxx
index 146ab293a4..1b93de74e7 100644
--- a/src/TDocStd/TDocStd_Document.hxx
+++ b/src/TDocStd/TDocStd_Document.hxx
@@ -242,7 +242,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_Document,CDM_Document)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_Document,CDM_Document)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_Modified.cxx b/src/TDocStd/TDocStd_Modified.cxx
index b128ea34ce..88ecca5531 100644
--- a/src/TDocStd/TDocStd_Modified.cxx
+++ b/src/TDocStd/TDocStd_Modified.cxx
@@ -24,6 +24,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TDocStd_Modified.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Modified,TDF_Attribute)
+
 //=======================================================================
 //function : IsEmpty
 //purpose  : 
diff --git a/src/TDocStd/TDocStd_Modified.hxx b/src/TDocStd/TDocStd_Modified.hxx
index 18da571ef0..7f8adc50cf 100644
--- a/src/TDocStd/TDocStd_Modified.hxx
+++ b/src/TDocStd/TDocStd_Modified.hxx
@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_Modified,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_Modified,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_MultiTransactionManager.cxx b/src/TDocStd/TDocStd_MultiTransactionManager.cxx
index cf1fbe71b0..1b12f711fe 100644
--- a/src/TDocStd/TDocStd_MultiTransactionManager.cxx
+++ b/src/TDocStd/TDocStd_MultiTransactionManager.cxx
@@ -20,6 +20,8 @@
 #include <TDocStd_Document.hxx>
 #include <TDocStd_MultiTransactionManager.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_MultiTransactionManager,MMgt_TShared)
+
 //=======================================================================
 //function : TDocStd_MultiTransactionManager
 //purpose  : Constructor
diff --git a/src/TDocStd/TDocStd_MultiTransactionManager.hxx b/src/TDocStd/TDocStd_MultiTransactionManager.hxx
index e4ab21b859..3bc0355b3b 100644
--- a/src/TDocStd/TDocStd_MultiTransactionManager.hxx
+++ b/src/TDocStd/TDocStd_MultiTransactionManager.hxx
@@ -145,7 +145,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_MultiTransactionManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_MultiTransactionManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_Owner.cxx b/src/TDocStd/TDocStd_Owner.cxx
index e8362e78cc..c47bcf1d9b 100644
--- a/src/TDocStd/TDocStd_Owner.cxx
+++ b/src/TDocStd/TDocStd_Owner.cxx
@@ -23,6 +23,8 @@
 #include <TDocStd_Document.hxx>
 #include <TDocStd_Owner.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_Owner,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TDocStd/TDocStd_Owner.hxx b/src/TDocStd/TDocStd_Owner.hxx
index f5924cfb9b..01768c0db7 100644
--- a/src/TDocStd/TDocStd_Owner.hxx
+++ b/src/TDocStd/TDocStd_Owner.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_Owner,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_Owner,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_XLink.cxx b/src/TDocStd/TDocStd_XLink.cxx
index bc6c308024..180bf68f58 100644
--- a/src/TDocStd/TDocStd_XLink.cxx
+++ b/src/TDocStd/TDocStd_XLink.cxx
@@ -36,6 +36,8 @@
 #include <TDocStd_XLinkIterator.hxx>
 #include <TDocStd_XLinkRoot.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_XLink,TDF_Attribute)
+
 //=======================================================================
 //function : TDocStd_XLink
 //purpose  : 
diff --git a/src/TDocStd/TDocStd_XLink.hxx b/src/TDocStd/TDocStd_XLink.hxx
index ecd6bc47dc..2f022ebeeb 100644
--- a/src/TDocStd/TDocStd_XLink.hxx
+++ b/src/TDocStd/TDocStd_XLink.hxx
@@ -117,7 +117,7 @@ friend class TDocStd_XLinkRoot;
 friend class TDocStd_XLinkIterator;
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_XLink,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_XLink,TDF_Attribute)
 
 protected:
 
diff --git a/src/TDocStd/TDocStd_XLinkRoot.cxx b/src/TDocStd/TDocStd_XLinkRoot.cxx
index 0693f8f5b8..d1c0207beb 100644
--- a/src/TDocStd/TDocStd_XLinkRoot.cxx
+++ b/src/TDocStd/TDocStd_XLinkRoot.cxx
@@ -27,6 +27,8 @@
 #include <TDocStd_XLinkIterator.hxx>
 #include <TDocStd_XLinkRoot.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TDocStd_XLinkRoot,TDF_Attribute)
+
 //=======================================================================
 //             CLASS METHODS
 //=======================================================================
diff --git a/src/TDocStd/TDocStd_XLinkRoot.hxx b/src/TDocStd/TDocStd_XLinkRoot.hxx
index fb61c0209c..fef4425354 100644
--- a/src/TDocStd/TDocStd_XLinkRoot.hxx
+++ b/src/TDocStd/TDocStd_XLinkRoot.hxx
@@ -79,7 +79,7 @@ public:
 friend class TDocStd_XLinkIterator;
 
 
-  DEFINE_STANDARD_RTTI(TDocStd_XLinkRoot,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TDocStd_XLinkRoot,TDF_Attribute)
 
 protected:
 
diff --git a/src/TFunction/TFunction_Driver.cxx b/src/TFunction/TFunction_Driver.cxx
index 3e4859a7a5..c220a5dea4 100644
--- a/src/TFunction/TFunction_Driver.cxx
+++ b/src/TFunction/TFunction_Driver.cxx
@@ -21,6 +21,8 @@
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TFunction_Driver,MMgt_TShared)
+
 //=======================================================================
 //function : TFunction_Driver
 //purpose  : Constructor
diff --git a/src/TFunction/TFunction_Driver.hxx b/src/TFunction/TFunction_Driver.hxx
index 9c0b5555b5..fe4ff8fc17 100644
--- a/src/TFunction/TFunction_Driver.hxx
+++ b/src/TFunction/TFunction_Driver.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TFunction_Driver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TFunction_Driver,MMgt_TShared)
 
 protected:
 
diff --git a/src/TFunction/TFunction_DriverTable.cxx b/src/TFunction/TFunction_DriverTable.cxx
index 4fa0be5905..ff150f3991 100644
--- a/src/TFunction/TFunction_DriverTable.cxx
+++ b/src/TFunction/TFunction_DriverTable.cxx
@@ -24,6 +24,8 @@
 #include <TFunction_Driver.hxx>
 #include <TFunction_DriverTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TFunction_DriverTable,MMgt_TShared)
+
 static Handle(TFunction_DriverTable) DT;
 
 //=======================================================================
diff --git a/src/TFunction/TFunction_DriverTable.hxx b/src/TFunction/TFunction_DriverTable.hxx
index 6fddb3f3c3..72fd7502e2 100644
--- a/src/TFunction/TFunction_DriverTable.hxx
+++ b/src/TFunction/TFunction_DriverTable.hxx
@@ -73,7 +73,7 @@ Standard_OStream& operator << (Standard_OStream& anOS) const
 
 
 
-  DEFINE_STANDARD_RTTI(TFunction_DriverTable,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TFunction_DriverTable,MMgt_TShared)
 
 protected:
 
diff --git a/src/TFunction/TFunction_Function.cxx b/src/TFunction/TFunction_Function.cxx
index 98b8ccfef7..e93d5dd5a6 100644
--- a/src/TFunction/TFunction_Function.cxx
+++ b/src/TFunction/TFunction_Function.cxx
@@ -26,6 +26,8 @@
 #include <TFunction_GraphNode.hxx>
 #include <TFunction_Scope.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TFunction_Function,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : Static method to get an ID
diff --git a/src/TFunction/TFunction_Function.hxx b/src/TFunction/TFunction_Function.hxx
index 1248dabda4..ee82107c6f 100644
--- a/src/TFunction/TFunction_Function.hxx
+++ b/src/TFunction/TFunction_Function.hxx
@@ -99,7 +99,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TFunction_Function,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TFunction_Function,TDF_Attribute)
 
 protected:
 
diff --git a/src/TFunction/TFunction_GraphNode.cxx b/src/TFunction/TFunction_GraphNode.cxx
index b1c150f598..b6b80b4eb2 100644
--- a/src/TFunction/TFunction_GraphNode.cxx
+++ b/src/TFunction/TFunction_GraphNode.cxx
@@ -23,6 +23,8 @@
 #include <TFunction_GraphNode.hxx>
 #include <TFunction_Scope.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TFunction_GraphNode,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : Static method to get an ID
diff --git a/src/TFunction/TFunction_GraphNode.hxx b/src/TFunction/TFunction_GraphNode.hxx
index a270c544a3..ba925cba41 100644
--- a/src/TFunction/TFunction_GraphNode.hxx
+++ b/src/TFunction/TFunction_GraphNode.hxx
@@ -115,7 +115,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TFunction_GraphNode,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TFunction_GraphNode,TDF_Attribute)
 
 protected:
 
diff --git a/src/TFunction/TFunction_Scope.cxx b/src/TFunction/TFunction_Scope.cxx
index 95e56bec87..67eedbab2c 100644
--- a/src/TFunction/TFunction_Scope.cxx
+++ b/src/TFunction/TFunction_Scope.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <TFunction_Scope.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TFunction_Scope,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : Static method to get an ID
diff --git a/src/TFunction/TFunction_Scope.hxx b/src/TFunction/TFunction_Scope.hxx
index faf49571f5..a47175359e 100644
--- a/src/TFunction/TFunction_Scope.hxx
+++ b/src/TFunction/TFunction_Scope.hxx
@@ -109,7 +109,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TFunction_Scope,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TFunction_Scope,TDF_Attribute)
 
 protected:
 
diff --git a/src/TNaming/TNaming_DeltaOnModification.cxx b/src/TNaming/TNaming_DeltaOnModification.cxx
index ccb7879602..1ef2b2359e 100644
--- a/src/TNaming/TNaming_DeltaOnModification.cxx
+++ b/src/TNaming/TNaming_DeltaOnModification.cxx
@@ -24,6 +24,8 @@
 #include <TNaming_Iterator.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_DeltaOnModification,TDF_DeltaOnModification)
+
 //=======================================================================
 //function : TNaming_DeltaOnModification
 //purpose  : 
diff --git a/src/TNaming/TNaming_DeltaOnModification.hxx b/src/TNaming/TNaming_DeltaOnModification.hxx
index 1b32a387ef..c2adff69eb 100644
--- a/src/TNaming/TNaming_DeltaOnModification.hxx
+++ b/src/TNaming/TNaming_DeltaOnModification.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TNaming_DeltaOnModification,TDF_DeltaOnModification)
+  DEFINE_STANDARD_RTTIEXT(TNaming_DeltaOnModification,TDF_DeltaOnModification)
 
 protected:
 
diff --git a/src/TNaming/TNaming_DeltaOnRemoval.cxx b/src/TNaming/TNaming_DeltaOnRemoval.cxx
index 3489b09991..f5a10d9833 100644
--- a/src/TNaming/TNaming_DeltaOnRemoval.cxx
+++ b/src/TNaming/TNaming_DeltaOnRemoval.cxx
@@ -21,6 +21,8 @@
 #include <TNaming_DeltaOnRemoval.hxx>
 #include <TNaming_NamedShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_DeltaOnRemoval,TDF_DeltaOnRemoval)
+
 //=======================================================================
 //function : TNaming_DeltaOnModification
 //purpose  : 
diff --git a/src/TNaming/TNaming_DeltaOnRemoval.hxx b/src/TNaming/TNaming_DeltaOnRemoval.hxx
index 7a2500160f..22e9b370e6 100644
--- a/src/TNaming/TNaming_DeltaOnRemoval.hxx
+++ b/src/TNaming/TNaming_DeltaOnRemoval.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TNaming_DeltaOnRemoval,TDF_DeltaOnRemoval)
+  DEFINE_STANDARD_RTTIEXT(TNaming_DeltaOnRemoval,TDF_DeltaOnRemoval)
 
 protected:
 
diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx
index 62ce5774a1..f7fae006bc 100644
--- a/src/TNaming/TNaming_NamedShape.cxx
+++ b/src/TNaming/TNaming_NamedShape.cxx
@@ -51,6 +51,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_NamedShape,TDF_Attribute)
+
 // Defines the nodes classes
 //#define MDTV_DEB_HASL
 //=======================================================================
diff --git a/src/TNaming/TNaming_NamedShape.hxx b/src/TNaming/TNaming_NamedShape.hxx
index 11c19b91ee..4e72e3ab3c 100644
--- a/src/TNaming/TNaming_NamedShape.hxx
+++ b/src/TNaming/TNaming_NamedShape.hxx
@@ -142,7 +142,7 @@ friend class TNaming_NewShapeIterator;
 friend class TNaming_OldShapeIterator;
 
 
-  DEFINE_STANDARD_RTTI(TNaming_NamedShape,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TNaming_NamedShape,TDF_Attribute)
 
 protected:
 
diff --git a/src/TNaming/TNaming_Naming.cxx b/src/TNaming/TNaming_Naming.cxx
index af2eed5408..3f3d71666c 100644
--- a/src/TNaming/TNaming_Naming.cxx
+++ b/src/TNaming/TNaming_Naming.cxx
@@ -67,6 +67,8 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_Naming,TDF_Attribute)
+
 // #include <TNaming_NCollections.hxx>
 typedef NCollection_Map<TopoDS_Shape> TNaming_MapOfShape; 
 typedef TNaming_MapOfShape::Iterator TNaming_MapIteratorOfMapOfShape;
diff --git a/src/TNaming/TNaming_Naming.hxx b/src/TNaming/TNaming_Naming.hxx
index 1fdbc4474a..f5ec41bef3 100644
--- a/src/TNaming/TNaming_Naming.hxx
+++ b/src/TNaming/TNaming_Naming.hxx
@@ -105,7 +105,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TNaming_Naming,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TNaming_Naming,TDF_Attribute)
 
 protected:
 
diff --git a/src/TNaming/TNaming_TranslateTool.cxx b/src/TNaming/TNaming_TranslateTool.cxx
index 2eef35bc1b..2f9c0bad1c 100644
--- a/src/TNaming/TNaming_TranslateTool.cxx
+++ b/src/TNaming/TNaming_TranslateTool.cxx
@@ -46,6 +46,8 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_TranslateTool,MMgt_TShared)
+
 //=======================================================================
 //function : TNaming_TranslateTool
 //purpose  : 
diff --git a/src/TNaming/TNaming_TranslateTool.hxx b/src/TNaming/TNaming_TranslateTool.hxx
index 647cb4f5ac..c50e1f8fa0 100644
--- a/src/TNaming/TNaming_TranslateTool.hxx
+++ b/src/TNaming/TNaming_TranslateTool.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TNaming_TranslateTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TNaming_TranslateTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/TNaming/TNaming_UsedShapes.cxx b/src/TNaming/TNaming_UsedShapes.cxx
index ad880b727f..47e1199c4d 100644
--- a/src/TNaming/TNaming_UsedShapes.cxx
+++ b/src/TNaming/TNaming_UsedShapes.cxx
@@ -30,6 +30,8 @@
 #include <TNaming_UsedShapes.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TNaming_UsedShapes,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TNaming/TNaming_UsedShapes.hxx b/src/TNaming/TNaming_UsedShapes.hxx
index 4b8295bfa9..8e3bd3df7f 100644
--- a/src/TNaming/TNaming_UsedShapes.hxx
+++ b/src/TNaming/TNaming_UsedShapes.hxx
@@ -110,7 +110,7 @@ public:
 friend class TNaming_Builder;
 
 
-  DEFINE_STANDARD_RTTI(TNaming_UsedShapes,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TNaming_UsedShapes,TDF_Attribute)
 
 protected:
 
diff --git a/src/TObj/TObj_Application.cxx b/src/TObj/TObj_Application.cxx
index 54fd91a684..e1f4a1e8d2 100644
--- a/src/TObj/TObj_Application.cxx
+++ b/src/TObj/TObj_Application.cxx
@@ -26,6 +26,8 @@
 #include <stdio.h>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_Application,TDocStd_Application)
+
 //=======================================================================
 //function : GetInstance
 //purpose  :
diff --git a/src/TObj/TObj_Application.hxx b/src/TObj/TObj_Application.hxx
index 27574291ec..6d7130e111 100644
--- a/src/TObj/TObj_Application.hxx
+++ b/src/TObj/TObj_Application.hxx
@@ -117,7 +117,7 @@ public:
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Application, TDocStd_Application)
+  DEFINE_STANDARD_RTTIEXT(TObj_Application,TDocStd_Application)
 };
 
 
diff --git a/src/TObj/TObj_Assistant.cxx b/src/TObj/TObj_Assistant.cxx
index dcc8f2bcdb..ab4dd65e29 100644
--- a/src/TObj/TObj_Assistant.cxx
+++ b/src/TObj/TObj_Assistant.cxx
@@ -152,7 +152,7 @@ class TObj_Assistant_UnknownType : public MMgt_TShared
     // Empty constructor
   
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Assistant_UnknownType, MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(TObj_Assistant_UnknownType,MMgt_TShared)
 };
 
 // Define handle class for TObj_Assistant_UnknownType
diff --git a/src/TObj/TObj_CheckModel.cxx b/src/TObj/TObj_CheckModel.cxx
index 3758ca42be..df34c5b923 100644
--- a/src/TObj/TObj_CheckModel.cxx
+++ b/src/TObj/TObj_CheckModel.cxx
@@ -23,6 +23,8 @@
 #include <Message_Messenger.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_CheckModel,Message_Algorithm)
+
 //=======================================================================
 //function : Perform
 //purpose  : 
diff --git a/src/TObj/TObj_CheckModel.hxx b/src/TObj/TObj_CheckModel.hxx
index cdbdcf2b03..664d980e03 100644
--- a/src/TObj/TObj_CheckModel.hxx
+++ b/src/TObj/TObj_CheckModel.hxx
@@ -74,7 +74,7 @@ private:
 
  public:
   //! Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (TObj_CheckModel, Message_Algorithm)
+  DEFINE_STANDARD_RTTIEXT(TObj_CheckModel,Message_Algorithm)
 };
 
 //! Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/TObj/TObj_HiddenPartition.cxx b/src/TObj/TObj_HiddenPartition.cxx
index 2c7df0fb0c..63ef642c26 100644
--- a/src/TObj/TObj_HiddenPartition.cxx
+++ b/src/TObj/TObj_HiddenPartition.cxx
@@ -18,6 +18,7 @@
 #include <TObj_HiddenPartition.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_HiddenPartition,TObj_Partition)
 IMPLEMENT_TOBJOCAF_PERSISTENCE(TObj_HiddenPartition)
   
 //=======================================================================
diff --git a/src/TObj/TObj_HiddenPartition.hxx b/src/TObj/TObj_HiddenPartition.hxx
index e496f71c82..ed73b2b840 100644
--- a/src/TObj/TObj_HiddenPartition.hxx
+++ b/src/TObj/TObj_HiddenPartition.hxx
@@ -38,7 +38,7 @@ class TObj_HiddenPartition : public TObj_Partition
   DECLARE_TOBJOCAF_PERSISTENCE(TObj_HiddenPartition,TObj_Partition)
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_HiddenPartition, TObj_Partition)
+  DEFINE_STANDARD_RTTIEXT(TObj_HiddenPartition,TObj_Partition)
 };
 
 //! Define handle class for TObj_HiddenPartition
diff --git a/src/TObj/TObj_LabelIterator.cxx b/src/TObj/TObj_LabelIterator.cxx
index d77f35c9d8..402cbe193c 100644
--- a/src/TObj/TObj_LabelIterator.cxx
+++ b/src/TObj/TObj_LabelIterator.cxx
@@ -18,6 +18,8 @@
 #include <TObj_LabelIterator.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_LabelIterator,TObj_ObjectIterator)
+
 //=======================================================================
 //function : TObj_LabelIterator
 //purpose  : 
diff --git a/src/TObj/TObj_LabelIterator.hxx b/src/TObj/TObj_LabelIterator.hxx
index 42719d70fe..87044c7d55 100644
--- a/src/TObj/TObj_LabelIterator.hxx
+++ b/src/TObj/TObj_LabelIterator.hxx
@@ -99,7 +99,7 @@ class TObj_LabelIterator : public TObj_ObjectIterator
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_LabelIterator, TObj_ObjectIterator)
+  DEFINE_STANDARD_RTTIEXT(TObj_LabelIterator,TObj_ObjectIterator)
 };
 
 //! Define handle class for TObj_LabelIterator
diff --git a/src/TObj/TObj_Model.cxx b/src/TObj/TObj_Model.cxx
index 84f956243d..e7428c586b 100644
--- a/src/TObj/TObj_Model.cxx
+++ b/src/TObj/TObj_Model.cxx
@@ -43,6 +43,8 @@
 #include <Message_Msg.hxx>
 #include <OSD_OpenFile.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_Model,MMgt_TShared)
+
 #ifdef _MSC_VER
   #include <io.h>
 #else
diff --git a/src/TObj/TObj_Model.hxx b/src/TObj/TObj_Model.hxx
index 1521718a9f..c224acd46d 100644
--- a/src/TObj/TObj_Model.hxx
+++ b/src/TObj/TObj_Model.hxx
@@ -355,7 +355,7 @@ class TObj_Model : public MMgt_TShared
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Model, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TObj_Model,MMgt_TShared)
 };
 
 //! The Model Handle is defined in a separate header file
diff --git a/src/TObj/TObj_ModelIterator.cxx b/src/TObj/TObj_ModelIterator.cxx
index 170bf1bd3c..9403e1f357 100644
--- a/src/TObj/TObj_ModelIterator.cxx
+++ b/src/TObj/TObj_ModelIterator.cxx
@@ -20,6 +20,8 @@
 #include <TObj_Model.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_ModelIterator,TObj_ObjectIterator)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/TObj/TObj_ModelIterator.hxx b/src/TObj/TObj_ModelIterator.hxx
index 4ba1ae670c..d96fac0d26 100644
--- a/src/TObj/TObj_ModelIterator.hxx
+++ b/src/TObj/TObj_ModelIterator.hxx
@@ -68,7 +68,7 @@ class TObj_ModelIterator : public TObj_ObjectIterator
     
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ModelIterator, TObj_ObjectIterator)
+  DEFINE_STANDARD_RTTIEXT(TObj_ModelIterator,TObj_ObjectIterator)
 };
 
 //! Define handle class for TObj_ObjectIterator
diff --git a/src/TObj/TObj_Object.cxx b/src/TObj/TObj_Object.cxx
index 4ad4647e26..2c6ca29bcc 100644
--- a/src/TObj/TObj_Object.cxx
+++ b/src/TObj/TObj_Object.cxx
@@ -54,6 +54,8 @@
 #include <TDF_TagSource.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_Object,MMgt_TShared)
+
 //=======================================================================
 //function : Constructor
 //purpose  :
diff --git a/src/TObj/TObj_Object.hxx b/src/TObj/TObj_Object.hxx
index 998b5b3eba..3cc3085e91 100644
--- a/src/TObj/TObj_Object.hxx
+++ b/src/TObj/TObj_Object.hxx
@@ -30,9 +30,9 @@ class TObj_Persistence;
 class TObj_ObjectIterator;
 class TObj_TNameContainer;
 class TCollection_HExtendedString;
-class TColStd_HArray1OfInteger;
-class TColStd_HArray1OfReal;
-class TColStd_HArray1OfExtendedString;
+#include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfReal.hxx>
+#include <TColStd_HArray1OfExtendedString.hxx>
 
 class TObj_Object;
 DEFINE_STANDARD_HANDLE(TObj_Object,MMgt_TShared)
@@ -627,7 +627,7 @@ class TObj_Object : public MMgt_TShared
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Object, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TObj_Object,MMgt_TShared)
 };
 
 //! Define handle in separate file
diff --git a/src/TObj/TObj_ObjectIterator.cxx b/src/TObj/TObj_ObjectIterator.cxx
index 08c63798ee..74c2c10087 100644
--- a/src/TObj/TObj_ObjectIterator.cxx
+++ b/src/TObj/TObj_ObjectIterator.cxx
@@ -19,6 +19,8 @@
 #include <TObj_Object.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_ObjectIterator,MMgt_TShared)
+
 //=======================================================================
 //function : More
 //purpose  : 
diff --git a/src/TObj/TObj_ObjectIterator.hxx b/src/TObj/TObj_ObjectIterator.hxx
index 9263ca6295..c80df1a097 100644
--- a/src/TObj/TObj_ObjectIterator.hxx
+++ b/src/TObj/TObj_ObjectIterator.hxx
@@ -49,7 +49,7 @@ class TObj_ObjectIterator : public MMgt_TShared
 
  public:
    //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ObjectIterator, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TObj_ObjectIterator,MMgt_TShared)
 };
 
 //! Define handle class for TObj_ObjectIterator
diff --git a/src/TObj/TObj_OcafObjectIterator.cxx b/src/TObj/TObj_OcafObjectIterator.cxx
index 44fc3af804..91dfbe24d0 100644
--- a/src/TObj/TObj_OcafObjectIterator.cxx
+++ b/src/TObj/TObj_OcafObjectIterator.cxx
@@ -19,6 +19,8 @@
 #include <TObj_Object.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_OcafObjectIterator,TObj_LabelIterator)
+
 //=======================================================================
 //function : TObj_OcafObjectIterator
 //purpose  :
diff --git a/src/TObj/TObj_OcafObjectIterator.hxx b/src/TObj/TObj_OcafObjectIterator.hxx
index 416a2b95ae..ee82041882 100644
--- a/src/TObj/TObj_OcafObjectIterator.hxx
+++ b/src/TObj/TObj_OcafObjectIterator.hxx
@@ -56,7 +56,7 @@ class TObj_OcafObjectIterator : public TObj_LabelIterator
   
  public:
    //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_OcafObjectIterator, TObj_LabelIterator)
+  DEFINE_STANDARD_RTTIEXT(TObj_OcafObjectIterator,TObj_LabelIterator)
 };
 
 //! Define handle class for TObj_OcafObjectIterator
diff --git a/src/TObj/TObj_Partition.cxx b/src/TObj/TObj_Partition.cxx
index fd61f75c86..68f3b47541 100644
--- a/src/TObj/TObj_Partition.cxx
+++ b/src/TObj/TObj_Partition.cxx
@@ -23,6 +23,7 @@
 #include <TDataStd_Name.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_Partition,TObj_Object)
 IMPLEMENT_TOBJOCAF_PERSISTENCE(TObj_Partition)
 
 //=======================================================================
diff --git a/src/TObj/TObj_Partition.hxx b/src/TObj/TObj_Partition.hxx
index bd9e47c95c..160d857c72 100644
--- a/src/TObj/TObj_Partition.hxx
+++ b/src/TObj/TObj_Partition.hxx
@@ -144,7 +144,7 @@ class TObj_Partition : public TObj_Object
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_Partition, TObj_Object)
+  DEFINE_STANDARD_RTTIEXT(TObj_Partition,TObj_Object)
 
  public:
   friend class TObj_Model;
diff --git a/src/TObj/TObj_ReferenceIterator.cxx b/src/TObj/TObj_ReferenceIterator.cxx
index 5b4e92f315..50f3012a88 100644
--- a/src/TObj/TObj_ReferenceIterator.cxx
+++ b/src/TObj/TObj_ReferenceIterator.cxx
@@ -20,6 +20,8 @@
 #include <TObj_TReference.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_ReferenceIterator,TObj_LabelIterator)
+
 //=======================================================================
 //function : TObj_ObjectIterator
 //purpose  :
diff --git a/src/TObj/TObj_ReferenceIterator.hxx b/src/TObj/TObj_ReferenceIterator.hxx
index d06389ede5..c5d3918364 100644
--- a/src/TObj/TObj_ReferenceIterator.hxx
+++ b/src/TObj/TObj_ReferenceIterator.hxx
@@ -51,7 +51,7 @@ class TObj_ReferenceIterator : public TObj_LabelIterator
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_ReferenceIterator, TObj_LabelIterator)
+  DEFINE_STANDARD_RTTIEXT(TObj_ReferenceIterator,TObj_LabelIterator)
 };
 
 //! Define handle class for TObj_ReferenceIterator
diff --git a/src/TObj/TObj_SequenceIterator.cxx b/src/TObj/TObj_SequenceIterator.cxx
index 68f6568c1f..3eed700d82 100644
--- a/src/TObj/TObj_SequenceIterator.cxx
+++ b/src/TObj/TObj_SequenceIterator.cxx
@@ -20,6 +20,8 @@
 #include <TObj_Object.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_SequenceIterator,TObj_ObjectIterator)
+
 //=======================================================================
 //function : TObj_SequenceIterator
 //purpose  :
diff --git a/src/TObj/TObj_SequenceIterator.hxx b/src/TObj/TObj_SequenceIterator.hxx
index 0754a02816..34e23f19ba 100644
--- a/src/TObj/TObj_SequenceIterator.hxx
+++ b/src/TObj/TObj_SequenceIterator.hxx
@@ -70,7 +70,7 @@ class TObj_SequenceIterator : public TObj_ObjectIterator
 
  public:
    //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_SequenceIterator, TObj_ObjectIterator)
+  DEFINE_STANDARD_RTTIEXT(TObj_SequenceIterator,TObj_ObjectIterator)
 };
 
 //! Define handle class for TObj_SequenceIterator
diff --git a/src/TObj/TObj_TIntSparseArray.cxx b/src/TObj/TObj_TIntSparseArray.cxx
index 8653dcc0bc..79b01832e7 100644
--- a/src/TObj/TObj_TIntSparseArray.cxx
+++ b/src/TObj/TObj_TIntSparseArray.cxx
@@ -23,6 +23,8 @@
 #include <TDF_DeltaOnModification.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TIntSparseArray,TDF_Attribute)
+
 //=======================================================================
 //function : TObj_TIntSparseArray
 //purpose  : Empty constructor
diff --git a/src/TObj/TObj_TIntSparseArray.hxx b/src/TObj/TObj_TIntSparseArray.hxx
index 9406611bd5..ea89639715 100644
--- a/src/TObj/TObj_TIntSparseArray.hxx
+++ b/src/TObj/TObj_TIntSparseArray.hxx
@@ -146,7 +146,7 @@ class TObj_TIntSparseArray : public TDF_Attribute
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TIntSparseArray, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TIntSparseArray,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TIntSparseArray
diff --git a/src/TObj/TObj_TModel.cxx b/src/TObj/TObj_TModel.cxx
index eacf20a480..3170c807f4 100644
--- a/src/TObj/TObj_TModel.cxx
+++ b/src/TObj/TObj_TModel.cxx
@@ -21,6 +21,8 @@
 #include <TDF_RelocationTable.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TModel,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TObj/TObj_TModel.hxx b/src/TObj/TObj_TModel.hxx
index 5ba1152a8e..f0e58d64f7 100644
--- a/src/TObj/TObj_TModel.hxx
+++ b/src/TObj/TObj_TModel.hxx
@@ -76,7 +76,7 @@ class TObj_TModel : public TDF_Attribute
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TModel, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TModel,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TModel
diff --git a/src/TObj/TObj_TNameContainer.cxx b/src/TObj/TObj_TNameContainer.cxx
index 954578525f..6b7741ac63 100644
--- a/src/TObj/TObj_TNameContainer.cxx
+++ b/src/TObj/TObj_TNameContainer.cxx
@@ -19,6 +19,8 @@
 #include <Standard_GUID.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TNameContainer,TDF_Attribute)
+
 //=======================================================================
 //function : TObj_TNameContainer
 //purpose  : 
diff --git a/src/TObj/TObj_TNameContainer.hxx b/src/TObj/TObj_TNameContainer.hxx
index 039d7842c5..9726e6dac9 100644
--- a/src/TObj/TObj_TNameContainer.hxx
+++ b/src/TObj/TObj_TNameContainer.hxx
@@ -96,7 +96,7 @@ class TObj_TNameContainer : public TDF_Attribute
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TNameContainer, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TNameContainer,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TObject
diff --git a/src/TObj/TObj_TObject.cxx b/src/TObj/TObj_TObject.cxx
index 2c261961f6..01520df1ce 100644
--- a/src/TObj/TObj_TObject.cxx
+++ b/src/TObj/TObj_TObject.cxx
@@ -22,6 +22,8 @@
 #include <TDF_ChildIterator.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TObject,TDF_Attribute)
+
 //=======================================================================
 //function : TObj_TObject
 //purpose  : 
diff --git a/src/TObj/TObj_TObject.hxx b/src/TObj/TObj_TObject.hxx
index 4101f2bb47..0ce7c8c785 100644
--- a/src/TObj/TObj_TObject.hxx
+++ b/src/TObj/TObj_TObject.hxx
@@ -95,7 +95,7 @@ class TObj_TObject : public TDF_Attribute
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TObject, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TObject,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TObject
diff --git a/src/TObj/TObj_TReference.cxx b/src/TObj/TObj_TReference.cxx
index 573a4e1430..3b71df27b1 100644
--- a/src/TObj/TObj_TReference.cxx
+++ b/src/TObj/TObj_TReference.cxx
@@ -25,6 +25,8 @@
 #include <TDF_DeltaOnRemoval.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TReference,TDF_Attribute)
+
 //=======================================================================
 //function : TObj_TReference
 //purpose  : 
diff --git a/src/TObj/TObj_TReference.hxx b/src/TObj/TObj_TReference.hxx
index f6c505de8a..01b817dfee 100644
--- a/src/TObj/TObj_TReference.hxx
+++ b/src/TObj/TObj_TReference.hxx
@@ -122,7 +122,7 @@ class TObj_TReference : public TDF_Attribute
 
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TReference, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TReference,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TReference
diff --git a/src/TObj/TObj_TXYZ.cxx b/src/TObj/TObj_TXYZ.cxx
index 06620d460f..5a0befe8be 100644
--- a/src/TObj/TObj_TXYZ.cxx
+++ b/src/TObj/TObj_TXYZ.cxx
@@ -20,6 +20,8 @@
 #include <TDF_Label.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(TObj_TXYZ,TDF_Attribute)
+
 //=======================================================================
 //function : TObj_TXYZ
 //purpose  : 
diff --git a/src/TObj/TObj_TXYZ.hxx b/src/TObj/TObj_TXYZ.hxx
index 848e3adfff..341b6913cc 100644
--- a/src/TObj/TObj_TXYZ.hxx
+++ b/src/TObj/TObj_TXYZ.hxx
@@ -85,7 +85,7 @@ class TObj_TXYZ : public TDF_Attribute
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObj_TXYZ, TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TObj_TXYZ,TDF_Attribute)
 };
 
 //! Define handle class for TObj_TXYZ
diff --git a/src/TObjDRAW/TObjDRAW.cxx b/src/TObjDRAW/TObjDRAW.cxx
index b764d296b7..6aa6c667bd 100644
--- a/src/TObjDRAW/TObjDRAW.cxx
+++ b/src/TObjDRAW/TObjDRAW.cxx
@@ -58,7 +58,7 @@ class TObjDRAW_Model : public TObj_Model
   
  public:
   //! CASCADE RTTI
-  DEFINE_STANDARD_RTTI(TObjDRAW_Model, TObj_Model)
+  DEFINE_STANDARD_RTTI_INLINE(TObjDRAW_Model,TObj_Model)
 
 };
 DEFINE_STANDARD_HANDLE (TObjDRAW_Model,TObj_Model)
@@ -132,7 +132,7 @@ class TObjDRAW_Object : public TObj_Object
 
  public:
   // Declaration of CASCADE RTTI
- DEFINE_STANDARD_RTTI (TObjDRAW_Object, TObj_Object)
+ DEFINE_STANDARD_RTTI_INLINE(TObjDRAW_Object,TObj_Object)
   
 };
 
diff --git a/src/TPrsStd/TPrsStd_AISPresentation.cxx b/src/TPrsStd/TPrsStd_AISPresentation.cxx
index fd52b85011..465dc52452 100644
--- a/src/TPrsStd/TPrsStd_AISPresentation.cxx
+++ b/src/TPrsStd/TPrsStd_AISPresentation.cxx
@@ -39,6 +39,8 @@
 #include <TPrsStd_Driver.hxx>
 #include <TPrsStd_DriverTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_AISPresentation,TDF_Attribute)
+
 //=======================================================================
 //function : Set
 //purpose  : 
diff --git a/src/TPrsStd/TPrsStd_AISPresentation.hxx b/src/TPrsStd/TPrsStd_AISPresentation.hxx
index 357bcba5d1..7d648fda23 100644
--- a/src/TPrsStd/TPrsStd_AISPresentation.hxx
+++ b/src/TPrsStd/TPrsStd_AISPresentation.hxx
@@ -188,7 +188,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_AISPresentation,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_AISPresentation,TDF_Attribute)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_AISViewer.cxx b/src/TPrsStd/TPrsStd_AISViewer.cxx
index cc3b95d438..77ba8299b3 100644
--- a/src/TPrsStd/TPrsStd_AISViewer.cxx
+++ b/src/TPrsStd/TPrsStd_AISViewer.cxx
@@ -24,6 +24,8 @@
 #include <TPrsStd_AISViewer.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_AISViewer,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/TPrsStd/TPrsStd_AISViewer.hxx b/src/TPrsStd/TPrsStd_AISViewer.hxx
index e99a83c540..66b61eb9ca 100644
--- a/src/TPrsStd/TPrsStd_AISViewer.hxx
+++ b/src/TPrsStd/TPrsStd_AISViewer.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_AISViewer,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_AISViewer,TDF_Attribute)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_AxisDriver.cxx b/src/TPrsStd/TPrsStd_AxisDriver.cxx
index 39807985d0..9f79e7fe3d 100644
--- a/src/TPrsStd/TPrsStd_AxisDriver.cxx
+++ b/src/TPrsStd/TPrsStd_AxisDriver.cxx
@@ -26,6 +26,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TPrsStd_AxisDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_AxisDriver,TPrsStd_Driver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/TPrsStd/TPrsStd_AxisDriver.hxx b/src/TPrsStd/TPrsStd_AxisDriver.hxx
index 0f7b7cea89..040ad7e029 100644
--- a/src/TPrsStd/TPrsStd_AxisDriver.hxx
+++ b/src/TPrsStd/TPrsStd_AxisDriver.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_AxisDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_AxisDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_ConstraintDriver.cxx b/src/TPrsStd/TPrsStd_ConstraintDriver.cxx
index d1fe858966..23cf0ac9b1 100644
--- a/src/TPrsStd/TPrsStd_ConstraintDriver.cxx
+++ b/src/TPrsStd/TPrsStd_ConstraintDriver.cxx
@@ -25,6 +25,8 @@
 #include <TPrsStd_ConstraintDriver.hxx>
 #include <TPrsStd_ConstraintTools.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_ConstraintDriver,TPrsStd_Driver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/TPrsStd/TPrsStd_ConstraintDriver.hxx b/src/TPrsStd/TPrsStd_ConstraintDriver.hxx
index 1007f4dd4b..c81258caf0 100644
--- a/src/TPrsStd/TPrsStd_ConstraintDriver.hxx
+++ b/src/TPrsStd/TPrsStd_ConstraintDriver.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_ConstraintDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_ConstraintDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_Driver.cxx b/src/TPrsStd/TPrsStd_Driver.cxx
index e0be8c9d0e..ddf33f5e5e 100644
--- a/src/TPrsStd/TPrsStd_Driver.cxx
+++ b/src/TPrsStd/TPrsStd_Driver.cxx
@@ -17,6 +17,8 @@
 #include <TDF_Label.hxx>
 #include <TPrsStd_Driver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_Driver,MMgt_TShared)
+
 TPrsStd_Driver::TPrsStd_Driver()
 {}
 
diff --git a/src/TPrsStd/TPrsStd_Driver.hxx b/src/TPrsStd/TPrsStd_Driver.hxx
index 3dde577e87..ebed12daf8 100644
--- a/src/TPrsStd/TPrsStd_Driver.hxx
+++ b/src/TPrsStd/TPrsStd_Driver.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_Driver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_Driver,MMgt_TShared)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_DriverTable.cxx b/src/TPrsStd/TPrsStd_DriverTable.cxx
index 719d536c8f..9fe8c83d00 100644
--- a/src/TPrsStd/TPrsStd_DriverTable.cxx
+++ b/src/TPrsStd/TPrsStd_DriverTable.cxx
@@ -33,6 +33,8 @@
 #include <TPrsStd_PlaneDriver.hxx>
 #include <TPrsStd_PointDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_DriverTable,MMgt_TShared)
+
 static Handle(TPrsStd_DriverTable) drivertable;
 
 //=======================================================================
diff --git a/src/TPrsStd/TPrsStd_DriverTable.hxx b/src/TPrsStd/TPrsStd_DriverTable.hxx
index 6b866e4ea4..dd106d7fa1 100644
--- a/src/TPrsStd/TPrsStd_DriverTable.hxx
+++ b/src/TPrsStd/TPrsStd_DriverTable.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_DriverTable,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_DriverTable,MMgt_TShared)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_GeometryDriver.cxx b/src/TPrsStd/TPrsStd_GeometryDriver.cxx
index 353542ac77..561e27e939 100644
--- a/src/TPrsStd/TPrsStd_GeometryDriver.cxx
+++ b/src/TPrsStd/TPrsStd_GeometryDriver.cxx
@@ -39,6 +39,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TPrsStd_GeometryDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_GeometryDriver,TPrsStd_Driver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/TPrsStd/TPrsStd_GeometryDriver.hxx b/src/TPrsStd/TPrsStd_GeometryDriver.hxx
index dd8812917f..550d951885 100644
--- a/src/TPrsStd/TPrsStd_GeometryDriver.hxx
+++ b/src/TPrsStd/TPrsStd_GeometryDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_GeometryDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_GeometryDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_NamedShapeDriver.cxx b/src/TPrsStd/TPrsStd_NamedShapeDriver.cxx
index bbf5295b9d..17c26a5d70 100644
--- a/src/TPrsStd/TPrsStd_NamedShapeDriver.cxx
+++ b/src/TPrsStd/TPrsStd_NamedShapeDriver.cxx
@@ -32,6 +32,8 @@
 #include <TPrsStd_DriverTable.hxx>
 #include <TPrsStd_NamedShapeDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_NamedShapeDriver,TPrsStd_Driver)
+
 #undef OPTIM_UPDATE  // If this variable is defined there will be done
 //                      more otimized update of AIS_Shape. If an object was
 //                      erased in the viewer and it's location was changed
diff --git a/src/TPrsStd/TPrsStd_NamedShapeDriver.hxx b/src/TPrsStd/TPrsStd_NamedShapeDriver.hxx
index 01d0a79892..ebacd6e06a 100644
--- a/src/TPrsStd/TPrsStd_NamedShapeDriver.hxx
+++ b/src/TPrsStd/TPrsStd_NamedShapeDriver.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_NamedShapeDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_NamedShapeDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_PlaneDriver.cxx b/src/TPrsStd/TPrsStd_PlaneDriver.cxx
index 83aac666a1..ba7372322d 100644
--- a/src/TPrsStd/TPrsStd_PlaneDriver.cxx
+++ b/src/TPrsStd/TPrsStd_PlaneDriver.cxx
@@ -25,6 +25,8 @@
 #include <TNaming_Tool.hxx>
 #include <TPrsStd_PlaneDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_PlaneDriver,TPrsStd_Driver)
+
 //#include <TDataStd_Datum.hxx>
 //=======================================================================
 //function :
diff --git a/src/TPrsStd/TPrsStd_PlaneDriver.hxx b/src/TPrsStd/TPrsStd_PlaneDriver.hxx
index c561e50434..cca9761c63 100644
--- a/src/TPrsStd/TPrsStd_PlaneDriver.hxx
+++ b/src/TPrsStd/TPrsStd_PlaneDriver.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_PlaneDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_PlaneDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TPrsStd/TPrsStd_PointDriver.cxx b/src/TPrsStd/TPrsStd_PointDriver.cxx
index 7d17861537..f94b5381fa 100644
--- a/src/TPrsStd/TPrsStd_PointDriver.cxx
+++ b/src/TPrsStd/TPrsStd_PointDriver.cxx
@@ -24,6 +24,8 @@
 #include <TDF_Label.hxx>
 #include <TPrsStd_PointDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_PointDriver,TPrsStd_Driver)
+
 //#include <TDataStd_Datum.hxx>
 //=======================================================================
 //function :
diff --git a/src/TPrsStd/TPrsStd_PointDriver.hxx b/src/TPrsStd/TPrsStd_PointDriver.hxx
index 6262bd1e72..7b41162ec4 100644
--- a/src/TPrsStd/TPrsStd_PointDriver.hxx
+++ b/src/TPrsStd/TPrsStd_PointDriver.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TPrsStd_PointDriver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(TPrsStd_PointDriver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx
index ee79857bb8..96527a168d 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx
@@ -25,6 +25,8 @@
 #include <TestTopOpeDraw_DrawableC2D.hxx>
 #include <TopOpeBRepTool_define.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC2D,DrawTrSurf_Curve2d)
+
 //=======================================================================
 //function : TestTopOpeDraw_DrawableC2D
 //purpose  : 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx
index 27c8aaf00b..2ac77e18bf 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableC2D,DrawTrSurf_Curve2d)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC2D,DrawTrSurf_Curve2d)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx
index 3f79fea6bc..3ac11e4035 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx
@@ -25,6 +25,8 @@
 #include <TestTopOpeDraw_DrawableC3D.hxx>
 #include <TopOpeBRepTool_define.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC3D,DrawTrSurf_Curve)
+
 //=======================================================================
 //function : TestTopOpeDraw_DrawableC3D
 //purpose  : 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx
index 8d60dbc751..d6f80a35e8 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableC3D,DrawTrSurf_Curve)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC3D,DrawTrSurf_Curve)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
index bca6046e13..94b27165d6 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx
@@ -32,6 +32,8 @@
 #include <TopOpeBRepTool_CurveTool.hxx>
 
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableMesure,TestTopOpeDraw_DrawableC3D)
+
 static gp_Pnt PScale(const gp_Pnt& P,
 		     const Standard_Real ScaleX,
 		     const Standard_Real ScaleY)
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx
index f55a237aa8..ac01165fab 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableMesure,TestTopOpeDraw_DrawableC3D)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableMesure,TestTopOpeDraw_DrawableC3D)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx
index e3ea9f5e00..228f70daab 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TestTopOpeDraw_DrawableP2D.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP2D,Draw_Marker2D)
+
 //=======================================================================
 //function : TestTopOpeDraw_DrawableP2D
 //purpose  : 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx
index 59be06d187..02f31a9499 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableP2D,Draw_Marker2D)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP2D,Draw_Marker2D)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx
index 4641033b9d..38c60c9146 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx
@@ -22,6 +22,8 @@
 #include <Standard_Type.hxx>
 #include <TestTopOpeDraw_DrawableP3D.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP3D,Draw_Marker3D)
+
 //=======================================================================
 //function : TestTopOpeDraw_DrawableP3D
 //purpose  : 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx
index 476040e6ff..0e44dea603 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableP3D,Draw_Marker3D)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP3D,Draw_Marker3D)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx
index 46b131be75..a662485b30 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx
@@ -43,6 +43,8 @@
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSHA,DBRep_DrawableShape)
+
 Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation);
 
 //=======================================================================
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx
index 765894b881..6a7a7414dd 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableSHA,DBRep_DrawableShape)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSHA,DBRep_DrawableShape)
 
 protected:
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx
index f4efda8c79..2c0358c268 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx
@@ -31,6 +31,8 @@
 #include <Standard_Type.hxx>
 #include <TestTopOpeDraw_DrawableSUR.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSUR,DrawTrSurf_Surface)
+
 //=======================================================================
 //function : TestTopOpeDraw_DrawableSUR
 //purpose  : 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx
index 78fa311aa7..9dbc3673c0 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TestTopOpeDraw_DrawableSUR,DrawTrSurf_Surface)
+  DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSUR,DrawTrSurf_Surface)
 
 protected:
 
diff --git a/src/TopLoc/TopLoc_Datum3D.cxx b/src/TopLoc/TopLoc_Datum3D.cxx
index 7bd6a92902..a9917c727c 100644
--- a/src/TopLoc/TopLoc_Datum3D.cxx
+++ b/src/TopLoc/TopLoc_Datum3D.cxx
@@ -21,6 +21,8 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Datum3D.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopLoc_Datum3D,MMgt_TShared)
+
 //=======================================================================
 //function : TopLoc_Datum3D
 //purpose  : Identity
diff --git a/src/TopLoc/TopLoc_Datum3D.hxx b/src/TopLoc/TopLoc_Datum3D.hxx
index 991814c843..c40e4c719e 100644
--- a/src/TopLoc/TopLoc_Datum3D.hxx
+++ b/src/TopLoc/TopLoc_Datum3D.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopLoc_Datum3D,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopLoc_Datum3D,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopLoc/TopLoc_SListNodeOfItemLocation.cxx b/src/TopLoc/TopLoc_SListNodeOfItemLocation.cxx
index fa4c06c0a4..2aa01301b6 100644
--- a/src/TopLoc/TopLoc_SListNodeOfItemLocation.cxx
+++ b/src/TopLoc/TopLoc_SListNodeOfItemLocation.cxx
@@ -17,3 +17,5 @@
 #include <TopLoc_ItemLocation.hxx>
 #include <TopLoc_SListNodeOfItemLocation.hxx>
 #include <TopLoc_SListOfItemLocation.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(TopLoc_SListNodeOfItemLocation,MMgt_TShared)
\ No newline at end of file
diff --git a/src/TopLoc/TopLoc_SListNodeOfItemLocation.hxx b/src/TopLoc/TopLoc_SListNodeOfItemLocation.hxx
index 133a91ac29..54c7af18e0 100644
--- a/src/TopLoc/TopLoc_SListNodeOfItemLocation.hxx
+++ b/src/TopLoc/TopLoc_SListNodeOfItemLocation.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopLoc_SListNodeOfItemLocation,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopLoc_SListNodeOfItemLocation,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx b/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
index df35f575fc..c97f12d82b 100644
--- a/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_FFDumper.cxx
@@ -37,6 +37,8 @@
 #include <TopOpeBRep_VPointInterIterator.hxx>
 #include <TopOpeBRepTool_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRep_FFDumper,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceDSNC(); 
 extern Standard_Boolean TopOpeBRepDS_GettraceDSF(); 
diff --git a/src/TopOpeBRep/TopOpeBRep_FFDumper.hxx b/src/TopOpeBRep/TopOpeBRep_FFDumper.hxx
index c496286092..b7b3ea272b 100644
--- a/src/TopOpeBRep/TopOpeBRep_FFDumper.hxx
+++ b/src/TopOpeBRep/TopOpeBRep_FFDumper.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRep_FFDumper,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRep_FFDumper,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
index a03acf470a..965c81d175 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cxx
@@ -34,6 +34,8 @@
 #include <TopOpeBRepTool_PROJECT.hxx>
 #include <TopOpeBRepTool_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRep_Hctxee2d,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 #include <GeomTools_SurfaceSet.hxx>
 #include <GeomTools_CurveSet.hxx>
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.hxx b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.hxx
index 2d9fb31d77..8ddbae4b0e 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.hxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.hxx
@@ -55,7 +55,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRep_Hctxee2d,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRep_Hctxee2d,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx
index a0f9a0fa4e..ea4adf6401 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cxx
@@ -24,6 +24,8 @@
 #include <TopOpeBRep_Hctxff2d.hxx>
 #include <TopOpeBRepTool_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRep_Hctxff2d,MMgt_TShared)
+
 //=======================================================================
 //function : TopOpeBRep_Hctxff2d
 //purpose  : 
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.hxx b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.hxx
index 024d04ab93..9e14399eb0 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.hxx
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRep_Hctxff2d,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRep_Hctxff2d,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cxx
index 3c2d936846..d4a2a5a9a3 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cxx
@@ -37,6 +37,8 @@
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepBuild_HBuilder,MMgt_TShared)
+
 //=======================================================================
 //function : TopOpeBRepBuild_HBuilder
 //purpose  : 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.hxx
index bb0831ea43..241cf32f1e 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.hxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.hxx
@@ -170,7 +170,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepBuild_HBuilder,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepBuild_HBuilder,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cxx
index 8eb7f36211..6497812ffa 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cxx
@@ -20,6 +20,8 @@
 #include <TopOpeBRepBuild_BlockIterator.hxx>
 #include <TopOpeBRepBuild_Loop.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepBuild_Loop,MMgt_TShared)
+
 //=======================================================================
 //function : TopOpeBRepBuild_Loop
 //purpose  : 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.hxx
index 47f096d9dc..8ffa0f4d08 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.hxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepBuild_Loop,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepBuild_Loop,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx
index 87ceb8637d..8435487ae1 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TopOpeBRepBuild_Pave.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepBuild_Pave,TopOpeBRepBuild_Loop)
+
 //=======================================================================
 //function : TopOpeBRepBuild_Pave
 //purpose  : 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.hxx
index 0f4d2db092..1eef485802 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.hxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepBuild_Pave,TopOpeBRepBuild_Loop)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepBuild_Pave,TopOpeBRepBuild_Loop)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Association.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Association.cxx
index 279ea4162e..cc0e76057d 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Association.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Association.cxx
@@ -20,6 +20,8 @@
 #include <TopOpeBRepDS_Interference.hxx>
 #include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_Association,MMgt_TShared)
+
 //=======================================================================
 //function : Contains
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Association.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_Association.hxx
index c9b6ba85d8..0ac81a2c7d 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Association.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Association.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_Association,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_Association,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx
index 6de4673f1f..0f9365ef3c 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx
@@ -42,6 +42,8 @@
 #include <TopTools_ListOfShape.hxx>
 
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_Check,MMgt_TShared)
+
 //=======================================================================
 //function : Create
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Check.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_Check.hxx
index ba236206c8..590fc4a4f1 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Check.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Check.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_Check,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_Check,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cxx
index ed195e47f7..57e8710402 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cxx
@@ -19,6 +19,8 @@
 #include <TopOpeBRepDS_CurvePointInterference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_CurvePointInterference,TopOpeBRepDS_Interference)
+
 //=======================================================================
 //function : TopOpeBRepDS_CurvePointInterference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.hxx
index d9db6ddae1..c8abbda82f 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_CurvePointInterference,TopOpeBRepDS_Interference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_CurvePointInterference,TopOpeBRepDS_Interference)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cxx
index ddb8c8df6d..5ffd2d7ef0 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cxx
@@ -20,6 +20,8 @@
 #include <TopOpeBRepDS_Kind.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_EdgeVertexInterference,TopOpeBRepDS_ShapeShapeInterference)
+
 //=======================================================================
 //function : TopOpeBRepDS_EdgeVertexInterference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.hxx
index 7e18b18699..4ea8351808 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_EdgeVertexInterference,TopOpeBRepDS_ShapeShapeInterference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_EdgeVertexInterference,TopOpeBRepDS_ShapeShapeInterference)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cxx
index dad4105745..cbc6ef1d01 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cxx
@@ -20,6 +20,8 @@
 #include <TopOpeBRepDS_Kind.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_FaceEdgeInterference,TopOpeBRepDS_ShapeShapeInterference)
+
 //=======================================================================
 //function : TopOpeBRepDS_FaceEdgeInterference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.hxx
index d6ced48403..2577cc88a8 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_FaceEdgeInterference,TopOpeBRepDS_ShapeShapeInterference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_FaceEdgeInterference,TopOpeBRepDS_ShapeShapeInterference)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx
index ea1de52dba..732f09cbc5 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapFiller.cxx
@@ -41,6 +41,7 @@
 #include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
 #include <TopOpeBRepDS_Point.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopOpeBRepDS_CurvePointInterference.hxx>
 
 #ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceGAP();
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx
index 07fafb4cbb..481f0b0153 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cxx
@@ -25,6 +25,8 @@
 #include <TopOpeBRepDS_Interference.hxx>
 #include <TopOpeBRepDS_ListIteratorOfListOfInterference.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_GapTool,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceGAP();
 #endif
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.hxx
index 2102361e9e..44d74f277f 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_GapTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_GapTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx
index 2493525642..82c979abce 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cxx
@@ -46,6 +46,8 @@
 #include <TopOpeBRepTool_ShapeExplorer.hxx>
 #include <TopTools_ListOfShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_HDataStructure,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 extern Standard_Boolean TopOpeBRepDS_GettraceISTO();
 extern Standard_Boolean TopOpeBRepDS_GettraceEDSF(); 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx
index a91e15ea36..32ee0d627f 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.hxx
@@ -213,7 +213,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_HDataStructure,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_HDataStructure,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx
index 50229eab15..b9750698de 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cxx
@@ -22,6 +22,8 @@
 #include <TopOpeBRepDS_Interference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_Interference,MMgt_TShared)
+
 //=======================================================================
 //function : TopOpeBRepDS_Interference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.hxx
index 3ea5013f2e..61a2cf0f80 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.hxx
@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_Interference,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_Interference,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cxx
index a1860939f3..6aadeb25e0 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cxx
@@ -19,6 +19,8 @@
 #include <TopOpeBRepDS_define.hxx>
 #include <TopOpeBRepDS_Marker.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_Marker,MMgt_TShared)
+
 //#include <TopExp.hxx>
 //#include <TopTools_IndexedMapOfShape.hxx>
 TopOpeBRepDS_Marker::TopOpeBRepDS_Marker()
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.hxx
index 832ec94c88..b19682d5d6 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_Marker,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_Marker,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx
index ea4f3851c4..56f8d8e9fe 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cxx
@@ -21,6 +21,8 @@
 #include <TopOpeBRepDS_ShapeShapeInterference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_ShapeShapeInterference,TopOpeBRepDS_Interference)
+
 //=======================================================================
 //function : TopOpeBRepDS_ShapeShapeInterference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx
index 6249353f5c..5828a85e5f 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_ShapeShapeInterference,TopOpeBRepDS_Interference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_ShapeShapeInterference,TopOpeBRepDS_Interference)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx
index 5a45ddf6ce..f73d1a1c14 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cxx
@@ -19,6 +19,8 @@
 #include <TopOpeBRepDS_SolidSurfaceInterference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_SolidSurfaceInterference,TopOpeBRepDS_Interference)
+
 //=======================================================================
 //function : TopOpeBRepDS_SolidSurfaceInterference
 //purpose  : 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx
index 0b65dea5ae..cd2b73bff8 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_SolidSurfaceInterference,TopOpeBRepDS_Interference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_SolidSurfaceInterference,TopOpeBRepDS_Interference)
 
 protected:
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx
index 36cd77f4bb..bce882a58e 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cxx
@@ -21,6 +21,8 @@
 #include <TopOpeBRepDS_SurfaceCurveInterference.hxx>
 #include <TopOpeBRepDS_Transition.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepDS_SurfaceCurveInterference,TopOpeBRepDS_Interference)
+
 #ifdef OCCT_DEBUG
 #include <TopOpeBRepDS_Dumper.hxx>
 #endif
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.hxx b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.hxx
index 789187e926..1af607f841 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.hxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepDS_SurfaceCurveInterference,TopOpeBRepDS_Interference)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepDS_SurfaceCurveInterference,TopOpeBRepDS_Interference)
 
 protected:
 
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
index 3456d9a149..72503f0c5e 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cxx
@@ -30,6 +30,8 @@
 #include <TopOpeBRepTool_define.hxx>
 #include <TopOpeBRepTool_HBoxTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopOpeBRepTool_HBoxTool,MMgt_TShared)
+
 #ifdef OCCT_DEBUG
 #define TBOX TopOpeBRepTool_GettraceBOX()
 #endif
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.hxx b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.hxx
index 914ca5e23f..126b01e9d4 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.hxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopOpeBRepTool_HBoxTool,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopOpeBRepTool_HBoxTool,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_HShape.cxx b/src/TopoDS/TopoDS_HShape.cxx
index 1ff5cd930b..29606b74f6 100644
--- a/src/TopoDS/TopoDS_HShape.cxx
+++ b/src/TopoDS/TopoDS_HShape.cxx
@@ -18,3 +18,5 @@
 #include <Standard_Type.hxx>
 #include <TopoDS_HShape.hxx>
 #include <TopoDS_Shape.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_HShape,MMgt_TShared)
\ No newline at end of file
diff --git a/src/TopoDS/TopoDS_HShape.hxx b/src/TopoDS/TopoDS_HShape.hxx
index 753369e0da..8b60356422 100644
--- a/src/TopoDS/TopoDS_HShape.hxx
+++ b/src/TopoDS/TopoDS_HShape.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_HShape,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_HShape,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TCompSolid.cxx b/src/TopoDS/TopoDS_TCompSolid.cxx
index 1b31f44856..e5a1d766ba 100644
--- a/src/TopoDS/TopoDS_TCompSolid.cxx
+++ b/src/TopoDS/TopoDS_TCompSolid.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TCompSolid.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TCompSolid,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TCompSolid.hxx b/src/TopoDS/TopoDS_TCompSolid.hxx
index a6f6604dd3..89e6df4d3c 100644
--- a/src/TopoDS/TopoDS_TCompSolid.hxx
+++ b/src/TopoDS/TopoDS_TCompSolid.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TCompSolid,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TCompSolid,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TCompound.cxx b/src/TopoDS/TopoDS_TCompound.cxx
index da0fbce2fc..974ba8bbf2 100644
--- a/src/TopoDS/TopoDS_TCompound.cxx
+++ b/src/TopoDS/TopoDS_TCompound.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TCompound.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TCompound,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TCompound.hxx b/src/TopoDS/TopoDS_TCompound.hxx
index 5b023f8383..873f91d8d7 100644
--- a/src/TopoDS/TopoDS_TCompound.hxx
+++ b/src/TopoDS/TopoDS_TCompound.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TCompound,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TCompound,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TEdge.cxx b/src/TopoDS/TopoDS_TEdge.cxx
index 379ebed7b2..789a46bf89 100644
--- a/src/TopoDS/TopoDS_TEdge.cxx
+++ b/src/TopoDS/TopoDS_TEdge.cxx
@@ -19,6 +19,8 @@
 #include <TopAbs.hxx>
 #include <TopoDS_TEdge.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TEdge,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TEdge.hxx b/src/TopoDS/TopoDS_TEdge.hxx
index e664ff438e..6bf84b9d15 100644
--- a/src/TopoDS/TopoDS_TEdge.hxx
+++ b/src/TopoDS/TopoDS_TEdge.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TEdge,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TEdge,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TFace.cxx b/src/TopoDS/TopoDS_TFace.cxx
index 3e22a4cc67..4052604f53 100644
--- a/src/TopoDS/TopoDS_TFace.cxx
+++ b/src/TopoDS/TopoDS_TFace.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TFace.hxx>
 #include <TopoDS_TShape.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TFace,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TFace.hxx b/src/TopoDS/TopoDS_TFace.hxx
index d4a5db0435..9fffc33af8 100644
--- a/src/TopoDS/TopoDS_TFace.hxx
+++ b/src/TopoDS/TopoDS_TFace.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TFace,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TFace,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TShape.cxx b/src/TopoDS/TopoDS_TShape.cxx
index 9c5ee156b3..038969b023 100644
--- a/src/TopoDS/TopoDS_TShape.cxx
+++ b/src/TopoDS/TopoDS_TShape.cxx
@@ -20,3 +20,5 @@
 #include <TopoDS_Builder.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_TShape.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TShape,MMgt_TShared)
\ No newline at end of file
diff --git a/src/TopoDS/TopoDS_TShape.hxx b/src/TopoDS/TopoDS_TShape.hxx
index 545edbf44c..a2736faca7 100644
--- a/src/TopoDS/TopoDS_TShape.hxx
+++ b/src/TopoDS/TopoDS_TShape.hxx
@@ -124,7 +124,7 @@ friend class TopoDS_Iterator;
 friend class TopoDS_Builder;
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TShape,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TShape,MMgt_TShared)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TShell.cxx b/src/TopoDS/TopoDS_TShell.cxx
index cde185313e..0edfdde76f 100644
--- a/src/TopoDS/TopoDS_TShell.cxx
+++ b/src/TopoDS/TopoDS_TShell.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TShape.hxx>
 #include <TopoDS_TShell.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TShell,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TShell.hxx b/src/TopoDS/TopoDS_TShell.hxx
index a792aef7c8..b7f9f8b604 100644
--- a/src/TopoDS/TopoDS_TShell.hxx
+++ b/src/TopoDS/TopoDS_TShell.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TShell,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TShell,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TSolid.cxx b/src/TopoDS/TopoDS_TSolid.cxx
index f8823577ae..e3415327e1 100644
--- a/src/TopoDS/TopoDS_TSolid.cxx
+++ b/src/TopoDS/TopoDS_TSolid.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TShape.hxx>
 #include <TopoDS_TSolid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TSolid,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TSolid.hxx b/src/TopoDS/TopoDS_TSolid.hxx
index 1b819015c3..fe64c4faca 100644
--- a/src/TopoDS/TopoDS_TSolid.hxx
+++ b/src/TopoDS/TopoDS_TSolid.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TSolid,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TSolid,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TVertex.cxx b/src/TopoDS/TopoDS_TVertex.cxx
index 8eda53e53d..cc1dea4a3a 100644
--- a/src/TopoDS/TopoDS_TVertex.cxx
+++ b/src/TopoDS/TopoDS_TVertex.cxx
@@ -19,6 +19,8 @@
 #include <TopAbs.hxx>
 #include <TopoDS_TVertex.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TVertex,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TVertex.hxx b/src/TopoDS/TopoDS_TVertex.hxx
index 24e0477bb5..78e7599e9b 100644
--- a/src/TopoDS/TopoDS_TVertex.hxx
+++ b/src/TopoDS/TopoDS_TVertex.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TVertex,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TVertex,TopoDS_TShape)
 
 protected:
 
diff --git a/src/TopoDS/TopoDS_TWire.cxx b/src/TopoDS/TopoDS_TWire.cxx
index 8c1aa38107..a60ac6601f 100644
--- a/src/TopoDS/TopoDS_TWire.cxx
+++ b/src/TopoDS/TopoDS_TWire.cxx
@@ -20,6 +20,8 @@
 #include <TopoDS_TShape.hxx>
 #include <TopoDS_TWire.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TopoDS_TWire,TopoDS_TShape)
+
 //=======================================================================
 //function : ShapeType
 //purpose  : 
diff --git a/src/TopoDS/TopoDS_TWire.hxx b/src/TopoDS/TopoDS_TWire.hxx
index 02a93db312..d3eb03fc21 100644
--- a/src/TopoDS/TopoDS_TWire.hxx
+++ b/src/TopoDS/TopoDS_TWire.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TopoDS_TWire,TopoDS_TShape)
+  DEFINE_STANDARD_RTTIEXT(TopoDS_TWire,TopoDS_TShape)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ActorDispatch.cxx b/src/Transfer/Transfer_ActorDispatch.cxx
index 4a7a37e6cb..b675188086 100644
--- a/src/Transfer/Transfer_ActorDispatch.cxx
+++ b/src/Transfer/Transfer_ActorDispatch.cxx
@@ -24,6 +24,8 @@
 #include <Transfer_TransferDispatch.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_ActorDispatch,Transfer_ActorOfTransientProcess)
+
 Transfer_ActorDispatch::Transfer_ActorDispatch
   (const Handle(Interface_InterfaceModel)& amodel,
    const Interface_GeneralLib& lib)
diff --git a/src/Transfer/Transfer_ActorDispatch.hxx b/src/Transfer/Transfer_ActorDispatch.hxx
index 289c99dd83..b1c4d94eef 100644
--- a/src/Transfer/Transfer_ActorDispatch.hxx
+++ b/src/Transfer/Transfer_ActorDispatch.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ActorDispatch,Transfer_ActorOfTransientProcess)
+  DEFINE_STANDARD_RTTIEXT(Transfer_ActorDispatch,Transfer_ActorOfTransientProcess)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.cxx b/src/Transfer/Transfer_ActorOfFinderProcess.cxx
index 2f44c8a0ec..b3a145072c 100644
--- a/src/Transfer/Transfer_ActorOfFinderProcess.cxx
+++ b/src/Transfer/Transfer_ActorOfFinderProcess.cxx
@@ -22,6 +22,8 @@
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_TransientMapper.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_ActorOfFinderProcess,Transfer_ActorOfProcessForFinder)
+
 Transfer_ActorOfFinderProcess::Transfer_ActorOfFinderProcess ()    {  themodetrans = 0;  }
 
 Standard_Integer& Transfer_ActorOfFinderProcess::ModeTrans ()
diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.hxx b/src/Transfer/Transfer_ActorOfFinderProcess.hxx
index 73030ae95e..bceaed9a61 100644
--- a/src/Transfer/Transfer_ActorOfFinderProcess.hxx
+++ b/src/Transfer/Transfer_ActorOfFinderProcess.hxx
@@ -56,7 +56,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ActorOfFinderProcess,Transfer_ActorOfProcessForFinder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_ActorOfFinderProcess,Transfer_ActorOfProcessForFinder)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ActorOfProcessForFinder.hxx b/src/Transfer/Transfer_ActorOfProcessForFinder.hxx
index 2a17a384dd..7191780d7b 100644
--- a/src/Transfer/Transfer_ActorOfProcessForFinder.hxx
+++ b/src/Transfer/Transfer_ActorOfProcessForFinder.hxx
@@ -97,7 +97,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ActorOfProcessForFinder,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Transfer_ActorOfProcessForFinder,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ActorOfProcessForTransient.hxx b/src/Transfer/Transfer_ActorOfProcessForTransient.hxx
index 44adcd6985..54fd6bba4e 100644
--- a/src/Transfer/Transfer_ActorOfProcessForTransient.hxx
+++ b/src/Transfer/Transfer_ActorOfProcessForTransient.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ActorOfProcessForTransient,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Transfer_ActorOfProcessForTransient,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.cxx b/src/Transfer/Transfer_ActorOfTransientProcess.cxx
index 4ce4e23350..dc454f57d3 100644
--- a/src/Transfer/Transfer_ActorOfTransientProcess.cxx
+++ b/src/Transfer/Transfer_ActorOfTransientProcess.cxx
@@ -20,6 +20,8 @@
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_ActorOfTransientProcess,Transfer_ActorOfProcessForTransient)
+
 Transfer_ActorOfTransientProcess::Transfer_ActorOfTransientProcess ()    {  }
 
 Handle(Transfer_Binder)  Transfer_ActorOfTransientProcess::Transfer
diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.hxx b/src/Transfer/Transfer_ActorOfTransientProcess.hxx
index 977db69745..e52441e523 100644
--- a/src/Transfer/Transfer_ActorOfTransientProcess.hxx
+++ b/src/Transfer/Transfer_ActorOfTransientProcess.hxx
@@ -48,7 +48,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ActorOfTransientProcess,Transfer_ActorOfProcessForTransient)
+  DEFINE_STANDARD_RTTIEXT(Transfer_ActorOfTransientProcess,Transfer_ActorOfProcessForTransient)
 
 protected:
 
diff --git a/src/Transfer/Transfer_Binder.cxx b/src/Transfer/Transfer_Binder.cxx
index 4d29e47e38..c13e858982 100644
--- a/src/Transfer/Transfer_Binder.cxx
+++ b/src/Transfer/Transfer_Binder.cxx
@@ -21,6 +21,8 @@
 #include <Transfer_TransferFailure.hxx>
 #include <Transfer_VoidBinder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_Binder,MMgt_TShared)
+
 //=======================================================================
 //function : Transfer_Binder
 //purpose  : 
diff --git a/src/Transfer/Transfer_Binder.hxx b/src/Transfer/Transfer_Binder.hxx
index cb49f9291c..50ed06a143 100644
--- a/src/Transfer/Transfer_Binder.hxx
+++ b/src/Transfer/Transfer_Binder.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_Binder,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Transfer_Binder,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_BinderOfTransientInteger.cxx b/src/Transfer/Transfer_BinderOfTransientInteger.cxx
index 6ff85989c1..72adcae2d3 100644
--- a/src/Transfer/Transfer_BinderOfTransientInteger.cxx
+++ b/src/Transfer/Transfer_BinderOfTransientInteger.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Transfer_BinderOfTransientInteger.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_BinderOfTransientInteger,Transfer_SimpleBinderOfTransient)
+
 Transfer_BinderOfTransientInteger::Transfer_BinderOfTransientInteger ()
     : theintval (0)    {  }
 
diff --git a/src/Transfer/Transfer_BinderOfTransientInteger.hxx b/src/Transfer/Transfer_BinderOfTransientInteger.hxx
index d2831fc524..3b08e9208e 100644
--- a/src/Transfer/Transfer_BinderOfTransientInteger.hxx
+++ b/src/Transfer/Transfer_BinderOfTransientInteger.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_BinderOfTransientInteger,Transfer_SimpleBinderOfTransient)
+  DEFINE_STANDARD_RTTIEXT(Transfer_BinderOfTransientInteger,Transfer_SimpleBinderOfTransient)
 
 protected:
 
diff --git a/src/Transfer/Transfer_DispatchControl.cxx b/src/Transfer/Transfer_DispatchControl.cxx
index 5771ca77a2..4e3829a530 100644
--- a/src/Transfer/Transfer_DispatchControl.cxx
+++ b/src/Transfer/Transfer_DispatchControl.cxx
@@ -19,6 +19,8 @@
 #include <Transfer_DispatchControl.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_DispatchControl,Interface_CopyControl)
+
 Transfer_DispatchControl::Transfer_DispatchControl
   (const Handle(Interface_InterfaceModel)& model,
    const Handle(Transfer_TransientProcess)& TP)
diff --git a/src/Transfer/Transfer_DispatchControl.hxx b/src/Transfer/Transfer_DispatchControl.hxx
index 1053b0a21e..2d426fe3e0 100644
--- a/src/Transfer/Transfer_DispatchControl.hxx
+++ b/src/Transfer/Transfer_DispatchControl.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_DispatchControl,Interface_CopyControl)
+  DEFINE_STANDARD_RTTIEXT(Transfer_DispatchControl,Interface_CopyControl)
 
 protected:
 
diff --git a/src/Transfer/Transfer_Finder.cxx b/src/Transfer/Transfer_Finder.cxx
index 870c624dea..d1f67652ba 100644
--- a/src/Transfer/Transfer_Finder.cxx
+++ b/src/Transfer/Transfer_Finder.cxx
@@ -21,6 +21,8 @@
 #include <TCollection_HAsciiString.hxx>
 #include <Transfer_Finder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_Finder,MMgt_TShared)
+
 void  Transfer_Finder::SetHashCode (const Standard_Integer code)
       {  thecode = code;  }
 
diff --git a/src/Transfer/Transfer_Finder.hxx b/src/Transfer/Transfer_Finder.hxx
index b6ecb06a65..f25dbb806a 100644
--- a/src/Transfer/Transfer_Finder.hxx
+++ b/src/Transfer/Transfer_Finder.hxx
@@ -147,7 +147,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_Finder,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Transfer_Finder,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_FinderProcess.cxx b/src/Transfer/Transfer_FinderProcess.cxx
index b024f97df4..16e7f74d29 100644
--- a/src/Transfer/Transfer_FinderProcess.cxx
+++ b/src/Transfer/Transfer_FinderProcess.cxx
@@ -23,6 +23,8 @@
 #include <Transfer_FinderProcess.hxx>
 #include <Transfer_TransientMapper.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_FinderProcess,Transfer_ProcessForFinder)
+
 Transfer_FinderProcess::Transfer_FinderProcess (const Standard_Integer nb)
     : Transfer_ProcessForFinder (nb)    {  }
  
diff --git a/src/Transfer/Transfer_FinderProcess.hxx b/src/Transfer/Transfer_FinderProcess.hxx
index 648ca5a47b..ca9599207a 100644
--- a/src/Transfer/Transfer_FinderProcess.hxx
+++ b/src/Transfer/Transfer_FinderProcess.hxx
@@ -74,7 +74,7 @@ public:
   //! Prints statistics on a given output, according mode
   Standard_EXPORT void PrintStats (const Standard_Integer mode, const Handle(Message_Messenger)& S) const;
 
-  DEFINE_STANDARD_RTTI(Transfer_FinderProcess,Transfer_ProcessForFinder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_FinderProcess,Transfer_ProcessForFinder)
 
 private:
   Handle(Interface_InterfaceModel) themodel;
diff --git a/src/Transfer/Transfer_MapContainer.cxx b/src/Transfer/Transfer_MapContainer.cxx
index dc435ef870..d27a42804c 100644
--- a/src/Transfer/Transfer_MapContainer.cxx
+++ b/src/Transfer/Transfer_MapContainer.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Transfer_MapContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_MapContainer,MMgt_TShared)
+
 Transfer_MapContainer::Transfer_MapContainer()
 {
 }
diff --git a/src/Transfer/Transfer_MapContainer.hxx b/src/Transfer/Transfer_MapContainer.hxx
index 51a45cad89..dd19f8c0e3 100644
--- a/src/Transfer/Transfer_MapContainer.hxx
+++ b/src/Transfer/Transfer_MapContainer.hxx
@@ -44,7 +44,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_MapContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Transfer_MapContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_MultipleBinder.cxx b/src/Transfer/Transfer_MultipleBinder.cxx
index 2349a23bba..f88c07167e 100644
--- a/src/Transfer/Transfer_MultipleBinder.cxx
+++ b/src/Transfer/Transfer_MultipleBinder.cxx
@@ -18,6 +18,8 @@
 #include <Transfer_MultipleBinder.hxx>
 #include <Transfer_TransferFailure.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_MultipleBinder,Transfer_Binder)
+
 // Resultat Multiple
 // Possibilite de definir un Resultat Multiple : plusieurs objets resultant
 //  d un Transfert, sans pouvoir les distinguer
diff --git a/src/Transfer/Transfer_MultipleBinder.hxx b/src/Transfer/Transfer_MultipleBinder.hxx
index d1c0dfbd36..7c292d9d0c 100644
--- a/src/Transfer/Transfer_MultipleBinder.hxx
+++ b/src/Transfer/Transfer_MultipleBinder.hxx
@@ -92,7 +92,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_MultipleBinder,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_MultipleBinder,Transfer_Binder)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ProcessForFinder.hxx b/src/Transfer/Transfer_ProcessForFinder.hxx
index 2986f87b6c..57fa9cb0a8 100644
--- a/src/Transfer/Transfer_ProcessForFinder.hxx
+++ b/src/Transfer/Transfer_ProcessForFinder.hxx
@@ -401,7 +401,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ProcessForFinder,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Transfer_ProcessForFinder,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ProcessForTransient.hxx b/src/Transfer/Transfer_ProcessForTransient.hxx
index 13f48ab9f8..51b55461e0 100644
--- a/src/Transfer/Transfer_ProcessForTransient.hxx
+++ b/src/Transfer/Transfer_ProcessForTransient.hxx
@@ -405,7 +405,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ProcessForTransient,MMgt_TShared)
+  DEFINE_STANDARD_RTTI_INLINE(Transfer_ProcessForTransient,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ResultFromModel.cxx b/src/Transfer/Transfer_ResultFromModel.cxx
index b525360d76..c9c7f5c49c 100644
--- a/src/Transfer/Transfer_ResultFromModel.cxx
+++ b/src/Transfer/Transfer_ResultFromModel.cxx
@@ -25,6 +25,8 @@
 #include <Transfer_ResultFromTransient.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_ResultFromModel,MMgt_TShared)
+
 Transfer_ResultFromModel::Transfer_ResultFromModel ()
       {  themnum = 0;  themchk = Interface_CheckAny;  }
 
diff --git a/src/Transfer/Transfer_ResultFromModel.hxx b/src/Transfer/Transfer_ResultFromModel.hxx
index c89268e646..096d5f363e 100644
--- a/src/Transfer/Transfer_ResultFromModel.hxx
+++ b/src/Transfer/Transfer_ResultFromModel.hxx
@@ -158,7 +158,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ResultFromModel,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Transfer_ResultFromModel,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_ResultFromTransient.cxx b/src/Transfer/Transfer_ResultFromTransient.cxx
index 81bb021d58..294425ac32 100644
--- a/src/Transfer/Transfer_ResultFromTransient.cxx
+++ b/src/Transfer/Transfer_ResultFromTransient.cxx
@@ -20,6 +20,8 @@
 #include <Transfer_ResultFromTransient.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_ResultFromTransient,MMgt_TShared)
+
 static Handle(Interface_Check) voidcheck = new Interface_Check;
 
     Transfer_ResultFromTransient::Transfer_ResultFromTransient ()    {  }
diff --git a/src/Transfer/Transfer_ResultFromTransient.hxx b/src/Transfer/Transfer_ResultFromTransient.hxx
index 202afb6ac6..29d8608ed8 100644
--- a/src/Transfer/Transfer_ResultFromTransient.hxx
+++ b/src/Transfer/Transfer_ResultFromTransient.hxx
@@ -113,7 +113,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_ResultFromTransient,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Transfer_ResultFromTransient,MMgt_TShared)
 
 protected:
 
diff --git a/src/Transfer/Transfer_SimpleBinderOfTransient.cxx b/src/Transfer/Transfer_SimpleBinderOfTransient.cxx
index cf2e6c53ee..44a7d14a8c 100644
--- a/src/Transfer/Transfer_SimpleBinderOfTransient.cxx
+++ b/src/Transfer/Transfer_SimpleBinderOfTransient.cxx
@@ -18,6 +18,8 @@
 #include <Transfer_SimpleBinderOfTransient.hxx>
 #include <Transfer_TransferFailure.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_SimpleBinderOfTransient,Transfer_Binder)
+
 //  "Handle(Standard_Transient)" : la classe de base pour le Resultat
 Transfer_SimpleBinderOfTransient::Transfer_SimpleBinderOfTransient () { }
 
diff --git a/src/Transfer/Transfer_SimpleBinderOfTransient.hxx b/src/Transfer/Transfer_SimpleBinderOfTransient.hxx
index ac52d7dce4..1b9ecb4ec4 100644
--- a/src/Transfer/Transfer_SimpleBinderOfTransient.hxx
+++ b/src/Transfer/Transfer_SimpleBinderOfTransient.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_SimpleBinderOfTransient,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_SimpleBinderOfTransient,Transfer_Binder)
 
 protected:
 
diff --git a/src/Transfer/Transfer_TransientListBinder.cxx b/src/Transfer/Transfer_TransientListBinder.cxx
index 8532d58c2b..f4c722638c 100644
--- a/src/Transfer/Transfer_TransientListBinder.cxx
+++ b/src/Transfer/Transfer_TransientListBinder.cxx
@@ -18,6 +18,8 @@
 #include <Standard_TypeMismatch.hxx>
 #include <Transfer_TransientListBinder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_TransientListBinder,Transfer_Binder)
+
 //#include  <TColStd.hxx>
 //=======================================================================
 //function : Constructor
diff --git a/src/Transfer/Transfer_TransientListBinder.hxx b/src/Transfer/Transfer_TransientListBinder.hxx
index 67f0869697..756c79b779 100644
--- a/src/Transfer/Transfer_TransientListBinder.hxx
+++ b/src/Transfer/Transfer_TransientListBinder.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_TransientListBinder,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_TransientListBinder,Transfer_Binder)
 
 protected:
 
diff --git a/src/Transfer/Transfer_TransientMapper.hxx b/src/Transfer/Transfer_TransientMapper.hxx
index 77b1e1f8a1..13bf4c4a79 100644
--- a/src/Transfer/Transfer_TransientMapper.hxx
+++ b/src/Transfer/Transfer_TransientMapper.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_TransientMapper,Transfer_Finder)
+  DEFINE_STANDARD_RTTI_INLINE(Transfer_TransientMapper,Transfer_Finder)
 
 protected:
 
diff --git a/src/Transfer/Transfer_TransientProcess.cxx b/src/Transfer/Transfer_TransientProcess.cxx
index 71ffc588a2..f124aa6ebb 100644
--- a/src/Transfer/Transfer_TransientProcess.cxx
+++ b/src/Transfer/Transfer_TransientProcess.cxx
@@ -26,6 +26,8 @@
 #include <Transfer_Binder.hxx>
 #include <Transfer_TransientProcess.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_TransientProcess,Transfer_ProcessForTransient)
+
 //=======================================================================
 //function : Transfer_TransientProcess
 //purpose  : 
diff --git a/src/Transfer/Transfer_TransientProcess.hxx b/src/Transfer/Transfer_TransientProcess.hxx
index 84523e7716..fe06250dfb 100644
--- a/src/Transfer/Transfer_TransientProcess.hxx
+++ b/src/Transfer/Transfer_TransientProcess.hxx
@@ -116,7 +116,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_TransientProcess,Transfer_ProcessForTransient)
+  DEFINE_STANDARD_RTTIEXT(Transfer_TransientProcess,Transfer_ProcessForTransient)
 
 protected:
 
diff --git a/src/Transfer/Transfer_VoidBinder.cxx b/src/Transfer/Transfer_VoidBinder.cxx
index 370f0b7d69..dc35ebbbf3 100644
--- a/src/Transfer/Transfer_VoidBinder.cxx
+++ b/src/Transfer/Transfer_VoidBinder.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <Transfer_VoidBinder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Transfer_VoidBinder,Transfer_Binder)
+
 Transfer_VoidBinder::Transfer_VoidBinder ()    {  }
 
 //    Standard_Boolean  Transfer_VoidBinder::IsMultiple () const
diff --git a/src/Transfer/Transfer_VoidBinder.hxx b/src/Transfer/Transfer_VoidBinder.hxx
index c6cdd35246..80a0d5ea70 100644
--- a/src/Transfer/Transfer_VoidBinder.hxx
+++ b/src/Transfer/Transfer_VoidBinder.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Transfer_VoidBinder,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(Transfer_VoidBinder,Transfer_Binder)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_BinderOfShape.cxx b/src/TransferBRep/TransferBRep_BinderOfShape.cxx
index 9e8e984026..cdbe8ddfba 100644
--- a/src/TransferBRep/TransferBRep_BinderOfShape.cxx
+++ b/src/TransferBRep/TransferBRep_BinderOfShape.cxx
@@ -18,6 +18,8 @@
 #include <TransferBRep_BinderOfShape.hxx>
 #include <TransferBRep_ShapeInfo.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TransferBRep_BinderOfShape,Transfer_Binder)
+
 TransferBRep_BinderOfShape::TransferBRep_BinderOfShape (){ }
 
 TransferBRep_BinderOfShape::TransferBRep_BinderOfShape (const TopoDS_Shape& res)
diff --git a/src/TransferBRep/TransferBRep_BinderOfShape.hxx b/src/TransferBRep/TransferBRep_BinderOfShape.hxx
index ad02568f8a..7509bb8de9 100644
--- a/src/TransferBRep/TransferBRep_BinderOfShape.hxx
+++ b/src/TransferBRep/TransferBRep_BinderOfShape.hxx
@@ -78,7 +78,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_BinderOfShape,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(TransferBRep_BinderOfShape,Transfer_Binder)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx b/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx
index 7543d090fd..468a2b293b 100644
--- a/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx
+++ b/src/TransferBRep/TransferBRep_OrientedShapeMapper.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_OrientedShapeMapper,Transfer_Finder)
+  DEFINE_STANDARD_RTTI_INLINE(TransferBRep_OrientedShapeMapper,Transfer_Finder)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_ShapeBinder.cxx b/src/TransferBRep/TransferBRep_ShapeBinder.cxx
index 81f9968390..8c28b74bd2 100644
--- a/src/TransferBRep/TransferBRep_ShapeBinder.cxx
+++ b/src/TransferBRep/TransferBRep_ShapeBinder.cxx
@@ -26,6 +26,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TransferBRep_ShapeBinder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TransferBRep_ShapeBinder,TransferBRep_BinderOfShape)
+
 TransferBRep_ShapeBinder::TransferBRep_ShapeBinder ()    {  }
 
     TransferBRep_ShapeBinder::TransferBRep_ShapeBinder (const TopoDS_Shape& shape)
diff --git a/src/TransferBRep/TransferBRep_ShapeBinder.hxx b/src/TransferBRep/TransferBRep_ShapeBinder.hxx
index 9ae910767e..bdec1e6a59 100644
--- a/src/TransferBRep/TransferBRep_ShapeBinder.hxx
+++ b/src/TransferBRep/TransferBRep_ShapeBinder.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_ShapeBinder,TransferBRep_BinderOfShape)
+  DEFINE_STANDARD_RTTIEXT(TransferBRep_ShapeBinder,TransferBRep_BinderOfShape)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_ShapeListBinder.cxx b/src/TransferBRep/TransferBRep_ShapeListBinder.cxx
index de789fb2c9..e63197ec65 100644
--- a/src/TransferBRep/TransferBRep_ShapeListBinder.cxx
+++ b/src/TransferBRep/TransferBRep_ShapeListBinder.cxx
@@ -27,6 +27,8 @@
 #include <TopoDS_Wire.hxx>
 #include <TransferBRep_ShapeListBinder.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TransferBRep_ShapeListBinder,Transfer_Binder)
+
 TransferBRep_ShapeListBinder::TransferBRep_ShapeListBinder  ()
       {  theres = new TopTools_HSequenceOfShape();  }
 
diff --git a/src/TransferBRep/TransferBRep_ShapeListBinder.hxx b/src/TransferBRep/TransferBRep_ShapeListBinder.hxx
index bf7f56fb39..f9a49d6186 100644
--- a/src/TransferBRep/TransferBRep_ShapeListBinder.hxx
+++ b/src/TransferBRep/TransferBRep_ShapeListBinder.hxx
@@ -96,7 +96,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_ShapeListBinder,Transfer_Binder)
+  DEFINE_STANDARD_RTTIEXT(TransferBRep_ShapeListBinder,Transfer_Binder)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_ShapeMapper.hxx b/src/TransferBRep/TransferBRep_ShapeMapper.hxx
index 07d2aa2746..9e6b7f4ebe 100644
--- a/src/TransferBRep/TransferBRep_ShapeMapper.hxx
+++ b/src/TransferBRep/TransferBRep_ShapeMapper.hxx
@@ -65,7 +65,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_ShapeMapper,Transfer_Finder)
+  DEFINE_STANDARD_RTTI_INLINE(TransferBRep_ShapeMapper,Transfer_Finder)
 
 protected:
 
diff --git a/src/TransferBRep/TransferBRep_TransferResultInfo.cxx b/src/TransferBRep/TransferBRep_TransferResultInfo.cxx
index 1b5de39346..3ea04fe9e8 100644
--- a/src/TransferBRep/TransferBRep_TransferResultInfo.cxx
+++ b/src/TransferBRep/TransferBRep_TransferResultInfo.cxx
@@ -18,6 +18,8 @@
 #include <Standard_Type.hxx>
 #include <TransferBRep_TransferResultInfo.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(TransferBRep_TransferResultInfo,MMgt_TShared)
+
 //=======================================================================
 //function : TransferBRep_TransferResultInfo
 //purpose  : 
diff --git a/src/TransferBRep/TransferBRep_TransferResultInfo.hxx b/src/TransferBRep/TransferBRep_TransferResultInfo.hxx
index cfdcc7557b..9cf69eae49 100644
--- a/src/TransferBRep/TransferBRep_TransferResultInfo.hxx
+++ b/src/TransferBRep/TransferBRep_TransferResultInfo.hxx
@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(TransferBRep_TransferResultInfo,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(TransferBRep_TransferResultInfo,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_Dimensions.cxx b/src/Units/Units_Dimensions.cxx
index c79173f1e0..3bcfdca648 100644
--- a/src/Units/Units_Dimensions.cxx
+++ b/src/Units/Units_Dimensions.cxx
@@ -21,6 +21,8 @@
 #include <Units_Operators.hxx>
 #include <Units_UnitsDictionary.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_Dimensions,MMgt_TShared)
+
 //=======================================================================
 //function : Units_Dimensions
 //purpose  : 
diff --git a/src/Units/Units_Dimensions.hxx b/src/Units/Units_Dimensions.hxx
index 5adefe8a96..59c8224082 100644
--- a/src/Units/Units_Dimensions.hxx
+++ b/src/Units/Units_Dimensions.hxx
@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_Dimensions,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_Dimensions,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_Lexicon.cxx b/src/Units/Units_Lexicon.cxx
index 77013e6dda..1aecc6ff37 100644
--- a/src/Units/Units_Lexicon.cxx
+++ b/src/Units/Units_Lexicon.cxx
@@ -24,6 +24,8 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
+IMPLEMENT_STANDARD_RTTIEXT(Units_Lexicon,MMgt_TShared)
+
 #ifdef _MSC_VER
 # include <stdio.h>
 #else
diff --git a/src/Units/Units_Lexicon.hxx b/src/Units/Units_Lexicon.hxx
index 06e732c2bc..fb98d6292d 100644
--- a/src/Units/Units_Lexicon.hxx
+++ b/src/Units/Units_Lexicon.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_Lexicon,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_Lexicon,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_Quantity.cxx b/src/Units/Units_Quantity.cxx
index 3383c11736..fe02f2ef8b 100644
--- a/src/Units/Units_Quantity.cxx
+++ b/src/Units/Units_Quantity.cxx
@@ -22,6 +22,8 @@
 #include <Units_Quantity.hxx>
 #include <Units_Unit.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_Quantity,MMgt_TShared)
+
 //=======================================================================
 //function : IsEqual
 //purpose  : 
diff --git a/src/Units/Units_Quantity.hxx b/src/Units/Units_Quantity.hxx
index 10d3cc7a02..8d80215c8d 100644
--- a/src/Units/Units_Quantity.hxx
+++ b/src/Units/Units_Quantity.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_Quantity,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_Quantity,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_ShiftedToken.cxx b/src/Units/Units_ShiftedToken.cxx
index 3cc3a56612..146b301b9f 100644
--- a/src/Units/Units_ShiftedToken.cxx
+++ b/src/Units/Units_ShiftedToken.cxx
@@ -21,6 +21,8 @@
 #include <Units_ShiftedToken.hxx>
 #include <Units_Token.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_ShiftedToken,Units_Token)
+
 //=======================================================================
 //function : Units_ShiftedToken
 //purpose  : 
diff --git a/src/Units/Units_ShiftedToken.hxx b/src/Units/Units_ShiftedToken.hxx
index 6d396608b4..74cec17ee5 100644
--- a/src/Units/Units_ShiftedToken.hxx
+++ b/src/Units/Units_ShiftedToken.hxx
@@ -86,7 +86,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_ShiftedToken,Units_Token)
+  DEFINE_STANDARD_RTTIEXT(Units_ShiftedToken,Units_Token)
 
 protected:
 
diff --git a/src/Units/Units_ShiftedUnit.cxx b/src/Units/Units_ShiftedUnit.cxx
index f3944d1500..29b3155687 100644
--- a/src/Units/Units_ShiftedUnit.cxx
+++ b/src/Units/Units_ShiftedUnit.cxx
@@ -23,6 +23,8 @@
 #include <Units_ShiftedUnit.hxx>
 #include <Units_Token.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_ShiftedUnit,Units_Unit)
+
 //=======================================================================
 //function : Units_ShiftedUnit
 //purpose  : 
diff --git a/src/Units/Units_ShiftedUnit.hxx b/src/Units/Units_ShiftedUnit.hxx
index aa0f7bed2f..4e29be16db 100644
--- a/src/Units/Units_ShiftedUnit.hxx
+++ b/src/Units/Units_ShiftedUnit.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_ShiftedUnit,Units_Unit)
+  DEFINE_STANDARD_RTTIEXT(Units_ShiftedUnit,Units_Unit)
 
 protected:
 
diff --git a/src/Units/Units_Token.cxx b/src/Units/Units_Token.cxx
index fc19060b15..4850b3cbf3 100644
--- a/src/Units/Units_Token.cxx
+++ b/src/Units/Units_Token.cxx
@@ -30,6 +30,8 @@
 #include <Units_Operators.hxx>
 #include <Units_Token.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_Token,MMgt_TShared)
+
 //=======================================================================
 //function : Units_Token
 //purpose  : 
diff --git a/src/Units/Units_Token.hxx b/src/Units/Units_Token.hxx
index 100ae3fd49..fe098e8d86 100644
--- a/src/Units/Units_Token.hxx
+++ b/src/Units/Units_Token.hxx
@@ -195,7 +195,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_Token,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_Token,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_Unit.cxx b/src/Units/Units_Unit.cxx
index a6e32b1565..0a9bceae31 100644
--- a/src/Units/Units_Unit.cxx
+++ b/src/Units/Units_Unit.cxx
@@ -25,6 +25,8 @@
 #include <Units_Unit.hxx>
 #include <Units_UnitsDictionary.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_Unit,MMgt_TShared)
+
 //=======================================================================
 //function : Units_Unit
 //purpose  : 
diff --git a/src/Units/Units_Unit.hxx b/src/Units/Units_Unit.hxx
index b0615e881b..8a631feada 100644
--- a/src/Units/Units_Unit.hxx
+++ b/src/Units/Units_Unit.hxx
@@ -94,7 +94,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_Unit,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_Unit,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_UnitsDictionary.cxx b/src/Units/Units_UnitsDictionary.cxx
index 4b44c7bb1b..17d3f23d02 100644
--- a/src/Units/Units_UnitsDictionary.cxx
+++ b/src/Units/Units_UnitsDictionary.cxx
@@ -38,6 +38,8 @@
 
 #include <stdio.h>
 #include <sys/stat.h>
+IMPLEMENT_STANDARD_RTTIEXT(Units_UnitsDictionary,MMgt_TShared)
+
 //=======================================================================
 //function : Units_UnitsDictionary
 //purpose  : 
diff --git a/src/Units/Units_UnitsDictionary.hxx b/src/Units/Units_UnitsDictionary.hxx
index e3fbf425fb..40d1358206 100644
--- a/src/Units/Units_UnitsDictionary.hxx
+++ b/src/Units/Units_UnitsDictionary.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_UnitsDictionary,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_UnitsDictionary,MMgt_TShared)
 
 protected:
 
diff --git a/src/Units/Units_UnitsLexicon.cxx b/src/Units/Units_UnitsLexicon.cxx
index b0b543f044..8c12e7881d 100644
--- a/src/Units/Units_UnitsLexicon.cxx
+++ b/src/Units/Units_UnitsLexicon.cxx
@@ -25,6 +25,8 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
+IMPLEMENT_STANDARD_RTTIEXT(Units_UnitsLexicon,Units_Lexicon)
+
 //=======================================================================
 //function : Units_UnitsLexicon
 //purpose  : 
diff --git a/src/Units/Units_UnitsLexicon.hxx b/src/Units/Units_UnitsLexicon.hxx
index e7d2dd298a..ceaddee5e3 100644
--- a/src/Units/Units_UnitsLexicon.hxx
+++ b/src/Units/Units_UnitsLexicon.hxx
@@ -63,7 +63,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_UnitsLexicon,Units_Lexicon)
+  DEFINE_STANDARD_RTTIEXT(Units_UnitsLexicon,Units_Lexicon)
 
 protected:
 
diff --git a/src/Units/Units_UnitsSystem.cxx b/src/Units/Units_UnitsSystem.cxx
index 10fcda008f..7313734c23 100644
--- a/src/Units/Units_UnitsSystem.cxx
+++ b/src/Units/Units_UnitsSystem.cxx
@@ -36,6 +36,8 @@
 #include <Units_UnitsSequence.hxx>
 #include <Units_UnitsSystem.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Units_UnitsSystem,MMgt_TShared)
+
 //=======================================================================
 //function : Units_UnitsSystem
 //purpose  : 
diff --git a/src/Units/Units_UnitsSystem.hxx b/src/Units/Units_UnitsSystem.hxx
index d3c2a2f294..a0f4ccf47a 100644
--- a/src/Units/Units_UnitsSystem.hxx
+++ b/src/Units/Units_UnitsSystem.hxx
@@ -104,7 +104,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Units_UnitsSystem,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Units_UnitsSystem,MMgt_TShared)
 
 protected:
 
diff --git a/src/V3d/V3d_AmbientLight.cxx b/src/V3d/V3d_AmbientLight.cxx
index 6a074487d5..33ba1a199e 100644
--- a/src/V3d/V3d_AmbientLight.cxx
+++ b/src/V3d/V3d_AmbientLight.cxx
@@ -17,6 +17,8 @@
 
 #include <V3d_AmbientLight.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_AmbientLight,V3d_Light)
+
 // =======================================================================
 // function : V3d_AmbientLight
 // purpose  :
diff --git a/src/V3d/V3d_AmbientLight.hxx b/src/V3d/V3d_AmbientLight.hxx
index 52ac7e928e..d312069637 100644
--- a/src/V3d/V3d_AmbientLight.hxx
+++ b/src/V3d/V3d_AmbientLight.hxx
@@ -34,7 +34,7 @@ public:
   Standard_EXPORT V3d_AmbientLight (const Handle(V3d_Viewer)& theViewer,
                                     const Quantity_NameOfColor theColor = Quantity_NOC_WHITE);
 
-  DEFINE_STANDARD_RTTI(V3d_AmbientLight,V3d_Light)
+  DEFINE_STANDARD_RTTIEXT(V3d_AmbientLight,V3d_Light)
 };
 
 #endif // _V3d_AmbientLight_HeaderFile
diff --git a/src/V3d/V3d_CircularGrid.cxx b/src/V3d/V3d_CircularGrid.cxx
index d9a1059e71..c2275a07d9 100644
--- a/src/V3d/V3d_CircularGrid.cxx
+++ b/src/V3d/V3d_CircularGrid.cxx
@@ -39,6 +39,8 @@
 #include <V3d_CircularGrid.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_CircularGrid,Aspect_CircularGrid)
+
 /*----------------------------------------------------------------------*/
 /*
  * Constant
diff --git a/src/V3d/V3d_CircularGrid.hxx b/src/V3d/V3d_CircularGrid.hxx
index 01d7e90e62..6e3ec1c4f4 100644
--- a/src/V3d/V3d_CircularGrid.hxx
+++ b/src/V3d/V3d_CircularGrid.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(V3d_CircularGrid,Aspect_CircularGrid)
+  DEFINE_STANDARD_RTTIEXT(V3d_CircularGrid,Aspect_CircularGrid)
 
 protected:
 
diff --git a/src/V3d/V3d_DirectionalLight.cxx b/src/V3d/V3d_DirectionalLight.cxx
index 733c12a16e..b7ff7f19fd 100644
--- a/src/V3d/V3d_DirectionalLight.cxx
+++ b/src/V3d/V3d_DirectionalLight.cxx
@@ -52,6 +52,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_DirectionalLight,V3d_PositionLight)
+
 // =======================================================================
 // function : V3d_DirectionalLight
 // purpose  :
diff --git a/src/V3d/V3d_DirectionalLight.hxx b/src/V3d/V3d_DirectionalLight.hxx
index 6d13f78244..576092f4ba 100644
--- a/src/V3d/V3d_DirectionalLight.hxx
+++ b/src/V3d/V3d_DirectionalLight.hxx
@@ -98,7 +98,7 @@ public:
                                   Quantity_Parameter& theVy,
                                   Quantity_Parameter& theVz) const;
 
-  DEFINE_STANDARD_RTTI(V3d_DirectionalLight,V3d_PositionLight)
+  DEFINE_STANDARD_RTTIEXT(V3d_DirectionalLight,V3d_PositionLight)
 
 private:
 
diff --git a/src/V3d/V3d_Light.cxx b/src/V3d/V3d_Light.cxx
index ac08b91a32..67be8f5deb 100644
--- a/src/V3d/V3d_Light.cxx
+++ b/src/V3d/V3d_Light.cxx
@@ -33,6 +33,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_Light,MMgt_TShared)
+
 // =======================================================================
 // function : V3d_Light
 // purpose  :
diff --git a/src/V3d/V3d_Light.hxx b/src/V3d/V3d_Light.hxx
index 048c8717a1..43d77acb23 100644
--- a/src/V3d/V3d_Light.hxx
+++ b/src/V3d/V3d_Light.hxx
@@ -95,7 +95,7 @@ friend
   //! Updates the lights of the view. The view is redrawn.
   Standard_EXPORT void V3d_View::UpdateLights() const;
 
-  DEFINE_STANDARD_RTTI(V3d_Light,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(V3d_Light,MMgt_TShared)
 
 protected:
 
diff --git a/src/V3d/V3d_Plane.cxx b/src/V3d/V3d_Plane.cxx
index f600d1f694..d6b6b8499c 100755
--- a/src/V3d/V3d_Plane.cxx
+++ b/src/V3d/V3d_Plane.cxx
@@ -19,6 +19,8 @@
 #include <Graphic3d_ArrayOfQuadrangles.hxx>
 #include <gp_Pln.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_Plane,MMgt_TShared)
+
 // =======================================================================
 // function : V3d_Plane
 // purpose  :
diff --git a/src/V3d/V3d_Plane.hxx b/src/V3d/V3d_Plane.hxx
index 40c1c74695..ca87568a81 100755
--- a/src/V3d/V3d_Plane.hxx
+++ b/src/V3d/V3d_Plane.hxx
@@ -96,7 +96,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(V3d_Plane, MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(V3d_Plane,MMgt_TShared)
 };
 
 #endif
diff --git a/src/V3d/V3d_PositionLight.cxx b/src/V3d/V3d_PositionLight.cxx
index bcce84f4ca..57702c41a6 100644
--- a/src/V3d/V3d_PositionLight.cxx
+++ b/src/V3d/V3d_PositionLight.cxx
@@ -38,6 +38,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_PositionLight,V3d_Light)
+
 // =======================================================================
 // function : V3d_PositionLight
 // purpose  :
diff --git a/src/V3d/V3d_PositionLight.hxx b/src/V3d/V3d_PositionLight.hxx
index 819ad46c09..c0f85b469d 100644
--- a/src/V3d/V3d_PositionLight.hxx
+++ b/src/V3d/V3d_PositionLight.hxx
@@ -97,7 +97,7 @@ public:
                                V3d_Coordinate& theY,
                                V3d_Coordinate& theZ) const;
 
-  DEFINE_STANDARD_RTTI(V3d_PositionLight,V3d_Light)
+  DEFINE_STANDARD_RTTIEXT(V3d_PositionLight,V3d_Light)
 
 protected:
 
diff --git a/src/V3d/V3d_PositionalLight.cxx b/src/V3d/V3d_PositionalLight.cxx
index 2ad5d03fd0..5206d1b973 100644
--- a/src/V3d/V3d_PositionalLight.cxx
+++ b/src/V3d/V3d_PositionalLight.cxx
@@ -53,6 +53,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_PositionalLight,V3d_PositionLight)
+
 // =======================================================================
 // function : V3d_PositionalLight
 // purpose  :
diff --git a/src/V3d/V3d_PositionalLight.hxx b/src/V3d/V3d_PositionalLight.hxx
index 061fd99054..0feede310d 100644
--- a/src/V3d/V3d_PositionalLight.hxx
+++ b/src/V3d/V3d_PositionalLight.hxx
@@ -105,7 +105,7 @@ public:
   Standard_EXPORT void Attenuation (Quantity_Coefficient& theConstAttenuation,
                                     Quantity_Coefficient& theLinearAttenuation) const;
 
-  DEFINE_STANDARD_RTTI(V3d_PositionalLight,V3d_PositionLight)
+  DEFINE_STANDARD_RTTIEXT(V3d_PositionalLight,V3d_PositionLight)
 
 private:
 
diff --git a/src/V3d/V3d_RectangularGrid.cxx b/src/V3d/V3d_RectangularGrid.cxx
index 5959f6fbea..e97ea4d07b 100644
--- a/src/V3d/V3d_RectangularGrid.cxx
+++ b/src/V3d/V3d_RectangularGrid.cxx
@@ -41,6 +41,8 @@
 #include <V3d_RectangularGrid.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_RectangularGrid,Aspect_RectangularGrid)
+
 /*----------------------------------------------------------------------*/
 /*
  * Constant
diff --git a/src/V3d/V3d_RectangularGrid.hxx b/src/V3d/V3d_RectangularGrid.hxx
index 431b031262..ad93debc47 100644
--- a/src/V3d/V3d_RectangularGrid.hxx
+++ b/src/V3d/V3d_RectangularGrid.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(V3d_RectangularGrid,Aspect_RectangularGrid)
+  DEFINE_STANDARD_RTTIEXT(V3d_RectangularGrid,Aspect_RectangularGrid)
 
 protected:
 
diff --git a/src/V3d/V3d_SpotLight.cxx b/src/V3d/V3d_SpotLight.cxx
index 25e54010e6..75d3f40aac 100644
--- a/src/V3d/V3d_SpotLight.cxx
+++ b/src/V3d/V3d_SpotLight.cxx
@@ -48,6 +48,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_SpotLight,V3d_PositionLight)
+
 // =======================================================================
 // function : V3d_SpotLight
 // purpose  :
diff --git a/src/V3d/V3d_SpotLight.hxx b/src/V3d/V3d_SpotLight.hxx
index 1d58e82e06..931d2eb63a 100644
--- a/src/V3d/V3d_SpotLight.hxx
+++ b/src/V3d/V3d_SpotLight.hxx
@@ -135,7 +135,7 @@ public:
   //! Returns the spot angle.
   Standard_EXPORT Quantity_PlaneAngle Angle() const;
 
-  DEFINE_STANDARD_RTTI(V3d_SpotLight,V3d_PositionLight)
+  DEFINE_STANDARD_RTTIEXT(V3d_SpotLight,V3d_PositionLight)
 
 private:
 
diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx
index f9da1b49f9..33e0690dd5 100644
--- a/src/V3d/V3d_View.cxx
+++ b/src/V3d/V3d_View.cxx
@@ -103,6 +103,8 @@ To solve the problem (for lack of a better solution) I make 2 passes.
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_View,MMgt_TShared)
+
 #define V3d_FLAG_COMPUTATION   0x00000004
 
 // Perspective
diff --git a/src/V3d/V3d_View.hxx b/src/V3d/V3d_View.hxx
index 9f14ea1047..cb6bc1045b 100644
--- a/src/V3d/V3d_View.hxx
+++ b/src/V3d/V3d_View.hxx
@@ -1001,7 +1001,7 @@ friend
   Standard_EXPORT void V3d_Viewer::SetViewOff (const Handle(V3d_View)& View);
 
 
-  DEFINE_STANDARD_RTTI(V3d_View,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(V3d_View,MMgt_TShared)
 
 protected:
 
diff --git a/src/V3d/V3d_View_4.cxx b/src/V3d/V3d_View_4.cxx
index 1d26602faa..ac8c2c8c59 100644
--- a/src/V3d/V3d_View_4.cxx
+++ b/src/V3d/V3d_View_4.cxx
@@ -35,6 +35,7 @@
 #include <V3d_UnMapped.hxx>
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
+#include <Aspect_CircularGrid.hxx>
 
 #define MYEPSILON1 0.0001		// Comparison with 0.0
 #define MYEPSILON2 M_PI / 180.	// Delta between 2 angles
diff --git a/src/V3d/V3d_Viewer.cxx b/src/V3d/V3d_Viewer.cxx
index 0a7261e751..73079fce4c 100644
--- a/src/V3d/V3d_Viewer.cxx
+++ b/src/V3d/V3d_Viewer.cxx
@@ -32,6 +32,8 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(V3d_Viewer,MMgt_TShared)
+
 // ========================================================================
 // function : V3d_Viewer
 // purpose  :
diff --git a/src/V3d/V3d_Viewer.hxx b/src/V3d/V3d_Viewer.hxx
index c042e76a5a..e642f71c26 100644
--- a/src/V3d/V3d_Viewer.hxx
+++ b/src/V3d/V3d_Viewer.hxx
@@ -450,7 +450,7 @@ public:
 friend class V3d_View;
 friend class V3d_Light;
 
-  DEFINE_STANDARD_RTTI(V3d_Viewer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(V3d_Viewer,MMgt_TShared)
 
 protected:
 
diff --git a/src/ViewerTest/ViewerTest_EventManager.cxx b/src/ViewerTest/ViewerTest_EventManager.cxx
index e1060f5cd8..c101cc1887 100644
--- a/src/ViewerTest/ViewerTest_EventManager.cxx
+++ b/src/ViewerTest/ViewerTest_EventManager.cxx
@@ -21,6 +21,8 @@
 #include <V3d_View.hxx>
 #include <ViewerTest_EventManager.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(ViewerTest_EventManager,MMgt_TShared)
+
 //=======================================================================
 //function : ViewerTest_EventManager
 //purpose  :
diff --git a/src/ViewerTest/ViewerTest_EventManager.hxx b/src/ViewerTest/ViewerTest_EventManager.hxx
index 262105df71..44bac48f1d 100644
--- a/src/ViewerTest/ViewerTest_EventManager.hxx
+++ b/src/ViewerTest/ViewerTest_EventManager.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(ViewerTest_EventManager,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(ViewerTest_EventManager,MMgt_TShared)
 
 protected:
 
diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index b955e106c0..7032b408dc 100644
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -2013,7 +2013,7 @@ class FilledCircle : public AIS_InteractiveObject
 {
 public:
     // CASCADE RTTI
-    DEFINE_STANDARD_RTTI(FilledCircle, AIS_InteractiveObject); 
+    DEFINE_STANDARD_RTTI_INLINE(FilledCircle,AIS_InteractiveObject); 
 
     FilledCircle(gp_Pnt theCenter, Standard_Real theRadius);
     FilledCircle(Handle(Geom_Circle) theCircle);
@@ -3379,7 +3379,7 @@ public:
     myMarkerAspect = theMarkerAspect;
   }
 
-  DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
+  DEFINE_STANDARD_RTTI_INLINE(MyPArrayObject,AIS_InteractiveObject);
 
 private:
 
@@ -4576,7 +4576,7 @@ class Triangle: public AIS_InteractiveObject
 {
 public: 
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(Triangle, AIS_InteractiveObject);
+  DEFINE_STANDARD_RTTI_INLINE(Triangle,AIS_InteractiveObject);
   Triangle (const gp_Pnt& theP1, 
             const gp_Pnt& theP2, 
             const gp_Pnt& theP3);
@@ -4770,7 +4770,7 @@ class SegmentObject: public AIS_InteractiveObject
 {
 public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(SegmentObject, AIS_InteractiveObject); 
+  DEFINE_STANDARD_RTTI_INLINE(SegmentObject,AIS_InteractiveObject); 
   SegmentObject (const gp_Pnt& thePnt1, const gp_Pnt& thePnt2);
 protected:
   void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
@@ -5159,7 +5159,7 @@ public:
     myMarkerAspect = theMarkerAspect;
   }
 
-  DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
+  DEFINE_STANDARD_RTTI_INLINE(MyPArrayObject,AIS_InteractiveObject);
 
 private:
 
diff --git a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
index 48ea9b079e..83ddf50767 100644
--- a/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
+++ b/src/ViewerTest/ViewerTest_OpenGlCommands.cxx
@@ -45,6 +45,7 @@
 #include <V3d_Viewer.hxx>
 #include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName.hxx>
+#include <OpenGl_Group.hxx>
 
 extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theName,
                                            const Handle(AIS_InteractiveObject)& theAISObj,
@@ -62,7 +63,7 @@ class VUserDrawObj : public AIS_InteractiveObject
 {
 public:
     // CASCADE RTTI
-    DEFINE_STANDARD_RTTI(VUserDrawObj, AIS_InteractiveObject);
+    DEFINE_STANDARD_RTTI_INLINE(VUserDrawObj,AIS_InteractiveObject);
 
     VUserDrawObj()
     {
diff --git a/src/ViewerTest/ViewerTest_RelationCommands.cxx b/src/ViewerTest/ViewerTest_RelationCommands.cxx
index 51222c98ba..b210cf8e69 100644
--- a/src/ViewerTest/ViewerTest_RelationCommands.cxx
+++ b/src/ViewerTest/ViewerTest_RelationCommands.cxx
@@ -87,6 +87,8 @@
 #include <ViewerTest_DoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName.hxx>
 #include <ViewerTest_EventManager.hxx>
+#include <AIS_InteractiveObject.hxx>
+#include <AIS_Dimension.hxx>
 
 extern Standard_Boolean VDisplayAISObject (const TCollection_AsciiString& theName,
                                            const Handle(AIS_InteractiveObject)& theAISObj,
diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 0cceba06b6..1c9b751c90 100644
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -4654,7 +4654,7 @@ class V3d_LineItem : public AIS_InteractiveObject
 {
 public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(V3d_LineItem, AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI_INLINE(V3d_LineItem,AIS_InteractiveObject)
 
   // constructor
   Standard_EXPORT V3d_LineItem(Standard_Real X1, Standard_Real Y1,
@@ -6434,7 +6434,7 @@ public:
                             const Standard_ShortReal theXShift,
                             const Standard_ShortReal theYShift,
                             const Standard_ShortReal theAngle);
-  DEFINE_STANDARD_RTTI(OCC_TextureEnv, Graphic3d_TextureEnv);
+  DEFINE_STANDARD_RTTI_INLINE(OCC_TextureEnv,Graphic3d_TextureEnv);
 };
 DEFINE_STANDARD_HANDLE(OCC_TextureEnv, Graphic3d_TextureEnv);
 
diff --git a/src/Vrml/Vrml_AsciiText.cxx b/src/Vrml/Vrml_AsciiText.cxx
index d2e3ab0638..4231720507 100644
--- a/src/Vrml/Vrml_AsciiText.cxx
+++ b/src/Vrml/Vrml_AsciiText.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_AsciiText.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_AsciiText,MMgt_TShared)
+
 Vrml_AsciiText::Vrml_AsciiText()
 {
     TCollection_AsciiString tmpS("");
diff --git a/src/Vrml/Vrml_AsciiText.hxx b/src/Vrml/Vrml_AsciiText.hxx
index 5388ae8d29..00678a785a 100644
--- a/src/Vrml/Vrml_AsciiText.hxx
+++ b/src/Vrml/Vrml_AsciiText.hxx
@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_AsciiText,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_AsciiText,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_Coordinate3.cxx b/src/Vrml/Vrml_Coordinate3.cxx
index 6645dd8b0e..d07089a123 100644
--- a/src/Vrml/Vrml_Coordinate3.cxx
+++ b/src/Vrml/Vrml_Coordinate3.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_Coordinate3.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_Coordinate3,MMgt_TShared)
+
 Vrml_Coordinate3::Vrml_Coordinate3(const Handle(TColgp_HArray1OfVec)& aPoint)
 {
  myPoint = aPoint;
diff --git a/src/Vrml/Vrml_Coordinate3.hxx b/src/Vrml/Vrml_Coordinate3.hxx
index 5509225a44..fe65c079d3 100644
--- a/src/Vrml/Vrml_Coordinate3.hxx
+++ b/src/Vrml/Vrml_Coordinate3.hxx
@@ -53,7 +53,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_Coordinate3,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_Coordinate3,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_IndexedFaceSet.cxx b/src/Vrml/Vrml_IndexedFaceSet.cxx
index 39c5d0eb9d..3acb2d4078 100644
--- a/src/Vrml/Vrml_IndexedFaceSet.cxx
+++ b/src/Vrml/Vrml_IndexedFaceSet.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_IndexedFaceSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_IndexedFaceSet,MMgt_TShared)
+
 Vrml_IndexedFaceSet::Vrml_IndexedFaceSet(const Handle(TColStd_HArray1OfInteger)& aCoordIndex, 
 					  const Handle(TColStd_HArray1OfInteger)& aMaterialIndex, 
 					  const Handle(TColStd_HArray1OfInteger)& aNormalIndex, 
diff --git a/src/Vrml/Vrml_IndexedFaceSet.hxx b/src/Vrml/Vrml_IndexedFaceSet.hxx
index d2dee46c32..e43e6e50cd 100644
--- a/src/Vrml/Vrml_IndexedFaceSet.hxx
+++ b/src/Vrml/Vrml_IndexedFaceSet.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_IndexedFaceSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_IndexedFaceSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_IndexedLineSet.cxx b/src/Vrml/Vrml_IndexedLineSet.cxx
index 547fc8f925..e6368d1486 100644
--- a/src/Vrml/Vrml_IndexedLineSet.cxx
+++ b/src/Vrml/Vrml_IndexedLineSet.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_IndexedLineSet.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_IndexedLineSet,MMgt_TShared)
+
 Vrml_IndexedLineSet::Vrml_IndexedLineSet(const Handle(TColStd_HArray1OfInteger)& aCoordIndex, 
 					  const Handle(TColStd_HArray1OfInteger)& aMaterialIndex, 
 					  const Handle(TColStd_HArray1OfInteger)& aNormalIndex, 
diff --git a/src/Vrml/Vrml_IndexedLineSet.hxx b/src/Vrml/Vrml_IndexedLineSet.hxx
index bcc8230829..2d03bd21aa 100644
--- a/src/Vrml/Vrml_IndexedLineSet.hxx
+++ b/src/Vrml/Vrml_IndexedLineSet.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_IndexedLineSet,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_IndexedLineSet,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_LOD.cxx b/src/Vrml/Vrml_LOD.cxx
index 97b3e82469..7349210357 100644
--- a/src/Vrml/Vrml_LOD.cxx
+++ b/src/Vrml/Vrml_LOD.cxx
@@ -16,6 +16,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_LOD.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_LOD,MMgt_TShared)
+
 Vrml_LOD::Vrml_LOD()
 {
   myRange = new TColStd_HArray1OfReal(1,1);
diff --git a/src/Vrml/Vrml_LOD.hxx b/src/Vrml/Vrml_LOD.hxx
index 7565681a4f..00816685ca 100644
--- a/src/Vrml/Vrml_LOD.hxx
+++ b/src/Vrml/Vrml_LOD.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_LOD,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_LOD,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_Material.cxx b/src/Vrml/Vrml_Material.cxx
index 64423d744e..4fd77ac101 100644
--- a/src/Vrml/Vrml_Material.cxx
+++ b/src/Vrml/Vrml_Material.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_Material.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_Material,MMgt_TShared)
+
 Vrml_Material::Vrml_Material(const Handle(Quantity_HArray1OfColor)& aAmbientColor, 
 			      const Handle(Quantity_HArray1OfColor)& aDiffuseColor, 
 			      const Handle(Quantity_HArray1OfColor)& aSpecularColor, 
diff --git a/src/Vrml/Vrml_Material.hxx b/src/Vrml/Vrml_Material.hxx
index 38fb400a69..af00ffb47a 100644
--- a/src/Vrml/Vrml_Material.hxx
+++ b/src/Vrml/Vrml_Material.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_Material,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_Material,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_Normal.cxx b/src/Vrml/Vrml_Normal.cxx
index 6aff57e947..0295da0c00 100644
--- a/src/Vrml/Vrml_Normal.cxx
+++ b/src/Vrml/Vrml_Normal.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_Normal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_Normal,MMgt_TShared)
+
 Vrml_Normal::Vrml_Normal(const Handle(TColgp_HArray1OfVec)& aVector)
 {
  myVector = aVector;
diff --git a/src/Vrml/Vrml_Normal.hxx b/src/Vrml/Vrml_Normal.hxx
index 40963efe9f..eb154c6567 100644
--- a/src/Vrml/Vrml_Normal.hxx
+++ b/src/Vrml/Vrml_Normal.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_Normal,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_Normal,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_SFImage.cxx b/src/Vrml/Vrml_SFImage.cxx
index d100f505c0..ab95f5257c 100644
--- a/src/Vrml/Vrml_SFImage.cxx
+++ b/src/Vrml/Vrml_SFImage.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_SFImage.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_SFImage,MMgt_TShared)
+
 Vrml_SFImage::Vrml_SFImage()
 {
   myArray = new TColStd_HArray1OfInteger(1,1);
diff --git a/src/Vrml/Vrml_SFImage.hxx b/src/Vrml/Vrml_SFImage.hxx
index 3b7e7409ba..b972d0dbce 100644
--- a/src/Vrml/Vrml_SFImage.hxx
+++ b/src/Vrml/Vrml_SFImage.hxx
@@ -62,7 +62,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_SFImage,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_SFImage,MMgt_TShared)
 
 protected:
 
diff --git a/src/Vrml/Vrml_TextureCoordinate2.cxx b/src/Vrml/Vrml_TextureCoordinate2.cxx
index d4b533ea8d..f68cc0467f 100644
--- a/src/Vrml/Vrml_TextureCoordinate2.cxx
+++ b/src/Vrml/Vrml_TextureCoordinate2.cxx
@@ -15,6 +15,8 @@
 #include <Standard_Type.hxx>
 #include <Vrml_TextureCoordinate2.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(Vrml_TextureCoordinate2,MMgt_TShared)
+
 Vrml_TextureCoordinate2::Vrml_TextureCoordinate2()
 {
   gp_Vec2d tmpVec(0,0);
diff --git a/src/Vrml/Vrml_TextureCoordinate2.hxx b/src/Vrml/Vrml_TextureCoordinate2.hxx
index db7f024e27..d93ce72a3b 100644
--- a/src/Vrml/Vrml_TextureCoordinate2.hxx
+++ b/src/Vrml/Vrml_TextureCoordinate2.hxx
@@ -58,7 +58,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(Vrml_TextureCoordinate2,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(Vrml_TextureCoordinate2,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_Drawer.cxx b/src/VrmlConverter/VrmlConverter_Drawer.cxx
index 67a79e5d6e..6168660dc5 100644
--- a/src/VrmlConverter/VrmlConverter_Drawer.cxx
+++ b/src/VrmlConverter/VrmlConverter_Drawer.cxx
@@ -20,6 +20,8 @@
 #include <VrmlConverter_PointAspect.hxx>
 #include <VrmlConverter_ShadingAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_Drawer,MMgt_TShared)
+
 VrmlConverter_Drawer::VrmlConverter_Drawer():
   myNbPoints(17),
   myIsoOnPlane(Standard_False),
diff --git a/src/VrmlConverter/VrmlConverter_Drawer.hxx b/src/VrmlConverter/VrmlConverter_Drawer.hxx
index b99021bc22..593f3c609d 100644
--- a/src/VrmlConverter/VrmlConverter_Drawer.hxx
+++ b/src/VrmlConverter/VrmlConverter_Drawer.hxx
@@ -216,7 +216,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_Drawer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_Drawer,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_IsoAspect.cxx b/src/VrmlConverter/VrmlConverter_IsoAspect.cxx
index 23e381a758..c4194641a2 100644
--- a/src/VrmlConverter/VrmlConverter_IsoAspect.cxx
+++ b/src/VrmlConverter/VrmlConverter_IsoAspect.cxx
@@ -16,6 +16,8 @@
 #include <Vrml_Material.hxx>
 #include <VrmlConverter_IsoAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_IsoAspect,VrmlConverter_LineAspect)
+
 VrmlConverter_IsoAspect::VrmlConverter_IsoAspect():VrmlConverter_LineAspect ()
 {
  myNumber = 10; 
diff --git a/src/VrmlConverter/VrmlConverter_IsoAspect.hxx b/src/VrmlConverter/VrmlConverter_IsoAspect.hxx
index 8967c6d4ca..aa5b7cf4db 100644
--- a/src/VrmlConverter/VrmlConverter_IsoAspect.hxx
+++ b/src/VrmlConverter/VrmlConverter_IsoAspect.hxx
@@ -52,7 +52,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_IsoAspect,VrmlConverter_LineAspect)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_IsoAspect,VrmlConverter_LineAspect)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_LineAspect.cxx b/src/VrmlConverter/VrmlConverter_LineAspect.cxx
index f1f4532fa4..2de9e466d4 100644
--- a/src/VrmlConverter/VrmlConverter_LineAspect.cxx
+++ b/src/VrmlConverter/VrmlConverter_LineAspect.cxx
@@ -16,6 +16,8 @@
 #include <Vrml_Material.hxx>
 #include <VrmlConverter_LineAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_LineAspect,MMgt_TShared)
+
 VrmlConverter_LineAspect::VrmlConverter_LineAspect()
 {
  myHasMaterial = Standard_False;
diff --git a/src/VrmlConverter/VrmlConverter_LineAspect.hxx b/src/VrmlConverter/VrmlConverter_LineAspect.hxx
index 2b707d2403..a078c5c2f8 100644
--- a/src/VrmlConverter/VrmlConverter_LineAspect.hxx
+++ b/src/VrmlConverter/VrmlConverter_LineAspect.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_LineAspect,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_LineAspect,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_PointAspect.cxx b/src/VrmlConverter/VrmlConverter_PointAspect.cxx
index 78c787ac04..2e35b8753d 100644
--- a/src/VrmlConverter/VrmlConverter_PointAspect.cxx
+++ b/src/VrmlConverter/VrmlConverter_PointAspect.cxx
@@ -16,6 +16,8 @@
 #include <Vrml_Material.hxx>
 #include <VrmlConverter_PointAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_PointAspect,MMgt_TShared)
+
 VrmlConverter_PointAspect::VrmlConverter_PointAspect()
 {
  myHasMaterial = Standard_False;
diff --git a/src/VrmlConverter/VrmlConverter_PointAspect.hxx b/src/VrmlConverter/VrmlConverter_PointAspect.hxx
index 43dc503830..670a63b7af 100644
--- a/src/VrmlConverter/VrmlConverter_PointAspect.hxx
+++ b/src/VrmlConverter/VrmlConverter_PointAspect.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_PointAspect,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_PointAspect,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_Projector.cxx b/src/VrmlConverter/VrmlConverter_Projector.cxx
index 3d933f51c4..dfb5aec629 100644
--- a/src/VrmlConverter/VrmlConverter_Projector.cxx
+++ b/src/VrmlConverter/VrmlConverter_Projector.cxx
@@ -30,6 +30,8 @@
 #include <Vrml_TransformSeparator.hxx>
 #include <VrmlConverter_Projector.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_Projector,MMgt_TShared)
+
 VrmlConverter_Projector::VrmlConverter_Projector (const TopTools_Array1OfShape& Shapes,
 						  const Quantity_Length Focus,
 						  const Quantity_Length DX,
diff --git a/src/VrmlConverter/VrmlConverter_Projector.hxx b/src/VrmlConverter/VrmlConverter_Projector.hxx
index 03ee459baa..01ea264f12 100644
--- a/src/VrmlConverter/VrmlConverter_Projector.hxx
+++ b/src/VrmlConverter/VrmlConverter_Projector.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_Projector,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_Projector,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlConverter/VrmlConverter_ShadingAspect.cxx b/src/VrmlConverter/VrmlConverter_ShadingAspect.cxx
index dde3ef3a37..f092498716 100644
--- a/src/VrmlConverter/VrmlConverter_ShadingAspect.cxx
+++ b/src/VrmlConverter/VrmlConverter_ShadingAspect.cxx
@@ -17,6 +17,8 @@
 #include <Vrml_ShapeHints.hxx>
 #include <VrmlConverter_ShadingAspect.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_ShadingAspect,MMgt_TShared)
+
 VrmlConverter_ShadingAspect::VrmlConverter_ShadingAspect()
 {
  Handle(Vrml_Material) m = new Vrml_Material;
diff --git a/src/VrmlConverter/VrmlConverter_ShadingAspect.hxx b/src/VrmlConverter/VrmlConverter_ShadingAspect.hxx
index 604a7ce45f..2d4b837283 100644
--- a/src/VrmlConverter/VrmlConverter_ShadingAspect.hxx
+++ b/src/VrmlConverter/VrmlConverter_ShadingAspect.hxx
@@ -72,7 +72,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(VrmlConverter_ShadingAspect,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(VrmlConverter_ShadingAspect,MMgt_TShared)
 
 protected:
 
diff --git a/src/VrmlData/VrmlData_Appearance.hxx b/src/VrmlData/VrmlData_Appearance.hxx
index d6c23b6215..554c8fa1f5 100644
--- a/src/VrmlData/VrmlData_Appearance.hxx
+++ b/src/VrmlData/VrmlData_Appearance.hxx
@@ -116,7 +116,7 @@ class VrmlData_Appearance : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Appearance, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Appearance,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_ArrayVec3d.hxx b/src/VrmlData/VrmlData_ArrayVec3d.hxx
index 51740e4863..f00308a336 100644
--- a/src/VrmlData/VrmlData_ArrayVec3d.hxx
+++ b/src/VrmlData/VrmlData_ArrayVec3d.hxx
@@ -120,7 +120,7 @@ class VrmlData_ArrayVec3d : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ArrayVec3d, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_ArrayVec3d,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Box.hxx b/src/VrmlData/VrmlData_Box.hxx
index 8493f4f3c4..21f5c9bd77 100644
--- a/src/VrmlData/VrmlData_Box.hxx
+++ b/src/VrmlData/VrmlData_Box.hxx
@@ -93,7 +93,7 @@ class VrmlData_Box : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Box, VrmlData_Geometry)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Box,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Color.hxx b/src/VrmlData/VrmlData_Color.hxx
index 369fbd8bae..4d31eca005 100644
--- a/src/VrmlData/VrmlData_Color.hxx
+++ b/src/VrmlData/VrmlData_Color.hxx
@@ -89,7 +89,7 @@ class VrmlData_Color : public VrmlData_ArrayVec3d
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Color, VrmlData_ArrayVec3d)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Color,VrmlData_ArrayVec3d)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Cone.hxx b/src/VrmlData/VrmlData_Cone.hxx
index d0a9b96dac..2f04b3b5ee 100644
--- a/src/VrmlData/VrmlData_Cone.hxx
+++ b/src/VrmlData/VrmlData_Cone.hxx
@@ -134,7 +134,7 @@ class VrmlData_Cone : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Cone, VrmlData_Geometry)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Cone,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Coordinate.hxx b/src/VrmlData/VrmlData_Coordinate.hxx
index c99d8cb720..565773e097 100644
--- a/src/VrmlData/VrmlData_Coordinate.hxx
+++ b/src/VrmlData/VrmlData_Coordinate.hxx
@@ -76,7 +76,7 @@ class VrmlData_Coordinate : public VrmlData_ArrayVec3d
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Coordinate, VrmlData_ArrayVec3d)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Coordinate,VrmlData_ArrayVec3d)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Cylinder.hxx b/src/VrmlData/VrmlData_Cylinder.hxx
index 7e8dada026..b37e80e920 100644
--- a/src/VrmlData/VrmlData_Cylinder.hxx
+++ b/src/VrmlData/VrmlData_Cylinder.hxx
@@ -138,7 +138,7 @@ class VrmlData_Cylinder : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Cylinder, VrmlData_Geometry)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Cylinder,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Faceted.hxx b/src/VrmlData/VrmlData_Faceted.hxx
index 556d836894..abe8e3f162 100644
--- a/src/VrmlData/VrmlData_Faceted.hxx
+++ b/src/VrmlData/VrmlData_Faceted.hxx
@@ -112,7 +112,7 @@ class VrmlData_Faceted : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Faceted, VrmlData_Geometry)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Faceted,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Geometry.cxx b/src/VrmlData/VrmlData_Geometry.cxx
index 36a7c6c174..5fc4b5c10f 100644
--- a/src/VrmlData/VrmlData_Geometry.cxx
+++ b/src/VrmlData/VrmlData_Geometry.cxx
@@ -33,6 +33,8 @@
 #include <Standard_ErrorHandler.hxx>
 #include <VrmlData_ArrayVec3d.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_Geometry,VrmlData_Node)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_Geometry.hxx b/src/VrmlData/VrmlData_Geometry.hxx
index d42769d865..3dd4ad4665 100644
--- a/src/VrmlData/VrmlData_Geometry.hxx
+++ b/src/VrmlData/VrmlData_Geometry.hxx
@@ -74,7 +74,7 @@ class VrmlData_Geometry : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Geometry, VrmlData_Node)
+DEFINE_STANDARD_RTTIEXT(VrmlData_Geometry,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Group.cxx b/src/VrmlData/VrmlData_Group.cxx
index 1cb2ca1fac..f1d989a661 100644
--- a/src/VrmlData/VrmlData_Group.cxx
+++ b/src/VrmlData/VrmlData_Group.cxx
@@ -23,6 +23,8 @@
 #include <Precision.hxx>
 #include <gp_Ax1.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_Group,VrmlData_Node)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_Group.hxx b/src/VrmlData/VrmlData_Group.hxx
index e987acb441..1068ec758f 100644
--- a/src/VrmlData/VrmlData_Group.hxx
+++ b/src/VrmlData/VrmlData_Group.hxx
@@ -170,7 +170,7 @@ class VrmlData_Group : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Group, VrmlData_Node)
+DEFINE_STANDARD_RTTIEXT(VrmlData_Group,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_ImageTexture.hxx b/src/VrmlData/VrmlData_ImageTexture.hxx
index e85c2e0f41..44be8e50db 100644
--- a/src/VrmlData/VrmlData_ImageTexture.hxx
+++ b/src/VrmlData/VrmlData_ImageTexture.hxx
@@ -81,7 +81,7 @@ class VrmlData_ImageTexture : public VrmlData_Texture
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ImageTexture, VrmlData_Texture)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_ImageTexture,VrmlData_Texture)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.cxx b/src/VrmlData/VrmlData_IndexedFaceSet.cxx
index 04b73d93f5..9d5d8ee9b2 100644
--- a/src/VrmlData/VrmlData_IndexedFaceSet.cxx
+++ b/src/VrmlData/VrmlData_IndexedFaceSet.cxx
@@ -29,6 +29,8 @@
 #include <Poly.hxx>
 #include <TShort_HArray1OfShortReal.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_IndexedFaceSet,VrmlData_Faceted)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_IndexedFaceSet.hxx b/src/VrmlData/VrmlData_IndexedFaceSet.hxx
index 6639d705eb..719e56d39b 100644
--- a/src/VrmlData/VrmlData_IndexedFaceSet.hxx
+++ b/src/VrmlData/VrmlData_IndexedFaceSet.hxx
@@ -333,7 +333,7 @@ class VrmlData_IndexedFaceSet : public VrmlData_Faceted
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_IndexedFaceSet, VrmlData_Faceted)
+DEFINE_STANDARD_RTTIEXT(VrmlData_IndexedFaceSet,VrmlData_Faceted)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_IndexedLineSet.cxx b/src/VrmlData/VrmlData_IndexedLineSet.cxx
index 474f46aab2..45c3397b94 100644
--- a/src/VrmlData/VrmlData_IndexedLineSet.cxx
+++ b/src/VrmlData/VrmlData_IndexedLineSet.cxx
@@ -26,6 +26,8 @@
 #include <VrmlData_Color.hxx>
 #include <VrmlData_Coordinate.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_IndexedLineSet,VrmlData_Geometry)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_IndexedLineSet.hxx b/src/VrmlData/VrmlData_IndexedLineSet.hxx
index 8f95d067fd..334fe8c2b2 100644
--- a/src/VrmlData/VrmlData_IndexedLineSet.hxx
+++ b/src/VrmlData/VrmlData_IndexedLineSet.hxx
@@ -197,7 +197,7 @@ class VrmlData_IndexedLineSet : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_IndexedLineSet, VrmlData_Geometry)
+DEFINE_STANDARD_RTTIEXT(VrmlData_IndexedLineSet,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Material.cxx b/src/VrmlData/VrmlData_Material.cxx
index 474ead27c6..4f7be17608 100644
--- a/src/VrmlData/VrmlData_Material.cxx
+++ b/src/VrmlData/VrmlData_Material.cxx
@@ -19,6 +19,8 @@
 #include <VrmlData_Scene.hxx>
 #include <gp_XYZ.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_Material,VrmlData_Node)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_Material.hxx b/src/VrmlData/VrmlData_Material.hxx
index 51d3a417a5..a2002e860c 100644
--- a/src/VrmlData/VrmlData_Material.hxx
+++ b/src/VrmlData/VrmlData_Material.hxx
@@ -156,7 +156,7 @@ class VrmlData_Material : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Material, VrmlData_Node)
+DEFINE_STANDARD_RTTIEXT(VrmlData_Material,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Node.cxx b/src/VrmlData/VrmlData_Node.cxx
index 115af13559..23ff39d68a 100644
--- a/src/VrmlData/VrmlData_Node.cxx
+++ b/src/VrmlData/VrmlData_Node.cxx
@@ -27,6 +27,8 @@
 #include <VrmlData_TextureTransform.hxx>
 #include <VrmlData_Texture.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_Node,Standard_Transient)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_Node.hxx b/src/VrmlData/VrmlData_Node.hxx
index f869fc4586..aeda75b40e 100644
--- a/src/VrmlData/VrmlData_Node.hxx
+++ b/src/VrmlData/VrmlData_Node.hxx
@@ -195,7 +195,7 @@ class VrmlData_Node : public Standard_Transient
 
  public:
 // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (VrmlData_Node, Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(VrmlData_Node,Standard_Transient)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Normal.hxx b/src/VrmlData/VrmlData_Normal.hxx
index 8f2e3eb4b9..5078f420d3 100644
--- a/src/VrmlData/VrmlData_Normal.hxx
+++ b/src/VrmlData/VrmlData_Normal.hxx
@@ -78,7 +78,7 @@ class VrmlData_Normal : public VrmlData_ArrayVec3d
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Normal, VrmlData_ArrayVec3d)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Normal,VrmlData_ArrayVec3d)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_ShapeNode.hxx b/src/VrmlData/VrmlData_ShapeNode.hxx
index 164d9d8839..89451bc7e7 100644
--- a/src/VrmlData/VrmlData_ShapeNode.hxx
+++ b/src/VrmlData/VrmlData_ShapeNode.hxx
@@ -102,7 +102,7 @@ class VrmlData_ShapeNode : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_ShapeNode, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_ShapeNode,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Sphere.hxx b/src/VrmlData/VrmlData_Sphere.hxx
index 1d23bce17b..fae8083b10 100644
--- a/src/VrmlData/VrmlData_Sphere.hxx
+++ b/src/VrmlData/VrmlData_Sphere.hxx
@@ -87,7 +87,7 @@ class VrmlData_Sphere : public VrmlData_Geometry
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Sphere, VrmlData_Geometry)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Sphere,VrmlData_Geometry)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_Texture.hxx b/src/VrmlData/VrmlData_Texture.hxx
index 75b866c550..4ea0f61f9c 100644
--- a/src/VrmlData/VrmlData_Texture.hxx
+++ b/src/VrmlData/VrmlData_Texture.hxx
@@ -83,7 +83,7 @@ class VrmlData_Texture : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_Texture, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_Texture,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_TextureCoordinate.hxx b/src/VrmlData/VrmlData_TextureCoordinate.hxx
index 0f0af73155..2ba0b576f6 100644
--- a/src/VrmlData/VrmlData_TextureCoordinate.hxx
+++ b/src/VrmlData/VrmlData_TextureCoordinate.hxx
@@ -92,7 +92,7 @@ class VrmlData_TextureCoordinate : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_TextureCoordinate, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_TextureCoordinate,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_TextureTransform.hxx b/src/VrmlData/VrmlData_TextureTransform.hxx
index de225da749..52ec6cbaca 100644
--- a/src/VrmlData/VrmlData_TextureTransform.hxx
+++ b/src/VrmlData/VrmlData_TextureTransform.hxx
@@ -96,7 +96,7 @@ class VrmlData_TextureTransform : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_TextureTransform, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_TextureTransform,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_UnknownNode.hxx b/src/VrmlData/VrmlData_UnknownNode.hxx
index 699feec30a..cdb1516824 100644
--- a/src/VrmlData/VrmlData_UnknownNode.hxx
+++ b/src/VrmlData/VrmlData_UnknownNode.hxx
@@ -69,7 +69,7 @@ class VrmlData_UnknownNode : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_UnknownNode, VrmlData_Node)
+DEFINE_STANDARD_RTTI_INLINE(VrmlData_UnknownNode,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/VrmlData/VrmlData_WorldInfo.cxx b/src/VrmlData/VrmlData_WorldInfo.cxx
index 96fe6193c8..70bc86e0eb 100644
--- a/src/VrmlData/VrmlData_WorldInfo.cxx
+++ b/src/VrmlData/VrmlData_WorldInfo.cxx
@@ -17,6 +17,8 @@
 #include <VrmlData_Scene.hxx>
 #include <VrmlData_InBuffer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(VrmlData_WorldInfo,VrmlData_Node)
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #pragma warning (disable:4996)
diff --git a/src/VrmlData/VrmlData_WorldInfo.hxx b/src/VrmlData/VrmlData_WorldInfo.hxx
index 5f8e2761b2..fb50dceef7 100644
--- a/src/VrmlData/VrmlData_WorldInfo.hxx
+++ b/src/VrmlData/VrmlData_WorldInfo.hxx
@@ -96,7 +96,7 @@ class VrmlData_WorldInfo : public VrmlData_Node
 
  public:
 // Declaration of CASCADE RTTI
-DEFINE_STANDARD_RTTI (VrmlData_WorldInfo, VrmlData_Node)
+DEFINE_STANDARD_RTTIEXT(VrmlData_WorldInfo,VrmlData_Node)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/WNT/WNT_WClass.cxx b/src/WNT/WNT_WClass.cxx
index edc386dcd1..f28c6b2c02 100644
--- a/src/WNT/WNT_WClass.cxx
+++ b/src/WNT/WNT_WClass.cxx
@@ -23,6 +23,8 @@
 #include <WNT_Window.hxx>
 
 #include <string.h>
+IMPLEMENT_STANDARD_RTTIEXT(WNT_WClass,MMgt_TShared)
+
 //=======================================================================
 //function : WNT_WClass
 //purpose  : 
diff --git a/src/WNT/WNT_WClass.hxx b/src/WNT/WNT_WClass.hxx
index cfd48b6876..78658d2357 100644
--- a/src/WNT/WNT_WClass.hxx
+++ b/src/WNT/WNT_WClass.hxx
@@ -80,7 +80,7 @@ public:
 friend class WNT_Window;
 
 
-  DEFINE_STANDARD_RTTI(WNT_WClass,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(WNT_WClass,MMgt_TShared)
 
 protected:
 
diff --git a/src/WNT/WNT_Window.hxx b/src/WNT/WNT_Window.hxx
index 69719a5a77..519263004d 100644
--- a/src/WNT/WNT_Window.hxx
+++ b/src/WNT/WNT_Window.hxx
@@ -118,7 +118,7 @@ public:
   //! Returns nothing on Windows
   virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return NULL; }
 
-  DEFINE_STANDARD_RTTI(WNT_Window,Aspect_Window)
+  DEFINE_STANDARD_RTTIEXT(WNT_Window,Aspect_Window)
 
 protected:
 
diff --git a/src/XCAFApp/XCAFApp_Application.cxx b/src/XCAFApp/XCAFApp_Application.cxx
index b7bd33ad1b..277117df46 100644
--- a/src/XCAFApp/XCAFApp_Application.cxx
+++ b/src/XCAFApp/XCAFApp_Application.cxx
@@ -22,6 +22,8 @@
 #include <XCAFDoc_DocumentTool.hxx>
 #include <XCAFPrs_Driver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFApp_Application,TDocStd_Application)
+
 //=======================================================================
 //function : GetApplication
 //purpose  : 
diff --git a/src/XCAFApp/XCAFApp_Application.hxx b/src/XCAFApp/XCAFApp_Application.hxx
index c6ddfd9158..220f8e7d3b 100644
--- a/src/XCAFApp/XCAFApp_Application.hxx
+++ b/src/XCAFApp/XCAFApp_Application.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFApp_Application,TDocStd_Application)
+  DEFINE_STANDARD_RTTIEXT(XCAFApp_Application,TDocStd_Application)
 
 protected:
 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.cxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.cxx
index c90b10413e..33ba5afcc2 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.cxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.cxx
@@ -14,6 +14,8 @@
 #include <XCAFDimTolObjects_DatumObject.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDimTolObjects_DatumObject,Standard_Transient)
+
 //=======================================================================
 //function : XCAFDimTolObjects_DatumObject
 //purpose  : 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx
index a8cb14bba7..e3b161499a 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_DatumObject.hxx
@@ -92,7 +92,7 @@ public:
   Standard_EXPORT void SetDatumTargetNumber (const Standard_Integer theNumber);
 
 
-  DEFINE_STANDARD_RTTI(XCAFDimTolObjects_DatumObject,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(XCAFDimTolObjects_DatumObject,Standard_Transient)
 
 private: 
 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.cxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.cxx
index 2693fe585f..1ff4f502b9 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.cxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.cxx
@@ -17,6 +17,8 @@
 #include <TColgp_HArray1OfPnt.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDimTolObjects_DimensionObject,Standard_Transient)
+
 //=======================================================================
 //function : XCAFDimTolObjects_DimensionObject
 //purpose  : 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx
index 53cf13b3bc..9cbb866e62 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_DimensionObject.hxx
@@ -117,7 +117,7 @@ public:
   Standard_EXPORT void SetPoints (const Handle(TColgp_HArray1OfPnt)& thePnts);
 
 
-  DEFINE_STANDARD_RTTI(XCAFDimTolObjects_DimensionObject,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(XCAFDimTolObjects_DimensionObject,Standard_Transient)
 
 private: 
 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.cxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.cxx
index dd14dfc9d0..58aae26e2b 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.cxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.cxx
@@ -13,6 +13,8 @@
 
 #include <XCAFDimTolObjects_GeomToleranceObject.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDimTolObjects_GeomToleranceObject,Standard_Transient)
+
 //=======================================================================
 //function : XCAFDimTolObjects_GeomTolerance
 //purpose  : 
diff --git a/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.hxx b/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.hxx
index d53ae52d27..c141b1f992 100644
--- a/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.hxx
+++ b/src/XCAFDimTolObjects/XCAFDimTolObjects_GeomToleranceObject.hxx
@@ -84,7 +84,7 @@ public:
    
   Standard_EXPORT Standard_Boolean HasAxis () const;
 
-  DEFINE_STANDARD_RTTI(XCAFDimTolObjects_GeomToleranceObject,Standard_Transient)
+  DEFINE_STANDARD_RTTIEXT(XCAFDimTolObjects_GeomToleranceObject,Standard_Transient)
 
 private: 
 
diff --git a/src/XCAFDoc/XCAFDoc_Area.cxx b/src/XCAFDoc/XCAFDoc_Area.cxx
index 85c3ff237f..3f87af66ef 100644
--- a/src/XCAFDoc/XCAFDoc_Area.cxx
+++ b/src/XCAFDoc/XCAFDoc_Area.cxx
@@ -21,6 +21,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_Area.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Area,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Area.hxx b/src/XCAFDoc/XCAFDoc_Area.hxx
index cab5929658..f1fcf4269f 100644
--- a/src/XCAFDoc/XCAFDoc_Area.hxx
+++ b/src/XCAFDoc/XCAFDoc_Area.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Area,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Area,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Centroid.cxx b/src/XCAFDoc/XCAFDoc_Centroid.cxx
index a213b82d1b..f1920406ed 100644
--- a/src/XCAFDoc/XCAFDoc_Centroid.cxx
+++ b/src/XCAFDoc/XCAFDoc_Centroid.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_Centroid.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Centroid,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Centroid.hxx b/src/XCAFDoc/XCAFDoc_Centroid.hxx
index c14e4e2c52..bad28e8e81 100644
--- a/src/XCAFDoc/XCAFDoc_Centroid.hxx
+++ b/src/XCAFDoc/XCAFDoc_Centroid.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Centroid,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Centroid,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Color.cxx b/src/XCAFDoc/XCAFDoc_Color.cxx
index 07e30ec725..d9c5511f58 100644
--- a/src/XCAFDoc/XCAFDoc_Color.cxx
+++ b/src/XCAFDoc/XCAFDoc_Color.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_Color.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Color,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Color.hxx b/src/XCAFDoc/XCAFDoc_Color.hxx
index 8b38e22c4f..110cc34a86 100644
--- a/src/XCAFDoc/XCAFDoc_Color.hxx
+++ b/src/XCAFDoc/XCAFDoc_Color.hxx
@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Color,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Color,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cxx b/src/XCAFDoc/XCAFDoc_ColorTool.cxx
index 5a29c5c124..0354e1c75a 100644
--- a/src/XCAFDoc/XCAFDoc_ColorTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_ColorTool.cxx
@@ -31,6 +31,8 @@
 #include <XCAFDoc_GraphNode.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ColorTool,TDF_Attribute)
+
 #define AUTONAMING // automatically set names for labels
 
 //=======================================================================
diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.hxx b/src/XCAFDoc/XCAFDoc_ColorTool.hxx
index bc33a1762e..87a226fa2b 100644
--- a/src/XCAFDoc/XCAFDoc_ColorTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_ColorTool.hxx
@@ -187,7 +187,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_ColorTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_ColorTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Datum.cxx b/src/XCAFDoc/XCAFDoc_Datum.cxx
index be63f239a0..774e284d05 100644
--- a/src/XCAFDoc/XCAFDoc_Datum.cxx
+++ b/src/XCAFDoc/XCAFDoc_Datum.cxx
@@ -31,6 +31,8 @@
 
 #include <XCAFDimTolObjects_DatumObject.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Datum,TDF_Attribute)
+
 enum ChildLab
 {
   ChildLab_Name = 1,
diff --git a/src/XCAFDoc/XCAFDoc_Datum.hxx b/src/XCAFDoc/XCAFDoc_Datum.hxx
index aada190886..7356e0160c 100644
--- a/src/XCAFDoc/XCAFDoc_Datum.hxx
+++ b/src/XCAFDoc/XCAFDoc_Datum.hxx
@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Datum,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Datum,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_DimTol.cxx b/src/XCAFDoc/XCAFDoc_DimTol.cxx
index 3dfde719b7..4fb3b21da1 100644
--- a/src/XCAFDoc/XCAFDoc_DimTol.cxx
+++ b/src/XCAFDoc/XCAFDoc_DimTol.cxx
@@ -20,6 +20,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_DimTol.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_DimTol,TDF_Attribute)
+
 //=======================================================================
 //function : XCAFDoc_DimTol
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_DimTol.hxx b/src/XCAFDoc/XCAFDoc_DimTol.hxx
index 0be84dd616..b218a1e80b 100644
--- a/src/XCAFDoc/XCAFDoc_DimTol.hxx
+++ b/src/XCAFDoc/XCAFDoc_DimTol.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_DimTol,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_DimTol,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_DimTolTool.cxx b/src/XCAFDoc/XCAFDoc_DimTolTool.cxx
index c488fdd3e8..8267f03d76 100644
--- a/src/XCAFDoc/XCAFDoc_DimTolTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_DimTolTool.cxx
@@ -34,6 +34,8 @@
 #include <XCAFDoc_GraphNode.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_DimTolTool,TDF_Attribute)
+
 //=======================================================================
 //function : XCAFDoc_DimTolTool
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_DimTolTool.hxx b/src/XCAFDoc/XCAFDoc_DimTolTool.hxx
index 986776f5b9..9e79142445 100644
--- a/src/XCAFDoc/XCAFDoc_DimTolTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_DimTolTool.hxx
@@ -197,7 +197,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_DimTolTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_DimTolTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Dimension.cxx b/src/XCAFDoc/XCAFDoc_Dimension.cxx
index d9a7222822..162e14286d 100644
--- a/src/XCAFDoc/XCAFDoc_Dimension.cxx
+++ b/src/XCAFDoc/XCAFDoc_Dimension.cxx
@@ -29,6 +29,8 @@
 #include <TopoDS.hxx>
 #include <XCAFDimTolObjects_DimensionObject.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Dimension,TDF_Attribute)
+
 enum ChildLab
 {
   ChildLab_Type = 1,
diff --git a/src/XCAFDoc/XCAFDoc_Dimension.hxx b/src/XCAFDoc/XCAFDoc_Dimension.hxx
index dbcbd9aa74..d2308947f0 100644
--- a/src/XCAFDoc/XCAFDoc_Dimension.hxx
+++ b/src/XCAFDoc/XCAFDoc_Dimension.hxx
@@ -54,7 +54,7 @@ public:
   
   Standard_EXPORT Handle(XCAFDimTolObjects_DimensionObject) GetObject() const;
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Dimension,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Dimension,TDF_Attribute)
 
 };
 
diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx
index 67c415e5e0..e1ceaa23af 100644
--- a/src/XCAFDoc/XCAFDoc_DocumentTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_DocumentTool.cxx
@@ -31,6 +31,8 @@
 #include <XCAFDoc_MaterialTool.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_DocumentTool,TDF_Attribute)
+
 //=======================================================================
 //function : GetID
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.hxx b/src/XCAFDoc/XCAFDoc_DocumentTool.hxx
index 310af6e0ec..38d4102104 100644
--- a/src/XCAFDoc/XCAFDoc_DocumentTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_DocumentTool.hxx
@@ -115,7 +115,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_DocumentTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_DocumentTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_GeomTolerance.cxx b/src/XCAFDoc/XCAFDoc_GeomTolerance.cxx
index 502ba3591a..99cddcc97d 100644
--- a/src/XCAFDoc/XCAFDoc_GeomTolerance.cxx
+++ b/src/XCAFDoc/XCAFDoc_GeomTolerance.cxx
@@ -23,6 +23,8 @@
 #include <TDataStd_Real.hxx>
 #include <XCAFDimTolObjects_GeomToleranceObject.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_GeomTolerance,TDF_Attribute)
+
 enum ChildLab
 {
   ChildLab_Type = 1,
diff --git a/src/XCAFDoc/XCAFDoc_GeomTolerance.hxx b/src/XCAFDoc/XCAFDoc_GeomTolerance.hxx
index 29a1cda895..819d87399d 100644
--- a/src/XCAFDoc/XCAFDoc_GeomTolerance.hxx
+++ b/src/XCAFDoc/XCAFDoc_GeomTolerance.hxx
@@ -57,7 +57,7 @@ public:
   
   Standard_EXPORT void Paste (const Handle(TDF_Attribute)& Into, const Handle(TDF_RelocationTable)& RT) const Standard_OVERRIDE;
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_GeomTolerance,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_GeomTolerance,TDF_Attribute)
 
 };
 
diff --git a/src/XCAFDoc/XCAFDoc_GraphNode.cxx b/src/XCAFDoc/XCAFDoc_GraphNode.cxx
index bb9a1ce9ea..9385cbb0a3 100644
--- a/src/XCAFDoc/XCAFDoc_GraphNode.cxx
+++ b/src/XCAFDoc/XCAFDoc_GraphNode.cxx
@@ -22,6 +22,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_GraphNode.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_GraphNode,TDF_Attribute)
+
 //     class  methods working on the node:
 //     ===================================
 //=======================================================================
diff --git a/src/XCAFDoc/XCAFDoc_GraphNode.hxx b/src/XCAFDoc/XCAFDoc_GraphNode.hxx
index 36bfeb7a25..96380774b9 100644
--- a/src/XCAFDoc/XCAFDoc_GraphNode.hxx
+++ b/src/XCAFDoc/XCAFDoc_GraphNode.hxx
@@ -144,7 +144,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_GraphNode,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_GraphNode,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.cxx b/src/XCAFDoc/XCAFDoc_LayerTool.cxx
index a7e713046f..0ac9db14c4 100644
--- a/src/XCAFDoc/XCAFDoc_LayerTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_LayerTool.cxx
@@ -31,6 +31,8 @@
 #include <XCAFDoc_LayerTool.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_LayerTool,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.hxx b/src/XCAFDoc/XCAFDoc_LayerTool.hxx
index 27ca280a74..59cd30a604 100644
--- a/src/XCAFDoc/XCAFDoc_LayerTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_LayerTool.hxx
@@ -194,7 +194,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_LayerTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_LayerTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Location.cxx b/src/XCAFDoc/XCAFDoc_Location.cxx
index 75aa24b7a9..61021e118a 100644
--- a/src/XCAFDoc/XCAFDoc_Location.cxx
+++ b/src/XCAFDoc/XCAFDoc_Location.cxx
@@ -22,6 +22,8 @@
 #include <TopLoc_Location.hxx>
 #include <XCAFDoc_Location.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Location,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Location.hxx b/src/XCAFDoc/XCAFDoc_Location.hxx
index e57edf8e5a..a2dfc61a04 100644
--- a/src/XCAFDoc/XCAFDoc_Location.hxx
+++ b/src/XCAFDoc/XCAFDoc_Location.hxx
@@ -66,7 +66,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Location,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Location,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Material.cxx b/src/XCAFDoc/XCAFDoc_Material.cxx
index 6973b4cb3b..7b6090a8b9 100644
--- a/src/XCAFDoc/XCAFDoc_Material.cxx
+++ b/src/XCAFDoc/XCAFDoc_Material.cxx
@@ -20,6 +20,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_Material.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Material,TDF_Attribute)
+
 //=======================================================================
 //function : XCAFDoc_Material
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Material.hxx b/src/XCAFDoc/XCAFDoc_Material.hxx
index ddd0021d69..9a07f705c9 100644
--- a/src/XCAFDoc/XCAFDoc_Material.hxx
+++ b/src/XCAFDoc/XCAFDoc_Material.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Material,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Material,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_MaterialTool.cxx b/src/XCAFDoc/XCAFDoc_MaterialTool.cxx
index 2c7eb70db5..a62e8a12bf 100644
--- a/src/XCAFDoc/XCAFDoc_MaterialTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_MaterialTool.cxx
@@ -27,6 +27,8 @@
 #include <XCAFDoc_MaterialTool.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_MaterialTool,TDF_Attribute)
+
 //=======================================================================
 //function : XCAFDoc_MaterialTool
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_MaterialTool.hxx b/src/XCAFDoc/XCAFDoc_MaterialTool.hxx
index 4c8a06d824..4826d8195f 100644
--- a/src/XCAFDoc/XCAFDoc_MaterialTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_MaterialTool.hxx
@@ -95,7 +95,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_MaterialTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_MaterialTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx
index 480a8831f5..938a66f94e 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cxx
@@ -21,6 +21,8 @@
 #include <TopoDS_Shape.hxx>
 #include <XCAFDoc_ShapeMapTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ShapeMapTool,TDF_Attribute)
+
 #define AUTONAMING // automatically set names for labels
 
 // attribute methods //////////////////////////////////////////////////
diff --git a/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx b/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx
index 46c4dedeac..93cdcb3237 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_ShapeMapTool.hxx
@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_ShapeMapTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_ShapeMapTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
index 0ce4c13fe7..3a1d416bef 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
@@ -51,6 +51,8 @@
 #include <XCAFDoc_ShapeMapTool.hxx>
 #include <XCAFDoc_ShapeTool.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_ShapeTool,TDF_Attribute)
+
 static Standard_Boolean theAutoNaming = Standard_True;
 
 // attribute methods //////////////////////////////////////////////////
diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.hxx b/src/XCAFDoc/XCAFDoc_ShapeTool.hxx
index 91b59a0c18..2df9b87c94 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeTool.hxx
+++ b/src/XCAFDoc/XCAFDoc_ShapeTool.hxx
@@ -418,7 +418,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_ShapeTool,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_ShapeTool,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFDoc/XCAFDoc_Volume.cxx b/src/XCAFDoc/XCAFDoc_Volume.cxx
index 997e2e1101..c53f8cb5a1 100644
--- a/src/XCAFDoc/XCAFDoc_Volume.cxx
+++ b/src/XCAFDoc/XCAFDoc_Volume.cxx
@@ -21,6 +21,8 @@
 #include <TDF_RelocationTable.hxx>
 #include <XCAFDoc_Volume.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFDoc_Volume,TDF_Attribute)
+
 //=======================================================================
 //function : Constructor
 //purpose  : 
diff --git a/src/XCAFDoc/XCAFDoc_Volume.hxx b/src/XCAFDoc/XCAFDoc_Volume.hxx
index 8ca24dc8ed..751fed588e 100644
--- a/src/XCAFDoc/XCAFDoc_Volume.hxx
+++ b/src/XCAFDoc/XCAFDoc_Volume.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFDoc_Volume,TDF_Attribute)
+  DEFINE_STANDARD_RTTIEXT(XCAFDoc_Volume,TDF_Attribute)
 
 protected:
 
diff --git a/src/XCAFPrs/XCAFPrs_AISObject.cxx b/src/XCAFPrs/XCAFPrs_AISObject.cxx
index 77d56321aa..a1d45f5f95 100644
--- a/src/XCAFPrs/XCAFPrs_AISObject.cxx
+++ b/src/XCAFPrs/XCAFPrs_AISObject.cxx
@@ -38,6 +38,8 @@
 #include <XCAFPrs_Style.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFPrs_AISObject,AIS_ColoredShape)
+
 //=======================================================================
 //function : XCAFPrs_AISObject
 //purpose  : 
diff --git a/src/XCAFPrs/XCAFPrs_AISObject.hxx b/src/XCAFPrs/XCAFPrs_AISObject.hxx
index 8f91fc4dfb..f4dcb42ac1 100644
--- a/src/XCAFPrs/XCAFPrs_AISObject.hxx
+++ b/src/XCAFPrs/XCAFPrs_AISObject.hxx
@@ -54,7 +54,7 @@ private:
 
 public:
 
-  DEFINE_STANDARD_RTTI(XCAFPrs_AISObject, AIS_ColoredShape)
+  DEFINE_STANDARD_RTTIEXT(XCAFPrs_AISObject,AIS_ColoredShape)
 
 };
 
diff --git a/src/XCAFPrs/XCAFPrs_Driver.cxx b/src/XCAFPrs/XCAFPrs_Driver.cxx
index 281dbf627f..99caac2b48 100644
--- a/src/XCAFPrs/XCAFPrs_Driver.cxx
+++ b/src/XCAFPrs/XCAFPrs_Driver.cxx
@@ -23,6 +23,8 @@
 #include <XCAFPrs_AISObject.hxx>
 #include <XCAFPrs_Driver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XCAFPrs_Driver,TPrsStd_Driver)
+
 //=======================================================================
 //function : Update
 //purpose  : 
diff --git a/src/XCAFPrs/XCAFPrs_Driver.hxx b/src/XCAFPrs/XCAFPrs_Driver.hxx
index cea89264a3..91a9ceb973 100644
--- a/src/XCAFPrs/XCAFPrs_Driver.hxx
+++ b/src/XCAFPrs/XCAFPrs_Driver.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XCAFPrs_Driver,TPrsStd_Driver)
+  DEFINE_STANDARD_RTTIEXT(XCAFPrs_Driver,TPrsStd_Driver)
 
 protected:
 
diff --git a/src/XSAlgo/XSAlgo_AlgoContainer.cxx b/src/XSAlgo/XSAlgo_AlgoContainer.cxx
index 374137c145..edd5a75ca5 100644
--- a/src/XSAlgo/XSAlgo_AlgoContainer.cxx
+++ b/src/XSAlgo/XSAlgo_AlgoContainer.cxx
@@ -65,6 +65,8 @@
 #include <XSAlgo_ToolContainer.hxx>
 #include <TopExp_Explorer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSAlgo_AlgoContainer,MMgt_TShared)
+
 //=======================================================================
 //function : XSAlgo_AlgoContainer
 //purpose  : 
diff --git a/src/XSAlgo/XSAlgo_AlgoContainer.hxx b/src/XSAlgo/XSAlgo_AlgoContainer.hxx
index 5b3bfe63fa..4ff946cce0 100644
--- a/src/XSAlgo/XSAlgo_AlgoContainer.hxx
+++ b/src/XSAlgo/XSAlgo_AlgoContainer.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSAlgo_AlgoContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSAlgo_AlgoContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSAlgo/XSAlgo_ToolContainer.cxx b/src/XSAlgo/XSAlgo_ToolContainer.cxx
index e9968fdad3..4885c5e698 100644
--- a/src/XSAlgo/XSAlgo_ToolContainer.cxx
+++ b/src/XSAlgo/XSAlgo_ToolContainer.cxx
@@ -17,6 +17,8 @@
 #include <Standard_Type.hxx>
 #include <XSAlgo_ToolContainer.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSAlgo_ToolContainer,MMgt_TShared)
+
 //=======================================================================
 //function : XSAlgo_ToolContainer
 //purpose  : 
diff --git a/src/XSAlgo/XSAlgo_ToolContainer.hxx b/src/XSAlgo/XSAlgo_ToolContainer.hxx
index 4c9e1ccbbe..c3b2ae8411 100644
--- a/src/XSAlgo/XSAlgo_ToolContainer.hxx
+++ b/src/XSAlgo/XSAlgo_ToolContainer.hxx
@@ -38,7 +38,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSAlgo_ToolContainer,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSAlgo_ToolContainer,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSControl/XSControl_ConnectedShapes.cxx b/src/XSControl/XSControl_ConnectedShapes.cxx
index 814e41c965..1abd723766 100644
--- a/src/XSControl/XSControl_ConnectedShapes.cxx
+++ b/src/XSControl/XSControl_ConnectedShapes.cxx
@@ -25,6 +25,8 @@
 #include <XSControl_ConnectedShapes.hxx>
 #include <XSControl_TransferReader.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_ConnectedShapes,IFSelect_SelectExplore)
+
 XSControl_ConnectedShapes::XSControl_ConnectedShapes ()
     : IFSelect_SelectExplore (1)    {  }
 
diff --git a/src/XSControl/XSControl_ConnectedShapes.hxx b/src/XSControl/XSControl_ConnectedShapes.hxx
index ccb9a78fd8..6b41ebed4c 100644
--- a/src/XSControl/XSControl_ConnectedShapes.hxx
+++ b/src/XSControl/XSControl_ConnectedShapes.hxx
@@ -73,7 +73,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_ConnectedShapes,IFSelect_SelectExplore)
+  DEFINE_STANDARD_RTTIEXT(XSControl_ConnectedShapes,IFSelect_SelectExplore)
 
 protected:
 
diff --git a/src/XSControl/XSControl_Controller.cxx b/src/XSControl/XSControl_Controller.cxx
index 2f6561a781..3df9402d3f 100644
--- a/src/XSControl/XSControl_Controller.cxx
+++ b/src/XSControl/XSControl_Controller.cxx
@@ -67,6 +67,8 @@
 #include <XSControl_TransferReader.hxx>
 #include <XSControl_WorkSession.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_Controller,MMgt_TShared)
+
 //  ParamEditor
 //  Transferts
 static Handle(Dico_DictionaryOfTransient)& listadapt()
diff --git a/src/XSControl/XSControl_Controller.hxx b/src/XSControl/XSControl_Controller.hxx
index 5eba7dd35b..ba6a7aaffe 100644
--- a/src/XSControl/XSControl_Controller.hxx
+++ b/src/XSControl/XSControl_Controller.hxx
@@ -295,7 +295,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_Controller,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSControl_Controller,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSControl/XSControl_SelectForTransfer.cxx b/src/XSControl/XSControl_SelectForTransfer.cxx
index cdf6feaabe..c1cfcba78d 100644
--- a/src/XSControl/XSControl_SelectForTransfer.cxx
+++ b/src/XSControl/XSControl_SelectForTransfer.cxx
@@ -20,6 +20,8 @@
 #include <XSControl_SelectForTransfer.hxx>
 #include <XSControl_TransferReader.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_SelectForTransfer,IFSelect_SelectExtract)
+
 XSControl_SelectForTransfer::XSControl_SelectForTransfer ()    {  }
 
     XSControl_SelectForTransfer::XSControl_SelectForTransfer
diff --git a/src/XSControl/XSControl_SelectForTransfer.hxx b/src/XSControl/XSControl_SelectForTransfer.hxx
index 7a31462112..a4bea1ab71 100644
--- a/src/XSControl/XSControl_SelectForTransfer.hxx
+++ b/src/XSControl/XSControl_SelectForTransfer.hxx
@@ -87,7 +87,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_SelectForTransfer,IFSelect_SelectExtract)
+  DEFINE_STANDARD_RTTIEXT(XSControl_SelectForTransfer,IFSelect_SelectExtract)
 
 protected:
 
diff --git a/src/XSControl/XSControl_SignTransferStatus.cxx b/src/XSControl/XSControl_SignTransferStatus.cxx
index 47a4467cea..a49830ce5c 100644
--- a/src/XSControl/XSControl_SignTransferStatus.cxx
+++ b/src/XSControl/XSControl_SignTransferStatus.cxx
@@ -22,6 +22,8 @@
 #include <XSControl_SignTransferStatus.hxx>
 #include <XSControl_TransferReader.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_SignTransferStatus,IFSelect_Signature)
+
 //#include <stdio.h>
 static TCollection_AsciiString& themes()
 {
diff --git a/src/XSControl/XSControl_SignTransferStatus.hxx b/src/XSControl/XSControl_SignTransferStatus.hxx
index 4ba978b27c..fbf3c21825 100644
--- a/src/XSControl/XSControl_SignTransferStatus.hxx
+++ b/src/XSControl/XSControl_SignTransferStatus.hxx
@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_SignTransferStatus,IFSelect_Signature)
+  DEFINE_STANDARD_RTTIEXT(XSControl_SignTransferStatus,IFSelect_Signature)
 
 protected:
 
diff --git a/src/XSControl/XSControl_TransferReader.cxx b/src/XSControl/XSControl_TransferReader.cxx
index 4ce44b04f1..b612cb6d92 100644
--- a/src/XSControl/XSControl_TransferReader.cxx
+++ b/src/XSControl/XSControl_TransferReader.cxx
@@ -55,6 +55,8 @@
 #include <XSControl_Utils.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_TransferReader,MMgt_TShared)
+
 //  Precision :
 //  Pour les regularites
 //=======================================================================
diff --git a/src/XSControl/XSControl_TransferReader.hxx b/src/XSControl/XSControl_TransferReader.hxx
index 8123603a6c..23a4f2b7f2 100644
--- a/src/XSControl/XSControl_TransferReader.hxx
+++ b/src/XSControl/XSControl_TransferReader.hxx
@@ -343,7 +343,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_TransferReader,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSControl_TransferReader,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSControl/XSControl_TransferWriter.cxx b/src/XSControl/XSControl_TransferWriter.cxx
index 2a7d97e507..7ab1bba2d9 100644
--- a/src/XSControl/XSControl_TransferWriter.cxx
+++ b/src/XSControl/XSControl_TransferWriter.cxx
@@ -30,6 +30,8 @@
 #include <XSControl_TransferWriter.hxx>
 #include <XSControl_Utils.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_TransferWriter,MMgt_TShared)
+
 XSControl_TransferWriter::XSControl_TransferWriter ()
 {  theTransferWrite = new Transfer_FinderProcess;  theTransferMode = 0;  }
 
diff --git a/src/XSControl/XSControl_TransferWriter.hxx b/src/XSControl/XSControl_TransferWriter.hxx
index 14268625a1..bf6002d644 100644
--- a/src/XSControl/XSControl_TransferWriter.hxx
+++ b/src/XSControl/XSControl_TransferWriter.hxx
@@ -120,7 +120,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_TransferWriter,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSControl_TransferWriter,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSControl/XSControl_Vars.cxx b/src/XSControl/XSControl_Vars.cxx
index 685a1894fa..10a2b6ba4c 100644
--- a/src/XSControl/XSControl_Vars.cxx
+++ b/src/XSControl/XSControl_Vars.cxx
@@ -28,6 +28,8 @@
 #include <TopoDS_Shape.hxx>
 #include <XSControl_Vars.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_Vars,MMgt_TShared)
+
 XSControl_Vars::XSControl_Vars  ()
     {  thevars = new Dico_DictionaryOfTransient;  }
 
diff --git a/src/XSControl/XSControl_Vars.hxx b/src/XSControl/XSControl_Vars.hxx
index c335babec3..2568f5123c 100644
--- a/src/XSControl/XSControl_Vars.hxx
+++ b/src/XSControl/XSControl_Vars.hxx
@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_Vars,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XSControl_Vars,MMgt_TShared)
 
 protected:
 
diff --git a/src/XSControl/XSControl_WorkSession.cxx b/src/XSControl/XSControl_WorkSession.cxx
index 7d620f1a92..86d95adbe4 100644
--- a/src/XSControl/XSControl_WorkSession.cxx
+++ b/src/XSControl/XSControl_WorkSession.cxx
@@ -45,6 +45,8 @@
 #include <XSControl_Vars.hxx>
 #include <XSControl_WorkSession.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSControl_WorkSession,IFSelect_WorkSession)
+
 // tpent
 //=======================================================================
 //function : XSControl_WorkSession
diff --git a/src/XSControl/XSControl_WorkSession.hxx b/src/XSControl/XSControl_WorkSession.hxx
index 0e04aecd43..819536a891 100644
--- a/src/XSControl/XSControl_WorkSession.hxx
+++ b/src/XSControl/XSControl_WorkSession.hxx
@@ -214,7 +214,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSControl_WorkSession,IFSelect_WorkSession)
+  DEFINE_STANDARD_RTTIEXT(XSControl_WorkSession,IFSelect_WorkSession)
 
 protected:
 
diff --git a/src/XSDRAW/XSDRAW_Vars.cxx b/src/XSDRAW/XSDRAW_Vars.cxx
index 7169f025d9..ebe95e22ac 100644
--- a/src/XSDRAW/XSDRAW_Vars.cxx
+++ b/src/XSDRAW/XSDRAW_Vars.cxx
@@ -26,6 +26,8 @@
 #include <TopoDS_Shape.hxx>
 #include <XSDRAW_Vars.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSDRAW_Vars,XSControl_Vars)
+
 XSDRAW_Vars::XSDRAW_Vars  ()    {  }
 
 void  XSDRAW_Vars::Set
diff --git a/src/XSDRAW/XSDRAW_Vars.hxx b/src/XSDRAW/XSDRAW_Vars.hxx
index dcb7e6dbcb..c1a694745e 100644
--- a/src/XSDRAW/XSDRAW_Vars.hxx
+++ b/src/XSDRAW/XSDRAW_Vars.hxx
@@ -70,7 +70,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSDRAW_Vars,XSControl_Vars)
+  DEFINE_STANDARD_RTTIEXT(XSDRAW_Vars,XSControl_Vars)
 
 protected:
 
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cxx
index 7b492fd314..de5d7a1673 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cxx
@@ -23,6 +23,8 @@
 #include <TColStd_DataMapOfIntegerReal.hxx>
 #include <XSDRAWSTLVRML_DataSource.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSDRAWSTLVRML_DataSource,MeshVS_DataSource)
+
 //================================================================
 // Function : Constructor
 // Purpose  :
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
index f2448c16ed..22a1838faa 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSDRAWSTLVRML_DataSource,MeshVS_DataSource)
+  DEFINE_STANDARD_RTTIEXT(XSDRAWSTLVRML_DataSource,MeshVS_DataSource)
 
 protected:
 
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.cxx
index 1d3d08e70f..5dce587406 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.cxx
@@ -22,6 +22,8 @@
 #include <TColStd_DataMapOfIntegerReal.hxx>
 #include <XSDRAWSTLVRML_DataSource3D.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSDRAWSTLVRML_DataSource3D,MeshVS_DataSource)
+
 //================================================================
 // Function : Constructor
 // Purpose  :
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.hxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.hxx
index b0e700ec6f..dab63e2e8b 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.hxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource3D.hxx
@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSDRAWSTLVRML_DataSource3D,MeshVS_DataSource)
+  DEFINE_STANDARD_RTTIEXT(XSDRAWSTLVRML_DataSource3D,MeshVS_DataSource)
 
 protected:
 
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cxx
index 1f5770dca2..ef2dd5baa1 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cxx
@@ -19,6 +19,8 @@
 #include <Standard_Type.hxx>
 #include <XSDRAWSTLVRML_DrawableMesh.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XSDRAWSTLVRML_DrawableMesh,Draw_Drawable3D)
+
 //================================================================
 // Function : DrawOn
 // Purpose  :
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.hxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.hxx
index 6114d7b048..d4fd63bf29 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.hxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.hxx
@@ -43,7 +43,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSDRAWSTLVRML_DrawableMesh,Draw_Drawable3D)
+  DEFINE_STANDARD_RTTIEXT(XSDRAWSTLVRML_DrawableMesh,Draw_Drawable3D)
 
 protected:
 
diff --git a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cxx b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cxx
index 7f274bf452..360c4b9c9b 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cxx
+++ b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cxx
@@ -26,6 +26,8 @@
 #include <XmlMNaming_NamedShapeDriver.hxx>
 #include <XmlObjMgt_Element.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlDrivers_DocumentRetrievalDriver,XmlLDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : XmlDrivers_DocumentRetrievalDriver
 //purpose  : Constructor
diff --git a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.hxx b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.hxx
index db759b4066..ddedf01392 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.hxx
@@ -50,7 +50,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlDrivers_DocumentRetrievalDriver,XmlLDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlDrivers_DocumentRetrievalDriver,XmlLDrivers_DocumentRetrievalDriver)
 
 protected:
 
diff --git a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cxx b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cxx
index 1282f65211..eeedbdaff8 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cxx
+++ b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlMNaming_NamedShapeDriver.hxx>
 #include <XmlObjMgt_Element.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlDrivers_DocumentStorageDriver,XmlLDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : XmlDrivers_DocumentStorageDriver
 //purpose  : Constructor
diff --git a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.hxx b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.hxx
index 04403785b4..f0ab0e0341 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.hxx
@@ -46,7 +46,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlDrivers_DocumentStorageDriver,XmlLDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlDrivers_DocumentStorageDriver,XmlLDrivers_DocumentStorageDriver)
 
 protected:
 
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
index a62f7cc02f..ed87128b4f 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx
@@ -40,6 +40,8 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_RRelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
+
 #ifdef _MSC_VER
 # include <tchar.h>
 #endif  // _MSC_VER
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx
index bd488e76a5..08a4a53f99 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx
@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlLDrivers_DocumentRetrievalDriver,PCDM_RetrievalDriver)
 
 protected:
 
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
index c34bad172b..454faace56 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
@@ -44,6 +44,8 @@
 #include <XmlObjMgt_SRelocationTable.hxx>
 
 #include <locale.h>
+IMPLEMENT_STANDARD_RTTIEXT(XmlLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
+
 #define STORAGE_VERSION      "STORAGE_VERSION: "
 #define REFERENCE_COUNTER    "REFERENCE_COUNTER: "
 #define MODIFICATION_COUNTER "MODIFICATION_COUNTER: "
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx
index 78c71b61d9..2b08c90901 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.hxx
@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlLDrivers_DocumentStorageDriver,PCDM_StorageDriver)
 
 protected:
 
diff --git a/src/XmlMDF/XmlMDF_ADriver.cxx b/src/XmlMDF/XmlMDF_ADriver.cxx
index 5b4b623fcc..1d6361770b 100644
--- a/src/XmlMDF/XmlMDF_ADriver.cxx
+++ b/src/XmlMDF/XmlMDF_ADriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlMDF_ADriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_ADriver,MMgt_TShared)
+
 //=======================================================================
 //function : XmlMDF_ADriver
 //purpose  : Constructor
diff --git a/src/XmlMDF/XmlMDF_ADriver.hxx b/src/XmlMDF/XmlMDF_ADriver.hxx
index b5e1c627ce..81d3838ccf 100644
--- a/src/XmlMDF/XmlMDF_ADriver.hxx
+++ b/src/XmlMDF/XmlMDF_ADriver.hxx
@@ -74,7 +74,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDF_ADriver,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XmlMDF_ADriver,MMgt_TShared)
 
 protected:
 
diff --git a/src/XmlMDF/XmlMDF_ADriverTable.cxx b/src/XmlMDF/XmlMDF_ADriverTable.cxx
index f890f0fa5d..2035b73911 100644
--- a/src/XmlMDF/XmlMDF_ADriverTable.cxx
+++ b/src/XmlMDF/XmlMDF_ADriverTable.cxx
@@ -18,6 +18,8 @@
 #include <XmlMDF_ADriver.hxx>
 #include <XmlMDF_ADriverTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_ADriverTable,MMgt_TShared)
+
 //=======================================================================
 //function : MDF_ADriverTable
 //purpose  : 
diff --git a/src/XmlMDF/XmlMDF_ADriverTable.hxx b/src/XmlMDF/XmlMDF_ADriverTable.hxx
index 589b913424..6e311ad13d 100644
--- a/src/XmlMDF/XmlMDF_ADriverTable.hxx
+++ b/src/XmlMDF/XmlMDF_ADriverTable.hxx
@@ -57,7 +57,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDF_ADriverTable,MMgt_TShared)
+  DEFINE_STANDARD_RTTIEXT(XmlMDF_ADriverTable,MMgt_TShared)
 
 protected:
 
diff --git a/src/XmlMDF/XmlMDF_ReferenceDriver.cxx b/src/XmlMDF/XmlMDF_ReferenceDriver.cxx
index 32b1e695f5..213c41d48a 100644
--- a/src/XmlMDF/XmlMDF_ReferenceDriver.cxx
+++ b/src/XmlMDF/XmlMDF_ReferenceDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_ReferenceDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDF_ReferenceDriver
 //purpose  : Constructor
diff --git a/src/XmlMDF/XmlMDF_ReferenceDriver.hxx b/src/XmlMDF/XmlMDF_ReferenceDriver.hxx
index 417adcbbb8..0dc8363107 100644
--- a/src/XmlMDF/XmlMDF_ReferenceDriver.hxx
+++ b/src/XmlMDF/XmlMDF_ReferenceDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDF_ReferenceDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDF_ReferenceDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDF/XmlMDF_TagSourceDriver.cxx b/src/XmlMDF/XmlMDF_TagSourceDriver.cxx
index 66fb42ec74..e3254085f9 100644
--- a/src/XmlMDF/XmlMDF_TagSourceDriver.cxx
+++ b/src/XmlMDF/XmlMDF_TagSourceDriver.cxx
@@ -23,6 +23,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_TagSourceDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDF_TagSourceDriver
 //purpose  : Constructor
diff --git a/src/XmlMDF/XmlMDF_TagSourceDriver.hxx b/src/XmlMDF/XmlMDF_TagSourceDriver.hxx
index 61e4391a43..e197ab5108 100644
--- a/src/XmlMDF/XmlMDF_TagSourceDriver.hxx
+++ b/src/XmlMDF/XmlMDF_TagSourceDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDF_TagSourceDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDF_TagSourceDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx
index db3dcc34c8..3c08219413 100644
--- a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt_RRelocationTable.hxx>
 #include <XmlObjMgt_SRelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_AsciiStringDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_AsciiStringDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.hxx b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.hxx
index a3accaca35..8ffb532da3 100644
--- a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_AsciiStringDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_AsciiStringDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx
index 2a50f1c30a..7c7b3cad2f 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_BooleanArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.hxx
index 96c6648d3e..df8841b64f 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_BooleanArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_BooleanArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cxx
index 2681ca9115..e07c52fb4d 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_BooleanListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.hxx b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.hxx
index 733088a48e..077aeccd37 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_BooleanListDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_BooleanListDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx
index 77e9578731..e958ab6139 100644
--- a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx
@@ -25,6 +25,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ByteArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 IMPLEMENT_DOMSTRING (IsDeltaOn,        "delta")
diff --git a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.hxx
index 9f1a723d54..305bdd985b 100644
--- a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ByteArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ByteArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_CommentDriver.cxx b/src/XmlMDataStd/XmlMDataStd_CommentDriver.cxx
index 5e5c663a42..febe1460ad 100644
--- a/src/XmlMDataStd/XmlMDataStd_CommentDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_CommentDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_CommentDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_CommentDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx b/src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx
index 271ad93a80..ba0054e58e 100644
--- a/src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_CommentDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_CommentDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cxx b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cxx
index 022fe68bcd..a325818386 100644
--- a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataStd_DirectoryDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_DirectoryDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_DirectoryDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.hxx b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.hxx
index b07f015232..36eaee3719 100644
--- a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_DirectoryDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_DirectoryDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cxx
index 0b69036df3..ff8b7d0034 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ExpressionDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (VariablesString, "variables")
 
 //=======================================================================
diff --git a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.hxx
index 390f8d91f9..8857d868e2 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ExpressionDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ExpressionDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx
index f18ab7bb40..8ed9f9309d 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx
@@ -25,6 +25,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ExtStringArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString, "last")
 IMPLEMENT_DOMSTRING (ExtString,       "string")
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.hxx
index d3f0ef6ab6..d6a8b4a49b 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ExtStringArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ExtStringArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cxx
index b2a5b5bc99..c2351dbed5 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cxx
@@ -25,6 +25,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ExtStringListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 IMPLEMENT_DOMSTRING (ExtString,        "string")
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.hxx
index efde187b33..390800f42d 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ExtStringListDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ExtStringListDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx
index 5af12565dc..870b69a815 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx
@@ -30,6 +30,7 @@
 #include <XmlObjMgt_RRelocationTable.hxx>
 #include <XmlObjMgt_SRelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_IntPackedMapDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (IntPackedMapSize, "mapsize")
 IMPLEMENT_DOMSTRING (IsDeltaOn,        "delta")
 //=======================================================================
diff --git a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.hxx b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.hxx
index 099b099e78..58430173da 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.hxx
@@ -51,7 +51,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_IntPackedMapDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_IntPackedMapDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx
index 5ea67bdb89..5d59ccb330 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx
@@ -25,6 +25,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_IntegerArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 IMPLEMENT_DOMSTRING (IsDeltaOn,        "delta")
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.hxx
index 4d9101e083..2976875069 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_IntegerArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_IntegerArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx
index ae8a9b8ad5..9e5b7e864e 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_IntegerDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_IntegerDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx
index f7db941993..cb72329f9a 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_IntegerDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_IntegerDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cxx
index 7cf79299bb..c777e14d96 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_IntegerListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.hxx b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.hxx
index f433e10235..d726c0cd56 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_IntegerListDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_IntegerListDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NameDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NameDriver.cxx
index 0663aae76e..4880fefbd6 100644
--- a/src/XmlMDataStd/XmlMDataStd_NameDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_NameDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt_RRelocationTable.hxx>
 #include <XmlObjMgt_SRelocationTable.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_NameDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_NameDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_NameDriver.hxx b/src/XmlMDataStd/XmlMDataStd_NameDriver.hxx
index 48f6b06d5c..bfec7d472c 100644
--- a/src/XmlMDataStd/XmlMDataStd_NameDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_NameDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_NameDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_NameDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx
index 2aab64ca08..a310c9d3f0 100644
--- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx
@@ -39,6 +39,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_NamedDataDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIntegerIndex, "firstI")
 IMPLEMENT_DOMSTRING (LastIntegerIndex,  "lastI")
 IMPLEMENT_DOMSTRING (FirstRealIndex,    "firstR")
diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.hxx b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.hxx
index 45622caf5e..39c275bece 100644
--- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_NamedDataDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_NamedDataDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cxx b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cxx
index b2992433ea..3ee4a95543 100644
--- a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataStd_NoteBookDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_NoteBookDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_NoteBookDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.hxx b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.hxx
index 70c1774a74..98ce4da3ec 100644
--- a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_NoteBookDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_NoteBookDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
index a30e5ea488..9fb09087fa 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
@@ -29,6 +29,7 @@
 #include <XmlObjMgt_Persistent.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RealArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString, "last")
 IMPLEMENT_DOMSTRING (IsDeltaOn,       "delta")
diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.hxx
index 5d60373206..3d9e362316 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_RealArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_RealArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealDriver.cxx
index 40f08c0780..6ca17521ee 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt_Persistent.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RealDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_RealDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_RealDriver.hxx b/src/XmlMDataStd/XmlMDataStd_RealDriver.hxx
index b740a06601..9148d8880c 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_RealDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_RealDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
index c86d47d0e1..0f59a3d479 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RealListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealListDriver.hxx b/src/XmlMDataStd/XmlMDataStd_RealListDriver.hxx
index 55c48de665..d4d2714991 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealListDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_RealListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_RealListDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_RealListDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cxx
index 130fc93bd4..efaa14d254 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cxx
@@ -26,6 +26,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ReferenceArrayDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 IMPLEMENT_DOMSTRING (ExtString,        "string")
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.hxx
index d09dba27b7..2a2b9565b5 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ReferenceArrayDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ReferenceArrayDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cxx
index 494300dbc4..8c9e5c0fb6 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cxx
@@ -27,6 +27,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ReferenceListDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
 IMPLEMENT_DOMSTRING (LastIndexString,  "last")
 IMPLEMENT_DOMSTRING (ExtString,        "string")
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.hxx b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.hxx
index a851479fe7..49bb896607 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_ReferenceListDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_ReferenceListDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RelationDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RelationDriver.cxx
index b6c7a5051d..b6c6108707 100644
--- a/src/XmlMDataStd/XmlMDataStd_RelationDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_RelationDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RelationDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (VariablesString, "variables")
 
 //=======================================================================
diff --git a/src/XmlMDataStd/XmlMDataStd_RelationDriver.hxx b/src/XmlMDataStd/XmlMDataStd_RelationDriver.hxx
index 0931c52c0e..4e0bf2a5c3 100644
--- a/src/XmlMDataStd/XmlMDataStd_RelationDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_RelationDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_RelationDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_RelationDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_TickDriver.cxx b/src/XmlMDataStd/XmlMDataStd_TickDriver.cxx
index 1bef8fe359..ed1bbf902b 100644
--- a/src/XmlMDataStd/XmlMDataStd_TickDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_TickDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataStd_TickDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_TickDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataStd_TickDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataStd/XmlMDataStd_TickDriver.hxx b/src/XmlMDataStd/XmlMDataStd_TickDriver.hxx
index b46b180b14..a000cab2a8 100644
--- a/src/XmlMDataStd/XmlMDataStd_TickDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_TickDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_TickDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_TickDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx
index 96c1a14c32..a50848a5c8 100644
--- a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx
@@ -23,6 +23,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_TreeNodeDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (TreeIdString,   "treeid")
 IMPLEMENT_DOMSTRING (ChildrenString, "children")
 
diff --git a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.hxx b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.hxx
index 7480e38f6e..b95471c050 100644
--- a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_TreeNodeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_TreeNodeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cxx b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cxx
index 8087c9c76d..601361378e 100644
--- a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cxx
@@ -21,6 +21,7 @@
 #include <XmlMDataStd_UAttributeDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_UAttributeDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (GuidString, "guid")
 
 //=======================================================================
diff --git a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.hxx b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.hxx
index 331d8ab215..84071f77dd 100644
--- a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_UAttributeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_UAttributeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataStd/XmlMDataStd_VariableDriver.cxx b/src/XmlMDataStd/XmlMDataStd_VariableDriver.cxx
index b328b36db4..c989329043 100644
--- a/src/XmlMDataStd/XmlMDataStd_VariableDriver.cxx
+++ b/src/XmlMDataStd/XmlMDataStd_VariableDriver.cxx
@@ -21,6 +21,7 @@
 #include <XmlMDataStd_VariableDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_VariableDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (IsConstString, "isconst")
 IMPLEMENT_DOMSTRING (UnitString,    "unit")
 IMPLEMENT_DOMSTRING (ConstString,   "true")
diff --git a/src/XmlMDataStd/XmlMDataStd_VariableDriver.hxx b/src/XmlMDataStd/XmlMDataStd_VariableDriver.hxx
index a3f79736fe..0f19eba36a 100644
--- a/src/XmlMDataStd/XmlMDataStd_VariableDriver.hxx
+++ b/src/XmlMDataStd/XmlMDataStd_VariableDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataStd_VariableDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataStd_VariableDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cxx
index bdac490a54..f511f3eedf 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_AxisDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_AxisDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataXtd_AxisDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.hxx
index 76e4413a55..6b8e5dbc2c 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_AxisDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_AxisDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cxx
index 8fc1b8b891..d832124fed 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_ConstraintDriver,XmlMDF_ADriver)
+
 static TDataXtd_ConstraintEnum    ConstraintTypeEnum
                                                 (const XmlObjMgt_DOMString&);
 static const XmlObjMgt_DOMString& ConstraintTypeString
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.hxx
index 8ba9c3ad79..28c83baae5 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_ConstraintDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_ConstraintDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cxx
index 3f75902654..b5ae593baa 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_GeometryDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_GeometryDriver,XmlMDF_ADriver)
+
 static const XmlObjMgt_DOMString& GeometryTypeString
                                         (const TDataXtd_GeometryEnum);
 static Standard_Boolean           GeometryTypeEnum
diff --git a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.hxx
index 4e51a843ab..8eab69a0d8 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_GeometryDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_GeometryDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cxx
index 72321eceae..1e9a32b51b 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlMDataXtd_PatternStdDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PatternStdDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (SignatureString,           "signature")
 IMPLEMENT_DOMSTRING (Axis1RevString,            "axis1reversed")
 IMPLEMENT_DOMSTRING (Axis2RevString,            "axis2reversed")
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.hxx
index e9169ecc45..58b506f682 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_PatternStdDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PatternStdDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cxx
index 0710beb688..9cc093630d 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_PlacementDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PlacementDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataXtd_PlacementDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.hxx
index 19fe6c2edd..ce0d980df9 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_PlacementDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PlacementDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cxx
index 978d774978..0928feae60 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_PlaneDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PlaneDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataXtd_PlaneDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.hxx
index 4f4f6513d3..821c0b3827 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_PlaneDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PlaneDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cxx
index a789334a9a..c258a3cb97 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_PointDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PointDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataXtd_PointDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.hxx
index 122e7e5fd7..3112e5f3f5 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_PointDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PointDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cxx
index ac3ef8eb61..d32ac90846 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMDataXtd_ShapeDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_ShapeDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMDataXtd_ShapeDriver
 //purpose  : Constructor
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.hxx
index e4059d9dee..50d50d90bb 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.hxx
+++ b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDataXtd_ShapeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_ShapeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cxx b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cxx
index 904d88e534..871928356a 100644
--- a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cxx
+++ b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMDocStd_XLinkDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (DocEntryString, "documentEntry")
 
 //=======================================================================
diff --git a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.hxx b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.hxx
index f9f1571064..f4937ea589 100644
--- a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.hxx
+++ b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMDocStd_XLinkDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMDocStd_XLinkDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMFunction/XmlMFunction_FunctionDriver.cxx b/src/XmlMFunction/XmlMFunction_FunctionDriver.cxx
index 6903dd607f..b172c1a073 100644
--- a/src/XmlMFunction/XmlMFunction_FunctionDriver.cxx
+++ b/src/XmlMFunction/XmlMFunction_FunctionDriver.cxx
@@ -23,6 +23,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMFunction_FunctionDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (GuidString, "guid")
 IMPLEMENT_DOMSTRING (FailureString, "failure")
 
diff --git a/src/XmlMFunction/XmlMFunction_FunctionDriver.hxx b/src/XmlMFunction/XmlMFunction_FunctionDriver.hxx
index f130a5fda3..16b876134f 100644
--- a/src/XmlMFunction/XmlMFunction_FunctionDriver.hxx
+++ b/src/XmlMFunction/XmlMFunction_FunctionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMFunction_FunctionDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMFunction_FunctionDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cxx b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cxx
index db6603a5d0..60675819fb 100644
--- a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cxx
+++ b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cxx
@@ -23,6 +23,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMFunction_GraphNodeDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (LastPreviousIndex, "lastprev")
 IMPLEMENT_DOMSTRING (LastNextIndex,     "lastnext")
 IMPLEMENT_DOMSTRING (ExecutionStatus,   "exec")
diff --git a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.hxx b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.hxx
index 4366b3b986..5d69210045 100644
--- a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.hxx
+++ b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMFunction_GraphNodeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMFunction_GraphNodeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx b/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx
index a029af2462..fb8bf121d6 100644
--- a/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx
+++ b/src/XmlMFunction/XmlMFunction_ScopeDriver.cxx
@@ -31,6 +31,7 @@
 #include <XmlObjMgt_Document.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMFunction_ScopeDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (LastIDIndex,    "lastid")
 IMPLEMENT_DOMSTRING (LastLabelIndex, "lastlabel")
 
diff --git a/src/XmlMFunction/XmlMFunction_ScopeDriver.hxx b/src/XmlMFunction/XmlMFunction_ScopeDriver.hxx
index e74570a9e2..662d213d22 100644
--- a/src/XmlMFunction/XmlMFunction_ScopeDriver.hxx
+++ b/src/XmlMFunction/XmlMFunction_ScopeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMFunction_ScopeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMFunction_ScopeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
index a075f707df..79c371c729 100644
--- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
+++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
@@ -34,6 +34,8 @@
 #include <XmlObjMgt_Array1.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMNaming_NamedShapeDriver,XmlMDF_ADriver)
+
 static TNaming_Evolution          EvolutionEnum   (const XmlObjMgt_DOMString&);
 static const XmlObjMgt_DOMString& EvolutionString (const TNaming_Evolution);
 static void                       doTranslate     (const TopoDS_Shape&,
diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.hxx b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.hxx
index c39ce22330..fcb4eec5df 100644
--- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.hxx
+++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.hxx
@@ -64,7 +64,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMNaming_NamedShapeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMNaming_NamedShapeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMNaming/XmlMNaming_NamingDriver.cxx b/src/XmlMNaming/XmlMNaming_NamingDriver.cxx
index 082912e47b..d52c14b7d6 100644
--- a/src/XmlMNaming/XmlMNaming_NamingDriver.cxx
+++ b/src/XmlMNaming/XmlMNaming_NamingDriver.cxx
@@ -28,6 +28,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMNaming_NamingDriver,XmlMDF_ADriver)
+
 //=======================================================================
 static TopAbs_ShapeEnum ShapeEnumFromString (const XmlObjMgt_DOMString&);
 static TNaming_NameType NameTypeFromString (const XmlObjMgt_DOMString&);
diff --git a/src/XmlMNaming/XmlMNaming_NamingDriver.hxx b/src/XmlMNaming/XmlMNaming_NamingDriver.hxx
index 07df3b609a..dec73389ad 100644
--- a/src/XmlMNaming/XmlMNaming_NamingDriver.hxx
+++ b/src/XmlMNaming/XmlMNaming_NamingDriver.hxx
@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMNaming_NamingDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMNaming_NamingDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx
index 0789b105d5..e5e6002a59 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx
+++ b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx
@@ -22,6 +22,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMPrsStd_AISPresentationDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (GuidString,        "guid")
 IMPLEMENT_DOMSTRING (IsDisplayedString, "isdisplayed")
 IMPLEMENT_DOMSTRING (ColorString,       "color")
diff --git a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx
index 136e4a2456..d00b0d196e 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx
+++ b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMPrsStd_AISPresentationDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMPrsStd_AISPresentationDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx
index 116c5e093a..ba19aaae36 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx
+++ b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt_Persistent.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(XmlMPrsStd_PositionDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMPrsStd_PositionDriver
 //purpose  : Constructor
diff --git a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx
index 930adc8f3f..0b4ba8e9b5 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx
+++ b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMPrsStd_PositionDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMPrsStd_PositionDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cxx
index 529d29a7eb..8515412c63 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AreaDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMXCAFDoc_AreaDriver
 //purpose  : Constructor
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.hxx
index a278bf83be..33d260eb25 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_AreaDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_AreaDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cxx
index c259a1dc33..0166afae0d 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cxx
@@ -24,6 +24,8 @@
 #include <XmlObjMgt_Persistent.hxx>
 
 #include <stdio.h>
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_CentroidDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMXCAFDoc_CentroidDriver
 //purpose  : Constructor
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.hxx
index 02d0c8a8a7..b499cf2290 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_CentroidDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_CentroidDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cxx
index 85ce8627c6..d14b22d3e6 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_ColorDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMXCAFDoc_ColorDriver
 //purpose  : Constructor
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.hxx
index 18f33c6d20..bd299704ac 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_ColorDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_ColorDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cxx
index 27c930484e..e7e2d6ef07 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_ColorToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_ColorToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.hxx
index 3bd1e2cbe6..88ac3636f7 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_ColorToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_ColorToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cxx
index 34beff28f1..4520fc6460 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_DatumDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (DescrIndexString, "descr")
 IMPLEMENT_DOMSTRING (IdIndexString,    "ident")
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.hxx
index 48f2c1bc2d..2b8fc73647 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_DatumDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_DatumDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cxx
index e787a144ba..733af5feee 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cxx
@@ -24,6 +24,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_DimTolDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (NameIndexString,  "name")
 IMPLEMENT_DOMSTRING (DescrIndexString, "descr")
 IMPLEMENT_DOMSTRING (FirstIndexString, "first")
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.hxx
index d399932c0b..6212dbba8a 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_DimTolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_DimTolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cxx
index 211dc45593..5370ecb705 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_DimTolToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_DimTolToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.hxx
index e73817b4db..188b78a2df 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_DimTolToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_DimTolToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cxx
index c7955ff825..ec4ccff289 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_DocumentToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_DocumentToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.hxx
index 5e457d2d92..3c527bf5cc 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_DocumentToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_DocumentToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cxx
index a2b2d91c23..5a36f09213 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cxx
@@ -25,6 +25,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_GraphNodeDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (TreeIdString,   "treeid")
 IMPLEMENT_DOMSTRING (ChildrenString, "children")
 IMPLEMENT_DOMSTRING (FathersString,  "fathers")
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.hxx
index a6d3046c41..742633c98e 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_GraphNodeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_GraphNodeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cxx
index 47dcf960ab..d4507f77d1 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_LayerToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_LayerToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.hxx
index c017280d88..fd71e23a98 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_LayerToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_LayerToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.hxx
index eded3b0230..7c83bb043c 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.hxx
@@ -60,7 +60,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_LocationDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_LocationDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
index 0e1f690a6b..89682e5757 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cxx
@@ -23,6 +23,7 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_MaterialDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (NameIndexString,     "name")
 IMPLEMENT_DOMSTRING (DescrIndexString,    "descr")
 IMPLEMENT_DOMSTRING (DensNameIndexString, "dens_name")
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.hxx
index 519a44443a..6d879d7cf0 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_MaterialDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_MaterialDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cxx
index d85fd2de24..0a93204e49 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_MaterialToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_MaterialToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.hxx
index afda466ea4..d07f279cb2 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_MaterialToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_MaterialToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cxx
index 47cfcf787b..d35651e99e 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc_ShapeToolDriver.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_ShapeToolDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function :
 //purpose  : 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.hxx
index 48c3aada45..9764434533 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_ShapeToolDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_ShapeToolDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cxx
index e8addffb12..fc6825b1e4 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_Persistent.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_VolumeDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlMXCAFDoc_VolumeDriver
 //purpose  : Constructor
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.hxx
index 6c0d7c90d3..700aacc0bf 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.hxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.hxx
@@ -49,7 +49,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlMXCAFDoc_VolumeDriver,XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_VolumeDriver,XmlMDF_ADriver)
 
 protected:
 
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx
index bdff10f1f0..30c5111352 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.cxx
@@ -19,6 +19,8 @@
 #include <XmlLDrivers.hxx>
 #include <XmlTObjDrivers.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentRetrievalDriver,XmlLDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : XmlTObjDrivers_DocumentRetrievalDriver
 //purpose  : 
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
index 65d49d8744..e7f6dd19f5 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
@@ -40,7 +40,7 @@ class XmlTObjDrivers_DocumentRetrievalDriver :
 
  public:
   // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (XmlTObjDrivers_DocumentRetrievalDriver, XmlLDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentRetrievalDriver,XmlLDrivers_DocumentRetrievalDriver)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx
index f4dc39ed6c..c52096ca01 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.cxx
@@ -19,6 +19,8 @@
 #include <XmlLDrivers.hxx>
 #include <XmlTObjDrivers.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentStorageDriver,XmlLDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : XmlTObjDrivers_DocumentStorageDriver
 //purpose  : 
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
index ead158ad1f..99df9f8d7b 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
@@ -41,7 +41,7 @@ class XmlTObjDrivers_DocumentStorageDriver :
 
  public:
   // Declaration of CASCADE RTTI
-  DEFINE_STANDARD_RTTI (XmlTObjDrivers_DocumentStorageDriver, XmlLDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_DocumentStorageDriver,XmlLDrivers_DocumentStorageDriver)
 };
 
 // Definition of HANDLE object using Standard_DefineHandle.hxx
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.cxx
index 3deaf36c8b..2f4ec63bfa 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.cxx
@@ -25,6 +25,8 @@
 #include <TDF_Tool.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_IntSparseArrayDriver,XmlMDF_ADriver)
+
 #define ITEM_ID "itemId_"
 #define ITEM_VALUE "itemValue_"
 
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.hxx
index a804698e4c..8f2e46066b 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_IntSparseArrayDriver.hxx
@@ -49,7 +49,7 @@ class XmlTObjDrivers_IntSparseArrayDriver : public XmlMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(XmlTObjDrivers_IntSparseArrayDriver, XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_IntSparseArrayDriver,XmlMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.cxx
index 726ed35b6a..cb3f6e6755 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.cxx
@@ -32,6 +32,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_ModelDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlTObjDrivers_ModelDriver
 //purpose  : constructor
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.hxx
index 607ed92151..f98d7623c2 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ModelDriver.hxx
@@ -54,7 +54,7 @@ class XmlTObjDrivers_ModelDriver : public XmlMDF_ADriver
   
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(XmlTObjDrivers_ModelDriver, XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_ModelDriver,XmlMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.cxx
index ee6a7205f3..36ea7d4baa 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.cxx
@@ -27,6 +27,8 @@
 
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_ObjectDriver,XmlMDF_ADriver)
+
 //=======================================================================
 //function : XmlTObjDrivers_ObjectDriver
 //purpose  : constructor
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.hxx
index 3825f6e772..279904a528 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ObjectDriver.hxx
@@ -55,7 +55,7 @@ class XmlTObjDrivers_ObjectDriver : public XmlMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(XmlTObjDrivers_ObjectDriver, XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_ObjectDriver,XmlMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.cxx
index 7720988d7c..b2e2957364 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.cxx
@@ -33,6 +33,7 @@
 #include <TDF_ChildIterator.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_ReferenceDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (MasterEntry,        "master")
 IMPLEMENT_DOMSTRING (ReferredEntry,      "entry")
 IMPLEMENT_DOMSTRING (ReferredModelEntry, "modelentry")
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.hxx
index c086adb240..ecbd14a519 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_ReferenceDriver.hxx
@@ -55,7 +55,7 @@ class XmlTObjDrivers_ReferenceDriver : public XmlMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(XmlTObjDrivers_ReferenceDriver, XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_ReferenceDriver,XmlMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.cxx b/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.cxx
index d2b07cace0..3a0c7d266f 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.cxx
@@ -28,6 +28,7 @@
 #include <TObj_TXYZ.hxx>
 
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlTObjDrivers_XYZDriver,XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING (CoordX,             "X")
 IMPLEMENT_DOMSTRING (CoordY,             "Y")
 IMPLEMENT_DOMSTRING (CoordZ,             "Z")
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.hxx
index 775f1d2a37..d289f5dbd7 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_XYZDriver.hxx
@@ -55,7 +55,7 @@ class XmlTObjDrivers_XYZDriver : public XmlMDF_ADriver
 
  public:
   // CASCADE RTTI
-  DEFINE_STANDARD_RTTI(XmlTObjDrivers_XYZDriver, XmlMDF_ADriver)
+  DEFINE_STANDARD_RTTIEXT(XmlTObjDrivers_XYZDriver,XmlMDF_ADriver)
 };
 
 // Define handle class
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cxx b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cxx
index 397d7a83bf..5170fe42cc 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cxx
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cxx
@@ -21,6 +21,8 @@
 #include <XmlMXCAFDoc.hxx>
 #include <XmlXCAFDrivers_DocumentRetrievalDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlXCAFDrivers_DocumentRetrievalDriver,XmlDrivers_DocumentRetrievalDriver)
+
 //=======================================================================
 //function : XmlXCAFDrivers_DocumentRetrievalDriver
 //purpose  : 
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.hxx b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.hxx
index e01b9d3f8b..fa10b50b73 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.hxx
@@ -41,7 +41,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlXCAFDrivers_DocumentRetrievalDriver,XmlDrivers_DocumentRetrievalDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlXCAFDrivers_DocumentRetrievalDriver,XmlDrivers_DocumentRetrievalDriver)
 
 protected:
 
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cxx b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cxx
index c8c287fd35..2a58dc4266 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cxx
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cxx
@@ -22,6 +22,8 @@
 #include <XmlMXCAFDoc.hxx>
 #include <XmlXCAFDrivers_DocumentStorageDriver.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(XmlXCAFDrivers_DocumentStorageDriver,XmlDrivers_DocumentStorageDriver)
+
 //=======================================================================
 //function : XmlXCAFDrivers_DocumentStorageDriver
 //purpose  : 
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
index 16a7731233..7d0d992b38 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.hxx
@@ -42,7 +42,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XmlXCAFDrivers_DocumentStorageDriver,XmlDrivers_DocumentStorageDriver)
+  DEFINE_STANDARD_RTTIEXT(XmlXCAFDrivers_DocumentStorageDriver,XmlDrivers_DocumentStorageDriver)
 
 protected:
 
diff --git a/src/Xw/Xw_Window.hxx b/src/Xw/Xw_Window.hxx
index 0c1aa9ae3d..693e8f93c9 100644
--- a/src/Xw/Xw_Window.hxx
+++ b/src/Xw/Xw_Window.hxx
@@ -131,7 +131,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(Xw_Window, Aspect_Window)
+  DEFINE_STANDARD_RTTIEXT(Xw_Window,Aspect_Window)
 
 };