From 7fa9781894a9cf779e6c6370c7547ece8872e326 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 14 Feb 2019 12:12:01 +0100
Subject: [PATCH] Remove derivation as workaround for a typedef

---
 Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp   | 6 +++---
 .../test/Apollonius_graph_2/test_ag_hierarchy_2.cpp       | 6 +++---
 .../test/Apollonius_graph_2/test_ag_three_sites_2.cpp     | 4 ++--
 .../test/Apollonius_graph_2/test_ag_traits_2.cpp          | 8 +++-----
 .../agg_op_test_suite_generator.cpp                       | 5 +----
 .../Boolean_set_operations_2/bop_test_suite_generator.cpp | 5 +----
 .../test/Boolean_set_operations_2/test_agg_op.cpp         | 6 ++----
 .../test/Boolean_set_operations_2/test_bop.cpp            | 5 +----
 .../test/Boolean_set_operations_2/test_compilation.cpp    | 5 +----
 Filtered_kernel/test/Filtered_kernel/Filtered_kernel.cpp  | 2 +-
 .../test/Inscribed_areas/extremal_polygon_2_test.cpp      | 4 ++--
 Mesh_2/test/Mesh_2/test_conforming.cpp                    | 4 ++--
 Mesh_2/test/Mesh_2/test_meshing.cpp                       | 4 ++--
 Mesh_2/test/Mesh_2/test_vertex_and_face_bases.cpp         | 2 +-
 .../test_p2t2_triangulation_prog1.cpp                     | 2 +-
 Polygon/test/Polygon/AlgorithmTest.cpp                    | 4 ++--
 Polygon/test/Polygon/PolygonTest.cpp                      | 4 ++--
 Polygon/test/Polygon/SimplicityTest.cpp                   | 6 +++---
 Polyhedron_IO/examples/Polyhedron_IO/terr_trian.cpp       | 6 ++----
 .../Polytope_distance_d/all_furthest_neighbors_2_test.cpp | 4 ++--
 .../sdg-voronoi-edges-exact-linf.cpp                      | 2 --
 .../Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_et.cpp  | 4 ++--
 .../Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_ft.cpp  | 1 -
 .../test_sdg_linf_hierarchy_2_et.cpp                      | 5 ++---
 .../test_sdg_linf_hierarchy_2_ft.cpp                      | 1 -
 .../test_sdg_linf_hierarchy_info_2_no_up.cpp              | 4 +---
 .../test_sdg_linf_hierarchy_info_2_up.cpp                 | 4 +---
 .../test_sdg_linf_info_2.cpp                              | 4 +---
 .../test_sdg_linf_traits_2.cpp                            | 5 +++--
 Surface_mesher/test/Surface_mesher/combined_spheres.cpp   | 2 +-
 Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp       | 4 ++--
 Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp      | 2 +-
 32 files changed, 51 insertions(+), 79 deletions(-)

diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp
index 6607b4983e0..1fc81aaa1ba 100644
--- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp
+++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag2.cpp
@@ -22,7 +22,7 @@ typedef CGAL::Filtered_exact<inexact_type,exact_type>  number_t;
 #include <CGAL/Simple_cartesian.h>
 
 #ifndef DONT_USE_FILTERED_EXACT
-struct Kernel : public CGAL::Simple_cartesian<number_t> {};
+typedef CGAL::Simple_cartesian<number_t> Kernel;
 #endif
 
 typedef CGAL::Integral_domain_without_division_tag Method_tag;
@@ -30,8 +30,8 @@ typedef CGAL::Integral_domain_without_division_tag Method_tag;
 #include "./include/test.h"
 
 
-struct CK : public CGAL::Simple_cartesian<inexact_type> {};
-struct EK : public CGAL::Simple_cartesian<exact_type> {};
+typedef CGAL::Simple_cartesian<inexact_type> CK;
+typedef CGAL::Simple_cartesian<exact_type> EK;
 
 
 int main()
diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp
index 8a1df12b411..7546bd42bed 100644
--- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp
+++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_hierarchy_2.cpp
@@ -23,7 +23,7 @@ typedef CGAL::Filtered_exact<inexact_type,exact_type>  number_t;
 #include <CGAL/Simple_cartesian.h>
 
 #ifndef DNOT_USE_FILTERED_EXACT
-struct Kernel : public CGAL::Simple_cartesian<number_t> {};
+typedef CGAL::Simple_cartesian<number_t> K;
 #endif
 
 typedef CGAL::Integral_domain_without_division_tag Method_tag;
@@ -31,8 +31,8 @@ typedef CGAL::Integral_domain_without_division_tag Method_tag;
 #include "./include/test.h"
 
 
-struct CK : public CGAL::Simple_cartesian<inexact_type> {};
-struct EK : public CGAL::Simple_cartesian<exact_type> {};
+typedef CGAL::Simple_cartesian<inexact_type> CK;
+typedef CGAL::Simple_cartesian<exact_type> EK;
 
 
 int main()
diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_three_sites_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_three_sites_2.cpp
index 9df5205e9ec..4b6029bb9f2 100644
--- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_three_sites_2.cpp
+++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_three_sites_2.cpp
@@ -10,11 +10,11 @@
 
 typedef CGAL::Exact_rational exact_nt;
 
-struct Rep : public CGAL::Simple_cartesian<exact_nt> {};
+typedef CGAL::Simple_cartesian<exact_nt> Rep;
 
 typedef CGAL::Integral_domain_without_division_tag Method_tag;
 
-struct Gt : public CGAL::Apollonius_graph_traits_2<Rep,Method_tag> {};
+typedef CGAL::Apollonius_graph_traits_2<Rep,Method_tag> Gt;
 
 typedef CGAL::Apollonius_graph_2<Gt>  AG2;
 typedef AG2::Point_2                  Point_2;
diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp
index 7c045384e4f..3739b77cad4 100644
--- a/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp
+++ b/Apollonius_graph_2/test/Apollonius_graph_2/test_ag_traits_2.cpp
@@ -1,5 +1,3 @@
-#include <CGAL/basic.h>
-
 #include <iostream>
 #include <fstream>
 #include <cassert>
@@ -22,7 +20,7 @@ typedef CGAL::Filtered_exact<inexact_type,exact_type>  number_t;
 #include <CGAL/Simple_cartesian.h>
 
 #ifndef DONT_USE_FILTERED_EXACT
-struct Kernel : public CGAL::Simple_cartesian<number_t> {};
+typedef CGAL::Simple_cartesian<number_t> Kernel;
 #endif
 
 typedef CGAL::Integral_domain_without_division_tag Method_tag;
@@ -30,8 +28,8 @@ typedef CGAL::Integral_domain_without_division_tag Method_tag;
 #include "./include/test.h"
 
 
-struct CK : public CGAL::Simple_cartesian<double> {};
-struct EK : public CGAL::Simple_cartesian<CGAL::MP_Float> {};
+typedef CGAL::Simple_cartesian<double> CK;
+typedef CGAL::Simple_cartesian<CGAL::MP_Float> EK;
 
 
 int main()
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/agg_op_test_suite_generator.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/agg_op_test_suite_generator.cpp
index 58d58a8bd63..83c949f5940 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/agg_op_test_suite_generator.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/agg_op_test_suite_generator.cpp
@@ -16,10 +16,7 @@
 // leda_rational, or Gmpq, or Quotient<MP_float>
 typedef CGAL::Exact_rational         Number_type;
 
