diff --git a/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h b/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h
index 4c3a7dda350..9b16bac7b86 100644
--- a/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h
+++ b/Arrangement_2/include/CGAL/Arr_traits_2/Polyline_2.h
@@ -243,17 +243,7 @@ public:
     friend class _Polyline_2<SegmentTraits_>;
   };
 
-#if defined(__SUNPRO_CC) && defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
-  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< const_iterator > const_reverse_iterator;
-#endif // defined(__SUNPRO_CC) && defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
+  typedef CGAL_reverse_iterator(const_iterator) const_reverse_iterator;
 
   /*! Get an iterator for the polyline points. */
   const_iterator begin() const
diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
index ceba14b6a19..474df7c5855 100644
--- a/STL_Extension/include/CGAL/Compact_container.h
+++ b/STL_Extension/include/CGAL/Compact_container.h
@@ -133,25 +133,8 @@ public:
   typedef typename Allocator::difference_type       difference_type;
   typedef CGALi::CC_iterator<Self, false>           iterator;
   typedef CGALi::CC_iterator<Self, true>            const_iterator;
-#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;
 
   friend class CGALi::CC_iterator<Self, false>;
   friend class CGALi::CC_iterator<Self, true>;
diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h
index 304153ed95e..da3ecc388f0 100644
--- a/STL_Extension/include/CGAL/In_place_list.h
+++ b/STL_Extension/include/CGAL/In_place_list.h
@@ -215,25 +215,8 @@ public:
   typedef CGALi::In_place_list_iterator<T, Alloc> iterator;
   typedef CGALi::In_place_list_const_iterator<T, Alloc> const_iterator;
 
-#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;
 
   typedef In_place_list<T,managed,Alloc>          Self;
 
diff --git a/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h
index 31244ba244a..b7415eca366 100644
--- a/STL_Extension/include/CGAL/Multiset.h
+++ b/STL_Extension/include/CGAL/Multiset.h
@@ -473,25 +473,8 @@ public:
   friend class const_iterator;
 
   // Define the reverse iterators:
-#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: