diff --git a/AABB_tree/test/AABB_tree/AABB_test_util.h b/AABB_tree/test/AABB_tree/AABB_test_util.h
index 55eeb4d84c8..bd5443a8548 100644
--- a/AABB_tree/test/AABB_tree/AABB_test_util.h
+++ b/AABB_tree/test/AABB_tree/AABB_test_util.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/AABB_halfedge_graph_segment_primitive.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/disable_warnings.h>
 
diff --git a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
index 70626442ac3..394bce109b5 100644
--- a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
@@ -15,7 +15,6 @@
 #include <CGAL/AABB_traits.h>
 
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 
diff --git a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
index 556a6f81bdd..8d511bea090 100644
--- a/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
@@ -32,7 +32,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
index 3da5b2fa1b7..5c3ba4ca6e1 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
@@ -33,7 +33,6 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
index 0e248bf8b4e..2c8e715276a 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
@@ -33,7 +33,6 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
index 6dfe77e2594..ff1e2775200 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
@@ -29,7 +29,6 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include "AABB_test_util.h"
diff --git a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
index 30121277365..3cdf2b07f8e 100644
--- a/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
@@ -32,7 +32,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test.cpp b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test.cpp
index 85a7a03ad41..acdfe0d2695 100644
--- a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_segment_test.cpp
@@ -33,7 +33,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_triangle_test.cpp
index 803f7397b50..04f6bbfbb8c 100644
--- a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_distance_triangle_test.cpp
@@ -35,7 +35,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_triangle_test.cpp
index 22340369dc9..0035f0b5259 100644
--- a/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_naive_vs_tree_triangle_test.cpp
@@ -34,7 +34,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/AABB_tree.h>
diff --git a/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp b/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp
index 90f6902f679..549f925fb9e 100644
--- a/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp
@@ -12,7 +12,6 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/Timer.h>
diff --git a/BGL/examples/BGL_LCC/copy_lcc.cpp b/BGL/examples/BGL_LCC/copy_lcc.cpp
index c2ec115e12d..0def9a59b53 100644
--- a/BGL/examples/BGL_LCC/copy_lcc.cpp
+++ b/BGL/examples/BGL_LCC/copy_lcc.cpp
@@ -2,8 +2,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 
diff --git a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
index 1268d4d9d77..40f1f884fee 100644
--- a/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
+++ b/BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
@@ -1,5 +1,4 @@
 #include <CGAL/Simple_cartesian.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/boost/graph/iterator.h>
 #include <fstream>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
index bf95392fdb4..71baeb00990 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
@@ -34,7 +34,6 @@
 #include <CGAL/assertions.h>
 #include <CGAL/hash_openmesh.h>
 
-
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
 #  pragma warning(disable:4267)
diff --git a/BGL/test/BGL/borders.cpp b/BGL/test/BGL/borders.cpp
index e2c848718f9..4df20313137 100644
--- a/BGL/test/BGL/borders.cpp
+++ b/BGL/test/BGL/borders.cpp
@@ -2,8 +2,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/split_graph_into_polylines.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <boost/graph/filtered_graph.hpp>
diff --git a/BGL/test/BGL/graph_concept_Dual.cpp b/BGL/test/BGL/graph_concept_Dual.cpp
index fc01a31ecae..6c29ab3fd57 100644
--- a/BGL/test/BGL/graph_concept_Dual.cpp
+++ b/BGL/test/BGL/graph_concept_Dual.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/boost/graph/graph_concepts.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 
diff --git a/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
index 02a5b6cf1e7..3e8c442a57e 100644
--- a/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
@@ -1,5 +1,4 @@
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/properties_Surface_mesh.h>
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/boost/graph/Graph_with_descriptor_with_graph.h>
 