-// instead of
-//typedef CGAL::Simple_cartesian<Number_type>            Kernel;
-// workaround for VC++ 
-struct Kernel : public CGAL::Simple_cartesian<Number_type> {};
+typedef CGAL::Simple_cartesian<Number_type> Kernel;
 
 typedef CGAL::Polygon_2<Kernel>                        Polygon_2;
 typedef CGAL::Polygon_with_holes_2<Kernel>             Polygon_with_holes_2;
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/bop_test_suite_generator.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/bop_test_suite_generator.cpp
index cce90ce649c..0f74f3ab364 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/bop_test_suite_generator.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/bop_test_suite_generator.cpp
@@ -16,10 +16,7 @@
 // leda_rational, or Gmpq, or Quotient<MP_float>
 typedef CGAL::Exact_rational        Number_type;
 
-// instead of
-//typedef CGAL::Simple_cartesian<Number_type>            Kernel;
-// workaround for VC++ 
-struct Kernel : public CGAL::Simple_cartesian<Number_type> {};
+typedef CGAL::Simple_cartesian<Number_type>            Kernel;
 
 typedef CGAL::Polygon_2<Kernel>                        Polygon_2;
 typedef CGAL::Polygon_with_holes_2<Kernel>             Polygon_with_holes_2;
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_agg_op.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_agg_op.cpp
index 44d16d2eaa9..5f9fe4b1065 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_agg_op.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_agg_op.cpp
@@ -17,10 +17,8 @@
 // leda_rational, or Gmpq, or Quotient<MP_float>
 typedef CGAL::Exact_rational        Number_type;
 
-// instead of
-//typedef CGAL::Simple_cartesian<Number_type>            Kernel;
-// workaround for VC++ 
-struct Kernel : public CGAL::Simple_cartesian<Number_type> {};
+
+typedef CGAL::Simple_cartesian<Number_type>            Kernel;
 
 typedef CGAL::Polygon_2<Kernel>                       Polygon_2;
 typedef CGAL::Polygon_with_holes_2<Kernel>            Polygon_with_holes_2;
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
index c0f9215a372..c087a022677 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
@@ -18,10 +18,7 @@
 // leda_rational, or Gmpq, or Quotient<MP_float>
 typedef CGAL::Exact_rational        Number_type;
 
-// instead of
-//typedef CGAL::Simple_cartesian<Number_type>           Kernel;
-// workaround for VC++ 
-struct Kernel : public CGAL::Simple_cartesian<Number_type> {};
+typedef CGAL::Simple_cartesian<Number_type>           Kernel;
 
 typedef CGAL::Polygon_2<Kernel>                       Polygon_2;
 typedef CGAL::Polygon_with_holes_2<Kernel>            Polygon_with_holes_2;
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
index f0130cdc88e..e642a24a0f0 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
@@ -18,10 +18,7 @@
 //typedef CGAL::Quotient<CGAL::MP_Float>                Number_type;
 typedef int Number_type;
 
-// instead of
-//typedef CGAL::Simple_cartesian<Number_type>            Kernel;
-// workaround for VC++ 
-struct Kernel : public CGAL::Simple_cartesian<Number_type> {};
+typedef CGAL::Simple_cartesian<Number_type>            Kernel;
 
 typedef CGAL::Gps_segment_traits_2<Kernel>            Traits;
 typedef CGAL::Polygon_set_2<Kernel>                   Ps;
diff --git a/Filtered_kernel/test/Filtered_kernel/Filtered_kernel.cpp b/Filtered_kernel/test/Filtered_kernel/Filtered_kernel.cpp
index 6adf28f86a7..4dd85a79cf1 100644
--- a/Filtered_kernel/test/Filtered_kernel/Filtered_kernel.cpp
+++ b/Filtered_kernel/test/Filtered_kernel/Filtered_kernel.cpp
@@ -25,7 +25,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #if 1
-struct K : public CGAL::Filtered_kernel<CGAL::Cartesian<double> > {};
+typedef CGAL::Filtered_kernel<CGAL::Cartesian<double> > K;
 #else
 typedef CGAL::Homogeneous<int> K1;
 typedef CGAL::Homogeneous<CGAL::MP_Float> K2;
diff --git a/Inscribed_areas/test/Inscribed_areas/extremal_polygon_2_test.cpp b/Inscribed_areas/test/Inscribed_areas/extremal_polygon_2_test.cpp
index 2106d4d67a6..3d6aa2729aa 100644
--- a/Inscribed_areas/test/Inscribed_areas/extremal_polygon_2_test.cpp
+++ b/Inscribed_areas/test/Inscribed_areas/extremal_polygon_2_test.cpp
@@ -19,7 +19,7 @@
 //
 // Author(s)     : Michael Hoffmann <hoffmann@inf.ethz.ch>
 
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polygon_2.h>
 #include <CGAL/point_generators_2.h>
 #include <CGAL/random_convex_set_2.h>
@@ -29,7 +29,7 @@
 
 typedef double                                    FT;
 
-struct Kernel : public CGAL::Cartesian<FT> {};
+typedef CGAL::Simple_cartesian<FT>                Kernel;
 
 typedef Kernel::Point_2                           Point;
 typedef std::vector<Point>                        Cont;
diff --git a/Mesh_2/test/Mesh_2/test_conforming.cpp b/Mesh_2/test/Mesh_2/test_conforming.cpp
index dd58974a25a..3bdb740998e 100644
--- a/Mesh_2/test/Mesh_2/test_conforming.cpp
+++ b/Mesh_2/test/Mesh_2/test_conforming.cpp
@@ -114,9 +114,9 @@ struct Tester {
 };
 
 
-struct K_e_i : public CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i;
 #if CGAL_USE_CORE || CGAL_USE_LEDA
-struct K_e_e : public CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt {};
+typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt K_e_e;
 #endif
 
 int main()
diff --git a/Mesh_2/test/Mesh_2/test_meshing.cpp b/Mesh_2/test/Mesh_2/test_meshing.cpp
index 96f71cca419..189556215d1 100644
--- a/Mesh_2/test/Mesh_2/test_meshing.cpp
+++ b/Mesh_2/test/Mesh_2/test_meshing.cpp
@@ -194,9 +194,9 @@ struct Tester2 {
   }
 };
 
-struct K_e_i : public CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i;
 #if CGAL_USE_CORE || CGAL_USE_LEDA
-struct K_e_e : public CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt {};
+typedef CGAL::Exact_predicates_exact_constructions_kernel_with_sqrt K_e_e;
 #endif
 
 int main()
diff --git a/Mesh_2/test/Mesh_2/test_vertex_and_face_bases.cpp b/Mesh_2/test/Mesh_2/test_vertex_and_face_bases.cpp
index 41c26b7b094..d3fde5ecc67 100644
--- a/Mesh_2/test/Mesh_2/test_vertex_and_face_bases.cpp
+++ b/Mesh_2/test/Mesh_2/test_vertex_and_face_bases.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
 #include <CGAL/Triangulation_face_base_with_info_2.h>
 
-struct K : public CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 
 typedef bool Vertex_info;
 typedef bool Face_info;
diff --git a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_prog1.cpp b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_prog1.cpp
index e93c7063f1d..95c88de8b96 100644
--- a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_prog1.cpp
+++ b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_prog1.cpp
@@ -6,7 +6,7 @@
 #include <CGAL/Periodic_2_triangulation_traits_2.h>
 #include <CGAL/Periodic_2_triangulation_2.h>
 
-struct K : CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef CGAL::Periodic_2_triangulation_traits_2<K>  Gt;
 
 typedef CGAL::Periodic_2_triangulation_2<Gt>        Triangulation;
diff --git a/Polygon/test/Polygon/AlgorithmTest.cpp b/Polygon/test/Polygon/AlgorithmTest.cpp
index 46db55a9d9a..70f23556949 100644
--- a/Polygon/test/Polygon/AlgorithmTest.cpp
+++ b/Polygon/test/Polygon/AlgorithmTest.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Homogeneous.h>
 #include <CGAL/Polygon_2_algorithms.h>
 
