diff --git a/Point_set_processing_3/include/CGAL/IO/write_off_points.h b/Point_set_processing_3/include/CGAL/IO/write_off_points.h
index 1d4b90337c2..50125b1bd26 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h
@@ -145,7 +145,7 @@ write_off_points_and_normals(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::input_iterator<ForwardIterator>::value_type()),
 #endif
     normal_pmap);
 }
@@ -247,7 +247,7 @@ write_off_points(
     make_dereference_property_map(first)
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type())
+    typename std::iterator_traits<ForwardIterator>::value_type())
 #endif
     );
 }
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 f01c9531278..7533b746e9b 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
@@ -140,7 +140,7 @@ write_xyz_points_and_normals(
     make_dereference_property_map(output),
 #else
     make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     normal_pmap);
 }
@@ -238,7 +238,7 @@ write_xyz_points(
     make_dereference_property_map(output)
 #else
     make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type())
+      typename std::iterator_traits<ForwardIterator>::value_type())
 #endif
     );
 }
diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
index d481f155235..49dc48ecb51 100644
--- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h
+++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
@@ -207,7 +207,7 @@ compute_average_spacing(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
     k);
 }
diff --git a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
index e744c209a79..3d973a0c541 100644
--- a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
@@ -222,7 +222,7 @@ grid_simplify_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     epsilon);
 }
diff --git a/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
index 5bd2544576b..a421bb6a45b 100644
--- a/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
@@ -360,7 +360,7 @@ improved_jet_smooth_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     k,
     iter_number,
diff --git a/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h b/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
index 39f00b4dc05..90cb9874784 100644
--- a/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
@@ -340,7 +340,7 @@ improved_laplacian_smooth_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     k,
     iter_number,
diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
index 17dedc70098..b7320fe18a9 100644
--- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
@@ -251,7 +251,7 @@ jet_estimate_normals(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     normal_pmap,
     k,
diff --git a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
index e69c1053525..1592c1a729f 100644
--- a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
@@ -226,7 +226,7 @@ jet_smooth_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
     k,
     degree_fitting,degree_monge);
diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
index 04fe41261ca..f60806e709c 100644
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@@ -704,7 +704,7 @@ mst_orient_normals(
       make_dereference_property_map(first),
 #else
       make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
       normal_pmap,
       k);
diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
index 371d832dedf..76dd71d718d 100644
--- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
@@ -241,7 +241,7 @@ pca_estimate_normals(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     normal_pmap,
     k);
diff --git a/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h b/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
index 124facabc0e..b42f3a007ff 100644
--- a/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
@@ -214,7 +214,7 @@ pca_smooth_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
     k);
 }
diff --git a/Point_set_processing_3/include/CGAL/radial_orient_normals.h b/Point_set_processing_3/include/CGAL/radial_orient_normals.h
index 48325128c79..4ad59f117f2 100644
--- a/Point_set_processing_3/include/CGAL/radial_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/radial_orient_normals.h
@@ -180,7 +180,7 @@ radial_orient_normals(
       make_dereference_property_map(first),
 #else
       make_typed_identity_property_map_by_reference(
-      typename value_type_traits<ForwardIterator>::type()),
+      typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
       normal_pmap);
 }
diff --git a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
index 4f7a36937bc..30c7ef1ca43 100644
--- a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
@@ -110,7 +110,7 @@ random_simplify_point_set(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<ForwardIterator>::type()),
+    typename std::iterator_traits<ForwardIterator>::value_type()),
 #endif
     removed_percentage);
 }
diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h
index e44e278f237..41bc4bfd9b9 100644
--- a/Point_set_processing_3/include/CGAL/remove_outliers.h
+++ b/Point_set_processing_3/include/CGAL/remove_outliers.h
@@ -246,7 +246,7 @@ remove_outliers(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
     k,threshold_percent);
 }
diff --git a/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h b/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h
index a40a667b1cd..cae10a356fd 100644
--- a/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h
+++ b/Point_set_processing_3/include/CGAL/remove_outliers_wrt_median_knn_sq_distance.h
@@ -244,7 +244,7 @@ remove_outliers_wrt_median_knn_sq_distance(
     make_dereference_property_map(first),
 #else
     make_typed_identity_property_map_by_reference(
-    typename value_type_traits<InputIterator>::type()),
+    typename std::iterator_traits<InputIterator>::value_type()),
 #endif
     k,threshold_percent);
 }
diff --git a/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h b/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
index 79526afca24..d6e53b1ac3b 100644
--- a/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
+++ b/Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
@@ -30,6 +30,7 @@
 #include <deque>
 #include <algorithm>
 #include <cmath>
+#include <iterator>
 
 #include <CGAL/trace.h>
 #include <CGAL/Reconstruction_triangulation_3.h>
@@ -344,7 +345,7 @@ public:
       make_dereference_property_map(first),
 #else
       make_typed_identity_property_map_by_reference(
-      typename value_type_traits<InputIterator>::type()),
+      typename std::iterator_traits<InputIterator>::value_type()),
 #endif
       normal_pmap, Poisson_visitor());
     CGAL::Timer task_timer; task_timer.start();
diff --git a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
index edb1deba2fd..b246e593f24 100644
--- a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
+++ b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
@@ -37,6 +37,7 @@
 #include <boost/random/linear_congruential.hpp>
 
 #include <vector>
+#include <iterator>
 
 namespace CGAL {
 
@@ -456,7 +457,7 @@ public:
       make_dereference_property_map(first),
 #else
       make_typed_identity_property_map_by_reference(
-      typename value_type_traits<InputIterator>::type()),
+      typename std::iterator_traits<InputIterator>::value_type()),
 #endif
       normal_pmap,
       visitor);