From 833a32660d76316894878089258a98dc0425436b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Fri, 14 Dec 2012 17:29:14 +0100
Subject: [PATCH 1/8] Replace boost/random.hpp with more precise headers

---
 .../include/CGAL/Segment_Delaunay_graph_hierarchy_2.h           | 2 +-
 Spatial_sorting/include/CGAL/hilbert_sort.h                     | 2 +-
 Spatial_sorting/include/CGAL/spatial_sort.h                     | 2 +-
 .../include/CGAL/Reconstruction_triangulation_3.h               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h
index 610f5958c12..6aa9b7a500a 100644
--- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h
+++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_hierarchy_2.h
@@ -25,7 +25,7 @@
 
 #include <map>
 
-#include <boost/random.hpp>
+#include <boost/random/random_number_generator.hpp>
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/geometric_distribution.hpp>
 #include <boost/random/variate_generator.hpp>
diff --git a/Spatial_sorting/include/CGAL/hilbert_sort.h b/Spatial_sorting/include/CGAL/hilbert_sort.h
index f762f288a02..97821aeef76 100644
--- a/Spatial_sorting/include/CGAL/hilbert_sort.h
+++ b/Spatial_sorting/include/CGAL/hilbert_sort.h
@@ -28,7 +28,7 @@
 #include <CGAL/Hilbert_sort_3.h>
 #include <CGAL/Hilbert_sort_d.h>
 
-#include <boost/random.hpp>
+#include <boost/random/random_number_generator.hpp>
 #include <boost/random/linear_congruential.hpp>
 
 #include <algorithm>
diff --git a/Spatial_sorting/include/CGAL/spatial_sort.h b/Spatial_sorting/include/CGAL/spatial_sort.h
index cbd8f08638b..3a34674a602 100644
--- a/Spatial_sorting/include/CGAL/spatial_sort.h
+++ b/Spatial_sorting/include/CGAL/spatial_sort.h
@@ -26,7 +26,7 @@
 #include <CGAL/hilbert_sort.h>
 #include <CGAL/Multiscale_sort.h>
 
-#include <boost/random.hpp>
+#include <boost/random/random_number_generator.hpp>
 #include <boost/random/linear_congruential.hpp>
 
 #include <algorithm>
diff --git a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
index 3def7397cab..843ed208729 100644
--- a/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
+++ b/Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
@@ -33,7 +33,7 @@
 #include <CGAL/Min_sphere_of_points_d_traits_3.h>
 #include <CGAL/centroid.h>
 
-#include <boost/random.hpp>
+#include <boost/random/random_number_generator.hpp>
 #include <boost/random/linear_congruential.hpp>
 
 #include <vector>

From 71ea8e6e22e33751d22ef304724975d06680488f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Fri, 14 Dec 2012 18:13:59 +0100
Subject: [PATCH 2/8] Minimal boost includes

Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
---
 .../CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h    | 2 +-
 Convex_hull_3/include/CGAL/convex_hull_3.h                | 2 +-
 Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h     | 3 +--
 Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h     | 1 -
 .../include/CGAL/Test/_test_bigfloat_interval_traits.h    | 2 +-
 Interval_support/include/CGAL/Test/_test_convert_to_bfi.h | 2 +-
 .../include/CGAL/Test/_test_interval_traits.h             | 2 +-
 Kernel_23/include/CGAL/Circle_2.h                         | 2 +-
 Kernel_23/include/CGAL/Circle_3.h                         | 2 +-
 Kernel_23/include/CGAL/Direction_2.h                      | 2 +-
 Kernel_23/include/CGAL/Direction_3.h                      | 2 +-
 Kernel_23/include/CGAL/Iso_cuboid_3.h                     | 2 +-
 Kernel_23/include/CGAL/Iso_rectangle_2.h                  | 2 +-
 Kernel_23/include/CGAL/Line_2.h                           | 2 +-
 Kernel_23/include/CGAL/Line_3.h                           | 2 +-
 Kernel_23/include/CGAL/Plane_3.h                          | 2 +-
 Kernel_23/include/CGAL/Point_2.h                          | 2 +-
 Kernel_23/include/CGAL/Point_3.h                          | 2 +-
 Kernel_23/include/CGAL/Ray_2.h                            | 2 +-
 Kernel_23/include/CGAL/Ray_3.h                            | 2 +-
 Kernel_23/include/CGAL/Segment_2.h                        | 2 +-
 Kernel_23/include/CGAL/Segment_3.h                        | 2 +-
 Kernel_23/include/CGAL/Sphere_3.h                         | 2 +-
 Kernel_23/include/CGAL/Tetrahedron_3.h                    | 2 +-
 Kernel_23/include/CGAL/Triangle_2.h                       | 2 +-
 Kernel_23/include/CGAL/Triangle_3.h                       | 2 +-
 Kernel_23/include/CGAL/Vector_2.h                         | 2 +-
 Kernel_23/include/CGAL/Vector_3.h                         | 2 +-
 .../include/CGAL/Mesh_domain_with_polyline_features_3.h   | 2 +-
 Number_types/include/CGAL/Lazy_exact_nt.h                 | 8 ++++++--
 Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h     | 1 -
 Ridges_3/include/CGAL/Ridges.h                            | 2 +-
 STL_Extension/include/CGAL/is_iterator.h                  | 4 +++-
 STL_Extension/include/CGAL/iterator.h                     | 3 ++-
 STL_Extension/test/STL_Extension/test_Cache.cpp           | 2 +-
 Triangulation_2/include/CGAL/Weighted_point.h             | 3 +--
 36 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
