diff --git a/Convex_decomposition_3/test/Convex_decomposition_3/check_decomposition.cpp b/Convex_decomposition_3/test/Convex_decomposition_3/check_decomposition.cpp
index 4599d01197f..1cc8fbbc0bb 100644
--- a/Convex_decomposition_3/test/Convex_decomposition_3/check_decomposition.cpp
+++ b/Convex_decomposition_3/test/Convex_decomposition_3/check_decomposition.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include<CGAL/Homogeneous.h>
 #include<CGAL/Nef_polyhedron_3.h>
 #include<CGAL/IO/Nef_polyhedron_iostream_3.h>
@@ -8,7 +8,7 @@
 #include<CGAL/Nef_3/SNC_indexed_items.h>
 #include<fstream>
 
-typedef CGAL::Arithmetic_kernel::Integer  RT;
+typedef CGAL::Exact_integer  RT;
 typedef CGAL::Homogeneous<RT> Kernel;
 typedef CGAL::Nef_polyhedron_3<Kernel> Nef_polyhedron_3;
 //typedef CGAL::Nef_polyhedron_3<Kernel, CGAL::SNC_indexed_items> Nef_polyhedron_3;
diff --git a/Convex_decomposition_3/test/Convex_decomposition_3/edge_sorter.cpp b/Convex_decomposition_3/test/Convex_decomposition_3/edge_sorter.cpp
index 002811b8645..f2904a748ca 100644
--- a/Convex_decomposition_3/test/Convex_decomposition_3/edge_sorter.cpp
+++ b/Convex_decomposition_3/test/Convex_decomposition_3/edge_sorter.cpp
@@ -1,8 +1,8 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include<CGAL/Homogeneous.h>
 #include<CGAL/Convex_decomposition_3/Edge_sorter.h>
 
-typedef CGAL::Arithmetic_kernel::Integer  RT;
+typedef CGAL::Exact_integer  RT;
 typedef CGAL::Homogeneous<RT> Kernel;
 typedef Kernel::Point_3 Point_3;
 typedef Kernel::FT FT;
diff --git a/Convex_decomposition_3/test/Convex_decomposition_3/reflex_sedge.cpp b/Convex_decomposition_3/test/Convex_decomposition_3/reflex_sedge.cpp
index ca81562aa69..0ea54bdd25f 100644
--- a/Convex_decomposition_3/test/Convex_decomposition_3/reflex_sedge.cpp
+++ b/Convex_decomposition_3/test/Convex_decomposition_3/reflex_sedge.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Nef_S2/Sphere_point.h>
 #include <CGAL/Nef_S2/Sphere_circle.h>
@@ -60,7 +60,7 @@ int main()
 
   //  CGAL_NEF_SETDTHREAD(239);
 
-  typedef CGAL::Arithmetic_kernel::Integer  RT;
+  typedef CGAL::Exact_integer  RT;
   typedef CGAL::Homogeneous<RT> Kernel;
   typedef Test_SNC<Kernel> SNC;
   typedef SNC::Point_3 Point_3;
diff --git a/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp b/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp
index e97b539a1b8..45472749633 100644
--- a/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp
+++ b/Convex_hull_3/test/Convex_hull_3/quick_hull_default_traits.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_rational.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
@@ -9,13 +9,13 @@
 #include <boost/type_traits.hpp>
 
 
-typedef CGAL::Arithmetic_kernel::Rational Precise_rational;
+typedef CGAL::Exact_rational Exact_rational;
 
 
 typedef CGAL::Exact_predicates_exact_constructions_kernel   EPEC;
 typedef CGAL::Exact_predicates_inexact_constructions_kernel EPIC;
 typedef CGAL::Simple_cartesian<double>                      SCD;
-typedef CGAL::Simple_cartesian<Precise_rational>            SCR;
+typedef CGAL::Simple_cartesian<Exact_rational>            SCR;
 
 using namespace CGAL::internal::Convex_hull_3;
 
diff --git a/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp b/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp
index 86738076da7..1ace68497a6 100644
--- a/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp
+++ b/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_rational.h>
 #include <CGAL/Cartesian.h>
 
 #include <fstream>
@@ -10,8 +10,8 @@
 #include <cassert>
 
 
-typedef CGAL::Arithmetic_kernel::Rational Precise_rational;
-typedef CGAL::Cartesian< Precise_rational >     R;
+typedef CGAL::Exact_rational Exact_rational;
+typedef CGAL::Cartesian< Exact_rational >     R;
 typedef CGAL::Convex_hull_traits_3<R>           Traits;
 typedef Traits::Polyhedron_3                    Polyhedron_3;
 
