diff --git a/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute_0.cxx b/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute_0.cxx
index 2828fc50ef..cbb68bf0dc 100644
--- a/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute_0.cxx
@@ -30,4 +30,4 @@
 #define Squares_hxx <AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx>
 #define AppParCurves_BSpFunction AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute
 #define AppParCurves_BSpFunction_hxx <AppDef_BSpParFunctionOfMyBSplGradientOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_BSpFunction.gxx"
+#include <AppParCurves_BSpFunction.gxx>
diff --git a/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute_0.cxx b/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute_0.cxx
index af8b6ab711..61486cd3e9 100644
--- a/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute_0.cxx
@@ -32,4 +32,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_LeastSquare AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute
 #define AppParCurves_LeastSquare_hxx <AppDef_BSpParLeastSquareOfMyBSplGradientOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/AppDef/AppDef_BSplineCompute_0.cxx b/src/AppDef/AppDef_BSplineCompute_0.cxx
index 5cbdf39bd9..81209a4f19 100644
--- a/src/AppDef/AppDef_BSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_BSplineCompute_0.cxx
@@ -86,4 +86,4 @@
   <AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx>
 #define Approx_BSplComputeLine AppDef_BSplineCompute
 #define Approx_BSplComputeLine_hxx <AppDef_BSplineCompute.hxx>
-#include "../Approx/Approx_BSplComputeLine.gxx"
+#include <Approx_BSplComputeLine.gxx>
diff --git a/src/AppDef/AppDef_Compute_0.cxx b/src/AppDef/AppDef_Compute_0.cxx
index 4678ace7ee..4d0cd5e312 100644
--- a/src/AppDef/AppDef_Compute_0.cxx
+++ b/src/AppDef/AppDef_Compute_0.cxx
@@ -50,4 +50,4 @@
 #define Approx_Gradient_BFGSOfMyGradient_hxx <AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx>
 #define Approx_ComputeLine AppDef_Compute
 #define Approx_ComputeLine_hxx <AppDef_Compute.hxx>
-#include "../Approx/Approx_ComputeLine.gxx"
+#include <Approx_ComputeLine.gxx>
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute_0.cxx b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute_0.cxx
index dce8e19092..4e8d238ae3 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute_0.cxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientOfCompute_0.cxx
@@ -38,4 +38,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx>
 #define AppParCurves_Gradient AppDef_MyGradientOfCompute
 #define AppParCurves_Gradient_hxx <AppDef_MyGradientOfCompute.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute_0.cxx b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute_0.cxx
index c314e3c0d6..78f6a0ad41 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute_0.cxx
@@ -38,4 +38,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx>
 #define AppParCurves_Gradient AppDef_MyGradientbisOfBSplineCompute
 #define AppParCurves_Gradient_hxx <AppDef_MyGradientbisOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/AppDef/AppDef_Gradient_BFGSOfTheGradient_0.cxx b/src/AppDef/AppDef_Gradient_BFGSOfTheGradient_0.cxx
index 28a7b27763..b28e694396 100644
--- a/src/AppDef/AppDef_Gradient_BFGSOfTheGradient_0.cxx
+++ b/src/AppDef/AppDef_Gradient_BFGSOfTheGradient_0.cxx
@@ -38,4 +38,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfTheGradient.hxx>
 #define AppParCurves_Gradient AppDef_TheGradient
 #define AppParCurves_Gradient_hxx <AppDef_TheGradient.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute_0.cxx b/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute_0.cxx
index 9403d640fb..3980e1d889 100644
--- a/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_MyBSplGradientOfBSplineCompute_0.cxx
@@ -39,4 +39,4 @@
   <AppDef_BSpGradient_BFGSOfMyBSplGradientOfBSplineCompute.hxx>
 #define AppParCurves_BSpGradient AppDef_MyBSplGradientOfBSplineCompute
 #define AppParCurves_BSpGradient_hxx <AppDef_MyBSplGradientOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_BSpGradient.gxx"
+#include <AppParCurves_BSpGradient.gxx>
diff --git a/src/AppDef/AppDef_MyGradientOfCompute_0.cxx b/src/AppDef/AppDef_MyGradientOfCompute_0.cxx
index bc57b2864b..5c594cb3cd 100644
--- a/src/AppDef/AppDef_MyGradientOfCompute_0.cxx
+++ b/src/AppDef/AppDef_MyGradientOfCompute_0.cxx
@@ -40,4 +40,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfMyGradientOfCompute.hxx>
 #define AppParCurves_Gradient AppDef_MyGradientOfCompute
 #define AppParCurves_Gradient_hxx <AppDef_MyGradientOfCompute.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/AppDef/AppDef_MyGradientbisOfBSplineCompute_0.cxx b/src/AppDef/AppDef_MyGradientbisOfBSplineCompute_0.cxx
index f32fad46cf..add8e4f179 100644
--- a/src/AppDef/AppDef_MyGradientbisOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_MyGradientbisOfBSplineCompute_0.cxx
@@ -40,4 +40,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfMyGradientbisOfBSplineCompute.hxx>
 #define AppParCurves_Gradient AppDef_MyGradientbisOfBSplineCompute
 #define AppParCurves_Gradient_hxx <AppDef_MyGradientbisOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute_0.cxx b/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute_0.cxx
index 296bcc5d94..9d95c2eecf 100644
--- a/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute_0.cxx
+++ b/src/AppDef/AppDef_ParFunctionOfMyGradientOfCompute_0.cxx
@@ -32,4 +32,4 @@
 #define ResolCons_hxx <AppDef_ResConstraintOfMyGradientOfCompute.hxx>
 #define AppParCurves_Function AppDef_ParFunctionOfMyGradientOfCompute
 #define AppParCurves_Function_hxx <AppDef_ParFunctionOfMyGradientOfCompute.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute_0.cxx b/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute_0.cxx
index 0c9a3e1be3..64509e3b5f 100644
--- a/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_ParFunctionOfMyGradientbisOfBSplineCompute_0.cxx
@@ -32,4 +32,4 @@
 #define ResolCons_hxx <AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx>
 #define AppParCurves_Function AppDef_ParFunctionOfMyGradientbisOfBSplineCompute
 #define AppParCurves_Function_hxx <AppDef_ParFunctionOfMyGradientbisOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/AppDef/AppDef_ParFunctionOfTheGradient_0.cxx b/src/AppDef/AppDef_ParFunctionOfTheGradient_0.cxx
index 04836e4e7b..8040ddc56f 100644
--- a/src/AppDef/AppDef_ParFunctionOfTheGradient_0.cxx
+++ b/src/AppDef/AppDef_ParFunctionOfTheGradient_0.cxx
@@ -32,4 +32,4 @@
 #define ResolCons_hxx <AppDef_ResConstraintOfTheGradient.hxx>
 #define AppParCurves_Function AppDef_ParFunctionOfTheGradient
 #define AppParCurves_Function_hxx <AppDef_ParFunctionOfTheGradient.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute_0.cxx b/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute_0.cxx
index 0c79942d01..3d5067cef5 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute_0.cxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfMyGradientOfCompute_0.cxx
@@ -32,4 +32,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_LeastSquare AppDef_ParLeastSquareOfMyGradientOfCompute
 #define AppParCurves_LeastSquare_hxx <AppDef_ParLeastSquareOfMyGradientOfCompute.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute_0.cxx b/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute_0.cxx
index 1eeee41679..fe70d25add 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute_0.cxx
@@ -32,4 +32,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_LeastSquare AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute
 #define AppParCurves_LeastSquare_hxx <AppDef_ParLeastSquareOfMyGradientbisOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/AppDef/AppDef_ParLeastSquareOfTheGradient_0.cxx b/src/AppDef/AppDef_ParLeastSquareOfTheGradient_0.cxx
index 57619642f9..921e5bbb5d 100644
--- a/src/AppDef/AppDef_ParLeastSquareOfTheGradient_0.cxx
+++ b/src/AppDef/AppDef_ParLeastSquareOfTheGradient_0.cxx
@@ -32,4 +32,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_LeastSquare AppDef_ParLeastSquareOfTheGradient
 #define AppParCurves_LeastSquare_hxx <AppDef_ParLeastSquareOfTheGradient.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute_0.cxx b/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute_0.cxx
index 1879aa24bc..20dae9cd97 100644
--- a/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute_0.cxx
+++ b/src/AppDef/AppDef_ResConstraintOfMyGradientOfCompute_0.cxx
@@ -28,4 +28,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_ResolConstraint AppDef_ResConstraintOfMyGradientOfCompute
 #define AppParCurves_ResolConstraint_hxx <AppDef_ResConstraintOfMyGradientOfCompute.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute_0.cxx b/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute_0.cxx
index d7d40b7d8b..348e5a0a0c 100644
--- a/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute_0.cxx
+++ b/src/AppDef/AppDef_ResConstraintOfMyGradientbisOfBSplineCompute_0.cxx
@@ -28,4 +28,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_ResolConstraint AppDef_ResConstraintOfMyGradientbisOfBSplineCompute
 #define AppParCurves_ResolConstraint_hxx <AppDef_ResConstraintOfMyGradientbisOfBSplineCompute.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/AppDef/AppDef_ResConstraintOfTheGradient_0.cxx b/src/AppDef/AppDef_ResConstraintOfTheGradient_0.cxx
index 46fcc65c3f..38274dc577 100644
--- a/src/AppDef/AppDef_ResConstraintOfTheGradient_0.cxx
+++ b/src/AppDef/AppDef_ResConstraintOfTheGradient_0.cxx
@@ -28,4 +28,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_ResolConstraint AppDef_ResConstraintOfTheGradient
 #define AppParCurves_ResolConstraint_hxx <AppDef_ResConstraintOfTheGradient.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/AppDef/AppDef_TheFunction_0.cxx b/src/AppDef/AppDef_TheFunction_0.cxx
index a5b2298af5..5a53b04044 100644
--- a/src/AppDef/AppDef_TheFunction_0.cxx
+++ b/src/AppDef/AppDef_TheFunction_0.cxx
@@ -32,4 +32,4 @@
 #define ResolCons_hxx <AppDef_TheResol.hxx>
 #define AppParCurves_Function AppDef_TheFunction
 #define AppParCurves_Function_hxx <AppDef_TheFunction.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/AppDef/AppDef_TheGradient_0.cxx b/src/AppDef/AppDef_TheGradient_0.cxx
index 36ab3c7d32..b3158b2918 100644
--- a/src/AppDef/AppDef_TheGradient_0.cxx
+++ b/src/AppDef/AppDef_TheGradient_0.cxx
@@ -40,4 +40,4 @@
 #define AppParCurves_Gradient_BFGS_hxx <AppDef_Gradient_BFGSOfTheGradient.hxx>
 #define AppParCurves_Gradient AppDef_TheGradient
 #define AppParCurves_Gradient_hxx <AppDef_TheGradient.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/AppDef/AppDef_TheLeastSquares_0.cxx b/src/AppDef/AppDef_TheLeastSquares_0.cxx
index 5665bc2ddd..e88a0e0ab8 100644
--- a/src/AppDef/AppDef_TheLeastSquares_0.cxx
+++ b/src/AppDef/AppDef_TheLeastSquares_0.cxx
@@ -32,4 +32,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_LeastSquare AppDef_TheLeastSquares
 #define AppParCurves_LeastSquare_hxx <AppDef_TheLeastSquares.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/AppDef/AppDef_TheResol_0.cxx b/src/AppDef/AppDef_TheResol_0.cxx
index 3568d82348..e8aa0bc2e0 100644
--- a/src/AppDef/AppDef_TheResol_0.cxx
+++ b/src/AppDef/AppDef_TheResol_0.cxx
@@ -28,4 +28,4 @@
 #define ToolLine_hxx <AppDef_MyLineTool.hxx>
 #define AppParCurves_ResolConstraint AppDef_TheResol
 #define AppParCurves_ResolConstraint_hxx <AppDef_TheResol.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/Approx/Approx_FitAndDivide2d_0.cxx b/src/Approx/Approx_FitAndDivide2d_0.cxx
index 85d3a34fc0..ad3b2e770e 100644
--- a/src/Approx/Approx_FitAndDivide2d_0.cxx
+++ b/src/Approx/Approx_FitAndDivide2d_0.cxx
@@ -22,4 +22,4 @@
 #define MultiLine_hxx <AppCont_Function.hxx>
 #define Approx_ComputeCLine Approx_FitAndDivide2d
 #define Approx_ComputeCLine_hxx <Approx_FitAndDivide2d.hxx>
-#include "../Approx/Approx_ComputeCLine.gxx"
+#include <Approx_ComputeCLine.gxx>
diff --git a/src/Approx/Approx_FitAndDivide_0.cxx b/src/Approx/Approx_FitAndDivide_0.cxx
index 786dc26240..43bd57a131 100644
--- a/src/Approx/Approx_FitAndDivide_0.cxx
+++ b/src/Approx/Approx_FitAndDivide_0.cxx
@@ -22,4 +22,4 @@
 #define MultiLine_hxx <AppCont_Function.hxx>
 #define Approx_ComputeCLine Approx_FitAndDivide
 #define Approx_ComputeCLine_hxx <Approx_FitAndDivide.hxx>
-#include "../Approx/Approx_ComputeCLine.gxx"
+#include <Approx_ComputeCLine.gxx>
diff --git a/src/BRepApprox/BRepApprox_Approx_0.cxx b/src/BRepApprox/BRepApprox_Approx_0.cxx
index fb6c623b1a..4ae368de95 100644
--- a/src/BRepApprox/BRepApprox_Approx_0.cxx
+++ b/src/BRepApprox/BRepApprox_Approx_0.cxx
@@ -95,4 +95,4 @@
   <BRepApprox_MyGradientOfTheComputeLineBezierOfApprox.hxx>
 #define ApproxInt_Approx BRepApprox_Approx
 #define ApproxInt_Approx_hxx <BRepApprox_Approx.hxx>
-#include "../ApproxInt/ApproxInt_Approx.gxx"
+#include <ApproxInt_Approx.gxx>
diff --git a/src/BRepApprox/BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
index 2d664d0aab..395f7a9751 100644
--- a/src/BRepApprox/BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
@@ -41,4 +41,4 @@
   <BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox.hxx>
 #define AppParCurves_BSpGradient BRepApprox_MyBSplGradientOfTheComputeLineOfApprox
 #define AppParCurves_BSpGradient_hxx <BRepApprox_MyBSplGradientOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpGradient_BFGS.gxx"
+#include <AppParCurves_BSpGradient_BFGS.gxx>
diff --git a/src/BRepApprox/BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
index 340118a6c5..0cfe8a8ed4 100644
--- a/src/BRepApprox/BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
@@ -31,4 +31,4 @@
 #define AppParCurves_BSpFunction BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox
 #define AppParCurves_BSpFunction_hxx                                                               \
   <BRepApprox_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpFunction.gxx"
+#include <AppParCurves_BSpFunction.gxx>
diff --git a/src/BRepApprox/BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
index 954eb53871..a3d703224c 100644
--- a/src/BRepApprox/BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox_0.cxx
@@ -34,4 +34,4 @@
   BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <BRepApprox_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
index 6649ade6c0..63ccdb91b7 100644
--- a/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
@@ -45,4 +45,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
 #define AppParCurves_Gradient BRepApprox_MyGradientOfTheComputeLineBezierOfApprox
 #define AppParCurves_Gradient_hxx <BRepApprox_MyGradientOfTheComputeLineBezierOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
index 6d54dd0011..04d89d48c0 100644
--- a/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
@@ -42,4 +42,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox.hxx>
 #define AppParCurves_Gradient BRepApprox_MyGradientbisOfTheComputeLineOfApprox
 #define AppParCurves_Gradient_hxx <BRepApprox_MyGradientbisOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/BRepApprox/BRepApprox_MyBSplGradientOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_MyBSplGradientOfTheComputeLineOfApprox_0.cxx
index 20ab5f4e14..01617ebff1 100644
--- a/src/BRepApprox/BRepApprox_MyBSplGradientOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_MyBSplGradientOfTheComputeLineOfApprox_0.cxx
@@ -43,4 +43,4 @@
   <BRepApprox_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfApprox.hxx>
 #define AppParCurves_BSpGradient BRepApprox_MyBSplGradientOfTheComputeLineOfApprox
 #define AppParCurves_BSpGradient_hxx <BRepApprox_MyBSplGradientOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpGradient.gxx"