diff --git a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
index 00b9bd6103d..8a0d04458b1 100644
--- a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
+++ b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp
@@ -1,5 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/boost/graph/graph_concepts.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 
diff --git a/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
index 459b0709e92..222b683cd5f 100644
--- a/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
@@ -1,5 +1,4 @@
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/properties_Surface_mesh.h>
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/Seam_mesh.h>
 #include <CGAL/Simple_cartesian.h>
 
diff --git a/BGL/test/BGL/graph_concept_Surface_mesh.cpp b/BGL/test/BGL/graph_concept_Surface_mesh.cpp
index dfeef4b03b6..1466fab4634 100644
--- a/BGL/test/BGL/graph_concept_Surface_mesh.cpp
+++ b/BGL/test/BGL/graph_concept_Surface_mesh.cpp
@@ -1,5 +1,4 @@
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/properties_Surface_mesh.h>
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/Simple_cartesian.h>
 
 #include <boost/graph/graph_concepts.hpp>
diff --git a/BGL/test/BGL/test_Manifold_face_removal.cpp b/BGL/test/BGL/test_Manifold_face_removal.cpp
index adc6f3bbe49..454a0d94ac5 100644
--- a/BGL/test/BGL/test_Manifold_face_removal.cpp
+++ b/BGL/test/BGL/test_Manifold_face_removal.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 #include <CGAL/Surface_mesh/IO.h>
 
 #include <boost/unordered_map.hpp>
diff --git a/BGL/test/BGL/test_bgl_read_write.cpp b/BGL/test/BGL/test_bgl_read_write.cpp
index bbbb1c4dbb7..894b772a610 100644
--- a/BGL/test/BGL/test_bgl_read_write.cpp
+++ b/BGL/test/BGL/test_bgl_read_write.cpp
@@ -1,10 +1,9 @@
 #include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
diff --git a/BGL/test/BGL/test_circulator.cpp b/BGL/test/BGL/test_circulator.cpp
index ce2b1a7fb8e..8cd8ac1e6ec 100644
--- a/BGL/test/BGL/test_circulator.cpp
+++ b/BGL/test/BGL/test_circulator.cpp
@@ -1,7 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <boost/foreach.hpp>
diff --git a/Convex_hull_3/test/Convex_hull_3/test_halfspace_intersections.cpp b/Convex_hull_3/test/Convex_hull_3/test_halfspace_intersections.cpp
index 7e0e00e9345..385236066d9 100644
--- a/Convex_hull_3/test/Convex_hull_3/test_halfspace_intersections.cpp
+++ b/Convex_hull_3/test/Convex_hull_3/test_halfspace_intersections.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/point_generators_3.h>
 
 #include <vector>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
 
 
diff --git a/Generalized_map/test/Generalized_map/Generalized_map_2_test.h b/Generalized_map/test/Generalized_map/Generalized_map_2_test.h
index ff1ae0576f0..15274a323fa 100644
--- a/Generalized_map/test/Generalized_map/Generalized_map_2_test.h
+++ b/Generalized_map/test/Generalized_map/Generalized_map_2_test.h
@@ -24,9 +24,7 @@
 #include <CGAL/Generalized_map_operations.h>
 #include <CGAL/Random.h>
 
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <iostream>
-#include <fstream>
 
 using namespace std;
 
diff --git a/Generator/test/Generator/generic_random_test.cpp b/Generator/test/Generator/generic_random_test.cpp
index d1c79fd0197..152071b8c44 100644
--- a/Generator/test/Generator/generic_random_test.cpp
+++ b/Generator/test/Generator/generic_random_test.cpp
@@ -18,7 +18,6 @@
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/Triangulation_vertex_base_2.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/point_generators_3.h>
 
diff --git a/Hash_map/test/Hash_map/Hash.cpp b/Hash_map/test/Hash_map/Hash.cpp
index fd558a42659..77e2c5c3b2f 100644
--- a/Hash_map/test/Hash_map/Hash.cpp
+++ b/Hash_map/test/Hash_map/Hash.cpp
@@ -9,7 +9,6 @@
 #include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/Linear_cell_complex_for_generalized_map.h>
 #include <CGAL/boost/graph/graph_traits_Arrangement_2.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
 #include <map>
 #include <boost/unordered_map.hpp>
