diff --git a/Packages/Kernel_d/changes.txt b/Packages/Kernel_d/changes.txt
index e3ed02a3aa2..c5655bc52d4 100644
--- a/Packages/Kernel_d/changes.txt
+++ b/Packages/Kernel_d/changes.txt
@@ -1,6 +1,9 @@
 Kernel_d Package: Release changes
 ----------------------------------------------------------------------
 
+0.9.56 (21 March 2002)
+   added CGAL_LEDA_SCOPEs where necessary
+
 0.9 (1 January 2001)
 
      initial release
diff --git a/Packages/Kernel_d/demo/Convex_hull_d/chull_3d-windows-demo.C b/Packages/Kernel_d/demo/Convex_hull_d/chull_3d-windows-demo.C
index a68e965b258..4ad8b6a779f 100644
--- a/Packages/Kernel_d/demo/Convex_hull_d/chull_3d-windows-demo.C
+++ b/Packages/Kernel_d/demo/Convex_hull_d/chull_3d-windows-demo.C
@@ -1,5 +1,6 @@
 #ifdef CGAL_USE_LEDA
 #include <CGAL/basic.h>
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/leda_integer.h>
 #include <CGAL/Convex_hull_d.h>
 #include <CGAL/IO/Convex_hull_d_window_stream.h>
