From cb389a77e4b77d1b1b78df9f9e5562fa6e60692c Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Thu, 13 Mar 2014 14:21:41 +0400
Subject: [PATCH] 0024710: Avoid including Handle_Class.hxx headers except
 where necessary

Includes of Handle*.hxx headers replaced by include of corresponding class (where possible without redesign of the classes).

Minor correction against compiler warning (vc10 64-bit) in BOPAlgo

Remove double header inclusions

Correction of minor mistake
---
 src/AIS/AIS_Line.cxx                          |  3 ++-
 src/AIS/AIS_TexturedShape.hxx                 |  8 +++---
 src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx      |  8 +++---
 .../Aspect_DisplayConnection_Handle.hxx       |  2 +-
 src/Aspect/Aspect_GraphicCallbackProc.hxx     |  2 +-
 src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx          | 10 +++----
 ...OPDS_DataMapOfPaveBlockListOfPaveBlock.hxx |  2 +-
 ...dexedDataMapOfPaveBlockListOfPaveBlock.hxx |  2 +-
 src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx     |  2 +-
 src/BOPDS/BOPDS_ListOfPaveBlock.hxx           |  2 +-
 src/BOPDS/BOPDS_MapOfCommonBlock.hxx          |  2 +-
 src/BOPDS/BOPDS_MapOfPaveBlock.hxx            |  2 +-
 src/BRepApprox/BRepApprox_SurfaceToolGen.lxx  |  8 +++---
 src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx   |  4 +--
 src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx   |  4 +--
 src/BRepBlend/BRepBlend_HCurveToolGen.gxx     |  4 +--
 src/BRepBlend/BRepBlend_HCurveToolGen.lxx     |  4 +--
 src/BRepExtrema/BRepExtrema_ExtCC.hxx         |  2 +-
 src/BRepExtrema/BRepExtrema_ExtCF.hxx         |  2 +-
 src/BRepExtrema/BRepExtrema_ExtFF.hxx         |  2 +-
 src/BRepExtrema/BRepExtrema_ExtPC.hxx         |  2 +-
 .../BRepSweep_NumLinearRegularSweep.hxx       |  2 +-
 ...BinTObjDrivers_DocumentRetrievalDriver.hxx |  2 +-
 .../BinTObjDrivers_DocumentStorageDriver.hxx  |  2 +-
 src/Contap/Contap_HContToolGen.gxx            |  8 +++---
 src/Contap/Contap_HCurve2dToolGen.gxx         |  4 +--
 src/Contap/Contap_HCurve2dToolGen.lxx         |  4 +--
 src/Font/Font_FTLibrary.hxx                   |  1 -
 src/Geom2dInt/Geom2dInt_CurveTool.gxx         |  4 +--
 src/GeomAPI/GeomAPI_Interpolate.cxx           |  2 +-
 src/GeomLib/GeomLib_Interpolate.cxx           |  2 +-
 src/GeomPlate/GeomPlate_MakeApprox.cxx        |  2 --
 .../GeometryTest_ConstraintCommands.cxx       |  2 --
 .../GeomliteTest_ApproxCommands.cxx           |  2 --
 src/Graphic3d/Graphic3d_CTexture.hxx          |  2 +-
 src/Graphic3d/Graphic3d_CView.hxx             |  2 +-
 src/Graphic3d/Graphic3d_MarkerImage.hxx       |  2 +-
 .../Graphic3d_MarkerImage_Handle.hxx          |  2 +-
 src/HLRBRep/HLRBRep_BCurveTool.cxx            |  4 +--
 src/HLRBRep/HLRBRep_BSurfaceTool.lxx          |  8 +++---
 src/HLRBRep/HLRBRep_Curve.cxx                 |  2 --
 src/HLRBRep/HLRBRep_CurveTool.cxx             |  4 +--
 src/HLRBRep/HLRBRep_CurveTool.lxx             |  4 +--
 src/HLRBRep/HLRBRep_SurfaceTool.lxx           |  8 +++---
 src/IFSelect/IFSelect_ActFunc.hxx             |  2 +-
 src/Image/Image_PixMap_Handle.hxx             |  2 +-
 .../IntCurveSurface_HCurveTool.gxx            |  4 +--
 .../IntCurveSurface_HCurveTool.lxx            |  4 +--
 .../IntCurveSurface_SurfaceTool.lxx           |  8 +++---
 src/IntPatch/IntPatch_HCurve2dTool.cxx        |  4 +--
 src/IntPatch/IntPatch_HCurve2dTool.lxx        |  4 +--
 src/IntPatch/IntPatch_HInterTool.cxx          |  5 ----
 src/IntPatch/IntPatch_Intersection.cxx        |  4 +--
 src/IntPatch/IntPatch_PrmPrmIntersection.cxx  |  1 -
 src/Interface/Interface_StaticSatisfies.hxx   |  2 +-
 src/Interface/Interface_ValueInterpret.hxx    |  2 +-
 src/Interface/Interface_ValueSatisfies.hxx    |  2 +-
 src/MoniTool/MoniTool_ValueInterpret.hxx      |  3 ++-
 src/Poly/FILES                                |  1 -
 .../Handle_Poly_CoherentTriangulation.hxx     | 27 -------------------
 src/Poly/Poly_CoherentTriangulation.hxx       |  9 +++++--
 src/Poly/Poly_ListOfTriangulation.hxx         |  2 +-
 src/ProjLib/ProjLib_ComputeApprox.cxx         |  2 --
 .../ProjLib_ComputeApproxOnPolarSurface.cxx   |  2 --
 src/ProjLib/ProjLib_ProjectOnSurface.cxx      |  2 --
 src/ProjLib/ProjLib_ProjectedCurve.cxx        |  6 -----
 .../SelectMgr_DataMapOfObjectOwners.hxx       |  2 +-
 src/ShapeFix/ShapeFix_Wire.cxx                |  1 -
 src/ShapeProcess/ShapeProcess_OperFunc.hxx    |  2 +-
 src/Standard/Handle_Standard_Persistent.cxx   |  2 +-
 src/Standard/Handle_Standard_Transient.cxx    |  2 +-
 src/Standard/Standard_Persistent.cxx          |  1 -
 src/Standard/Standard_Persistent_proto.hxx    |  1 -
 src/StdPrs/StdPrs_HLRShape.hxx                |  6 ++---
 src/TDF/TDF_AttributeIterator.hxx             |  2 +-
 .../TestTopOpeTools_Mesure.cxx                |  1 -
 .../TopTools_MutexForShapeProvider.hxx        |  2 +-
 .../VrmlData_DataMapOfShapeAppearance.hxx     |  1 -
 src/VrmlData/VrmlData_Geometry.hxx            |  2 +-
 src/VrmlData/VrmlData_Node.hxx                |  2 +-
 ...XmlTObjDrivers_DocumentRetrievalDriver.hxx |  2 +-
 .../XmlTObjDrivers_DocumentStorageDriver.hxx  |  2 +-
 82 files changed, 114 insertions(+), 167 deletions(-)
 delete mode 100644 src/Poly/Handle_Poly_CoherentTriangulation.hxx

diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx
index 6f9937ccc7..2d26a7fc99 100644
--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -31,10 +31,11 @@
 #include <GeomAdaptor_Curve.hxx>
 #include <AIS_Drawer.hxx>
 #include <GC_MakeSegment.hxx>
-#include <Handle_Geom_Line.hxx>
+#include <Geom_Line.hxx>
 #include <Quantity_Color.hxx>
 #include <AIS_GraphicTool.hxx>
 #include <UnitsAPI.hxx>
+
 //==================================================================
 // function: FindLimits
 // purpose:
diff --git a/src/AIS/AIS_TexturedShape.hxx b/src/AIS/AIS_TexturedShape.hxx
index d6f457bac8..8bec8f2a09 100644
--- a/src/AIS/AIS_TexturedShape.hxx
+++ b/src/AIS/AIS_TexturedShape.hxx
@@ -22,10 +22,10 @@
 #include <Image_PixMap.hxx>
 #include <Standard_DefineHandle.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Handle_Graphic3d_AspectFillArea3d.hxx>
-#include <Handle_Graphic3d_Texture2Dmanual.hxx>
-#include <Handle_Prs3d_Presentation.hxx>
-#include <Handle_PrsMgr_PresentationManager3d.hxx>
+#include <Graphic3d_AspectFillArea3d.hxx>
+#include <Graphic3d_Texture2Dmanual.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <PrsMgr_PresentationManager3d.hxx>
 
 class Graphic3d_AspectFillArea3d;
 class Graphic3d_Texture2Dmanual;
diff --git a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
index bae9e9d7b2..39aa5e8643 100644
--- a/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
+++ b/src/Adaptor3d/Adaptor3d_HSurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 inline Standard_Real Adaptor3d_HSurfaceTool::FirstUParameter(const Handle(Adaptor3d_HSurface)& Surf)
diff --git a/src/Aspect/Aspect_DisplayConnection_Handle.hxx b/src/Aspect/Aspect_DisplayConnection_Handle.hxx
index 528188b88c..fa0676fbf7 100755
--- a/src/Aspect/Aspect_DisplayConnection_Handle.hxx
+++ b/src/Aspect/Aspect_DisplayConnection_Handle.hxx
@@ -14,7 +14,7 @@
 #ifndef _Aspect_DisplayConnection_Handle_H__
 #define _Aspect_DisplayConnection_Handle_H__
 
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Aspect_DisplayConnection;
 DEFINE_STANDARD_HANDLE(Aspect_DisplayConnection, Standard_Transient)