diff --git a/Intersections_3/test/Intersections_3/test_intersections_3.cpp b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
index 1390d6a407b..4a4ec69e0bf 100644
--- a/Intersections_3/test/Intersections_3/test_intersections_3.cpp
+++ b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
@@ -9,7 +9,7 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/point_generators_3.h>
 
diff --git a/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp b/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
index 9c5a5d1ae50..8316a6f5335 100644
--- a/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
+++ b/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
@@ -7,13 +7,11 @@
 #include <CGAL/Mesh_criteria_3.h>
 
 #include <CGAL/Implicit_mesh_domain_3.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedral_mesh_domain_3.h>
 #include <CGAL/Mesh_domain_with_polyline_features_3.h>
 #include <CGAL/make_mesh_3.h>
 
-// IO
-#include <CGAL/IO/Polyhedron_iostream.h>
-
 // Ouput
 #include <CGAL/Mesh_3/Dump_c3t3.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_c3t3.cpp b/Mesh_3/test/Mesh_3/test_c3t3.cpp
index 1c296cbb970..83eae437387 100644
--- a/Mesh_3/test/Mesh_3/test_c3t3.cpp
+++ b/Mesh_3/test/Mesh_3/test_c3t3.cpp
@@ -32,7 +32,7 @@
 // IO
 #include <fstream>
 #include <iostream>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/IO/File_medit.h>
 #include <CGAL/IO/File_tetgen.h>
 
diff --git a/Nef_3/examples/Nef_3/handling_double_coordinates.cpp b/Nef_3/examples/Nef_3/handling_double_coordinates.cpp
index 7f194599b50..9a570ef0599 100644
--- a/Nef_3/examples/Nef_3/handling_double_coordinates.cpp
+++ b/Nef_3/examples/Nef_3/handling_double_coordinates.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Nef_polyhedron_3.h>
 #include <CGAL/IO/Nef_polyhedron_iostream_3.h>
 
diff --git a/Nef_3/examples/Nef_3/interface_polyhedron.cpp b/Nef_3/examples/Nef_3/interface_polyhedron.cpp
index ab6b36ca7a6..6cd007b3a0b 100644
--- a/Nef_3/examples/Nef_3/interface_polyhedron.cpp
+++ b/Nef_3/examples/Nef_3/interface_polyhedron.cpp
@@ -1,7 +1,6 @@
 #include <CGAL/Exact_integer.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Nef_polyhedron_3.h>
 #include <CGAL/IO/Nef_polyhedron_iostream_3.h>
 #include <iostream>
diff --git a/Nef_3/examples/Nef_3/offIO.cpp b/Nef_3/examples/Nef_3/offIO.cpp
index 94f69d586fc..ffc0fa34b24 100644
--- a/Nef_3/examples/Nef_3/offIO.cpp
+++ b/Nef_3/examples/Nef_3/offIO.cpp
@@ -1,7 +1,6 @@
 #include <CGAL/Exact_integer.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Nef_polyhedron_3.h>
 #include <CGAL/IO/Nef_polyhedron_iostream_3.h>
 #include <iostream>
diff --git a/Nef_3/test/Nef_3/nef_union_error_llvm.cpp b/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
index bca9fec0243..d0683165374 100644
--- a/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
+++ b/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Nef_polyhedron_3.h>
 #include <CGAL/IO/Nef_polyhedron_iostream_3.h>
 #include <iostream>
diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_example.cpp b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_example.cpp
index e45b6ea9ee0..31f49252ad2 100644
--- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_example.cpp
+++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_example.cpp
@@ -1,7 +1,6 @@
 #include <CGAL/trace.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Surface_mesh_default_triangulation_3.h>
 #include <CGAL/make_surface_mesh.h>
 #include <CGAL/Implicit_surface_3.h>
diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_function.cpp b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_function.cpp
index 704c88bb495..8ddef0b3273 100644
--- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_function.cpp
+++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/poisson_reconstruction_function.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/poisson_surface_reconstruction.h>
 #include <CGAL/IO/read_xyz_points.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
index dfbff75feb6..b3eff2f4aab 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
@@ -1,8 +1,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/Polygon_mesh_processing/fair.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
index a763b6b8128..eabf7f14538 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
@@ -2,13 +2,11 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/algorithm.h>
 #include <CGAL/Timer.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
index e4ce28785ae..d2081853d35 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
@@ -2,8 +2,6 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Side_of_triangle_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include "point_inside_helpers.h"
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
index 6d6820b9288..a08b5302938 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
@@ -4,11 +4,8 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #ifdef USE_SURFACE_MESH
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 #else
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #endif
 #include <CGAL/AABB_halfedge_graph_segment_primitive.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
index c362b06b61e..154b56bd6d4 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
@@ -2,8 +2,6 @@
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
 #include <CGAL/iterator.h>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
index 6b1d61c739d..29501f793ea 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
@@ -7,7 +7,6 @@
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
 
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <iostream>
 #include <vector>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
index 2e88a149549..7199a5f4e58 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
       = PMP::sharp_edges_segmentation(mesh, 90, eif, pid,
                                       PMP::parameters::first_index(1)
                                      .vertex_incident_patches_map(vip));
+   
     CGAL_assertion(number_of_patches == 6);
 
     PMP::detect_sharp_edges(mesh, 90, eif);
@@ -89,3 +90,4 @@ int main(int argc, char* argv[])
     return 0;
 }
 
+
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
index 06197919b57..edfc4802110 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
@@ -1,5 +1,4 @@
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
index 2fa0e4cef27..80d530789da 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
@@ -1,8 +1,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 
 #include <fstream>
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 14fc54b703e..21b85e5fb4b 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
@@ -1,8 +1,6 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Polygon_mesh_processing/stitch_borders.h>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
index 33d2e65f3c4..a301cb0e2d6 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
@@ -1,7 +1,6 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 
 #include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
 #include <boost/foreach.hpp>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
index e3c7b62d9b6..213cfa95b5a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
@@ -5,13 +5,8 @@
 #include <CGAL/Polygon_mesh_processing/internal/Hole_filling/do_not_use_DT3.h>
 #ifdef POLY
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #else
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/properties_Surface_mesh.h>
 #endif
 #include <CGAL/boost/graph/helpers.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
index 4003415e2e4..afff2c7acba 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
@@ -3,13 +3,8 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #ifdef POLY
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #else
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
-#include <CGAL/boost/graph/properties_Surface_mesh.h>
 #endif
 #include <CGAL/boost/graph/helpers.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
index c6998746633..16cfe36105a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
@@ -9,9 +9,6 @@
 
 #include <CGAL/Polyhedron_incremental_builder_3.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
 
 #include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
 
diff --git a/Polyhedron/examples/Polyhedron/polyhedron_prog_cut_cube.cpp b/Polyhedron/examples/Polyhedron/polyhedron_prog_cut_cube.cpp
index 74dcfff094a..c244c1c1c74 100644
--- a/Polyhedron/examples/Polyhedron/polyhedron_prog_cut_cube.cpp
+++ b/Polyhedron/examples/Polyhedron/polyhedron_prog_cut_cube.cpp
@@ -1,5 +1,4 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/polyhedron_cut_plane_3.h>
 #include <iostream>
diff --git a/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv.cpp b/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv.cpp
index 009841ff69a..bf1104c3c3b 100644
--- a/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv.cpp
+++ b/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <iostream>
 #include <algorithm>
 #include <vector>
