diff --git a/Spatial_sorting/include/CGAL/hilbert_sort.h b/Spatial_sorting/include/CGAL/hilbert_sort.h
index 2c4c9475f95..f762f288a02 100644
--- a/Spatial_sorting/include/CGAL/hilbert_sort.h
+++ b/Spatial_sorting/include/CGAL/hilbert_sort.h
@@ -28,12 +28,9 @@
 #include <CGAL/Hilbert_sort_3.h>
 #include <CGAL/Hilbert_sort_d.h>
 
-#include <CGAL/random_shuffle.h>
-
 #include <boost/random.hpp>
 #include <boost/random/linear_congruential.hpp>
 
-
 #include <algorithm>
 
 namespace CGAL {
@@ -46,10 +43,10 @@ namespace internal {
 		       RandomAccessIterator end,
 		       Policy /*policy*/,
 		       const Kernel &k, typename Kernel::Point_2 *)
-        CGAL::random_shuffle(begin,end, rng);
+    {
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
-        CGAL::random_shuffle(begin,end, rng);
+        std::random_shuffle(begin,end, rng);
 	(Hilbert_sort_2<Kernel, Policy> (k))(begin, end);
     }
     
@@ -58,7 +55,7 @@ namespace internal {
 			 RandomAccessIterator end,
 			 Policy /*policy*/,
 			 const Kernel &k, typename Kernel::Point_3 *)
-        CGAL::random_shuffle(begin,end, rng);
+    {
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
         std::random_shuffle(begin,end, rng);
@@ -70,7 +67,7 @@ namespace internal {
 			 RandomAccessIterator end,
 			 Policy /*policy*/,
 			 const Kernel &k, typename Kernel::Point_d *)
-        CGAL::random_shuffle(begin,end, rng);
+    {
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
         std::random_shuffle(begin,end, rng);
diff --git a/Spatial_sorting/include/CGAL/spatial_sort.h b/Spatial_sorting/include/CGAL/spatial_sort.h
index 46ca94301a2..cbd8f08638b 100644
--- a/Spatial_sorting/include/CGAL/spatial_sort.h
+++ b/Spatial_sorting/include/CGAL/spatial_sort.h
@@ -25,7 +25,6 @@
 
 #include <CGAL/hilbert_sort.h>
 #include <CGAL/Multiscale_sort.h>
-#include <CGAL/random_shuffle.h>
 
 #include <boost/random.hpp>
 #include <boost/random/linear_congruential.hpp>
@@ -50,7 +49,7 @@ namespace internal {
       typedef Hilbert_sort_2<Kernel, Policy> Sort;
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
-        CGAL::random_shuffle(begin,end,rng);
+        std::random_shuffle(begin,end,rng);
 
 	if (threshold_hilbert==0) threshold_hilbert=4;
 	if (threshold_multiscale==0) threshold_multiscale=16;
@@ -73,7 +72,7 @@ namespace internal {
       typedef Hilbert_sort_3<Kernel, Policy> Sort;
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
-        CGAL::random_shuffle(begin,end, rng);
+        std::random_shuffle(begin,end, rng);
 
 	if (threshold_hilbert==0) threshold_hilbert=8;
 	if (threshold_multiscale==0) threshold_multiscale=64;
@@ -96,7 +95,7 @@ namespace internal {
       typedef Hilbert_sort_d<Kernel, Policy> Sort;
         boost::rand48 random;
         boost::random_number_generator<boost::rand48> rng(random);
-        CGAL::random_shuffle(begin,end, rng);
+        std::random_shuffle(begin,end, rng);
 	
 	if (threshold_hilbert==0) threshold_hilbert=10;
 	if (threshold_multiscale==0) threshold_multiscale=500;