diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h
index b308ed83618..5a1ba88a9f0 100644
--- a/STL_Extension/include/CGAL/vector.h
+++ b/STL_Extension/include/CGAL/vector.h
@@ -154,25 +154,8 @@ public:
                                                      const_iterator;
     typedef vector< T, Alloc>                        Self;
 
-#if defined(__SUNPRO_CC) && defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
-    typedef std::reverse_iterator< iterator,
-                                   typename iterator::iterator_category,
-                                   typename iterator::value_type,
-                                   typename iterator::reference,
-                                   typename iterator::pointer,
-                                   typename iterator::difference_type
-                                   > reverse_iterator;
-    typedef std::reverse_iterator< const_iterator,
-                                   typename const_iterator::iterator_category,
-                                   typename const_iterator::value_type,
-                                   typename const_iterator::reference,
-                                   typename const_iterator::pointer,
-                                   typename const_iterator::difference_type
-                                   > const_reverse_iterator;
-#else
-    typedef std::reverse_iterator< iterator >       reverse_iterator;
-    typedef std::reverse_iterator< const_iterator > const_reverse_iterator;
-#endif // defined(__SUNPRO_CC) && defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
+    typedef CGAL_reverse_iterator(iterator)          reverse_iterator;
+    typedef CGAL_reverse_iterator(const_iterator)    const_reverse_iterator;
 
 protected:
 #ifndef _MSC_VER