+#include <AppParCurves_BSpGradient.gxx>
diff --git a/src/BRepApprox/BRepApprox_MyGradientOfTheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_MyGradientOfTheComputeLineBezierOfApprox_0.cxx
index 0de653a7df..b97e55dc99 100644
--- a/src/BRepApprox/BRepApprox_MyGradientOfTheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_MyGradientOfTheComputeLineBezierOfApprox_0.cxx
@@ -47,4 +47,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
 #define AppParCurves_Gradient BRepApprox_MyGradientOfTheComputeLineBezierOfApprox
 #define AppParCurves_Gradient_hxx <BRepApprox_MyGradientOfTheComputeLineBezierOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/BRepApprox/BRepApprox_MyGradientbisOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_MyGradientbisOfTheComputeLineOfApprox_0.cxx
index 076c7032a7..b3f3893f02 100644
--- a/src/BRepApprox/BRepApprox_MyGradientbisOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_MyGradientbisOfTheComputeLineOfApprox_0.cxx
@@ -44,4 +44,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox.hxx>
 #define AppParCurves_Gradient BRepApprox_MyGradientbisOfTheComputeLineOfApprox
 #define AppParCurves_Gradient_hxx <BRepApprox_MyGradientbisOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
index 5ef48b55bd..b0553eaf88 100644
--- a/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_Function BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox
 #define AppParCurves_Function_hxx                                                                  \
   <BRepApprox_ParFunctionOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
index f9dc779156..d6ff81aea6 100644
--- a/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_Function BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox
 #define AppParCurves_Function_hxx                                                                  \
   <BRepApprox_ParFunctionOfMyGradientbisOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
index cf13cb040d..878a7fdf33 100644
--- a/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_LeastSquare BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <BRepApprox_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
index 6e440360e8..257c11ac8b 100644
--- a/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_LeastSquare BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <BRepApprox_ParLeastSquareOfMyGradientbisOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
index 274eb396a8..1163451424 100644
--- a/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox_0.cxx
@@ -30,4 +30,4 @@
   BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox
 #define AppParCurves_ResolConstraint_hxx                                                           \
   <BRepApprox_ResConstraintOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
index f893b21c38..0fcd0b9815 100644
--- a/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox_0.cxx
@@ -29,4 +29,4 @@
 #define AppParCurves_ResolConstraint BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox
 #define AppParCurves_ResolConstraint_hxx                                                           \
   <BRepApprox_ResConstraintOfMyGradientbisOfTheComputeLineOfApprox.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheComputeLineBezierOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheComputeLineBezierOfApprox_0.cxx
index af4d7a17c9..64e49e95e2 100644
--- a/src/BRepApprox/BRepApprox_TheComputeLineBezierOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheComputeLineBezierOfApprox_0.cxx
@@ -66,4 +66,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfApprox.hxx>
 #define Approx_ComputeLine BRepApprox_TheComputeLineBezierOfApprox
 #define Approx_ComputeLine_hxx <BRepApprox_TheComputeLineBezierOfApprox.hxx>
-#include "../Approx/Approx_ComputeLine.gxx"
+#include <Approx_ComputeLine.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheComputeLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheComputeLineOfApprox_0.cxx
index 0c75321b3e..b0bb6e4e10 100644
--- a/src/BRepApprox/BRepApprox_TheComputeLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheComputeLineOfApprox_0.cxx
@@ -96,4 +96,4 @@
   <BRepApprox_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfApprox.hxx>
 #define Approx_BSplComputeLine BRepApprox_TheComputeLineOfApprox
 #define Approx_BSplComputeLine_hxx <BRepApprox_TheComputeLineOfApprox.hxx>
-#include "../Approx/Approx_BSplComputeLine.gxx"
+#include <Approx_BSplComputeLine.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
index bae6522d96..727b3ce5ba 100644
--- a/src/BRepApprox/BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
@@ -28,4 +28,4 @@
 #define ThePSurfaceTool_hxx <BRepApprox_SurfaceTool.hxx>
 #define IntImp_ZerParFunc BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox
 #define IntImp_ZerParFunc_hxx <BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox.hxx>
-#include "../IntImp/IntImp_ZerParFunc.gxx"
+#include <IntImp_ZerParFunc.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheImpPrmSvSurfacesOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheImpPrmSvSurfacesOfApprox_0.cxx
index b9124f4808..3682f2f690 100644
--- a/src/BRepApprox/BRepApprox_TheImpPrmSvSurfacesOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheImpPrmSvSurfacesOfApprox_0.cxx
@@ -41,4 +41,4 @@
 #define ApproxInt_TheZerImpFunc_hxx <BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox.hxx>
 #define ApproxInt_ImpPrmSvSurfaces BRepApprox_TheImpPrmSvSurfacesOfApprox
 #define ApproxInt_ImpPrmSvSurfaces_hxx <BRepApprox_TheImpPrmSvSurfacesOfApprox.hxx>
-#include "../ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx"
+#include <ApproxInt_ImpPrmSvSurfaces.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
index eb31b64159..0ab689a4f5 100644
--- a/src/BRepApprox/BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox_0.cxx
@@ -36,4 +36,4 @@
 #define IntImp_TheFunction_hxx <BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox.hxx>
 #define IntImp_Int2S BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox
 #define IntImp_Int2S_hxx <BRepApprox_TheInt2SOfThePrmPrmSvSurfacesOfApprox.hxx>
-#include "../IntImp/IntImp_Int2S.gxx"
+#include <IntImp_Int2S.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheMultiLineOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheMultiLineOfApprox_0.cxx
index 3dbea8a682..2bd6920845 100644
--- a/src/BRepApprox/BRepApprox_TheMultiLineOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheMultiLineOfApprox_0.cxx
@@ -26,4 +26,4 @@
 #define TheSvSurfaces_hxx <ApproxInt_SvSurfaces.hxx>
 #define ApproxInt_MultiLine BRepApprox_TheMultiLineOfApprox
 #define ApproxInt_MultiLine_hxx <BRepApprox_TheMultiLineOfApprox.hxx>
-#include "../ApproxInt/ApproxInt_MultiLine.gxx"
+#include <ApproxInt_MultiLine.gxx>
diff --git a/src/BRepApprox/BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx b/src/BRepApprox/BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx
index 67e0a39a64..381278fd9c 100644
--- a/src/BRepApprox/BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_ThePrmPrmSvSurfacesOfApprox_0.cxx
@@ -44,4 +44,4 @@
   <BRepApprox_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfApprox.hxx>
 #define ApproxInt_PrmPrmSvSurfaces BRepApprox_ThePrmPrmSvSurfacesOfApprox
 #define ApproxInt_PrmPrmSvSurfaces_hxx <BRepApprox_ThePrmPrmSvSurfacesOfApprox.hxx>
-#include "../ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx"
+#include <ApproxInt_PrmPrmSvSurfaces.gxx>
diff --git a/src/BRepApprox/BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox_0.cxx b/src/BRepApprox/BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox_0.cxx
index dbc31fabf2..92d3c5a8a9 100644
--- a/src/BRepApprox/BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox_0.cxx
+++ b/src/BRepApprox/BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox_0.cxx
@@ -36,4 +36,4 @@
 #define TheISurfaceTool_hxx <IntSurf_QuadricTool.hxx>
 #define IntImp_ZerImpFunc BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox
 #define IntImp_ZerImpFunc_hxx <BRepApprox_TheZerImpFuncOfTheImpPrmSvSurfacesOfApprox.hxx>
-#include "../IntImp/IntImp_ZerImpFunc.gxx"
+#include <IntImp_ZerImpFunc.gxx>
diff --git a/src/BRepBlend/BRepBlend_AppSurf_0.cxx b/src/BRepBlend/BRepBlend_AppSurf_0.cxx
index 40a2fdd3d3..aeef462008 100644
--- a/src/BRepBlend/BRepBlend_AppSurf_0.cxx
+++ b/src/BRepBlend/BRepBlend_AppSurf_0.cxx
@@ -29,4 +29,4 @@
 #define TheLine_hxx <BRepBlend_Line.hxx>
 #define AppBlend_AppSurf BRepBlend_AppSurf
 #define AppBlend_AppSurf_hxx <BRepBlend_AppSurf.hxx>
-#include "../AppBlend/AppBlend_AppSurf.gxx"
+#include <AppBlend_AppSurf.gxx>
diff --git a/src/BRepClass/BRepClass_FClass2dOfFClassifier_0.cxx b/src/BRepClass/BRepClass_FClass2dOfFClassifier_0.cxx
index 55ba5141f8..e06138ef61 100644
--- a/src/BRepClass/BRepClass_FClass2dOfFClassifier_0.cxx
+++ b/src/BRepClass/BRepClass_FClass2dOfFClassifier_0.cxx
@@ -27,4 +27,4 @@
 #define TheIntersector_hxx <BRepClass_Intersector.hxx>
 #define TopClass_Classifier2d BRepClass_FClass2dOfFClassifier
 #define TopClass_Classifier2d_hxx <BRepClass_FClass2dOfFClassifier.hxx>
-#include "../TopClass/TopClass_Classifier2d.gxx"
+#include <TopClass_Classifier2d.gxx>
diff --git a/src/BRepClass/BRepClass_FClassifier_0.cxx b/src/BRepClass/BRepClass_FClassifier_0.cxx
index 8b48d2081e..bf2db10e93 100644
--- a/src/BRepClass/BRepClass_FClassifier_0.cxx
+++ b/src/BRepClass/BRepClass_FClassifier_0.cxx
@@ -33,4 +33,4 @@
 #define TopClass_FClass2d_hxx <BRepClass_FClass2dOfFClassifier.hxx>
 #define TopClass_FaceClassifier BRepClass_FClassifier
 #define TopClass_FaceClassifier_hxx <BRepClass_FClassifier.hxx>
-#include "../TopClass/TopClass_FaceClassifier.gxx"
+#include <TopClass_FaceClassifier.gxx>
diff --git a/src/BRepClass/BRepClass_FacePassiveClassifier_0.cxx b/src/BRepClass/BRepClass_FacePassiveClassifier_0.cxx
index aad586b873..d1b7d2eb42 100644
--- a/src/BRepClass/BRepClass_FacePassiveClassifier_0.cxx
+++ b/src/BRepClass/BRepClass_FacePassiveClassifier_0.cxx
@@ -27,4 +27,4 @@
 #define TheIntersector_hxx <BRepClass_Intersector.hxx>
 #define TopClass_Classifier2d BRepClass_FacePassiveClassifier
 #define TopClass_Classifier2d_hxx <BRepClass_FacePassiveClassifier.hxx>
-#include "../TopClass/TopClass_Classifier2d.gxx"
+#include <TopClass_Classifier2d.gxx>
diff --git a/src/BRepFill/BRepFill_ComputeCLine_0.cxx b/src/BRepFill/BRepFill_ComputeCLine_0.cxx
index 6facd6027b..9dee1a19c2 100644
--- a/src/BRepFill/BRepFill_ComputeCLine_0.cxx
+++ b/src/BRepFill/BRepFill_ComputeCLine_0.cxx
@@ -22,4 +22,4 @@
 #define MultiLine_hxx <BRepFill_MultiLine.hxx>
 #define Approx_ComputeCLine BRepFill_ComputeCLine
 #define Approx_ComputeCLine_hxx <BRepFill_ComputeCLine.hxx>
-#include "../Approx/Approx_ComputeCLine.gxx"
+#include <Approx_ComputeCLine.gxx>
diff --git a/src/BRepLProp/BRepLProp_CLProps_0.cxx b/src/BRepLProp/BRepLProp_CLProps_0.cxx
index 758d9d7721..a03d03e2fc 100644
--- a/src/BRepLProp/BRepLProp_CLProps_0.cxx
+++ b/src/BRepLProp/BRepLProp_CLProps_0.cxx
@@ -38,4 +38,4 @@
 #define Tool_hxx <BRepLProp_CurveTool.hxx>
 #define LProp_CLProps BRepLProp_CLProps
 #define LProp_CLProps_hxx <BRepLProp_CLProps.hxx>
-#include "../LProp/LProp_CLProps.gxx"
+#include <LProp_CLProps.gxx>
diff --git a/src/BRepLProp/BRepLProp_SLProps_0.cxx b/src/BRepLProp/BRepLProp_SLProps_0.cxx
index 6d0bf59845..d01d3762a7 100644
--- a/src/BRepLProp/BRepLProp_SLProps_0.cxx
+++ b/src/BRepLProp/BRepLProp_SLProps_0.cxx
@@ -32,4 +32,4 @@
 #define Tool_hxx <BRepLProp_SurfaceTool.hxx>
 #define LProp_SLProps BRepLProp_SLProps
 #define LProp_SLProps_hxx <BRepLProp_SLProps.hxx>
-#include "../LProp/LProp_SLProps.gxx"
+#include <LProp_SLProps.gxx>
diff --git a/src/BSplCLib/BSplCLib_1.cxx b/src/BSplCLib/BSplCLib_1.cxx
index 8a56a0c346..925b4e607e 100644
--- a/src/BSplCLib/BSplCLib_1.cxx
+++ b/src/BSplCLib/BSplCLib_1.cxx
@@ -38,4 +38,4 @@
 
 #define BSplCLib_DataContainer BSplCLib_DataContainer_2d
 
-#include "../BSplCLib/BSplCLib_CurveComputation.gxx"
+#include <BSplCLib_CurveComputation.gxx>
diff --git a/src/BSplCLib/BSplCLib_3.cxx b/src/BSplCLib/BSplCLib_3.cxx
index 9884bd3442..5888bd4a32 100644
--- a/src/BSplCLib/BSplCLib_3.cxx
+++ b/src/BSplCLib/BSplCLib_3.cxx
@@ -47,4 +47,4 @@
 
 #define BSplCLib_DataContainer BSplCLib_DataContainer_3d
 
-#include "../BSplCLib/BSplCLib_CurveComputation.gxx"
+#include <BSplCLib_CurveComputation.gxx>
diff --git a/src/Bnd/Bnd_B2d_0.cxx b/src/Bnd/Bnd_B2d_0.cxx
index 60eb30f3ee..0a2c50d901 100644
--- a/src/Bnd/Bnd_B2d_0.cxx
+++ b/src/Bnd/Bnd_B2d_0.cxx
@@ -25,4 +25,4 @@
 #define RealType_hxx <Standard_Real.hxx>
 #define Bnd_B2x Bnd_B2d
 #define Bnd_B2x_hxx <Bnd_B2d.hxx>
-#include "../Bnd/Bnd_B2x.gxx"
+#include <Bnd_B2x.gxx>
diff --git a/src/Bnd/Bnd_B2f_0.cxx b/src/Bnd/Bnd_B2f_0.cxx
index 46267b3a3d..767f43d9a5 100644
--- a/src/Bnd/Bnd_B2f_0.cxx
+++ b/src/Bnd/Bnd_B2f_0.cxx
@@ -25,4 +25,4 @@
 #define RealType_hxx <Standard_ShortReal.hxx>
 #define Bnd_B2x Bnd_B2f
 #define Bnd_B2x_hxx <Bnd_B2f.hxx>
-#include "../Bnd/Bnd_B2x.gxx"
+#include <Bnd_B2x.gxx>
diff --git a/src/Bnd/Bnd_B3d_0.cxx b/src/Bnd/Bnd_B3d_0.cxx
index c5e840e4f7..88a4fdcaa3 100644
--- a/src/Bnd/Bnd_B3d_0.cxx
+++ b/src/Bnd/Bnd_B3d_0.cxx
@@ -26,4 +26,4 @@
 #define RealType_hxx <Standard_Real.hxx>
 #define Bnd_B3x Bnd_B3d
 #define Bnd_B3x_hxx <Bnd_B3d.hxx>
-#include "../Bnd/Bnd_B3x.gxx"
+#include <Bnd_B3x.gxx>
diff --git a/src/Bnd/Bnd_B3f_0.cxx b/src/Bnd/Bnd_B3f_0.cxx
index f035a6a46f..e676a57817 100644
--- a/src/Bnd/Bnd_B3f_0.cxx
+++ b/src/Bnd/Bnd_B3f_0.cxx
@@ -26,4 +26,4 @@
 #define RealType_hxx <Standard_ShortReal.hxx>
 #define Bnd_B3x Bnd_B3f
 #define Bnd_B3x_hxx <Bnd_B3f.hxx>
