diff --git a/src/xalanc/Include/AIXDefinitions.hpp b/src/xalanc/Include/AIXDefinitions.hpp
index 8db21a9..2f58e08 100644
--- a/src/xalanc/Include/AIXDefinitions.hpp
+++ b/src/xalanc/Include/AIXDefinitions.hpp
@@ -36,7 +36,6 @@
 
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 
 
diff --git a/src/xalanc/Include/GCCDefinitions.hpp b/src/xalanc/Include/GCCDefinitions.hpp
index 72acade..e0ccc4b 100644
--- a/src/xalanc/Include/GCCDefinitions.hpp
+++ b/src/xalanc/Include/GCCDefinitions.hpp
@@ -34,7 +34,6 @@
 
 
 #define XALAN_INLINE_INITIALIZATION
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 
 #if defined(CYGWIN)
diff --git a/src/xalanc/Include/HPUXDefinitions.hpp b/src/xalanc/Include/HPUXDefinitions.hpp
index c5ebda1..ab66a1a 100644
--- a/src/xalanc/Include/HPUXDefinitions.hpp
+++ b/src/xalanc/Include/HPUXDefinitions.hpp
@@ -33,7 +33,6 @@
 #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
 
 #if defined(_HP_NAMESPACE_STD)
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #else
 #if defined(RWSTD_MULTI_THREAD) && !defined(__HPACC_THREAD_SAFE_RB_TREE)
diff --git a/src/xalanc/Include/IntelDefinitions.hpp b/src/xalanc/Include/IntelDefinitions.hpp
index 8b4955a..1dc3453 100644
--- a/src/xalanc/Include/IntelDefinitions.hpp
+++ b/src/xalanc/Include/IntelDefinitions.hpp
@@ -33,7 +33,6 @@
 
 
 
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
diff --git a/src/xalanc/Include/OS390Definitions.hpp b/src/xalanc/Include/OS390Definitions.hpp
index c994488..5354696 100644
--- a/src/xalanc/Include/OS390Definitions.hpp
+++ b/src/xalanc/Include/OS390Definitions.hpp
@@ -36,7 +36,6 @@
 #define XALAN_NON_ASCII_PLATFORM
 
 #define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #define XALAN_NO_REENTRANT_TIME_FUNCTIONS
 #define XALAN_POSIX2_AVAILABLE
diff --git a/src/xalanc/Include/SolarisDefinitions.hpp b/src/xalanc/Include/SolarisDefinitions.hpp
index 938eb32..75234d0 100644
--- a/src/xalanc/Include/SolarisDefinitions.hpp
+++ b/src/xalanc/Include/SolarisDefinitions.hpp
@@ -33,7 +33,6 @@
 
 
 #if defined(_STLP_CONFIG_H)
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #else
 #define XALAN_RW_NO_CLASS_PARTIAL_SPEC
diff --git a/src/xalanc/Include/TRU64Definitions.hpp b/src/xalanc/Include/TRU64Definitions.hpp
index 724e088..2d79d9d 100644
--- a/src/xalanc/Include/TRU64Definitions.hpp
+++ b/src/xalanc/Include/TRU64Definitions.hpp
@@ -37,7 +37,6 @@
 #define __USE_STD_IOSTREAM
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
-#define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #define XALAN_NO_REENTRANT_TIME_FUNCTIONS
 
diff --git a/src/xalanc/Include/VCPPDefinitions.hpp b/src/xalanc/Include/VCPPDefinitions.hpp
index 8192fc0..9e7cd1f 100644
--- a/src/xalanc/Include/VCPPDefinitions.hpp
+++ b/src/xalanc/Include/VCPPDefinitions.hpp
@@ -44,7 +44,6 @@
       #define XALAN_USE_WINDOWS_COLLATION
     #endif
   #endif
-  #define XALAN_HAS_STD_ITERATORS
   #if _MSC_VER == 1300
     #define XALAN_VCPP_USE_PTRIT
   #endif
diff --git a/src/xalanc/Include/XalanDeque.hpp b/src/xalanc/Include/XalanDeque.hpp
index 7bf63c9..4091c62 100644
--- a/src/xalanc/Include/XalanDeque.hpp
+++ b/src/xalanc/Include/XalanDeque.hpp
@@ -215,32 +215,8 @@
     typedef XalanDequeIterator<XalanDequeIteratorTraits<value_type>, ThisType>          iterator;
     typedef XalanDequeIterator<XalanDequeConstIteratorTraits<value_type>, ThisType>     const_iterator;
 