diff --git a/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv_with_boundary.cpp b/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv_with_boundary.cpp
index 90ead40b2ff..744440fd123 100644
--- a/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv_with_boundary.cpp
+++ b/Polyhedron/examples/Polyhedron/polyhedron_prog_subdiv_with_boundary.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <iostream>
 #include <algorithm>
 #include <vector>
diff --git a/Polyhedron/examples/Polyhedron/polyhedron_self_intersection.cpp b/Polyhedron/examples/Polyhedron/polyhedron_self_intersection.cpp
index 5bea593eaa1..a70ee0fd0e2 100644
--- a/Polyhedron/examples/Polyhedron/polyhedron_self_intersection.cpp
+++ b/Polyhedron/examples/Polyhedron/polyhedron_self_intersection.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/intersections.h>
diff --git a/Polyhedron/test/Polyhedron/bug_polyhedron_incremental_builder_3.cpp b/Polyhedron/test/Polyhedron/bug_polyhedron_incremental_builder_3.cpp
index 17ead1f548f..df51270184b 100644
--- a/Polyhedron/test/Polyhedron/bug_polyhedron_incremental_builder_3.cpp
+++ b/Polyhedron/test/Polyhedron/bug_polyhedron_incremental_builder_3.cpp
@@ -1,7 +1,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <sstream>
 
 typedef CGAL::Simple_cartesian<double> K;
diff --git a/Polyhedron_IO/examples/Polyhedron_IO/off2stl.cpp b/Polyhedron_IO/examples/Polyhedron_IO/off2stl.cpp
index 71e2c2b7723..0419f5e218e 100644
--- a/Polyhedron_IO/examples/Polyhedron_IO/off2stl.cpp
+++ b/Polyhedron_IO/examples/Polyhedron_IO/off2stl.cpp
@@ -2,7 +2,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/IO/Verbose_ostream.h>
 #include <cstddef>
 #include <cstdlib>
diff --git a/Polyhedron_IO/examples/Polyhedron_IO/polyhedron2vrml.cpp b/Polyhedron_IO/examples/Polyhedron_IO/polyhedron2vrml.cpp
index a2466f354e1..f6431fd9b57 100644
--- a/Polyhedron_IO/examples/Polyhedron_IO/polyhedron2vrml.cpp
+++ b/Polyhedron_IO/examples/Polyhedron_IO/polyhedron2vrml.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/IO/Polyhedron_VRML_1_ostream.h>
 #include <iostream>
 
diff --git a/Polyhedron_IO/examples/Polyhedron_IO/polyhedron_copy.cpp b/Polyhedron_IO/examples/Polyhedron_IO/polyhedron_copy.cpp
index b192f224fe5..f93cd531db5 100644
--- a/Polyhedron_IO/examples/Polyhedron_IO/polyhedron_copy.cpp
+++ b/Polyhedron_IO/examples/Polyhedron_IO/polyhedron_copy.cpp
@@ -2,7 +2,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/IO/Verbose_ostream.h>
 #include <cstddef>
 #include <cstdlib>
diff --git a/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp b/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
index 181062a7990..f737d11d10f 100644
--- a/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
+++ b/Polyhedron_IO/test/Polyhedron_IO/test_polyhedron_io.cpp
@@ -32,7 +32,6 @@
 // disabled compilers.
 #ifndef CGAL_USE_POLYHEDRON_DESIGN_ONE
 
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/IO/print_OFF.h>
 #include <CGAL/IO/print_wavefront.h>
 #include <CGAL/IO/print_inventor.h>
diff --git a/Ridges_3/examples/Ridges_3/PolyhedralSurf.h b/Ridges_3/examples/Ridges_3/PolyhedralSurf.h
index 13f555e1cf8..44a36ea7fd5 100644
--- a/Ridges_3/examples/Ridges_3/PolyhedralSurf.h
+++ b/Ridges_3/examples/Ridges_3/PolyhedralSurf.h
@@ -3,9 +3,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <cstdlib>
 #include <cstdio>
