diff --git a/doc/changes.qbk b/doc/changes.qbk
index af8cf0a5..ecabe158 100644
--- a/doc/changes.qbk
+++ b/doc/changes.qbk
@@ -269,4 +269,8 @@ C++11 support has resulted in some breaking changes:
 * Fix potential overflow when calculating number of buckets to allocate
   ([@https://github.com/boostorg/unordered/pull/4 GitHub #4]).
 
+[h2 Boost 1.62.0]
+
+* Remove use of deprecated `boost::iterator`.
+
 [endsect]
diff --git a/include/boost/unordered/detail/buckets.hpp b/include/boost/unordered/detail/buckets.hpp
index 8a67345c..ac5bd6d8 100644
--- a/include/boost/unordered/detail/buckets.hpp
+++ b/include/boost/unordered/detail/buckets.hpp
@@ -21,7 +21,7 @@
 #include <boost/swap.hpp>
 #include <boost/assert.hpp>
 #include <boost/limits.hpp>
-#include <boost/iterator.hpp>
+#include <iterator>
 
 namespace boost { namespace unordered { namespace detail {
 
@@ -56,7 +56,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
 
     template <typename Node, typename Policy>
     struct l_iterator
-        : public boost::iterator<
+        : public std::iterator<
             std::forward_iterator_tag,
             typename Node::value_type,
             std::ptrdiff_t,
@@ -116,7 +116,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
 
     template <typename Node, typename Policy>
     struct cl_iterator
-        : public boost::iterator<
+        : public std::iterator<
             std::forward_iterator_tag,
             typename Node::value_type,
             std::ptrdiff_t,
@@ -184,7 +184,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
 
     template <typename Node>
     struct iterator
-        : public boost::iterator<
+        : public std::iterator<
             std::forward_iterator_tag,
             typename Node::value_type,
             std::ptrdiff_t,
@@ -248,7 +248,7 @@ namespace boost { namespace unordered { namespace iterator_detail {
 
     template <typename Node>
     struct c_iterator
-        : public boost::iterator<
+        : public std::iterator<
             std::forward_iterator_tag,
             typename Node::value_type,
             std::ptrdiff_t,
diff --git a/test/helpers/input_iterator.hpp b/test/helpers/input_iterator.hpp
index 1671e0c0..d3c91afb 100644
--- a/test/helpers/input_iterator.hpp
+++ b/test/helpers/input_iterator.hpp
@@ -7,8 +7,8 @@
 #define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER
 
 #include <boost/config.hpp>
-#include <boost/iterator.hpp>
 #include <boost/iterator/iterator_traits.hpp>
+#include <iterator>
 
 namespace test
 {
@@ -28,7 +28,7 @@ namespace test
 
     template <class Iterator>
     struct input_iterator_adaptor
-        : public boost::iterator<
+        : public std::iterator<
             std::input_iterator_tag,
             BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
             std::ptrdiff_t,
@@ -72,7 +72,7 @@ namespace test
 
     template <class Iterator>
     struct copy_iterator_adaptor
-        : public boost::iterator<
+        : public std::iterator<
             BOOST_DEDUCED_TYPENAME boost::iterator_category<Iterator>::type,
             BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
             BOOST_DEDUCED_TYPENAME boost::iterator_difference<Iterator>::type,
diff --git a/test/helpers/list.hpp b/test/helpers/list.hpp
index 5d02c2df..0c92928d 100644
--- a/test/helpers/list.hpp
+++ b/test/helpers/list.hpp
@@ -11,8 +11,8 @@
 #if !defined(UNORDERED_TEST_LIST_HEADER)
 #define UNORDERED_TEST_LIST_HEADER
 
-#include <boost/iterator.hpp>
 #include <boost/limits.hpp>
+#include <iterator>
 #include <functional>
 
 namespace test
@@ -83,7 +83,7 @@ namespace test
 
         template <typename T>
         class list_iterator
-            : public boost::iterator<
+            : public std::iterator<
                 std::forward_iterator_tag, T,
                   int, T*, T&>
         {
@@ -109,7 +109,7 @@ namespace test
 
         template <typename T>
         class list_const_iterator
-            : public boost::iterator<
+            : public std::iterator<
                 std::forward_iterator_tag, T,
                   int, T const*, T const&>
         {