@@ -192,7 +192,7 @@ int main()
   cout << "-   testing polygon algorithms with cartesian/double   -" << endl;
   cout << "--------------------------------------------------------" << endl;
   cout << endl;
-  typedef CGAL::Cartesian<double> R1;
+  typedef CGAL::Simple_cartesian<double> R1;
 
   typedef CGAL::Point_2<R1> Point1;
   test_polygon(R1(), Point1(), "data/polygon_cartesian.dat");
diff --git a/Polygon/test/Polygon/PolygonTest.cpp b/Polygon/test/Polygon/PolygonTest.cpp
index 7ca1eacea2e..b86ac41b152 100644
--- a/Polygon/test/Polygon/PolygonTest.cpp
+++ b/Polygon/test/Polygon/PolygonTest.cpp
@@ -1,7 +1,7 @@
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polygon_2.h>
 
-typedef CGAL::Cartesian<double> K;
+typedef CGAL::Simple_cartesian<double> K;
 typedef K::Point_2 Point;
 typedef K::Segment_2 Segment;
 
diff --git a/Polygon/test/Polygon/SimplicityTest.cpp b/Polygon/test/Polygon/SimplicityTest.cpp
index acbb61f69f4..f61946f3c28 100644
--- a/Polygon/test/Polygon/SimplicityTest.cpp
+++ b/Polygon/test/Polygon/SimplicityTest.cpp
@@ -1,6 +1,6 @@
 #define CGAL_POLYGON_DEBUG 1
 
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Exact_rational.h>
 
 #include <CGAL/Point_2.h>
