diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
index 51639fca96d..38f66ccf452 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
@@ -3248,14 +3248,13 @@ public:
         Z<Curved_kernel_via_analysis_2>
 #else // defined(_MSC_VER) || defined(__clang__) || defined(__INTEL_COMPILER)
     // befriending the kernel point
-    friend class Curved_kernel_via_analysis_2::Point_2;
+    //friend class Curved_kernel_via_analysis_2::Point_2;
 
     // befriending the kernel arc
-    friend class Curved_kernel_via_analysis_2::Arc_2;
+    //friend class Curved_kernel_via_analysis_2::Arc_2;
 
     // befriending the functors
 #define CGAL_BEFRIEND_CKvA_2_FUNCTOR(Z) \
-    friend class Curved_kernel_via_analysis_2::Z; \
     friend class Curved_kernel_via_analysis_2_Functors:: \
         Z<Curved_kernel_via_analysis_2>
 #endif // defined(_MSC_VER) || defined(__clang__) || defined(__INTEL_COMPILER)
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
index ed62c49f32c..01e7cc14ef1 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
@@ -790,7 +790,6 @@ public:
   friend typename Curved_kernel_via_analysis_2_Functors::Z< Curved_kernel_via_analysis_2 >
 #else // defined(_MSC_VER) || defined(__clang__) || defined(__INTEL_COMPILER)
 #define CGAL_BEFRIEND_CKvA_2_FUNCTOR(Z) \
-  friend class Curved_kernel_via_analysis_2::Z;  \
   friend class Curved_kernel_via_analysis_2_Functors::Z< Curved_kernel_via_analysis_2 > 
 #endif // defined(_MSC_VER) || defined(__clang__) || defined(__INTEL_COMPILER)