diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_short_names_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_short_names_2.h
deleted file mode 100644
index fa44f4a11f1..00000000000
--- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_short_names_2.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H
-#define CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H
-
-
-// Define shorter names
-
-   #define Cartesian Ca
-   #define Homogeneous Hg
-//   #define Quotient Qt
-
-   #define Triangulation_test_point Ttp
-   #define Triangulation_test_segment Tts
-   #define Triangulation_test_line Ttl
-   #define Triangulation_test_direction Ttd
-   #define Triangulation_test_ray Ttr
-   #define Triangulation_test_distance Ttdst
-   #define _Triangulation_test_traits _Tttr
-
-#endif //CGAL_TRIANGULATION_TEST_SHORT_NAMES_2_H
diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h
index 3b9285f281e..c9ad3bd67aa 100644
--- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h
+++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_types.h
@@ -1,34 +1,12 @@
 #ifndef CGAL_TEST_TYPES_H
 #define CGAL_TEST_TYPES_H
 
-#include <CGAL/_test_short_names_2.h>
-
-#include <CGAL/basic.h>
 #include <iostream>
 #include <cassert>
 
-
-
-
-// #ifdef CGAL_USE_CLN
-// #include <CGAL/CLN/cl_integer.h>
-// #include <cl_io.h>
-// #include <cl_integer_io.h>
-// typedef cl_I Rtype;
-// #else
-// #ifdef CGAL_USE_GMP
-// #include <CGAL/Gmpz.h>
-// typedef CGAL::Gmpz Rtype;
-// #else
-// #ifdef CGAL_USE_LEDA
-// #include <CGAL/leda_integer.h>
-// typedef leda_integer Rtype;
-// #else
+#include <CGAL/basic.h>
 #include <CGAL/MP_Float.h>
 typedef CGAL::MP_Float Rtype;
-//#endif // CGAL_USE_LEDA
-//#endif // CGAL_USE_GMP
-//#endif // CGAL_USE_CLN
 
 #include <CGAL/Quotient.h>
 typedef CGAL::Quotient<CGAL::MP_Float>  Ftype;
@@ -42,11 +20,9 @@ typedef CGAL::Homogeneous<Rtype>              Test_rep_homogeneous;
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Filtered_kernel.h>
 typedef CGAL::Simple_cartesian<double>  K1;
-typedef CGAL::Filtered_kernel<K1>       K;
-struct TestK : public K {}; 
+typedef CGAL::Filtered_kernel<K1> TestK; 
 
 typedef CGAL::Quotient<Ftype>                       Exact_type;
-typedef CGAL::Simple_cartesian<Exact_type>          Exact_kernel;
-struct EK : public Exact_kernel {};
+typedef CGAL::Simple_cartesian<Exact_type>          EK;
 
 #endif