@@ -22,7 +22,7 @@ typedef R::Triangle_3				Triangle_3;
 typedef R::Plane_3   				Plane_3;
 
 
-typedef CGAL::Creator_uniform_3<Precise_rational, Point_3>    Creator;
+typedef CGAL::Creator_uniform_3<Exact_rational, Point_3>    Creator;
 typedef CGAL::Random_points_in_sphere_3<Point_3,Creator>      Generator;
 
 void test_coplanar_xy()
diff --git a/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp b/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp
index 99c7b1e775d..b981080e97b 100644
--- a/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp
+++ b/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_rational.h>
 #include <CGAL/Cartesian.h>
 
 #include <CGAL/Convex_hull_traits_3.h>
@@ -8,7 +8,7 @@
 #include <vector>
 #include <cassert>
 
-typedef CGAL::Arithmetic_kernel::Rational             NT;
+typedef CGAL::Exact_rational                          NT;
 typedef CGAL::Cartesian<NT>                           K;
 typedef CGAL::Convex_hull_traits_3<K>                 Traits;
 typedef Traits::Polyhedron_3                          Polyhedron_3;
diff --git a/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp b/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp
index 2fcc7dec462..eefecd03070 100644
--- a/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp
+++ b/Kernel_d/test/Kernel_d/Linear_algebra-test.cpp
@@ -8,12 +8,13 @@
 #define VEC_DIM 10
 #define MAT_DIM 10
 
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
+#include <CGAL/Exact_rational.h>
 
 #if defined( CGAL_USE_LEDA) || defined ( CGAL_USE_GMP )
 
-typedef CGAL::Arithmetic_kernel::Integer RT;
-typedef CGAL::Arithmetic_kernel::Rational FT;
+typedef CGAL::Exact_integer RT;
+typedef CGAL::Exact_rational FT;
 
 #else
 
diff --git a/Minkowski_sum_3/test/Minkowski_sum_3/gaussian_map_conversion.cpp b/Minkowski_sum_3/test/Minkowski_sum_3/gaussian_map_conversion.cpp
index 11456f1618f..062bd60f013 100644
--- a/Minkowski_sum_3/test/Minkowski_sum_3/gaussian_map_conversion.cpp
+++ b/Minkowski_sum_3/test/Minkowski_sum_3/gaussian_map_conversion.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include<CGAL/Homogeneous.h>
 #include<CGAL/Nef_polyhedron_3.h>
 #include<CGAL/IO/Nef_polyhedron_iostream_3.h>
@@ -11,7 +11,7 @@
 #include<CGAL/Minkowski_sum_3/Gaussian_map_to_nef_3.h>
 #include<fstream>
 
-typedef CGAL::Arithmetic_kernel::Integer RT;
+typedef CGAL::Exact_integer RT;
 typedef CGAL::Homogeneous<RT> Kernel;
 typedef CGAL::Nef_polyhedron_3<Kernel, CGAL::SNC_indexed_items> Nef_polyhedron_3;
 typedef CGAL::Polyhedron_3<Kernel> Polyhedron_3;
diff --git a/Nef_3/include/CGAL/OFF_to_nef_3.h b/Nef_3/include/CGAL/OFF_to_nef_3.h
index 37e8340d8e3..223ce107828 100644
--- a/Nef_3/include/CGAL/OFF_to_nef_3.h
+++ b/Nef_3/include/CGAL/OFF_to_nef_3.h
@@ -31,7 +31,8 @@
 #define CGAL_NUMBER_TYPE_CONVERTER_NEF_3_H
 
 #include<sstream>
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_rational.h>
+#include <CGAL/Exact_integer.h>
 #include <CGAL/Fraction_traits.h>
 #include<CGAL/Cartesian.h>
 #include<CGAL/Homogeneous.h>
