diff --git a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
index 79ef4b173d2..55bc347f08e 100644
--- a/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
+++ b/Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
@@ -37,7 +37,7 @@ CGAL_BEGIN_NAMESPACE
 
 namespace Box_intersection_d {
 
-#define BOX_INTERSECTION_DEBUG 0
+#define CGAL_BOX_INTERSECTION_DEBUG 0
 
 
 template< class ForwardIter1, class ForwardIter2,
@@ -241,7 +241,7 @@ split_points( RandomAccessIter begin, RandomAccessIter end,
 }
 
 
-#if BOX_INTERSECTION_DEBUG
+#if CGAL_BOX_INTERSECTION_DEBUG
  static int level = -1;
  #define CGAL_BOX_INTERSECTION_DUMP(msg) { \
    for( unsigned int i = level; i; --i ) \
@@ -305,7 +305,7 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
     const T inf = box_limits< T >::inf();
     const T sup = box_limits< T >::sup();
 
-#if BOX_INTERSECTION_DEBUG
+#if CGAL_BOX_INTERSECTION_DEBUG
     Counter<int> bla( level );
     CGAL_BOX_INTERSECTION_DUMP("range: [" << lo << "," << hi << ") dim " 
                                           << dim << std::endl )
@@ -317,7 +317,7 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
     dump_points( p_begin, p_end, traits, dim );
 #endif
 
-#if SEGMENT_TREE_CHECK_INVARIANTS
+#if CGAL_SEGMENT_TREE_CHECK_INVARIANTS
     {
         // first: each point is inside segment [lo,hi)
         for( RandomAccessIter1 it = p_begin; it != p_end; ++it ) {
@@ -390,7 +390,10 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
                   callback, traits, cutoff, dim, in_order );
 }
 
-#undef BOX_INTERSECTION_DEBUG
+#if CGAL_BOX_INTERSECTION_DEBUG
+ #undef CGAL_BOX_INTERSECTION_DUMP
+#endif
+#undef CGAL_BOX_INTERSECTION_DEBUG
 
 } // end namespace Box_intersection_d
 
diff --git a/Box_intersection_d/test/Box_intersection_d/automated_test.C b/Box_intersection_d/test/Box_intersection_d/automated_test.C
index 45b7a3b1548..54320d7e567 100644
--- a/Box_intersection_d/test/Box_intersection_d/automated_test.C
+++ b/Box_intersection_d/test/Box_intersection_d/automated_test.C
@@ -19,7 +19,7 @@
 //                 Andreas Meyer <ameyer@mpi-sb.mpg.de>
 
 // enable invariant checking
-#define SEGMENT_TREE_CHECK_INVARIANTS 1
+#define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
 
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/Timer.h>
diff --git a/Box_intersection_d/test/Box_intersection_d/benchmark.C b/Box_intersection_d/test/Box_intersection_d/benchmark.C
index ef462dd9962..1e2fcf0a728 100644
--- a/Box_intersection_d/test/Box_intersection_d/benchmark.C
+++ b/Box_intersection_d/test/Box_intersection_d/benchmark.C
@@ -20,7 +20,7 @@
 
 
 // enable invariant checking
-#define SEGMENT_TREE_CHECK_INVARIANTS 1
+#define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/Timer.h>
 #include <iostream>
diff --git a/Box_intersection_d/test/Box_intersection_d/random_set_test.C b/Box_intersection_d/test/Box_intersection_d/random_set_test.C
index 06707347faf..385b868dc1f 100644
--- a/Box_intersection_d/test/Box_intersection_d/random_set_test.C
+++ b/Box_intersection_d/test/Box_intersection_d/random_set_test.C
@@ -20,7 +20,7 @@
 
 
 // enable invariant checking
-#define SEGMENT_TREE_CHECK_INVARIANTS 1
+#define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
 
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/Timer.h>
diff --git a/Box_intersection_d/test/Box_intersection_d/util.h b/Box_intersection_d/test/Box_intersection_d/util.h
index ece15cee695..48739f42e04 100644
--- a/Box_intersection_d/test/Box_intersection_d/util.h
+++ b/Box_intersection_d/test/Box_intersection_d/util.h
@@ -1,5 +1,5 @@
-#ifndef BOX_INTERSECTION_D_UTIL_H
-#define BOX_INTERSECTION_D_UTIL_H
+#ifndef CGAL_BOX_INTERSECTION_D_UTIL_H
+#define CGAL_BOX_INTERSECTION_D_UTIL_H
 
 #include <vector>
 #include <algorithm> // for pair