diff --git a/Classification/include/CGAL/Classification/ETHZ/internal/random-forest/forest.hpp b/Classification/include/CGAL/Classification/ETHZ/internal/random-forest/forest.hpp
index db51011e714..ce6695b8624 100644
--- a/Classification/include/CGAL/Classification/ETHZ/internal/random-forest/forest.hpp
+++ b/Classification/include/CGAL/Classification/ETHZ/internal/random-forest/forest.hpp
@@ -45,7 +45,7 @@
 #include <cstdio>
 #endif
 
-#include <algorithm>
+#include <CGAL/algorithm.h>
 
 #include <CGAL/tags.h>
 
@@ -113,7 +113,7 @@ public:
     std::vector<int> in_bag_samples = sample_idxes;
 
     // Bagging: draw random sample indexes used for this tree
-    std::random_shuffle (in_bag_samples.begin(),in_bag_samples.end());
+    CGAL::cpp98::random_shuffle (in_bag_samples.begin(),in_bag_samples.end());
 
     // Train the tree
     trees[i_tree].train(samples, labels, &in_bag_samples[0], n_in_bag_samples, split_generator, gen);