From 6269309d86aaabd28a4c5ae01d4079781c5d52e6 Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Tue, 23 Jan 2018 11:09:52 +0100
Subject: [PATCH] Use CGAL include for boost counting/transform iterators
 everywhere

---
 .../include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h   | 2 +-
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h    | 2 +-
 BGL/examples/BGL_LCC/transform_iterator_lcc.cpp               | 2 +-
 BGL/examples/BGL_polyhedron_3/transform_iterator.cpp          | 2 +-
 BGL/include/CGAL/boost/graph/Face_filtered_graph.h            | 2 +-
 .../CGAL/boost/graph/Graph_with_descriptor_with_graph.h       | 2 +-
 BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h          | 2 +-
 BGL/include/CGAL/boost/graph/graph_traits_Seam_mesh.h         | 2 +-
 Bounding_volumes/include/CGAL/Min_annulus_d.h                 | 2 +-
 .../include/CGAL/Classification/Point_set_neighborhood.h      | 2 +-
 HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h | 2 +-
 .../archive/include/CGAL/Kinetic/Active_objects_set.h         | 2 +-
 .../include/CGAL/Kinetic/Active_objects_vector.h              | 2 +-
 Mesh_2/include/CGAL/Mesh_2/Clusters.h                         | 2 +-
 Mesh_2/include/CGAL/Mesh_2/Refine_edges.h                     | 2 +-
 Mesh_2/include/CGAL/Mesh_2/Refine_faces.h                     | 2 +-
 Mesh_3/benchmark/Mesh_3/StdAfx.h                              | 4 ++--
 Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h                     | 2 +-
 Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h       | 2 +-
 Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h                   | 2 +-
 Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h       | 2 +-
 Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h       | 2 +-
 Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h        | 2 +-
 Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h  | 2 +-
 NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h       | 2 +-
 Number_types/include/CGAL/Counted_number.h                    | 2 +-
 Number_types/include/CGAL/Lazy_exact_nt.h                     | 2 +-
 .../include/CGAL/Optimal_transportation_reconstruction_2.h    | 2 +-
 .../include/CGAL/Shape_detection_3/Region_growing.h           | 4 ++--
 .../benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp | 2 +-
 .../internal/Hole_filling/Triangulate_hole_polyline.h         | 2 +-
 .../include/CGAL/Polygon_mesh_processing/intersection.h       | 2 +-
 .../Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp     | 2 +-
 .../Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp   | 2 +-
 .../Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp | 2 +-
 Polynomial/include/CGAL/Polynomial.h                          | 2 +-
 Polynomial/include/CGAL/Polynomial_traits_d.h                 | 2 +-
 .../demo/Principal_component_analysis/types.h                 | 2 +-
 .../examples/QP_solver/solve_convex_hull_containment_lp2.h    | 2 +-
 .../examples/QP_solver/solve_convex_hull_containment_lp3.h    | 2 +-
 QP_solver/include/CGAL/QP_models.h                            | 2 +-
 QP_solver/include/CGAL/QP_solution.h                          | 2 +-
 QP_solver/include/CGAL/QP_solver/QP_solver.h                  | 2 +-
 QP_solver/test/QP_solver/master_mps_to_derivatives.cpp        | 2 +-
 .../include/CGAL/Segment_Delaunay_graph_2.h                   | 2 +-
 Spatial_searching/include/CGAL/internal/K_neighbor_search.h   | 2 +-
 Spatial_searching/test/Spatial_searching/Point_with_info.h    | 2 +-
 .../include/CGAL/boost/graph/graph_traits_Surface_mesh.h      | 2 +-
 .../Surface_mesh_skeletonization/solver_benchmark.cpp         | 2 +-
 .../include/CGAL/Mean_curvature_flow_skeletonization.h        | 2 +-
 .../CGAL/Surface_mesher/Intersection_data_structure_3.h       | 2 +-
 Triangulation/include/CGAL/Delaunay_triangulation.h           | 2 +-
 .../include/CGAL/Regular_triangulation_traits_adapter.h       | 2 +-
 Triangulation/include/CGAL/Triangulation.h                    | 2 +-
 .../benchmark/Triangulation_2/CDT_with_intersection_2.cpp     | 2 +-
 .../Triangulation_2/info_insert_with_transform_iterator_2.cpp | 2 +-
 Triangulation_2/include/CGAL/Triangulation_2.h                | 2 +-
 .../Triangulation_3/info_insert_with_transform_iterator.cpp   | 2 +-
 Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h | 2 +-
 Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h            | 2 +-
 60 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h
