diff --git a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
index 0d4fa7be80c..b25fbd994dd 100644
--- a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
+++ b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
@@ -145,11 +145,14 @@ int main (int argc, char* argv[])
   std::cerr << "done\nPoint set structuring... ";
 
   Pwn_vector structured_pts;
-  Structure pss (points, Point_map(), Normal_map(),
+  Structure pss (points,
                  planes,
-                 CGAL::Shape_detection_3::Plane_map<Traits>(),
-                 CGAL::Shape_detection_3::Point_to_shape_index_map<Traits>(points, planes),
-                 op.cluster_epsilon);  // Same parameter as RANSAC
+                 op.cluster_epsilon,  // Same parameter as RANSAC
+                 CGAL::parameters::point_map (Point_map()).
+                 normal_map (Normal_map()).
+                 plane_map (CGAL::Shape_detection_3::Plane_map<Traits>()).
+                 plane_index_map(CGAL::Shape_detection_3::Point_to_shape_index_map<Traits>(points, planes)));
+
 
   for (std::size_t i = 0; i < pss.size(); ++ i)
     structured_pts.push_back (pss[i]);
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
index bc52731eeb6..78e66369cbb 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
@@ -17,9 +17,9 @@ bool test_orientation(TriangleMesh& tm, bool is_positive, const NamedParameters&
   typedef boost::graph_traits<TriangleMesh> Graph_traits;
   typedef typename Graph_traits::vertex_descriptor vertex_descriptor;
   typedef typename Graph_traits::face_descriptor face_descriptor;
-  typedef typename CGAL::GetVertexPointMap<TriangleMesh,
+  typedef typename CGAL::Polygon_mesh_processing::GetVertexPointMap<TriangleMesh,
       NamedParameters>::const_type Vpm;
-  typedef typename CGAL::GetFaceIndexMap<TriangleMesh,
+  typedef typename CGAL::Polygon_mesh_processing::GetFaceIndexMap<TriangleMesh,
       NamedParameters>::const_type Fid_map;
 
   Vpm vpm = boost::choose_param(get_param(np, CGAL::internal_np::vertex_point),
diff --git a/Triangulation_3/demo/Triangulation_3/Scene.cpp b/Triangulation_3/demo/Triangulation_3/Scene.cpp
index 42aa6b68a39..d566b020512 100644
--- a/Triangulation_3/demo/Triangulation_3/Scene.cpp
+++ b/Triangulation_3/demo/Triangulation_3/Scene.cpp
@@ -12,6 +12,8 @@
 #include <CGAL/IO/read_xyz_points.h>
 #include <CGAL/IO/write_xyz_points.h>
 
+#include <CGAL/Iterator_range.h>
+
 using namespace std;
 
 void Scene::generatePoints(int num)
@@ -226,8 +228,8 @@ void Scene::savePointsXYZ(const char* filename)
   /* Use CGAL::write_xyz_points to write out data */
   /* Note: this function writes out points only (normals are ignored) */
   if( !CGAL::write_xyz_points( fout,  // output ofstream
-                               m_dt.points_begin(),  // first output point
-                               m_dt.points_end() ) ) {  // past-the-end output point
+                               CGAL::make_range (m_dt.points_begin(),  // first output point
+                                                 m_dt.points_end()) ) ) {  // past-the-end output point
     showError( QObject::tr("Error: cannot read file %1.").arg(filename) );
   }
 }