-#include "../Bnd/Bnd_B3x.gxx"
+#include <Bnd_B3x.gxx>
diff --git a/src/Contap/Contap_TheIWLineOfTheIWalking_0.cxx b/src/Contap/Contap_TheIWLineOfTheIWalking_0.cxx
index c5f9be88c6..d8801ef798 100644
--- a/src/Contap/Contap_TheIWLineOfTheIWalking_0.cxx
+++ b/src/Contap/Contap_TheIWLineOfTheIWalking_0.cxx
@@ -30,4 +30,4 @@
 #define IntWalk_IWLine Contap_TheIWLineOfTheIWalking
 #define IntWalk_IWLine_hxx <Contap_TheIWLineOfTheIWalking.hxx>
 #define Handle_IntWalk_IWLine Handle(Contap_TheIWLineOfTheIWalking)
-#include "../IntWalk/IntWalk_IWLine.gxx"
+#include <IntWalk_IWLine.gxx>
diff --git a/src/Contap/Contap_TheIWalking_0.cxx b/src/Contap/Contap_TheIWalking_0.cxx
index 8364be1182..1185699196 100644
--- a/src/Contap/Contap_TheIWalking_0.cxx
+++ b/src/Contap/Contap_TheIWalking_0.cxx
@@ -54,4 +54,4 @@
 #define Handle_IntWalk_TheIWLine Handle(Contap_TheIWLineOfTheIWalking)
 #define IntWalk_IWalking Contap_TheIWalking
 #define IntWalk_IWalking_hxx <Contap_TheIWalking.hxx>
-#include "../IntWalk/IntWalk_IWalking.gxx"
+#include <IntWalk_IWalking.gxx>
diff --git a/src/Contap/Contap_ThePathPointOfTheSearch_0.cxx b/src/Contap/Contap_ThePathPointOfTheSearch_0.cxx
index ce6e0cfa28..14a488b303 100644
--- a/src/Contap/Contap_ThePathPointOfTheSearch_0.cxx
+++ b/src/Contap/Contap_ThePathPointOfTheSearch_0.cxx
@@ -27,4 +27,4 @@
 #define TheArc_hxx <Adaptor2d_Curve2d.hxx>
 #define IntStart_PathPoint Contap_ThePathPointOfTheSearch
 #define IntStart_PathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>
-#include "../IntStart/IntStart_PathPoint.gxx"
+#include <IntStart_PathPoint.gxx>
diff --git a/src/Contap/Contap_TheSearchInside_0.cxx b/src/Contap/Contap_TheSearchInside_0.cxx
index 745569248f..c003ae823c 100644
--- a/src/Contap/Contap_TheSearchInside_0.cxx
+++ b/src/Contap/Contap_TheSearchInside_0.cxx
@@ -38,4 +38,4 @@
 #define TheFunction_hxx <Contap_SurfFunction.hxx>
 #define IntStart_SearchInside Contap_TheSearchInside
 #define IntStart_SearchInside_hxx <Contap_TheSearchInside.hxx>
-#include "../IntStart/IntStart_SearchInside.gxx"
+#include <IntStart_SearchInside.gxx>
diff --git a/src/Contap/Contap_TheSearch_0.cxx b/src/Contap/Contap_TheSearch_0.cxx
index dc2f79029f..d0835c894b 100644
--- a/src/Contap/Contap_TheSearch_0.cxx
+++ b/src/Contap/Contap_TheSearch_0.cxx
@@ -53,4 +53,4 @@
 #define IntStart_SequenceOfSegment_hxx <Contap_SequenceOfSegmentOfTheSearch.hxx>
 #define IntStart_SearchOnBoundaries Contap_TheSearch
 #define IntStart_SearchOnBoundaries_hxx <Contap_TheSearch.hxx>
-#include "../IntStart/IntStart_SearchOnBoundaries.gxx"
+#include <IntStart_SearchOnBoundaries.gxx>
diff --git a/src/Contap/Contap_TheSegmentOfTheSearch_0.cxx b/src/Contap/Contap_TheSegmentOfTheSearch_0.cxx
index d449255335..a194599839 100644
--- a/src/Contap/Contap_TheSegmentOfTheSearch_0.cxx
+++ b/src/Contap/Contap_TheSegmentOfTheSearch_0.cxx
@@ -29,4 +29,4 @@
 #define ThePathPoint_hxx <Contap_ThePathPointOfTheSearch.hxx>
 #define IntStart_Segment Contap_TheSegmentOfTheSearch
 #define IntStart_Segment_hxx <Contap_TheSegmentOfTheSearch.hxx>
-#include "../IntStart/IntStart_Segment.gxx"
+#include <IntStart_Segment.gxx>
diff --git a/src/Extrema/Extrema_CCLocFOfLocECC2d_0.cxx b/src/Extrema/Extrema_CCLocFOfLocECC2d_0.cxx
index aa5fe5e9c8..7865485f5c 100644
--- a/src/Extrema/Extrema_CCLocFOfLocECC2d_0.cxx
+++ b/src/Extrema/Extrema_CCLocFOfLocECC2d_0.cxx
@@ -43,4 +43,4 @@
 #define Extrema_SeqPOnC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtCC Extrema_CCLocFOfLocECC2d
 #define Extrema_FuncExtCC_hxx <Extrema_CCLocFOfLocECC2d.hxx>
-#include "../Extrema/Extrema_FuncExtCC.gxx"
+#include <Extrema_FuncExtCC.gxx>
diff --git a/src/Extrema/Extrema_CCLocFOfLocECC_0.cxx b/src/Extrema/Extrema_CCLocFOfLocECC_0.cxx
index 783710cb3b..d191ecbcbe 100644
--- a/src/Extrema/Extrema_CCLocFOfLocECC_0.cxx
+++ b/src/Extrema/Extrema_CCLocFOfLocECC_0.cxx
@@ -43,4 +43,4 @@
 #define Extrema_SeqPOnC_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_FuncExtCC Extrema_CCLocFOfLocECC
 #define Extrema_FuncExtCC_hxx <Extrema_CCLocFOfLocECC.hxx>
-#include "../Extrema/Extrema_FuncExtCC.gxx"
+#include <Extrema_FuncExtCC.gxx>
diff --git a/src/Extrema/Extrema_ECC2d_0.cxx b/src/Extrema/Extrema_ECC2d_0.cxx
index 57ed1e0e79..cbb683b0ea 100644
--- a/src/Extrema/Extrema_ECC2d_0.cxx
+++ b/src/Extrema/Extrema_ECC2d_0.cxx
@@ -43,4 +43,4 @@
 #define Extrema_GExtPC Extrema_ExtPC2d
 #define Extrema_GenExtCC Extrema_ECC2d
 #define Extrema_GenExtCC_hxx <Extrema_ECC2d.hxx>
-#include "../Extrema/Extrema_GenExtCC.gxx"
+#include <Extrema_GenExtCC.gxx>
diff --git a/src/Extrema/Extrema_ECC_0.cxx b/src/Extrema/Extrema_ECC_0.cxx
index 9f813b2a3b..dc7e21b56d 100644
--- a/src/Extrema/Extrema_ECC_0.cxx
+++ b/src/Extrema/Extrema_ECC_0.cxx
@@ -43,4 +43,4 @@
 #define Extrema_GExtPC Extrema_ExtPC
 #define Extrema_GenExtCC Extrema_ECC
 #define Extrema_GenExtCC_hxx <Extrema_ECC.hxx>
-#include "../Extrema/Extrema_GenExtCC.gxx"
+#include <Extrema_GenExtCC.gxx>
diff --git a/src/Extrema/Extrema_ELPCOfLocateExtPC2d_0.cxx b/src/Extrema/Extrema_ELPCOfLocateExtPC2d_0.cxx
index 5a38d62b3f..3e55f3d937 100644
--- a/src/Extrema/Extrema_ELPCOfLocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_ELPCOfLocateExtPC2d_0.cxx
@@ -50,4 +50,4 @@
 #define Extrema_PCFOfEPC_hxx <Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx>
 #define Extrema_GExtPC Extrema_ELPCOfLocateExtPC2d
 #define Extrema_GExtPC_hxx <Extrema_ELPCOfLocateExtPC2d.hxx>
-#include "../Extrema/Extrema_GExtPC.gxx"
+#include <Extrema_GExtPC.gxx>
diff --git a/src/Extrema/Extrema_ELPCOfLocateExtPC_0.cxx b/src/Extrema/Extrema_ELPCOfLocateExtPC_0.cxx
index 79506d0f11..50fab6c9c4 100644
--- a/src/Extrema/Extrema_ELPCOfLocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_ELPCOfLocateExtPC_0.cxx
@@ -50,4 +50,4 @@
 #define Extrema_PCFOfEPC_hxx <Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx>
 #define Extrema_GExtPC Extrema_ELPCOfLocateExtPC
 #define Extrema_GExtPC_hxx <Extrema_ELPCOfLocateExtPC.hxx>
-#include "../Extrema/Extrema_GExtPC.gxx"
+#include <Extrema_GExtPC.gxx>
diff --git a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d_0.cxx b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d_0.cxx
index ca92739e7f..631089d97d 100644
--- a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC2d_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenExtPC Extrema_EPCOfELPCOfLocateExtPC2d
 #define Extrema_GenExtPC_hxx <Extrema_EPCOfELPCOfLocateExtPC2d.hxx>
-#include "../Extrema/Extrema_GenExtPC.gxx"
+#include <Extrema_GenExtPC.gxx>
diff --git a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC_0.cxx b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC_0.cxx
index 4c06cd5c19..82d4e7ca41 100644
--- a/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_EPCOfELPCOfLocateExtPC_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCF_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_GenExtPC Extrema_EPCOfELPCOfLocateExtPC
 #define Extrema_GenExtPC_hxx <Extrema_EPCOfELPCOfLocateExtPC.hxx>
-#include "../Extrema/Extrema_GenExtPC.gxx"
+#include <Extrema_GenExtPC.gxx>
diff --git a/src/Extrema/Extrema_EPCOfExtPC2d_0.cxx b/src/Extrema/Extrema_EPCOfExtPC2d_0.cxx
index 07a850aa4c..1f6be92cb1 100644
--- a/src/Extrema/Extrema_EPCOfExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_EPCOfExtPC2d_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenExtPC Extrema_EPCOfExtPC2d
 #define Extrema_GenExtPC_hxx <Extrema_EPCOfExtPC2d.hxx>
-#include "../Extrema/Extrema_GenExtPC.gxx"
+#include <Extrema_GenExtPC.gxx>
diff --git a/src/Extrema/Extrema_EPCOfExtPC_0.cxx b/src/Extrema/Extrema_EPCOfExtPC_0.cxx
index 209a1c26ae..00cf488e07 100644
--- a/src/Extrema/Extrema_EPCOfExtPC_0.cxx
+++ b/src/Extrema/Extrema_EPCOfExtPC_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCF_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_GenExtPC Extrema_EPCOfExtPC
 #define Extrema_GenExtPC_hxx <Extrema_EPCOfExtPC.hxx>
-#include "../Extrema/Extrema_GenExtPC.gxx"
+#include <Extrema_GenExtPC.gxx>
diff --git a/src/Extrema/Extrema_ExtPC2d_0.cxx b/src/Extrema/Extrema_ExtPC2d_0.cxx
index ec579f7214..4e70564ac5 100644
--- a/src/Extrema/Extrema_ExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_ExtPC2d_0.cxx
@@ -50,4 +50,4 @@
 #define Extrema_PCFOfEPC_hxx <Extrema_PCFOfEPCOfExtPC2d.hxx>
 #define Extrema_GExtPC Extrema_ExtPC2d
 #define Extrema_GExtPC_hxx <Extrema_ExtPC2d.hxx>
-#include "../Extrema/Extrema_GExtPC.gxx"
+#include <Extrema_GExtPC.gxx>
diff --git a/src/Extrema/Extrema_ExtPC_0.cxx b/src/Extrema/Extrema_ExtPC_0.cxx
index d72a46c19c..5359a9b56d 100644
--- a/src/Extrema/Extrema_ExtPC_0.cxx
+++ b/src/Extrema/Extrema_ExtPC_0.cxx
@@ -50,4 +50,4 @@
 #define Extrema_PCFOfEPC_hxx <Extrema_PCFOfEPCOfExtPC.hxx>
 #define Extrema_GExtPC Extrema_ExtPC
 #define Extrema_GExtPC_hxx <Extrema_ExtPC.hxx>
-#include "../Extrema/Extrema_GExtPC.gxx"
+#include <Extrema_GExtPC.gxx>
diff --git a/src/Extrema/Extrema_LocECC2d_0.cxx b/src/Extrema/Extrema_LocECC2d_0.cxx
index 8788411db7..d1ae98d56a 100644
--- a/src/Extrema/Extrema_LocECC2d_0.cxx
+++ b/src/Extrema/Extrema_LocECC2d_0.cxx
@@ -48,4 +48,4 @@
 #define Extrema_SeqPOnCOfCCLocF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenLocateExtCC Extrema_LocECC2d
 #define Extrema_GenLocateExtCC_hxx <Extrema_LocECC2d.hxx>
-#include "../Extrema/Extrema_GenLocateExtCC.gxx"
+#include <Extrema_GenLocateExtCC.gxx>
diff --git a/src/Extrema/Extrema_LocECC_0.cxx b/src/Extrema/Extrema_LocECC_0.cxx
index 72200c32f5..2399e764ce 100644
--- a/src/Extrema/Extrema_LocECC_0.cxx
+++ b/src/Extrema/Extrema_LocECC_0.cxx
@@ -48,4 +48,4 @@
 #define Extrema_SeqPOnCOfCCLocF_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_GenLocateExtCC Extrema_LocECC
 #define Extrema_GenLocateExtCC_hxx <Extrema_LocECC.hxx>
-#include "../Extrema/Extrema_GenLocateExtCC.gxx"
+#include <Extrema_GenLocateExtCC.gxx>
diff --git a/src/Extrema/Extrema_LocEPCOfLocateExtPC2d_0.cxx b/src/Extrema/Extrema_LocEPCOfLocateExtPC2d_0.cxx
index f80515fcd8..8f02fde723 100644
--- a/src/Extrema/Extrema_LocEPCOfLocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_LocEPCOfLocateExtPC2d_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCLocF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenLocateExtPC Extrema_LocEPCOfLocateExtPC2d
 #define Extrema_GenLocateExtPC_hxx <Extrema_LocEPCOfLocateExtPC2d.hxx>
-#include "../Extrema/Extrema_GenLocateExtPC.gxx"
+#include <Extrema_GenLocateExtPC.gxx>
diff --git a/src/Extrema/Extrema_LocEPCOfLocateExtPC_0.cxx b/src/Extrema/Extrema_LocEPCOfLocateExtPC_0.cxx
index cdb08ca9bb..e871842a50 100644
--- a/src/Extrema/Extrema_LocEPCOfLocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_LocEPCOfLocateExtPC_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCLocF_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_GenLocateExtPC Extrema_LocEPCOfLocateExtPC
 #define Extrema_GenLocateExtPC_hxx <Extrema_LocEPCOfLocateExtPC.hxx>
-#include "../Extrema/Extrema_GenLocateExtPC.gxx"
+#include <Extrema_GenLocateExtPC.gxx>
diff --git a/src/Extrema/Extrema_LocateExtPC2d_0.cxx b/src/Extrema/Extrema_LocateExtPC2d_0.cxx
index ffdf7a1e20..7b4d00fcae 100644
--- a/src/Extrema/Extrema_LocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_LocateExtPC2d_0.cxx
@@ -57,4 +57,4 @@
 #define Extrema_PCLocFOfLocEPC_hxx <Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx>
 #define Extrema_GLocateExtPC Extrema_LocateExtPC2d
 #define Extrema_GLocateExtPC_hxx <Extrema_LocateExtPC2d.hxx>
