diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
index 84f80011099..90db9d7e452 100644
--- a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
+++ b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
@@ -21,6 +21,9 @@
 #ifndef CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
 #define CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
 
+// This will push/pop a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/version.hpp>
 #include <climits>
 
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Arrangement_2.h b/BGL/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
index 432516b10bf..62f4437bce9 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_Arrangement_2.h
@@ -22,6 +22,9 @@
 #ifndef CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
 #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <CGAL/graph_traits_Arrangement_2.h>
 
 #endif //CGAL_BOOST_GRAPH_GRAPH_TRAITS_ARRANGEMENT_2_H
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_CombinatorialMap.h b/BGL/include/CGAL/boost/graph/graph_traits_CombinatorialMap.h
index 87855cd625b..ca386be1656 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_CombinatorialMap.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_CombinatorialMap.h
@@ -22,6 +22,9 @@
 #include <utility>
 #include <iterator>
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/config.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h b/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
index e1cb66719bf..d25e9744e0c 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
@@ -20,6 +20,9 @@
 #ifndef CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 #define CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
 #include <boost/graph/graph_traits.hpp>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
index dfc99ed4c9d..f7185e8ae34 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
@@ -22,6 +22,9 @@
 
 #include <functional>
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/config.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/transform_iterator.hpp>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
index 393a79de179..05207f83f7a 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
@@ -20,6 +20,9 @@
 #ifndef CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYMESH_ARRAYKERNELT_H
 #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYMESH_ARRAYKERNELT_H
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Surface_mesh.h b/BGL/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
index d0e3a92d9b9..f55c8a7d4ce 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
@@ -20,6 +20,9 @@
 #ifndef CGAL_BOOST_GRAPH_TRAITS_SURFACE_MESH_H
 #define CGAL_BOOST_GRAPH_TRAITS_SURFACE_MESH_H
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h b/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
index f9eee766312..8c8e4119928 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
@@ -22,6 +22,9 @@
 
 #include <functional>
 
+// include this to avoid a VC15 warning
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
 #include <boost/graph/graph_traits.hpp>
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
index 1eeae46d8a4..819063336ce 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
@@ -23,6 +23,8 @@
 
 #include<set>
 #include<vector>
+
+#include <CGAL/boost/graph/named_function_params.h>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/foreach.hpp>
 #include <boost/graph/filtered_graph.hpp>
diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
index 4ec78c75d74..a2d0fa47663 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
@@ -39,6 +39,8 @@
 #endif
 #include <CGAL/trace.h>
 
+#include <CGAL/boost/graph/named_function_params.h>
+
 #include <boost/version.hpp>
 #ifdef CGAL_DO_NOT_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE
 #include <boost/graph/adjacency_list.hpp>