diff --git a/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h b/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
index 1348f5d2932..a44bd71044f 100644
--- a/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
+++ b/GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
@@ -19,7 +19,6 @@
 
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Polygon_with_holes_2.h>
-#include <CGAL/apply_to_range.h>
 #include <CGAL/Qt/PainterOstream.h>
 #include <CGAL/Qt/GraphicsItem.h>
 #include <CGAL/Qt/Converter.h>
diff --git a/Triangulation_2/include/CGAL/apply_to_range.h b/GraphicsView/include/CGAL/apply_to_range.h
similarity index 100%
rename from Triangulation_2/include/CGAL/apply_to_range.h
rename to GraphicsView/include/CGAL/apply_to_range.h
diff --git a/GraphicsView/package_info/GraphicsView/dependencies b/GraphicsView/package_info/GraphicsView/dependencies
index f74d1ba2e46..b4a464ef5e7 100644
--- a/GraphicsView/package_info/GraphicsView/dependencies
+++ b/GraphicsView/package_info/GraphicsView/dependencies
@@ -11,4 +11,3 @@ Number_types
 Profiling_tools
 STL_Extension
 Stream_support
-Triangulation_2
diff --git a/Mesh_2/include/CGAL/Mesh_2/Mesh_global_optimizer_2.h b/Mesh_2/include/CGAL/Mesh_2/Mesh_global_optimizer_2.h
index 380696549c1..d2df50df3fa 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Mesh_global_optimizer_2.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Mesh_global_optimizer_2.h
@@ -29,6 +29,7 @@
 #include <CGAL/Constrained_voronoi_diagram_2.h>
 
 #include <vector>
+#include <set>
 #include <list>
 #include <algorithm>
 #include <iterator>
diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h
index e6b56085125..71e38171d57 100644
--- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h
+++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h
@@ -14,7 +14,6 @@
 #define CGAL_QT_TRIANGULATION_GRAPHICS_ITEM_H
 
 #include <CGAL/Bbox_2.h>
-#include <CGAL/apply_to_range.h>
 #include <CGAL/Qt/PainterOstream.h>
 
 #include <CGAL/Qt/GraphicsItem.h>
diff --git a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
index eafd4d73b89..21b21d10fb9 100644
--- a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
+++ b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
@@ -15,6 +15,8 @@
 #define CGAL_SURFACE_SWEEP_2_IMPL_H
 
 #include <CGAL/license/Surface_sweep_2.h>
+#include <set>
+#include <vector>
 
 /*! \file
  *