From 1aefb3b0f3fc638d5e6688165539a49d238ebbb5 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Mon, 26 Sep 2016 15:52:59 +0200
Subject: [PATCH] include <CGAL/config.h>, not <CGAL/basic.h>

---
 Circulator/include/CGAL/circulator.h                          | 2 +-
 .../CGAL/internal/Static_filters/Static_filter_error.h        | 2 +-
 .../include/CGAL/internal/Static_filters/Static_filters.h     | 2 +-
 Filtered_kernel/include/CGAL/internal/Static_filters/tools.h  | 2 +-
 Hash_map/include/CGAL/Handle_hash_function.h                  | 2 +-
 Hash_map/include/CGAL/Unique_hash_map.h                       | 2 +-
 Kernel_23/include/CGAL/Aff_transformation_2.h                 | 3 ++-
 Kernel_23/include/CGAL/Bbox_2.h                               | 2 +-
 Kernel_23/include/CGAL/Bbox_3.h                               | 4 +++-
 Kernel_23/include/CGAL/Dimension.h                            | 2 +-
 Kernel_23/include/CGAL/Kernel/Return_base_tag.h               | 2 +-
 Kernel_23/include/CGAL/Kernel/mpl.h                           | 2 +-
 Kernel_23/include/CGAL/Origin.h                               | 2 +-
 Kernel_23/include/CGAL/aff_transformation_tags.h              | 2 +-
 Polygon/include/CGAL/Polygon_2.h                              | 2 +-
 Polygon/include/CGAL/Polygon_2_algorithms.h                   | 2 +-
 Polygon/include/CGAL/Polygon_traits_2.h                       | 2 +-
 STL_Extension/include/CGAL/Compact_container.h                | 3 ++-
 STL_Extension/include/CGAL/Object.h                           | 3 ++-
 STL_Extension/include/CGAL/algorithm.h                        | 4 +++-
 Spatial_sorting/include/CGAL/Hilbert_sort_base.h              | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h          | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h          | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h          | 3 ++-
 Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h          | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h          | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h       | 2 +-
 Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h          | 3 ++-
 Spatial_sorting/include/CGAL/Multiscale_sort.h                | 3 ++-
 Spatial_sorting/include/CGAL/hilbert_sort.h                   | 2 +-
 Spatial_sorting/include/CGAL/spatial_sort.h                   | 2 +-
 Stream_support/include/CGAL/IO/File_header_extended_OFF.h     | 3 ++-
 Stream_support/include/CGAL/IO/File_scanner_OFF.h             | 2 +-
 Stream_support/include/CGAL/IO/binary_file_io.h               | 2 +-
 TDS_2/include/CGAL/Dummy_tds_2.h                              | 2 +-
 TDS_2/include/CGAL/Triangulation_data_structure_2.h           | 2 +-
 TDS_2/include/CGAL/Triangulation_ds_face_base_2.h             | 2 +-
 TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h           | 3 ++-
 Triangulation_2/include/CGAL/Triangulation_face_base_2.h      | 2 +-
 Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h    | 2 +-
 40 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h
index e5187312158..b2f605819d5 100644
--- a/Circulator/include/CGAL/circulator.h
+++ b/Circulator/include/CGAL/circulator.h
@@ -25,7 +25,7 @@
 #ifndef CGAL_CIRCULATOR_H
 #define CGAL_CIRCULATOR_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/circulator_bases.h>
 #include <CGAL/assertions.h>
 #include <CGAL/use.h>
diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h
index c59d6c05f59..477e5de9e97 100644
--- a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h
+++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filter_error.h
@@ -34,7 +34,7 @@
 // - Remove the degree stuff, it's only meant for debug (?).
 // - Add __attribute__((const)) for optimizing ?
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/FPU.h>
 
 #include <boost/math/special_functions/next.hpp>
diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h
index cc347ea16af..e4e0c262b6c 100644
--- a/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h
+++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h
@@ -29,7 +29,7 @@
 // logic and is not plug'n play (requires users providing bounds).
 // If it should be provided again, it should probably be separate.
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <CGAL/Kernel/function_objects.h>
 #include <CGAL/Cartesian/function_objects.h>
diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h b/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h
index 98f0f95569d..02ddbaa89c3 100644
--- a/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h
+++ b/Filtered_kernel/include/CGAL/internal/Static_filters/tools.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_INTERNAL_STATIC_FILTERS_TOOLS_H
 #define CGAL_INTERNAL_STATIC_FILTERS_TOOLS_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/function_objects.h>
 #include <boost/mpl/has_xxx.hpp>
 