diff --git a/src/Aspect/Aspect_GraphicCallbackProc.hxx b/src/Aspect/Aspect_GraphicCallbackProc.hxx
index 1ff4e494aa..adeb3cdc83 100644
--- a/src/Aspect/Aspect_GraphicCallbackProc.hxx
+++ b/src/Aspect/Aspect_GraphicCallbackProc.hxx
@@ -17,7 +17,7 @@
 #include <Aspect_Display.hxx>
 #include <Aspect_Drawable.hxx>
 #include <Aspect_RenderingContext.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 // The flags below provide additional information to define the moment when
 // callback was invoked in redraw procedure. These flags are bitwise OR'ed
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
index d2f76b1dd5..dca01224fe 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
@@ -115,8 +115,8 @@ class BOPAlgo_EdgeEdgeFunctor {
     : myPVEE(&aVEE) {
   }
   //
-  void operator()( const flexible_range<Standard_Size>& aBR ) const{
-    Standard_Size i, iBeg, iEnd;
+  void operator()( const flexible_range<Standard_Integer>& aBR ) const{
+    Standard_Integer i, iBeg, iEnd;
     //
     BOPAlgo_VectorOfEdgeEdge& aVEE=*myPVEE;
     //
@@ -142,13 +142,13 @@ class BOPAlgo_EdgeEdgeCnt {
                         BOPAlgo_VectorOfEdgeEdge& aVEdgeEdge) {
     //
     BOPAlgo_EdgeEdgeFunctor aEEF(aVEdgeEdge);
-    Standard_Size aNbEE=aVEdgeEdge.Extent();
+    Standard_Integer aNbEE=aVEdgeEdge.Extent();
     //
     if (bRunParallel) {
-      flexible_for(flexible_range<Standard_Size>(0,aNbEE), aEEF);
+      flexible_for(flexible_range<Standard_Integer>(0,aNbEE), aEEF);
     }
     else {
-      aEEF.operator()(flexible_range<Standard_Size>(0,aNbEE));
+      aEEF.operator()(flexible_range<Standard_Integer>(0,aNbEE));
     }
   }
 };
diff --git a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
index 25d8bb5327..7f2ae2af72 100644
--- a/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_DataMapOfPaveBlockListOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_DataMap.hxx>
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 #include <BOPDS_ListOfPaveBlock.hxx>
 
 typedef NCollection_DataMap<Handle(BOPDS_PaveBlock), BOPDS_ListOfPaveBlock, TColStd_MapTransientHasher> BOPDS_DataMapOfPaveBlockListOfPaveBlock; 
diff --git a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
index 6c7672ed69..2394fdecb0 100644
--- a/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_IndexedDataMap.hxx>
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 #include <BOPDS_ListOfPaveBlock.hxx>
 
 typedef NCollection_IndexedDataMap<Handle(BOPDS_PaveBlock), BOPDS_ListOfPaveBlock, TColStd_MapTransientHasher> BOPDS_IndexedDataMapOfPaveBlockListOfPaveBlock; 
diff --git a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
index 05fae2e26f..0c9d5782e5 100644
--- a/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_IndexedMapOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_IndexedMap.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 
 typedef NCollection_IndexedMap<Handle(BOPDS_PaveBlock), TColStd_MapTransientHasher> BOPDS_IndexedMapOfPaveBlock; 
 
diff --git a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
index 0d60b05cb0..88f21a0661 100644
--- a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx
@@ -16,7 +16,7 @@
 #define BOPDS_ListOfPaveBlock_HeaderFile
 
 #include <NCollection_List.hxx>   
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 class BOPDS_PaveBlock;
 
 typedef NCollection_List<Handle(BOPDS_PaveBlock)> BOPDS_ListOfPaveBlock; 
diff --git a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
index 964ea09206..40e7ae51a9 100644
--- a/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
+++ b/src/BOPDS/BOPDS_MapOfCommonBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_Map.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_CommonBlock.hxx>   
+#include <BOPDS_CommonBlock.hxx>   
 
 typedef NCollection_Map<Handle(BOPDS_CommonBlock), TColStd_MapTransientHasher> BOPDS_MapOfCommonBlock; 
 typedef BOPDS_MapOfCommonBlock::Iterator BOPDS_MapIteratorOfMapOfCommonBlock;  
diff --git a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
index 80b1c276d0..b7b9c07735 100644
--- a/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
+++ b/src/BOPDS/BOPDS_MapOfPaveBlock.hxx
@@ -18,7 +18,7 @@
 #define _NCollection_MapHasher
 #include <NCollection_Map.hxx>   
 #include <TColStd_MapTransientHasher.hxx>
-#include <Handle_BOPDS_PaveBlock.hxx>   
+#include <BOPDS_PaveBlock.hxx>   
 
 typedef NCollection_Map<Handle(BOPDS_PaveBlock), TColStd_MapTransientHasher> BOPDS_MapOfPaveBlock; 
 typedef BOPDS_MapOfPaveBlock::Iterator BOPDS_MapIteratorOfMapOfPaveBlock;  
diff --git a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx b/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
index 31dc16e670..b83e77d488 100644
--- a/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
+++ b/src/BRepApprox/BRepApprox_SurfaceToolGen.lxx
@@ -24,10 +24,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 
diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx b/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
index 562f703708..b8c4575f0f 100644
--- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
+++ b/src/BRepBlend/BRepBlend_HCurve2dToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx b/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
index 750b06113b..afdd09a99a 100644
--- a/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
+++ b/src/BRepBlend/BRepBlend_HCurve2dToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr2d.hxx>
 
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx b/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
index 9dd43fc7a2..00b5da8aed 100644
--- a/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
+++ b/src/BRepBlend/BRepBlend_HCurveToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx b/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
index 6ef8471bfa..789aebdf87 100644
--- a/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
+++ b/src/BRepBlend/BRepBlend_HCurveToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr.hxx>
 
 
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/BRepExtrema/BRepExtrema_ExtCC.hxx b/src/BRepExtrema/BRepExtrema_ExtCC.hxx
index fa2e4316d7..a397eb789d 100644
--- a/src/BRepExtrema/BRepExtrema_ExtCC.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtCC.hxx
@@ -28,7 +28,7 @@
 #include <Extrema_ExtCC.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HCurve_HeaderFile
-#include <Handle_BRepAdaptor_HCurve.hxx>
+#include <BRepAdaptor_HCurve.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ExtCF.hxx b/src/BRepExtrema/BRepExtrema_ExtCF.hxx
index c6d7532f19..24247e461b 100644
--- a/src/BRepExtrema/BRepExtrema_ExtCF.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtCF.hxx
@@ -40,7 +40,7 @@
 #include <Extrema_SequenceOfPOnCurv.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HSurface_HeaderFile
-#include <Handle_BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_HSurface.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ExtFF.hxx b/src/BRepExtrema/BRepExtrema_ExtFF.hxx
index db8a587c63..d14c52ca87 100644
--- a/src/BRepExtrema/BRepExtrema_ExtFF.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtFF.hxx
@@ -37,7 +37,7 @@
 #include <Extrema_SequenceOfPOnSurf.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HSurface_HeaderFile
-#include <Handle_BRepAdaptor_HSurface.hxx>
+#include <BRepAdaptor_HSurface.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/BRepExtrema/BRepExtrema_ExtPC.hxx b/src/BRepExtrema/BRepExtrema_ExtPC.hxx
index 94c7f3ffcd..a0ddc68001 100644
--- a/src/BRepExtrema/BRepExtrema_ExtPC.hxx
+++ b/src/BRepExtrema/BRepExtrema_ExtPC.hxx
@@ -28,7 +28,7 @@
 #include <Extrema_ExtPC.hxx>
 #endif
 #ifndef _Handle_BRepAdaptor_HCurve_HeaderFile
-#include <Handle_BRepAdaptor_HCurve.hxx>
+#include <BRepAdaptor_HCurve.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
index 6c5358660d..7a64f23906 100644
--- a/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
+++ b/src/BRepSweep/BRepSweep_NumLinearRegularSweep.hxx
@@ -36,7 +36,7 @@
 #include <TColStd_Array2OfBoolean.hxx>
 #endif
 #ifndef _Handle_BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep_HeaderFile
-#include <Handle_BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep.hxx>
+#include <BRepSweep_SequenceNodeOfSequenceOfShapesOfNumLinearRegularSweep.hxx>
 #endif
 #ifndef _TopAbs_Orientation_HeaderFile
 #include <TopAbs_Orientation.hxx>
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
index f4d9856d5b..c3084c0552 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentRetrievalDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <BinLDrivers_DocumentRetrievalDriver.hxx>
-#include <Handle_BinMDF_ADriverTable.hxx>
+#include <BinMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 
diff --git a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
index b17d11bc9e..c5a4c6bb46 100644
--- a/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/BinTObjDrivers/BinTObjDrivers_DocumentStorageDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <BinLDrivers_DocumentStorageDriver.hxx>
-#include <Handle_BinMDF_ADriverTable.hxx>
+#include <BinMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 
diff --git a/src/Contap/Contap_HContToolGen.gxx b/src/Contap/Contap_HContToolGen.gxx
index ca9020b53f..0fd0df02b4 100644
--- a/src/Contap/Contap_HContToolGen.gxx
+++ b/src/Contap/Contap_HContToolGen.gxx
@@ -20,10 +20,10 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
diff --git a/src/Contap/Contap_HCurve2dToolGen.gxx b/src/Contap/Contap_HCurve2dToolGen.gxx
index d109347779..b50de0c61f 100644
--- a/src/Contap/Contap_HCurve2dToolGen.gxx
+++ b/src/Contap/Contap_HCurve2dToolGen.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/Contap/Contap_HCurve2dToolGen.lxx b/src/Contap/Contap_HCurve2dToolGen.lxx
index a8b0f9918f..731f33f4e0 100644
--- a/src/Contap/Contap_HCurve2dToolGen.lxx
+++ b/src/Contap/Contap_HCurve2dToolGen.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr2d.hxx>
 
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/Font/Font_FTLibrary.hxx b/src/Font/Font_FTLibrary.hxx
index 2798dd282b..305c9c207b 100755
--- a/src/Font/Font_FTLibrary.hxx
+++ b/src/Font/Font_FTLibrary.hxx
@@ -18,7 +18,6 @@
 
 #include <Standard_DefineHandle.hxx>
 #include <Standard_Transient.hxx>
-#include <Handle_Standard_Transient.hxx>
 
 // inclusion template for FreeType
 #include <ft2build.h>
diff --git a/src/Geom2dInt/Geom2dInt_CurveTool.gxx b/src/Geom2dInt/Geom2dInt_CurveTool.gxx
index cb6bd67694..41d7114e05 100644
--- a/src/Geom2dInt/Geom2dInt_CurveTool.gxx
+++ b/src/Geom2dInt/Geom2dInt_CurveTool.gxx
@@ -15,8 +15,8 @@
 // commercial license or contractual agreement.
 
 #include <GeomAbs_CurveType.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 
diff --git a/src/GeomAPI/GeomAPI_Interpolate.cxx b/src/GeomAPI/GeomAPI_Interpolate.cxx
index 8dc2a41682..e3d28da979 100644
--- a/src/GeomAPI/GeomAPI_Interpolate.cxx
+++ b/src/GeomAPI/GeomAPI_Interpolate.cxx
@@ -26,7 +26,7 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
+
 //=======================================================================
 //function : CheckPoints
 //purpose  : 
diff --git a/src/GeomLib/GeomLib_Interpolate.cxx b/src/GeomLib/GeomLib_Interpolate.cxx
index 2960a3ca9f..aff8f007d2 100644
--- a/src/GeomLib/GeomLib_Interpolate.cxx
+++ b/src/GeomLib/GeomLib_Interpolate.cxx
@@ -25,7 +25,7 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
+#include <TColStd_HArray1OfBoolean.hxx>
 
 //=======================================================================
 //function : GeomLib_Interpolate
diff --git a/src/GeomPlate/GeomPlate_MakeApprox.cxx b/src/GeomPlate/GeomPlate_MakeApprox.cxx
index 4a5421a98c..e39f6775f7 100644
--- a/src/GeomPlate/GeomPlate_MakeApprox.cxx
+++ b/src/GeomPlate/GeomPlate_MakeApprox.cxx
@@ -35,8 +35,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray2OfReal.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray2OfReal.hxx>
 
 #include <AdvApp2Var_Criterion.hxx>
 #include <AdvApp2Var_ApproxAFunc2Var.hxx>
diff --git a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
index e91514e7ef..6b04b3069b 100644
--- a/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
+++ b/src/GeometryTest/GeometryTest_ConstraintCommands.cxx
@@ -56,8 +56,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppDef_MultiLine.hxx>
 #include <AppDef_TheVariational.hxx>
diff --git a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
index d6669f136f..0f0cccbd82 100644
--- a/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
+++ b/src/GeomliteTest/GeomliteTest_ApproxCommands.cxx
@@ -48,8 +48,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColStd_HArray1OfBoolean.hxx>
-#include <Handle_TColStd_HArray1OfReal.hxx>
-#include <Handle_TColStd_HArray1OfBoolean.hxx>
 
 #include <AppParCurves_MultiBSpCurve.hxx>
 #include <AppParCurves_MultiCurve.hxx>
diff --git a/src/Graphic3d/Graphic3d_CTexture.hxx b/src/Graphic3d/Graphic3d_CTexture.hxx
index 168fa0d81b..33dcb73ef9 100644
--- a/src/Graphic3d/Graphic3d_CTexture.hxx
+++ b/src/Graphic3d/Graphic3d_CTexture.hxx
@@ -14,7 +14,7 @@
 #ifndef _Graphic3d_CTexture_HeaderFile
 #define _Graphic3d_CTexture_HeaderFile
 
-#include <Handle_Graphic3d_TextureMap.hxx>
+#include <Graphic3d_TextureMap.hxx>
 #include <Standard_Type.hxx>
 
 class Graphic3d_CTexture
diff --git a/src/Graphic3d/Graphic3d_CView.hxx b/src/Graphic3d/Graphic3d_CView.hxx
index 0cd6de1df7..3c49890934 100644
--- a/src/Graphic3d/Graphic3d_CView.hxx
+++ b/src/Graphic3d/Graphic3d_CView.hxx
@@ -16,7 +16,7 @@
 
 #include <InterfaceGraphic_Graphic3d.hxx>
 #include <InterfaceGraphic_Visual3d.hxx>
-#include <Handle_Graphic3d_TextureEnv.hxx>
+#include <Graphic3d_TextureEnv.hxx>
 #include <Graphic3d_Camera.hxx>
 
 #include <Standard_Type.hxx>
diff --git a/src/Graphic3d/Graphic3d_MarkerImage.hxx b/src/Graphic3d/Graphic3d_MarkerImage.hxx
index a432f7fef6..fc68e47ac1 100755
--- a/src/Graphic3d/Graphic3d_MarkerImage.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage.hxx
@@ -18,7 +18,7 @@
 
 #include <Graphic3d_MarkerImage_Handle.hxx>
 
-#include <Handle_TColStd_HArray1OfByte.hxx>
+#include <TColStd_HArray1OfByte.hxx>
 #include <Image_PixMap_Handle.hxx>
 #include <Quantity_Parameter.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx b/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
index 940fa0b485..97a14d2315 100755
--- a/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
+++ b/src/Graphic3d/Graphic3d_MarkerImage_Handle.hxx
@@ -17,7 +17,7 @@
 #define _Graphic3d_TextureBitMap_Handle_H__
 
 #include <Standard_DefineHandle.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Graphic3d_TextureBitMap;
 DEFINE_STANDARD_HANDLE(Graphic3d_MarkerImage, Standard_Transient)
diff --git a/src/HLRBRep/HLRBRep_BCurveTool.cxx b/src/HLRBRep/HLRBRep_BCurveTool.cxx
index 3dabf48737..a0cae055ca 100644
--- a/src/HLRBRep/HLRBRep_BCurveTool.cxx
+++ b/src/HLRBRep/HLRBRep_BCurveTool.cxx
@@ -17,8 +17,8 @@
 #include <HLRBRep_BCurveTool.ixx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 
diff --git a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
index c6a800d8b6..e37c2e516c 100644
--- a/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
+++ b/src/HLRBRep/HLRBRep_BSurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
 //=======================================================================
diff --git a/src/HLRBRep/HLRBRep_Curve.cxx b/src/HLRBRep/HLRBRep_Curve.cxx
index ac9d533f13..3cc51fdb63 100644
--- a/src/HLRBRep/HLRBRep_Curve.cxx
+++ b/src/HLRBRep/HLRBRep_Curve.cxx
@@ -26,8 +26,6 @@
 #include <HLRBRep_CLProps.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
 
 //OCC155 // jfa 05.03.2002 // bad vectors projection
 
diff --git a/src/HLRBRep/HLRBRep_CurveTool.cxx b/src/HLRBRep/HLRBRep_CurveTool.cxx
index cb2d1e2c80..8841bd1e31 100644
--- a/src/HLRBRep/HLRBRep_CurveTool.cxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.cxx
@@ -18,8 +18,8 @@
 #include <HLRBRep_Curve.hxx>
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 //=======================================================================
diff --git a/src/HLRBRep/HLRBRep_CurveTool.lxx b/src/HLRBRep/HLRBRep_CurveTool.lxx
index 8b1bdde0b1..b8a01437e4 100644
--- a/src/HLRBRep/HLRBRep_CurveTool.lxx
+++ b/src/HLRBRep/HLRBRep_CurveTool.lxx
@@ -23,8 +23,8 @@
 #include <gp_Elips2d.hxx>
 #include <gp_Parab2d.hxx>
 #include <gp_Hypr2d.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
 #define   IS_C2_COMPOSITE 0
diff --git a/src/HLRBRep/HLRBRep_SurfaceTool.lxx b/src/HLRBRep/HLRBRep_SurfaceTool.lxx
index b82bfd7aa9..87172f6513 100644
--- a/src/HLRBRep/HLRBRep_SurfaceTool.lxx
+++ b/src/HLRBRep/HLRBRep_SurfaceTool.lxx
@@ -22,10 +22,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
 inline Standard_Real HLRBRep_SurfaceTool::FirstUParameter(const Standard_Address Surf){  return ((BRepAdaptor_Surface *)Surf)->FirstUParameter(); }
diff --git a/src/IFSelect/IFSelect_ActFunc.hxx b/src/IFSelect/IFSelect_ActFunc.hxx
index 4abb8db761..f21dde2e60 100644
--- a/src/IFSelect/IFSelect_ActFunc.hxx
+++ b/src/IFSelect/IFSelect_ActFunc.hxx
@@ -17,7 +17,7 @@
 #define _IFSelect_ActFunc_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Handle_IFSelect_SessionPilot.hxx>
+#include <IFSelect_SessionPilot.hxx>
 #include <IFSelect_ReturnStatus.hxx>
 
 typedef IFSelect_ReturnStatus (*IFSelect_ActFunc) (const Handle(IFSelect_SessionPilot)&);
diff --git a/src/Image/Image_PixMap_Handle.hxx b/src/Image/Image_PixMap_Handle.hxx
index c06dc8c131..1a5ee60551 100644
--- a/src/Image/Image_PixMap_Handle.hxx
+++ b/src/Image/Image_PixMap_Handle.hxx
@@ -15,7 +15,7 @@
 #define _Image_PixMap_Handle_H__
 
 #include <Standard_DefineHandle.hxx>
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 
 class Image_PixMap;
 DEFINE_STANDARD_HANDLE(Image_PixMap, Standard_Transient)
diff --git a/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx b/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
index d863211293..ba68d67cc5 100644
--- a/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
+++ b/src/IntCurveSurface/IntCurveSurface_HCurveTool.gxx
@@ -17,8 +17,8 @@
 #include CurveGen_hxx
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfBoolean.hxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
index b32a082d48..79b18277f6 100644
--- a/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
+++ b/src/IntCurveSurface/IntCurveSurface_HCurveTool.lxx
@@ -27,8 +27,8 @@
 #include <gp_Hypr.hxx>
 
 
-#include <Handle_Geom_BezierCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx b/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
index f90e3a8842..b17054975c 100644
--- a/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
+++ b/src/IntCurveSurface/IntCurveSurface_SurfaceTool.lxx
@@ -27,10 +27,10 @@
 #include <gp_Sphere.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Dir.hxx>
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Adaptor3d_HSurface.hxx>
+#include <Adaptor3d_HCurve.hxx>
 
 
 
diff --git a/src/IntPatch/IntPatch_HCurve2dTool.cxx b/src/IntPatch/IntPatch_HCurve2dTool.cxx
index 441955fe96..9b047af87b 100644
--- a/src/IntPatch/IntPatch_HCurve2dTool.cxx
+++ b/src/IntPatch/IntPatch_HCurve2dTool.cxx
@@ -18,8 +18,8 @@
 
 #include <GeomAbs_CurveType.hxx>
 #include <GeomAbs_Shape.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/IntPatch/IntPatch_HCurve2dTool.lxx b/src/IntPatch/IntPatch_HCurve2dTool.lxx
index 3f9f746aca..0348595864 100644
--- a/src/IntPatch/IntPatch_HCurve2dTool.lxx
+++ b/src/IntPatch/IntPatch_HCurve2dTool.lxx
@@ -24,8 +24,8 @@
 #include <gp_Parab2d.hxx>
 #include <gp_Hypr2d.hxx>
 
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
+#include <Geom2d_BezierCurve.hxx>
+#include <Geom2d_BSplineCurve.hxx>
 
 #include <TColStd_Array1OfReal.hxx>
 
diff --git a/src/IntPatch/IntPatch_HInterTool.cxx b/src/IntPatch/IntPatch_HInterTool.cxx
index b6f4b42352..ec4da95eaa 100644
--- a/src/IntPatch/IntPatch_HInterTool.cxx
+++ b/src/IntPatch/IntPatch_HInterTool.cxx
@@ -22,11 +22,6 @@
 #include <GeomAbs_SurfaceType.hxx>
 #include <Standard_OutOfRange.hxx>
 
-#include <Handle_Geom_BezierSurface.hxx>
-#include <Handle_Geom_BSplineSurface.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
-
 #include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <Geom2d_BezierCurve.hxx>
diff --git a/src/IntPatch/IntPatch_Intersection.cxx b/src/IntPatch/IntPatch_Intersection.cxx
index d3da07067a..d31cab612a 100644
--- a/src/IntPatch/IntPatch_Intersection.cxx
+++ b/src/IntPatch/IntPatch_Intersection.cxx
@@ -174,7 +174,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)&  S1,
 #include <GeomAdaptor_HCurve.hxx>
 #include <GeomAdaptor_Curve.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <Handle_GeomAdaptor_HSurface.hxx>
+#include <GeomAdaptor_HSurface.hxx>
 #include <Geom_Plane.hxx>
 #include <ProjLib_ProjectOnPlane.hxx>
 #include <GeomProjLib.hxx>
@@ -1511,7 +1511,7 @@ void IntPatch_Intersection::Perform(const Handle(Adaptor3d_HSurface)&  S1,
 //======================================================================
 #include <IntPatch_IType.hxx>
 #include <IntPatch_LineConstructor.hxx>
-#include <Handle_Adaptor2d_HCurve2d.hxx>
+#include <Adaptor2d_HCurve2d.hxx>
 #define MAXR 200
 
 
diff --git a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
index 4c3a6da6f4..4491e7fa77 100644
--- a/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
+++ b/src/IntPatch/IntPatch_PrmPrmIntersection.cxx
@@ -26,7 +26,6 @@
 
 #include <IntPatch_Line.hxx>
 
-#include <Handle_IntSurf_LineOn2S.hxx>
 #include <IntSurf_PntOn2S.hxx>
 #include <IntSurf_LineOn2S.hxx>
 #include <TColStd_Array1OfReal.hxx>
diff --git a/src/Interface/Interface_StaticSatisfies.hxx b/src/Interface/Interface_StaticSatisfies.hxx
index 097da493a9..5423943c5b 100644
--- a/src/Interface/Interface_StaticSatisfies.hxx
+++ b/src/Interface/Interface_StaticSatisfies.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_StaticSatisfies_HeaderFile
 #define _Interface_StaticSatisfies_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Standard_Boolean (*Interface_StaticSatisfies) (const Handle(TCollection_HAsciiString)& val);
 
diff --git a/src/Interface/Interface_ValueInterpret.hxx b/src/Interface/Interface_ValueInterpret.hxx
index 913dd002cc..84db997382 100644
--- a/src/Interface/Interface_ValueInterpret.hxx
+++ b/src/Interface/Interface_ValueInterpret.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_ValueInterpret_HeaderFile
 #define _Interface_ValueInterpret_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Handle(TCollection_HAsciiString)  (*Interface_ValueInterpret) (const Handle(Interface_TypedValue)& typval, const Handle(TCollection_HAsciiString)& val, const Standard_Boolean native);
 
diff --git a/src/Interface/Interface_ValueSatisfies.hxx b/src/Interface/Interface_ValueSatisfies.hxx
index b2d543d2f5..50e162a9f6 100644
--- a/src/Interface/Interface_ValueSatisfies.hxx
+++ b/src/Interface/Interface_ValueSatisfies.hxx
@@ -14,7 +14,7 @@
 #ifndef _Interface_ValueSatisfies_HeaderFile
 #define _Interface_ValueSatisfies_HeaderFile
 
-#include <Handle_TCollection_HAsciiString.hxx>
+#include <TCollection_HAsciiString.hxx>
 
 typedef Standard_Boolean (*Interface_ValueSatisfies) (const Handle(TCollection_HAsciiString)& val);
 
diff --git a/src/MoniTool/MoniTool_ValueInterpret.hxx b/src/MoniTool/MoniTool_ValueInterpret.hxx
index adb4bf330d..3f16ba52ad 100644
--- a/src/MoniTool/MoniTool_ValueInterpret.hxx
+++ b/src/MoniTool/MoniTool_ValueInterpret.hxx
@@ -18,7 +18,8 @@
 
 #include <Standard_Type.hxx>
 #include <TCollection_HAsciiString.hxx>
-#include <Handle_MoniTool_TypedValue.hxx>
+
+class Handle(MoniTool_TypedValue);
 
 typedef Handle(TCollection_HAsciiString)  (*MoniTool_ValueInterpret) (const Handle(MoniTool_TypedValue)& typval,
 								      const Handle(TCollection_HAsciiString)& val,
diff --git a/src/Poly/FILES b/src/Poly/FILES
index 469fe619a5..e4b2681c1e 100755
--- a/src/Poly/FILES
+++ b/src/Poly/FILES
@@ -1,4 +1,3 @@
-Handle_Poly_CoherentTriangulation.hxx
 Poly_CoherentTriangulation.hxx
 Poly_CoherentTriangle.hxx
 Poly_CoherentTriPtr.hxx
diff --git a/src/Poly/Handle_Poly_CoherentTriangulation.hxx b/src/Poly/Handle_Poly_CoherentTriangulation.hxx
deleted file mode 100644
index d6dc2f5b9f..0000000000
--- a/src/Poly/Handle_Poly_CoherentTriangulation.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Created on: 2008-04-23
-// Created by: Alexander GRIGORIEV
-// Copyright (c) 2008-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef Handle_Poly_CoherentTriangulation_HeaderFile
-#define Handle_Poly_CoherentTriangulation_HeaderFile
-
-#include <Standard_DefineHandle.hxx>
-#include <Standard_Transient.hxx>
-
-class Poly_CoherentTriangulation;
-
-//! Definition of HANDLE object using Standard_DefineHandle.hxx
-DEFINE_STANDARD_HANDLE (Poly_CoherentTriangulation, Standard_Transient)
-
-#endif
diff --git a/src/Poly/Poly_CoherentTriangulation.hxx b/src/Poly/Poly_CoherentTriangulation.hxx
index 53141cdbd9..1fa1b2106c 100644
--- a/src/Poly/Poly_CoherentTriangulation.hxx
+++ b/src/Poly/Poly_CoherentTriangulation.hxx
@@ -16,7 +16,7 @@
 #ifndef Poly_CoherentTriangulation_HeaderFile
 #define Poly_CoherentTriangulation_HeaderFile
 
-#include <Handle_Poly_Triangulation.hxx>
+#include <Poly_Triangulation.hxx>
 #include <Poly_CoherentNode.hxx>
 #include <Poly_CoherentTriangle.hxx>
 #include <Poly_CoherentLink.hxx>
@@ -33,6 +33,11 @@ typedef NCollection_Vector<Poly_CoherentNode>::Iterator
 typedef NCollection_Vector<Poly_CoherentLink>::Iterator
                                 Poly_BaseIteratorOfCoherentLink;
 
+//! Definition of HANDLE object using Standard_DefineHandle.hxx
+#include <Standard_DefineHandle.hxx>
+class Poly_CoherentTriangulation;
+DEFINE_STANDARD_HANDLE (Poly_CoherentTriangulation, Standard_Transient)
+
 /**
  * Triangulation structure that allows to:
  * <ul>
@@ -409,6 +414,6 @@ DEFINE_STANDARD_RTTI (Poly_CoherentTriangulation)
   friend class IteratorOfLink;
 };
 
-#include <Handle_Poly_CoherentTriangulation.hxx>
+#include <Poly_CoherentTriangulation.hxx>
 
 #endif
diff --git a/src/Poly/Poly_ListOfTriangulation.hxx b/src/Poly/Poly_ListOfTriangulation.hxx
index 53c0969de9..38a6a502e4 100644
--- a/src/Poly/Poly_ListOfTriangulation.hxx
+++ b/src/Poly/Poly_ListOfTriangulation.hxx
@@ -17,7 +17,7 @@
 #define Poly_ListOfTriangulation_HeaderFile
 
 #include <NCollection_List.hxx>
-#include <Handle_Poly_Triangulation.hxx>
+#include <Poly_Triangulation.hxx>
 
 /**
  * List of Poly_Triangulation instances.
diff --git a/src/ProjLib/ProjLib_ComputeApprox.cxx b/src/ProjLib/ProjLib_ComputeApprox.cxx
index 36f105504b..9871ac4233 100644
--- a/src/ProjLib/ProjLib_ComputeApprox.cxx
+++ b/src/ProjLib/ProjLib_ComputeApprox.cxx
@@ -32,9 +32,7 @@
 #include <Precision.hxx>
 #include <Approx_FitAndDivide2d.hxx>
 #include <AppParCurves_MultiCurve.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColgp_Array1OfPnt.hxx>
diff --git a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
index 32175f18cb..013fe7bc46 100644
--- a/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
+++ b/src/ProjLib/ProjLib_ComputeApproxOnPolarSurface.cxx
@@ -52,8 +52,6 @@
 
 #include <GeomAbs_SurfaceType.hxx>
 #include <GeomAbs_CurveType.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_Surface.hxx>
 #include <Adaptor3d_Curve.hxx>
 #include <Adaptor3d_HSurface.hxx>
diff --git a/src/ProjLib/ProjLib_ProjectOnSurface.cxx b/src/ProjLib/ProjLib_ProjectOnSurface.cxx
index d497dae918..bd4f7e8a36 100644
--- a/src/ProjLib/ProjLib_ProjectOnSurface.cxx
+++ b/src/ProjLib/ProjLib_ProjectOnSurface.cxx
@@ -25,9 +25,7 @@
 #include <BSplCLib.hxx>
 #include <PLib.hxx>
 #include <Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_Array1OfInteger.hxx>
diff --git a/src/ProjLib/ProjLib_ProjectedCurve.cxx b/src/ProjLib/ProjLib_ProjectedCurve.cxx
index b693264e32..6be1457708 100644
--- a/src/ProjLib/ProjLib_ProjectedCurve.cxx
+++ b/src/ProjLib/ProjLib_ProjectedCurve.cxx
@@ -25,8 +25,6 @@
 #include <ProjLib_ComputeApproxOnPolarSurface.hxx>
 #include <ProjLib_ComputeApprox.hxx>
 #include <ProjLib_Projector.hxx>
-#include <Handle_Adaptor3d_HCurve.hxx>
-#include <Handle_Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <Approx_CurveOnSurface.hxx>
@@ -36,12 +34,8 @@
 #include <ProjLib_Sphere.hxx>
 #include <ProjLib_Torus.hxx>
 #include <Precision.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Handle_Geom2d_BSplineCurve.hxx>
 #include <Geom2d_BezierCurve.hxx>
-#include <Handle_Geom2d_BezierCurve.hxx>
-#include <Handle_Adaptor2d_HCurve2d.hxx>
 #include <gp_Vec2d.hxx>
 #include <StdFail_NotDone.hxx>
 #include <gp_XY.hxx>
diff --git a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
index bf7bec824a..888ac064d7 100644
--- a/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
+++ b/src/SelectMgr/SelectMgr_DataMapOfObjectOwners.hxx
@@ -17,7 +17,7 @@
 #define _SelectMgr_DataMapOfObjectOwners_HeaderFile
 
 #include <NCollection_DefineDataMap.hxx>
-#include <Handle_SelectMgr_SelectableObject.hxx>
+#include <SelectMgr_SelectableObject.hxx>
 #include <SelectMgr_SequenceOfOwner.hxx>
 
 inline Standard_Boolean IsEqual (const Handle_SelectMgr_SelectableObject& theH1,
diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx
index 20a8c1697e..592d6444f7 100644
--- a/src/ShapeFix/ShapeFix_Wire.cxx
+++ b/src/ShapeFix/ShapeFix_Wire.cxx
@@ -109,7 +109,6 @@
 #include <Geom_OffsetCurve.hxx>
 
 #include <TColStd_HSequenceOfReal.hxx>
-#include <Handle_Geom2dAdaptor_HCurve.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Geom2dAdaptor_HCurve.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
diff --git a/src/ShapeProcess/ShapeProcess_OperFunc.hxx b/src/ShapeProcess/ShapeProcess_OperFunc.hxx
index 86c613cb18..23fe51b993 100644
--- a/src/ShapeProcess/ShapeProcess_OperFunc.hxx
+++ b/src/ShapeProcess/ShapeProcess_OperFunc.hxx
@@ -17,7 +17,7 @@
 #define ShapeProcess_OperFunc_HeaderFile
 
 #include <Standard_Type.hxx>
-#include <Handle_ShapeProcess_Context.hxx>
+#include <ShapeProcess_Context.hxx>
 
 typedef Standard_Boolean (*ShapeProcess_OperFunc) (const Handle(ShapeProcess_Context)& context);
 
diff --git a/src/Standard/Handle_Standard_Persistent.cxx b/src/Standard/Handle_Standard_Persistent.cxx
index 2fe8c689ce..44c48bd668 100644
--- a/src/Standard/Handle_Standard_Persistent.cxx
+++ b/src/Standard/Handle_Standard_Persistent.cxx
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Persistent.hxx>
+#include <Standard_Persistent.hxx>
 
 
 
diff --git a/src/Standard/Handle_Standard_Transient.cxx b/src/Standard/Handle_Standard_Transient.cxx
index 6f64d77f65..efb2d4258d 100644
--- a/src/Standard/Handle_Standard_Transient.cxx
+++ b/src/Standard/Handle_Standard_Transient.cxx
@@ -12,7 +12,7 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Transient.hxx>
+#include <Standard_Transient.hxx>
 #include <Standard_Atomic.hxx>
 
 //============================================================================
diff --git a/src/Standard/Standard_Persistent.cxx b/src/Standard/Standard_Persistent.cxx
index 7501a87710..2006e338c7 100644
--- a/src/Standard/Standard_Persistent.cxx
+++ b/src/Standard/Standard_Persistent.cxx
@@ -12,7 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Handle_Standard_Persistent.hxx>
 #include <Standard_Persistent.hxx>
 
 #include <Standard_Failure.hxx>
diff --git a/src/Standard/Standard_Persistent_proto.hxx b/src/Standard/Standard_Persistent_proto.hxx
index d1a05b2be7..7e940cc6cf 100644
--- a/src/Standard/Standard_Persistent_proto.hxx
+++ b/src/Standard/Standard_Persistent_proto.hxx
@@ -28,7 +28,6 @@
 #include <Standard.hxx>
 #endif
 
-class Handle_Standard_Persistent;
 class Standard_Type;
 class Handle_Standard_Type;
 class Standard_Type;
diff --git a/src/StdPrs/StdPrs_HLRShape.hxx b/src/StdPrs/StdPrs_HLRShape.hxx
index 18b33450d9..7b2d002034 100755
--- a/src/StdPrs/StdPrs_HLRShape.hxx
+++ b/src/StdPrs/StdPrs_HLRShape.hxx
@@ -15,9 +15,9 @@
 #define _StdPrs_HLRFace_H__
 
 #include <Prs3d_Root.hxx>
-#include <Handle_Prs3d_Presentation.hxx>
-#include <Handle_Prs3d_Drawer.hxx>
-#include <Handle_Prs3d_Projector.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_Projector.hxx>
 
 class StdPrs_HLRShape: public Prs3d_Root
 {
diff --git a/src/TDF/TDF_AttributeIterator.hxx b/src/TDF/TDF_AttributeIterator.hxx
index 6523baf2de..dae1020c62 100644
--- a/src/TDF/TDF_AttributeIterator.hxx
+++ b/src/TDF/TDF_AttributeIterator.hxx
@@ -31,7 +31,7 @@
 #define TDF_AttributeIterator_HeaderFile
 
 #ifndef _Handle_TDF_Attribute_HeaderFile
-#include <Handle_TDF_Attribute.hxx>
+#include <TDF_Attribute.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx b/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
index 177f443e70..3f108d9eca 100644
--- a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
+++ b/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx
@@ -21,7 +21,6 @@
 #include <TColStd_HArray1OfReal.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <Handle_Geom_BSplineCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <gp_Pnt.hxx>
 
diff --git a/src/TopTools/TopTools_MutexForShapeProvider.hxx b/src/TopTools/TopTools_MutexForShapeProvider.hxx
index 037914a2a3..bb7bb01607 100644
--- a/src/TopTools/TopTools_MutexForShapeProvider.hxx
+++ b/src/TopTools/TopTools_MutexForShapeProvider.hxx
@@ -16,7 +16,7 @@
 #ifndef _TopTools_MutexForShapeProvider_HeaderFile
 #define _TopTools_MutexForShapeProvider_HeaderFile
 
-#include <Handle_TopoDS_TShape.hxx>
+#include <TopoDS_TShape.hxx>
 #include <NCollection_DataMap.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 
diff --git a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
index c5d61417bf..64616f2d20 100644
--- a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
+++ b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
@@ -17,7 +17,6 @@
 #define VrmlData_DataMapOfShapeAppearance_HeaderFile
 
 #include <NCollection_DataMap.hxx>
-#include <Handle_TopoDS_TShape.hxx>
 #include <VrmlData_Appearance.hxx>
 #include <TopoDS_TShape.hxx>
 
diff --git a/src/VrmlData/VrmlData_Geometry.hxx b/src/VrmlData/VrmlData_Geometry.hxx
index da1e9aafc8..3ad9e2bc04 100644
--- a/src/VrmlData/VrmlData_Geometry.hxx
+++ b/src/VrmlData/VrmlData_Geometry.hxx
@@ -17,7 +17,7 @@
 #define VrmlData_Geometry_HeaderFile
 
 #include <VrmlData_Node.hxx>
-#include <Handle_TopoDS_TShape.hxx>
+#include <TopoDS_TShape.hxx>
 
 /**
  *  Implementation of the Geometry node.
diff --git a/src/VrmlData/VrmlData_Node.hxx b/src/VrmlData/VrmlData_Node.hxx
index 814befd185..f2ec769dc3 100644
--- a/src/VrmlData/VrmlData_Node.hxx
+++ b/src/VrmlData/VrmlData_Node.hxx
@@ -16,7 +16,7 @@
 #ifndef VrmlData_Node_HeaderFile
 #define VrmlData_Node_HeaderFile
 
-#include <Handle_Standard_Type.hxx>
+#include <Standard_Type.hxx>
 #include <NCollection_List.hxx>
 #include <Standard_DefineHandle.hxx>
 #include <Standard_TypeDef.hxx>
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
index ac53d2272d..becbb7b4f7 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentRetrievalDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <XmlLDrivers_DocumentRetrievalDriver.hxx>
-#include <Handle_XmlMDF_ADriverTable.hxx>
+#include <XmlMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);
 
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
index a95887fb4b..cdbf9a8554 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers_DocumentStorageDriver.hxx
@@ -20,7 +20,7 @@
 
 #include <TObj_Common.hxx>
 #include <XmlLDrivers_DocumentStorageDriver.hxx>
-#include <Handle_XmlMDF_ADriverTable.hxx>
+#include <XmlMDF_ADriverTable.hxx>
 
 class Handle(CDM_MessageDriver);