diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
index bb797e5e5bc..6f1a465df7f 100644
--- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
+++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
@@ -1201,7 +1201,7 @@ private:
       if (m_debugOutput)
       {
         std::cout << "\t Distance to target: " << currentNodeDistance << std::endl;
-        std::cout << "\t Is there a current occupier? " << (currentOccupier.first != nullptr) << std::endl;
+        std::cout << "\t Is there a current occupier? " << (currentOccupier.first != NULL) << std::endl;
       }
 
       // the relative position of the ray between node.source() and node.target_vertex() and the ray
@@ -1329,7 +1329,7 @@ private:
         }
 
         // If equal times, give priority to vertex sources since it's cleaner and simpler to handle than interval windows
-        if (currentClosest.first == nullptr ||
+        if (currentClosest.first == NULL ||
            currentClosest.second > currentNodeDistance ||
            (currentClosest.second == currentNodeDistance && node->node_type() == Cone_tree_node::VERTEX_SOURCE))
         {
@@ -2070,7 +2070,7 @@ private:
 
         std::cout << "Prio Queue size = " << m_expansionPriqueue.size() << std::endl;
         std::cout << "Queue:" << std::endl;
-        auto duplicate_queue = m_expansionPriqueue;
+        Expansion_priqueue duplicate_queue = m_expansionPriqueue;
         while(duplicate_queue.size() > 0)
         {
           Cone_expansion_event* event = duplicate_queue.top();
diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
index de838369d8b..86fa5a05379 100644
--- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
+++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/function_objects.h
@@ -622,7 +622,7 @@ public:
   {
     FT angle_sum = 0;
 
-    for(halfedge_descriptor h : halfedges_around_target(v, g))
+    BOOST_FOREACH(halfedge_descriptor h, halfedges_around_target(v, g))
     {
       if(is_border(h, g))
         continue;
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_6.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_6.cpp
index 71d52570350..7737f99627a 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_6.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_6.cpp
@@ -22,8 +22,8 @@ int main()
   input >> mesh;
   input.close();
 
-  for (Triangle_mesh::Vertex_index v1 : vertices(mesh))
-    for (Triangle_mesh::Vertex_index v2 : vertices(mesh))
+  BOOST_FOREACH(Triangle_mesh::Vertex_index v1, vertices(mesh))
+    BOOST_FOREACH(Triangle_mesh::Vertex_index v2, vertices(mesh))
     {
       Surface_mesh_shortest_path shortest_paths(mesh);
       shortest_paths.add_source_point(v1);