Revert "Fix test compilation"

This reverts commit 443dfb9901.

test/concept_tests.cpp

@@ -7,16 +7,13 @@
 #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 std::iterator< new_random_access, int >
+  : public boost::iterator< new_random_access, int >
 {
   int& operator*() const { return *m_x; }
   new_iterator& operator++() { return *this; }
@@ -36,7 +33,7 @@ struct new_iterator
 new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; }
 
 struct old_iterator
-  : public std::iterator<std::random_access_iterator_tag, int>
+  : public boost::iterator<std::random_access_iterator_tag, int>
 {
   int& operator*() const { return *m_x; }
   old_iterator& operator++() { return *this; }

test/indirect_iterator_test.cpp

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