diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Adjacencies_3.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Adjacencies_3.h
index 4f30109947c..a1e22ddd88e 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Adjacencies_3.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Adjacencies_3.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,25 +12,19 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Adjacencies_3.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
 //                 Michael Kerber <mkerber@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_ADJACENCIES_3_H
-#define SoX_GAPS_ADJACENCIES_3_H 1
+#ifndef CGAL_ARRANGEMENT_2l_ADJACENCIES_3_H
+#define CGAL_ARRANGEMENT_2l_ADJACENCIES_3_H 1
 
-/*! \file SoX/GAPS/Adjacencies_3
-    \brief Contains Adjacencies_3 class
-*/
+/*!\file include/CGAL/Arrangement_2l/Adjacencies_3.h
+ * \brief Contains Adjacencies_3 class
+ */
 
 #include <CGAL/config.h>
 #include <CGAL/Handle_with_policy.h>
@@ -210,4 +203,5 @@ std::ostream& operator<<(
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_ADJACENCIES_3
+#endif // CGAL_ARRANGEMENT_2l_ADJACENCIES_3
+// EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Arr_p_dcel_info_overlay_traits.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Arr_p_dcel_info_overlay_traits.h
index 23708371dc8..07948bebc1e 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Arr_p_dcel_info_overlay_traits.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Arr_p_dcel_info_overlay_traits.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Arr_p_dcel_info_overlay_traits.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-/*! \file SoX/GAPS/Arr_p_dcel_info_overlay_traits.h
+/*!\file include/CGAL/Arrangement_2l/Arr_p_dcel_info_overlay_traits.h
  * \brief definition of Arr_p_dcel_info_overlay_traits class template
  */
 
-#ifndef SoX_GAPS_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H
-#define SoX_GAPS_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H 1
+#ifndef CGAL_ARRANGEMENT_2l_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H
+#define CGAL_ARRANGEMENT_2l_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H 1
 
 #include <CGAL/config.h>
 
@@ -466,5 +459,5 @@ private:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H
+#endif // CGAL_ARRANGEMENT_2l_ARR_P_DCEL_INFO_OVERLAY_TRAITS_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Curve_3.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Curve_3.h
index 396b5a6b786..bed1e38079c 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Curve_3.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Curve_3.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,17 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Curve_3.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_CURVE_3_H
-#define SoX_GAPS_CURVE_3_H 1
+#ifndef CGAL_ARRANGEMENT_2l_CURVE_3_H
+#define CGAL_ARRANGEMENT_2l_CURVE_3_H 1
 
-/*!\file SoX/GAPS/Curve_3.h
- * \brief 
- * definition of \c Curve_3<>
+/*!\file include/CGAL/Arrangement_2l/Curve_3.h
+ * \brief definition of \c Curve_3<>
  */
 
 #include <CGAL/config.h>
@@ -721,5 +713,5 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_CURVE_3_H
+#endif // CGAL_ARRANGEMENT_2l_CURVE_3_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/P_dcel_info.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/P_dcel_info.h
index 1fd8d972060..54a671e8265 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/P_dcel_info.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/P_dcel_info.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/P_dcel_info.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-/*! \file SoX/GAPS/P_dcel_info.h
+/*!\file include/CGAL/Arrangement_2l/P_dcel_info.h
  * \brief definition of P_dcel_info class template
  */
 
-#ifndef SoX_GAPS_P_DCEL_INFO_H
-#define SoX_GAPS_P_DCEL_INFO_H 1
+#ifndef CGAL_ARRANGEMENT_2l_P_DCEL_INFO_H
+#define CGAL_ARRANGEMENT_2l_P_DCEL_INFO_H 1
 
 #include <CGAL/config.h>
 
@@ -1718,8 +1711,7 @@ std::ostream& operator<<(
     return os;
 }
     
-
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_P_DCEL_INFO_H
+#endif // CGAL_ARRANGEMENT_2l_P_DCEL_INFO_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3.h
index 5825bd84777..8feb6493d08 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Restricted_cad_3.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_RESTRICTED_CAD_3_H
-#define SoX_GAPS_RESTRICTED_CAD_3_H 1
+#ifndef CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_H
+#define CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_H 1
 
-/*! \file SoX/GAPS/Restricted_cad_3.h
-    \brief Contains class template Restricted_cad_3
-*/
+/*!\file include/CGAL/Arrangement/Restricted_cad_3.h
+ * \brief Contains class template Restricted_cad_3
+ */
 
 #include <CGAL/config.h>
 
@@ -1625,5 +1618,5 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_RESTRICTED_CAD_3_H
+#endif // CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_accessor.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_accessor.h
index ca9ae3c3ddd..8597caf0320 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_accessor.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_accessor.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Restricted_cad_3_accessor.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_RESTRICTED_CAD_3_ACCESSOR_H
-#define SoX_GAPS_RESTRICTED_CAD_3_ACCESSOR_H 1
+#ifndef CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ACCESSOR_H
+#define CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ACCESSOR_H 1
 
-/*! \file SoX/GAPS/Restricted_cad_3_accessor.h
-    \brief Contains class template Restricted_cad_3_accessor
-*/
+/*!\file include/CGAL/Arrangement_2l/Restricted_cad_3_accessor.h
+ * \brief Contains class template Restricted_cad_3_accessor
+ */
 
 #include <CGAL/config.h>
 
@@ -437,5 +430,5 @@ private:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_RESTRICTED_CAD_3_ACCESSOR_H
+#endif // CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ACCESSOR_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_enums.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_enums.h
index 4b96e4c7ec9..fff46ff7a2c 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_enums.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_enums.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,27 +12,21 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Restricted_cad_3_enums.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_RESTRICTED_CAD_3_ENUMS_H
-#define SoX_GAPS_RESTRICTED_CAD_3_ENUMS_H 1
+#ifndef CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ENUMS_H
+#define CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ENUMS_H 1
 
-/*! \file SoX/GAPS/Restricted_cad_3_enums.h
-    \brief Contains enumeration related to  
-    \link Restricted_cad_3 \endlink
-*/
+/*!\file include/CGAL/Arrangement_2l/Restricted_cad_3_enums.h
+ * \brief Contains enumeration related to  
+ * \link Restricted_cad_3 \endlink
+ */
 
-#include <CGAL/basic.h>
+#include <CGAL/config.h>
 
 #include <iostream>
 
@@ -168,4 +161,5 @@ std::ostream& operator<<(std::ostream& out, const CGAL::Nk& nk) {
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_RESTRICTED_CAD_3_ENUMS_H
+#endif // CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_ENUMS_H
+// EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_functors.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_functors.h
index 8137ed190ad..aba25a54ca1 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_functors.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Restricted_cad_3_functors.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,25 +12,19 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Restricted_cad_3_functors.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_RESTRICTED_CAD_3_FUNCTORS_H
-#define SoX_GAPS_RESTRICTED_CAD_3_FUNCTORS_H 1
+#ifndef CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_FUNCTORS_H
+#define CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_FUNCTORS_H 1
 
-/*! \file SoX/GAPS/Restricted_cad_3_functor.h
-    \brief Contains functor classes related to  
-    \link Restricted_cad_3 \endlink
-*/
+/*!\file include/CGAL/Arrangement_2l/Restricted_cad_3_functor.h
+ * \brief Contains functor classes related to  
+ * \link Restricted_cad_3 \endlink
+ */
 
 #include <CGAL/config.h>
 
@@ -1516,4 +1509,5 @@ private:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_RESTRICTED_CAD_3_FUNCTORS_H
+#endif // CGAL_ARRANGEMENT_2l_RESTRICTED_CAD_3_FUNCTORS_H
+// EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_3_envelope_traits.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_3_envelope_traits.h
index ba1b4dab005..babb7b47f0d 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_3_envelope_traits.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_3_envelope_traits.h
@@ -1,34 +1,27 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
-// 
-// ----------------------------------------------------------------------------
 //
-// Library       : QdX
-// File          : include/SoX/GAPS/Surface_3_envelope_traits.h
-// QdX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_SURFACE_3_ENVELOPE_TRAITS
-#define SoX_GAPS_SURFACE_3_ENVELOPE_TRAITS 1
+#ifndef CGAL_ARRANGEMENT_2l_SURFACE_3_ENVELOPE_TRAITS
+#define CGAL_ARRANGEMENT_2l_SURFACE_3_ENVELOPE_TRAITS 1
 
-/*!\file SoX/GAPS/Surface_3_envelope_traits.h
+/*!\file include/CGAL/Arrangement_2l/Surface_3_envelope_traits.h
  * \brief Model for CGAL's EnvelopeTraits_3 concept.
  */
 
@@ -837,5 +830,5 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_SURFACE_3_ENVELOPE_TRAITS
+#endif // CGAL_ARRANGEMENT_2l_SURFACE_3_ENVELOPE_TRAITS
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_pair_3.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_pair_3.h
index 252fc7ea679..c54309077c1 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_pair_3.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Surface_pair_3.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,17 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Surface_pair_3.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_SURFACE_PAIR_3_H
-#define SoX_GAPS_SURFACE_PAIR_3_H 1
+#ifndef CGAL_ARRANGEMENT_2l_SURFACE_PAIR_3_H
+#define CGAL_ARRANGEMENT_2l_SURFACE_PAIR_3_H 1
 
-/*!\file SoX/GAPS/Surface_pair_3.h
- * \brief 
- * definition of \c Surface_pair_3<>
+/*!\file include/CGAL/Arrangement_2l/Surface_pair_3.h
+ * \brief definition of \c Surface_pair_3<>
  */
 
 #include <CGAL/config.h>
@@ -320,5 +312,5 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_SURFACE_PAIR_3_H
+#endif // CGAL_ARRANGEMENT_2l_SURFACE_PAIR_3_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack.h
index 994f63525e7..fcd3da88525 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,22 +12,16 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Z_stack.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-#ifndef SoX_GAPS_Z_STACK_H
-#define SoX_GAPS_Z_STACK_H 1
+#ifndef CGAL_ARRANGEMENT_2l_Z_STACK_H
+#define CGAL_ARRANGEMENT_2l_Z_STACK_H 1
 
-/*! \file SoX/GAPS/Z_stack.h
+/*!\file include/CGAL/Arrangement_2l/Z_stack.h
  * \brief definition of Z_stack class template
  */
 
@@ -1622,9 +1615,8 @@ std::ostream& operator<<(
     z_stack.pretty_print(os);
     return os;
 }
-    
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_Z_STACK_H
+#endif // CGAL_ARRANGEMENT_2l_Z_STACK_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack_helpers.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack_helpers.h
index 672e8cdf43b..251b1b470d0 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack_helpers.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/Z_stack_helpers.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/Z_stack_helpers.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-/*! \file SoX/GAPS/Z_stack_helpers.h
+/*!\file include/CGAL/Arrangement_2l/Z_stack_helpers.h
  * \brief definition of Z_stack helpers
  */
 
-#ifndef SoX_GAPS_Z_STACK_HELPERS_H
-#define SoX_GAPS_Z_STACK_HELPERS_H 1
+#ifndef CGAL_ARRANGEMENT_2l_Z_STACK_HELPERS_H
+#define CGAL_ARRANGEMENT_2l_Z_STACK_HELPERS_H 1
 
 #include <CGAL/config.h>
 
@@ -300,10 +293,9 @@ public:
     
 }; // Refineable_interval_helper
 
-
 } // namespace CGALi
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_Z_STACK_HELPERS_H
+#endif // CGAL_ARRANGEMENT_2l_Z_STACK_HELPERS_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/macros.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/macros.h
index 7d9c7485e3a..821b0e7eebb 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/macros.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/macros.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/macros.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-/*! \file SoX/GAPS/macros.h
-    \brief some basic macro declarations
-*/
+#ifndef CGAL_ARRANGEMENT_2l_MACROS_H
+#define CGAL_ARRANGEMENT_2l_MACROS_H 1
 
