From 51f5697d3dfd7b9246bdce695d6f2e42e3ebbdc8 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Mon, 26 Sep 2016 14:51:34 +0200
Subject: [PATCH] Add missing #include

---
 .../CGAL/Circular_kernel_2/internal_functions_on_circle_2.h    | 1 +
 .../include/CGAL/Circular_kernel_3/Circular_arc_point_3.h      | 3 +++
 .../internal_function_has_on_spherical_kernel.h                | 1 +
 .../CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h    | 2 ++
 Distance_3/include/CGAL/squared_distance_3_0.h                 | 2 +-
 Generator/include/CGAL/Random_convex_set_traits_2.h            | 1 +
 Generator/include/CGAL/random_convex_hull_in_disc_2.h          | 1 +
 HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h                  | 2 ++
 Hash_map/include/CGAL/Tools/chained_map.h                      | 1 +
 Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h   | 2 +-
 Interpolation/include/CGAL/natural_neighbor_coordinates_3.h    | 1 +
 Intersections_2/include/CGAL/Intersection_traits.h             | 1 +
 Intersections_3/include/CGAL/Intersection_traits_3.h           | 1 +
 .../include/CGAL/Intersections_3/intersection_3_1_impl.h       | 1 +
 Intersections_3/include/CGAL/bbox_intersection_3.h             | 1 +
 Kernel_23/include/CGAL/Aff_transformation_3.h                  | 1 +
 Kernel_23/include/CGAL/Circle_2.h                              | 2 ++
 Kernel_23/include/CGAL/Direction_2.h                           | 3 +++
 Kernel_23/include/CGAL/Direction_3.h                           | 3 +++
 Kernel_23/include/CGAL/Iso_rectangle_2.h                       | 1 +
 Kernel_23/include/CGAL/Line_2.h                                | 1 +
 Kernel_23/include/CGAL/Line_3.h                                | 1 +
 Kernel_23/include/CGAL/Plane_3.h                               | 2 ++
 Kernel_23/include/CGAL/Point_2.h                               | 1 +
 Kernel_23/include/CGAL/Ray_2.h                                 | 3 +++
 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/Triangle_2.h                            | 2 ++
 Kernel_23/include/CGAL/Vector_2.h                              | 3 +++
 Kernel_23/include/CGAL/Vector_3.h                              | 3 +++
 Kernel_23/include/CGAL/enum.h                                  | 1 +
 Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h          | 1 +
 Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h                  | 1 +
 Mesh_2/include/CGAL/Mesh_2/Refine_edges_with_clusters.h        | 2 ++
 .../include/CGAL/Small_side_angle_bisector_decomposition_2.h   | 1 +
 Number_types/include/CGAL/double.h                             | 1 +
 Point_set_processing_3/include/CGAL/IO/read_off_points.h       | 1 +
 Point_set_processing_3/include/CGAL/IO/read_xyz_points.h       | 1 +
 Point_set_processing_3/include/CGAL/IO/write_xyz_points.h      | 1 +
 Spatial_searching/include/CGAL/Euclidean_distance.h            | 2 +-
 .../include/CGAL/Euclidean_distance_sphere_point.h             | 1 +
 .../include/CGAL/Manhattan_distance_iso_box_point.h            | 1 +
 Spatial_sorting/include/CGAL/Hilbert_sort_on_sphere_3.h        | 2 ++
 .../include/CGAL/Straight_skeleton_converter_2.h               | 1 +
 .../include/CGAL/Straight_skeleton_face_base_2.h               | 2 ++
 .../include/CGAL/Straight_skeleton_halfedge_base_2.h           | 2 ++
 .../include/CGAL/Straight_skeleton_vertex_base_2.h             | 1 +
 Surface_mesh/include/CGAL/Surface_mesh/IO.h                    | 1 +
 .../include/CGAL/Surface_mesher/Surface_mesher_edges_level.h   | 1 +
 Triangulation_2/include/CGAL/Delaunay_triangulation_2.h        | 1 +
 Triangulation_2/include/CGAL/Regular_triangulation_2.h         | 1 +
 Triangulation_2/include/CGAL/Weighted_point.h                  | 3 ++-
 .../include/CGAL/predicates/Regular_triangulation_ftC2.h       | 2 ++
 54 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
