From 9b907de4516603710871ceb822d136ef62d5d0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20Sch=C3=B6nherr?= <sven@inf.ethz.ch>
Date: Fri, 5 Dec 1997 14:51:40 +0000
Subject: [PATCH] new structure of specification directory new protection
 against multiple header-file inclusion

---
 Packages/Min_circle_2/web/Min_circle_2.aw | 21 +++++++++++++--------
 Packages/Random_numbers/web/Random.aw     | 10 +++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Packages/Min_circle_2/web/Min_circle_2.aw b/Packages/Min_circle_2/web/Min_circle_2.aw
index e477c4b0731..9f20ac6b81a 100644
--- a/Packages/Min_circle_2/web/Min_circle_2.aw
+++ b/Packages/Min_circle_2/web/Min_circle_2.aw
@@ -160,10 +160,10 @@ in the \cgal\ Reference Manual.
 \ccSetThreeColumns{typedef CGAL_Point_2<R>}{}{%
   creates a variable \ccc{min_circle} of type \ccc{CGAL_Min_circle_2<Traits>}.}
 \ccPropagateThreeToTwoColumns
-\input{../../spec/Optimisation/Min_circle_2.tex}
-\input{../../spec/Optimisation/Optimisation_circle_2.tex}
-\input{../../spec/Optimisation/Min_circle_2_adapterC2.tex}
-\input{../../spec/Optimisation/Min_circle_2_adapterH2.tex}
+\input{../../doc_tex/basic/Optimisation/Min_circle_2.tex}
+\input{../../doc_tex/basic/Optimisation/Optimisation_circle_2.tex}
+\input{../../doc_tex/basic/Optimisation/Min_circle_2_adapterC2.tex}
+\input{../../doc_tex/basic/Optimisation/Min_circle_2_adapterH2.tex}
 
 @! ============================================================================
 @! Implementations
@@ -2207,16 +2207,13 @@ representation with number type \ccc{CGAL_Quotient<CGAL_Gmpz>} and
 homogeneous representation with number type \ccc{CGAL_Gmpz}.
 
 @macro <Min_circle_2 test (includes and typedefs)> = @begin
-    #include <CGAL/Gmpz.h>
     #include <CGAL/Cartesian.h>
     #include <CGAL/Homogeneous.h>
     #include <CGAL/Optimisation_traits_2.h>
     #include <CGAL/Min_circle_2.h>
     #include <CGAL/Min_circle_2_adapterC2.h>
     #include <CGAL/Min_circle_2_adapterH2.h>
-    #include <CGAL/Random.h>
     #include <CGAL/IO/Verbose_ostream.h>
-    #include <algo.h>
     #include <assert.h>
     #include <fstream.h>
 
@@ -2682,10 +2679,18 @@ end of each file.
     #ifndef CGAL_OPTIMISATION_MISC_H
     #  include <CGAL/optimisation_misc.h>
     #endif
-    #include <list.h>
+    #ifndef CGAL_PROTECT_LIST_H
+    #  include <list.h>
+    #endif
+    #ifndef CGAL_PROTECT_VECTOR_H
     #include <vector.h>
+    #endif
+    #ifndef CGAL_PROTECT_ALGO_H
     #include <algo.h>
+    #endif
+    #ifndef CGAL_PROTECT_IOSTREAM_H
     #include <iostream.h>
+    #endif
 
     @<Min_circle_2 interface>
 
diff --git a/Packages/Random_numbers/web/Random.aw b/Packages/Random_numbers/web/Random.aw
index f583c00fd5d..11cec1d3450 100644
--- a/Packages/Random_numbers/web/Random.aw
+++ b/Packages/Random_numbers/web/Random.aw
@@ -74,7 +74,7 @@ created in Section~4.
 \renewcommand{\ccEndFont}{}
 \ccSetThreeColumns{CGAL_Random}{random.restore_seed( Seed seed)}{}
 \ccPropagateThreeToTwoColumns
-\input{../../spec/Random/Random.tex}
+\input{../../doc_tex/support/Random/Random.tex}
 
 @! ============================================================================
 @! Implementation
@@ -169,7 +169,9 @@ In the default constructor the seed is initialized using the system
 time.
 
 @macro <Random constructors> = @begin
-    #include <sys/time.h>
+    #ifndef CGAL_PROTECT_SYS_TIME_H
+    #  include <sys/time.h>
+    #endif
 
     CGAL_Random::
     CGAL_Random( )
@@ -211,7 +213,9 @@ uniformly chosen from the interval $[\ccc{0.0},\ccc{1.0})$.
 The result is converted to a number in the given range.
 
 @macro <Random operations> = @begin
-    #include <stdlib.h>
+    #ifndef CGAL_PROTECT_STDLIB_H
+    #  include <stdlib.h>
+    #endif
 
     inline
     bool