-#include "../Extrema/Extrema_GLocateExtPC.gxx"
+#include <Extrema_GLocateExtPC.gxx>
diff --git a/src/Extrema/Extrema_LocateExtPC_0.cxx b/src/Extrema/Extrema_LocateExtPC_0.cxx
index c4506def23..63f523648d 100644
--- a/src/Extrema/Extrema_LocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_LocateExtPC_0.cxx
@@ -57,4 +57,4 @@
 #define Extrema_PCLocFOfLocEPC_hxx <Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx>
 #define Extrema_GLocateExtPC Extrema_LocateExtPC
 #define Extrema_GLocateExtPC_hxx <Extrema_LocateExtPC.hxx>
-#include "../Extrema/Extrema_GLocateExtPC.gxx"
+#include <Extrema_GLocateExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d_0.cxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d_0.cxx
index c23d57a1e7..525b327124 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC2d_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtPC Extrema_PCFOfEPCOfELPCOfLocateExtPC2d
 #define Extrema_FuncExtPC_hxx <Extrema_PCFOfEPCOfELPCOfLocateExtPC2d.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC_0.cxx b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC_0.cxx
index be5a14c983..c245b82800 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfELPCOfLocateExtPC_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_FuncExtPC Extrema_PCFOfEPCOfELPCOfLocateExtPC
 #define Extrema_FuncExtPC_hxx <Extrema_PCFOfEPCOfELPCOfLocateExtPC.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d_0.cxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d_0.cxx
index de817f0966..3934eaacdc 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC2d_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtPC Extrema_PCFOfEPCOfExtPC2d
 #define Extrema_FuncExtPC_hxx <Extrema_PCFOfEPCOfExtPC2d.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCFOfEPCOfExtPC_0.cxx b/src/Extrema/Extrema_PCFOfEPCOfExtPC_0.cxx
index 580156a4ba..0db5477a07 100644
--- a/src/Extrema/Extrema_PCFOfEPCOfExtPC_0.cxx
+++ b/src/Extrema/Extrema_PCFOfEPCOfExtPC_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_FuncExtPC Extrema_PCFOfEPCOfExtPC
 #define Extrema_FuncExtPC_hxx <Extrema_PCFOfEPCOfExtPC.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d_0.cxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d_0.cxx
index ed70080457..4db40abc34 100644
--- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d_0.cxx
+++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC2d_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtPC Extrema_PCLocFOfLocEPCOfLocateExtPC2d
 #define Extrema_FuncExtPC_hxx <Extrema_PCLocFOfLocEPCOfLocateExtPC2d.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC_0.cxx b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC_0.cxx
index ef3b2e7b0a..6c65aaa6b9 100644
--- a/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC_0.cxx
+++ b/src/Extrema/Extrema_PCLocFOfLocEPCOfLocateExtPC_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv.hxx>
 #define Extrema_FuncExtPC Extrema_PCLocFOfLocEPCOfLocateExtPC
 #define Extrema_FuncExtPC_hxx <Extrema_PCLocFOfLocEPCOfLocateExtPC.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Extrema/Extrema_POnCurv2d_0.cxx b/src/Extrema/Extrema_POnCurv2d_0.cxx
index 906d3e4d67..34451fdba8 100644
--- a/src/Extrema/Extrema_POnCurv2d_0.cxx
+++ b/src/Extrema/Extrema_POnCurv2d_0.cxx
@@ -22,4 +22,4 @@
 #define Pnt_hxx <gp_Pnt2d.hxx>
 #define Extrema_Point Extrema_POnCurv2d
 #define Extrema_Point_hxx <Extrema_POnCurv2d.hxx>
-#include "../Extrema/Extrema_Point.gxx"
+#include <Extrema_Point.gxx>
diff --git a/src/Extrema/Extrema_POnCurv_0.cxx b/src/Extrema/Extrema_POnCurv_0.cxx
index 181f67b037..bf54ce3410 100644
--- a/src/Extrema/Extrema_POnCurv_0.cxx
+++ b/src/Extrema/Extrema_POnCurv_0.cxx
@@ -22,4 +22,4 @@
 #define Pnt_hxx <gp_Pnt.hxx>
 #define Extrema_Point Extrema_POnCurv
 #define Extrema_Point_hxx <Extrema_POnCurv.hxx>
-#include "../Extrema/Extrema_Point.gxx"
+#include <Extrema_Point.gxx>
diff --git a/src/Geom2dHatch/Geom2dHatch_Classifier_0.cxx b/src/Geom2dHatch/Geom2dHatch_Classifier_0.cxx
index 9ce4288cca..578ed98314 100644
--- a/src/Geom2dHatch/Geom2dHatch_Classifier_0.cxx
+++ b/src/Geom2dHatch/Geom2dHatch_Classifier_0.cxx
@@ -33,4 +33,4 @@
 #define TopClass_FClass2d_hxx <Geom2dHatch_FClass2dOfClassifier.hxx>
 #define TopClass_FaceClassifier Geom2dHatch_Classifier
 #define TopClass_FaceClassifier_hxx <Geom2dHatch_Classifier.hxx>
-#include "../TopClass/TopClass_FaceClassifier.gxx"
+#include <TopClass_FaceClassifier.gxx>
diff --git a/src/Geom2dHatch/Geom2dHatch_FClass2dOfClassifier_0.cxx b/src/Geom2dHatch/Geom2dHatch_FClass2dOfClassifier_0.cxx
index 7db5707660..ae13f8d9d7 100644
--- a/src/Geom2dHatch/Geom2dHatch_FClass2dOfClassifier_0.cxx
+++ b/src/Geom2dHatch/Geom2dHatch_FClass2dOfClassifier_0.cxx
@@ -27,4 +27,4 @@
 #define TheIntersector_hxx <Geom2dHatch_Intersector.hxx>
 #define TopClass_Classifier2d Geom2dHatch_FClass2dOfClassifier
 #define TopClass_Classifier2d_hxx <Geom2dHatch_FClass2dOfClassifier.hxx>
-#include "../TopClass/TopClass_Classifier2d.gxx"
+#include <TopClass_Classifier2d.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter_0.cxx
index 521bddc466..d9efb532f5 100644
--- a/src/Geom2dInt/Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter_0.cxx
@@ -39,4 +39,4 @@
   <Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter.hxx>
 #define IntCurve_IntPolyPolyGen Geom2dInt_TheIntPCurvePCurveOfGInter
 #define IntCurve_IntPolyPolyGen_hxx <Geom2dInt_TheIntPCurvePCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_ExactIntersectionPoint.gxx"
+#include <IntCurve_ExactIntersectionPoint.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_GInter_0.cxx b/src/Geom2dInt/Geom2dInt_GInter_0.cxx
index 599f0d4ae3..96818f356f 100644
--- a/src/Geom2dInt/Geom2dInt_GInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_GInter_0.cxx
@@ -85,4 +85,4 @@
   <Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter.hxx>
 #define IntCurve_IntCurveCurveGen Geom2dInt_GInter
 #define IntCurve_IntCurveCurveGen_hxx <Geom2dInt_GInter.hxx>
-#include "../IntCurve/IntCurve_IntCurveCurveGen.gxx"
+#include <IntCurve_IntCurveCurveGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_IntConicCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_IntConicCurveOfGInter_0.cxx
index d4db310ffe..750c623212 100644
--- a/src/Geom2dInt/Geom2dInt_IntConicCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_IntConicCurveOfGInter_0.cxx
@@ -38,4 +38,4 @@
 #define TheIntConicCurve_hxx <Geom2dInt_TheIntConicCurveOfGInter.hxx>
 #define IntCurve_UserIntConicCurveGen Geom2dInt_IntConicCurveOfGInter
 #define IntCurve_UserIntConicCurveGen_hxx <Geom2dInt_IntConicCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_UserIntConicCurveGen.gxx"
+#include <IntCurve_UserIntConicCurveGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter_0.cxx
index 81379bcda9..629ad88d27 100644
--- a/src/Geom2dInt/Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter_0.cxx
@@ -29,4 +29,4 @@
 #define IntImpParGen_ImpParTool Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter
 #define IntImpParGen_ImpParTool_hxx                                                                \
   <Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter.hxx>
-#include "../IntImpParGen/IntImpParGen_ImpParTool.gxx"
+#include <IntImpParGen_ImpParTool.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter_0.cxx
index afeb729210..ff9da7c731 100644
--- a/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter_0.cxx
@@ -39,4 +39,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtPC Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter
 #define Extrema_FuncExtPC_hxx <Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter_0.cxx
index 8d6835bbe0..564d137f2f 100644
--- a/src/Geom2dInt/Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter_0.cxx
@@ -35,4 +35,4 @@
 #define Pnt_hxx <gp_Pnt2d.hxx>
 #define Extrema_CurveLocator Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter
 #define Extrema_CurveLocator_hxx <Geom2dInt_TheCurveLocatorOfTheProjPCurOfGInter.hxx>
-#include "../Extrema/Extrema_CurveLocator.gxx"
+#include <Extrema_CurveLocator.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter_0.cxx
index 6f5d6527b8..4a740b6f65 100644
--- a/src/Geom2dInt/Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter_0.cxx
@@ -27,4 +27,4 @@
 #define IntCurve_DistBetweenPCurvesGen Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter
 #define IntCurve_DistBetweenPCurvesGen_hxx                                                         \
   <Geom2dInt_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_DistBetweenPCurvesGen.gxx"
+#include <IntCurve_DistBetweenPCurvesGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheIntConicCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheIntConicCurveOfGInter_0.cxx
index c1149ddd06..3c87cd9940 100644
--- a/src/Geom2dInt/Geom2dInt_TheIntConicCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheIntConicCurveOfGInter_0.cxx
@@ -49,4 +49,4 @@
   <Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter.hxx>
 #define IntCurve_IntConicCurveGen Geom2dInt_TheIntConicCurveOfGInter
 #define IntCurve_IntConicCurveGen_hxx <Geom2dInt_TheIntConicCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_IntConicCurveGen.gxx"
+#include <IntCurve_IntConicCurveGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheIntPCurvePCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheIntPCurvePCurveOfGInter_0.cxx
index d8035c7a36..6b9920b226 100644
--- a/src/Geom2dInt/Geom2dInt_TheIntPCurvePCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheIntPCurvePCurveOfGInter_0.cxx
@@ -40,4 +40,4 @@
   <Geom2dInt_ExactIntersectionPointOfTheIntPCurvePCurveOfGInter.hxx>
 #define IntCurve_IntPolyPolyGen Geom2dInt_TheIntPCurvePCurveOfGInter
 #define IntCurve_IntPolyPolyGen_hxx <Geom2dInt_TheIntPCurvePCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_IntPolyPolyGen.gxx"
+#include <IntCurve_IntPolyPolyGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter_0.cxx
index c53bd59f9b..5ba6d6c077 100644
--- a/src/Geom2dInt/Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter_0.cxx
@@ -38,4 +38,4 @@
   <Geom2dInt_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfGInter.hxx>
 #define IntImpParGen_Intersector Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter
 #define IntImpParGen_Intersector_hxx <Geom2dInt_TheIntersectorOfTheIntConicCurveOfGInter.hxx>
-#include "../IntImpParGen/IntImpParGen_Intersector.gxx"
+#include <IntImpParGen_Intersector.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter_0.cxx
index a846791c24..1e23dd7d10 100644
--- a/src/Geom2dInt/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter_0.cxx
@@ -45,4 +45,4 @@
 #define Extrema_SeqPCOfPCLocF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenLocateExtPC Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter
 #define Extrema_GenLocateExtPC_hxx <Geom2dInt_TheLocateExtPCOfTheProjPCurOfGInter.hxx>
-#include "../Extrema/Extrema_GenLocateExtPC.gxx"
+#include <Extrema_GenLocateExtPC.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter_0.cxx
index 9647462d37..fe2136e183 100644
--- a/src/Geom2dInt/Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter_0.cxx
@@ -29,4 +29,4 @@
 #define TheCurveTool_hxx <Geom2dInt_Geom2dCurveTool.hxx>
 #define IntCurve_Polygon2dGen Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter
 #define IntCurve_Polygon2dGen_hxx <Geom2dInt_ThePolygon2dOfTheIntPCurvePCurveOfGInter.hxx>
-#include "../IntCurve/IntCurve_Polygon2dGen.gxx"
+#include <IntCurve_Polygon2dGen.gxx>
diff --git a/src/Geom2dInt/Geom2dInt_TheProjPCurOfGInter_0.cxx b/src/Geom2dInt/Geom2dInt_TheProjPCurOfGInter_0.cxx
index 4369da4890..b2d65c71ec 100644
--- a/src/Geom2dInt/Geom2dInt_TheProjPCurOfGInter_0.cxx
+++ b/src/Geom2dInt/Geom2dInt_TheProjPCurOfGInter_0.cxx
@@ -39,4 +39,4 @@
   <Geom2dInt_PCLocFOfTheLocateExtPCOfTheProjPCurOfGInter.hxx>
 #define IntCurve_ProjPCurGen Geom2dInt_TheProjPCurOfGInter
 #define IntCurve_ProjPCurGen_hxx <Geom2dInt_TheProjPCurOfGInter.hxx>
-#include "../IntCurve/IntCurve_ProjPCurGen.gxx"
+#include <IntCurve_ProjPCurGen.gxx>
diff --git a/src/Geom2dLProp/Geom2dLProp_CLProps2d_0.cxx b/src/Geom2dLProp/Geom2dLProp_CLProps2d_0.cxx
index 0a9528a4b0..ca1ec20aa4 100644
--- a/src/Geom2dLProp/Geom2dLProp_CLProps2d_0.cxx
+++ b/src/Geom2dLProp/Geom2dLProp_CLProps2d_0.cxx
@@ -38,4 +38,4 @@
 #define Tool_hxx <Geom2dLProp_Curve2dTool.hxx>
 #define LProp_CLProps Geom2dLProp_CLProps2d
 #define LProp_CLProps_hxx <Geom2dLProp_CLProps2d.hxx>
-#include "../LProp/LProp_CLProps.gxx"
+#include <LProp_CLProps.gxx>
diff --git a/src/GeomFill/GeomFill_AppSurf_0.cxx b/src/GeomFill/GeomFill_AppSurf_0.cxx
index ab4973065d..b87c764c0b 100644
--- a/src/GeomFill/GeomFill_AppSurf_0.cxx
+++ b/src/GeomFill/GeomFill_AppSurf_0.cxx
@@ -29,4 +29,4 @@
 #define TheLine_hxx <GeomFill_Line.hxx>
 #define AppBlend_AppSurf GeomFill_AppSurf
 #define AppBlend_AppSurf_hxx <GeomFill_AppSurf.hxx>
-#include "../AppBlend/AppBlend_AppSurf.gxx"
+#include <AppBlend_AppSurf.gxx>
diff --git a/src/GeomFill/GeomFill_AppSweep_0.cxx b/src/GeomFill/GeomFill_AppSweep_0.cxx
index 6be158eb69..390a66b64b 100644
--- a/src/GeomFill/GeomFill_AppSweep_0.cxx
+++ b/src/GeomFill/GeomFill_AppSweep_0.cxx
@@ -29,4 +29,4 @@
 #define TheLine_hxx <GeomFill_Line.hxx>
 #define AppBlend_AppSurf GeomFill_AppSweep
 #define AppBlend_AppSurf_hxx <GeomFill_AppSweep.hxx>
-#include "../AppBlend/AppBlend_AppSurf.gxx"
+#include <AppBlend_AppSurf.gxx>
diff --git a/src/GeomInt/GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
index 95268fa7f2..9411a30e28 100644
--- a/src/GeomInt/GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
@@ -40,4 +40,4 @@
   <GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox.hxx>
 #define AppParCurves_BSpGradient GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox
 #define AppParCurves_BSpGradient_hxx <GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpGradient_BFGS.gxx"
+#include <AppParCurves_BSpGradient_BFGS.gxx>
diff --git a/src/GeomInt/GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
index 493d938302..660a1db0d7 100644
--- a/src/GeomInt/GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
@@ -31,4 +31,4 @@
 #define AppParCurves_BSpFunction GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox
 #define AppParCurves_BSpFunction_hxx                                                               \
   <GeomInt_BSpParFunctionOfMyBSplGradientOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpFunction.gxx"
+#include <AppParCurves_BSpFunction.gxx>
diff --git a/src/GeomInt/GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
index 43e1586520..20b56003c5 100644
--- a/src/GeomInt/GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_LeastSquare GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <GeomInt_BSpParLeastSquareOfMyBSplGradientOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
index 90af507132..128a0a8e82 100644
--- a/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
@@ -43,4 +43,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
 #define AppParCurves_Gradient GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox
 #define AppParCurves_Gradient_hxx <GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
