diff --git a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies
index 09b948be599a..3778306dcb9c 100644
--- a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies
+++ b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies
@@ -1,9 +1,6 @@
 Algebraic_foundations
-Arithmetic_kernel
 BGL
 Barycentric_coordinates_2
-CGAL_Core
-Cartesian_kernel
 Circulator
 Distance_2
 Distance_3
diff --git a/Basic_viewer/include/CGAL/Buffer_for_vao.h b/Basic_viewer/include/CGAL/Buffer_for_vao.h
index d7c9619619ad..6352236acf4e 100644
--- a/Basic_viewer/include/CGAL/Buffer_for_vao.h
+++ b/Basic_viewer/include/CGAL/Buffer_for_vao.h
@@ -15,6 +15,7 @@
 
 #include <CGAL/license/GraphicsView.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Projection_traits_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
 #include <CGAL/Triangulation_face_base_with_info_2.h>
diff --git a/Partition_2/package_info/Partition_2/dependencies b/Partition_2/package_info/Partition_2/dependencies
index 2d383a64c885..6ff0abd837d2 100644
--- a/Partition_2/package_info/Partition_2/dependencies
+++ b/Partition_2/package_info/Partition_2/dependencies
@@ -1,7 +1,4 @@
 Algebraic_foundations
-Arithmetic_kernel
-CGAL_Core
-Cartesian_kernel
 Circulator
 Convex_hull_2
 Distance_2
diff --git a/Polygon_repair/package_info/Polygon_repair/dependencies b/Polygon_repair/package_info/Polygon_repair/dependencies
index 7e57c5ca79cd..8231db1007e1 100644
--- a/Polygon_repair/package_info/Polygon_repair/dependencies
+++ b/Polygon_repair/package_info/Polygon_repair/dependencies
@@ -1,7 +1,4 @@
 Algebraic_foundations
-Arithmetic_kernel
-Cartesian_kernel
-CGAL_Core
 Circulator
 Distance_2
 Distance_3
diff --git a/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies
index b1e47ef32221..117856fa8050 100644
--- a/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies
+++ b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies
@@ -1,20 +1,15 @@
 Algebraic_foundations
-Arithmetic_kernel
 BGL
-CGAL_Core
-Cartesian_kernel
 Circulator
 Distance_2
 Distance_3
 Filtered_kernel
 Hash_map
-Homogeneous_kernel
 Installation
 Intersections_2
 Intersections_3
 Interval_support
 Kernel_23
-Kernel_d
 Modular_arithmetic
 Number_types
 Polygon
diff --git a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies
index d2906b564b4b..41240d76f489 100644
--- a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies
+++ b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies
@@ -1,8 +1,6 @@
 Algebraic_foundations
-Arithmetic_kernel
 BGL
 Box_intersection_d
-CGAL_Core
 Cartesian_kernel
 Circulator
 Distance_2
diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
index 90d6448f0e5b..d77322d74378 100644
--- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
@@ -30,9 +30,8 @@
 #include <CGAL/intersections.h>
 #include <CGAL/squared_distance_2.h>
 #include <CGAL/tags.h>
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Exact_rational.h>
 #include <CGAL/Kernel_23/internal/Has_boolean_tags.h>
+#include <CGAL/NT_converter.h>
 
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/iterator/filter_iterator.hpp>
diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
index c3cd6d187dec..74f12fa315eb 100644
--- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
@@ -24,16 +24,17 @@
 #include <CGAL/Triangulation_2/internal/CTP2_subconstraint_graph.h>
 #include <boost/tuple/tuple.hpp>
 