@@ -57,10 +58,10 @@ int main(int argc, char* argv[]) {
   if (from) from >> L;
   else {
     int r = numpoints;
-    rand_int.set_range(-r,r);
+    CGAL_LEDA_SCOPE::rand_int.set_range(-r,r);
     int x,y,z;
     while (r--) { 
-      rand_int >> x >> y >> z; 
+      CGAL_LEDA_SCOPE::rand_int >> x >> y >> z; 
       L.append(Point(x,y,z,1));
     }
   }
@@ -71,7 +72,7 @@ int main(int argc, char* argv[]) {
   T.initialize(L.begin(),L.end());
   T.print_statistics();
   To.flush(); 
-  GRAPH<Point,int> G;
+  CGAL_LEDA_SCOPE::GRAPH<Point,int> G;
   leda_node_array<leda_vector> pos(G);
   leda_node v;
   leda_d3_window W3(W,G,pos);
diff --git a/Packages/Kernel_d/demo/Convex_hull_d/chull_dd-runtime.C b/Packages/Kernel_d/demo/Convex_hull_d/chull_dd-runtime.C
index bb2c0b45afa..b717a8ef6f3 100644
--- a/Packages/Kernel_d/demo/Convex_hull_d/chull_dd-runtime.C
+++ b/Packages/Kernel_d/demo/Convex_hull_d/chull_dd-runtime.C
@@ -206,7 +206,11 @@ if ( which & 16 )  {
 #endif
 
 #ifdef CGAL_USE_LEDA
+#if defined(LEDA_NAMESPACE)
+  leda::print_statistics();
+#else
   print_statistics();
+#endif  
 #endif
   destroy(V,n);
   return 0;
diff --git a/Packages/Kernel_d/demo/Convex_hull_d/delaunay_3d-windows-demo.C b/Packages/Kernel_d/demo/Convex_hull_d/delaunay_3d-windows-demo.C
index 89b5e30ef88..73e43df6b19 100644
--- a/Packages/Kernel_d/demo/Convex_hull_d/delaunay_3d-windows-demo.C
+++ b/Packages/Kernel_d/demo/Convex_hull_d/delaunay_3d-windows-demo.C
@@ -1,5 +1,6 @@
 #ifdef CGAL_USE_LEDA
 #include <CGAL/basic.h>
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/Homogeneous_d.h>
 #include <CGAL/leda_integer.h>
 #include <CGAL/Delaunay_d.h>
@@ -66,7 +67,7 @@ int main()
   // see dd_delaunay_traits.h for the adaptations
   std::ofstream To("delddemo.log");
 
-  GRAPH< Point_d, int > G;
+  CGAL_LEDA_SCOPE::GRAPH< Point_d, int > G;
   leda_node_array<leda_rat_vector> pos(G);
   leda_d3_window W3(W2,G,pos);
   leda_node v;
diff --git a/Packages/Kernel_d/demo/Convex_hull_d/delaunay_dd-runtime.C b/Packages/Kernel_d/demo/Convex_hull_d/delaunay_dd-runtime.C
index e55f76396cb..9a870a07567 100644
--- a/Packages/Kernel_d/demo/Convex_hull_d/delaunay_dd-runtime.C
+++ b/Packages/Kernel_d/demo/Convex_hull_d/delaunay_dd-runtime.C
@@ -1,5 +1,6 @@
 #ifdef CGAL_USE_LEDA
 #include <CGAL/basic.h>
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/Homogeneous_d.h>
 #include <CGAL/Delaunay_d.h>
 #include <CGAL/random_selection.h>
@@ -57,7 +58,7 @@ int main(int argc, char* argv[])
   std::list<Point_d> L;
 
   random_points_in_range(n,dimension,-m,m,L);
-  float ti = used_time();
+  float ti = CGAL_LEDA_SCOPE::used_time();
   int i=0;
   std::list<Point_d>::iterator it;
   for(it = L.begin(); it!=L.end(); ++it) {
@@ -65,23 +66,23 @@ int main(int argc, char* argv[])
     if (i%10==0) 
       std::cout << i << " points inserted" << std::endl;
   }
-  std::cout << "used time for inserts  " << used_time(ti) << std::endl;
+  std::cout << "used time for inserts  " << CGAL_LEDA_SCOPE::used_time(ti) << std::endl;
   std::cout << "entering check" << std::endl;
   T.is_valid(); 
-  std::cout << "used time for sanity check  " << used_time(ti) << std::endl;
+  std::cout << "used time for sanity check  " << CGAL_LEDA_SCOPE::used_time(ti) << std::endl;
   std::cout << "entering nearest neighbor location" << std::endl;
   L.clear();
   random_points_in_range(n/10,dimension,-m,m,L);
-  ti = used_time();
+  ti = CGAL_LEDA_SCOPE::used_time();
   i = 0;
   for(it = L.begin(); it!=L.end(); ++it) {
     T.nearest_neighbor(*it); i++;
     if (i%10==0) std::cout << i << " points located" << std::endl;
   }
-  std::cout << "used time for location  " << used_time(ti) << std::endl;  
+  std::cout << "used time for location  " << CGAL_LEDA_SCOPE::used_time(ti) << std::endl;  
 
   T.print_statistics(); 
-  print_statistics(); 
+  CGAL_LEDA_SCOPE::print_statistics(); 
   return 0;
 }
 
diff --git a/Packages/Kernel_d/include/CGAL/IO/Convex_hull_d_window_stream.h b/Packages/Kernel_d/include/CGAL/IO/Convex_hull_d_window_stream.h
index c8545982115..353379f70ef 100644
--- a/Packages/Kernel_d/include/CGAL/IO/Convex_hull_d_window_stream.h
+++ b/Packages/Kernel_d/include/CGAL/IO/Convex_hull_d_window_stream.h
@@ -1,4 +1,4 @@
-// ============================================================================
+// ======================================================================
 //
 // Copyright (c) 1997-2000 The CGAL Consortium
 //
@@ -6,13 +6,14 @@
 // of the Computational Geometry Algorithms Library (CGAL). It is not
 // intended for general use.
 //
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------
 //
-// release       : $CGAL_Revision$
-// release_date  : $CGAL_Date$
+// release       : $CGAL_Revision: CGAL-2.4-I-65 $
+// release_date  : $CGAL_Date: 2002/03/19 $
 //
-// file          : include/CGAL/Convex_hull_d_window_stream.h
-// package       : Kernel_d
+// file          : include/CGAL/IO/Convex_hull_d_window_stream.h
+// package       : Kernel_d (0.9.55)
+// maintainer    : Michael Seel <seel@mpi-sb.mpg.de>
 // chapter       : Basic
 //
 // source        : ddgeo/Convex_hull_d.lw
@@ -20,16 +21,17 @@
 // revision_date : $Date$
 //
 // author(s)     : Michael Seel <seel@mpi-sb.mpg.de>
-// maintainer    : Michael Seel <seel@mpi-sb.mpg.de>
 // coordinator   : Susan Hert <hert@mpi-sb.mpg.de>
 //
 // implementation: Higher dimensional geometry
-// ============================================================================
+// ======================================================================
 #ifndef CGAL_CONVEX_HULL_D_WINDOW_STREAM_H
 #define CGAL_CONVEX_HULL_D_WINDOW_STREAM_H
 
 #include <CGAL/basic.h>
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/Convex_hull_d.h>
+#include <CGAL/Hash_map.h>
 #include <CGAL/IO/Regular_complex_d_window_stream.h>
 
 
@@ -46,7 +48,7 @@ void d2_show(const Convex_hull_d<R>& C, CGAL::Window_stream& W);
 
 template <class R>
 void d3_surface_map(const Convex_hull_d<R>& C, 
-                    GRAPH< typename Convex_hull_d<R>::Point_d ,int>& G);
+                    CGAL_LEDA_SCOPE::GRAPH< typename Convex_hull_d<R>::Point_d ,int>& G);
 /*{\Mfunc constructs the representation of the surface of |\Mvar| as a 
 bidirected LEDA graph |G|.\\ \precond |dim == 3|.}*/
 
@@ -81,7 +83,7 @@ void d2_show(const Convex_hull_d<R>& C, CGAL::Window_stream& W)
 
 template <class R> 
 void d3_surface_map(const Convex_hull_d<R>& C, 
-                    GRAPH< typename Convex_hull_d<R>::Point_d ,int>& G)
+                    CGAL_LEDA_SCOPE::GRAPH< typename Convex_hull_d<R>::Point_d ,int>& G)
 { 
   typedef typename Convex_hull_d<R>::Vertex_const_handle  Vertex_handle;
   typedef typename Convex_hull_d<R>::Simplex_const_handle Simplex_handle;
@@ -180,7 +182,7 @@ void d3_surface_map(const Convex_hull_d<R>& C,
         }// end if bounded
       }// end forall
     if (!G.make_map())