@@ -18,7 +18,7 @@ bool TestSimplicity(const char* FileName)
 // tests the simplicity of the polygon in the file FileName
 {
   typedef CGAL::Exact_rational NT;
-  typedef CGAL::Cartesian<NT> K;
+  typedef CGAL::Simple_cartesian<NT> K;
   typedef CGAL::Point_2<K> Point;
 
   cout << "-----------------------------------------------" << endl;
@@ -54,7 +54,7 @@ bool TestSimplicity(const char* FileName)
 
 void TestDegenerateCases()
 {
-  typedef CGAL::Cartesian<double> K;
+  typedef CGAL::Simple_cartesian<double> K;
   typedef CGAL::Point_2<K> Point;
   std::vector<Point> polygon;
 
diff --git a/Polyhedron_IO/examples/Polyhedron_IO/terr_trian.cpp b/Polyhedron_IO/examples/Polyhedron_IO/terr_trian.cpp
index ef896159368..08d79771a82 100644
--- a/Polyhedron_IO/examples/Polyhedron_IO/terr_trian.cpp
+++ b/Polyhedron_IO/examples/Polyhedron_IO/terr_trian.cpp
@@ -1,8 +1,7 @@
 // Delaunay Triangulation of a set of 3D points in the xy-plane.
 // (Terrain triangulation)
 
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Filtered_kernel.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/IO/Verbose_ostream.h>
 #include <CGAL/IO/File_scanner_OFF.h>
 #include <CGAL/IO/File_writer_OFF.h>
@@ -30,8 +29,7 @@ public:
         : Point_3(x,y,z), index(i)               {}
 };
 
-typedef CGAL::Simple_cartesian<double> SC;
-typedef CGAL::Filtered_kernel<SC> Kernel;
+typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
 
 typedef Indexed_point<Kernel>                              IPoint;
 typedef CGAL::Projection_traits_xy_3<Kernel>               Gtraits;
diff --git a/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp b/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp
index ef835749189..043096017e6 100644
--- a/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp
@@ -19,7 +19,7 @@
 //
 // Author(s)     : Michael Hoffmann <hoffmann@inf.ethz.ch>
 
-#include <CGAL/Cartesian.h>
+#include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polygon_2.h>
 #include <CGAL/point_generators_2.h>
 #include <CGAL/random_convex_set_2.h>
@@ -36,7 +36,7 @@ using CGAL::iterator_distance;
 
 typedef double                                    FT;
 
-struct Kernel : public CGAL::Cartesian<FT> {};
+typedef CGAL::Simple_cartesian<FT>                Kernel;
 
 typedef Kernel::Point_2                           Point;
 typedef std::vector<int>                          Index_cont;
diff --git a/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/sdg-voronoi-edges-exact-linf.cpp b/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/sdg-voronoi-edges-exact-linf.cpp
index 3ae8d3352dd..5c68ed7f3ef 100644
--- a/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/sdg-voronoi-edges-exact-linf.cpp
+++ b/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/sdg-voronoi-edges-exact-linf.cpp
@@ -29,7 +29,6 @@ typedef CGAL::Quotient<exact_ring_t>   exact_field_t;
 
 #endif
 
-//typedef exact_ring_t   ring_number_t;
 typedef exact_field_t  field_number_t;
 
 #include <CGAL/Simple_cartesian.h>
@@ -37,7 +36,6 @@ typedef exact_field_t  field_number_t;
 #include <CGAL/Segment_Delaunay_graph_Linf_2.h>
 #include <CGAL/Segment_Delaunay_graph_Linf_traits_2.h>
 
-//struct K_ring  : public CGAL::Simple_cartesian<ring_number_t> {};
 typedef CGAL::Simple_cartesian<field_number_t> K_field;
 
 typedef CGAL::Field_tag  MTag;
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_et.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_et.cpp
index 43c4de102d9..64859405779 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_et.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_et.cpp
@@ -31,8 +31,8 @@ typedef exact_field_t  field_number_t;
 #include <CGAL/Segment_Delaunay_graph_Linf_2.h>
 #include <CGAL/Segment_Delaunay_graph_Linf_traits_2.h>
 
-struct K_ring  : public CGAL::Simple_cartesian<ring_number_t> {};
-struct K_field : public CGAL::Simple_cartesian<field_number_t> {};
+typedef public CGAL::Simple_cartesian<ring_number_t> K_ring;
+typedef CGAL::Simple_cartesian<field_number_t> K_field;
 
 typedef CGAL::Field_tag  MTag;
 typedef CGAL::Integral_domain_without_division_tag   MTag_wi;
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_ft.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_ft.cpp
index 961eaa43605..2c2da09996d 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_ft.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_2_ft.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_et.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_et.cpp
index 8b9733164a2..b29b4615c6c 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_et.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_et.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
@@ -31,8 +30,8 @@ typedef exact_field_t  field_number_t;
 #include <CGAL/Segment_Delaunay_graph_Linf_hierarchy_2.h>
 #include <CGAL/Segment_Delaunay_graph_Linf_traits_2.h>
 
-struct K_ring  : public CGAL::Simple_cartesian<ring_number_t> {};
-struct K_field : public CGAL::Simple_cartesian<field_number_t> {};
+typedef CGAL::Simple_cartesian<ring_number_t> K_ring;
+typedef CGAL::Simple_cartesian<field_number_t> K_field;
 
 typedef CGAL::Field_tag  MTag;
 typedef CGAL::Integral_domain_without_division_tag   MTag_wi;
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_ft.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_ft.cpp
index ed6565c1997..5f97d4d1a5d 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_ft.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_2_ft.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_no_up.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_no_up.cpp
index adabafdec22..cfe6a4f3b2d 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_no_up.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_no_up.cpp
@@ -1,5 +1,3 @@
-// file: multi_info.cpp
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
@@ -26,7 +24,7 @@ typedef
 CGAL::Segment_Delaunay_graph_Linf_filtered_traits_2<Rep>
 Traits_x;
 
-struct Gt : public Traits_x {};
+typedef Traits_x Gt;
 
 #include "Multi_info.h"
 
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_up.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_up.cpp
index f8eaa456b3a..07b9168b7e9 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_up.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_hierarchy_info_2_up.cpp
@@ -1,5 +1,3 @@
-// file: multi_info.cpp
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
@@ -26,7 +24,7 @@ typedef
 CGAL::Segment_Delaunay_graph_Linf_filtered_traits_2<Rep>
 Traits_x;
 
-struct Gt : public Traits_x {};
+typedef Traits_x Gt;
 
 #include "Multi_info.h"
 
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_info_2.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_info_2.cpp
index d1890725288..2ff83ab4c58 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_info_2.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_info_2.cpp
@@ -1,5 +1,3 @@
-// file: test_sdg_info_2.cpp
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
@@ -25,7 +23,7 @@ typedef
 CGAL::Segment_Delaunay_graph_Linf_filtered_traits_2<Rep>
 Traits_x;
 
-struct Gt : public Traits_x {};
+typedef Traits_x Gt;
 
 #include "Multi_info.h"
 
diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_traits_2.cpp b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_traits_2.cpp
index 35ce072121a..e023bc44390 100644
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_traits_2.cpp
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/test_sdg_linf_traits_2.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/basic.h>
 
 #ifndef CGAL_SDG_VERBOSE
 #define CGAL_SDG_DEBUG(a)
@@ -11,8 +10,10 @@
 #include <cassert>
 #include <vector>
 
-#include <CGAL/Interval_arithmetic.h>
+#include <CGAL/basic.h>
+#include <CGAL/Interval_nt.h>
 #include <CGAL/Simple_cartesian.h>
+
 #include <CGAL/Segment_Delaunay_graph_Linf_traits_2.h>
 #include <CGAL/Segment_Delaunay_graph_Linf_filtered_traits_2.h>
 
diff --git a/Surface_mesher/test/Surface_mesher/combined_spheres.cpp b/Surface_mesher/test/Surface_mesher/combined_spheres.cpp
index 0f381ed63eb..fc2aaf6d6e2 100644
--- a/Surface_mesher/test/Surface_mesher/combined_spheres.cpp
+++ b/Surface_mesher/test/Surface_mesher/combined_spheres.cpp
@@ -19,7 +19,7 @@
 #include <fstream>
 #include <string>
 
-struct K : public CGAL::Exact_predicates_inexact_constructions_kernel {};
+typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef CGAL::Point_with_surface_index_geom_traits<K> My_traits;
 // Multi_surface_traits<Regular_traits> ?
 typedef CGAL::Complex_2_in_triangulation_vertex_base_3<My_traits> Vb;
diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp
index cf671e678a0..14661db311c 100644
--- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp
+++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_ag.cpp
@@ -32,8 +32,8 @@
 #include <CGAL/Apollonius_graph_adaptation_traits_2.h>
 #include <CGAL/Apollonius_graph_adaptation_policies_2.h>
 
-struct Rep : public CGAL::Simple_cartesian<double> {};
-struct K : public CGAL::Apollonius_graph_filtered_traits_2<Rep> {};
+typedef CGAL::Simple_cartesian<double> Rep;
+typedef CGAL::Apollonius_graph_filtered_traits_2<Rep> K;
 
 #if 1 // definitions for hierarchy
 
diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp
index 073f68907e0..0395aac019d 100644
--- a/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp
+++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/vda_sdg.cpp
@@ -40,7 +40,7 @@ typedef CGAL::Integral_domain_without_division_tag  MTag;
 typedef CGAL::Simple_cartesian<NT>      K;
 typedef CGAL::Simple_cartesian<double>  DK;
 
-struct Gt : public CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2<DK> {};
+typedef CGAL::Segment_Delaunay_graph_filtered_traits_without_intersections_2<DK> Gt;
 
 //CGAL::Segment_Delaunay_graph_traits_without_intersections_2<K,MTag>  Gt;