index 4391a98ba3..b3e440f6a6 100644
--- a/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
@@ -42,4 +42,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
 #define AppParCurves_Gradient GeomInt_MyGradientbisOfTheComputeLineOfWLApprox
 #define AppParCurves_Gradient_hxx <GeomInt_MyGradientbisOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient_BFGS.gxx"
+#include <AppParCurves_Gradient_BFGS.gxx>
diff --git a/src/GeomInt/GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
index 6f6f2355df..9384989fa6 100644
--- a/src/GeomInt/GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox_0.cxx
@@ -42,4 +42,4 @@
   <GeomInt_BSpGradient_BFGSOfMyBSplGradientOfTheComputeLineOfWLApprox.hxx>
 #define AppParCurves_BSpGradient GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox
 #define AppParCurves_BSpGradient_hxx <GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_BSpGradient.gxx"
+#include <AppParCurves_BSpGradient.gxx>
diff --git a/src/GeomInt/GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
index 77d60ad5a3..ac64d3ca46 100644
--- a/src/GeomInt/GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
@@ -45,4 +45,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
 #define AppParCurves_Gradient GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox
 #define AppParCurves_Gradient_hxx <GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/GeomInt/GeomInt_MyGradientbisOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_MyGradientbisOfTheComputeLineOfWLApprox_0.cxx
index ecb5804f97..410fcfb807 100644
--- a/src/GeomInt/GeomInt_MyGradientbisOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_MyGradientbisOfTheComputeLineOfWLApprox_0.cxx
@@ -44,4 +44,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
 #define AppParCurves_Gradient GeomInt_MyGradientbisOfTheComputeLineOfWLApprox
 #define AppParCurves_Gradient_hxx <GeomInt_MyGradientbisOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Gradient.gxx"
+#include <AppParCurves_Gradient.gxx>
diff --git a/src/GeomInt/GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
index 27ff2af210..be82d3d701 100644
--- a/src/GeomInt/GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_Function GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox
 #define AppParCurves_Function_hxx                                                                  \
   <GeomInt_ParFunctionOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/GeomInt/GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
index ec824d877e..9caaf995c2 100644
--- a/src/GeomInt/GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_Function GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox
 #define AppParCurves_Function_hxx                                                                  \
   <GeomInt_ParFunctionOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_Function.gxx"
+#include <AppParCurves_Function.gxx>
diff --git a/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
index 09d86fca47..c13f241996 100644
--- a/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_LeastSquare GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <GeomInt_ParLeastSquareOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
index fd30a9cd07..f9ef49dc15 100644
--- a/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
@@ -33,4 +33,4 @@
 #define AppParCurves_LeastSquare GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox
 #define AppParCurves_LeastSquare_hxx                                                               \
   <GeomInt_ParLeastSquareOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_LeastSquare.gxx"
+#include <AppParCurves_LeastSquare.gxx>
diff --git a/src/GeomInt/GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
index 9f02ba8f2a..188c2d85f4 100644
--- a/src/GeomInt/GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox_0.cxx
@@ -30,4 +30,4 @@
   GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox
 #define AppParCurves_ResolConstraint_hxx                                                           \
   <GeomInt_ResConstraintOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/GeomInt/GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
index 7929dc8ef9..a0058a09a8 100644
--- a/src/GeomInt/GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox_0.cxx
@@ -29,4 +29,4 @@
 #define AppParCurves_ResolConstraint GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox
 #define AppParCurves_ResolConstraint_hxx                                                           \
   <GeomInt_ResConstraintOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
-#include "../AppParCurves/AppParCurves_ResolConstraint.gxx"
+#include <AppParCurves_ResolConstraint.gxx>
diff --git a/src/GeomInt/GeomInt_TheComputeLineBezierOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheComputeLineBezierOfWLApprox_0.cxx
index 89b0af980c..904b37bd45 100644
--- a/src/GeomInt/GeomInt_TheComputeLineBezierOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheComputeLineBezierOfWLApprox_0.cxx
@@ -66,4 +66,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientOfTheComputeLineBezierOfWLApprox.hxx>
 #define Approx_ComputeLine GeomInt_TheComputeLineBezierOfWLApprox
 #define Approx_ComputeLine_hxx <GeomInt_TheComputeLineBezierOfWLApprox.hxx>
-#include "../Approx/Approx_ComputeLine.gxx"
+#include <Approx_ComputeLine.gxx>
diff --git a/src/GeomInt/GeomInt_TheComputeLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheComputeLineOfWLApprox_0.cxx
index 443ecf6ff6..5b1002215a 100644
--- a/src/GeomInt/GeomInt_TheComputeLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheComputeLineOfWLApprox_0.cxx
@@ -96,4 +96,4 @@
   <GeomInt_Gradient_BFGSOfMyGradientbisOfTheComputeLineOfWLApprox.hxx>
 #define Approx_BSplComputeLine GeomInt_TheComputeLineOfWLApprox
 #define Approx_BSplComputeLine_hxx <GeomInt_TheComputeLineOfWLApprox.hxx>
-#include "../Approx/Approx_BSplComputeLine.gxx"
+#include <Approx_BSplComputeLine.gxx>
diff --git a/src/GeomInt/GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
index 8d4a195c5c..5b2f773421 100644
--- a/src/GeomInt/GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
@@ -28,4 +28,4 @@
 #define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
 #define IntImp_ZerParFunc GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox
 #define IntImp_ZerParFunc_hxx <GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox.hxx>
-#include "../IntImp/IntImp_ZerParFunc.gxx"
+#include <IntImp_ZerParFunc.gxx>
diff --git a/src/GeomInt/GeomInt_TheImpPrmSvSurfacesOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheImpPrmSvSurfacesOfWLApprox_0.cxx
index 9b6f67483e..93e56b5d84 100644
--- a/src/GeomInt/GeomInt_TheImpPrmSvSurfacesOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheImpPrmSvSurfacesOfWLApprox_0.cxx
@@ -41,4 +41,4 @@
 #define ApproxInt_TheZerImpFunc_hxx <GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox.hxx>
 #define ApproxInt_ImpPrmSvSurfaces GeomInt_TheImpPrmSvSurfacesOfWLApprox
 #define ApproxInt_ImpPrmSvSurfaces_hxx <GeomInt_TheImpPrmSvSurfacesOfWLApprox.hxx>
-#include "../ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx"
+#include <ApproxInt_ImpPrmSvSurfaces.gxx>
diff --git a/src/GeomInt/GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
index c43c3ed970..ed2b006a90 100644
--- a/src/GeomInt/GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox_0.cxx
@@ -36,4 +36,4 @@
 #define IntImp_TheFunction_hxx <GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox.hxx>
 #define IntImp_Int2S GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox
 #define IntImp_Int2S_hxx <GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox.hxx>
-#include "../IntImp/IntImp_Int2S.gxx"
+#include <IntImp_Int2S.gxx>
diff --git a/src/GeomInt/GeomInt_TheMultiLineOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheMultiLineOfWLApprox_0.cxx
index 85d6f2fcc2..e0c1243f16 100644
--- a/src/GeomInt/GeomInt_TheMultiLineOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheMultiLineOfWLApprox_0.cxx
@@ -26,4 +26,4 @@
 #define TheSvSurfaces_hxx <ApproxInt_SvSurfaces.hxx>
 #define ApproxInt_MultiLine GeomInt_TheMultiLineOfWLApprox
 #define ApproxInt_MultiLine_hxx <GeomInt_TheMultiLineOfWLApprox.hxx>
-#include "../ApproxInt/ApproxInt_MultiLine.gxx"
+#include <ApproxInt_MultiLine.gxx>
diff --git a/src/GeomInt/GeomInt_ThePrmPrmSvSurfacesOfWLApprox_0.cxx b/src/GeomInt/GeomInt_ThePrmPrmSvSurfacesOfWLApprox_0.cxx
index f5f54fa920..5213fe8e6e 100644
--- a/src/GeomInt/GeomInt_ThePrmPrmSvSurfacesOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_ThePrmPrmSvSurfacesOfWLApprox_0.cxx
@@ -42,4 +42,4 @@
   <GeomInt_TheFunctionOfTheInt2SOfThePrmPrmSvSurfacesOfWLApprox.hxx>
 #define ApproxInt_PrmPrmSvSurfaces GeomInt_ThePrmPrmSvSurfacesOfWLApprox
 #define ApproxInt_PrmPrmSvSurfaces_hxx <GeomInt_ThePrmPrmSvSurfacesOfWLApprox.hxx>
-#include "../ApproxInt/ApproxInt_PrmPrmSvSurfaces.gxx"
+#include <ApproxInt_PrmPrmSvSurfaces.gxx>
diff --git a/src/GeomInt/GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox_0.cxx b/src/GeomInt/GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox_0.cxx
index d34f0e957e..5bb2a881b3 100644
--- a/src/GeomInt/GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox_0.cxx
@@ -36,4 +36,4 @@
 #define TheISurfaceTool_hxx <IntSurf_QuadricTool.hxx>
 #define IntImp_ZerImpFunc GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox
 #define IntImp_ZerImpFunc_hxx <GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox.hxx>
-#include "../IntImp/IntImp_ZerImpFunc.gxx"
+#include <IntImp_ZerImpFunc.gxx>
diff --git a/src/GeomInt/GeomInt_WLApprox_0.cxx b/src/GeomInt/GeomInt_WLApprox_0.cxx
index ec20ab055c..3cc07bb339 100644
--- a/src/GeomInt/GeomInt_WLApprox_0.cxx
+++ b/src/GeomInt/GeomInt_WLApprox_0.cxx
@@ -95,4 +95,4 @@
   <GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox.hxx>
 #define ApproxInt_Approx GeomInt_WLApprox
 #define ApproxInt_Approx_hxx <GeomInt_WLApprox.hxx>
-#include "../ApproxInt/ApproxInt_Approx.gxx"
+#include <ApproxInt_Approx.gxx>
diff --git a/src/GeomLProp/GeomLProp_CLProps_0.cxx b/src/GeomLProp/GeomLProp_CLProps_0.cxx
index 7729257423..d6da687f2f 100644
--- a/src/GeomLProp/GeomLProp_CLProps_0.cxx
+++ b/src/GeomLProp/GeomLProp_CLProps_0.cxx
@@ -38,4 +38,4 @@
 #define Tool_hxx <GeomLProp_CurveTool.hxx>
 #define LProp_CLProps GeomLProp_CLProps
 #define LProp_CLProps_hxx <GeomLProp_CLProps.hxx>
-#include "../LProp/LProp_CLProps.gxx"
+#include <LProp_CLProps.gxx>
diff --git a/src/GeomLProp/GeomLProp_SLProps_0.cxx b/src/GeomLProp/GeomLProp_SLProps_0.cxx
index db27c01505..2ef0a7e440 100644
--- a/src/GeomLProp/GeomLProp_SLProps_0.cxx
+++ b/src/GeomLProp/GeomLProp_SLProps_0.cxx
@@ -32,4 +32,4 @@
 #define Tool_hxx <GeomLProp_SurfaceTool.hxx>
 #define LProp_SLProps GeomLProp_SLProps
 #define LProp_SLProps_hxx <GeomLProp_SLProps.hxx>
-#include "../LProp/LProp_SLProps.gxx"
+#include <LProp_SLProps.gxx>
diff --git a/src/HLRAlgo/HLRAlgo_Interference_0.cxx b/src/HLRAlgo/HLRAlgo_Interference_0.cxx
index 504f2fdd3f..4382258753 100644
--- a/src/HLRAlgo/HLRAlgo_Interference_0.cxx
+++ b/src/HLRAlgo/HLRAlgo_Interference_0.cxx
@@ -25,4 +25,4 @@
 #define TheShape_hxx <HLRAlgo_Coincidence.hxx>
 #define TopBas_Interference HLRAlgo_Interference
 #define TopBas_Interference_hxx <HLRAlgo_Interference.hxx>
-#include "../TopBas/TopBas_Interference.gxx"
+#include <TopBas_Interference.gxx>
diff --git a/src/HLRBRep/HLRBRep_CInter_0.cxx b/src/HLRBRep/HLRBRep_CInter_0.cxx
index a4c529823b..4f2fc76742 100644
--- a/src/HLRBRep/HLRBRep_CInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_CInter_0.cxx
@@ -82,4 +82,4 @@
   <HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter.hxx>
 #define IntCurve_IntCurveCurveGen HLRBRep_CInter
 #define IntCurve_IntCurveCurveGen_hxx <HLRBRep_CInter.hxx>
-#include "../IntCurve/IntCurve_IntCurveCurveGen.gxx"
+#include <IntCurve_IntCurveCurveGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_CLProps_0.cxx b/src/HLRBRep/HLRBRep_CLProps_0.cxx
index e24a9a18fa..692364e550 100644
--- a/src/HLRBRep/HLRBRep_CLProps_0.cxx
+++ b/src/HLRBRep/HLRBRep_CLProps_0.cxx
@@ -37,4 +37,4 @@
 #define Tool_hxx <HLRBRep_CLPropsATool.hxx>
 #define LProp_CLProps HLRBRep_CLProps
 #define LProp_CLProps_hxx <HLRBRep_CLProps.hxx>
-#include "../LProp/LProp_CLProps.gxx"
+#include <LProp_CLProps.gxx>
diff --git a/src/HLRBRep/HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter_0.cxx
index 022132f3ae..cf90447701 100644
--- a/src/HLRBRep/HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter_0.cxx
@@ -38,4 +38,4 @@
   <HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter.hxx>
 #define IntCurve_IntPolyPolyGen HLRBRep_TheIntPCurvePCurveOfCInter
 #define IntCurve_IntPolyPolyGen_hxx <HLRBRep_TheIntPCurvePCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_ExactIntersectionPoint.gxx"
+#include <IntCurve_ExactIntersectionPoint.gxx>
diff --git a/src/HLRBRep/HLRBRep_IntConicCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_IntConicCurveOfCInter_0.cxx
index e51a518aac..972262164c 100644
--- a/src/HLRBRep/HLRBRep_IntConicCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_IntConicCurveOfCInter_0.cxx
@@ -37,4 +37,4 @@
 #define TheIntConicCurve_hxx <HLRBRep_TheIntConicCurveOfCInter.hxx>
 #define IntCurve_UserIntConicCurveGen HLRBRep_IntConicCurveOfCInter
 #define IntCurve_UserIntConicCurveGen_hxx <HLRBRep_IntConicCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_UserIntConicCurveGen.gxx"
+#include <IntCurve_UserIntConicCurveGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_InterCSurf_0.cxx b/src/HLRBRep/HLRBRep_InterCSurf_0.cxx
index 7d43099259..cabd10412a 100644
--- a/src/HLRBRep/HLRBRep_InterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_InterCSurf_0.cxx
@@ -70,4 +70,4 @@
   <HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf.hxx>
 #define IntCurveSurface_Inter HLRBRep_InterCSurf
 #define IntCurveSurface_Inter_hxx <HLRBRep_InterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Inter.gxx"
+#include <IntCurveSurface_Inter.gxx>
diff --git a/src/HLRBRep/HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter_0.cxx
index c0e742f800..4aa43b0263 100644
--- a/src/HLRBRep/HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter_0.cxx
@@ -28,4 +28,4 @@
 #define IntImpParGen_ImpParTool HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter
 #define IntImpParGen_ImpParTool_hxx                                                                \
   <HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter.hxx>
-#include "../IntImpParGen/IntImpParGen_ImpParTool.gxx"
+#include <IntImpParGen_ImpParTool.gxx>
diff --git a/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter_0.cxx b/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter_0.cxx
index c781be3382..4529a7a8ab 100644
--- a/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter_0.cxx
@@ -38,4 +38,4 @@
 #define Extrema_SeqPC_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_FuncExtPC HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter
 #define Extrema_FuncExtPC_hxx <HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx>
