diff --git a/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp b/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp
index c9671dd408e..38de21612d5 100644
--- a/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp
+++ b/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp
@@ -2,7 +2,7 @@
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/selection.h>
 #include <CGAL/boost/graph/IO/OFF.h>
-
+#include <CGAL/Random.h>
 #include <fstream>
 #include <iostream>
 
diff --git a/BGL/examples/BGL_surface_mesh/gwdwg.cpp b/BGL/examples/BGL_surface_mesh/gwdwg.cpp
index f9a7228f711..aaa5eb333bf 100644
--- a/BGL/examples/BGL_surface_mesh/gwdwg.cpp
+++ b/BGL/examples/BGL_surface_mesh/gwdwg.cpp
@@ -4,6 +4,7 @@
 #include <CGAL/boost/graph/Graph_with_descriptor_with_graph.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <fstream>
 
diff --git a/BGL/examples/BGL_surface_mesh/write_inp.cpp b/BGL/examples/BGL_surface_mesh/write_inp.cpp
index 7554bed208d..aedd8f539fb 100644
--- a/BGL/examples/BGL_surface_mesh/write_inp.cpp
+++ b/BGL/examples/BGL_surface_mesh/write_inp.cpp
@@ -1,5 +1,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <CGAL/boost/graph/io.h>
 
diff --git a/BGL/test/BGL/test_Collapse_edge_with_constraints.cpp b/BGL/test/BGL/test_Collapse_edge_with_constraints.cpp
index a8f84f6e654..34d704bb679 100644
--- a/BGL/test/BGL/test_Collapse_edge_with_constraints.cpp
+++ b/BGL/test/BGL/test_Collapse_edge_with_constraints.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 typedef CGAL::Simple_cartesian<double> K;
 typedef K::Point_3 Point_3;
diff --git a/BGL/test/BGL/test_Euler_operations.cpp b/BGL/test/BGL/test_Euler_operations.cpp
index fe7c3275dd1..3fdcfe0edec 100644
--- a/BGL/test/BGL/test_Euler_operations.cpp
+++ b/BGL/test/BGL/test_Euler_operations.cpp
@@ -2,6 +2,7 @@
 #include "test_Prefix.h"
 #include <boost/range/distance.hpp>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <CGAL/IO/OFF.h>
 #include <CGAL/Polygon_mesh_processing/border.h>
diff --git a/BGL/test/BGL/test_Face_filtered_graph.cpp b/BGL/test/BGL/test_Face_filtered_graph.cpp
index 9623d2868bd..9917b7d06a5 100644
--- a/BGL/test/BGL/test_Face_filtered_graph.cpp
+++ b/BGL/test/BGL/test_Face_filtered_graph.cpp
@@ -2,6 +2,7 @@
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/Polygon_mesh_processing/connected_components.h>
+#include <CGAL/boost/graph/generators.h>
 #include <CGAL/use.h>
 #include "test_Prefix.h"
 
diff --git a/BGL/test/BGL/test_test_face.cpp b/BGL/test/BGL/test_test_face.cpp
index aa4e0fa0879..7afbc79385b 100644
--- a/BGL/test/BGL/test_test_face.cpp
+++ b/BGL/test/BGL/test_test_face.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <vector>
 #include <iostream>
diff --git a/Hash_map/test/Hash_map/Hash.cpp b/Hash_map/test/Hash_map/Hash.cpp
index fc12a7571fb..e73d4c3033d 100644
--- a/Hash_map/test/Hash_map/Hash.cpp
+++ b/Hash_map/test/Hash_map/Hash.cpp
@@ -11,9 +11,9 @@
 #include <CGAL/Linear_cell_complex_for_generalized_map.h>
 #include <CGAL/boost/graph/graph_traits_Arrangement_2.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
+#include <CGAL/boost/graph/generators.h>
 #include <map>
 #include <boost/unordered_map.hpp>
-#include <CGAL/boost/graph/helpers.h>
 
 
 typedef CGAL::Simple_cartesian<double> Kernel;