diff --git a/Ridges_3/test/Ridges_3/PolyhedralSurf.h b/Ridges_3/test/Ridges_3/PolyhedralSurf.h
index 13f555e1cf8..44a36ea7fd5 100644
--- a/Ridges_3/test/Ridges_3/PolyhedralSurf.h
+++ b/Ridges_3/test/Ridges_3/PolyhedralSurf.h
@@ -3,9 +3,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <cstdlib>
 #include <cstdio>
diff --git a/Skin_surface_3/test/Skin_surface_3/degenerate_test.cpp b/Skin_surface_3/test/Skin_surface_3/degenerate_test.cpp
index fbc6f377732..59638cf9178 100644
--- a/Skin_surface_3/test/Skin_surface_3/degenerate_test.cpp
+++ b/Skin_surface_3/test/Skin_surface_3/degenerate_test.cpp
@@ -3,7 +3,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Skin_surface_3.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/mesh_skin_surface_3.h>
 
 #include <list>
diff --git a/Skin_surface_3/test/Skin_surface_3/degenerate_test_exact.cpp b/Skin_surface_3/test/Skin_surface_3/degenerate_test_exact.cpp
index 86590e8a36b..ca7fd696be9 100644
--- a/Skin_surface_3/test/Skin_surface_3/degenerate_test_exact.cpp
+++ b/Skin_surface_3/test/Skin_surface_3/degenerate_test_exact.cpp
@@ -2,7 +2,6 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Skin_surface_3.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/mesh_skin_surface_3.h>
 
 #include <list>
diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session.cpp b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session.cpp
index 23d96f039f7..383b5cd2f66 100644
--- a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session.cpp
+++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_deformation_session.cpp
@@ -5,7 +5,6 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 #include <CGAL/Simple_cartesian.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Surface_mesh_deformation.h>
 
 #include <CGAL/Timer.h>
diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_performance_test.cpp b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_performance_test.cpp
index 081c53030b2..6045e1cf4a7 100644
--- a/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_performance_test.cpp
+++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/Cactus_performance_test.cpp
@@ -6,7 +6,6 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/Surface_mesh_deformation_test_commons.h b/Surface_mesh_deformation/test/Surface_mesh_deformation/Surface_mesh_deformation_test_commons.h
index 2650b7dbc91..b165ac6c6b2 100644
--- a/Surface_mesh_deformation/test/Surface_mesh_deformation/Surface_mesh_deformation_test_commons.h
+++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/Surface_mesh_deformation_test_commons.h
@@ -1,6 +1,4 @@
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
-
+#include <boost/graph/graph_traits.hpp>
 #include <CGAL/property_map.h>
 #include <boost/optional.hpp>
 #include <vector>
diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/Symmetry_test.cpp b/Surface_mesh_deformation/test/Surface_mesh_deformation/Symmetry_test.cpp
index 6dddddf8008..cea63122867 100644
--- a/Surface_mesh_deformation/test/Surface_mesh_deformation/Symmetry_test.cpp
+++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/Symmetry_test.cpp
@@ -8,7 +8,6 @@
 #include <CGAL/Polyhedron_items_with_id_3.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh_deformation.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 typedef CGAL::Simple_cartesian<double>   Kernel;
 typedef CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_with_id_3>  Polyhedron;
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Fast_sdf_calculation_test.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Fast_sdf_calculation_test.cpp
index 3b1c54d11cd..4f6c44ed6c9 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Fast_sdf_calculation_test.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Fast_sdf_calculation_test.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/Timer.h>
 
 #include <CGAL/mesh_segmentation.h>
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Filters_test.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Filters_test.cpp
index 831ce389984..e4897a0dd6c 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Filters_test.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Filters_test.cpp
@@ -1,8 +1,7 @@
 #include <CGAL/internal/Surface_mesh_segmentation/Filters.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 
 #include <cmath>
 #include <map>
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test.cpp
index ebd3e4019c6..2afde8999d9 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test.cpp
@@ -1,6 +1,5 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/mesh_segmentation.h>
 
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test_using_boost.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test_using_boost.cpp
index 992203e964d..eaf9f8b1f81 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test_using_boost.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/mesh_segmentation_test_using_boost.cpp
@@ -1,8 +1,7 @@
 #define CGAL_DO_NOT_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