-#include "../Extrema/Extrema_FuncExtPC.gxx"
+#include <Extrema_FuncExtPC.gxx>
diff --git a/src/HLRBRep/HLRBRep_SLProps_0.cxx b/src/HLRBRep/HLRBRep_SLProps_0.cxx
index 82b6709474..b04a5eee4d 100644
--- a/src/HLRBRep/HLRBRep_SLProps_0.cxx
+++ b/src/HLRBRep/HLRBRep_SLProps_0.cxx
@@ -31,4 +31,4 @@
 #define Tool_hxx <HLRBRep_SLPropsATool.hxx>
 #define LProp_SLProps HLRBRep_SLProps
 #define LProp_SLProps_hxx <HLRBRep_SLProps.hxx>
-#include "../LProp/LProp_SLProps.gxx"
+#include <LProp_SLProps.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheCSFunctionOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_TheCSFunctionOfInterCSurf_0.cxx
index e02f93bd59..5e30347a93 100644
--- a/src/HLRBRep/HLRBRep_TheCSFunctionOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheCSFunctionOfInterCSurf_0.cxx
@@ -32,4 +32,4 @@
 #define TheCurveTool_hxx <HLRBRep_LineTool.hxx>
 #define IntImp_ZerCSParFunc HLRBRep_TheCSFunctionOfInterCSurf
 #define IntImp_ZerCSParFunc_hxx <HLRBRep_TheCSFunctionOfInterCSurf.hxx>
-#include "../IntImp/IntImp_ZerCSParFunc.gxx"
+#include <IntImp_ZerCSParFunc.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter_0.cxx
index 4b0f5f60b5..c7f86ff354 100644
--- a/src/HLRBRep/HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter_0.cxx
@@ -34,4 +34,4 @@
 #define Pnt_hxx <gp_Pnt2d.hxx>
 #define Extrema_CurveLocator HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter
 #define Extrema_CurveLocator_hxx <HLRBRep_TheCurveLocatorOfTheProjPCurOfCInter.hxx>
-#include "../Extrema/Extrema_CurveLocator.gxx"
+#include <Extrema_CurveLocator.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter_0.cxx
index cf9a36f9b5..238f7a2753 100644
--- a/src/HLRBRep/HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter_0.cxx
@@ -26,4 +26,4 @@
 #define IntCurve_DistBetweenPCurvesGen HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter
 #define IntCurve_DistBetweenPCurvesGen_hxx                                                         \
   <HLRBRep_TheDistBetweenPCurvesOfTheIntPCurvePCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_DistBetweenPCurvesGen.gxx"
+#include <IntCurve_DistBetweenPCurvesGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheExactInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_TheExactInterCSurf_0.cxx
index a6d5c92804..379ff17a56 100644
--- a/src/HLRBRep/HLRBRep_TheExactInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheExactInterCSurf_0.cxx
@@ -37,4 +37,4 @@
 #define TheFunction_hxx <HLRBRep_TheCSFunctionOfInterCSurf.hxx>
 #define IntImp_IntCS HLRBRep_TheExactInterCSurf
 #define IntImp_IntCS_hxx <HLRBRep_TheExactInterCSurf.hxx>
-#include "../IntImp/IntImp_IntCS.gxx"
+#include <IntImp_IntCS.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheIntConicCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheIntConicCurveOfCInter_0.cxx
index 94180fe336..4bd9800566 100644
--- a/src/HLRBRep/HLRBRep_TheIntConicCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheIntConicCurveOfCInter_0.cxx
@@ -48,4 +48,4 @@
   <HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter.hxx>
 #define IntCurve_IntConicCurveGen HLRBRep_TheIntConicCurveOfCInter
 #define IntCurve_IntConicCurveGen_hxx <HLRBRep_TheIntConicCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_IntConicCurveGen.gxx"
+#include <IntCurve_IntConicCurveGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheIntPCurvePCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheIntPCurvePCurveOfCInter_0.cxx
index c131a950e9..e4e661eb4b 100644
--- a/src/HLRBRep/HLRBRep_TheIntPCurvePCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheIntPCurvePCurveOfCInter_0.cxx
@@ -39,4 +39,4 @@
   <HLRBRep_ExactIntersectionPointOfTheIntPCurvePCurveOfCInter.hxx>
 #define IntCurve_IntPolyPolyGen HLRBRep_TheIntPCurvePCurveOfCInter
 #define IntCurve_IntPolyPolyGen_hxx <HLRBRep_TheIntPCurvePCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_IntPolyPolyGen.gxx"
+#include <IntCurve_IntPolyPolyGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheInterferenceOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_TheInterferenceOfInterCSurf_0.cxx
index 28ce735344..7efe36ec5d 100644
--- a/src/HLRBRep/HLRBRep_TheInterferenceOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheInterferenceOfInterCSurf_0.cxx
@@ -35,4 +35,4 @@
 #define ToolPolyh_hxx <HLRBRep_ThePolyhedronToolOfInterCSurf.hxx>
 #define Intf_InterferencePolygonPolyhedron HLRBRep_TheInterferenceOfInterCSurf
 #define Intf_InterferencePolygonPolyhedron_hxx <HLRBRep_TheInterferenceOfInterCSurf.hxx>
-#include "../Intf/Intf_InterferencePolygonPolyhedron.gxx"
+#include <Intf_InterferencePolygonPolyhedron.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter_0.cxx
index 2baaff4e3b..5fa56ae5fb 100644
--- a/src/HLRBRep/HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter_0.cxx
@@ -37,4 +37,4 @@
   <HLRBRep_MyImpParToolOfTheIntersectorOfTheIntConicCurveOfCInter.hxx>
 #define IntImpParGen_Intersector HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter
 #define IntImpParGen_Intersector_hxx <HLRBRep_TheIntersectorOfTheIntConicCurveOfCInter.hxx>
-#include "../IntImpParGen/IntImpParGen_Intersector.gxx"
+#include <IntImpParGen_Intersector.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter_0.cxx
index e9d244869d..5150c6bff8 100644
--- a/src/HLRBRep/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter_0.cxx
@@ -44,4 +44,4 @@
 #define Extrema_SeqPCOfPCLocF_hxx <Extrema_SequenceOfPOnCurv2d.hxx>
 #define Extrema_GenLocateExtPC HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter
 #define Extrema_GenLocateExtPC_hxx <HLRBRep_TheLocateExtPCOfTheProjPCurOfCInter.hxx>
-#include "../Extrema/Extrema_GenLocateExtPC.gxx"
+#include <Extrema_GenLocateExtPC.gxx>
diff --git a/src/HLRBRep/HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter_0.cxx b/src/HLRBRep/HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter_0.cxx
index 5480594436..59eeccf3ac 100644
--- a/src/HLRBRep/HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter_0.cxx
@@ -28,4 +28,4 @@
 #define TheCurveTool_hxx <HLRBRep_CurveTool.hxx>
 #define IntCurve_Polygon2dGen HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter
 #define IntCurve_Polygon2dGen_hxx <HLRBRep_ThePolygon2dOfTheIntPCurvePCurveOfCInter.hxx>
-#include "../IntCurve/IntCurve_Polygon2dGen.gxx"
+#include <IntCurve_Polygon2dGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_ThePolygonOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_ThePolygonOfInterCSurf_0.cxx
index 0a92f94e5d..413cc09a3e 100644
--- a/src/HLRBRep/HLRBRep_ThePolygonOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_ThePolygonOfInterCSurf_0.cxx
@@ -28,4 +28,4 @@
 #define TheCurveTool_hxx <HLRBRep_LineTool.hxx>
 #define IntCurveSurface_Polygon HLRBRep_ThePolygonOfInterCSurf
 #define IntCurveSurface_Polygon_hxx <HLRBRep_ThePolygonOfInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Polygon.gxx"
+#include <IntCurveSurface_Polygon.gxx>
diff --git a/src/HLRBRep/HLRBRep_ThePolygonToolOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_ThePolygonToolOfInterCSurf_0.cxx
index c9790573b7..e421fdb42a 100644
--- a/src/HLRBRep/HLRBRep_ThePolygonToolOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_ThePolygonToolOfInterCSurf_0.cxx
@@ -29,4 +29,4 @@
 #define TheBoundingBox_hxx <Bnd_Box.hxx>
 #define IntCurveSurface_PolygonTool HLRBRep_ThePolygonToolOfInterCSurf
 #define IntCurveSurface_PolygonTool_hxx <HLRBRep_ThePolygonToolOfInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_PolygonTool.gxx"
+#include <IntCurveSurface_PolygonTool.gxx>
diff --git a/src/HLRBRep/HLRBRep_ThePolyhedronOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_ThePolyhedronOfInterCSurf_0.cxx
index 22e0eb21b2..c44fc02515 100644
--- a/src/HLRBRep/HLRBRep_ThePolyhedronOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_ThePolyhedronOfInterCSurf_0.cxx
@@ -28,4 +28,4 @@
 #define ThePSurfaceTool_hxx <HLRBRep_SurfaceTool.hxx>
 #define IntCurveSurface_Polyhedron HLRBRep_ThePolyhedronOfInterCSurf
 #define IntCurveSurface_Polyhedron_hxx <HLRBRep_ThePolyhedronOfInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Polyhedron.gxx"
+#include <IntCurveSurface_Polyhedron.gxx>
diff --git a/src/HLRBRep/HLRBRep_ThePolyhedronToolOfInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_ThePolyhedronToolOfInterCSurf_0.cxx
index 2dd430fe37..110df1a807 100644
--- a/src/HLRBRep/HLRBRep_ThePolyhedronToolOfInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_ThePolyhedronToolOfInterCSurf_0.cxx
@@ -25,4 +25,4 @@
 #define ThePolyhedron_hxx <HLRBRep_ThePolyhedronOfInterCSurf.hxx>
 #define IntCurveSurface_PolyhedronTool HLRBRep_ThePolyhedronToolOfInterCSurf
 #define IntCurveSurface_PolyhedronTool_hxx <HLRBRep_ThePolyhedronToolOfInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_PolyhedronTool.gxx"
+#include <IntCurveSurface_PolyhedronTool.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheProjPCurOfCInter_0.cxx b/src/HLRBRep/HLRBRep_TheProjPCurOfCInter_0.cxx
index 4bc0d09f07..c41a7c1d60 100644
--- a/src/HLRBRep/HLRBRep_TheProjPCurOfCInter_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheProjPCurOfCInter_0.cxx
@@ -38,4 +38,4 @@
   <HLRBRep_PCLocFOfTheLocateExtPCOfTheProjPCurOfCInter.hxx>
 #define IntCurve_ProjPCurGen HLRBRep_TheProjPCurOfCInter
 #define IntCurve_ProjPCurGen_hxx <HLRBRep_TheProjPCurOfCInter.hxx>
-#include "../IntCurve/IntCurve_ProjPCurGen.gxx"
+#include <IntCurve_ProjPCurGen.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheQuadCurvExactInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_TheQuadCurvExactInterCSurf_0.cxx
index 529ffe1094..3ae376ded1 100644
--- a/src/HLRBRep/HLRBRep_TheQuadCurvExactInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheQuadCurvExactInterCSurf_0.cxx
@@ -34,4 +34,4 @@
   <HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf.hxx>
 #define IntCurveSurface_QuadricCurveExactInter HLRBRep_TheQuadCurvExactInterCSurf
 #define IntCurveSurface_QuadricCurveExactInter_hxx <HLRBRep_TheQuadCurvExactInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_QuadricCurveExactInter.gxx"
+#include <IntCurveSurface_QuadricCurveExactInter.gxx>
diff --git a/src/HLRBRep/HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf_0.cxx b/src/HLRBRep/HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf_0.cxx
index e951026561..c1a15ab56f 100644
--- a/src/HLRBRep/HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf_0.cxx
+++ b/src/HLRBRep/HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf_0.cxx
@@ -29,4 +29,4 @@
 #define IntCurveSurface_QuadricCurveFunc HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf
 #define IntCurveSurface_QuadricCurveFunc_hxx                                                       \
   <HLRBRep_TheQuadCurvFuncOfTheQuadCurvExactInterCSurf.hxx>
-#include "../IntCurveSurface/IntCurveSurface_QuadricCurveFunc.gxx"
+#include <IntCurveSurface_QuadricCurveFunc.gxx>
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity_0.cxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity_0.cxx
index b0ee6fbd79..6c196dbdcf 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity_0.cxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfIGESEntity_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESBasic_HArray1OfHArray1OfIGESEntity
 #define Interface_JaggedArray_hxx <IGESBasic_HArray1OfHArray1OfIGESEntity.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESBasic_HArray1OfHArray1OfIGESEntity)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger_0.cxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger_0.cxx
index 9b8f2d4ce9..c644d7feef 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger_0.cxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfInteger_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESBasic_HArray1OfHArray1OfInteger
 #define Interface_JaggedArray_hxx <IGESBasic_HArray1OfHArray1OfInteger.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESBasic_HArray1OfHArray1OfInteger)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal_0.cxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal_0.cxx
index d5aea069d3..bdf44ba6ea 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal_0.cxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfReal_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESBasic_HArray1OfHArray1OfReal
 #define Interface_JaggedArray_hxx <IGESBasic_HArray1OfHArray1OfReal.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESBasic_HArray1OfHArray1OfReal)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ_0.cxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ_0.cxx
index a2a8c057a2..739632afe3 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ_0.cxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXYZ_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESBasic_HArray1OfHArray1OfXYZ
 #define Interface_JaggedArray_hxx <IGESBasic_HArray1OfHArray1OfXYZ.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESBasic_HArray1OfHArray1OfXYZ)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY_0.cxx b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY_0.cxx
index 8d89265584..cc38f86276 100644
--- a/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY_0.cxx
+++ b/src/IGESBasic/IGESBasic_HArray1OfHArray1OfXY_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESBasic_HArray1OfHArray1OfXY
 #define Interface_JaggedArray_hxx <IGESBasic_HArray1OfHArray1OfXY.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESBasic_HArray1OfHArray1OfXY)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESData/IGESData_FileRecognizer_0.cxx b/src/IGESData/IGESData_FileRecognizer_0.cxx
index e48969d4f4..58396bda6f 100644
--- a/src/IGESData/IGESData_FileRecognizer_0.cxx
+++ b/src/IGESData/IGESData_FileRecognizer_0.cxx
@@ -31,4 +31,4 @@
 #define Interface_Recognizer IGESData_FileRecognizer
 #define Interface_Recognizer_hxx <IGESData_FileRecognizer.hxx>
 #define Handle_Interface_Recognizer Handle(IGESData_FileRecognizer)
-#include "../Interface/Interface_Recognizer.gxx"
+#include <Interface_Recognizer.gxx>
diff --git a/src/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx b/src/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
index e4de8d786d..aa6f4c491e 100644
--- a/src/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
+++ b/src/IGESData/IGESData_GlobalNodeOfSpecificLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfSpecificLib)
 #define LibCtl_Library IGESData_SpecificLib
 #define LibCtl_Library_hxx <IGESData_SpecificLib.hxx>
-#include "../LibCtl/LibCtl_GlobalNode.gxx"
+#include <LibCtl_GlobalNode.gxx>
diff --git a/src/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx b/src/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
index 23da0c9c11..a5d9d2f28d 100644
--- a/src/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
+++ b/src/IGESData/IGESData_GlobalNodeOfWriterLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfWriterLib)
 #define LibCtl_Library IGESData_WriterLib
 #define LibCtl_Library_hxx <IGESData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_GlobalNode.gxx"
+#include <LibCtl_GlobalNode.gxx>
diff --git a/src/IGESData/IGESData_NodeOfSpecificLib_0.cxx b/src/IGESData/IGESData_NodeOfSpecificLib_0.cxx
index d8b7961e2b..0df198638d 100644
--- a/src/IGESData/IGESData_NodeOfSpecificLib_0.cxx
+++ b/src/IGESData/IGESData_NodeOfSpecificLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfSpecificLib)
 #define LibCtl_Library IGESData_SpecificLib
 #define LibCtl_Library_hxx <IGESData_SpecificLib.hxx>
-#include "../LibCtl/LibCtl_Node.gxx"
+#include <LibCtl_Node.gxx>
diff --git a/src/IGESData/IGESData_NodeOfWriterLib_0.cxx b/src/IGESData/IGESData_NodeOfWriterLib_0.cxx
index 0fb5188c8a..7eec3e2ad3 100644
--- a/src/IGESData/IGESData_NodeOfWriterLib_0.cxx
+++ b/src/IGESData/IGESData_NodeOfWriterLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfWriterLib)
 #define LibCtl_Library IGESData_WriterLib
 #define LibCtl_Library_hxx <IGESData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_Node.gxx"
