diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
index 4168c28f9cd..caec5339052 100644
--- a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
@@ -19,7 +19,6 @@
 //                 Sylvain Pion
 //                 Andreas Fabri <Andreas.Fabri@sophia.inria.fr>
 
-
 #ifndef CGAL_DELAUNAY_TRIANGULATION_3_H
 #define CGAL_DELAUNAY_TRIANGULATION_3_H
 
@@ -28,7 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_3.h>
 #include <CGAL/Delaunay_remove_tds_3.h>
 #include <CGAL/iterator.h>
diff --git a/Triangulation_3/include/CGAL/Dummy_tds_3.h b/Triangulation_3/include/CGAL/Dummy_tds_3.h
index c3a01b6724d..69917e82c5a 100644
--- a/Triangulation_3/include/CGAL/Dummy_tds_3.h
+++ b/Triangulation_3/include/CGAL/Dummy_tds_3.h
@@ -21,7 +21,6 @@
 #define CGAL_TRIANGULATION_DUMMY_TDS_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
index 18f9aea63ff..9271a20642a 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h
@@ -26,7 +26,6 @@
 
 #include <set>
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_3.h>
 #include <CGAL/Regular_triangulation_cell_base_3.h>
 
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
index dac69b8ba2f..86cf85bb1b2 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Sylvain Pion
 //                 Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
@@ -23,7 +22,6 @@
 #define CGAL_REGULAR_TRIANGULATION_EUCLIDEAN_TRAITS_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Weighted_point.h>
 #include <CGAL/representation_tags.h>
diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h
index e4ad06fe43f..8d2f2eee583 100644
--- a/Triangulation_3/include/CGAL/Triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_3.h
@@ -14,11 +14,9 @@
 // $URL$
 // $Id$
 // 
-//
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 //                 Sylvain Pion
 
-
 #ifndef CGAL_TRIANGULATION_3_H
 #define CGAL_TRIANGULATION_3_H
 
@@ -31,7 +29,6 @@
 #include <utility>
 #include <stack>
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_utils_3.h>
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h
index 45849db432b..ebeeef8fe56 100644
--- a/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_cell_base_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 //                 Sylvain Pion
@@ -25,7 +24,6 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_ds_cell_base_3.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
index bcce5f98b7f..b496ad8d170 100644
--- a/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
@@ -25,7 +25,6 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_ds_cell_base_3.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
index 41dd1337c97..2bb9404f280 100644
--- a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h
@@ -13,16 +13,13 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 //                 Sylvain Pion
-//
+
 // combinatorial triangulation of the boundary of a polytope
 // of dimension d in dimension d+1
 // for -1 <= d <= 3
-//
-// ============================================================================
 
 #ifndef CGAL_TRIANGULATION_DATA_STRUCTURE_3_H
 #define CGAL_TRIANGULATION_DATA_STRUCTURE_3_H
@@ -38,7 +35,6 @@
 #include <CGAL/utility.h>
 #include <CGAL/iterator.h>
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_utils_3.h>
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h
index e740b450e1a..cfed1a1ddc6 100644
--- a/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 //                 Sylvain Pion
@@ -25,7 +24,6 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Dummy_tds_3.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h
index da4b8009663..372f702547b 100644
--- a/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h
@@ -13,14 +13,12 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 
 #ifndef CGAL_TRIANGULATION_DS_CIRCULATORS_3_H
 #define CGAL_TRIANGULATION_DS_CIRCULATORS_3_H
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_utils_3.h>
 #include <CGAL/circulator_bases.h>
diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
index 51c02143bf1..04841862caa 100644
--- a/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 
@@ -22,7 +21,6 @@
 
 #include <utility>
 
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_ds_circulators_3.h>
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h
index af05386a0d5..61df8b22008 100644
--- a/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 
@@ -21,7 +20,6 @@
 #define CGAL_TRIANGULATION_DS_VERTEX_BASE_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Dummy_tds_3.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h b/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h
index 85fdb6d733c..bf7e675e725 100644
--- a/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_geom_traits_3.h
@@ -13,14 +13,11 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Andreas Fabri <Andreas.Fabri@sophia.inria.fr>
 //                 Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