-#if defined(XALAN_HAS_STD_ITERATORS)
     typedef std::reverse_iterator<iterator>          reverse_iterator_;
     typedef std::reverse_iterator<const_iterator>    const_reverse_iterator_;
-#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
-    typedef typename iterator::iterator_category    iterator_category;
-
-    // This is a specific case for the Rogue Wave STL on Solaris.
-    typedef std::reverse_iterator<
-        iterator,
-        iterator_category,
-        value_type> reverse_iterator_;
-
-    typedef std::reverse_iterator<
-        const_iterator,
-        iterator_category,
-        const value_type> const_reverse_iterator_;
-#else
-    typedef std::reverse_iterator<
-        iterator,
-        value_type>        reverse_iterator_;
-
-    typedef std::reverse_iterator<
-        const_iterator,
-        value_type,
-        const_reference>   const_reverse_iterator_;
-#endif
 
     typedef reverse_iterator_           reverse_iterator;
     typedef const_reverse_iterator_     const_reverse_iterator;
diff --git a/src/xalanc/Include/XalanList.hpp b/src/xalanc/Include/XalanList.hpp
index 0995271..cf72f46 100644
--- a/src/xalanc/Include/XalanList.hpp
+++ b/src/xalanc/Include/XalanList.hpp
@@ -186,32 +186,8 @@
     typedef XalanListIteratorBase<XalanListIteratorTraits<value_type>, Node>        iterator;
     typedef XalanListIteratorBase<XalanListConstIteratorTraits<value_type>, Node>   const_iterator;
 
-#if defined(XALAN_HAS_STD_ITERATORS)
     typedef std::reverse_iterator<iterator>          reverse_iterator_;
     typedef std::reverse_iterator<const_iterator>    const_reverse_iterator_;
-#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
-    typedef typename iterator::iterator_category    iterator_category;
-
-    // This is a specific case for the Rogue Wave STL on Solaris.
-    typedef std::reverse_iterator<
-        iterator,
-        iterator_category,
-        value_type>         reverse_iterator_;
-
-    typedef std::reverse_iterator<
-        const_iterator,
-        iterator_category,
-        const value_type>   const_reverse_iterator_;
-#else
-    typedef std::reverse_iterator<
-        iterator,
-        value_type>         reverse_iterator_;
-
-    typedef std::reverse_iterator<
-        const_iterator,
-        value_type,
-        const_reference>    const_reverse_iterator_;
-#endif
 
     typedef reverse_iterator_           reverse_iterator;
     typedef const_reverse_iterator_     const_reverse_iterator;
diff --git a/src/xalanc/Include/XalanVector.hpp b/src/xalanc/Include/XalanVector.hpp
index 7400ad3..6b42948 100644
--- a/src/xalanc/Include/XalanVector.hpp
+++ b/src/xalanc/Include/XalanVector.hpp
@@ -89,30 +89,8 @@
     typedef const value_type*       const_iterator;
 #endif
 
-#if defined(XALAN_HAS_STD_ITERATORS)
     typedef std::reverse_iterator<iterator>          reverse_iterator_;
     typedef std::reverse_iterator<const_iterator>    const_reverse_iterator_;
-#elif defined(XALAN_RW_NO_CLASS_PARTIAL_SPEC)
-    typedef std::random_access_iterator_tag  iterator_category;
-
-    // This is a specific case for the Rogue Wave STL on Solaris.
-    typedef std::reverse_iterator<
-        iterator,
-        iterator_category,
-        value_type> reverse_iterator_;
-    typedef std::reverse_iterator<
-        const_iterator,
-        iterator_category,
-        const value_type> const_reverse_iterator_;
-#else
-    typedef std::reverse_iterator<
-        iterator,
-        value_type>         reverse_iterator_;
-    typedef std::reverse_iterator<
-        const_iterator,
-        value_type,
-        const_reference>    const_reverse_iterator_;
-#endif
 
     typedef reverse_iterator_           reverse_iterator;
     typedef const_reverse_iterator_     const_reverse_iterator;