diff --git a/example/doc_avl_set.cpp b/example/doc_avl_set.cpp
index 73d7b02..561298c 100644
--- a/example/doc_avl_set.cpp
+++ b/example/doc_avl_set.cpp
@@ -47,7 +47,6 @@ typedef avl_multiset< MyClass, MemberOption>   MemberMultiset;
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create several MyClass objects, each one with a different value
    std::vector<MyClass> values;
diff --git a/example/doc_list.cpp b/example/doc_list.cpp
index 629b682..7b6f390 100644
--- a/example/doc_list.cpp
+++ b/example/doc_list.cpp
@@ -39,7 +39,6 @@ typedef list< MyClass
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create several MyClass objects, each one with a different value
    std::vector<MyClass> values;
diff --git a/example/doc_set.cpp b/example/doc_set.cpp
index 22c69c8..a759e51 100644
--- a/example/doc_set.cpp
+++ b/example/doc_set.cpp
@@ -47,7 +47,6 @@ typedef multiset< MyClass, MemberOption>   MemberMultiset;
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create several MyClass objects, each one with a different value
    std::vector<MyClass> values;
diff --git a/example/doc_sg_set.cpp b/example/doc_sg_set.cpp
index 49b711d..576dbc7 100644
--- a/example/doc_sg_set.cpp
+++ b/example/doc_sg_set.cpp
@@ -48,7 +48,6 @@ typedef sg_multiset< MyClass, MemberOption>   MemberMultiset;
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create several MyClass objects, each one with a different value
    std::vector<MyClass> values;
diff --git a/example/doc_splay_set.cpp b/example/doc_splay_set.cpp
index 50f89e6..45deceb 100644
--- a/example/doc_splay_set.cpp
+++ b/example/doc_splay_set.cpp
@@ -53,7 +53,6 @@ typedef splay_multiset< MyClass, MemberOption>   MemberSplayMultiset;
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create several MyClass objects, each one with a different value
    std::vector<MyClass> values;
diff --git a/example/doc_unordered_set.cpp b/example/doc_unordered_set.cpp
index f276a7d..5468026 100644
--- a/example/doc_unordered_set.cpp
+++ b/example/doc_unordered_set.cpp
@@ -46,7 +46,6 @@ typedef unordered_multiset< MyClass, MemberOption>  MemberMultiSet;
 int main()
 {
    typedef std::vector<MyClass>::iterator VectIt;
-   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
    //Create a vector with 100 different MyClass objects
    std::vector<MyClass> values;
diff --git a/test/generic_assoc_test.hpp b/test/generic_assoc_test.hpp
index 2d08304..6b01749 100644
--- a/test/generic_assoc_test.hpp
+++ b/test/generic_assoc_test.hpp
@@ -184,7 +184,6 @@ void test_generic_assoc<ValueTraits, ContainerDefiner>::test_insert_erase_burst(
 template<class ValueTraits, template <class = void, class = void, class = void, class = void> class ContainerDefiner>
 void test_generic_assoc<ValueTraits, ContainerDefiner>::test_all(std::vector<typename ValueTraits::value_type>& values)
 {
-   typedef typename ValueTraits::value_type value_type;
    test_clone(values);
    test_container_from_end(values);
    test_splay_up(values);
@@ -356,7 +355,6 @@ void test_generic_assoc<ValueTraits, ContainerDefiner>::test_rebalance
       , constant_time_size<value_type::constant_time_size>
       >::type assoc_type;
    typedef std::vector<value_type> orig_set_t;
-   typedef typename orig_set_t::iterator iterator_t;
    orig_set_t original_testset;
    {
       assoc_type testset (values.begin(), values.end());
diff --git a/test/generic_multiset_test.hpp b/test/generic_multiset_test.hpp
index 2224d09..81a0c27 100644
--- a/test/generic_multiset_test.hpp
+++ b/test/generic_multiset_test.hpp
@@ -206,7 +206,6 @@ void test_generic_multiset<ValueTraits, ContainerDefiner>::test_find(std::vector
       >::type multiset_type;
    multiset_type testset (values.begin(), values.end());
    typedef typename multiset_type::iterator        iterator;
-   typedef typename multiset_type::const_iterator  const_iterator;
 
    {
       value_type cmp_val;
diff --git a/test/generic_set_test.hpp b/test/generic_set_test.hpp
index eae5954..050d001 100644
--- a/test/generic_set_test.hpp
+++ b/test/generic_set_test.hpp
@@ -277,7 +277,6 @@ void test_generic_set<ValueTraits, ContainerDefiner>::test_find(std::vector<type
       >::type set_type;
    set_type testset (values.begin(), values.end());
    typedef typename set_type::iterator       iterator;
-   typedef typename set_type::const_iterator const_iterator;
 
    {
       value_type cmp_val;
diff --git a/test/test_container.hpp b/test/test_container.hpp
index 522d93e..bb6444d 100644
--- a/test/test_container.hpp
+++ b/test/test_container.hpp
@@ -27,8 +27,8 @@ struct is_unordered
    static const bool value = false;
 };
 
-template< class Container >
-void test_container( Container & c )
+template<class Container>
+struct test_container_typedefs
 {
    typedef typename Container::value_type       value_type;
    typedef typename Container::iterator         iterator;
@@ -39,10 +39,17 @@ void test_container( Container & c )
    typedef typename Container::const_pointer    const_pointer;
    typedef typename Container::difference_type  difference_type;
    typedef typename Container::size_type        size_type;
-   typedef typename Container::difference_type  difference_type;
-   typedef typename Container::size_type        size_type;
    typedef typename Container::value_traits     value_traits;
+};
 
+template< class Container >
+void test_container( Container & c )
+{
+   typedef typename Container::const_iterator   const_iterator;
+   typedef typename Container::iterator         iterator;
+   typedef typename Container::size_type        size_type;
+
+   {test_container_typedefs<Container> dummy;  (void)dummy;}
    const size_type num_elem = c.size();
    BOOST_TEST( c.empty() == (num_elem == 0) );
    {
@@ -56,7 +63,7 @@ void test_container( Container & c )
    }
 
    //Check iterator conversion
-   BOOST_TEST( const_iterator(c.begin()) == c.cbegin() );
+   BOOST_TEST(const_iterator(c.begin()) == c.cbegin() );
    {
       const_iterator it(c.cbegin()), itend(c.cend());
       size_type i;
@@ -313,7 +320,6 @@ void test_associative_container_invariants(Container & c, Data & d)
 template< class Container, class Data >
 void test_associative_container(Container & c, Data & d)
 {
-   typedef typename Container::const_iterator const_iterator;
    assert( d.size() > 2 );
 
    c.clear();