Cleanup : remove ancient CGAL_PROTECT_* macros.

It's the compiler's job to optimize preprocessing time.
2007-01-24 17:16:05 +00:00 · 2007-01-24 17:16:05 +00:00 · fb8595b94e
parent 9b7a13a3ed
commit fb8595b94e
35 changed files with 76 additions and 386 deletions
--- a/Circulator/include/CGAL/circulator_bases.h
+++ b/Circulator/include/CGAL/circulator_bases.h
@ -24,14 +24,8 @@
 #ifndef CGAL_CIRCULATOR_BASES_H
 #define CGAL_CIRCULATOR_BASES_H 1

-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
 #include <iterator>
-#define CGAL_PROTECT_ITERATOR
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Circulator/test/Circulator/test_circ1.C
+++ b/Circulator/test/Circulator/test_circ1.C
@ -2244,10 +2244,8 @@ void test_container_from_circulator() {
  delete_nodes(data_struct);
  delete[] my_C_array;
 }
-#ifndef CGAL_PROTECT_ALGORITHM
+
 #include <algorithm>
-#define CGAL_PROTECT_ALGORITHM
-#endif

 void test_circulator_from_iterator() {
  int* my_C_array  = new_C_array();
--- a/Generator/include/CGAL/random_selection.h
+++ b/Generator/include/CGAL/random_selection.h
@ -23,17 +23,10 @@

 #ifndef CGAL_RANDOM_SELECTION_H
 #define CGAL_RANDOM_SELECTION_H 1
-#ifndef CGAL_PROTECT_CSTDDEF
+
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
 #include <iterator>
-#define CGAL_PROTECT_ITERATOR
-#endif
-#ifndef CGAL_RANDOM_H
 #include <CGAL/Random.h>
-#endif

 CGAL_BEGIN_NAMESPACE

@ -67,5 +60,5 @@ OutputIterator random_selection( RandomAccessIterator first,
 }

 CGAL_END_NAMESPACE    
+
 #endif // CGAL_RANDOM_SELECTION_H //
-// EOF //
--- a/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h
+++ b/HalfedgeDS/include/CGAL/HalfedgeDS_const_decorator.h
@ -24,16 +24,9 @@
 #ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H
 #define CGAL_HALFEDGEDS_CONST_DECORATOR_H 1

-#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H
 #include <CGAL/HalfedgeDS_items_decorator.h>
-#endif
-#ifndef CGAL_PROTECT_VECTOR
 #include <vector>
-#define CGAL_PROTECT_VECTOR
-#endif
-#ifndef CGAL_IO_VERBOSE_OSTREAM_H
 #include <CGAL/IO/Verbose_ostream.h>
-#endif // CGAL_IO_VERBOSE_OSTREAM_H

 CGAL_BEGIN_NAMESPACE

--- a/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h
+++ b/HalfedgeDS/include/CGAL/HalfedgeDS_decorator.h
@ -24,20 +24,10 @@
 #ifndef CGAL_HALFEDGEDS_DECORATOR_H
 #define CGAL_HALFEDGEDS_DECORATOR_H 1

-#ifndef CGAL_HALFEDGEDS_ITEMS_DECORATOR_H
 #include <CGAL/HalfedgeDS_items_decorator.h>
-#endif
-#ifndef CGAL_HALFEDGEDS_CONST_DECORATOR_H
 #include <CGAL/HalfedgeDS_const_decorator.h>
-#endif
-#ifndef CGAL_PROTECT_VECTOR
 #include <vector>
-#define CGAL_PROTECT_VECTOR
-#endif
-
-#ifndef CGAL_IO_VERBOSE_OSTREAM_H
 #include <CGAL/IO/Verbose_ostream.h>
-#endif // CGAL_IO_VERBOSE_OSTREAM_H

 CGAL_BEGIN_NAMESPACE

--- a/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h
+++ b/HalfedgeDS/include/CGAL/HalfedgeDS_iterator_adaptor.h
@ -23,10 +23,8 @@

 #ifndef CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H
 #define CGAL_HALFEDGEDS_ITERATOR_ADAPTOR_H 1
-#ifndef CGAL_PROTECT_ITERATOR
+
 #include <iterator>
-#define CGAL_PROTECT_ITERATOR
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Min_annulus_d/web/Min_annulus_d.aw
+++ b/Min_annulus_d/web/Min_annulus_d.aw
@ -393,10 +393,7 @@ The inputs points are kept in a vector to have random access to them.
 Their dimension is stored separately.

@macro <Min_annulus_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_VECTOR
-    #  include <vector>
-    #  define CGAL_PROTECT_VECTOR
-    #endif
+    #include <vector>
@end

@macro <Min_annulus_d private types> += @begin
@ -450,10 +447,7 @@ Two constructors are provided. If the user wants to get some verbose output
 \ccc{verbose} and \ccc{stream}.

@macro <Min_annulus_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <iostream>
@end

@macro <Min_annulus_d member functions> += @begin
@ -545,10 +539,7 @@ following function class.
 Another function class is used to divide the index by 2.

@macro <Min_annulus_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_FUNCTIONAL_H
-    #  include <functional>
-    #  define CGAL_PROTECT_FUNCTIONAL_H
-    #endif
+    #include <functional>
@end

@macro<Min_annulus_d private types> += @begin
--- a/Min_circle_2/web/Min_circle_2.aw
+++ b/Min_circle_2/web/Min_circle_2.aw
@ -2787,29 +2787,12 @@ end of each file.
    #ifndef CGAL_MIN_CIRCLE_2_H
    #define CGAL_MIN_CIRCLE_2_H

-    // includes
-    #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/Optimisation/basic.h>
-    #endif
-    #ifndef CGAL_RANDOM_H
-    #  include <CGAL/Random.h>
-    #endif
-    #ifndef CGAL_PROTECT_LIST
-    #  include <list>
-    #  define CGAL_PROTECT_LIST
-    #endif
-    #ifndef CGAL_PROTECT_VECTOR
-    #  include <vector>
-    #  define CGAL_PROTECT_VECTOR
-    #endif
-    #ifndef CGAL_PROTECT_ALGORITHM
-    #  include <algorithm>
-    #  define CGAL_PROTECT_ALGORITHM
-    #endif
-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <CGAL/Optimisation/basic.h>
+    #include <CGAL/Random.h>
+    #include <list>
+    #include <vector>
+    #include <algorithm>
+    #include <iostream>

    @<namespace begin>("CGAL")
    
--- a/Min_ellipse_2/include/CGAL/Min_ellipse_2.h
+++ b/Min_ellipse_2/include/CGAL/Min_ellipse_2.h
@ -20,29 +20,12 @@
 #ifndef CGAL_MIN_ELLIPSE_2_H
 #define CGAL_MIN_ELLIPSE_2_H

-// includes
-#ifndef CGAL_OPTIMISATION_BASIC_H
-#  include <CGAL/Optimisation/basic.h>
-#endif
-#ifndef CGAL_RANDOM_H
-#  include <CGAL/Random.h>
-#endif
-#ifndef CGAL_PROTECT_LIST
-#  include <list>
-#  define CGAL_PROTECT_LIST
-#endif
-#ifndef CGAL_PROTECT_VECTOR
-#  include <vector>
-#  define CGAL_PROTECT_VECTOR
-#endif
-#ifndef CGAL_PROTECT_ALGORITHM
-#  include <algorithm>
-#  define CGAL_PROTECT_ALGORITHM
-#endif
-#ifndef CGAL_PROTECT_IOSTREAM
-#  include <iostream>
-#  define CGAL_PROTECT_IOSTREAM
-#endif
+#include <CGAL/Optimisation/basic.h>
+#include <CGAL/Random.h>
+#include <list>
+#include <vector>
+#include <algorithm>
+#include <iostream>

 CGAL_BEGIN_NAMESPACE

--- a/Min_ellipse_2/web/Min_ellipse_2.aw
+++ b/Min_ellipse_2/web/Min_ellipse_2.aw
@ -3000,28 +3000,12 @@ end of each file.
    #define CGAL_MIN_ELLIPSE_2_H

    // includes
-    #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/Optimisation/basic.h>
-    #endif
-    #ifndef CGAL_RANDOM_H
-    #  include <CGAL/Random.h>
-    #endif
-    #ifndef CGAL_PROTECT_LIST
-    #  include <list>
-    #  define CGAL_PROTECT_LIST
-    #endif
-    #ifndef CGAL_PROTECT_VECTOR
-    #  include <vector>
-    #  define CGAL_PROTECT_VECTOR
-    #endif
-    #ifndef CGAL_PROTECT_ALGORITHM
-    #  include <algorithm>
-    #  define CGAL_PROTECT_ALGORITHM
-    #endif
-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <CGAL/Optimisation/basic.h>
+    #include <CGAL/Random.h>
+    #include <list>
+    #include <vector>
+    #include <algorithm>
+    #include <iostream>

    @<namespace begin>("CGAL")
    
--- a/Min_sphere_d/include/CGAL/Min_sphere_d.h
+++ b/Min_sphere_d/include/CGAL/Min_sphere_d.h
@ -37,15 +37,9 @@
 #  include <CGAL/Min_sphere_d/Optimisation_sphere_d.h>


-#ifndef CGAL_PROTECT_LIST
-#  include <list>
-#  define CGAL_PROTECT_LIST
-#endif
+#include <list>

-#ifndef CGAL_PROTECT_IOSTREAM
-#  include <iostream>
-#  define CGAL_PROTECT_IOSTREAM
-#endif
+#include <iostream>

 CGAL_BEGIN_NAMESPACE

--- a/Min_sphere_d/web/Doc_Min_sphere_d.aw
+++ b/Min_sphere_d/web/Doc_Min_sphere_d.aw
@ -3137,15 +3137,9 @@ int main ()
    #  include <CGAL/Optimisation_sphere_d.h>
    

-    #ifndef CGAL_PROTECT_LIST
-    #  include <list>
-    #  define CGAL_PROTECT_LIST
-    #endif
+    #include <list>

-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <iostream>

    CGAL_BEGIN_NAMESPACE

--- a/Min_sphere_d_new/web/Min_sphere_d.aw
+++ b/Min_sphere_d_new/web/Min_sphere_d.aw
@ -279,10 +279,7 @@ The inputs points are kept in a vector to have random access to them.
 Their dimension is stored separately.

@macro <Min_sphere_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_VECTOR
-    #  include <vector>
-    #  define CGAL_PROTECT_VECTOR
-    #endif
+    #include <vector>
@end

@macro <Min_sphere_d private types> += @begin
@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output
 \ccc{verbose} and \ccc{stream}.

@macro <Min_sphere_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <iostream>
@end

@macro <Min_sphere_d member functions> += @begin
--- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
+++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
@ -24,22 +24,10 @@
 #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H
 #define CGAL_OPTIMISATION_CONSTRUCT_POINT_2_H

-// includes
-#ifndef CGAL_POINT_2_H
-#  include <CGAL/Point_2.h>
-#endif
-#ifndef CGAL_PROTECT_VECTOR
-#  include <vector>
-#  define CGAL_PROTECT_VECTOR
-#endif
-#ifndef CGAL_PROTECT_FUNCTIONAL
-#  include <functional>
-#  define CGAL_PROTECT_FUNCTIONAL
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
-#  include <iterator>
-#  define CGAL_PROTECT_ITERATOR
-#endif
+#include <CGAL/Point_2.h>
+#include <vector>
+#include <functional>
+#include <iterator>

 CGAL_BEGIN_NAMESPACE

--- a/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
+++ b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
@ -24,22 +24,10 @@
 #ifndef CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H
 #define CGAL_OPTIMISATION_CONSTRUCT_POINT_3_H

-// includes
-#ifndef CGAL_POINT_3_H
-#  include <CGAL/Point_3.h>
-#endif
-#ifndef CGAL_PROTECT_VECTOR
-#  include <vector>
-#  define CGAL_PROTECT_VECTOR
-#endif
-#ifndef CGAL_PROTECT_FUNCTIONAL
-#  include <functional>
-#  define CGAL_PROTECT_FUNCTIONAL
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
-#  include <iterator>
-#  define CGAL_PROTECT_ITERATOR
-#endif
+#include <CGAL/Point_3.h>
+#include <vector>
+#include <functional>
+#include <iterator>

 CGAL_BEGIN_NAMESPACE

--- a/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h
+++ b/Polyhedron_IO/examples/Polyhedron_IO/triangulation_print_OFF.h
@ -3,10 +3,7 @@
 #ifndef CGAL_TRIANGULATION_PRINT_OFF_H
 #define CGAL_TRIANGULATION_PRINT_OFF_H 1

-#ifndef CGAL_PROTECT_MAP
 #include <map>
-#define CGAL_PROTECT_MAP
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Polytope_distance_d/web/Polytope_distance_d.aw
+++ b/Polytope_distance_d/web/Polytope_distance_d.aw
@ -280,10 +280,7 @@ The inputs points are kept in a vector to have random access to them.
 Their dimension is stored separately.

@macro <Poly_dist_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_VECTOR
-    #  include <vector>
-    #  define CGAL_PROTECT_VECTOR
-    #endif
+    #include <vector>
@end

@macro <Poly_dist_d private types> += @begin
@ -335,10 +332,7 @@ Two constructors are provided. If the user wants to get some verbose output
 \ccc{verbose} and \ccc{stream}.

@macro <Poly_dist_d standard includes> += @begin
-    #ifndef CGAL_PROTECT_IOSTREAM
-    #  include <iostream>
-    #  define CGAL_PROTECT_IOSTREAM
-    #endif
+    #include <iostream>
@end

@macro <Poly_dist_d member functions> += @begin
--- a/QP_solver/include/CGAL/QP_solver.h
+++ b/QP_solver/include/CGAL/QP_solver.h
@ -33,22 +33,11 @@

 #include <CGAL/algorithm.h>

-#ifndef CGAL_IO_VERBOSE_OSTREAM_H
 #include <CGAL/IO/Verbose_ostream.h>
-#endif

-#ifndef CGAL_PROTECT_VECTOR
-#  define CGAL_PROTECT_VECTOR
-#  include <vector>
-#endif
-#ifndef CGAL_PROTECT_NUMERIC
-#  define CGAL_PROTECT_NUMERIC
-#  include <numeric>
-#endif
-#ifndef CGAL_PROTECT_ALGORITHM
-#  define CGAL_PROTECT_ALGORITHM
-#  include <algorithm>
-#endif
+#include <vector>
+#include <numeric>
+#include <algorithm>

 CGAL_BEGIN_NAMESPACE

--- a/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h
+++ b/QP_solver/include/CGAL/QP_solver/QP_basis_inverse.h
@ -23,18 +23,9 @@
 #ifndef CGAL_QP_SOLVER_QP_BASIS_INVERSE_H
 #define CGAL_QP_SOLVER_QP_BASIS_INVERSE_H

-// includes
-#ifndef CGAL_QP_SOLVER_BASIC_H
-#  include <CGAL/QP_solver/basic.h>
-#endif
-#ifndef CGAL_IO_VERBOSE_OSTREAM_H
-#  include <CGAL/IO/Verbose_ostream.h>
-#endif
-      
-#ifndef CGAL_PROTECT_VECTOR
-#  define CGAL_PROTECT_VECTOR
-#  include <vector>
-#endif
+#include <CGAL/QP_solver/basic.h>
+#include <CGAL/IO/Verbose_ostream.h>
+#include <vector>

 CGAL_BEGIN_NAMESPACE
                    
--- a/QP_solver/include/CGAL/QP_solver/functors.h
+++ b/QP_solver/include/CGAL/QP_solver/functors.h
@ -23,22 +23,10 @@
 #ifndef CGAL_QP_SOLVER_FUNCTORS_H
 #define CGAL_QP_SOLVER_FUNCTORS_H

-// includes
-#ifndef CGAL_QP_SOLVER_BASIC_H
-#  include <CGAL/QP_solver/basic.h>
-#endif
-#ifndef CGAL_FUNCTION_OBJECTS_H
-#  include <CGAL/function_objects.h>
-#endif
-
-#ifndef CGAL_PROTECT_FUNCTIONAL
-#  define CGAL_PROTECT_FUNCTIONAL
-#  include <functional>
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
-#  define CGAL_PROTECT_ITERATOR
-#  include <iterator>
-#endif
+#include <CGAL/QP_solver/basic.h>
+#include <CGAL/function_objects.h>
+#include <functional>
+#include <iterator>

 CGAL_BEGIN_NAMESPACE

--- a/Random_numbers/src/CGAL/Random.cpp
+++ b/Random_numbers/src/CGAL/Random.cpp
@ -22,12 +22,7 @@
 // Author(s)     : Sven Schönherr <sven@inf.ethz.ch>

 #include <CGAL/Random.h>
-
-// additional includes
-#ifndef CGAL_PROTECT_CTIME
-#  include <ctime>
-#  define CGAL_PROTECT_CTIME
-#endif
+#include <ctime>

 CGAL_BEGIN_NAMESPACE

@ -63,5 +58,3 @@ Random( unsigned int  seed)
 Random  default_random;

 CGAL_END_NAMESPACE
-
-// ===== EOF ==================================================================
--- a/Random_numbers/web/Random.aw
+++ b/Random_numbers/web/Random.aw
@ -467,10 +467,7 @@ numbers.
    // Class implementation (inline functions)
    // =======================================
    // includes
-    #ifndef CGAL_PROTECT_CSTDLIB
-    #  include <cstdlib>
-    #  define CGAL_PROTECT_CSTDLIB
-    #endif
+    #include <cstdlib>

    @<namespace begin>("CGAL")

@ -498,14 +495,8 @@ numbers.
    #include <CGAL/Random.h>

    // additional includes
-    #ifndef CGAL_PROTECT_CTIME
-    #  include <ctime>
-    #  define CGAL_PROTECT_CTIME
-    #endif
-    #ifndef CGAL_PROTECT_SYS_TIME_H
-    #  include <sys/time.h>
-    #  define CGAL_PROTECT_SYS_TIME_H
-    #endif
+    #include <ctime>
+    #include <sys/time.h>

    @<namespace begin>("CGAL")

--- a/Stream_support/include/CGAL/IO/File_header_OFF.h
+++ b/Stream_support/include/CGAL/IO/File_header_OFF.h
@ -24,13 +24,9 @@

 #ifndef CGAL_IO_FILE_HEADER_OFF_H
 #define CGAL_IO_FILE_HEADER_OFF_H 1
-#ifndef CGAL_IO_FILE_HEADER_EXTENDED_OFF_H
+
 #include <CGAL/IO/File_header_extended_OFF.h>
-#endif // CGAL_IO_FILE_HEADER_EXTENDED_OFF_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/File_writer_OFF.h
+++ b/Stream_support/include/CGAL/IO/File_writer_OFF.h
@ -23,20 +23,11 @@

 #ifndef CGAL_IO_FILE_WRITER_OFF_H
 #define CGAL_IO_FILE_WRITER_OFF_H 1
-#ifndef CGAL_IO_BINARY_FILE_IO_H
+
 #include <CGAL/IO/binary_file_io.h>
-#endif // CGAL_IO_BINARY_FILE_IO_H
-#ifndef CGAL_IO_FILE_HEADER_OFF_H
 #include <CGAL/IO/File_header_OFF.h>
-#endif // CGAL_IO_FILE_HEADER_OFF_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/File_writer_VRML_2.h
+++ b/Stream_support/include/CGAL/IO/File_writer_VRML_2.h
@ -23,17 +23,10 @@

 #ifndef CGAL_IO_FILE_WRITER_VRML_2_H
 #define CGAL_IO_FILE_WRITER_VRML_2_H 1
-#ifndef CGAL_BASIC_H
+
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/File_writer_inventor.h
+++ b/Stream_support/include/CGAL/IO/File_writer_inventor.h
@ -23,17 +23,10 @@

 #ifndef CGAL_IO_FILE_WRITER_INVENTOR_H
 #define CGAL_IO_FILE_WRITER_INVENTOR_H 1
-#ifndef CGAL_BASIC_H
+
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/File_writer_wavefront.h
+++ b/Stream_support/include/CGAL/IO/File_writer_wavefront.h
@ -23,17 +23,10 @@

 #ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H
 #define CGAL_IO_FILE_WRITER_WAVEFRONT_H 1
-#ifndef CGAL_IO_BINARY_FILE_IO_H
+
 #include <CGAL/IO/binary_file_io.h>
-#endif // CGAL_IO_BINARY_FILE_IO_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/Generic_writer.h
+++ b/Stream_support/include/CGAL/IO/Generic_writer.h
@ -23,13 +23,9 @@

 #ifndef CGAL_IO_GENERIC_WRITER_H
 #define CGAL_IO_GENERIC_WRITER_H 1
-#ifndef CGAL_BASIC_H
+
 #include <CGAL/basic.h>
-#endif
-#ifndef CGAL_PROTECT_ITERATOR
 #include <iterator>
-#define CGAL_PROTECT_ITERATOR
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/include/CGAL/IO/generic_copy_OFF.h
+++ b/Stream_support/include/CGAL/IO/generic_copy_OFF.h
@ -23,23 +23,12 @@

 #ifndef CGAL_IO_GENERIC_COPY_OFF_H
 #define CGAL_IO_GENERIC_COPY_OFF_H 1
-#ifndef CGAL_BASIC_H
+
 #include <CGAL/basic.h>
-#endif
-#ifndef CGAL_PROTECT_CSTDDEF
 #include <cstddef>
-#define CGAL_PROTECT_CSTDDEF
-#endif
-#ifndef CGAL_IO_FILE_HEADER_OFF_H
 #include <CGAL/IO/File_header_OFF.h>
-#endif // CGAL_IO_FILE_HEADER_OFF_H
-#ifndef CGAL_IO_FILE_SCANNER_OFF_H
 #include <CGAL/IO/File_scanner_OFF.h>
-#endif // CGAL_IO_FILE_SCANNER_OFF_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/src/CGAL/File_header_OFF.cpp
+++ b/Stream_support/src/CGAL/File_header_OFF.cpp
@ -21,38 +21,15 @@
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-sb.mpg.de>

-#ifndef CGAL_BASIC_H
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_KNOWN_BIT_SIZE_INTEGERS_H
 #include <CGAL/known_bit_size_integers.h>
-#endif
-#ifndef CGAL_PROTECT_CSTDLIB
 #include <cstdlib>
-#define CGAL_PROTECT_CSTDLIB
-#endif
-#ifndef CGAL_PROTECT_CCTYPE
 #include <cctype>
-#define CGAL_PROTECT_CCTYPE
-#endif
-#ifndef CGAL_PROTECT_CSTRING
 #include <cstring>
-#define CGAL_PROTECT_CSTRING
-#endif
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_IO_BINARY_FILE_IO_H
 #include <CGAL/IO/binary_file_io.h>
-#endif // CGAL_IO_BINARY_FILE_IO_H
-#ifndef CGAL_IO_FILE_HEADER_OFF_H
 #include <CGAL/IO/File_header_OFF.h>
-#endif // CGAL_IO_FILE_HEADER_OFF_H
-#ifndef CGAL_PROTECT_ALGORITHM
 #include <algorithm>
-#define CGAL_PROTECT_ALGORITHM
-#endif

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/src/CGAL/File_scanner_OFF.cpp
+++ b/Stream_support/src/CGAL/File_scanner_OFF.cpp
@ -21,23 +21,11 @@
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-sb.mpg.de>

-#ifndef CGAL_BASIC_H
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_CSTDLIB
 #include <cstdlib>
-#define CGAL_PROTECT_CSTDLIB
-#endif
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_IO_BINARY_FILE_IO_H
 #include <CGAL/IO/binary_file_io.h>
-#endif // CGAL_IO_BINARY_FILE_IO_H
-#ifndef CGAL_IO_FILE_SCANNER_OFF_H
 #include <CGAL/IO/File_scanner_OFF.h>
-#endif // CGAL_IO_FILE_SCANNER_OFF_H

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/src/CGAL/File_writer_OFF.cpp
+++ b/Stream_support/src/CGAL/File_writer_OFF.cpp
@ -21,16 +21,9 @@
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-sb.mpg.de>

-#ifndef CGAL_BASIC_H
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_IO_FILE_WRITER_OFF_H
 #include <CGAL/IO/File_writer_OFF.h>
-#endif // CGAL_IO_FILE_WRITER_OFF_H

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/src/CGAL/File_writer_VRML_2.cpp
+++ b/Stream_support/src/CGAL/File_writer_VRML_2.cpp
@ -21,16 +21,9 @@
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-sb.mpg.de>

-#ifndef CGAL_BASIC_H
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_IO_FILE_WRITER_VRML_2_H
 #include <CGAL/IO/File_writer_VRML_2.h>
-#endif // CGAL_IO_FILE_WRITER_VRML_2_H

 CGAL_BEGIN_NAMESPACE

--- a/Stream_support/src/CGAL/File_writer_wavefront.cpp
+++ b/Stream_support/src/CGAL/File_writer_wavefront.cpp
@ -21,16 +21,9 @@
 //
 // Author(s)     : Lutz Kettner  <kettner@mpi-sb.mpg.de>

-#ifndef CGAL_BASIC_H
 #include <CGAL/basic.h>
-#endif // CGAL_BASIC_H
-#ifndef CGAL_PROTECT_IOSTREAM
 #include <iostream>
-#define CGAL_PROTECT_IOSTREAM
-#endif
-#ifndef CGAL_IO_FILE_WRITER_WAVEFRONT_H
 #include <CGAL/IO/File_writer_wavefront.h>
-#endif // CGAL_IO_FILE_WRITER_WAVEFRONT_H

 CGAL_BEGIN_NAMESPACE

--- a/Timer/src/CGAL/Real_timer.cpp
+++ b/Timer/src/CGAL/Real_timer.cpp
@ -25,38 +25,27 @@
 #include <CGAL/Real_timer.h>

 #if defined (_MSC_VER)
-#define CGAL_PROTECT_SYS_TIME_H
-#include <sys/timeb.h>
-#include <sys/types.h>
-#endif
+#  include <sys/timeb.h>
+#  include <sys/types.h>

-#if defined (__BORLANDC__)
-#define CGAL_PROTECT_SYS_TIME_H
-#include <sys/timeb>
-#include <ctype> 
-#endif
+#elif defined (__BORLANDC__)
+#  include <sys/timeb>
+#  include <ctype> 

-#if defined (__MWERKS__)
-#define CGAL_PROTECT_SYS_TIME_H
-#include <ctime>
-#endif
+#elif defined (__MWERKS__)
+#  include <ctime>

-#if defined (__MINGW32__)
-#define CGAL_PROTECT_SYS_TIME_H
-  #include <sys/timeb.h>
-  #include <sys/types.h>
-#endif 
+#elif defined (__MINGW32__)
+#  include <sys/timeb.h>
+#  include <sys/types.h>

+#else
 // If none of the above PC compilers, use POSIX fct. gettimeofday()
-#ifndef CGAL_PROTECT_SYS_TIME_H
-#include <sys/time.h>
-#define CGAL_PROTECT_SYS_TIME_H
-#endif // CGAL_PROTECT_SYS_TIME_H
-
+#  include <sys/time.h>
+#endif

 CGAL_BEGIN_NAMESPACE

-
 // Static member variable for Real_timer
 // =====================================

@ -147,5 +136,3 @@ double Real_timer::precision() const {
 }

 CGAL_END_NAMESPACE
-
-// EOF //