diff --git a/include/boost/iterator/zip_iterator.hpp b/include/boost/iterator/zip_iterator.hpp
@@ -9,7 +9,6 @@
 # define BOOST_ZIP_ITERATOR_TMB_07_13_2003_HPP_
 
 #include <stddef.h>
-#include <boost/iterator.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/iterator/iterator_adaptor.hpp> // for enable_if_convertible

diff --git a/include/boost/pending/detail/int_iterator.hpp b/include/boost/pending/detail/int_iterator.hpp
@@ -6,11 +6,12 @@
 #ifndef BOOST_INT_ITERATOR_H
 #define BOOST_INT_ITERATOR_H
 
-#include <boost/iterator.hpp>
 #if !defined BOOST_MSVC
 #include <boost/operators.hpp>
 #endif
 #include <iostream>
+#include <iterator>
+#include <cstddef>
 //using namespace std;
 
 #ifndef BOOST_NO_OPERATORS_IN_NAMESPACE

diff --git a/include/boost/pending/iterator_tests.hpp b/include/boost/pending/iterator_tests.hpp
@@ -215,7 +215,7 @@ void random_access_iterator_test(Iterator i, int N, TrueVals vals)
   const Iterator j = i;
   int c;
 
-  typedef typename boost::detail::iterator_traits<Iterator>::value_type value_type;
+  typedef typename std::iterator_traits<Iterator>::value_type value_type;
 
   for (c = 0; c < N-1; ++c) {
     assert(i == j + c);

diff --git a/include/boost/pointee.hpp b/include/boost/pointee.hpp
@@ -20,6 +20,8 @@
 # include <boost/mpl/if.hpp>
 # include <boost/mpl/eval_if.hpp>
 
+#include <iterator>
+
 namespace boost {
 
 namespace detail
@@ -33,7 +35,7 @@ namespace detail
   template <class Iterator>
   struct iterator_pointee
   {
-      typedef typename iterator_traits<Iterator>::value_type value_type;
+      typedef typename std::iterator_traits<Iterator>::value_type value_type;
 
       struct impl
       {

diff --git a/test/concept_tests.cpp b/test/concept_tests.cpp
@@ -7,13 +7,16 @@
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/operators.hpp>
 
+#include <iterator>
+#include <cstddef>
+
 struct new_random_access
   : std::random_access_iterator_tag
   , boost::random_access_traversal_tag
 {};
 
 struct new_iterator
-  : public boost::iterator< new_random_access, int >
+  : public std::iterator< new_random_access, int >
 {
   int& operator*() const { return *m_x; }
   new_iterator& operator++() { return *this; }
@@ -33,7 +36,7 @@ struct new_iterator
 new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; }
 
 struct old_iterator
-  : public boost::iterator<std::random_access_iterator_tag, int>
+  : public std::iterator<std::random_access_iterator_tag, int>
 {
   int& operator*() const { return *m_x; }
   old_iterator& operator++() { return *this; }

diff --git a/test/indirect_iterator_test.cpp b/test/indirect_iterator_test.cpp
@@ -32,6 +32,7 @@
 #include <vector>
 #include <stdlib.h>
 #include <set>
+#include <iterator>
 
 #if !defined(__SGI_STL_PORT)                            \
     && (defined(BOOST_MSVC_STD_ITERATOR)                \
@@ -164,7 +165,7 @@ main()
 
     BOOST_STATIC_ASSERT(
         has_element_type<
-            boost::detail::iterator_traits<shared_t::iterator>::value_type
+            std::iterator_traits<shared_t::iterator>::value_type
         >::value
         );