-#include <CGAL/Default.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Triangulation_2/insert_constraints.h>
+
 #include <boost/container/flat_set.hpp>
 
 #include <type_traits>
 
 namespace CGAL {
 
+ class Epick;
+
 // Comparison functor that compares two Vertex_handle.
 // Used as 'Compare' functor for the constraint hierarchy.
 template < class Tr >
@@ -55,27 +56,11 @@ class Pct2_vertex_handle_less_xy {
 // Tr the base triangulation class
 // Tr has to be Constrained or Constrained_Delaunay with Constrained_triangulation_plus_vertex_base
 
-template < class Tr_ = Default >
+template < class Tr_>
 class Constrained_triangulation_plus_2
-  : public
-Default::Get< Tr_, Constrained_Delaunay_triangulation_2<
-                      Exact_predicates_inexact_constructions_kernel
-                      , Triangulation_data_structure_2<
-                            Triangulation_vertex_base_2<Exact_predicates_inexact_constructions_kernel>
-                          , Constrained_triangulation_face_base_2<Exact_predicates_inexact_constructions_kernel>
-                          >
-                      , CGAL::Exact_predicates_tag
-                      > >::type
+  : public Tr_
 {
-  typedef typename
-  Default::Get< Tr_, Constrained_Delaunay_triangulation_2<
-                  Exact_predicates_inexact_constructions_kernel
-                  , Triangulation_data_structure_2<
-                        Triangulation_vertex_base_2<Exact_predicates_inexact_constructions_kernel>
-                      , Constrained_triangulation_face_base_2<Exact_predicates_inexact_constructions_kernel>
-                      >
-                  , CGAL::Exact_predicates_tag
-                  > >::type Tr;
+  typedef Tr_ Tr;
 
 
   template<class CDT>
diff --git a/Triangulation_2/test/Triangulation_2/issue_3447.cpp b/Triangulation_2/test/Triangulation_2/issue_3447.cpp
index e3b6e4218366..db05aa0e5467 100644
--- a/Triangulation_2/test/Triangulation_2/issue_3447.cpp
+++ b/Triangulation_2/test/Triangulation_2/issue_3447.cpp
@@ -1,7 +1,8 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
+
 typedef CGAL::Triangulation_vertex_base_2<K> Vb;
 typedef CGAL::Constrained_triangulation_face_base_2<K> Fb;
 typedef CGAL::Triangulation_data_structure_2<Vb, Fb>           TDS;
diff --git a/Triangulation_2/test/Triangulation_2/issue_5080.cpp b/Triangulation_2/test/Triangulation_2/issue_5080.cpp
index 73a5e1481312..aedb90c8f2eb 100644
--- a/Triangulation_2/test/Triangulation_2/issue_5080.cpp
+++ b/Triangulation_2/test/Triangulation_2/issue_5080.cpp
@@ -6,6 +6,8 @@
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 template<typename VertexInfoType, typename FaceInfoType, typename Itag>
 struct TriangulationTraitsTemplate_2 {
 
diff --git a/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp b/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp
index f9143da6ff8f..80d1760c70fb 100644
--- a/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp
@@ -1,7 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 #include <CGAL/Projection_traits_xy_3.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <cassert>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel EIK;
diff --git a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp
index 1f6638de00e3..e40d4b018759 100644
--- a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp
@@ -1,9 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Projection_traits_3.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 
diff --git a/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp b/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp
index 3c2bcf48f3ff..df7a23fdf274 100644
--- a/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp
@@ -1,8 +1,8 @@
 #define CGAL_CDT_2_DEBUG_INTERSECTIONS 1
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 #include <CGAL/Base_with_time_stamp.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <iostream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel EPIC;
diff --git a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp
index a1852062240c..51b0c811581b 100644
--- a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp
@@ -22,8 +22,8 @@
 
 #include <CGAL/_test_types.h>
 
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/_test_cls_const_Del_triangulation_2.h>
 
 // Explicit instantiation of the whole class :
diff --git a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp
index 89dd4e73888f..f8ec1403614d 100644
--- a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp
@@ -26,9 +26,10 @@
 #define CGAL_NO_CDT_2_WARNING
 
 #include <CGAL/_test_types.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Constrained_triangulation_2.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <CGAL/_test_cls_constrained_triangulation_2.h>
 
 static_assert(!CGAL::internal::can_construct_almost_exact_intersection_v<EK>,
diff --git a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp
index d86f08e55b87..a8b5327f6200 100644
--- a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp
@@ -1,6 +1,7 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <vector>
 #include <cassert>
 
diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp
index f82cb7a23ecb..a2dd86682a65 100644
--- a/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp
@@ -19,13 +19,15 @@
 //
 // coordinator   : INRIA Sophia-Antipolis
 // ============================================================================
-#include <iostream>
-
-#include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_hierarchy_2.h>
+
+#include <CGAL/Simple_cartesian.h>
+
+#include <iostream>
+
 #include <CGAL/_test_cls_delaunay_hierarchy_2.h>
 
 typedef double                      Coord_type;
diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp
index f58585c4810c..59e2943738df 100644
--- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp
@@ -32,9 +32,10 @@
 #include <iostream>
 
 #include <CGAL/_test_types.h>
-#include <CGAL/Cartesian.h>
+
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/Delaunay_triangulation_2.h>
+#include <CGAL/Cartesian.h>
 
 #include <CGAL/_test_traits.h>
 #include <CGAL/_test_cls_delaunay_triangulation_2.h>
diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp
index d539afe3ab63..6df29ee3872c 100644
--- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp
@@ -1,12 +1,14 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Projection_traits_xy_3.h>
 #include <CGAL/Projection_traits_yz_3.h>
 #include <CGAL/Projection_traits_xz_3.h>
 #include <CGAL/Delaunay_triangulation_2.h>
-#include <iostream>
-
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
+#include <iostream>
+
 typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
 typedef CGAL::Projection_traits_xy_3<Kernel>   Gt_xy;
 typedef CGAL::Projection_traits_yz_3<Kernel>   Gt_yz;
diff --git a/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp b/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp
index 84a8465162d6..d232cfe109ff 100644
--- a/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp
@@ -1,9 +1,11 @@
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <vector>
 
diff --git a/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp
index 4b5be564167c..177d62ac3088 100644
--- a/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp
@@ -24,10 +24,10 @@
 #include <CGAL/_test_types.h>
 
 #include <CGAL/Regular_triangulation_2.h>
-#include <CGAL/_test_cls_regular_triangulation_2.h>
 
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
+#include <CGAL/_test_cls_regular_triangulation_2.h>
 
 typedef CGAL::Exact_predicates_exact_constructions_kernel  RGt;
 
diff --git a/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp b/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp
index c3e0a5a081c7..cdc0445c0d7e 100644
--- a/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp
+++ b/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp
@@ -1,6 +1,8 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <boost/iterator/zip_iterator.hpp>
 #include <vector>
 #include <cassert>
diff --git a/Visibility_2/package_info/Visibility_2/dependencies b/Visibility_2/package_info/Visibility_2/dependencies
index 2199ba4f76d3..7acbd2503036 100644
--- a/Visibility_2/package_info/Visibility_2/dependencies
+++ b/Visibility_2/package_info/Visibility_2/dependencies
@@ -1,8 +1,5 @@
 Algebraic_foundations
-Arithmetic_kernel
 Arrangement_on_surface_2
-CGAL_Core
-Cartesian_kernel
 Circulator
 Distance_2
 Distance_3