+#include <LibCtl_Node.gxx>
diff --git a/src/IGESData/IGESData_SpecificLib_0.cxx b/src/IGESData/IGESData_SpecificLib_0.cxx
index 6784553cce..8f38b0daee 100644
--- a/src/IGESData/IGESData_SpecificLib_0.cxx
+++ b/src/IGESData/IGESData_SpecificLib_0.cxx
@@ -40,4 +40,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfSpecificLib)
 #define LibCtl_Library IGESData_SpecificLib
 #define LibCtl_Library_hxx <IGESData_SpecificLib.hxx>
-#include "../LibCtl/LibCtl_Library.gxx"
+#include <LibCtl_Library.gxx>
diff --git a/src/IGESData/IGESData_WriterLib_0.cxx b/src/IGESData/IGESData_WriterLib_0.cxx
index 208757073c..f1093127f2 100644
--- a/src/IGESData/IGESData_WriterLib_0.cxx
+++ b/src/IGESData/IGESData_WriterLib_0.cxx
@@ -40,4 +40,4 @@
 #define Handle_LibCtl_Node Handle(IGESData_NodeOfWriterLib)
 #define LibCtl_Library IGESData_WriterLib
 #define LibCtl_Library_hxx <IGESData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_Library.gxx"
+#include <LibCtl_Library.gxx>
diff --git a/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate_0.cxx b/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate_0.cxx
index bc6a679ab8..3e7d663924 100644
--- a/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate_0.cxx
+++ b/src/IGESDefs/IGESDefs_HArray1OfHArray1OfTextDisplayTemplate_0.cxx
@@ -24,4 +24,4 @@
 #define Interface_JaggedArray IGESDefs_HArray1OfHArray1OfTextDisplayTemplate
 #define Interface_JaggedArray_hxx <IGESDefs_HArray1OfHArray1OfTextDisplayTemplate.hxx>
 #define Handle_Interface_JaggedArray Handle(IGESDefs_HArray1OfHArray1OfTextDisplayTemplate)
-#include "../Interface/Interface_JaggedArray.gxx"
+#include <Interface_JaggedArray.gxx>
diff --git a/src/IGESSelect/IGESSelect_FileModifier_0.cxx b/src/IGESSelect/IGESSelect_FileModifier_0.cxx
index 8179a5d114..44f626e5f8 100644
--- a/src/IGESSelect/IGESSelect_FileModifier_0.cxx
+++ b/src/IGESSelect/IGESSelect_FileModifier_0.cxx
@@ -26,4 +26,4 @@
 #define IFSelect_FileModifier IGESSelect_FileModifier
 #define IFSelect_FileModifier_hxx <IGESSelect_FileModifier.hxx>
 #define Handle_IFSelect_FileModifier Handle(IGESSelect_FileModifier)
-#include "../IFSelect/IFSelect_FileModifier.gxx"
+#include <IFSelect_FileModifier.gxx>
diff --git a/src/IGESSelect/IGESSelect_ModelModifier_0.cxx b/src/IGESSelect/IGESSelect_ModelModifier_0.cxx
index 88ac863110..7330662208 100644
--- a/src/IGESSelect/IGESSelect_ModelModifier_0.cxx
+++ b/src/IGESSelect/IGESSelect_ModelModifier_0.cxx
@@ -34,4 +34,4 @@
 #define IFSelect_ModelModifier IGESSelect_ModelModifier
 #define IFSelect_ModelModifier_hxx <IGESSelect_ModelModifier.hxx>
 #define Handle_IFSelect_ModelModifier Handle(IGESSelect_ModelModifier)
-#include "../IFSelect/IFSelect_ModelModifier.gxx"
+#include <IFSelect_ModelModifier.gxx>
diff --git a/src/IntCurve/IntCurve_IntImpConicParConic_0.cxx b/src/IntCurve/IntCurve_IntImpConicParConic_0.cxx
index 7e67b0238b..56dc42bdd3 100644
--- a/src/IntCurve/IntCurve_IntImpConicParConic_0.cxx
+++ b/src/IntCurve/IntCurve_IntImpConicParConic_0.cxx
@@ -37,4 +37,4 @@
 #define IntImpParGen_MyImpParTool_hxx <IntCurve_MyImpParToolOfIntImpConicParConic.hxx>
 #define IntImpParGen_Intersector IntCurve_IntImpConicParConic
 #define IntImpParGen_Intersector_hxx <IntCurve_IntImpConicParConic.hxx>
-#include "../IntImpParGen/IntImpParGen_Intersector.gxx"
+#include <IntImpParGen_Intersector.gxx>
diff --git a/src/IntCurve/IntCurve_MyImpParToolOfIntImpConicParConic_0.cxx b/src/IntCurve/IntCurve_MyImpParToolOfIntImpConicParConic_0.cxx
index 8d92541f8f..4056e4f552 100644
--- a/src/IntCurve/IntCurve_MyImpParToolOfIntImpConicParConic_0.cxx
+++ b/src/IntCurve/IntCurve_MyImpParToolOfIntImpConicParConic_0.cxx
@@ -28,4 +28,4 @@
 #define ParTool_hxx <IntCurve_PConicTool.hxx>
 #define IntImpParGen_ImpParTool IntCurve_MyImpParToolOfIntImpConicParConic
 #define IntImpParGen_ImpParTool_hxx <IntCurve_MyImpParToolOfIntImpConicParConic.hxx>
-#include "../IntImpParGen/IntImpParGen_ImpParTool.gxx"
+#include <IntImpParGen_ImpParTool.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_HInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_HInter_0.cxx
index 39a362d211..f294dbd43f 100644
--- a/src/IntCurveSurface/IntCurveSurface_HInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_HInter_0.cxx
@@ -72,4 +72,4 @@
   <IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter.hxx>
 #define IntCurveSurface_Inter IntCurveSurface_HInter
 #define IntCurveSurface_Inter_hxx <IntCurveSurface_HInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Inter.gxx"
+#include <IntCurveSurface_Inter.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_TheCSFunctionOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_TheCSFunctionOfHInter_0.cxx
index c1ae1aef39..d1b3d11398 100644
--- a/src/IntCurveSurface/IntCurveSurface_TheCSFunctionOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_TheCSFunctionOfHInter_0.cxx
@@ -33,4 +33,4 @@
 #define TheCurveTool_hxx <IntCurveSurface_TheHCurveTool.hxx>
 #define IntImp_ZerCSParFunc IntCurveSurface_TheCSFunctionOfHInter
 #define IntImp_ZerCSParFunc_hxx <IntCurveSurface_TheCSFunctionOfHInter.hxx>
-#include "../IntImp/IntImp_ZerCSParFunc.gxx"
+#include <IntImp_ZerCSParFunc.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_TheExactHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_TheExactHInter_0.cxx
index a7af790fec..0d8e2f4dbe 100644
--- a/src/IntCurveSurface/IntCurveSurface_TheExactHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_TheExactHInter_0.cxx
@@ -38,4 +38,4 @@
 #define TheFunction_hxx <IntCurveSurface_TheCSFunctionOfHInter.hxx>
 #define IntImp_IntCS IntCurveSurface_TheExactHInter
 #define IntImp_IntCS_hxx <IntCurveSurface_TheExactHInter.hxx>
-#include "../IntImp/IntImp_IntCS.gxx"
+#include <IntImp_IntCS.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_TheInterferenceOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_TheInterferenceOfHInter_0.cxx
index 5bdb4b4d3d..e88664fcf4 100644
--- a/src/IntCurveSurface/IntCurveSurface_TheInterferenceOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_TheInterferenceOfHInter_0.cxx
@@ -35,4 +35,4 @@
 #define ToolPolyh_hxx <IntCurveSurface_ThePolyhedronToolOfHInter.hxx>
 #define Intf_InterferencePolygonPolyhedron IntCurveSurface_TheInterferenceOfHInter
 #define Intf_InterferencePolygonPolyhedron_hxx <IntCurveSurface_TheInterferenceOfHInter.hxx>
-#include "../Intf/Intf_InterferencePolygonPolyhedron.gxx"
+#include <Intf_InterferencePolygonPolyhedron.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_ThePolygonOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_ThePolygonOfHInter_0.cxx
index 78df0b1fcb..fe00a39c9c 100644
--- a/src/IntCurveSurface/IntCurveSurface_ThePolygonOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_ThePolygonOfHInter_0.cxx
@@ -28,4 +28,4 @@
 #define TheCurveTool_hxx <IntCurveSurface_TheHCurveTool.hxx>
 #define IntCurveSurface_Polygon IntCurveSurface_ThePolygonOfHInter
 #define IntCurveSurface_Polygon_hxx <IntCurveSurface_ThePolygonOfHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Polygon.gxx"
+#include <IntCurveSurface_Polygon.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_ThePolygonToolOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_ThePolygonToolOfHInter_0.cxx
index 7a2a6f9031..d9e0996259 100644
--- a/src/IntCurveSurface/IntCurveSurface_ThePolygonToolOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_ThePolygonToolOfHInter_0.cxx
@@ -29,4 +29,4 @@
 #define TheBoundingBox_hxx <Bnd_Box.hxx>
 #define IntCurveSurface_PolygonTool IntCurveSurface_ThePolygonToolOfHInter
 #define IntCurveSurface_PolygonTool_hxx <IntCurveSurface_ThePolygonToolOfHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_PolygonTool.gxx"
+#include <IntCurveSurface_PolygonTool.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_ThePolyhedronOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_ThePolyhedronOfHInter_0.cxx
index ada274e32f..645532d9b8 100644
--- a/src/IntCurveSurface/IntCurveSurface_ThePolyhedronOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_ThePolyhedronOfHInter_0.cxx
@@ -29,4 +29,4 @@
 #define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
 #define IntCurveSurface_Polyhedron IntCurveSurface_ThePolyhedronOfHInter
 #define IntCurveSurface_Polyhedron_hxx <IntCurveSurface_ThePolyhedronOfHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_Polyhedron.gxx"
+#include <IntCurveSurface_Polyhedron.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_ThePolyhedronToolOfHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_ThePolyhedronToolOfHInter_0.cxx
index 66b316b72a..dd3e4579f0 100644
--- a/src/IntCurveSurface/IntCurveSurface_ThePolyhedronToolOfHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_ThePolyhedronToolOfHInter_0.cxx
@@ -25,4 +25,4 @@
 #define ThePolyhedron_hxx <IntCurveSurface_ThePolyhedronOfHInter.hxx>
 #define IntCurveSurface_PolyhedronTool IntCurveSurface_ThePolyhedronToolOfHInter
 #define IntCurveSurface_PolyhedronTool_hxx <IntCurveSurface_ThePolyhedronToolOfHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_PolyhedronTool.gxx"
+#include <IntCurveSurface_PolyhedronTool.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_TheQuadCurvExactHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_TheQuadCurvExactHInter_0.cxx
index 4aa6727515..c1c8807aed 100644
--- a/src/IntCurveSurface/IntCurveSurface_TheQuadCurvExactHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_TheQuadCurvExactHInter_0.cxx
@@ -35,4 +35,4 @@
   <IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter.hxx>
 #define IntCurveSurface_QuadricCurveExactInter IntCurveSurface_TheQuadCurvExactHInter
 #define IntCurveSurface_QuadricCurveExactInter_hxx <IntCurveSurface_TheQuadCurvExactHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_QuadricCurveExactInter.gxx"
+#include <IntCurveSurface_QuadricCurveExactInter.gxx>
diff --git a/src/IntCurveSurface/IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter_0.cxx b/src/IntCurveSurface/IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter_0.cxx
index c9f7553b24..5a7d60db0b 100644
--- a/src/IntCurveSurface/IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter_0.cxx
+++ b/src/IntCurveSurface/IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter_0.cxx
@@ -29,4 +29,4 @@
 #define IntCurveSurface_QuadricCurveFunc IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter
 #define IntCurveSurface_QuadricCurveFunc_hxx                                                       \
   <IntCurveSurface_TheQuadCurvFuncOfTheQuadCurvExactHInter.hxx>
-#include "../IntCurveSurface/IntCurveSurface_QuadricCurveFunc.gxx"
+#include <IntCurveSurface_QuadricCurveFunc.gxx>
diff --git a/src/IntPatch/IntPatch_CurvIntSurf_0.cxx b/src/IntPatch/IntPatch_CurvIntSurf_0.cxx
index 49a73526c2..4d8688a871 100644
--- a/src/IntPatch/IntPatch_CurvIntSurf_0.cxx
+++ b/src/IntPatch/IntPatch_CurvIntSurf_0.cxx
@@ -38,4 +38,4 @@
 #define TheFunction_hxx <IntPatch_CSFunction.hxx>
 #define IntImp_IntCS IntPatch_CurvIntSurf
 #define IntImp_IntCS_hxx <IntPatch_CurvIntSurf.hxx>
-#include "../IntImp/IntImp_IntCS.gxx"
+#include <IntImp_IntCS.gxx>
diff --git a/src/IntPatch/IntPatch_TheIWLineOfTheIWalking_0.cxx b/src/IntPatch/IntPatch_TheIWLineOfTheIWalking_0.cxx
index 11b14c58c5..a756686127 100644
--- a/src/IntPatch/IntPatch_TheIWLineOfTheIWalking_0.cxx
+++ b/src/IntPatch/IntPatch_TheIWLineOfTheIWalking_0.cxx
@@ -30,4 +30,4 @@
 #define IntWalk_IWLine IntPatch_TheIWLineOfTheIWalking
 #define IntWalk_IWLine_hxx <IntPatch_TheIWLineOfTheIWalking.hxx>
 #define Handle_IntWalk_IWLine Handle(IntPatch_TheIWLineOfTheIWalking)
-#include "../IntWalk/IntWalk_IWLine.gxx"
+#include <IntWalk_IWLine.gxx>
diff --git a/src/IntPatch/IntPatch_TheIWalking_0.cxx b/src/IntPatch/IntPatch_TheIWalking_0.cxx
index 1c76b24446..b16b4116c8 100644
--- a/src/IntPatch/IntPatch_TheIWalking_0.cxx
+++ b/src/IntPatch/IntPatch_TheIWalking_0.cxx
@@ -54,4 +54,4 @@
 #define Handle_IntWalk_TheIWLine Handle(IntPatch_TheIWLineOfTheIWalking)
 #define IntWalk_IWalking IntPatch_TheIWalking
 #define IntWalk_IWalking_hxx <IntPatch_TheIWalking.hxx>
-#include "../IntWalk/IntWalk_IWalking.gxx"
+#include <IntWalk_IWalking.gxx>
diff --git a/src/IntPatch/IntPatch_ThePathPointOfTheSOnBounds_0.cxx b/src/IntPatch/IntPatch_ThePathPointOfTheSOnBounds_0.cxx
index ead0df661a..f6f375821d 100644
--- a/src/IntPatch/IntPatch_ThePathPointOfTheSOnBounds_0.cxx
+++ b/src/IntPatch/IntPatch_ThePathPointOfTheSOnBounds_0.cxx
@@ -27,4 +27,4 @@
 #define TheArc_hxx <Adaptor2d_Curve2d.hxx>
 #define IntStart_PathPoint IntPatch_ThePathPointOfTheSOnBounds
 #define IntStart_PathPoint_hxx <IntPatch_ThePathPointOfTheSOnBounds.hxx>
-#include "../IntStart/IntStart_PathPoint.gxx"
+#include <IntStart_PathPoint.gxx>
diff --git a/src/IntPatch/IntPatch_TheSOnBounds_0.cxx b/src/IntPatch/IntPatch_TheSOnBounds_0.cxx
index 7064b1d56b..19154ee465 100644
--- a/src/IntPatch/IntPatch_TheSOnBounds_0.cxx
+++ b/src/IntPatch/IntPatch_TheSOnBounds_0.cxx
@@ -53,4 +53,4 @@
 #define IntStart_SequenceOfSegment_hxx <IntPatch_SequenceOfSegmentOfTheSOnBounds.hxx>
 #define IntStart_SearchOnBoundaries IntPatch_TheSOnBounds
 #define IntStart_SearchOnBoundaries_hxx <IntPatch_TheSOnBounds.hxx>