index ca3482a21e2..496daca7dce 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
@@ -25,7 +25,7 @@
 #include <CGAL/Unique_hash_map.h> 
 #include <CGAL/Sweep_line_2/Arr_construction_sl_visitor.h>
 #include <boost/mpl/if.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Arr_tags.h>
 #include <CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h>
 #include <CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h>
diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h
index cb3ec6312b3..bd26b6d9b1b 100644
--- a/Convex_hull_3/include/CGAL/convex_hull_3.h
+++ b/Convex_hull_3/include/CGAL/convex_hull_3.h
@@ -43,7 +43,7 @@
 #include <vector>
 #include <boost/bind.hpp>
 #include <boost/next_prior.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_floating_point.hpp>
 #include <CGAL/internal/Exact_type_selector.h>
 
 
diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h
index a32e448d389..ee2859fd9c1 100644
--- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH2.h
@@ -27,10 +27,9 @@
 
 #include <CGAL/Origin.h>
 #include <boost/utility/enable_if.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/logical.hpp>
-#include <boost/utility.hpp>
 
 namespace CGAL {
 
diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h
index c24bf0615af..feb2f09b62b 100644
--- a/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/PointH3.h
@@ -27,7 +27,6 @@
 
 #include <CGAL/Origin.h>
 #include <boost/utility/enable_if.hpp>
-#include <boost/utility.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/logical.hpp>
 
diff --git a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h
index d88a99e3730..7a74bc11733 100644
--- a/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h
+++ b/Interval_support/include/CGAL/Test/_test_bigfloat_interval_traits.h
@@ -25,7 +25,7 @@
 
 #include <cstddef>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <cassert>
 #include <CGAL/tags.h>
diff --git a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h
index cd47f47a9e9..5901d8d4ca1 100644
--- a/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h
+++ b/Interval_support/include/CGAL/Test/_test_convert_to_bfi.h
@@ -25,7 +25,7 @@
 
 #include <cstddef>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <cassert>
 #include <CGAL/tags.h>
diff --git a/Interval_support/include/CGAL/Test/_test_interval_traits.h b/Interval_support/include/CGAL/Test/_test_interval_traits.h
index e23d2025fe4..2e8ff6652e9 100644
--- a/Interval_support/include/CGAL/Test/_test_interval_traits.h
+++ b/Interval_support/include/CGAL/Test/_test_interval_traits.h
@@ -25,7 +25,7 @@
 
 #include <cstddef>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <cassert>
 #include <CGAL/tags.h>
diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h
index e8279ff6dc1..4dcadc88c1d 100644
--- a/Kernel_23/include/CGAL/Circle_2.h
+++ b/Kernel_23/include/CGAL/Circle_2.h
@@ -27,7 +27,7 @@
 #define CGAL_CIRCLE_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Circle_3.h b/Kernel_23/include/CGAL/Circle_3.h
index 846a6791b02..74588fd33b1 100644
--- a/Kernel_23/include/CGAL/Circle_3.h
+++ b/Kernel_23/include/CGAL/Circle_3.h
@@ -31,7 +31,7 @@
 #define CGAL_CIRCLE_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/representation_tags.h>
diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h
index 3b8d5533caf..093faf2a9f8 100644
--- a/Kernel_23/include/CGAL/Direction_2.h
+++ b/Kernel_23/include/CGAL/Direction_2.h
@@ -26,7 +26,7 @@
 #define CGAL_DIRECTION_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h
index 511eebb48cb..155f0f69fcb 100644
--- a/Kernel_23/include/CGAL/Direction_3.h
+++ b/Kernel_23/include/CGAL/Direction_3.h
@@ -26,7 +26,7 @@
 #define CGAL_DIRECTION_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Iso_cuboid_3.h b/Kernel_23/include/CGAL/Iso_cuboid_3.h
index 5c7102f124f..276f3199178 100644
--- a/Kernel_23/include/CGAL/Iso_cuboid_3.h
+++ b/Kernel_23/include/CGAL/Iso_cuboid_3.h
@@ -26,7 +26,7 @@
 #define CGAL_ISO_CUBOID_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h
index 5dea113923b..b5777b2a2f1 100644
--- a/Kernel_23/include/CGAL/Iso_rectangle_2.h
+++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h
@@ -26,7 +26,7 @@
 #define CGAL_ISO_RECTANGLE_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h
index 639f4e1f17b..772bbf26987 100644
--- a/Kernel_23/include/CGAL/Line_2.h
+++ b/Kernel_23/include/CGAL/Line_2.h
@@ -26,7 +26,7 @@
 #define CGAL_LINE_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
 
diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h
index 7251a000617..4429b11c06e 100644
--- a/Kernel_23/include/CGAL/Line_3.h
+++ b/Kernel_23/include/CGAL/Line_3.h
@@ -27,7 +27,7 @@
 #define CGAL_LINE_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
 
diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h
index a7e76834688..a168a82b0d9 100644
--- a/Kernel_23/include/CGAL/Plane_3.h
+++ b/Kernel_23/include/CGAL/Plane_3.h
@@ -26,7 +26,7 @@
 #define CGAL_PLANE_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
 
diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h
index fde20f8c606..b63f0ef772f 100644
--- a/Kernel_23/include/CGAL/Point_2.h
+++ b/Kernel_23/include/CGAL/Point_2.h
@@ -28,7 +28,7 @@
 #include <CGAL/Origin.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h
index 82ee3090254..c811c405299 100644
--- a/Kernel_23/include/CGAL/Point_3.h
+++ b/Kernel_23/include/CGAL/Point_3.h
@@ -28,7 +28,7 @@
 #include <CGAL/Origin.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h
index a0a988c55ba..a5cd969e9c1 100644
--- a/Kernel_23/include/CGAL/Ray_2.h
+++ b/Kernel_23/include/CGAL/Ray_2.h
@@ -26,7 +26,7 @@
 #define CGAL_RAY_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h
index b53b37ad516..a27f8b3be85 100644
--- a/Kernel_23/include/CGAL/Ray_3.h
+++ b/Kernel_23/include/CGAL/Ray_3.h
@@ -26,7 +26,7 @@
 #define CGAL_RAY_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h
index 4cae9992148..7e3ef317e73 100644
--- a/Kernel_23/include/CGAL/Segment_2.h
+++ b/Kernel_23/include/CGAL/Segment_2.h
@@ -26,7 +26,7 @@
 #define CGAL_SEGMENT_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h
index 3777752ec64..71239ca618c 100644
--- a/Kernel_23/include/CGAL/Segment_3.h
+++ b/Kernel_23/include/CGAL/Segment_3.h
@@ -26,7 +26,7 @@
 #define CGAL_SEGMENT_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Sphere_3.h b/Kernel_23/include/CGAL/Sphere_3.h
index 0ff186ce44b..013670f6f17 100644
--- a/Kernel_23/include/CGAL/Sphere_3.h
+++ b/Kernel_23/include/CGAL/Sphere_3.h
@@ -26,7 +26,7 @@
 #define CGAL_SPHERE_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/representation_tags.h>
diff --git a/Kernel_23/include/CGAL/Tetrahedron_3.h b/Kernel_23/include/CGAL/Tetrahedron_3.h
index d03ae1d5088..1a1da7f94f8 100644
--- a/Kernel_23/include/CGAL/Tetrahedron_3.h
+++ b/Kernel_23/include/CGAL/Tetrahedron_3.h
@@ -26,7 +26,7 @@
 #define CGAL_TETRAHEDRON_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Triangle_2.h b/Kernel_23/include/CGAL/Triangle_2.h
index 46251f19b5d..720c75ed863 100644
--- a/Kernel_23/include/CGAL/Triangle_2.h
+++ b/Kernel_23/include/CGAL/Triangle_2.h
@@ -26,7 +26,7 @@
 #define CGAL_TRIANGLE_2_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Triangle_3.h b/Kernel_23/include/CGAL/Triangle_3.h
index ee1dc80d86f..dc8f99802a7 100644
--- a/Kernel_23/include/CGAL/Triangle_3.h
+++ b/Kernel_23/include/CGAL/Triangle_3.h
@@ -26,7 +26,7 @@
 #define CGAL_TRIANGLE_3_H
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_3.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h
index 80b7ee70001..c34c00d0815 100644
--- a/Kernel_23/include/CGAL/Vector_2.h
+++ b/Kernel_23/include/CGAL/Vector_2.h
@@ -28,7 +28,7 @@
 #include <CGAL/Origin.h>
 #include <CGAL/Kernel/mpl.h>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h
index fe1c2b865a9..6c25b16a46e 100644
--- a/Kernel_23/include/CGAL/Vector_3.h
+++ b/Kernel_23/include/CGAL/Vector_3.h
@@ -29,7 +29,7 @@
 #include <CGAL/Kernel/mpl.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
 
diff --git a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
index fc8954a3ec1..1beee523132 100644
--- a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
+++ b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
@@ -33,7 +33,7 @@
 #include <vector>
 #include <set>
 #include <map>
-#include <boost/utility.hpp> // for boost::prior and boost::next
+#include <boost/next_prior.hpp> // for boost::prior and boost::next
 #include <boost/variant.hpp>
 
 namespace CGAL {
diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h
index f78f2bef256..9526f57d7b2 100644
--- a/Number_types/include/CGAL/Lazy_exact_nt.h
+++ b/Number_types/include/CGAL/Lazy_exact_nt.h
@@ -27,11 +27,15 @@
 
 
 #include <CGAL/number_type_basic.h>
+#include <CGAL/assertions.h>
 
 #include <boost/iterator/transform_iterator.hpp> // for Root_of functor
-#include <CGAL/assertions.h>
 #include <boost/operators.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+#include <boost/utility/enable_if.hpp>
+
+#include <boost/mpl/if.hpp>
 #include <boost/mpl/logical.hpp>
 
 #include <CGAL/Interval_nt.h>
diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
index 142101241c2..290920b2028 100644
--- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
+++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
@@ -40,7 +40,6 @@
 #include <CGAL/internal/corefinement/intersection_triangle_segment_3.h>
 #include <CGAL/internal/corefinement/intersection_coplanar_triangles_3.h>
 
-#include <boost/utility.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 
 #ifdef CGAL_COREFINEMENT_DEBUG
diff --git a/Ridges_3/include/CGAL/Ridges.h b/Ridges_3/include/CGAL/Ridges.h
index e28ea801e3f..af2ea96852d 100644
--- a/Ridges_3/include/CGAL/Ridges.h
+++ b/Ridges_3/include/CGAL/Ridges.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/property_map.h>
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace CGAL {
  
diff --git a/STL_Extension/include/CGAL/is_iterator.h b/STL_Extension/include/CGAL/is_iterator.h
index ae0b73a1eb7..5043515a8e8 100644
--- a/STL_Extension/include/CGAL/is_iterator.h
+++ b/STL_Extension/include/CGAL/is_iterator.h
@@ -23,7 +23,9 @@
 #define CGAL_IS_ITERATOR_H
 
 #include <iterator>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/type_traits/remove_cv.hpp>
 #include <boost/mpl/has_xxx.hpp>
 
 namespace CGAL {
diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index 5415c64fed8..a649b1fa7db 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -32,9 +32,10 @@
 #include <CGAL/use.h>
 #include <vector>
 #include <map>
-#include <boost/type_traits.hpp>
 #include <CGAL/tuple.h>
 
+#include <boost/config.hpp>
+
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
 #  pragma warning(disable:4396)
diff --git a/STL_Extension/test/STL_Extension/test_Cache.cpp b/STL_Extension/test/STL_Extension/test_Cache.cpp
index 8b44a30cf1c..e859111e0d1 100644
--- a/STL_Extension/test/STL_Extension/test_Cache.cpp
+++ b/STL_Extension/test/STL_Extension/test_Cache.cpp
@@ -19,7 +19,7 @@
 #include <CGAL/function_objects.h>
 
 #include <CGAL/assertions.h>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 struct Int_rep {
     int val;
diff --git a/Triangulation_2/include/CGAL/Weighted_point.h b/Triangulation_2/include/CGAL/Weighted_point.h
index c44a33950f9..e7ae87149be 100644
--- a/Triangulation_2/include/CGAL/Weighted_point.h
+++ b/Triangulation_2/include/CGAL/Weighted_point.h
@@ -26,11 +26,10 @@
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Dimension.h>
 #include <boost/utility/enable_if.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/logical.hpp>
-#include <boost/utility.hpp>
 
 namespace CGAL {
 

From c5f3c7b4f4861d461056efaf9ff6e615d910b0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Fri, 14 Dec 2012 18:19:57 +0100
Subject: [PATCH 3/8] Use angle-bracket includes

---
 Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h
index 89eb748c483..fe5ae2a04a4 100644
--- a/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h
+++ b/Kernel_23/include/CGAL/Kernel/global_functions_internal_3.h
@@ -31,7 +31,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/Dimension.h>
 #include <boost/utility/enable_if.hpp>
-#include "boost/mpl/equal_to.hpp"
+#include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/integral_c.hpp>
 
 namespace CGAL {

From ded638af71de141c4d7153037ac08302e1f9ac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Mon, 17 Dec 2012 17:32:01 +0100
Subject: [PATCH 4/8] Stream_lines_2 uses an undocumented class

Add the proper include for it.
---
 Stream_lines_2/include/CGAL/Stream_lines_2.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Stream_lines_2/include/CGAL/Stream_lines_2.h b/Stream_lines_2/include/CGAL/Stream_lines_2.h
index e524ef1e449..96d229970d4 100644
--- a/Stream_lines_2/include/CGAL/Stream_lines_2.h
+++ b/Stream_lines_2/include/CGAL/Stream_lines_2.h
@@ -36,6 +36,7 @@
 #include <CGAL/streamlines_assertions.h>
 
 #include <boost/tuple/tuple.hpp>
+#include <boost/random/uniform_real.hpp> // undocumented class
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/uniform_smallint.hpp>
 

From 7bb310767cfaf07251b3e43103e8fec3136ffb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Mon, 17 Dec 2012 17:32:49 +0100
Subject: [PATCH 5/8] Fix type_traits includes in Combinatorial_map

Make sure every header is complete and only brings in the minimal
requirements.
---
 Combinatorial_map/include/CGAL/Cell_iterators.h                 | 2 ++
 Combinatorial_map/include/CGAL/Combinatorial_map.h              | 2 ++
 .../include/CGAL/Combinatorial_map_basic_operations.h           | 2 ++
 .../include/CGAL/Combinatorial_map_iterators_base.h             | 2 ++
 .../include/CGAL/internal/Combinatorial_map_utility.h           | 2 ++
 .../CGAL/internal/Combinatorial_map_utility_novariadic.h        | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Combinatorial_map/include/CGAL/Cell_iterators.h b/Combinatorial_map/include/CGAL/Cell_iterators.h
index 97dce995957..a9a38c1e98c 100644
--- a/Combinatorial_map/include/CGAL/Cell_iterators.h
+++ b/Combinatorial_map/include/CGAL/Cell_iterators.h
@@ -23,6 +23,8 @@
 #include <CGAL/Dart_iterators.h>
 #include <CGAL/Combinatorial_map_basic_operations.h>
 
+#include <boost/type_traits/is_same.hpp>
+
 // TODO do all the orbit iterator of any orbit ?
 
 namespace CGAL {
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h
index d203cbdb040..b8e33ef4bc1 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h
@@ -30,6 +30,8 @@
 #include <bitset>
 #include <vector>
 
+#include <boost/type_traits/is_same.hpp>
+
 // suppress bogus warning when compiling with gcc 4.3 or 4.4
 #if (__GNUC__ == 4 && (__GNUC_MINOR__ == 3 || __GNUC_MINOR__ == 4))
 #pragma GCC diagnostic ignored "-Warray-bounds"
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h
index 732402cd245..47e1473ae22 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h
@@ -20,6 +20,8 @@
 #ifndef CGAL_COMBINATORIAL_MAP_BASIC_OPERATIONS_H
 #define CGAL_COMBINATORIAL_MAP_BASIC_OPERATIONS_H 1
 
+#include <boost/type_traits/is_same.hpp>
+
 namespace CGAL {
 
   /** @file Combinatorial_map_basic_operations.h
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h b/Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h
index 664c0aa86b2..9687d1c59df 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h
@@ -21,6 +21,8 @@
 #define CGAL_COMBINATORIAL_MAP_ITERATORS_BASE_HH 1
 
 #include <queue>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace CGAL {
 
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
index 0f90fb91381..70d080a37a1 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h
@@ -24,6 +24,8 @@
 #include <CGAL/Compact_container.h>
 #include <iostream>
 
+#include <boost/type_traits/is_same.hpp>
+
 namespace CGAL 
 {
   namespace internal
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
index fc0f77d8cf4..0e4a2629927 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility_novariadic.h
@@ -22,7 +22,7 @@
 
 #ifdef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 #include <boost/mpl/if.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 // This file is included in Combinatorial_map_utility.h, in the namespace
 // CGAL::internal

From 1f1ff446a7ea24ef90b0a419196451d0fbd071e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Tue, 18 Dec 2012 10:59:47 +0100
Subject: [PATCH 6/8] Missing sstream include

---
 .../test/Inscribed_areas/largest_empty_iso_rectangle_2_test.cpp  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Inscribed_areas/test/Inscribed_areas/largest_empty_iso_rectangle_2_test.cpp b/Inscribed_areas/test/Inscribed_areas/largest_empty_iso_rectangle_2_test.cpp
index ba105ed5e9f..f99a4f91f58 100644
--- a/Inscribed_areas/test/Inscribed_areas/largest_empty_iso_rectangle_2_test.cpp
+++ b/Inscribed_areas/test/Inscribed_areas/largest_empty_iso_rectangle_2_test.cpp
@@ -4,6 +4,7 @@
 #include <CGAL/Largest_empty_iso_rectangle_2.h>
 #include <fstream>
 #include <cassert>
+#include <sstream>
 
 #define MIN_X 0
 #define MIN_Y 0

From 5e9b73897de2160370bc0bed894c57cc5e954866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Thu, 20 Dec 2012 10:31:50 +0100
Subject: [PATCH 7/8] Missing next_prior.hpp include in VectorH*.h

---
 Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h | 2 ++
 Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
index d342be92316..c7c249666f2 100644
--- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
@@ -31,6 +31,8 @@
 #include <CGAL/Kernel_d/Cartesian_const_iterator_d.h>
 #include <CGAL/Handle_for.h>
 
+#include <boost/next_prior.hpp>
+
 namespace CGAL {
 
 template < class R_ >
diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
index 625738d61f5..d0ab75b3f5f 100644
--- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
@@ -29,6 +29,8 @@
 #include <CGAL/array.h>
 #include <CGAL/Kernel_d/Cartesian_const_iterator_d.h>
 
+#include <boost/next_prior.hpp>
+
 namespace CGAL {
 
 template < class R_ >

From ea956821a8911022a7fe2499743bb6f35daa0af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@googlemail.com>
Date: Fri, 21 Dec 2012 09:41:56 +0100
Subject: [PATCH 8/8] Add missing includes in intersection_of_Polyhedra

---
 Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h            | 1 +
 .../CGAL/intersection_of_Polyhedra_3_refinement_visitor.h        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
index 290920b2028..cf4f31b46d8 100644
--- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
+++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3.h
@@ -40,6 +40,7 @@
 #include <CGAL/internal/corefinement/intersection_triangle_segment_3.h>
 #include <CGAL/internal/corefinement/intersection_coplanar_triangles_3.h>
 
+#include <boost/type_traits/is_base_of.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 
 #ifdef CGAL_COREFINEMENT_DEBUG
diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h
index ac34caa752e..b886f8cfbdd 100644
--- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h
+++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h
@@ -32,6 +32,7 @@
 #include <CGAL/Polyhedral_mesh_domain_3.h>
 
 #include <boost/optional.hpp>
+#include <boost/next_prior.hpp>
 
 #include <fstream>
 #include <sstream>