diff --git a/Hash_map/include/CGAL/Handle_hash_function.h b/Hash_map/include/CGAL/Handle_hash_function.h
index 675341fa592..61a1790390b 100644
--- a/Hash_map/include/CGAL/Handle_hash_function.h
+++ b/Hash_map/include/CGAL/Handle_hash_function.h
@@ -26,7 +26,7 @@
 #ifndef CGAL_HANDLE_HASH_FUNCTION_H
 #define CGAL_HANDLE_HASH_FUNCTION_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <cstddef>
 
 namespace CGAL {
diff --git a/Hash_map/include/CGAL/Unique_hash_map.h b/Hash_map/include/CGAL/Unique_hash_map.h
index 494ef12d64c..4ca3b645926 100644
--- a/Hash_map/include/CGAL/Unique_hash_map.h
+++ b/Hash_map/include/CGAL/Unique_hash_map.h
@@ -26,7 +26,7 @@
 #ifndef CGAL_UNIQUE_HASH_MAP_H
 #define CGAL_UNIQUE_HASH_MAP_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/memory.h>
 #include <CGAL/Handle_hash_function.h>
 #include <CGAL/Tools/chained_map.h>
diff --git a/Kernel_23/include/CGAL/Aff_transformation_2.h b/Kernel_23/include/CGAL/Aff_transformation_2.h
index 973b859d78d..d8e5a1f41c3 100644
--- a/Kernel_23/include/CGAL/Aff_transformation_2.h
+++ b/Kernel_23/include/CGAL/Aff_transformation_2.h
@@ -24,8 +24,9 @@
 #ifndef CGAL_AFF_TRANSFORMATION_2_H
 #define CGAL_AFF_TRANSFORMATION_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/Dimension.h>
+#include <CGAL/aff_transformation_tags.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/Bbox_2.h b/Kernel_23/include/CGAL/Bbox_2.h
index 8b7bcbf54a7..aa982b91745 100644
--- a/Kernel_23/include/CGAL/Bbox_2.h
+++ b/Kernel_23/include/CGAL/Bbox_2.h
@@ -24,7 +24,7 @@
 #ifndef CGAL_BBOX_2_H
 #define CGAL_BBOX_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/kernel_assertions.h>
 #include <CGAL/IO/io.h>
 #include <CGAL/Dimension.h>
diff --git a/Kernel_23/include/CGAL/Bbox_3.h b/Kernel_23/include/CGAL/Bbox_3.h
index 062dfab0b92..4e1adee6265 100644
--- a/Kernel_23/include/CGAL/Bbox_3.h
+++ b/Kernel_23/include/CGAL/Bbox_3.h
@@ -24,7 +24,9 @@
 #ifndef CGAL_BBOX_3_H
 #define CGAL_BBOX_3_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
+#include <CGAL/kernel_assertions.h>
+#include <CGAL/result_of.h>
 #include <CGAL/IO/io.h>
 #include <CGAL/Dimension.h>
 #include <CGAL/array.h>
diff --git a/Kernel_23/include/CGAL/Dimension.h b/Kernel_23/include/CGAL/Dimension.h
index b0e8a9f2d3a..3980b5dd3a5 100644
--- a/Kernel_23/include/CGAL/Dimension.h
+++ b/Kernel_23/include/CGAL/Dimension.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_DIMENSION_H
 #define CGAL_DIMENSION_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/Kernel_traits.h>
 #include <climits>
 #include <limits>
diff --git a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h
index 9b2d4901307..8156093e52f 100644
--- a/Kernel_23/include/CGAL/Kernel/Return_base_tag.h
+++ b/Kernel_23/include/CGAL/Kernel/Return_base_tag.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_KERNEL_RETURN_BASE_TAG_H
 #define CGAL_KERNEL_RETURN_BASE_TAG_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 // This is a simple tag which is used as additional (first) argument in
 // some kernel functors, to tell them to return the base (rep) class,
diff --git a/Kernel_23/include/CGAL/Kernel/mpl.h b/Kernel_23/include/CGAL/Kernel/mpl.h
index e0b6bcaf5c6..9b6ad2f28a2 100644
--- a/Kernel_23/include/CGAL/Kernel/mpl.h
+++ b/Kernel_23/include/CGAL/Kernel/mpl.h
@@ -25,7 +25,7 @@
 #ifndef CGAL_KERNEL_MPL_H
 #define CGAL_KERNEL_MPL_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 // Some tools for basic template metaprogramming.
 // These bits should move to CGAL/mpl.h in STL_Extension, or taken from Boost.
diff --git a/Kernel_23/include/CGAL/Origin.h b/Kernel_23/include/CGAL/Origin.h
index 78ec935776b..954f491a2e5 100644
--- a/Kernel_23/include/CGAL/Origin.h
+++ b/Kernel_23/include/CGAL/Origin.h
@@ -26,7 +26,7 @@
 #ifndef CGAL_ORIGIN_H
 #define CGAL_ORIGIN_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 namespace CGAL {
 
diff --git a/Kernel_23/include/CGAL/aff_transformation_tags.h b/Kernel_23/include/CGAL/aff_transformation_tags.h
index 96a0041699a..24f94b9f785 100644
--- a/Kernel_23/include/CGAL/aff_transformation_tags.h
+++ b/Kernel_23/include/CGAL/aff_transformation_tags.h
@@ -26,7 +26,7 @@
 #ifndef CGAL_AFF_TRANSFORMATION_TAGS_H
 #define CGAL_AFF_TRANSFORMATION_TAGS_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 namespace CGAL {
 
diff --git a/Polygon/include/CGAL/Polygon_2.h b/Polygon/include/CGAL/Polygon_2.h
index 46615498896..7623916b0a5 100644
--- a/Polygon/include/CGAL/Polygon_2.h
+++ b/Polygon/include/CGAL/Polygon_2.h
@@ -30,7 +30,7 @@
 #ifndef CGAL_POLYGON_2_H
 #define CGAL_POLYGON_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <vector>
 #include <list>
 #include <iterator>
diff --git a/Polygon/include/CGAL/Polygon_2_algorithms.h b/Polygon/include/CGAL/Polygon_2_algorithms.h
index 9cffa529cae..2eb9ec98ca8 100644
--- a/Polygon/include/CGAL/Polygon_2_algorithms.h
+++ b/Polygon/include/CGAL/Polygon_2_algorithms.h
@@ -29,7 +29,7 @@
 #ifndef CGAL_POLYGON_2_ALGORITHMS_H
 #define CGAL_POLYGON_2_ALGORITHMS_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/enum.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Polygon_2/polygon_assertions.h>
diff --git a/Polygon/include/CGAL/Polygon_traits_2.h b/Polygon/include/CGAL/Polygon_traits_2.h
index 06b2e761559..c4f29439521 100644
--- a/Polygon/include/CGAL/Polygon_traits_2.h
+++ b/Polygon/include/CGAL/Polygon_traits_2.h
@@ -27,7 +27,7 @@
 
 // For backward compatibility only.
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 namespace CGAL {
 
diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
index 3152f0480b8..9ff00673647 100644
--- a/STL_Extension/include/CGAL/Compact_container.h
+++ b/STL_Extension/include/CGAL/Compact_container.h
@@ -21,9 +21,10 @@
 #ifndef CGAL_COMPACT_CONTAINER_H
 #define CGAL_COMPACT_CONTAINER_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/Default.h>
 
+#include <cmath>
 #include <iterator>
 #include <algorithm>
 #include <vector>
diff --git a/STL_Extension/include/CGAL/Object.h b/STL_Extension/include/CGAL/Object.h
index e41a41c9dc1..37f06431532 100644
--- a/STL_Extension/include/CGAL/Object.h
+++ b/STL_Extension/include/CGAL/Object.h
@@ -29,7 +29,8 @@
 #ifndef CGAL_OBJECT_H
 #define CGAL_OBJECT_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
+#include <CGAL/assertions.h>
 
 #include <typeinfo>
 
diff --git a/STL_Extension/include/CGAL/algorithm.h b/STL_Extension/include/CGAL/algorithm.h
index b1c467c710a..05c5dfa4461 100644
--- a/STL_Extension/include/CGAL/algorithm.h
+++ b/STL_Extension/include/CGAL/algorithm.h
@@ -27,10 +27,12 @@
 #ifndef CGAL_ALGORITHM_H
 #define CGAL_ALGORITHM_H
 
-#include <CGAL/basic.h>
 #include <CGAL/config.h>
+#include <CGAL/utils.h>
+#include <CGAL/enum.h>
 #include <algorithm>
 #include <iosfwd>
+#include <iostream>
 
 #ifdef CGAL_CFG_NO_CPP0X_NEXT_PREV
 #  include <boost/next_prior.hpp>
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h
index 43c5cd7830d..97920379e8c 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_base.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_base.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_BASE_H
 #define CGAL_HILBERT_SORT_BASE_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <algorithm>
 #include <CGAL/algorithm.h>
 
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h
index 84a93202619..56df1c0cd33 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_MEDIAN_2_H
 #define CGAL_HILBERT_SORT_MEDIAN_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
 #include <CGAL/Hilbert_sort_base.h>
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h
index 10042b6b5ff..551c66db534 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_MEDIAN_3_H
 #define CGAL_HILBERT_SORT_MEDIAN_3_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
 #include <CGAL/Hilbert_sort_base.h>
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h b/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h
index d2cf0a3feb5..ffb0d2bd47a 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_median_d.h
@@ -20,10 +20,11 @@
 #ifndef CGAL_HILBERT_SORT_MEDIAN_d_H
 #define CGAL_HILBERT_SORT_MEDIAN_d_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
 #include <iterator>
+#include <vector>
 #include <CGAL/Hilbert_sort_base.h>
 
 namespace CGAL {
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h
index bc63fefcf2d..56857e77466 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_2.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_MIDDLE_2_H
 #define CGAL_HILBERT_SORT_MIDDLE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
 #include <CGAL/Hilbert_sort_middle_base.h>
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h
index 01a5747b7f7..3e7130620ba 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_3.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_MIDDLE_3_H
 #define CGAL_HILBERT_SORT_MIDDLE_3_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
 #include <CGAL/Hilbert_sort_middle_base.h>
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h
index ebb7ca49630..a459e9391a1 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_base.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_HILBERT_SORT_MIDDLE_BASE_H
 #define CGAL_HILBERT_SORT_MIDDLE_BASE_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <algorithm>
 
 namespace CGAL {
diff --git a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h
index 4cd7b61e074..d17dbebba7f 100644
--- a/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h
+++ b/Spatial_sorting/include/CGAL/Hilbert_sort_middle_d.h
@@ -20,9 +20,10 @@
 #ifndef CGAL_HILBERT_SORT_MIDDLE_d_H
 #define CGAL_HILBERT_SORT_MIDDLE_d_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <functional>
 #include <cstddef>
+#include <vector>
 #include <CGAL/Hilbert_sort_middle_base.h>
 
 namespace CGAL {
diff --git a/Spatial_sorting/include/CGAL/Multiscale_sort.h b/Spatial_sorting/include/CGAL/Multiscale_sort.h
index e0ecd6f5a1f..fd29e986492 100644
--- a/Spatial_sorting/include/CGAL/Multiscale_sort.h
+++ b/Spatial_sorting/include/CGAL/Multiscale_sort.h
@@ -20,7 +20,8 @@
 #ifndef CGAL_MULTISCALE_SORT_H
 #define CGAL_MULTISCALE_SORT_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
+#include <CGAL/assertions.h>
 #include <iterator>
 #include <cstddef>
 
diff --git a/Spatial_sorting/include/CGAL/hilbert_sort.h b/Spatial_sorting/include/CGAL/hilbert_sort.h
index bc9bffa88d5..8de97db721c 100644
--- a/Spatial_sorting/include/CGAL/hilbert_sort.h
+++ b/Spatial_sorting/include/CGAL/hilbert_sort.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_HILBERT_SORT_H
 #define CGAL_HILBERT_SORT_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <CGAL/Hilbert_policy_tags.h>
 #include <CGAL/Hilbert_sort_2.h>
diff --git a/Spatial_sorting/include/CGAL/spatial_sort.h b/Spatial_sorting/include/CGAL/spatial_sort.h
index 5dca2194648..17d814205c0 100644
--- a/Spatial_sorting/include/CGAL/spatial_sort.h
+++ b/Spatial_sorting/include/CGAL/spatial_sort.h
@@ -20,7 +20,7 @@
 #ifndef CGAL_SPATIAL_SORT_H
 #define CGAL_SPATIAL_SORT_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <CGAL/hilbert_sort.h>
 #include <CGAL/Multiscale_sort.h>
diff --git a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h
index 58d4ee49140..9bc7ee72c29 100644
--- a/Stream_support/include/CGAL/IO/File_header_extended_OFF.h
+++ b/Stream_support/include/CGAL/IO/File_header_extended_OFF.h
@@ -25,7 +25,8 @@
 
 #ifndef CGAL_IO_FILE_HEADER_EXTENDED_OFF_H
 #define CGAL_IO_FILE_HEADER_EXTENDED_OFF_H 1
-#include <CGAL/basic.h>
+
+#include <CGAL/config.h>
 
 #include <iostream>
 #include <string>
diff --git a/Stream_support/include/CGAL/IO/File_scanner_OFF.h b/Stream_support/include/CGAL/IO/File_scanner_OFF.h
index f8cb0e62873..88fb3e6ffe1 100644
--- a/Stream_support/include/CGAL/IO/File_scanner_OFF.h
+++ b/Stream_support/include/CGAL/IO/File_scanner_OFF.h
@@ -25,7 +25,7 @@
 #ifndef CGAL_IO_FILE_SCANNER_OFF_H
 #define CGAL_IO_FILE_SCANNER_OFF_H 1
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <cstddef>
 #include <CGAL/IO/binary_file_io.h>
 #include <CGAL/IO/File_header_OFF.h>
diff --git a/Stream_support/include/CGAL/IO/binary_file_io.h b/Stream_support/include/CGAL/IO/binary_file_io.h
index 9a8c3f85ecb..81045c2878a 100644
--- a/Stream_support/include/CGAL/IO/binary_file_io.h
+++ b/Stream_support/include/CGAL/IO/binary_file_io.h
@@ -26,7 +26,7 @@
 #ifndef CGAL_IO_BINARY_FILE_IO_H
 #define CGAL_IO_BINARY_FILE_IO_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <iostream>
 #include <boost/cstdint.hpp>
 
diff --git a/TDS_2/include/CGAL/Dummy_tds_2.h b/TDS_2/include/CGAL/Dummy_tds_2.h
index 07756368164..8cd3fea0f86 100644
--- a/TDS_2/include/CGAL/Dummy_tds_2.h
+++ b/TDS_2/include/CGAL/Dummy_tds_2.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_TRIANGULATION_DUMMY_TDS_2_H
 #define CGAL_TRIANGULATION_DUMMY_TDS_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 namespace CGAL {
 
diff --git a/TDS_2/include/CGAL/Triangulation_data_structure_2.h b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
index 02e3c6b9e1a..9171f0e7fdf 100644
--- a/TDS_2/include/CGAL/Triangulation_data_structure_2.h
+++ b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_TRIANGULATION_DATA_STRUCTURE_2_H
 #define CGAL_TRIANGULATION_DATA_STRUCTURE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <iostream>
 #include <list>
 #include <map>
diff --git a/TDS_2/include/CGAL/Triangulation_ds_face_base_2.h b/TDS_2/include/CGAL/Triangulation_ds_face_base_2.h
index 2204eff553d..5c571670e1a 100644
--- a/TDS_2/include/CGAL/Triangulation_ds_face_base_2.h
+++ b/TDS_2/include/CGAL/Triangulation_ds_face_base_2.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_TRIANGULATION_DS_FACE_BASE_2_H
 #define CGAL_TRIANGULATION_DS_FACE_BASE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_utils_2.h>
 #include <CGAL/Dummy_tds_2.h>
diff --git a/TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h b/TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h
index 338b9e87338..e0de841a252 100644
--- a/TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h
+++ b/TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h
@@ -22,7 +22,8 @@
 #ifndef CGAL_TRIANGULATION_DS_VERTEX_BASE_2_H
 #define CGAL_TRIANGULATION_DS_VERTEX_BASE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
+#include <iostream>
 #include <CGAL/Dummy_tds_2.h>
 
 namespace CGAL {
diff --git a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h
index 93d06b412ce..8bbd9bd9cc7 100644
--- a/Triangulation_2/include/CGAL/Triangulation_face_base_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_face_base_2.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_TRIANGULATION_FACE_BASE_2_H
 #define CGAL_TRIANGULATION_FACE_BASE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_ds_face_base_2.h>
 
diff --git a/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h b/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h
index 15cb74897a8..dce0ef9d9d9 100644
--- a/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h
@@ -21,7 +21,7 @@
 #ifndef CGAL_TRIANGULATION_VERTEX_BASE_2_H
 #define CGAL_TRIANGULATION_VERTEX_BASE_2_H
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 #include <CGAL/Triangulation_ds_vertex_base_2.h>
 
 namespace CGAL {