diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_3.h
index d32a12c43c0..9ee09841e16 100644
--- a/Packages/Triangulation_3/include/CGAL/Triangulation_3.h
+++ b/Packages/Triangulation_3/include/CGAL/Triangulation_3.h
@@ -30,18 +30,15 @@
 #include <iostream>
 #include <list>
 #include <map> 
-
 #include <utility>
 
-#include <CGAL/Triangulation_utils_3.h>
-// #include <CGAL/Random.h>
-#include <CGAL/triple.h>
+#include <CGAL/Triangulation_short_names_3.h>
 
+#include <CGAL/Triangulation_utils_3.h>
+#include <CGAL/triple.h>
 #include <CGAL/Pointer.h>
 #include <CGAL/circulator.h>
 
-//#include <CGAL/predicates_on_points_3.h>
-
 #include <CGAL/triangulation_assertions.h>
 
 #include <CGAL/Triangulation_data_structure_3.h>
@@ -52,26 +49,15 @@
 #include <CGAL/Triangulation_iterators_3.h>
 #include <CGAL/Triangulation_circulators_3.h>
 
-#include <CGAL/Triangulation_short_names_3.h>
-
 CGAL_BEGIN_NAMESPACE
 
-template < class GT, class Tds>
-class Triangulation_cell_iterator_3;
-template < class GT, class Tds>
-class Triangulation_vertex_iterator_3;
-template < class GT, class Tds>
-class Triangulation_edge_iterator_3;
-template < class GT, class Tds>
-class Triangulation_facet_iterator_3;
-
-template < class GT, class Tds>
-class Triangulation_cell_circulator_3;
-template < class GT, class Tds>
-class Triangulation_facet_circulator_3;
-
-template < class GT, class Tds>
-class Triangulation_cell_3;
+template < class GT, class Tds> class Triangulation_cell_iterator_3;
+template < class GT, class Tds> class Triangulation_vertex_iterator_3;
+template < class GT, class Tds> class Triangulation_edge_iterator_3;
+template < class GT, class Tds> class Triangulation_facet_iterator_3;
+template < class GT, class Tds> class Triangulation_cell_circulator_3;
+template < class GT, class Tds> class Triangulation_facet_circulator_3;
+template < class GT, class Tds> class Triangulation_cell_3;
 
 template < class GT, class Tds > std::istream& operator>> 
 (std::istream& is, Triangulation_3<GT,Tds> &tr);
diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
index 4db27c656da..949f36bee79 100644
--- a/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
+++ b/Packages/Triangulation_3/include/CGAL/Triangulation_ds_iterators_3.h
@@ -25,10 +25,10 @@
 
 #include <utility>
 
-#include <CGAL/triple.h>
-#include <CGAL/triangulation_assertions.h>
-#include <CGAL/Triangulation_ds_circulators_3.h>
 #include <CGAL/Triangulation_short_names_3.h>
+#include <CGAL/triangulation_assertions.h>
+#include <CGAL/triple.h>
+#include <CGAL/Triangulation_ds_circulators_3.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h b/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h
index 32023e4e54c..299e0927915 100644
--- a/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h
+++ b/Packages/Triangulation_3/include/CGAL/Triangulation_iterators_3.h
@@ -26,37 +26,21 @@
 
 #include <utility>
 #include <iterator>
+
+#include <CGAL/Triangulation_short_names_3.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_ds_iterators_3.h>
 
-#include <CGAL/Triangulation_short_names_3.h>
-
 CGAL_BEGIN_NAMESPACE
 
-template < class Gt, class Tds >
-class Triangulation_3;
-
-template < class Gt, class Tds >
-class Triangulation_cell_3;
-
-template < class Gt, class Tds >
-class Triangulation_vertex_3;
-
-template < class Gt, class Tds>
-class Triangulation_3;
-
-template < class Gt, class Tds>
-class Triangulation_cell_iterator_3;
-
-template < class Gt, class Tds>
-class Triangulation_facet_iterator_3;
-
-template < class Gt, class Tds>
-class Triangulation_edge_iterator_3;
-
-template < class Gt, class Tds>
-class Triangulation_vertex_iterator_3;
-
+template < class Gt, class Tds > class Triangulation_3;
+template < class Gt, class Tds > class Triangulation_cell_3;
+template < class Gt, class Tds > class Triangulation_vertex_3;
+template < class Gt, class Tds > class Triangulation_3;
+template < class Gt, class Tds > class Triangulation_cell_iterator_3;
+template < class Gt, class Tds > class Triangulation_facet_iterator_3;
+template < class Gt, class Tds > class Triangulation_edge_iterator_3;
+template < class Gt, class Tds > class Triangulation_vertex_iterator_3;
 
 template < class Gt, class Tds>
 class Triangulation_cell_iterator_3