diff --git a/Generator/doc_tex/Generator_ref/random_convex_set.tex b/Generator/doc_tex/Generator_ref/random_convex_set.tex
index 7c8065942af..11ed8224042 100644
--- a/Generator/doc_tex/Generator_ref/random_convex_set.tex
+++ b/Generator/doc_tex/Generator_ref/random_convex_set.tex
@@ -25,7 +25,7 @@ domain.
 \def\ccLongParamLayout{\ccTrue} 
 
 \ccFunction{template < class OutputIterator, class PointGenerator,
-  class Traits > OutputIterator random_convex_set_2( int n,
+  class Traits > OutputIterator random_convex_set_2( std::size_t n,
   OutputIterator o, const PointGenerator& pg, Traits t =
   Default_traits);}
 {
diff --git a/Generator/doc_tex/Generator_ref/random_polygon.tex b/Generator/doc_tex/Generator_ref/random_polygon.tex
index 8d037124dec..6312bb045b1 100644
--- a/Generator/doc_tex/Generator_ref/random_polygon.tex
+++ b/Generator/doc_tex/Generator_ref/random_polygon.tex
@@ -22,7 +22,7 @@ generated polygons is not known since it depends on the generated points.
 
 \ccFunction{
 template < class OutputIterator, class PointGenerator, class Traits > 
-OutputIterator random_polygon_2( int n, OutputIterator result, 
+OutputIterator random_polygon_2( std::size_t n, OutputIterator result, 
                     const PointGenerator& pg, Traits t = Default_traits);
 }
 {
diff --git a/Generator/include/CGAL/Random_convex_set_traits_2.h b/Generator/include/CGAL/Random_convex_set_traits_2.h
index 8287b4a0999..76dba5ee3af 100644
--- a/Generator/include/CGAL/Random_convex_set_traits_2.h
+++ b/Generator/include/CGAL/Random_convex_set_traits_2.h
@@ -89,7 +89,7 @@ struct Random_convex_set_traits : public Random_convex_set_traits_2<Kernel>
 template < class OutputIterator, class Point_generator >
 inline
 OutputIterator
-random_convex_set_2( int n,
+random_convex_set_2( std::size_t n,
                      OutputIterator o,
                      const Point_generator& pg)
 {
@@ -100,7 +100,7 @@ random_convex_set_2( int n,
 template < class OutputIterator, class Point_generator, class R >
 inline
 OutputIterator
-CGAL_random_convex_set_2( int n,
+CGAL_random_convex_set_2( std::size_t n,
                           OutputIterator o,
                           const Point_generator& pg,
                           Point_2< R >*)
diff --git a/Generator/include/CGAL/random_convex_set_2.h b/Generator/include/CGAL/random_convex_set_2.h
index 07068b7b475..b064d137b45 100644
--- a/Generator/include/CGAL/random_convex_set_2.h
+++ b/Generator/include/CGAL/random_convex_set_2.h
@@ -36,7 +36,7 @@ namespace CGAL {
 
 template < class OutputIterator, class Point_generator, class Traits >
 OutputIterator
-random_convex_set_2( int n,
+random_convex_set_2( std::size_t n,
                      OutputIterator o,
                      const Point_generator& pg,
                      Traits t)
diff --git a/Generator/include/CGAL/random_polygon_2.h b/Generator/include/CGAL/random_polygon_2.h
index beda1b40e2b..4f66da45f35 100644
--- a/Generator/include/CGAL/random_polygon_2.h
+++ b/Generator/include/CGAL/random_polygon_2.h
@@ -41,7 +41,7 @@ namespace CGAL {
 // generated with uniform probability.
 //
 template <class PointGenerator, class OutputIterator, class Traits>
-OutputIterator random_polygon_2(int n,  OutputIterator result, 
+OutputIterator random_polygon_2(std::size_t n,  OutputIterator result, 
                                 const PointGenerator& pg, const Traits& traits)
 {
    typedef typename Traits::Point_2           Point_2;
@@ -67,7 +67,7 @@ OutputIterator random_polygon_2(int n,  OutputIterator result,
 
 template <class PointGenerator, class OutputIterator>
 inline
-OutputIterator random_polygon_2( int n,  OutputIterator result, 
+OutputIterator random_polygon_2( std::size_t n,  OutputIterator result, 
                                  const PointGenerator& pg )
 {
    typedef typename std::iterator_traits<PointGenerator>::value_type  Point_2;
@@ -108,7 +108,7 @@ OutputIterator copy_n_unique(InputIterator first, Size n,
    typedef typename Traits::Less_xy_2  Less_xy_2;
 
    std::set<Point_2, Less_xy_2>    sorted_point_set;
-   for (int i = 0; i < n; i++)
+   for (std::size_t i = 0; i < n; i++)
    {
       if (sorted_point_set.insert(*first).second)
       {