-//
+
 // geometric traits for a <=3 D triangulation
-//
-// ============================================================================
 
 // OBSOLETE !!!!!!!!!!!!!!!!!
 
@@ -30,7 +27,6 @@
 #include <CGAL/basic.h>
 
 #include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_short_names_3.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
index e8e2b7e5175..7b91e602d37 100644
--- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
 //                 Sylvain Pion
@@ -22,7 +21,6 @@
 #define CGAL_TRIANGULATION_HIERARCHY_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Random.h>
 #include <CGAL/Triangulation_hierarchy_vertex_base_3.h>
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h
index 11413f6d53b..8adbdb8b885 100644
--- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_vertex_base_3.h
@@ -14,7 +14,6 @@
 // $URL$
 // $Id$
 // 
-//
 // Author(s)     : Olivier Devillers <Olivier.Devillers@sophia.inria.fr>
 //                 Sylvain Pion
 
@@ -22,7 +21,6 @@
 #define CGAL_TRIANGULATION_HIERARCHY_VERTEX_BASE_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Triangulation_3/include/CGAL/Triangulation_short_names_3.h b/Triangulation_3/include/CGAL/Triangulation_short_names_3.h
deleted file mode 100644
index c7fa9706a53..00000000000
--- a/Triangulation_3/include/CGAL/Triangulation_short_names_3.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 1999  INRIA Sophia-Antipolis (France).
-// All rights reserved.
-//
-// This file is part of CGAL (www.cgal.org); you may redistribute it under
-// the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with CGAL.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// $URL$
-// $Id$
-// 
-//
-// Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
-
-#ifndef CGAL_TRIANGULATION_SHORT_NAMES_3_H
-#define CGAL_TRIANGULATION_SHORT_NAMES_3_H
-
-#if 0 // Disabled to see if it's still really needed.
-
-#define Triangulation_vertex_base_3                 T_vb3
-#define Triangulation_cell_base_3                   T_cb3
-
-#define Triangulation_data_structure_3              TDS3
-
-#define Triangulation_ds_vertex_base_3              TDS_vb3
-#define Triangulation_ds_cell_base_3                TDS_cb3
-
-#define Triangulation_ds_edge_iterator_3            TDS_eit3
-#define Triangulation_ds_facet_iterator_3           TDS_fit3
-
-#define Triangulation_ds_cell_circulator_3          TDS_ccir3
-#define Triangulation_ds_facet_circulator_3         TDS_fcir3
-
-#define Triangulation_3                             TR3
-
-#define Delaunay_triangulation_3                    DT3
-#define Delaunay_remove_tds_face_3_2                DRf32
-#define Delaunay_remove_tds_vertex_3_2              DRv32
-
-#define Regular_triangulation_euclidean_traits_3    R_gt3
-#define Regular_triangulation_filtered_traits_3     R_ft3
-#define Regular_triangulation_3                     RT3
-
-#define Triangulation_hierarchy_3                   TH3
-#define Triangulation_hierarchy_vertex_base_3       TH_vb3
-
-#endif // 0
-
-#endif // CGAL_TRIANGULATION_SHORT_NAMES_3_H
diff --git a/Triangulation_3/include/CGAL/Triangulation_utils_3.h b/Triangulation_3/include/CGAL/Triangulation_utils_3.h
index e5be72e5e8b..2bec3211d72 100644
--- a/Triangulation_3/include/CGAL/Triangulation_utils_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_utils_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 
@@ -22,7 +21,6 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_utils_2.h>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h b/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h
index 310ebff0444..6d50ce9f3e0 100644
--- a/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_vertex_base_3.h
@@ -13,7 +13,6 @@
 //
 // $URL$
 // $Id$
-// 
 //
 // Author(s)     : Monique Teillaud <Monique.Teillaud@sophia.inria.fr>
 
@@ -21,7 +20,6 @@
 #define CGAL_TRIANGULATION_VERTEX_BASE_3_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/Triangulation_ds_vertex_base_3.h>
 
 CGAL_BEGIN_NAMESPACE