diff --git a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.h b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.h
index b76bbf1d7e6..f22bd0a480a 100644
--- a/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.h
+++ b/Linear_cell_complex/test/Linear_cell_complex/Linear_cell_complex_2_test.h
@@ -17,6 +17,7 @@
 #include <CGAL/Linear_cell_complex_constructors.h>
 #include <CGAL/Triangulation_2_to_lcc.h>
 #include <CGAL/Delaunay_triangulation_2.h>
+#include <CGAL/Random.h>
 #include <fstream>
 
 // #define LCC_TRACE_TEST_BEGIN 1
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_surface_mesh.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_surface_mesh.cpp
index bff0cb6d083..f308a4ce35a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_surface_mesh.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_surface_mesh.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
 
-#include <CGAL/boost/graph/helpers.h>
+#include <CGAL/boost/graph/generators.h>
 #include <CGAL/Polygon_mesh_processing/connected_components.h>
 #include <CGAL/property_map.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
index 695d4862623..c45de576ffb 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Polygon_mesh_processing/transform.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/Aff_transformation_3.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
index d5d2fa63b9d..540aeb84639 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
@@ -5,6 +5,7 @@
 
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/boost/graph/copy_face_graph.h>
+#include <CGAL/boost/graph/generators.h>
 #include <CGAL/Dynamic_property_map.h>
 
 #include <CGAL/Polyhedron_3.h>
diff --git a/Property_map/examples/Property_map/dynamic_properties.cpp b/Property_map/examples/Property_map/dynamic_properties.cpp
index 6edbd4cfb9a..e3eb014e40c 100644
--- a/Property_map/examples/Property_map/dynamic_properties.cpp
+++ b/Property_map/examples/Property_map/dynamic_properties.cpp
@@ -1,6 +1,7 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <string>
 
diff --git a/Property_map/test/Property_map/dynamic_properties_test.cpp b/Property_map/test/Property_map/dynamic_properties_test.cpp
index 41a4ea8abce..07fd4751c4c 100644
--- a/Property_map/test/Property_map/dynamic_properties_test.cpp
+++ b/Property_map/test/Property_map/dynamic_properties_test.cpp
@@ -2,6 +2,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
+#include <CGAL/boost/graph/generators.h>
 
 #if defined(CGAL_USE_OPENMESH)
 #include <OpenMesh/Core/IO/MeshIO.hh>
diff --git a/Property_map/test/Property_map/kernel_converter_properties_test.cpp b/Property_map/test/Property_map/kernel_converter_properties_test.cpp
index ebe871bc3e3..05cf177b325 100644
--- a/Property_map/test/Property_map/kernel_converter_properties_test.cpp
+++ b/Property_map/test/Property_map/kernel_converter_properties_test.cpp
@@ -5,6 +5,7 @@
 #include <CGAL/MP_Float.h>
 #include <CGAL/Cartesian_converter.h>
 #include <CGAL/property_map.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <cassert>
 
diff --git a/Surface_mesh/examples/Surface_mesh/sm_aabbtree.cpp b/Surface_mesh/examples/Surface_mesh/sm_aabbtree.cpp
index eba06f7b578..ba18732911d 100644
--- a/Surface_mesh/examples/Surface_mesh/sm_aabbtree.cpp
+++ b/Surface_mesh/examples/Surface_mesh/sm_aabbtree.cpp
@@ -6,6 +6,7 @@
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 typedef CGAL::Simple_cartesian<double> K;
 typedef K::Point_3 Point;
diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing.cpp b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing.cpp
index fffb560ac88..0d09480d987 100644
--- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing.cpp
+++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing.cpp
@@ -8,6 +8,7 @@
 #include <CGAL/Tetrahedral_remeshing/Remeshing_triangulation_3.h>
 #include <CGAL/tetrahedral_remeshing.h>
 #include <CGAL/Tetrahedral_remeshing/tetrahedral_remeshing_io.h>
+#include <CGAL/Random.h>
 
 #include <iostream>
 #include <fstream>