-#ifndef SoX_GAPS_MACROS_H
-#define SoX_GAPS_MACROS_H 1
+/*!\file include/CGAL/Arrangement_2l/macros.h
+ * \brief some basic macro declarations
+ */
 
 #include <CGAL/config.h>
 
@@ -48,5 +41,5 @@
 // end #define SoX_SURFACE_Z_AT_XY_ISOLATOR_TRAITS_SNAP_TYPEDEFS(Traits)
 
 
-#endif // SoX_GAPS_MACROS_H
+#endif // CGAL_ARRANGEMENT_2l_MACROS_H
 // EOF
diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/z_stack_predeclarations.h b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/z_stack_predeclarations.h
index 8bc20fb7186..6e43502f6bc 100644
--- a/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/z_stack_predeclarations.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Arrangement_2l/z_stack_predeclarations.h
@@ -1,11 +1,10 @@
-// ============================================================================
-//
-// Copyright (c) 2001-2008 Max-Planck-Institut Saarbruecken (Germany).
+// Copyright (c) 2007-2008 Max-Planck-Institute Saarbruecken (Germany), 
+// and Tel-Aviv University (Israel).
 // All rights reserved.
 //
-// This file is part of EXACUS (http://www.mpi-inf.mpg.de/projects/EXACUS/);
-// you may redistribute it under the terms of the Q Public License version 1.0.
-// See the file LICENSE.QPL distributed with EXACUS.
+// 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.
@@ -13,24 +12,18 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// ----------------------------------------------------------------------------
-//
-// Library       : SoX
-// File          : include/SoX/GAPS/z_stack_predclarations.h
-// SoX_release   : $Name:  $
-// Revision      : $Revision$
-// Revision_date : $Date$
+// $URL$
+// $Id$
+// 
 //
 // Author(s)     : Eric Berberich <eric@mpi-inf.mpg.de>
-//
-// ============================================================================
 
-/*! \file SoX/GAPS/z_stack_predeclarations.h
-    \brief contains all required pre-declarations
-*/
+#ifndef CGAL_ARRANGEMENT_2l_Z_STACK_PREDECLARATIONS_H
+#define CGAL_ARRANGEMENT_2l_Z_STACK_PREDECLARATIONS_H 1
 
-#ifndef SoX_GAPS_Z_STACK_PREDECLARATIONS_H
-#define SoX_GAPS_Z_STACK_PREDECLARATIONS_H 1
+/*!\file include/CGAL/Arrangement_2l/z_stack_predeclarations.h
+ * \brief contains all required pre-declarations
+ */
 
 #include <CGAL/config.h>
 
@@ -78,5 +71,5 @@ class Z_cell;
 
 CGAL_END_NAMESPACE
 
-#endif // SoX_GAPS_Z_STACK_PREDECLARATIONS_H
+#endif // CGAL_ARRANGEMENT_2l_Z_STACK_PREDECLARATIONS_H
 // EOF