diff --git a/Documentation/doc/scripts/html_output_post_processing.py b/Documentation/doc/scripts/html_output_post_processing.py
index 30d59dbc772..f07bd3d2ced 100755
--- a/Documentation/doc/scripts/html_output_post_processing.py
+++ b/Documentation/doc/scripts/html_output_post_processing.py
@@ -355,7 +355,7 @@ removes some unneeded files, and performs minor repair on some glitches.''')
     class_and_struct_files=list(package_glob('./*/class*.html'))
     class_and_struct_files.extend(package_glob('./*/struct*.html'))
     for fn in class_and_struct_files:
-        re_replace_first_in_file(r'<p>Inherits\s*(.*)</p>', r'<a name="details" id="details"></a><h2 class="groupheader">Inherits from</h2><p>\1</p>', fn)
+        re_replace_first_in_file(r'<p>Inherits\s*(.*)</p>', r'<h2 class="groupheader">Inherits from</h2><p>\1</p>', fn)
 
     # remove class name in Definition section if there is no default template
     # parameter documented
diff --git a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h
index d7bf6457dc6..831f12a53ac 100644
--- a/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h
+++ b/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_filtered_traits_2.h
@@ -27,12 +27,7 @@
 #include <CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h>
 
 // includes for the default parameters of the filtered traits
-#ifdef CGAL_USE_GMP
-#include <CGAL/Gmpq.h>
-#else
-#include <CGAL/Quotient.h>
-#include <CGAL/MP_Float.h>
-#endif
+#include <CGAL/internal/Exact_type_selector.h>
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Interval_arithmetic.h>
@@ -56,11 +51,7 @@ namespace CGAL {
 // this traits class does support intersecting segments
 template<class CK,
          class CK_MTag = Field_with_sqrt_tag,
-#ifdef CGAL_USE_GMP
-         class EK      = Simple_cartesian< Gmpq >,
-#else
-         class EK      = Simple_cartesian< Quotient<MP_Float> >,
-#endif
+         class EK      = Simple_cartesian< internal::Exact_field_selector<double>::Type >,
          class EK_MTag = Field_tag,
          class FK      = Simple_cartesian< Interval_nt<false> >,
          class FK_MTag = Field_with_sqrt_tag,
diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h
index c61d82f8dea..e1cb16e1e3a 100644
--- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h
+++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h
@@ -24,12 +24,8 @@
 #include <CGAL/Segment_Delaunay_graph_2/Filtered_traits_concept_check_tags.h>
 
 // includes for the default parameters of the filtered traits
-#ifdef CGAL_USE_GMP
-#include <CGAL/Gmpq.h>
-#else
-#include <CGAL/Quotient.h>
-#include <CGAL/MP_Float.h>
-#endif
+#include <CGAL/internal/Exact_type_selector.h>
+
 
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Interval_arithmetic.h>
@@ -53,11 +49,7 @@ namespace CGAL {
 // this traits class does support intersecting segments
 template<class CK,
          class CK_MTag = Field_with_sqrt_tag,
-#ifdef CGAL_USE_GMP
-         class EK      = Simple_cartesian< Gmpq >,
-#else
-         class EK      = Simple_cartesian< Quotient<MP_Float> >,
-#endif
+         class EK      = Simple_cartesian< internal::Exact_field_selector<double>::Type >,
          class EK_MTag = Field_tag,
          class FK      = Simple_cartesian< Interval_nt<false> >,
          class FK_MTag = Field_with_sqrt_tag,