+#include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/mesh_segmentation.h>
 
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
index 80703d42805..36b3989e902 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
@@ -1,8 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_rational.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polyhedron_3.h>
 
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/mesh_segmentation.h>
 
 #include <CGAL/property_map.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_1.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_1.cpp
index f5af383014e..457c5f951a0 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_1.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_1.cpp
@@ -9,9 +9,7 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_2.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_2.cpp
index 8b5493eea39..5a895e77fc4 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_2.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_2.cpp
@@ -11,11 +11,8 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/boost/graph/iterator.h>
-#include <CGAL/boost/graph/properties_Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_3.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_3.cpp
index eb81aa1df7d..96af1eed022 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_3.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_3.cpp
@@ -2,12 +2,10 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp
index 87020292d7c..c6ab30e0fef 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp
@@ -2,12 +2,10 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_5.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_5.cpp
index a00e74fa66e..aea9ead5bd8 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_5.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_5.cpp
@@ -10,9 +10,7 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits_test.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits_test.cpp
index d3e575d5e68..04744d1b3ac 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits_test.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits_test.cpp
@@ -2,14 +2,12 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
 #include <CGAL/Surface_mesh_shortest_path/function_objects.h>
 #include <CGAL/Surface_mesh_shortest_path/barycentric.h>
 #include <CGAL/Surface_mesh_shortest_path/internal/misc_functions.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/test_util.h>
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
index 2edc30b901c..89f57b80826 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/TestMesh.cpp
@@ -20,14 +20,12 @@
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/property_map/property_map.hpp>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/boost/graph/iterator.h>
 
 #include <CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path_traits.h>
diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_bounded_normal_change.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_bounded_normal_change.cpp
index 037d75c4c27..f46b2bfb847 100644
--- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_bounded_normal_change.cpp
+++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_bounded_normal_change.cpp
@@ -2,8 +2,6 @@
 #include <fstream>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 
 // Simplification function
 #include <CGAL/Surface_mesh_simplification/edge_collapse.h>
diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h b/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h
index 6f3b1ae089d..0dc8b196a84 100644
--- a/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h
+++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h
@@ -27,7 +27,6 @@ void Surface_simplification_external_trace( std::string s )
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
 
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 
 #include <CGAL/Surface_mesh_simplification/edge_collapse.h>
 #include <CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h>
@@ -35,7 +34,6 @@ void Surface_simplification_external_trace( std::string s )
 #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Midpoint_and_length.h>
 #include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Count_stop_predicate.h>
 
-#include <CGAL/IO/Polyhedron_iostream.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
 
diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp b/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp
index e6c6d3d18ac..2501ead0069 100644
--- a/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp
+++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp
@@ -3,9 +3,6 @@
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
-
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 
 // Simplification function
 #include <CGAL/Surface_mesh_simplification/edge_collapse.h>
diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp
index 4467550ae86..63deba74b69 100644
--- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp
+++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp
@@ -1,10 +1,8 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Mean_curvature_flow_skeletonization.h>
 #include <CGAL/internal/corefinement/connected_components.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <fstream>
 
diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp
index 0fab0e9af72..4409100ab7e 100644
--- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp
+++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp
@@ -1,10 +1,8 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/extract_mean_curvature_flow_skeleton.h>
 #include <CGAL/internal/corefinement/connected_components.h>
-#include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <boost/foreach.hpp>