index 5cc8108b9ad..fdd5c86e2b4 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
@@ -27,6 +27,7 @@
 #define CGAL_CIRCULAR_KERNEL_INTERNAL_FUNCTIONS_ON_CIRCLE_2_H
 
 #include <CGAL/Circular_kernel_2/Intersection_traits.h>
+#include <vector>
 
 namespace CGAL {
 
diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h
index 8cea92f66d1..c9a502e1256 100644
--- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h
+++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/Circular_arc_point_3.h
@@ -33,6 +33,9 @@
 // fixme, devrait
 // appeler fonction de global_functions_on_circular_arcs
 
+#include <vector>
+#include <CGAL/kernel_config.h>
+
 namespace CGAL {
   namespace internal {
 
diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_function_has_on_spherical_kernel.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_function_has_on_spherical_kernel.h
index 66a8e84793c..d1afc551ce0 100644
--- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_function_has_on_spherical_kernel.h
+++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_function_has_on_spherical_kernel.h
@@ -26,6 +26,7 @@
 #define CGAL_SPHERICAL_KERNEL_PREDICATES_HAS_ON_3_H
 
 #include <CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h>
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
   namespace SphericalFunctors {
diff --git a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
index 9bfedfaa182..13d9a509a94 100644
--- a/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
+++ b/Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
@@ -25,6 +25,8 @@
 #define CGAL_SPHERICAL_KERNEL_PREDICATES_ON_SPHERE_3_H
 
 #include <CGAL/Circular_kernel_3/Intersection_traits.h>
+#include <utility>
+#include <vector>
 
 namespace CGAL {
   namespace SphericalFunctors {
diff --git a/Distance_3/include/CGAL/squared_distance_3_0.h b/Distance_3/include/CGAL/squared_distance_3_0.h
index 443c561686b..5227036000e 100644
--- a/Distance_3/include/CGAL/squared_distance_3_0.h
+++ b/Distance_3/include/CGAL/squared_distance_3_0.h
@@ -32,7 +32,7 @@
 
 #include <CGAL/Point_3.h>
 #include <CGAL/Vector_3.h>
-
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
 
diff --git a/Generator/include/CGAL/Random_convex_set_traits_2.h b/Generator/include/CGAL/Random_convex_set_traits_2.h
index 6582e1393a9..94b10d9221f 100644
--- a/Generator/include/CGAL/Random_convex_set_traits_2.h
+++ b/Generator/include/CGAL/Random_convex_set_traits_2.h
@@ -26,6 +26,7 @@
 #define CGAL_RANDOM_CONVEX_SET_TRAITS_2_H 1
 
 #include <CGAL/Point_2.h>
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
 
diff --git a/Generator/include/CGAL/random_convex_hull_in_disc_2.h b/Generator/include/CGAL/random_convex_hull_in_disc_2.h
index 8a62ecc96fb..fe970319236 100644
--- a/Generator/include/CGAL/random_convex_hull_in_disc_2.h
+++ b/Generator/include/CGAL/random_convex_hull_in_disc_2.h
@@ -28,6 +28,7 @@
 #include <CGAL/Polygon_2_algorithms.h>
 #include <CGAL/function_objects.h>
 #include <CGAL/copy_n.h>
+#include <CGAL/number_type_config.h>
 #include <list>
 
 namespace CGAL {
diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h
index 4b3f0150c42..f178415d5d8 100644
--- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h
+++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h
@@ -24,7 +24,9 @@
 
 #ifndef CGAL_HALFEDGEDS_ITERATOR_H
 #define CGAL_HALFEDGEDS_ITERATOR_H 1
+
 #include <CGAL/circulator.h>
+#include <CGAL/tags.h>
 #include <CGAL/use.h>
 
 namespace CGAL {
diff --git a/Hash_map/include/CGAL/Tools/chained_map.h b/Hash_map/include/CGAL/Tools/chained_map.h
index abed099a843..c947c503b22 100644
--- a/Hash_map/include/CGAL/Tools/chained_map.h
+++ b/Hash_map/include/CGAL/Tools/chained_map.h
@@ -25,6 +25,7 @@
 #define CGAL_CHAINED_MAP_H
 
 #include <CGAL/memory.h>
+#include <iostream>
 
 namespace CGAL {
 
diff --git a/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h b/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
index 9597b3ff25a..67a5fb10885 100644
--- a/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
+++ b/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
@@ -23,7 +23,7 @@
 
 #include <CGAL/Origin.h>
 #include <CGAL/tags.h>
-#include <CGAL/number_utils.h>
+#include <CGAL/number_utils_classes.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h>
 #include <CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h>
diff --git a/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
index d05773b6aca..73c26404929 100644
--- a/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
+++ b/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
@@ -27,6 +27,7 @@
 #include <CGAL/iterator.h>
 #include <CGAL/utility.h>
 #include <CGAL/triangulation_assertions.h>
+#include <CGAL/number_utils.h>
 
 #include <iostream> //TO DO : to remove
 
diff --git a/Intersections_2/include/CGAL/Intersection_traits.h b/Intersections_2/include/CGAL/Intersection_traits.h
index 5c7b74ea74f..f22672a88ea 100644
--- a/Intersections_2/include/CGAL/Intersection_traits.h
+++ b/Intersections_2/include/CGAL/Intersection_traits.h
@@ -25,6 +25,7 @@
 #include <CGAL/Object.h>
 #include <CGAL/assertions.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/variant.hpp>
diff --git a/Intersections_3/include/CGAL/Intersection_traits_3.h b/Intersections_3/include/CGAL/Intersection_traits_3.h
index 885e11c152a..3fd85b454d4 100644
--- a/Intersections_3/include/CGAL/Intersection_traits_3.h
+++ b/Intersections_3/include/CGAL/Intersection_traits_3.h
@@ -22,6 +22,7 @@
 #define CGAL_INTERSECTION_TRAITS_3_H
 
 #include <CGAL/Intersection_traits.h>
+#include <vector>
 
 #if !(CGAL_INTERSECTION_VERSION < 2)
 
diff --git a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
index 7a298ef7492..cc20b947899 100644
--- a/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
+++ b/Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
@@ -27,6 +27,7 @@
 #include <CGAL/wmult.h>
 #include <boost/next_prior.hpp>
 #include <CGAL/Intersection_traits_3.h>
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
 
diff --git a/Intersections_3/include/CGAL/bbox_intersection_3.h b/Intersections_3/include/CGAL/bbox_intersection_3.h
index 91b5126ab58..83630b93afa 100644
--- a/Intersections_3/include/CGAL/bbox_intersection_3.h
+++ b/Intersections_3/include/CGAL/bbox_intersection_3.h
@@ -27,6 +27,7 @@
 #define CGAL_BBOX_INTERSECTION_3_H
 
 #include <CGAL/Bbox_3.h>
+#include <CGAL/Object.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Aff_transformation_3.h b/Kernel_23/include/CGAL/Aff_transformation_3.h
index e8f3ddd4fc4..4bd67252138 100644
--- a/Kernel_23/include/CGAL/Aff_transformation_3.h
+++ b/Kernel_23/include/CGAL/Aff_transformation_3.h
@@ -25,6 +25,7 @@
 #define CGAL_AFF_TRANSFORMATION_3_H
 
 #include <CGAL/Dimension.h>
+#include <CGAL/aff_transformation_tags.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Circle_2.h b/Kernel_23/include/CGAL/Circle_2.h
index b12ccb6feef..a3d67895e02 100644
--- a/Kernel_23/include/CGAL/Circle_2.h
+++ b/Kernel_23/include/CGAL/Circle_2.h
@@ -31,6 +31,8 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/number_utils.h>
+#include <CGAL/result_of.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Direction_2.h b/Kernel_23/include/CGAL/Direction_2.h
index bca7fa567d2..2c693b0a2f8 100644
--- a/Kernel_23/include/CGAL/Direction_2.h
+++ b/Kernel_23/include/CGAL/Direction_2.h
@@ -27,9 +27,12 @@
 
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
+#include <CGAL/kernel_assertions.h>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Direction_3.h b/Kernel_23/include/CGAL/Direction_3.h
index eff1991b9b4..a03c5116b3f 100644
--- a/Kernel_23/include/CGAL/Direction_3.h
+++ b/Kernel_23/include/CGAL/Direction_3.h
@@ -28,8 +28,11 @@
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
+#include <CGAL/kernel_assertions.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Iso_rectangle_2.h b/Kernel_23/include/CGAL/Iso_rectangle_2.h
index 9df885f0a3a..2890b371b5b 100644
--- a/Kernel_23/include/CGAL/Iso_rectangle_2.h
+++ b/Kernel_23/include/CGAL/Iso_rectangle_2.h
@@ -30,6 +30,7 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Line_2.h b/Kernel_23/include/CGAL/Line_2.h
index 8f83060b6a7..dc96015b833 100644
--- a/Kernel_23/include/CGAL/Line_2.h
+++ b/Kernel_23/include/CGAL/Line_2.h
@@ -29,6 +29,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Line_3.h b/Kernel_23/include/CGAL/Line_3.h
index 47696e5a9ab..7898f085058 100644
--- a/Kernel_23/include/CGAL/Line_3.h
+++ b/Kernel_23/include/CGAL/Line_3.h
@@ -30,6 +30,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Plane_3.h b/Kernel_23/include/CGAL/Plane_3.h
index 448474c5cdf..337c910bf5d 100644
--- a/Kernel_23/include/CGAL/Plane_3.h
+++ b/Kernel_23/include/CGAL/Plane_3.h
@@ -29,6 +29,8 @@
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Point_2.h b/Kernel_23/include/CGAL/Point_2.h
index 6c1ac87105b..f6d14d1708f 100644
--- a/Kernel_23/include/CGAL/Point_2.h
+++ b/Kernel_23/include/CGAL/Point_2.h
@@ -32,6 +32,7 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Ray_2.h b/Kernel_23/include/CGAL/Ray_2.h
index b5bb85fd726..26bcfeea985 100644
--- a/Kernel_23/include/CGAL/Ray_2.h
+++ b/Kernel_23/include/CGAL/Ray_2.h
@@ -28,8 +28,11 @@
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
+#include <CGAL/kernel_assertions.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Ray_3.h b/Kernel_23/include/CGAL/Ray_3.h
index d63d3ec07b7..ff944a32aad 100644
--- a/Kernel_23/include/CGAL/Ray_3.h
+++ b/Kernel_23/include/CGAL/Ray_3.h
@@ -30,6 +30,8 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Segment_2.h b/Kernel_23/include/CGAL/Segment_2.h
index 92f6c2a8b58..1949ecca697 100644
--- a/Kernel_23/include/CGAL/Segment_2.h
+++ b/Kernel_23/include/CGAL/Segment_2.h
@@ -30,6 +30,8 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/kernel_config.h>
+#include <CGAL/result_of.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Segment_3.h b/Kernel_23/include/CGAL/Segment_3.h
index 11c3a76cbce..aca753cc837 100644
--- a/Kernel_23/include/CGAL/Segment_3.h
+++ b/Kernel_23/include/CGAL/Segment_3.h
@@ -28,6 +28,8 @@
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
+#include <CGAL/kernel_assertions.h>
+#include <CGAL/kernel_config.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 75bcedaaa26..03894a28ccb 100644
--- a/Kernel_23/include/CGAL/Triangle_2.h
+++ b/Kernel_23/include/CGAL/Triangle_2.h
@@ -30,6 +30,8 @@
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Vector_2.h b/Kernel_23/include/CGAL/Vector_2.h
index 23e3b6edae5..89714e6fc74 100644
--- a/Kernel_23/include/CGAL/Vector_2.h
+++ b/Kernel_23/include/CGAL/Vector_2.h
@@ -30,8 +30,11 @@
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
+#include <CGAL/kernel_assertions.h>
 #include <CGAL/representation_tags.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Vector_3.h b/Kernel_23/include/CGAL/Vector_3.h
index 5f18d0493af..2fbdd2789de 100644
--- a/Kernel_23/include/CGAL/Vector_3.h
+++ b/Kernel_23/include/CGAL/Vector_3.h
@@ -28,10 +28,13 @@
 #include <CGAL/Origin.h>
 #include <CGAL/Kernel/mpl.h>
 #include <CGAL/representation_tags.h>
+#include <CGAL/kernel_assertions.h>
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 #include <CGAL/Kernel/Return_base_tag.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/result_of.h>
+#include <CGAL/IO/io.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/enum.h b/Kernel_23/include/CGAL/enum.h
index 22f7737a550..9452328ca20 100644
--- a/Kernel_23/include/CGAL/enum.h
+++ b/Kernel_23/include/CGAL/enum.h
@@ -27,6 +27,7 @@
 
 #include <CGAL/config.h>
 #include <CGAL/Kernel/Same_uncertainty.h>
+#include <CGAL/Origin.h>
 
 // If you add/change one type here, please update Is_a_predicate.h as well.
 
diff --git a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h
index 408ba35d7b7..3133541df1e 100644
--- a/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h
+++ b/Kernel_d/include/CGAL/Kernel_d/Aff_transformation_d.h
@@ -27,6 +27,7 @@
 #include <CGAL/Dimension.h>
 #include <CGAL/Kernel_d/Vector_d.h>
 #include <CGAL/Kernel_d/Direction_d.h>
+#include <CGAL/aff_transformation_tags.h>
 
 namespace CGAL {
 
diff --git a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h
index 8d6e76a7b2b..fc10e4c2006 100644
--- a/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h
+++ b/Kernel_d/include/CGAL/Kernel_d/Hyperplane_d.h
@@ -28,6 +28,7 @@
 #include <CGAL/Dimension.h>
 #include <CGAL/Kernel_d/Point_d.h>
 #include <CGAL/Kernel_d/Direction_d.h>
+#include <CGAL/enum.h>
 
 namespace CGAL {
 
diff --git a/Mesh_2/include/CGAL/Mesh_2/Refine_edges_with_clusters.h b/Mesh_2/include/CGAL/Mesh_2/Refine_edges_with_clusters.h
index 8697399f4cd..0c617283176 100644
--- a/Mesh_2/include/CGAL/Mesh_2/Refine_edges_with_clusters.h
+++ b/Mesh_2/include/CGAL/Mesh_2/Refine_edges_with_clusters.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/Mesh_2/Refine_edges.h>
 #include <CGAL/Mesh_2/Clusters.h>
+#include <CGAL/utils.h>
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
 
diff --git a/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h b/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h
index 4fbabb1f7e7..79dd00027a4 100644
--- a/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h
+++ b/Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h
@@ -20,6 +20,7 @@
 #define CGAL_SMALL_SIDE_ANGLE_BISECTOR_DECOMPOSITION_2_H
 
 #include <CGAL/Polygon_2.h>
+#include <CGAL/number_utils.h>
 #include <vector>
 #include <list>
 
diff --git a/Number_types/include/CGAL/double.h b/Number_types/include/CGAL/double.h
index ff2ba81954a..6f7339d89ff 100644
--- a/Number_types/include/CGAL/double.h
+++ b/Number_types/include/CGAL/double.h
@@ -28,6 +28,7 @@
 #include <CGAL/utils.h>
 #include <CGAL/utils_classes.h>
 #include <CGAL/number_utils.h>
+#include <CGAL/Algebraic_structure_traits.h>
 #include <utility>
 #include <cmath>
 #include <math.h> // for nextafter
diff --git a/Point_set_processing_3/include/CGAL/IO/read_off_points.h b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
index 3de0ff1fb8c..90da4c917d4 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
@@ -23,6 +23,7 @@
 #include <CGAL/IO/io.h>
 #include <CGAL/property_map.h>
 #include <CGAL/value_type_traits.h>
+#include <CGAL/Origin.h>
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Kernel_traits.h>
 
diff --git a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
index 10da96cd802..dbe7c58e891 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
@@ -24,6 +24,7 @@
 #include <CGAL/value_type_traits.h>
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Origin.h>
+#include <CGAL/Kernel_traits.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
index 4134d8b88e0..4fbc1f2e813 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
@@ -22,6 +22,7 @@
 
 #include <CGAL/property_map.h>
 #include <CGAL/point_set_processing_assertions.h>
+#include <CGAL/Kernel_traits.h>
 
 #include <iostream>
 #include <iterator>
diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h
index d6d952d85dd..00e0ad8cfb7 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance.h
@@ -25,7 +25,7 @@
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/number_utils.h>
 #include <CGAL/internal/Get_dimension_tag.h>
-
+#include <vector>
 
 namespace CGAL {
 
diff --git a/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h b/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h
index eea140821b0..c5511d7a932 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h
@@ -25,6 +25,7 @@
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/number_utils.h>
 #include <CGAL/internal/Get_dimension_tag.h>
+#include <vector>
 
 namespace CGAL {
 
diff --git a/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h b/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
index 9ead32a8d5f..8c54a614f04 100644
--- a/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
+++ b/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
@@ -25,6 +25,7 @@
 #include <CGAL/result_of.h>
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/internal/Get_dimension_tag.h>
+#include <vector>
 
 namespace CGAL {
 
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_on_sphere_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_on_sphere_3.h
index b472d27dba7..e26d147b4f7 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_on_sphere_3.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_on_sphere_3.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/Hilbert_sort_2.h>
 #include <CGAL/internal/Transform_coordinates_traits_3.h>
+#include <CGAL/number_utils.h>
+#include <CGAL/double.h>
 #include <algorithm>
 #include <vector>
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
index cd95bf9bd48..254869b10b3 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_converter_2.h
@@ -20,6 +20,7 @@
 #define CGAL_STRAIGHT_SKELETON_CONVERTER_2_H 1
 
 #include <boost/shared_ptr.hpp>
+#include <CGAL/Cartesian_converter.h>
 
 #include <CGAL/Straight_skeleton_2.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
index 0e4b2833483..a3bb94bcb9d 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_face_base_2.h
@@ -19,6 +19,8 @@
 #ifndef CGAL_STRAIGHT_SKELETON_FACE_BASE_2_H
 #define CGAL_STRAIGHT_SKELETON_FACE_BASE_2_H 1
 
+#include <CGAL/tags.h>
+#include <CGAL/Kernel_traits.h>
 
 namespace CGAL {
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
index b7482d06919..b0d1a6fc85b 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_halfedge_base_2.h
@@ -19,6 +19,8 @@
 #ifndef CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H
 #define CGAL_STRAIGHT_SKELETON_HALFEDGE_BASE_2_H 1
 
+#include <CGAL/tags.h>
+#include <CGAL/enum.h>
 
 namespace CGAL {
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
index 41aa6b7f2aa..a7f0c2cefad 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
@@ -19,6 +19,7 @@
 #ifndef CGAL_STRAIGHT_SKELETON_VERTEX_BASE_2_H
 #define CGAL_STRAIGHT_SKELETON_VERTEX_BASE_2_H 1
 
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_aux.h>
 #include <CGAL/Straight_skeleton_halfedge_base_2.h>
 #include <CGAL/circulator.h>
 #include <CGAL/Origin.h>
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO.h b/Surface_mesh/include/CGAL/Surface_mesh/IO.h
index 9a65452e5e5..a35d4f71e9a 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO.h
@@ -32,6 +32,7 @@
 #include <CGAL/use.h>
 #include <CGAL/Surface_mesh/Surface_mesh.h>
 #include <CGAL/Surface_mesh/Properties.h>
+#include <CGAL/Kernel_traits.h>
 
 //=============================================================================
 
diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h
index 3223bf9dc8e..e36e0986e52 100644
--- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h
+++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h
@@ -29,6 +29,7 @@
 #include <CGAL/iterator.h> // for CGAL::inserter
 #include <CGAL/circulator.h> // for CGAL::Circulator_from_container<C>
 #include <CGAL/use.h>
+#include <CGAL/number_utils.h> // for CGAL::sqrt
 
 #include <sstream>
 #include <set>
diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
index 7acc27d7731..e7e68950048 100644
--- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
@@ -27,6 +27,7 @@
 
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/iterator.h>
+#include <CGAL/Object.h>
 
 #ifndef CGAL_TRIANGULATION_2_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
 #include <CGAL/Spatial_sort_traits_adapter_2.h>
diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h
index 4ecaeb9115e..86b2e2199f3 100644
--- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h
@@ -25,6 +25,7 @@
 #include <CGAL/Regular_triangulation_face_base_2.h>
 #include <CGAL/Regular_triangulation_vertex_base_2.h>
 #include <CGAL/utility.h>
+#include <CGAL/Object.h>
 
 #include <boost/bind.hpp>
 
diff --git a/Triangulation_2/include/CGAL/Weighted_point.h b/Triangulation_2/include/CGAL/Weighted_point.h
index 200b374a0aa..9f449d72a4e 100644
--- a/Triangulation_2/include/CGAL/Weighted_point.h
+++ b/Triangulation_2/include/CGAL/Weighted_point.h
@@ -22,9 +22,10 @@
 #ifndef CGAL_WEIGHTED_POINT_H
 #define CGAL_WEIGHTED_POINT_H
 
-#include <iostream>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/IO/io.h>
+#include <iostream>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/and.hpp>
diff --git a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h
index 54a70c6d13e..0bde1702333 100644
--- a/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h
+++ b/Triangulation_2/include/CGAL/predicates/Regular_triangulation_ftC2.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_REGULAR_TRIANGULATION_FTC2_H
 #define CGAL_REGULAR_TRIANGULATION_FTC2_H
 
+#include <CGAL/number_utils.h>
+
 // This file contains the low level cartesian predicates
 // used by the 2D regular triangulation.