diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
index e9fb0c317d4..807ea04f1b9 100644
--- a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
+++ b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
@@ -15,6 +15,16 @@
 
 // This will push/pop a VC15 warning
 #include <CGAL/Named_function_parameters.h>
+
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4172) // Address warning inside boost named parameters
+#endif
+
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
+
 #endif // CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
index 3f8cdb0b93a..a839ff3d8ce 100644
--- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
+++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
@@ -18,7 +18,7 @@
 
 #include <CGAL/assertions.h>
 
-#include <boost/graph/dijkstra_shortest_paths.hpp>
+#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
 #include <boost/graph/graph_traits.hpp>
 
 #include <unordered_map>