diff --git a/Circular_kernel_3/include/CGAL/Circular_arc_3.h b/Circular_kernel_3/include/CGAL/Circular_arc_3.h
index 86c0756bda4..6843fac6003 100644
--- a/Circular_kernel_3/include/CGAL/Circular_arc_3.h
+++ b/Circular_kernel_3/include/CGAL/Circular_arc_3.h
@@ -20,7 +20,6 @@
 #include <CGAL/license/Circular_kernel_3.h>
 
 
-#include <CGAL/result_of.h>
 #include <CGAL/Bbox_3.h>
 
 namespace CGAL {
@@ -117,19 +116,19 @@ namespace CGAL {
      : RCircular_arc_3(a)
       {}
 
-    typename cpp11::result_of<typename R::Construct_circular_source_vertex_3(Circular_arc_3)>::type
+    decltype(auto)
     source() const
     {
       return typename R::Construct_circular_source_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_circular_target_vertex_3(Circular_arc_3)>::type
+    decltype(auto)
     target() const
     {
       return typename R::Construct_circular_target_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_circle_3(Circular_arc_3)>::type
+    decltype(auto)
     supporting_circle() const
     {
       return typename R::Construct_circle_3()(*this);
diff --git a/Circular_kernel_3/include/CGAL/Circular_arc_point_3.h b/Circular_kernel_3/include/CGAL/Circular_arc_point_3.h
index 36c0ed41c18..f9f941d2d8b 100644
--- a/Circular_kernel_3/include/CGAL/Circular_arc_point_3.h
+++ b/Circular_kernel_3/include/CGAL/Circular_arc_point_3.h
@@ -20,7 +20,6 @@
 #include <CGAL/license/Circular_kernel_3.h>
 
 
-#include <CGAL/result_of.h>
 #include <CGAL/Bbox_3.h>
 #include <iostream>
 
@@ -196,15 +195,15 @@ public:
 
 
 
-  typename cpp11::result_of<typename R::Compute_circular_x_3(Circular_arc_point_3)>::type
+  decltype(auto)
   x() const
   { return typename R::Compute_circular_x_3()(*this);}
 
-  typename cpp11::result_of<typename R::Compute_circular_y_3(Circular_arc_point_3)>::type
+  decltype(auto)
   y() const
   { return typename R::Compute_circular_y_3()(*this);}
 
-  typename cpp11::result_of<typename R::Compute_circular_z_3(Circular_arc_point_3)>::type
+  decltype(auto)
   z() const
   { return typename R::Compute_circular_z_3()(*this);}
 
diff --git a/Circular_kernel_3/include/CGAL/Line_arc_3.h b/Circular_kernel_3/include/CGAL/Line_arc_3.h
index e2413b1317c..f9955774c9b 100644
--- a/Circular_kernel_3/include/CGAL/Line_arc_3.h
+++ b/Circular_kernel_3/include/CGAL/Line_arc_3.h
@@ -20,7 +20,6 @@
 #include <CGAL/license/Circular_kernel_3.h>
 
 
-#include <CGAL/result_of.h>
 #include <CGAL/Bbox_3.h>
 
 
@@ -122,31 +121,31 @@ namespace CGAL {
      : RLine_arc_3(a)
       {}
 
-    typename cpp11::result_of<typename R::Construct_circular_source_vertex_3(Line_arc_3)>::type
+    decltype(auto)
     source() const
     {
       return typename R::Construct_circular_source_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_circular_target_vertex_3(Line_arc_3)>::type
+    decltype(auto)
     target() const
     {
       return typename R::Construct_circular_target_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_circular_min_vertex_3(Line_arc_3)>::type
+    decltype(auto)
     lower_xyz_extremity() const
     {
       return typename R::Construct_circular_min_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_circular_max_vertex_3(Line_arc_3)>::type
+    decltype(auto)
     higher_xyz_extremity() const
     {
       return typename R::Construct_circular_max_vertex_3()(*this);
     }
 
-    typename cpp11::result_of<typename R::Construct_line_3(Line_arc_3)>::type
+    decltype(auto)
     supporting_line() const
     {
       return typename R::Construct_line_3()(*this);