@@ -41,8 +42,8 @@
 namespace CGAL {
 
 
-typedef CGAL::Arithmetic_kernel::Integer Integer;
-typedef CGAL::Arithmetic_kernel::Rational Rational;
+typedef CGAL::Exact_integer Integer;
+typedef CGAL::Exact_rational Rational;
 
 class Homogeneous_tag;
 class Cartesian_tag;
diff --git a/Nef_3/test/Nef_3/Nef_3_problematic_construction.cpp b/Nef_3/test/Nef_3/Nef_3_problematic_construction.cpp
index 0969dda291c..3133bc9525d 100644
--- a/Nef_3/test/Nef_3/Nef_3_problematic_construction.cpp
+++ b/Nef_3/test/Nef_3/Nef_3_problematic_construction.cpp
@@ -28,7 +28,8 @@
 #define CGAL_NEF3_SORT_OUTPUT 1
 
 
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
+#include <CGAL/Exact_rational.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Nef_polyhedron_3.h>
@@ -40,8 +41,8 @@
 #include <string>
 
 
-typedef CGAL::Arithmetic_kernel::Integer NT;
-typedef CGAL::Arithmetic_kernel::Rational FNT;
+typedef CGAL::Exact_integer NT;
+typedef CGAL::Exact_rational FNT;
 
 
 template<typename Kernel>
diff --git a/Nef_3/test/Nef_3/test_with_extended_homogeneous.cpp b/Nef_3/test/Nef_3/test_with_extended_homogeneous.cpp
index 6241d7d958c..4cb6622a8be 100644
--- a/Nef_3/test/Nef_3/test_with_extended_homogeneous.cpp
+++ b/Nef_3/test/Nef_3/test_with_extended_homogeneous.cpp
@@ -26,13 +26,13 @@
 
 #define CGAL_NEF3_SORT_OUTPUT 1
 
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include <CGAL/Extended_homogeneous.h>
 #include <CGAL/Timer.h>
 #include <CGAL/test_Nef_3.h>
 
 int main() {
-  typedef CGAL::Arithmetic_kernel::Integer NT;
+  typedef CGAL::Exact_integer NT;
   typedef CGAL::Extended_homogeneous<NT> EH_kernel;
   
 #ifdef CGAL_CFG_ISTREAM_INT_BUG
diff --git a/Nef_3/test/Nef_3/test_with_homogeneous.cpp b/Nef_3/test/Nef_3/test_with_homogeneous.cpp
index d457013c4e7..d25cf985251 100644
--- a/Nef_3/test/Nef_3/test_with_homogeneous.cpp
+++ b/Nef_3/test/Nef_3/test_with_homogeneous.cpp
@@ -26,13 +26,13 @@
 
 #define CGAL_NEF3_SORT_OUTPUT 1
 
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_integer.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Timer.h>
 #include <CGAL/test_Nef_3.h>
 
 int main() {
-  typedef CGAL::Arithmetic_kernel::Integer NT;
+  typedef CGAL::Exact_integer NT;
   typedef CGAL::Homogeneous<NT>              H_kernel;
   
 #ifdef CGAL_CFG_ISTREAM_INT_BUG
diff --git a/Nef_3/test/Nef_3/test_with_lazy.cpp b/Nef_3/test/Nef_3/test_with_lazy.cpp
index cfb2a7ac7b0..2538be75c5c 100644
--- a/Nef_3/test/Nef_3/test_with_lazy.cpp
+++ b/Nef_3/test/Nef_3/test_with_lazy.cpp
@@ -26,14 +26,14 @@
 
 #define CGAL_NEF3_SORT_OUTPUT 1
 
-#include <CGAL/Arithmetic_kernel.h>
-typedef CGAL::Arithmetic_kernel::Rational NT;
+#include <CGAL/Exact_rational.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Lazy_kernel.h>
 #include <CGAL/Timer.h>
 #include <CGAL/test_Nef_3.h>
 
 int main() {
+  typedef CGAL::Exact_rational NT;
   typedef CGAL::Lazy_kernel<CGAL::Simple_cartesian<NT> > LC_kernel;
   
 #ifdef CGAL_CFG_ISTREAM_INT_BUG
diff --git a/Polygon/test/Polygon/SimplicityTest.cpp b/Polygon/test/Polygon/SimplicityTest.cpp
index f85e7fa3a5f..e33a7741ef6 100644
--- a/Polygon/test/Polygon/SimplicityTest.cpp
+++ b/Polygon/test/Polygon/SimplicityTest.cpp
@@ -1,7 +1,7 @@
 #define CGAL_POLYGON_DEBUG 1
 
 #include <CGAL/Cartesian.h>
-#include <CGAL/Arithmetic_kernel.h>
+#include <CGAL/Exact_rational.h>
 
 #include <CGAL/Point_2.h>
 #include <CGAL/Polygon_2_algorithms.h>
@@ -17,7 +17,7 @@ using std::endl;
 bool TestSimplicity(const char* FileName)
 // tests the simplicity of the polygon in the file FileName
 {
-  typedef CGAL::Arithmetic_kernel::Rational NT;
+  typedef CGAL::Exact_rational NT;
   typedef CGAL::Cartesian<NT> K;
   typedef CGAL::Point_2<K> Point;