index b0a62fa534a..a7ec12aa317 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h
@@ -32,7 +32,7 @@
 #include <boost/optional.hpp>
 
 #include <CGAL/Handle_with_policy.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <CGAL/Polynomial.h>
 #include <CGAL/Polynomial_traits_d.h>
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h
index 887f56d1577..4661ee97fa6 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/shear.h
@@ -32,7 +32,7 @@
 #include <vector>
 #include <functional>
 #include <iterator>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/boost/iterator/counting_iterator.hpp>
 
 namespace CGAL {
diff --git a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
index e8c75364dc3..1268d4d9d77 100644
--- a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
+++ b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
@@ -4,7 +4,7 @@
 #include <CGAL/boost/graph/iterator.h>
 #include <fstream>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <algorithm>
 
 typedef CGAL::Simple_cartesian<double>              Kernel;
diff --git a/BGL/examples/BGL_polyhedron_3/transform_iterator.cpp b/BGL/examples/BGL_polyhedron_3/transform_iterator.cpp
index a990901c61b..c03df6f0b7f 100644
--- a/BGL/examples/BGL_polyhedron_3/transform_iterator.cpp
+++ b/BGL/examples/BGL_polyhedron_3/transform_iterator.cpp
@@ -2,7 +2,7 @@
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/boost/graph/iterator.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <fstream>
 #include <algorithm>
diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
index e18921b5ef9..be5dfa39830 100644
--- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
+++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
@@ -29,7 +29,7 @@
 #include <boost/foreach.hpp>
 #include <boost/unordered_set.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/foreach.hpp>
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/dynamic_bitset.hpp>
diff --git a/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
index ab5f11f7bb8..ce92302b96b 100644
--- a/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
+++ b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
@@ -25,7 +25,7 @@
 #include <CGAL/boost/graph/properties.h>
 #include <boost/graph/graph_traits.hpp>
 #include <CGAL/boost/graph/iterator.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h>
 
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
index e291c006f1a..2f363ebb3d5 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
@@ -24,7 +24,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <OpenMesh/Core/IO/MeshIO.hh>
 #include <CGAL/boost/graph/internal/OM_iterator_from_circulator.h>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Seam_mesh.h b/BGL/include/CGAL/boost/graph/graph_traits_Seam_mesh.h
index bbde0c6bcec..a293f534152 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_Seam_mesh.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_Seam_mesh.h
@@ -24,7 +24,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <CGAL/boost/graph/properties_Seam_mesh.h>
 #include <CGAL/boost/graph/iterator.h>
diff --git a/Bounding_volumes/include/CGAL/Min_annulus_d.h b/Bounding_volumes/include/CGAL/Min_annulus_d.h
index 5fb5c803afe..f1f349b64fe 100644
--- a/Bounding_volumes/include/CGAL/Min_annulus_d.h
+++ b/Bounding_volumes/include/CGAL/Min_annulus_d.h
@@ -40,7 +40,7 @@
 #include <CGAL/QP_solver/QP_full_filtered_pricing.h>
 #include <CGAL/QP_solver/QP_full_exact_pricing.h>
 #include <CGAL/boost/iterator/counting_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/functional.hpp>
 
 // here is how it works. We have d+2 variables: 
diff --git a/Classification/include/CGAL/Classification/Point_set_neighborhood.h b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
index 29765db9be5..79977a3eb43 100644
--- a/Classification/include/CGAL/Classification/Point_set_neighborhood.h
+++ b/Classification/include/CGAL/Classification/Point_set_neighborhood.h
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 
 #include <CGAL/Search_traits_3.h>
 #include <CGAL/Fuzzy_sphere.h>
diff --git a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
index 6935008ae26..53304971c7b 100644
--- a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
+++ b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
@@ -28,7 +28,7 @@
 
 #include <boost/config.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/graph/graph_traits.hpp>
diff --git a/Kinetic_data_structures/archive/include/CGAL/Kinetic/Active_objects_set.h b/Kinetic_data_structures/archive/include/CGAL/Kinetic/Active_objects_set.h
index a539a72435a..f86b872e0a2 100644
--- a/Kinetic_data_structures/archive/include/CGAL/Kinetic/Active_objects_set.h
+++ b/Kinetic_data_structures/archive/include/CGAL/Kinetic/Active_objects_set.h
@@ -31,7 +31,7 @@
 #include <map>
 #include <vector>
 #include <sstream>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <utility>
 
 namespace CGAL { namespace Kinetic {;
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h b/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h
index 22e4a012a16..f51d72495c0 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/Active_objects_vector.h
@@ -32,7 +32,7 @@
 #include <vector>
 #include <sstream>
 #include <CGAL/iterator.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
diff --git a/Mesh_2/include/CGAL/Mesh_2/Clusters.h b/Mesh_2/include/CGAL/Mesh_2/Clusters.h
index d351d67fc34..9bf140dc531 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Clusters.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Clusters.h
@@ -30,7 +30,7 @@
 #include <CGAL/Unique_hash_map.h>
 
 #include <utility>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h b/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
index 070de821ae9..8bdddb618e8 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
@@ -34,7 +34,7 @@
 #include <utility>
 #include <iterator>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/Mesh_2/include/CGAL/Mesh_2/Refine_faces.h b/Mesh_2/include/CGAL/Mesh_2/Refine_faces.h
index b687881a7f9..a1da7301e30 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Refine_faces.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Refine_faces.h
@@ -27,7 +27,7 @@
 
 #include <CGAL/Mesh_2/Face_badness.h>
 #include <CGAL/Double_map.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <string>
 #include <sstream>
diff --git a/Mesh_3/benchmark/Mesh_3/StdAfx.h b/Mesh_3/benchmark/Mesh_3/StdAfx.h
index 0aa9e0bd9a7..e4e8a7a319d 100644
--- a/Mesh_3/benchmark/Mesh_3/StdAfx.h
+++ b/Mesh_3/benchmark/Mesh_3/StdAfx.h
@@ -29,7 +29,7 @@
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/iterator_traits.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/zip_iterator.hpp>
 #include <boost/mpl/always.hpp>
 #include <boost/mpl/and.hpp>
@@ -282,4 +282,4 @@
 #include <implicit_functions/Implicit_function_interface.h>
 #include <CGAL_demo/Scene_item_with_display_list.h>*/
 
-#endif //STDAFX_H
\ No newline at end of file
+#endif //STDAFX_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
index 68dfd5ddb8f..ebcbcf146da 100644
--- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
+++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
@@ -47,7 +47,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/optional.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/function_output_iterator.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_convertible.hpp>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
index 044eaf0433c..b4d38434920 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
@@ -78,7 +78,7 @@ namespace internal {
 #include <vector>
 #include <stack>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/optional.hpp>
 
 #include <CGAL/Mesh_3/utilities.h>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
index 4732593f45f..d794b3f6806 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
@@ -39,7 +39,7 @@
 #include <algorithm>
 #include <iomanip> // std::setprecision
 #include <iostream> // std::cerr/cout
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/function_output_iterator.hpp>
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
index ab65987d156..91fff95bb75 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Triangulation_sizing_field.h
@@ -35,7 +35,7 @@
 #include <CGAL/Regular_triangulation_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
index b39d377682d..21a5d5026e7 100644
--- a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
+++ b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
@@ -39,7 +39,7 @@
 #include <map>
 #include <boost/bimap/bimap.hpp>
 #include <boost/bimap/multiset_of.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/mpl/if.hpp>
 #include <CGAL/internal/Mesh_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h>
diff --git a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
index 146a927967f..a6702b11db1 100644
--- a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
@@ -48,7 +48,7 @@
 #include <boost/dynamic_bitset.hpp>
 #include <CGAL/boost/graph/split_graph_into_polylines.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/foreach.hpp>
 
 #include <string>
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
index 9d2e05f04c9..719045910dd 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
@@ -52,7 +52,7 @@
 #include <CGAL/boost/graph/split_graph_into_polylines.h>
 #include <CGAL/Default.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/foreach.hpp>
 
 #include <string>
diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
index ac60adf362d..1a32b080bed 100644
--- a/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
+++ b/NewKernel_d/include/CGAL/NewKernel_d/Types/Hyperplane.h
@@ -23,7 +23,7 @@
 #include <CGAL/enum.h>
 #include <CGAL/number_utils.h>
 #include <CGAL/NewKernel_d/store_kernel.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/boost/iterator/counting_iterator.hpp>
 namespace CGAL {
 template <class R_> class Hyperplane {
diff --git a/Number_types/include/CGAL/Counted_number.h b/Number_types/include/CGAL/Counted_number.h
index 194d0079540..22c9b009400 100644
--- a/Number_types/include/CGAL/Counted_number.h
+++ b/Number_types/include/CGAL/Counted_number.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/number_type_basic.h>
 #include <CGAL/atomic.h>
-#include <boost/iterator/transform_iterator.hpp> // for Root_of_selector
+#include <CGAL/boost/iterator/transform_iterator.hpp> // for Root_of_selector
 #include <iostream>
 
 namespace CGAL {
diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h
index 7e4c86363f9..a69313bee8e 100644
--- a/Number_types/include/CGAL/Lazy_exact_nt.h
+++ b/Number_types/include/CGAL/Lazy_exact_nt.h
@@ -30,7 +30,7 @@
 #include <CGAL/number_type_basic.h>
 #include <CGAL/assertions.h>
 
-#include <boost/iterator/transform_iterator.hpp> // for Root_of functor
+#include <CGAL/boost/iterator/transform_iterator.hpp> // for Root_of functor
 #include <boost/operators.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
diff --git a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h
index c5b9d304e32..d522c9ffa8a 100644
--- a/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h
+++ b/Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h
@@ -42,7 +42,7 @@
 #include <boost/multi_index/mem_fun.hpp>
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/identity.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/type_traits/is_float.hpp>
 
 namespace CGAL {
diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h
index 885c1d0ebd1..f4ebad8a741 100644
--- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h
+++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Region_growing.h
@@ -33,8 +33,8 @@
 #include <CGAL/linear_least_squares_fitting_3.h>
 #include <CGAL/squared_distance_3.h>
 
-#include <boost/iterator/counting_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 namespace Shape_detection_3 {
diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp
index 4abd5c247a7..092f2bec741 100644
--- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp
+++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/polygon_mesh_slicer.cpp
@@ -19,7 +19,7 @@
 
 #include <functional>
 #include <boost/foreach.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <fstream>
 
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
index 630702b8651..e3c16de3575 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
@@ -37,7 +37,7 @@
 #include <stack>
 #include <map>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/unordered_set.hpp>
 
 namespace CGAL {
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
index 9e43ceffc82..b7045a0b604 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
@@ -29,7 +29,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <CGAL/Polygon_mesh_processing/bbox.h>
-#include <boost/iterator/counting_iterator.hpp>
+#include <CGAL/boost/iterator/counting_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <CGAL/Polygon_mesh_processing/bbox.h>
 #include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp
index 5d2e487337e..de075a1841c 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp
@@ -16,7 +16,7 @@
 
 #include <CGAL/convex_hull_3.h>
 #include <CGAL/boost/graph/copy_face_graph.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 using namespace CGAL::Three;
 class Polyhedron_demo_convex_hull_plugin : 
   public QObject,
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp
index 5107cca03d0..561dbeb7163 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
 
 #include <boost/function_output_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 
 struct Face : public CGAL::cpp11::array<int,3>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp
index 05e42b51397..057db99a16b 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp
@@ -24,7 +24,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/optional/optional.hpp>
 
 using namespace CGAL::Three;
diff --git a/Polynomial/include/CGAL/Polynomial.h b/Polynomial/include/CGAL/Polynomial.h
index f600d49b9d8..78f4510eec2 100644
--- a/Polynomial/include/CGAL/Polynomial.h
+++ b/Polynomial/include/CGAL/Polynomial.h
@@ -40,7 +40,7 @@
 #include <iostream>
 #include <CGAL/basic.h>
 #include <CGAL/Handle_with_policy.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <CGAL/Flattening_iterator.h>
 
diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h
index 627fc69ef59..d0a204b239f 100644
--- a/Polynomial/include/CGAL/Polynomial_traits_d.h
+++ b/Polynomial/include/CGAL/Polynomial_traits_d.h
@@ -43,7 +43,7 @@
 #include <CGAL/Polynomial/subresultants.h>
 #include <CGAL/Polynomial/sturm_habicht_sequence.h>
 
-#include <boost/iterator/transform_iterator.hpp> 
+#include <CGAL/boost/iterator/transform_iterator.hpp> 
 
 
 #define CGAL_POLYNOMIAL_TRAITS_D_BASE_TYPEDEFS                          \
diff --git a/Principal_component_analysis/demo/Principal_component_analysis/types.h b/Principal_component_analysis/demo/Principal_component_analysis/types.h
index c30211fcb8a..5fca2488f30 100644
--- a/Principal_component_analysis/demo/Principal_component_analysis/types.h
+++ b/Principal_component_analysis/demo/Principal_component_analysis/types.h
@@ -3,7 +3,7 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <boost/iterator/transform_iterator.hpp> 
+#include <CGAL/boost/iterator/transform_iterator.hpp> 
 
 typedef CGAL::Simple_cartesian<double> Kernel;
 typedef Kernel::FT FT;
diff --git a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h
index bb022e19318..675af0f94b7 100644
--- a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h
+++ b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h
@@ -1,6 +1,6 @@
 // example: function to check whether a point is in the convex 
 // hull of other points; this version uses a maker
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/QP_models.h>
 #include <CGAL/QP_functions.h>
diff --git a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp3.h b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp3.h
index f5cf1a45a4f..98266e30dbd 100644
--- a/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp3.h
+++ b/QP_solver/examples/QP_solver/solve_convex_hull_containment_lp3.h
@@ -1,6 +1,6 @@
 // example: function to check whether a point is in the convex 
 // hull of other points; this version uses a maker
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/QP_options.h>
 #include <CGAL/QP_models.h>
diff --git a/QP_solver/include/CGAL/QP_models.h b/QP_solver/include/CGAL/QP_models.h
index 4ca5db648cc..428e2543b86 100644
--- a/QP_solver/include/CGAL/QP_models.h
+++ b/QP_solver/include/CGAL/QP_models.h
@@ -38,7 +38,7 @@
 #include <sstream>
 
 #include <CGAL/boost/iterator/counting_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 // this file defines the following models:
 // - Quadratic_program_from_iterators
diff --git a/QP_solver/include/CGAL/QP_solution.h b/QP_solver/include/CGAL/QP_solution.h
index e1ebcca0b58..109c319abe6 100644
--- a/QP_solver/include/CGAL/QP_solution.h
+++ b/QP_solver/include/CGAL/QP_solution.h
@@ -39,7 +39,7 @@
 #include <boost/function.hpp>
 
 #include <CGAL/boost/iterator/counting_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/QP_solver/include/CGAL/QP_solver/QP_solver.h b/QP_solver/include/CGAL/QP_solver/QP_solver.h
index 743ff7dbb18..f49093e4733 100644
--- a/QP_solver/include/CGAL/QP_solver/QP_solver.h
+++ b/QP_solver/include/CGAL/QP_solver/QP_solver.h
@@ -48,7 +48,7 @@
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <vector>
 #include <numeric>
diff --git a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
index 718595f2d54..14124909a84 100644
--- a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
+++ b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
@@ -25,7 +25,7 @@
 #include <string>
 #include <cstdlib>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/zip_iterator.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
index b4f898ef627..217f00d6491 100644
--- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
+++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
@@ -57,7 +57,7 @@
 #include <CGAL/assertions.h>
 
 #include <CGAL/boost/iterator/counting_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 /*
   Conventions:
diff --git a/Spatial_searching/include/CGAL/internal/K_neighbor_search.h b/Spatial_searching/include/CGAL/internal/K_neighbor_search.h
index 0a6593a79f6..4cbfe31707f 100644
--- a/Spatial_searching/include/CGAL/internal/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/internal/K_neighbor_search.h
@@ -33,7 +33,7 @@
 #include <CGAL/Euclidean_distance.h>
 #include <CGAL/Splitters.h>
 #include <CGAL/internal/bounded_priority_queue.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 namespace internal{
diff --git a/Spatial_searching/test/Spatial_searching/Point_with_info.h b/Spatial_searching/test/Spatial_searching/Point_with_info.h
index 9cf9670b1aa..48557ff6cdd 100644
--- a/Spatial_searching/test/Spatial_searching/Point_with_info.h
+++ b/Spatial_searching/test/Spatial_searching/Point_with_info.h
@@ -1,4 +1,4 @@
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 template <class Pt>
 struct My_point_with_info
diff --git a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
index 3a5b09364a2..9f79653b7f1 100644
--- a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
@@ -31,7 +31,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <CGAL/boost/graph/properties_Surface_mesh.h>
 #include <CGAL/boost/graph/iterator.h>
diff --git a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp
index a5fda169ac8..569b6a1594d 100644
--- a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp
+++ b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp
@@ -11,7 +11,7 @@
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <Eigen/SparseLU>
 #include <Eigen/Sparse>
diff --git a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h
index f74f8192676..ae2f5d77a0e 100644
--- a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h
+++ b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h
@@ -39,7 +39,7 @@
 #include <boost/unordered_map.hpp>
 #include <boost/property_map/property_map.hpp>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/foreach.hpp>
 
 #include <CGAL/boost/graph/iterator.h>
diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Intersection_data_structure_3.h b/Surface_mesher/include/CGAL/Surface_mesher/Intersection_data_structure_3.h
index 410b10e6a17..1da2b1339b4 100644
--- a/Surface_mesher/include/CGAL/Surface_mesher/Intersection_data_structure_3.h
+++ b/Surface_mesher/include/CGAL/Surface_mesher/Intersection_data_structure_3.h
@@ -31,7 +31,7 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <CGAL/intersections.h>
 
diff --git a/Triangulation/include/CGAL/Delaunay_triangulation.h b/Triangulation/include/CGAL/Delaunay_triangulation.h
index 40076704d30..3a6185d9a02 100644
--- a/Triangulation/include/CGAL/Delaunay_triangulation.h
+++ b/Triangulation/include/CGAL/Delaunay_triangulation.h
@@ -29,7 +29,7 @@
 #include <CGAL/Dimension.h>
 #include <CGAL/Default.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #include <algorithm>
 
diff --git a/Triangulation/include/CGAL/Regular_triangulation_traits_adapter.h b/Triangulation/include/CGAL/Regular_triangulation_traits_adapter.h
index fb1d220f1bc..c9046c0ea27 100644
--- a/Triangulation/include/CGAL/Regular_triangulation_traits_adapter.h
+++ b/Triangulation/include/CGAL/Regular_triangulation_traits_adapter.h
@@ -25,7 +25,7 @@
 
 #include <CGAL/basic.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/Triangulation/include/CGAL/Triangulation.h b/Triangulation/include/CGAL/Triangulation.h
index dd1f7c9c560..460030287c3 100644
--- a/Triangulation/include/CGAL/Triangulation.h
+++ b/Triangulation/include/CGAL/Triangulation.h
@@ -36,7 +36,7 @@
 #include <CGAL/Random.h>
 
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {
 
diff --git a/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp b/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp
index 6075b23de80..c4bd24a23b3 100644
--- a/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp
+++ b/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp
@@ -6,7 +6,7 @@
 #include <CGAL/Random.h>
 #include <CGAL/Timer.h>
 
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <boost/random.hpp>
 
 
diff --git a/Triangulation_2/examples/Triangulation_2/info_insert_with_transform_iterator_2.cpp b/Triangulation_2/examples/Triangulation_2/info_insert_with_transform_iterator_2.cpp
index 0f2cc96d356..cf865ef9ffc 100644
--- a/Triangulation_2/examples/Triangulation_2/info_insert_with_transform_iterator_2.cpp
+++ b/Triangulation_2/examples/Triangulation_2/info_insert_with_transform_iterator_2.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <vector>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel         K;
diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h
index 36e6e56cf69..aaa1a301d3e 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2.h
@@ -50,7 +50,7 @@
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/uniform_smallint.hpp>
 #include <boost/random/variate_generator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 #ifndef CGAL_NO_STRUCTURAL_FILTERING
 #include <CGAL/internal/Static_filters/tools.h>
diff --git a/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp b/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp
index 402cbb76e13..9b84be9b8af 100644
--- a/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp
+++ b/Triangulation_3/examples/Triangulation_3/info_insert_with_transform_iterator.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Delaunay_triangulation_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <vector>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel         K;
diff --git a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h
index 134c59736b6..f391ac0a075 100644
--- a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h
+++ b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/Arrangement_2.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Arr_observer.h>
 #include <CGAL/assertions.h>
diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h
index 7bdd1c10045..4f1bd13a3af 100644
--- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h
@@ -51,7 +51,7 @@
 #include <CGAL/Identity_policy_2.h>
 
 #include <boost/variant.hpp>
-#include <boost/iterator/transform_iterator.hpp>
+#include <CGAL/boost/iterator/transform_iterator.hpp>
 
 namespace CGAL {