diff --git a/BGL/include/CGAL/boost/graph/IO/INP.h b/BGL/include/CGAL/boost/graph/IO/INP.h
index 61d2ea7409e..9194174dd9b 100644
--- a/BGL/include/CGAL/boost/graph/IO/INP.h
+++ b/BGL/include/CGAL/boost/graph/IO/INP.h
@@ -98,6 +98,25 @@ bool write_INP(const std::string& fname, const std::string& type, const Graph& g
   return write_INP(fname, type, g, parameters::all_default());
 }
 
+#ifndef CGAL_NO_DEPRECATED_CODE
+template <typename FaceGraph, typename NamedParameters>
+CGAL_DEPRECATED bool write_inp(std::ostream& os,
+               const FaceGraph& g,
+               std::string name,
+               std::string type,
+               const NamedParameters& np)
+{
+  return write_INP(os, name, type, g, np);
+}
+template <typename FaceGraph>
+CGAL_DEPRECATED bool write_inp(std::ostream& os,
+               const FaceGraph& g,
+               std::string name,
+               std::string type)
+{
+  return write_INP(os, name, type, g, parameters::all_default());
+}
+#endif
 /// \endcond
 
 }} // namespace CGAL::IO
diff --git a/BGL/include/CGAL/boost/graph/IO/OFF.h b/BGL/include/CGAL/boost/graph/IO/OFF.h
index fb5b5a25f4d..e368a1ab92a 100644
--- a/BGL/include/CGAL/boost/graph/IO/OFF.h
+++ b/BGL/include/CGAL/boost/graph/IO/OFF.h
@@ -313,6 +313,12 @@ CGAL_DEPRECATED bool read_off(const char* fname, Graph& g)
  return read_off(fname, g, parameters::all_default());
 }
 
+template <typename Graph>
+CGAL_DEPRECATED bool read_off(const std::string& fname, Graph& g)
+{
+ return read_off(fname.c_str(), g, parameters::all_default());
+}
+
 #endif // CGAL_NO_DEPRECATED_CODE
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Generator/include/CGAL/internal/Generic_random_point_generator.h b/Generator/include/CGAL/internal/Generic_random_point_generator.h
index 76c52dd55cb..a161df1da76 100644
--- a/Generator/include/CGAL/internal/Generic_random_point_generator.h
+++ b/Generator/include/CGAL/internal/Generic_random_point_generator.h
@@ -18,7 +18,6 @@
 #include <CGAL/generators.h>
 #include <CGAL/Random.h>
 #include <CGAL/property_map.h>
-#include <CGAL/result_of.h>
 
 
 #include <vector>
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index 76d6fd9366c..a848194d68b 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -652,7 +652,15 @@ namespace CGAL {
 
 // Typedef for the type of nullptr.
 typedef const void * Nullptr_t;   // Anticipate C++0x's std::nullptr_t
-
+namespace cpp11{
+#if CGAL_CXX20 || __cpp_lib_is_invocable>=201703L
+    template<typename Signature> class result_of;
+    template<typename F, typename... Args>
+    class result_of<F(Args...)> : public std::invoke_result<F, Args...> { };
+#else
+    using std::result_of;
+#endif
+}//namespace cpp11
 } //namespace CGAL
 
 //Support for c++11 noexcept
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
index 631603f092e..01661657268 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
@@ -22,7 +22,6 @@
 #include <CGAL/basic.h>
 
 #include <CGAL/internal/Periodic_3_triangulation_iterators_3.h>
-#include <CGAL/result_of.h>
 #include <CGAL/Periodic_3_triangulation_ds_cell_base_3.h>
 #include <CGAL/Periodic_3_triangulation_ds_vertex_base_3.h>
 #include <CGAL/Periodic_3_triangulation_traits_3.h>
diff --git a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_2.h b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_2.h
index 0c74a7a8be4..3b17771004c 100644
--- a/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_2.h
+++ b/Periodic_4_hyperbolic_triangulation_2/include/CGAL/Periodic_4_hyperbolic_Delaunay_triangulation_2.h
@@ -24,7 +24,6 @@
 
 #include <CGAL/intersections.h>
 #include <CGAL/iterator.h>
-#include <CGAL/result_of.h>
 #include <CGAL/Timer.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
index 4e2b88068f6..403f1d25f05 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
@@ -328,7 +328,7 @@ CGAL_DEPRECATED bool write_xyz_points(std::ostream& os, const PointRange& points
 template <typename PointRange>
 CGAL_DEPRECATED bool write_xyz_points(std::ostream& os, const PointRange& points)
 {
-  return IO::write_XYZ(os, points, parameters::all_default(points));
+  return IO::write_XYZ(os, points, parameters::all_default());
 }
 
 /// \endcond
diff --git a/STL_Extension/include/CGAL/result_of.h b/STL_Extension/include/CGAL/result_of.h
index 863ddb90806..87329e362b7 100644
--- a/STL_Extension/include/CGAL/result_of.h
+++ b/STL_Extension/include/CGAL/result_of.h
@@ -18,6 +18,9 @@
 #ifndef CGAL_RESULT_OF_H
 #define CGAL_RESULT_OF_H
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/result_of.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/config.h>"
+
 #include <CGAL/config.h>
 #include <CGAL/disable_warnings.h>
 
diff --git a/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h b/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
index 16ffe439eaa..cd348d178e3 100644
--- a/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
+++ b/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
@@ -17,7 +17,6 @@
 #include <CGAL/license/Spatial_searching.h>
 
 
-#include <CGAL/result_of.h>
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/internal/Get_dimension_tag.h>
 #include <vector>
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
index 38db58f55dc..b6196d5908c 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
@@ -1145,6 +1145,11 @@ CGAL_DEPRECATED bool write_ply(std::ostream& os, const Surface_mesh<P>& sm, cons
   return IO::write_PLY(os, sm, comments);
 }
 
+template <typename P>
+CGAL_DEPRECATED bool write_ply(std::ostream& os, const Surface_mesh<P>& sm)
+{
+  return write_PLY(os, sm, "");
+}
 #endif // CGAL_NO_DEPRECATED_CODE
 
 } // namespace CGAL
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
index 34186b034a0..c65d42e9bf8 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
@@ -38,7 +38,6 @@
 #include <CGAL/Cartesian_converter.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Kernel_traits.h>
-#include <CGAL/result_of.h>
 
 #ifndef CGAL_TRIANGULATION_3_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
 #include <CGAL/Spatial_sort_traits_adapter_3.h>