From b909b3e4e4afe4c6bbfb19ae9d16daca051efc7e Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Thu, 6 Apr 2006 09:11:38 +0000
Subject: [PATCH] Get rid of <CGAL/NT_extensions_root_of/*> and other small
 cleanups.

---
 .../Benchmarks/DxfArrayBenchmarks/benchmark.h |  2 +-
 .../benchmarks_arrangement.C                  |  4 ---
 .../Benchmarks/arrangement_traits/benchmark.h |  3 +-
 .../benchmarks_arrangement.C                  |  4 ---
 .../benchmarks_arrengement_traits.C           |  6 ----
 Curved_kernel/Benchmarks/benchmark.h          |  2 +-
 .../Benchmarks/benchmarks_arrangement.C       |  4 ---
 Curved_kernel/Benchmarks/bff_reader/Breader.C |  4 ---
 .../Benchmarks/dxf_to_bff/dxf_converter.h     |  5 ----
 .../incremental_insertion/benchmark.h         |  3 +-
 .../benchmarks_arrangement.C                  |  4 ---
 Curved_kernel/demo/Curved_kernel/demo.C       |  4 ---
 .../Curved_kernel/demo_Lazy_line_circle.C     | 28 -------------------
 Curved_kernel/demo/Curved_kernel/demo_line.C  |  4 ---
 .../demo/Curved_kernel/demo_line_circle.C     |  4 ---
 .../demo/Curved_kernel/demo_viewer.C          |  4 ---
 Curved_kernel/demo/Curved_kernel/makefile     |  3 ++
 ...ircular_kernel_arrangement_Line_Circular.C |  6 +---
 .../example_Circular_kernel_arrangement.C     |  6 +---
 ...ircular_kernel_arrangement_Line_Circular.C |  9 ++----
 ...ple_Circular_kernel_arrangement_Line_arc.C |  8 +-----
 ...example_Lazy_Circular_kernel_arrangement.C | 22 +--------------
 ...ircular_kernel_arrangement_Line_Circular.C | 17 ++---------
 ...azy_Circular_kernel_arrangement_Line_arc.C | 19 +------------
 .../example_arrangement_random_circles.C      |  2 --
 ...mple_arrangement_random_circles_segments.C |  3 +-
 .../include/CGAL/Exact_circular_kernel.h      |  3 --
 .../Circular_arc_with_hexagon_2.h             |  1 -
 .../Line_arc_with_hexagon_2.h                 |  1 -
 .../hexagon_primitives.h                      |  1 -
 .../test/Curved_kernel/test_Circular_kernel.C |  2 --
 ...Filtered_bbox_hexagon_Lazy_curved_kernel.C |  3 --
 .../test_Filtered_hexagon_kernel.C            |  4 ---
 .../test/Curved_kernel/test_Lazy_Line_arc.C   |  6 ----
 .../Curved_kernel/test_Lazy_curved_kernel.C   |  3 --
 .../test/Curved_kernel/test_Line_arc.C        |  6 ----
 36 files changed, 19 insertions(+), 191 deletions(-)

diff --git a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h b/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h
index 81bf74a21f2..994e40ddb53 100644
--- a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h
+++ b/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmark.h
@@ -11,7 +11,7 @@
 #include <iomanip>
 #include <fstream>
 #include "Input_data.h"
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
 
 
 
diff --git a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C b/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C
index e8a99d26877..2d62cd53562 100644
--- a/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C
+++ b/Curved_kernel/Benchmarks/DxfArrayBenchmarks/benchmarks_arrangement.C
@@ -18,10 +18,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h b/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h
index dcb5ac7c0a2..ba495588330 100644
--- a/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h
+++ b/Curved_kernel/Benchmarks/arrangement_traits/benchmark.h
@@ -11,7 +11,8 @@
 #include <iomanip>
 #include <fstream>
 #include "Input_data.h"
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
+
 class Bench
 {
   int numof_f_fails;
diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C b/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C
index 4b7071267de..84a744321a0 100644
--- a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C
+++ b/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrangement.C
@@ -9,10 +9,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C b/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C
index 6bc8b0eacdc..92d76a48f50 100644
--- a/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C
+++ b/Curved_kernel/Benchmarks/arrangement_traits/benchmarks_arrengement_traits.C
@@ -1,5 +1,3 @@
- 
-
 #include <CGAL/basic.h>
 
 #include <CGAL/point_generators_2.h>
@@ -8,10 +6,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/Benchmarks/benchmark.h b/Curved_kernel/Benchmarks/benchmark.h
index 6525207221e..90ecd75cfc1 100644
--- a/Curved_kernel/Benchmarks/benchmark.h
+++ b/Curved_kernel/Benchmarks/benchmark.h
@@ -11,7 +11,7 @@
 #include <iomanip>
 #include <fstream>
 #include "Input_data.h"
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
 
 
 
diff --git a/Curved_kernel/Benchmarks/benchmarks_arrangement.C b/Curved_kernel/Benchmarks/benchmarks_arrangement.C
index 1d8b754be5c..6d16d645fd1 100644
--- a/Curved_kernel/Benchmarks/benchmarks_arrangement.C
+++ b/Curved_kernel/Benchmarks/benchmarks_arrangement.C
@@ -17,10 +17,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/Benchmarks/bff_reader/Breader.C b/Curved_kernel/Benchmarks/bff_reader/Breader.C
index 0b2d8879773..7d3fd0f4c1a 100644
--- a/Curved_kernel/Benchmarks/bff_reader/Breader.C
+++ b/Curved_kernel/Benchmarks/bff_reader/Breader.C
@@ -8,10 +8,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h b/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h
index d4fd443483b..1ec6fe61145 100644
--- a/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h
+++ b/Curved_kernel/Benchmarks/dxf_to_bff/dxf_converter.h
@@ -16,11 +16,6 @@
 #include <CGAL/Gmpq.h>
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
-
 using namespace std;
 class Dxf_converter {
   //typedef std::pair<double, double> Point_2;
diff --git a/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h b/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h
index 4afffdbee9f..97629a2a126 100644
--- a/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h
+++ b/Curved_kernel/Benchmarks/incremental_insertion/benchmark.h
@@ -11,7 +11,8 @@
 #include <iomanip>
 #include <fstream>
 #include "Input_data.h"
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
+
 class Bench
 {
   int numof_f_fails;
diff --git a/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C b/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C
index 919d748c71b..5ece844831c 100644
--- a/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C
+++ b/Curved_kernel/Benchmarks/incremental_insertion/benchmarks_arrangement.C
@@ -9,10 +9,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/demo/Curved_kernel/demo.C b/Curved_kernel/demo/Curved_kernel/demo.C
index 0e5561d118c..0d85c36d8cc 100644
--- a/Curved_kernel/demo/Curved_kernel/demo.C
+++ b/Curved_kernel/demo/Curved_kernel/demo.C
@@ -37,10 +37,6 @@ int main() {
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/IO/Qt_widget.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
 #include <CGAL/IO/Qt_help_window.h>
diff --git a/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.C b/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.C
index a69e39f6746..29c34ed35ab 100644
--- a/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.C
+++ b/Curved_kernel/demo/Curved_kernel/demo_Lazy_line_circle.C
@@ -29,30 +29,6 @@ int main() {
 #else
 
 #include <utility>
-namespace CGAL {
-class MP_Float;
-template < typename T > class Root_of_2;
-template < typename T > class Lazy_exact_nt;
-template < typename T >
-std::pair<double,double> to_interval(const Root_of_2<T>&);
-
-#if 0
-template < typename T >
-void operator-(Lazy_exact_nt<Root_of_2<T> > a, Lazy_exact_nt< Root_of_2<T> > b) { f(a); }
-void operator-(Lazy_exact_nt<Root_of_2<MP_Float> > a, Lazy_exact_nt< Root_of_2<MP_Float> > b);
-
-template < typename T1, typename T2 >
-struct Binary_operator_result;
-
-template < typename T1, typename T2 >
-struct Binary_operator_result <Root_of_2<T1>, Root_of_2<T2> >;
-#endif
-}
-
-
-
-
-
 #include <fstream>
 
 #include <CGAL/Cartesian.h>
@@ -62,10 +38,6 @@ struct Binary_operator_result <Root_of_2<T1>, Root_of_2<T2> >;
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/IO/Qt_widget.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
 #include <CGAL/IO/Qt_help_window.h>
diff --git a/Curved_kernel/demo/Curved_kernel/demo_line.C b/Curved_kernel/demo/Curved_kernel/demo_line.C
index 808e34fc072..338bead374a 100644
--- a/Curved_kernel/demo/Curved_kernel/demo_line.C
+++ b/Curved_kernel/demo/Curved_kernel/demo_line.C
@@ -37,10 +37,6 @@ int main() {
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/IO/Qt_widget.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
 #include <CGAL/IO/Qt_help_window.h>
diff --git a/Curved_kernel/demo/Curved_kernel/demo_line_circle.C b/Curved_kernel/demo/Curved_kernel/demo_line_circle.C
index c4969cce02b..fe86d8217ac 100644
--- a/Curved_kernel/demo/Curved_kernel/demo_line_circle.C
+++ b/Curved_kernel/demo/Curved_kernel/demo_line_circle.C
@@ -37,10 +37,6 @@ int main() {
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/IO/Qt_widget.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
 #include <CGAL/IO/Qt_help_window.h>
diff --git a/Curved_kernel/demo/Curved_kernel/demo_viewer.C b/Curved_kernel/demo/Curved_kernel/demo_viewer.C
index 42b2e0b93db..4e7a5ffd5ef 100644
--- a/Curved_kernel/demo/Curved_kernel/demo_viewer.C
+++ b/Curved_kernel/demo/Curved_kernel/demo_viewer.C
@@ -37,10 +37,6 @@ int main() {
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/IO/Qt_widget.h>
 #include <CGAL/IO/Qt_widget_standard_toolbar.h>
 #include <CGAL/IO/Qt_help_window.h>
diff --git a/Curved_kernel/demo/Curved_kernel/makefile b/Curved_kernel/demo/Curved_kernel/makefile
index fbb63971a35..a35e95d388c 100644
--- a/Curved_kernel/demo/Curved_kernel/makefile
+++ b/Curved_kernel/demo/Curved_kernel/makefile
@@ -14,6 +14,9 @@ include $(CGAL_MAKEFILE)
 #---------------------------------------------------------------------#
 
 CXXFLAGS = \
+           -I../../../Number_types/include \
+           -I../../../Interval_arithmetic/include \
+           -I../../include \
 	   $(CGAL_CXXFLAGS) \
            $(LONG_NAME_PROBLEM_CXXFLAGS) \
            -fmessage-length=0
diff --git a/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.C b/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.C
index b100240fe1e..83f291c82b2 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Bbox_Hexagon_Lazy_Circular_kernel_arrangement_Line_Circular.C
@@ -11,10 +11,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 #include <CGAL/Circular_kernel.h>
 #include <CGAL/Lazy_curved_kernel.h>
@@ -23,7 +19,7 @@
 #include <CGAL/Arr_naive_point_location.h>
 #include <CGAL/Filtered_hexagon_curved_kernel.h>
 #include <CGAL/Filtered_bbox_curved_kernel.h>
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
 #include <CGAL/Timer.h>
 
 
diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.C b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.C
index d3f4f6cf2a7..d7d98e5d51a 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement.C
@@ -5,14 +5,10 @@
 #include <CGAL/point_generators_2.h>
 
 #include <CGAL/MP_Float.h>
+#include <CGAL/Gmpq.h>
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.C b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.C
index e289164c987..f3678447272 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_Circular.C
@@ -1,4 +1,3 @@
-
 //#include <fstream>
 
 #include <CGAL/basic.h>
@@ -6,20 +5,16 @@
 #include <CGAL/point_generators_2.h>
 
 #include <CGAL/MP_Float.h>
+#include <CGAL/Gmpq.h>
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 #include <CGAL/Circular_kernel.h>
 #include <CGAL/Arr_circular_line_arc_traits.h>
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_naive_point_location.h>
-#include "boost/variant.hpp"
-
+#include <boost/variant.hpp>
 
 #include <CGAL/Random.h>
 
diff --git a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.C b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.C
index 350a7d282e8..dc231d4cf86 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Circular_kernel_arrangement_Line_arc.C
@@ -5,24 +5,18 @@
 #include <CGAL/point_generators_2.h>
 
 #include <CGAL/MP_Float.h>
+#include <CGAL/Gmpq.h>
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
 #include <CGAL/Arr_line_arc_traits.h>
 
-
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_naive_point_location.h>
 
-
-
 #include <CGAL/Random.h>
 
 
diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.C b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.C
index 38d20a3ad93..ca7ad504824 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement.C
@@ -1,17 +1,8 @@
+#include <CGAL/basic.h>
 #include <utility>
-namespace CGAL {
-class MP_Float;
-template < typename T > class Root_of_2;
-template < typename T > class Lazy_exact_nt;
-template < typename T >
-std::pair<double,double> to_interval(const Root_of_2<T>&);
-
-}
-
 
 //#include <fstream>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/point_generators_2.h>
 
@@ -20,18 +11,10 @@ std::pair<double,double> to_interval(const Root_of_2<T>&);
 #include <CGAL/Algebraic_kernel_2_2.h>
 #include <CGAL/Lazy_curved_kernel.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-#include <CGAL/NT_extensions_Root_of/double.h>
-
 //#include <CGAL/IO/Qt_widget.h>
 //#include <CGAL/IO/Qt_widget_standard_toolbar.h>
 //#include <CGAL/IO/Qt_help_window.h>
 //#include <CGAL/IO/Qt_widget_layer.h>
-
-
-
 //#include <CGAL/IO/Qt_widget_circular_arc_2.h>
 //#include <CGAL/IO/Qt_widget_circular_arc_endpoint_2.h>
 
@@ -45,12 +28,9 @@ std::pair<double,double> to_interval(const Root_of_2<T>&);
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_naive_point_location.h>
 
-
-
 #include <CGAL/Random.h>
 
 
-
 typedef CGAL::Quotient<CGAL::MP_Float>                       NT1;
 typedef CGAL::Cartesian<NT1>                                 Linear_k1;
 typedef CGAL::Algebraic_kernel_for_circles_2_2<NT1>          Algebraic_k1;
diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.C b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.C
index 59eaf9f1e1d..a590f40f0b0 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_Circular.C
@@ -1,16 +1,8 @@
+#include <CGAL/basic.h>
 #include <utility>
-namespace CGAL {
-class MP_Float;
-template < typename T > class Root_of_2;
-template < typename T > class Lazy_exact_nt;
-template < typename T >
-std::pair<double,double> to_interval(const Root_of_2<T>&);
-
-}
 
 //#include <fstream>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/point_generators_2.h>
 
@@ -18,20 +10,15 @@ std::pair<double,double> to_interval(const Root_of_2<T>&);
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-
 #include <CGAL/intersections.h>
 #include <CGAL/Circular_kernel.h>
 #include <CGAL/Lazy_curved_kernel.h>
 #include <CGAL/Arr_circular_line_arc_traits.h>
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_naive_point_location.h>
-#include "boost/variant.hpp"
+#include <boost/variant.hpp>
 #include <CGAL/Timer.h>
 
-
 #include <CGAL/Random.h>
 
 
diff --git a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.C b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.C
index a9c097e1006..4929dd5e324 100644
--- a/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.C
+++ b/Curved_kernel/examples/Curved_kernel/example_Lazy_Circular_kernel_arrangement_Line_arc.C
@@ -1,15 +1,7 @@
+#include <CGAL/basic.h>
 #include <utility>
-namespace CGAL {
-class MP_Float;
-template < typename T > class Root_of_2;
-template < typename T > class Lazy_exact_nt;
-template < typename T >
-std::pair<double,double> to_interval(const Root_of_2<T>&);
-}
-
 //#include <fstream>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/point_generators_2.h>
 
@@ -17,10 +9,6 @@ std::pair<double,double> to_interval(const Root_of_2<T>&);
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 #include <CGAL/Lazy_curved_kernel.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
-#include <CGAL/NT_extensions_Root_of/double.h>
 #include <CGAL/intersections.h>
 
 #include <CGAL/Circular_kernel.h>
@@ -30,8 +18,6 @@ std::pair<double,double> to_interval(const Root_of_2<T>&);
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arr_naive_point_location.h>
 
-
-
 #include <CGAL/Random.h>
 
 
@@ -51,9 +37,6 @@ typedef CGAL::Lazy_curved_kernel<CK1_,CK2_>                  Circular_k;
 
 
 
-
-
-
 //typedef Circular_k::Circular_arc_2                          Arc;
 typedef Circular_k::Line_arc_2                                Arc;
 typedef std::vector<Arc>                                    ArcContainer;
diff --git a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.C b/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.C
index 4830cce3ee3..dcd513ec840 100644
--- a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.C
+++ b/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles.C
@@ -8,8 +8,6 @@
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-
 #include <CGAL/Circular_kernel.h>
 
 #include <CGAL/Arr_circular_arc_traits.h>
diff --git a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.C b/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.C
index 3dab37ba8f8..b5ac862bfb1 100644
--- a/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.C
+++ b/Curved_kernel/examples/Curved_kernel/example_arrangement_random_circles_segments.C
@@ -5,11 +5,10 @@
 #include <CGAL/point_generators_2.h>
 
 #include <CGAL/MP_Float.h>
+#include <CGAL/Gmpq.h>
 
 #include <CGAL/Algebraic_kernel_2_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-
 #include <CGAL/Circular_kernel.h>
 
 #include <CGAL/Arr_circular_line_arc_traits.h>
diff --git a/Curved_kernel/include/CGAL/Exact_circular_kernel.h b/Curved_kernel/include/CGAL/Exact_circular_kernel.h
index c01479f3563..c36b786f323 100644
--- a/Curved_kernel/include/CGAL/Exact_circular_kernel.h
+++ b/Curved_kernel/include/CGAL/Exact_circular_kernel.h
@@ -32,14 +32,11 @@
 
 #ifdef CGAL_USE_GMP
 #  include <CGAL/Gmpq.h>
-#  include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
 #else
 #  include <CGAL/MP_Float.h>
 #  include <CGAL/Quotient.h>
-#  include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
 #endif
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
 #include <CGAL/Lazy_curved_kernel.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
index c2391237ead..585e6c71311 100644
--- a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
+++ b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
@@ -29,7 +29,6 @@
 #include <iterator>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polygon_2.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Interval_nt.h>
 #include <CGAL/Curved_kernel_converter.h>
 #include <CGAL/Bbox_2.h>
 #include <CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h>
diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
index d90c00bb68f..15d7b7f3c63 100644
--- a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
+++ b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
@@ -30,7 +30,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polygon_2.h>
 #include <CGAL/Bbox_2.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Interval_nt.h>
 #include <CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
index 2fdc8bdc248..e84836a6dde 100644
--- a/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
+++ b/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
@@ -32,7 +32,6 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/number_utils.h>
 #include <CGAL/Line_2.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Interval_nt.h>
 #include <CGAL/Object.h>
 #include <CGAL/Lazy.h>
 #include <CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h>
diff --git a/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C b/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C
index 22b7cf571ec..106f486d55e 100644
--- a/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C
+++ b/Curved_kernel/test/Curved_kernel/test_Circular_kernel.C
@@ -4,8 +4,6 @@
 #include <CGAL/MP_Float.h>
 #include <CGAL/Quotient.h>
 //#include <CGAL/Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
 #include <CGAL/_test_circles_predicates.h>
 #include <CGAL/_test_circles_constructions.h>
 #include <CGAL/_test_circles_extention.h>
diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C b/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C
index 70ddc114130..015de0de73f 100644
--- a/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C
+++ b/Curved_kernel/test/Curved_kernel/test_Filtered_bbox_hexagon_Lazy_curved_kernel.C
@@ -7,9 +7,6 @@
 #include <CGAL/MP_Float.h>
 #include <CGAL/Quotient.h>
 //#include <CGAL/Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
 #include <CGAL/Lazy_curved_kernel.h>
 #include <CGAL/intersections.h>
 #include <CGAL/Filtered_bbox_curved_kernel.h>
diff --git a/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C b/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C
index 85ca1cb447c..7d3d377fb59 100644
--- a/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C
+++ b/Curved_kernel/test/Curved_kernel/test_Filtered_hexagon_kernel.C
@@ -8,8 +8,6 @@
 #include <CGAL/MP_Float.h>
 #include <CGAL/Quotient.h>
 //#include <CGAL/Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
 #include <CGAL/_test_circles_predicates.h>
 #include <CGAL/_test_circles_constructions.h>
 
@@ -51,5 +49,3 @@ int main()
   
   return 0;
 }
-
-
diff --git a/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C b/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C
index 78e6033bcce..ad58f591c16 100644
--- a/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C
+++ b/Curved_kernel/test/Curved_kernel/test_Lazy_Line_arc.C
@@ -13,9 +13,6 @@
 #include <CGAL/Curved_kernel/Circular_arc_2.h>
 #include <CGAL/Curved_kernel/Line_arc_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
 #include <CGAL/Lazy_curved_kernel.h>
 #include <CGAL/Random.h>
 
@@ -1083,7 +1080,4 @@ int main()
   _test_compare_y_to_right(ck);
   _test_compare_y_at_x(ck);
   _test_has_on(ck);
-
-
 }
-
diff --git a/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C b/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C
index ec2f091baa5..cbbcc14132f 100644
--- a/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C
+++ b/Curved_kernel/test/Curved_kernel/test_Lazy_curved_kernel.C
@@ -7,9 +7,6 @@
 #include <CGAL/MP_Float.h>
 #include <CGAL/Quotient.h>
 //#include <CGAL/Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-#include <CGAL/NT_extensions_Root_of/CGAL_Lazy_exact_nt.h>
 #include <CGAL/Lazy_curved_kernel.h>
 #include <CGAL/intersections.h>
 #include <iostream>
diff --git a/Curved_kernel/test/Curved_kernel/test_Line_arc.C b/Curved_kernel/test/Curved_kernel/test_Line_arc.C
index 1f10683cdb8..d934d02516c 100644
--- a/Curved_kernel/test/Curved_kernel/test_Line_arc.C
+++ b/Curved_kernel/test/Curved_kernel/test_Line_arc.C
@@ -13,9 +13,6 @@
 #include <CGAL/Curved_kernel/Circular_arc_2.h>
 #include <CGAL/Curved_kernel/Line_arc_2.h>
 
-#include <CGAL/NT_extensions_Root_of/CGAL_Quotient.h>
-//#include <CGAL/NT_extensions_Root_of/CGAL_Gmpq.h>
-
 #include <CGAL/Random.h>
 
 template <class CK>
@@ -1075,7 +1072,4 @@ int main()
   _test_compare_y_to_right(ck1);
   _test_compare_y_at_x(ck1);
   _test_has_on(ck1);
-
-
 }
-