diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
index 163125c0e3d..c232a671542 100644
--- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
+++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
@@ -5,7 +5,7 @@
 
 #include <CGAL/config.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/property_map/vector_property_map.hpp>
 
 #include <CGAL/graph_traits_Arrangement_2.h>
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
index 1915f8a1a23..98c2c4b1526 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_dual.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Arr_extended_dcel.h>
 #include <CGAL/Arrangement_2.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <CGAL/graph_traits_dual_arrangement_2.h>
 
diff --git a/BGL/examples/BGL_arrangement_2/primal.cpp b/BGL/examples/BGL_arrangement_2/primal.cpp
index 62d684e0c42..e5f954dfdad 100644
--- a/BGL/examples/BGL_arrangement_2/primal.cpp
+++ b/BGL/examples/BGL_arrangement_2/primal.cpp
@@ -8,7 +8,7 @@
 #include <CGAL/graph_traits_Arrangement_2.h>
 #include <CGAL/Arr_vertex_index_map.h>
 
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <CGAL/property_map.h>
 
diff --git a/BGL/examples/BGL_triangulation_2/dijkstra.cpp b/BGL/examples/BGL_triangulation_2/dijkstra.cpp
index 1e63fc8810f..f0bf554b69d 100644
--- a/BGL/examples/BGL_triangulation_2/dijkstra.cpp
+++ b/BGL/examples/BGL_triangulation_2/dijkstra.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <fstream>
 
diff --git a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
index b1bc089d216..bcd9548338f 100644
--- a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
+++ b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp
@@ -4,7 +4,7 @@
 #include <CGAL/Triangulation_vertex_base_with_id_2.h>
 
 #include <CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <fstream>
 
diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
deleted file mode 100644
index a8563023229..00000000000
--- a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2014  GeometryFactory (France).  All rights reserved.
-//
-// This file is part of CGAL (www.cgal.org)
-//
-// $URL$
-// $Id$
-// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
-//
-//
-// Author(s)     : Sebastien Loriot
-
-
-#ifndef CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
-#define CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
-
-// This will push/pop a VC++ 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/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h
index a15422a19d2..9b3136be2b4 100644
--- a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h
+++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h
@@ -37,7 +37,7 @@
 #ifdef CGAL_ENVELOPE_USE_BFS_FACE_ORDER
 #include <CGAL/Arr_face_index_map.h>
 #include <CGAL/graph_traits_dual_arrangement_on_surface_2.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #endif
 
 // this base divide & conquer algorithm splits the input into 2 groups,
diff --git a/Envelope_3/package_info/Envelope_3/dependencies b/Envelope_3/package_info/Envelope_3/dependencies
index 059d79cfb7d..5abc02d0186 100644
--- a/Envelope_3/package_info/Envelope_3/dependencies
+++ b/Envelope_3/package_info/Envelope_3/dependencies
@@ -2,7 +2,6 @@ Algebraic_foundations
 Apollonius_graph_2
 Arithmetic_kernel
 Arrangement_on_surface_2
-BGL
 Cartesian_kernel
 Circulator
 Distance_2
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 5536815e9f3..f9ce5352b26 100644
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@@ -39,11 +39,7 @@
 
 #include <CGAL/property_map.h>
 #include <boost/graph/adjacency_list.hpp>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h> // work around a
-                                                      // bug in boost
-                                                      // 1.54
-
-
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/prim_minimum_spanning_tree.hpp>
 
 #if defined(BOOST_MSVC)
diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
index 0a012a64293..893b6bac719 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Polygon_mesh_processing/compute_normal.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Polygon_mesh_processing/shape_predicates.h>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/property_map.h>
 #include <CGAL/Handle_hash_function.h>
diff --git a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
index 93c9655eb47..5269caf38e3 100644
--- a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
+++ b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
@@ -4,9 +4,7 @@
 #include <iostream>
 #include <fstream>
 
-// workaround a bug in Boost-1.54
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
-
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/prim_minimum_spanning_tree.hpp>
 
 typedef CGAL::Simple_cartesian<double>                       Kernel;
diff --git a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
index b42e28707b5..d186261d845 100644
--- a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
+++ b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h
@@ -31,7 +31,7 @@
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/subgraph.hpp>
 #include <optional>
 
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 a839ff3d8ce..3f8cdb0b93a 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 <CGAL/boost/graph/dijkstra_shortest_paths.h>
+#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/graph_traits.hpp>
 
 #include <unordered_map>