-#include "../IntStart/IntStart_SearchOnBoundaries.gxx"
+#include <IntStart_SearchOnBoundaries.gxx>
diff --git a/src/IntPatch/IntPatch_TheSearchInside_0.cxx b/src/IntPatch/IntPatch_TheSearchInside_0.cxx
index 6a20a43d58..d87c27e598 100644
--- a/src/IntPatch/IntPatch_TheSearchInside_0.cxx
+++ b/src/IntPatch/IntPatch_TheSearchInside_0.cxx
@@ -38,4 +38,4 @@
 #define TheFunction_hxx <IntPatch_TheSurfFunction.hxx>
 #define IntStart_SearchInside IntPatch_TheSearchInside
 #define IntStart_SearchInside_hxx <IntPatch_TheSearchInside.hxx>
-#include "../IntStart/IntStart_SearchInside.gxx"
+#include <IntStart_SearchInside.gxx>
diff --git a/src/IntPatch/IntPatch_TheSegmentOfTheSOnBounds_0.cxx b/src/IntPatch/IntPatch_TheSegmentOfTheSOnBounds_0.cxx
index 6524e0e4c8..1f10705eb8 100644
--- a/src/IntPatch/IntPatch_TheSegmentOfTheSOnBounds_0.cxx
+++ b/src/IntPatch/IntPatch_TheSegmentOfTheSOnBounds_0.cxx
@@ -29,4 +29,4 @@
 #define ThePathPoint_hxx <IntPatch_ThePathPointOfTheSOnBounds.hxx>
 #define IntStart_Segment IntPatch_TheSegmentOfTheSOnBounds
 #define IntStart_Segment_hxx <IntPatch_TheSegmentOfTheSOnBounds.hxx>
-#include "../IntStart/IntStart_Segment.gxx"
+#include <IntStart_Segment.gxx>
diff --git a/src/IntPatch/IntPatch_TheSurfFunction_0.cxx b/src/IntPatch/IntPatch_TheSurfFunction_0.cxx
index dcb11aee0a..2c7859675a 100644
--- a/src/IntPatch/IntPatch_TheSurfFunction_0.cxx
+++ b/src/IntPatch/IntPatch_TheSurfFunction_0.cxx
@@ -36,4 +36,4 @@
 #define TheISurfaceTool_hxx <IntSurf_QuadricTool.hxx>
 #define IntImp_ZerImpFunc IntPatch_TheSurfFunction
 #define IntImp_ZerImpFunc_hxx <IntPatch_TheSurfFunction.hxx>
-#include "../IntImp/IntImp_ZerImpFunc.gxx"
+#include <IntImp_ZerImpFunc.gxx>
diff --git a/src/IntWalk/IntWalk_TheFunctionOfTheInt2S_0.cxx b/src/IntWalk/IntWalk_TheFunctionOfTheInt2S_0.cxx
index be12d3b31e..f822a5d9a7 100644
--- a/src/IntWalk/IntWalk_TheFunctionOfTheInt2S_0.cxx
+++ b/src/IntWalk/IntWalk_TheFunctionOfTheInt2S_0.cxx
@@ -28,4 +28,4 @@
 #define ThePSurfaceTool_hxx <Adaptor3d_HSurfaceTool.hxx>
 #define IntImp_ZerParFunc IntWalk_TheFunctionOfTheInt2S
 #define IntImp_ZerParFunc_hxx <IntWalk_TheFunctionOfTheInt2S.hxx>
-#include "../IntImp/IntImp_ZerParFunc.gxx"
+#include <IntImp_ZerParFunc.gxx>
diff --git a/src/IntWalk/IntWalk_TheInt2S_0.cxx b/src/IntWalk/IntWalk_TheInt2S_0.cxx
index 1c63fb4400..d5c4bb6ad4 100644
--- a/src/IntWalk/IntWalk_TheInt2S_0.cxx
+++ b/src/IntWalk/IntWalk_TheInt2S_0.cxx
@@ -36,4 +36,4 @@
 #define IntImp_TheFunction_hxx <IntWalk_TheFunctionOfTheInt2S.hxx>
 #define IntImp_Int2S IntWalk_TheInt2S
 #define IntImp_Int2S_hxx <IntWalk_TheInt2S.hxx>
-#include "../IntImp/IntImp_Int2S.gxx"
+#include <IntImp_Int2S.gxx>
diff --git a/src/Interface/Interface_GeneralLib_0.cxx b/src/Interface/Interface_GeneralLib_0.cxx
index bea4d8414f..962fb34b46 100644
--- a/src/Interface/Interface_GeneralLib_0.cxx
+++ b/src/Interface/Interface_GeneralLib_0.cxx
@@ -39,4 +39,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfGeneralLib)
 #define LibCtl_Library Interface_GeneralLib
 #define LibCtl_Library_hxx <Interface_GeneralLib.hxx>
-#include "../LibCtl/LibCtl_Library.gxx"
+#include <LibCtl_Library.gxx>
diff --git a/src/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx b/src/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
index 2dd943590e..1d73a318bf 100644
--- a/src/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
+++ b/src/Interface/Interface_GlobalNodeOfGeneralLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfGeneralLib)
 #define LibCtl_Library Interface_GeneralLib
 #define LibCtl_Library_hxx <Interface_GeneralLib.hxx>
-#include "../LibCtl/LibCtl_GlobalNode.gxx"
+#include <LibCtl_GlobalNode.gxx>
diff --git a/src/Interface/Interface_GlobalNodeOfReaderLib_0.cxx b/src/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
index f77f4d1168..ed3417eb93 100644
--- a/src/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
+++ b/src/Interface/Interface_GlobalNodeOfReaderLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfReaderLib)
 #define LibCtl_Library Interface_ReaderLib
 #define LibCtl_Library_hxx <Interface_ReaderLib.hxx>
-#include "../LibCtl/LibCtl_GlobalNode.gxx"
+#include <LibCtl_GlobalNode.gxx>
diff --git a/src/Interface/Interface_NodeOfGeneralLib_0.cxx b/src/Interface/Interface_NodeOfGeneralLib_0.cxx
index 77ac4ab327..cf416ac809 100644
--- a/src/Interface/Interface_NodeOfGeneralLib_0.cxx
+++ b/src/Interface/Interface_NodeOfGeneralLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfGeneralLib)
 #define LibCtl_Library Interface_GeneralLib
 #define LibCtl_Library_hxx <Interface_GeneralLib.hxx>
-#include "../LibCtl/LibCtl_Node.gxx"
+#include <LibCtl_Node.gxx>
diff --git a/src/Interface/Interface_NodeOfReaderLib_0.cxx b/src/Interface/Interface_NodeOfReaderLib_0.cxx
index 6839898d1d..ed0826a893 100644
--- a/src/Interface/Interface_NodeOfReaderLib_0.cxx
+++ b/src/Interface/Interface_NodeOfReaderLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfReaderLib)
 #define LibCtl_Library Interface_ReaderLib
 #define LibCtl_Library_hxx <Interface_ReaderLib.hxx>
-#include "../LibCtl/LibCtl_Node.gxx"
+#include <LibCtl_Node.gxx>
diff --git a/src/Interface/Interface_ReaderLib_0.cxx b/src/Interface/Interface_ReaderLib_0.cxx
index 21111477c1..55719a00ce 100644
--- a/src/Interface/Interface_ReaderLib_0.cxx
+++ b/src/Interface/Interface_ReaderLib_0.cxx
@@ -39,4 +39,4 @@
 #define Handle_LibCtl_Node Handle(Interface_NodeOfReaderLib)
 #define LibCtl_Library Interface_ReaderLib
 #define LibCtl_Library_hxx <Interface_ReaderLib.hxx>
-#include "../LibCtl/LibCtl_Library.gxx"
+#include <LibCtl_Library.gxx>
diff --git a/src/LProp3d/LProp3d_CLProps_0.cxx b/src/LProp3d/LProp3d_CLProps_0.cxx
index 70f1b00ed5..3b47a7c0f9 100644
--- a/src/LProp3d/LProp3d_CLProps_0.cxx
+++ b/src/LProp3d/LProp3d_CLProps_0.cxx
@@ -37,4 +37,4 @@
 #define Tool_hxx <LProp3d_CurveTool.hxx>
 #define LProp_CLProps LProp3d_CLProps
 #define LProp_CLProps_hxx <LProp3d_CLProps.hxx>
-#include "../LProp/LProp_CLProps.gxx"
+#include <LProp_CLProps.gxx>
diff --git a/src/LProp3d/LProp3d_SLProps_0.cxx b/src/LProp3d/LProp3d_SLProps_0.cxx
index da07d2bc8c..e49d535187 100644
--- a/src/LProp3d/LProp3d_SLProps_0.cxx
+++ b/src/LProp3d/LProp3d_SLProps_0.cxx
@@ -31,4 +31,4 @@
 #define Tool_hxx <LProp3d_SurfaceTool.hxx>
 #define LProp_SLProps LProp3d_SLProps
 #define LProp_SLProps_hxx <LProp3d_SLProps.hxx>
-#include "../LProp/LProp_SLProps.gxx"
+#include <LProp_SLProps.gxx>
diff --git a/src/MAT/MAT_ListOfBisector_0.cxx b/src/MAT/MAT_ListOfBisector_0.cxx
index 3ade427c92..3ccc6b2b72 100644
--- a/src/MAT/MAT_ListOfBisector_0.cxx
+++ b/src/MAT/MAT_ListOfBisector_0.cxx
@@ -29,4 +29,4 @@
 #define MAT_TList MAT_ListOfBisector
 #define MAT_TList_hxx <MAT_ListOfBisector.hxx>
 #define Handle_MAT_TList Handle(MAT_ListOfBisector)
-#include "../MAT/MAT_TList.gxx"
+#include <MAT_TList.gxx>
diff --git a/src/MAT/MAT_ListOfEdge_0.cxx b/src/MAT/MAT_ListOfEdge_0.cxx
index 033a11d9ac..fff188f3ab 100644
--- a/src/MAT/MAT_ListOfEdge_0.cxx
+++ b/src/MAT/MAT_ListOfEdge_0.cxx
@@ -29,4 +29,4 @@
 #define MAT_TList MAT_ListOfEdge
 #define MAT_TList_hxx <MAT_ListOfEdge.hxx>
 #define Handle_MAT_TList Handle(MAT_ListOfEdge)
-#include "../MAT/MAT_TList.gxx"
+#include <MAT_TList.gxx>
diff --git a/src/MAT/MAT_TListNodeOfListOfBisector_0.cxx b/src/MAT/MAT_TListNodeOfListOfBisector_0.cxx
index bb36dee972..057e969ced 100644
--- a/src/MAT/MAT_TListNodeOfListOfBisector_0.cxx
+++ b/src/MAT/MAT_TListNodeOfListOfBisector_0.cxx
@@ -30,4 +30,4 @@
 #define MAT_TList MAT_ListOfBisector
 #define MAT_TList_hxx <MAT_ListOfBisector.hxx>
 #define Handle_MAT_TList Handle(MAT_ListOfBisector)
-#include "../MAT/MAT_TListNode.gxx"
+#include <MAT_TListNode.gxx>
diff --git a/src/MAT/MAT_TListNodeOfListOfEdge_0.cxx b/src/MAT/MAT_TListNodeOfListOfEdge_0.cxx
index d2a854a2c9..768352b687 100644
--- a/src/MAT/MAT_TListNodeOfListOfEdge_0.cxx
+++ b/src/MAT/MAT_TListNodeOfListOfEdge_0.cxx
@@ -30,4 +30,4 @@
 #define MAT_TList MAT_ListOfEdge
 #define MAT_TList_hxx <MAT_ListOfEdge.hxx>
 #define Handle_MAT_TList Handle(MAT_ListOfEdge)
-#include "../MAT/MAT_TListNode.gxx"
+#include <MAT_TListNode.gxx>
diff --git a/src/StepData/StepData_FileRecognizer_0.cxx b/src/StepData/StepData_FileRecognizer_0.cxx
index 32339e56e1..a5a04f7ede 100644
--- a/src/StepData/StepData_FileRecognizer_0.cxx
+++ b/src/StepData/StepData_FileRecognizer_0.cxx
@@ -31,4 +31,4 @@
 #define Interface_Recognizer StepData_FileRecognizer
 #define Interface_Recognizer_hxx <StepData_FileRecognizer.hxx>
 #define Handle_Interface_Recognizer Handle(StepData_FileRecognizer)
-#include "../Interface/Interface_Recognizer.gxx"
+#include <Interface_Recognizer.gxx>
diff --git a/src/StepData/StepData_GlobalNodeOfWriterLib_0.cxx b/src/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
index 2b3ab4bac0..e009a7d3e7 100644
--- a/src/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
+++ b/src/StepData/StepData_GlobalNodeOfWriterLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(StepData_NodeOfWriterLib)
 #define LibCtl_Library StepData_WriterLib
 #define LibCtl_Library_hxx <StepData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_GlobalNode.gxx"
+#include <LibCtl_GlobalNode.gxx>
diff --git a/src/StepData/StepData_NodeOfWriterLib_0.cxx b/src/StepData/StepData_NodeOfWriterLib_0.cxx
index 8e394c5aeb..d825290dde 100644
--- a/src/StepData/StepData_NodeOfWriterLib_0.cxx
+++ b/src/StepData/StepData_NodeOfWriterLib_0.cxx
@@ -41,4 +41,4 @@
 #define Handle_LibCtl_Node Handle(StepData_NodeOfWriterLib)
 #define LibCtl_Library StepData_WriterLib
 #define LibCtl_Library_hxx <StepData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_Node.gxx"
+#include <LibCtl_Node.gxx>
diff --git a/src/StepData/StepData_WriterLib_0.cxx b/src/StepData/StepData_WriterLib_0.cxx
index a897e376e5..d5e534e279 100644
--- a/src/StepData/StepData_WriterLib_0.cxx
+++ b/src/StepData/StepData_WriterLib_0.cxx
@@ -39,4 +39,4 @@
 #define Handle_LibCtl_Node Handle(StepData_NodeOfWriterLib)
 #define LibCtl_Library StepData_WriterLib
 #define LibCtl_Library_hxx <StepData_WriterLib.hxx>
-#include "../LibCtl/LibCtl_Library.gxx"
+#include <LibCtl_Library.gxx>
diff --git a/src/StepSelect/StepSelect_FileModifier_0.cxx b/src/StepSelect/StepSelect_FileModifier_0.cxx
index 6be1fc1641..c44f320f6b 100644
--- a/src/StepSelect/StepSelect_FileModifier_0.cxx
+++ b/src/StepSelect/StepSelect_FileModifier_0.cxx
@@ -26,4 +26,4 @@
 #define IFSelect_FileModifier StepSelect_FileModifier
 #define IFSelect_FileModifier_hxx <StepSelect_FileModifier.hxx>
 #define Handle_IFSelect_FileModifier Handle(StepSelect_FileModifier)
-#include "../IFSelect/IFSelect_FileModifier.gxx"
+#include <IFSelect_FileModifier.gxx>
diff --git a/src/StepSelect/StepSelect_ModelModifier_0.cxx b/src/StepSelect/StepSelect_ModelModifier_0.cxx
index 813ac55a73..124d5370d4 100644
--- a/src/StepSelect/StepSelect_ModelModifier_0.cxx
+++ b/src/StepSelect/StepSelect_ModelModifier_0.cxx
@@ -34,4 +34,4 @@
 #define IFSelect_ModelModifier StepSelect_ModelModifier
 #define IFSelect_ModelModifier_hxx <StepSelect_ModelModifier.hxx>
 #define Handle_IFSelect_ModelModifier Handle(StepSelect_ModelModifier)
-#include "../IFSelect/IFSelect_ModelModifier.gxx"
+#include <IFSelect_ModelModifier.gxx>
diff --git a/src/TopBas/TopBas_TestInterference_0.cxx b/src/TopBas/TopBas_TestInterference_0.cxx
index e9806a18ff..b6ab6668f7 100644
--- a/src/TopBas/TopBas_TestInterference_0.cxx
+++ b/src/TopBas/TopBas_TestInterference_0.cxx
@@ -22,4 +22,4 @@
 #define TheShape_hxx <Standard_Integer.hxx>
 #define TopBas_Interference TopBas_TestInterference
 #define TopBas_Interference_hxx <TopBas_TestInterference.hxx>
-#include "../TopBas/TopBas_Interference.gxx"
+#include <TopBas_Interference.gxx>