-      error_handler(1,"chull::surface_graphrep: not bidirected"); 
+      CGAL_LEDA_SCOPE::error_handler(1,"chull::surface_graphrep: not bidirected"); 
     return;
     }
   }
@@ -202,7 +204,7 @@ void d3_surface_map(const Convex_hull_d<R>& C,
     }
   }
   if ( 2*G.number_of_nodes() != facet_num + 4)
-    error_handler(1,"d3_surface_map: node equation wrong.");
+    CGAL_LEDA_SCOPE::error_handler(1,"d3_surface_map: node equation wrong.");
  
   leda_node_array<bool> untreated(G,true);
   for(it = Surface.begin(); it != Surface.end(); ++it) {
@@ -243,9 +245,9 @@ void d3_surface_map(const Convex_hull_d<R>& C,
     } // end for i
   } // end forall
   if (G.number_of_edges() != (3*facet_num))
-    error_handler(1,"d3_surface_map: wrong number of edges");
+    CGAL_LEDA_SCOPE::error_handler(1,"d3_surface_map: wrong number of edges");
   if (!G.make_map())
-    error_handler(1,"d3_surface_map: not bidirected"); 
+    CGAL_LEDA_SCOPE::error_handler(1,"d3_surface_map: not bidirected"); 
 }
 
 
diff --git a/Packages/Kernel_d/include/CGAL/IO/Delaunay_d_window_stream.h b/Packages/Kernel_d/include/CGAL/IO/Delaunay_d_window_stream.h
index 3d09593fc17..553c4e67ef5 100644
--- a/Packages/Kernel_d/include/CGAL/IO/Delaunay_d_window_stream.h
+++ b/Packages/Kernel_d/include/CGAL/IO/Delaunay_d_window_stream.h
@@ -1,4 +1,4 @@
-// ============================================================================
+// ======================================================================
 //
 // Copyright (c) 1997-2000 The CGAL Consortium
 //
@@ -6,13 +6,14 @@
 // of the Computational Geometry Algorithms Library (CGAL). It is not
 // intended for general use.
 //
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------
 //
-// release       : $CGAL_Revision$
-// release_date  : $CGAL_Date$
+// release       : $CGAL_Revision: CGAL-2.4-I-65 $
+// release_date  : $CGAL_Date: 2002/03/19 $
 //
-// file          : include/CGAL/Delaunay_d_window_stream.h
-// package       : Kernel_d
+// file          : include/CGAL/IO/Delaunay_d_window_stream.h
+// package       : Kernel_d (0.9.55)
+// maintainer    : Michael Seel <seel@mpi-sb.mpg.de>
 // chapter       : Basic
 //
 // source        : ddgeo/Delaunay_d.lw
@@ -20,14 +21,14 @@
 // revision_date : $Date$
 //
 // author(s)     : Michael Seel <seel@mpi-sb.mpg.de>
-// maintainer    : Michael Seel <seel@mpi-sb.mpg.de>
 // coordinator   : Susan Hert <hert@mpi-sb.mpg.de>
 //
 // implementation: Higher dimensional geometry
-// ============================================================================
+// ======================================================================
 #ifndef CGAL_DELAUNAY_D_WINDOW_STREAM_H
 #define CGAL_DELAUNAY_D_WINDOW_STREAM_H
 
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/Delaunay_d.h>
 #include <CGAL/IO/Convex_hull_d_window_stream.h>
 #include <CGAL/IO/Window_stream.h>
@@ -54,7 +55,7 @@ void d2_show(const Delaunay_d<R,Lifted_R>& D,
 
 template <typename R, typename Lifted_R>
 void d2_map(const Delaunay_d<R,Lifted_R>& D, 
-            GRAPH< typename Delaunay_d<R,Lifted_R>::Point_d, int >& DTG, 
+            CGAL_LEDA_SCOPE::GRAPH< typename Delaunay_d<R,Lifted_R>::Point_d, int >& DTG, 
             typename Delaunay_d<R,Lifted_R>::Delaunay_voronoi_kind k = 
             Delaunay_d<R,Lifted_R>::NEAREST)
 /*{\Mfunc constructs a LEDA graph representation of the nearest 
diff --git a/Packages/Kernel_d/include/CGAL/IO/Regular_complex_d_window_stream.h b/Packages/Kernel_d/include/CGAL/IO/Regular_complex_d_window_stream.h
index d4a98bb86d1..57c2d324d96 100644
--- a/Packages/Kernel_d/include/CGAL/IO/Regular_complex_d_window_stream.h
+++ b/Packages/Kernel_d/include/CGAL/IO/Regular_complex_d_window_stream.h
@@ -1,3 +1,23 @@
+// ======================================================================
+//
+// Copyright (c) 2002 The CGAL Consortium
+//
+// This software and related documentation is part of an INTERNAL release
+// of the Computational Geometry Algorithms Library (CGAL). It is not
+// intended for general use.
+//
+// ----------------------------------------------------------------------
+//
+// release       : $CGAL_Revision: CGAL-2.4-I-65 $
+// release_date  : $CGAL_Date: 2002/03/19 $
+//
+// file          : include/CGAL/IO/Regular_complex_d_window_stream.h
+// package       : Kernel_d (0.9.55)
+// maintainer    : Michael Seel <seel@mpi-sb.mpg.de>
+// author(s)     : ?
+// coordinator   : ?
+//
+// ======================================================================
 #ifndef CGAL_REGULAR_COMPLEX_D_WINDOW_STREAM_H
 #define CGAL_REGULAR_COMPLEX_D_WINDOW_STREAM_H
 
@@ -8,6 +28,8 @@
 #else
 #include <CGAL/Regular_complex_d_MSC.h>
 #endif
+
+#include <CGAL/LEDA_basic.h>
 #include <CGAL/IO/Window_stream.h>
 #include <LEDA/graph.h>
 #include <LEDA/node_map.h>
@@ -26,12 +48,12 @@ void d2_show(const Regular_complex_d<R>& RC, Window_stream& W);
 \precond |dim == 2|.}*/
 
 template <class R>
-void d2_map(const Regular_complex_d<R>& RC, GRAPH<leda_point,int>& G);
+void d2_map(const Regular_complex_d<R>& RC, CGAL_LEDA_SCOPE::GRAPH<leda_point,int>& G);
 /*{\Mfunc constructs the representation of |R| as a bidirected graph |G|.
 \precond |dim == 2|.}*/
 
 template <class R>
-void d3_graph(const Regular_complex_d<R>& RC, GRAPH<leda_d3_point,int>& G);
+void d3_graph(const Regular_complex_d<R>& RC, CGAL_LEDA_SCOPE::GRAPH<leda_d3_point,int>& G);
 /*{\Mfunc constructs the representation of |R| as a bidirected graph |G|.
 \precond |dim == 3|.}*/
 
@@ -60,7 +82,7 @@ void d2_show(const Regular_complex_d<R>& RC, CGAL::Window_stream& W)
 
 
 template <class R>
-void d2_map(const Regular_complex_d<R>& RC, GRAPH<leda_point,int>& G)
+void d2_map(const Regular_complex_d<R>& RC, CGAL_LEDA_SCOPE::GRAPH<leda_point,int>& G)
 { 
   typedef Regular_complex_d<R>::Simplex_const_iterator Simplex_iterator;
   typedef Regular_complex_d<R>::Vertex_const_iterator Vertex_iterator;
@@ -163,7 +185,7 @@ void d2_map(const Regular_complex_d<R>& RC, GRAPH<leda_point,int>& G)
 
 template <class R>
 void d3_graph(const Regular_complex_d<R>& RC, 
-              GRAPH< typename Regular_complex_d<R>::Point_d ,int>& G)
+              CGAL_LEDA_SCOPE::GRAPH< typename Regular_complex_d<R>::Point_d ,int>& G)
 { 
   typedef Regular_complex_d<R>::Simplex_const_iterator Simplex_iterator;
   typedef Regular_complex_d<R>::Vertex_const_iterator Vertex_iterator;
@@ -174,7 +196,7 @@ void d3_graph(const Regular_complex_d<R>& RC,
 
   CGAL_assertion_msg(RC.dimension() == 3,"d3_graph: dim must be 3.");
   G.clear();
-  node_map2<bool> connected(G);
+  CGAL_LEDA_SCOPE::node_map2<bool> connected(G);
   Unique_hash_map<Vertex_handle,leda_node> node_for(nil);
 
   forall_rc_vertices(v,RC) {