diff --git a/doc/changes.qbk b/doc/changes.qbk
index 8fd4c2a9..b55a5170 100644
--- a/doc/changes.qbk
+++ b/doc/changes.qbk
@@ -33,4 +33,13 @@ First official release.
   are available.
 * Added equality operators.
 
+[h2 Boost 1.37.0]
+
+* Rename overload of `emplace` with hint, to `emplace_hint` as specified in
+  [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2691.pdf n2691].
+* Provide forwarding headers at `<boost/unordered/unordered_map_fwd.hpp>` and
+  `<boost/unordered/unordered_set_fwd.hpp>`.
+* Move all the implementation inside `boost/unordered`, to assist
+  modularization and hopefully make it easier to track changes in subversion.
+
 [endsect]
diff --git a/doc/intro.qbk b/doc/intro.qbk
index 5f918138..6e4b4ce1 100644
--- a/doc/intro.qbk
+++ b/doc/intro.qbk
@@ -9,7 +9,7 @@
     [@http://www.boost.org/doc/html/boost_tr1.html
     Boost.TR1]]
 [def __draft__
-    [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2007/n2461.pdf
+    [@http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2008/n2691.pdf
     Working Draft of the C++ Standard]]
 [def __hash-table__ [@http://en.wikipedia.org/wiki/Hash_table
     hash table]]
diff --git a/doc/ref.xml b/doc/ref.xml
index d7dd9259..67ef3640 100644
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -24,7 +24,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           </purpose>
           <description>
             <para>For the normative reference see chapter 23 of
-              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2461.pdf">the working draft of the C++ standard [n2461].</ulink></para>
+              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf">the working draft of the C++ standard [n2691].</ulink></para>
             <para><emphasis role="bold">Template Parameters</emphasis>
               <informaltable>
                 <tgroup cols="2">
@@ -287,7 +287,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -754,7 +754,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           </purpose>
           <description>
             <para>For the normative reference see chapter 23 of
-              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2461.pdf">the working draft of the C++ standard [n2461].</ulink></para>
+              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf">the working draft of the C++ standard [n2691].</ulink></para>
             <para><emphasis role="bold">Template Parameters</emphasis>
               <informaltable>
                 <tgroup cols="2">
@@ -1016,7 +1016,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -1488,7 +1488,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           </purpose>
           <description>
             <para>For the normative reference see chapter 23 of
-              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2461.pdf">the working draft of the C++ standard [n2461].</ulink></para>
+              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf">the working draft of the C++ standard [n2691].</ulink></para>
             <para><emphasis role="bold">Template Parameters</emphasis>
               <informaltable>
                 <tgroup cols="2">
@@ -1757,7 +1757,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
@@ -2267,7 +2267,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
           </purpose>
           <description>
             <para>For the normative reference see chapter 23 of
-              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2461.pdf">the working draft of the C++ standard [n2461].</ulink></para>
+              <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2691.pdf">the working draft of the C++ standard [n2691].</ulink></para>
             <para><emphasis role="bold">Template Parameters</emphasis>
               <informaltable>
                 <tgroup cols="2">
@@ -2535,7 +2535,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
                 <para>Only available on compilers with support for variadic template arguments and rvalue references.</para>
               </notes>
             </method>
-            <method name="emplace">
+            <method name="emplace_hint">
               <template>
                 <template-type-parameter name="Args" pack="1">
                 </template-type-parameter>
diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp
new file mode 100644
index 00000000..62647001
--- /dev/null
+++ b/include/boost/unordered/unordered_map.hpp
@@ -0,0 +1,788 @@
+
+// Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
+// Copyright (C) 2005-2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/unordered for documentation
+
+#ifndef BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
+#define BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/unordered/unordered_map_fwd.hpp>
+#include <boost/functional/hash.hpp>
+#include <boost/unordered/detail/hash_table.hpp>
+
+#if !defined(BOOST_HAS_RVALUE_REFS)
+#include <boost/unordered/detail/move.hpp>
+#endif
+
+namespace boost
+{
+    template <class Key, class T, class Hash, class Pred, class Alloc>
+    class unordered_map
+    {
+        typedef boost::unordered_detail::hash_types_unique_keys<
+            std::pair<const Key, T>, Key, Hash, Pred, Alloc
+        > implementation;
+
+        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
+
+    public:
+
+        // types
+
+        typedef Key key_type;
+        typedef std::pair<const Key, T> value_type;
+        typedef T mapped_type;
+        typedef Hash hasher;
+        typedef Pred key_equal;
+
+        typedef Alloc allocator_type;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
+
+        // construct/destroy/copy
+
+        explicit unordered_map(
+                size_type n = boost::unordered_detail::default_initial_bucket_count,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+            : base(n, hf, eql, a)
+        {
+        }
+
+        explicit unordered_map(allocator_type const& a)
+            : base(boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), a)
+        {
+        }
+
+        unordered_map(unordered_map const& other, allocator_type const& a)
+            : base(other.base, a)
+        {
+        }
+
+        template <class InputIterator>
+        unordered_map(InputIterator f, InputIterator l)
+            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), allocator_type())
+        {
+        }
+
+        template <class InputIterator>
+        unordered_map(InputIterator f, InputIterator l,
+                size_type n,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+            : base(f, l, n, hf, eql, a)
+        {
+        }
+
+#if defined(BOOST_HAS_RVALUE_REFS)
+        unordered_map(unordered_map&& other)
+            : base(other.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_map(unordered_map&& other, allocator_type const& a)
+            : base(other.base, a, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_map& operator=(unordered_map&& x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#else
+        unordered_map(boost::unordered_detail::move_from<unordered_map<Key, T, Hash, Pred, Alloc> > other)
+            : base(other.source.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
+        unordered_map& operator=(unordered_map x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#endif
+#endif
+
+    private:
+
+        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
+            get(const_iterator const& it)
+        {
+            return boost::unordered_detail::iterator_access::get(it);
+        }
+
+    public:
+
+        allocator_type get_allocator() const
+        {
+            return base.get_allocator();
+        }
+
+        // size and capacity
+
+        bool empty() const
+        {
+            return base.empty();
+        }
+
+        size_type size() const
+        {
+            return base.size();
+        }
+
+        size_type max_size() const
+        {
+            return base.max_size();
+        }
+
+        // iterators
+
+        iterator begin()
+        {
+            return iterator(base.data_.begin());
+        }
+
+        const_iterator begin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        iterator end()
+        {
+            return iterator(base.data_.end());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        const_iterator cbegin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        const_iterator cend() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        // modifiers
+
+#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
+        template <class... Args>
+        std::pair<iterator, bool> emplace(Args&&... args)
+        {
+            return boost::unordered_detail::pair_cast<iterator, bool>(
+                base.insert(std::forward<Args>(args)...));
+        }
+
+        template <class... Args>
+        iterator emplace_hint(const_iterator hint, Args&&... args)
+        {
+            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
+        }
+#endif
+
+        std::pair<iterator, bool> insert(const value_type& obj)
+        {
+            return boost::unordered_detail::pair_cast<iterator, bool>(
+                    base.insert(obj));
+        }
+
+        iterator insert(const_iterator hint, const value_type& obj)
+        {
+            return iterator(base.insert_hint(get(hint), obj));
+        }
+
+        template <class InputIterator>
+            void insert(InputIterator first, InputIterator last)
+        {
+            base.insert_range(first, last);
+        }
+
+        iterator erase(const_iterator position)
+        {
+            return iterator(base.data_.erase(get(position)));
+        }
+
+        size_type erase(const key_type& k)
+        {
+            return base.erase_key(k);
+        }
+
+        iterator erase(const_iterator first, const_iterator last)
+        {
+            return iterator(base.data_.erase_range(get(first), get(last)));
+        }
+
+        void clear()
+        {
+            base.data_.clear();
+        }
+
+        void swap(unordered_map& other)
+        {
+            base.swap(other.base);
+        }
+
+        // observers
+
+        hasher hash_function() const
+        {
+            return base.hash_function();
+        }
+
+        key_equal key_eq() const
+        {
+            return base.key_eq();
+        }
+
+        mapped_type& operator[](const key_type &k)
+        {
+            return base[k].second;
+        }
+
+        mapped_type& at(const key_type& k)
+        {
+            return base.at(k).second;
+        }
+
+        mapped_type const& at(const key_type& k) const
+        {
+            return base.at(k).second;
+        }
+
+        // lookup
+
+        iterator find(const key_type& k)
+        {
+            return iterator(base.find(k));
+        }
+
+        const_iterator find(const key_type& k) const
+        {
+            return const_iterator(base.find(k));
+        }
+
+        size_type count(const key_type& k) const
+        {
+            return base.count(k);
+        }
+
+        std::pair<iterator, iterator>
+            equal_range(const key_type& k)
+        {
+            return boost::unordered_detail::pair_cast<iterator, iterator>(
+                    base.equal_range(k));
+        }
+
+        std::pair<const_iterator, const_iterator>
+            equal_range(const key_type& k) const
+        {
+            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
+                    base.equal_range(k));
+        }
+
+        // bucket interface
+
+        size_type bucket_count() const
+        {
+            return base.bucket_count();
+        }
+
+        size_type max_bucket_count() const
+        {
+            return base.max_bucket_count();
+        }
+
+        size_type bucket_size(size_type n) const
+        {
+            return base.data_.bucket_size(n);
+        }
+
+        size_type bucket(const key_type& k) const
+        {
+            return base.bucket(k);
+        }
+
+        local_iterator begin(size_type n)
+        {
+            return local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator begin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        local_iterator end(size_type n)
+        {
+            return local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator end(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator cbegin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator cend(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        // hash policy
+
+        float load_factor() const
+        {
+            return base.load_factor();
+        }
+
+        float max_load_factor() const
+        {
+            return base.max_load_factor();
+        }
+
+        void max_load_factor(float m)
+        {
+            base.max_load_factor(m);
+        }
+
+        void rehash(size_type n)
+        {
+            base.rehash(n);
+        }
+        
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_map const&, unordered_map const&);
+        friend bool operator!=(unordered_map const&, unordered_map const&);
+#else
+        friend bool operator==<>(unordered_map const&, unordered_map const&);
+        friend bool operator!=<>(unordered_map const&, unordered_map const&);
+#endif
+    }; // class template unordered_map
+
+    template <class K, class T, class H, class P, class A>
+    inline bool operator==(unordered_map<K, T, H, P, A> const& m1,
+        unordered_map<K, T, H, P, A> const& m2)
+    {
+        return boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class K, class T, class H, class P, class A>
+    inline bool operator!=(unordered_map<K, T, H, P, A> const& m1,
+        unordered_map<K, T, H, P, A> const& m2)
+    {
+        return !boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class K, class T, class H, class P, class A>
+    inline void swap(unordered_map<K, T, H, P, A> &m1,
+            unordered_map<K, T, H, P, A> &m2)
+    {
+        m1.swap(m2);
+    }
+
+    template <class Key, class T, class Hash, class Pred, class Alloc>
+    class unordered_multimap
+    {
+        typedef boost::unordered_detail::hash_types_equivalent_keys<
+            std::pair<const Key, T>, Key, Hash, Pred, Alloc
+        > implementation;
+
+        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
+
+        public:
+
+        // types
+
+        typedef Key key_type;
+        typedef std::pair<const Key, T> value_type;
+        typedef T mapped_type;
+        typedef Hash hasher;
+        typedef Pred key_equal;
+
+        typedef Alloc allocator_type;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
+
+        // construct/destroy/copy
+
+        explicit unordered_multimap(
+                size_type n = boost::unordered_detail::default_initial_bucket_count,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+          : base(n, hf, eql, a)
+        {
+        }
+
+        explicit unordered_multimap(allocator_type const& a)
+            : base(boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), a)
+        {
+        }
+
+        unordered_multimap(unordered_multimap const& other, allocator_type const& a)
+            : base(other.base, a)
+        {
+        }
+
+        template <class InputIterator>
+        unordered_multimap(InputIterator f, InputIterator l)
+            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), allocator_type())
+        {
+        }
+
+        template <class InputIterator>
+        unordered_multimap(InputIterator f, InputIterator l,
+                size_type n,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+          : base(f, l, n, hf, eql, a)
+        {
+        }
+
+#if defined(BOOST_HAS_RVALUE_REFS)
+        unordered_multimap(unordered_multimap&& other)
+            : base(other.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_multimap(unordered_multimap&& other, allocator_type const& a)
+            : base(other.base, a, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_multimap& operator=(unordered_multimap&& x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#else
+        unordered_multimap(boost::unordered_detail::move_from<unordered_multimap<Key, T, Hash, Pred, Alloc> > other)
+            : base(other.source.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
+        unordered_multimap& operator=(unordered_multimap x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#endif
+#endif
+
+
+    private:
+
+        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
+            get(const_iterator const& it)
+        {
+            return boost::unordered_detail::iterator_access::get(it);
+        }
+
+    public:
+
+        allocator_type get_allocator() const
+        {
+            return base.get_allocator();
+        }
+
+        // size and capacity
+
+        bool empty() const
+        {
+            return base.empty();
+        }
+
+        size_type size() const
+        {
+            return base.size();
+        }
+
+        size_type max_size() const
+        {
+            return base.max_size();
+        }
+
+        // iterators
+
+        iterator begin()
+        {
+            return iterator(base.data_.begin());
+        }
+
+        const_iterator begin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        iterator end()
+        {
+            return iterator(base.data_.end());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        const_iterator cbegin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        const_iterator cend() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        // modifiers
+
+#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
+        template <class... Args>
+        iterator emplace(Args&&... args)
+        {
+            return iterator(base.insert(std::forward<Args>(args)...));
+        }
+
+        template <class... Args>
+        iterator emplace_hint(const_iterator hint, Args&&... args)
+        {
+            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
+        }
+#endif
+
+        iterator insert(const value_type& obj)
+        {
+            return iterator(base.insert(obj));
+        }
+
+        iterator insert(const_iterator hint, const value_type& obj)
+        {
+            return iterator(base.insert_hint(get(hint), obj));
+        }
+
+        template <class InputIterator>
+            void insert(InputIterator first, InputIterator last)
+        {
+            base.insert_range(first, last);
+        }
+
+        iterator erase(const_iterator position)
+        {
+            return iterator(base.data_.erase(get(position)));
+        }
+
+        size_type erase(const key_type& k)
+        {
+            return base.erase_key(k);
+        }
+
+        iterator erase(const_iterator first, const_iterator last)
+        {
+            return iterator(base.data_.erase_range(get(first), get(last)));
+        }
+
+        void clear()
+        {
+            base.data_.clear();
+        }
+
+        void swap(unordered_multimap& other)
+        {
+            base.swap(other.base);
+        }
+
+        // observers
+
+        hasher hash_function() const
+        {
+            return base.hash_function();
+        }
+
+        key_equal key_eq() const
+        {
+            return base.key_eq();
+        }
+
+        // lookup
+
+        iterator find(const key_type& k)
+        {
+            return iterator(base.find(k));
+        }
+
+        const_iterator find(const key_type& k) const
+        {
+            return const_iterator(base.find(k));
+        }
+
+        size_type count(const key_type& k) const
+        {
+            return base.count(k);
+        }
+
+        std::pair<iterator, iterator>
+            equal_range(const key_type& k)
+        {
+            return boost::unordered_detail::pair_cast<iterator, iterator>(
+                    base.equal_range(k));
+        }
+
+        std::pair<const_iterator, const_iterator>
+            equal_range(const key_type& k) const
+        {
+            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
+                    base.equal_range(k));
+        }
+
+        // bucket interface
+
+        size_type bucket_count() const
+        {
+            return base.bucket_count();
+        }
+
+        size_type max_bucket_count() const
+        {
+            return base.max_bucket_count();
+        }
+
+        size_type bucket_size(size_type n) const
+        {
+            return base.data_.bucket_size(n);
+        }
+
+        size_type bucket(const key_type& k) const
+        {
+            return base.bucket(k);
+        }
+
+        local_iterator begin(size_type n)
+        {
+            return local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator begin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        local_iterator end(size_type n)
+        {
+            return local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator end(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator cbegin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator cend(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        // hash policy
+
+        float load_factor() const
+        {
+            return base.load_factor();
+        }
+
+        float max_load_factor() const
+        {
+            return base.max_load_factor();
+        }
+
+        void max_load_factor(float m)
+        {
+            base.max_load_factor(m);
+        }
+
+        void rehash(size_type n)
+        {
+            base.rehash(n);
+        }
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_multimap const&, unordered_multimap const&);
+        friend bool operator!=(unordered_multimap const&, unordered_multimap const&);
+#else
+        friend bool operator==<>(unordered_multimap const&, unordered_multimap const&);
+        friend bool operator!=<>(unordered_multimap const&, unordered_multimap const&);
+#endif
+    }; // class template unordered_multimap
+
+    template <class K, class T, class H, class P, class A>
+    inline bool operator==(unordered_multimap<K, T, H, P, A> const& m1,
+        unordered_multimap<K, T, H, P, A> const& m2)
+    {
+        return boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class K, class T, class H, class P, class A>
+    inline bool operator!=(unordered_multimap<K, T, H, P, A> const& m1,
+        unordered_multimap<K, T, H, P, A> const& m2)
+    {
+        return !boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class K, class T, class H, class P, class A>
+    inline void swap(unordered_multimap<K, T, H, P, A> &m1,
+            unordered_multimap<K, T, H, P, A> &m2)
+    {
+        m1.swap(m2);
+    }
+
+} // namespace boost
+
+#endif // BOOST_UNORDERED_UNORDERED_MAP_HPP_INCLUDED
diff --git a/include/boost/unordered/unordered_map_fwd.hpp b/include/boost/unordered/unordered_map_fwd.hpp
new file mode 100644
index 00000000..ceb77fc0
--- /dev/null
+++ b/include/boost/unordered/unordered_map_fwd.hpp
@@ -0,0 +1,53 @@
+
+// Copyright (C) 2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_MAP_FWD_HPP_INCLUDED
+#define BOOST_UNORDERED_MAP_FWD_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <memory>
+#include <functional>
+#include <boost/functional/hash_fwd.hpp>
+
+namespace boost
+{
+    template <class Key,
+        class T,
+        class Hash = hash<Key>,
+        class Pred = std::equal_to<Key>,
+        class Alloc = std::allocator<std::pair<const Key, T> > >
+    class unordered_map;
+    template <class K, class T, class H, class P, class A>
+    bool operator==(unordered_map<K, T, H, P, A> const&,
+        unordered_map<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    bool operator!=(unordered_map<K, T, H, P, A> const&,
+        unordered_map<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    void swap(unordered_map<K, T, H, P, A>&,
+            unordered_map<K, T, H, P, A>&);
+
+    template <class Key,
+        class T,
+        class Hash = hash<Key>,
+        class Pred = std::equal_to<Key>,
+        class Alloc = std::allocator<std::pair<const Key, T> > >
+    class unordered_multimap;
+    template <class K, class T, class H, class P, class A>
+    bool operator==(unordered_multimap<K, T, H, P, A> const&,
+        unordered_multimap<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    bool operator!=(unordered_multimap<K, T, H, P, A> const&,
+        unordered_multimap<K, T, H, P, A> const&);
+    template <class K, class T, class H, class P, class A>
+    void swap(unordered_multimap<K, T, H, P, A>&,
+            unordered_multimap<K, T, H, P, A>&);
+}
+
+#endif
diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp
new file mode 100644
index 00000000..cfb73ad5
--- /dev/null
+++ b/include/boost/unordered/unordered_set.hpp
@@ -0,0 +1,745 @@
+
+// Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
+// Copyright (C) 2005-2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/unordered for documentation
+
+#ifndef BOOST_UNORDERED_UNORDERED_SET_HPP_INCLUDED
+#define BOOST_UNORDERED_UNORDERED_SET_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/unordered/unordered_set_fwd.hpp>
+#include <boost/functional/hash.hpp>
+#include <boost/unordered/detail/hash_table.hpp>
+
+#if !defined(BOOST_HAS_RVALUE_REFS)
+#include <boost/unordered/detail/move.hpp>
+#endif
+
+namespace boost
+{
+    template <class Value, class Hash, class Pred, class Alloc>
+    class unordered_set
+    {
+        typedef boost::unordered_detail::hash_types_unique_keys<
+            Value, Value, Hash, Pred, Alloc
+        > implementation;
+
+        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
+
+    public:
+
+        // types
+
+        typedef Value key_type;
+        typedef Value value_type;
+        typedef Hash hasher;
+        typedef Pred key_equal;
+
+        typedef Alloc allocator_type;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
+
+        // construct/destroy/copy
+
+        explicit unordered_set(
+                size_type n = boost::unordered_detail::default_initial_bucket_count,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+            : base(n, hf, eql, a)
+        {
+        }
+
+        explicit unordered_set(allocator_type const& a)
+            : base(boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), a)
+        {
+        }
+
+        unordered_set(unordered_set const& other, allocator_type const& a)
+            : base(other.base, a)
+        {
+        }
+
+        template <class InputIterator>
+        unordered_set(InputIterator f, InputIterator l)
+            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), allocator_type())
+        {
+        }
+
+        template <class InputIterator>
+        unordered_set(InputIterator f, InputIterator l, size_type n,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+            : base(f, l, n, hf, eql, a)
+        {
+        }
+
+#if defined(BOOST_HAS_RVALUE_REFS)
+        unordered_set(unordered_set&& other)
+            : base(other.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_set(unordered_set&& other, allocator_type const& a)
+            : base(other.base, a, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_set& operator=(unordered_set&& x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#else
+        unordered_set(boost::unordered_detail::move_from<unordered_set<Value, Hash, Pred, Alloc> > other)
+            : base(other.source.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
+        unordered_set& operator=(unordered_set x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#endif
+#endif
+
+    private:
+
+        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
+            get(const_iterator const& it)
+        {
+            return boost::unordered_detail::iterator_access::get(it);
+        }
+
+    public:
+
+        allocator_type get_allocator() const
+        {
+            return base.get_allocator();
+        }
+
+        // size and capacity
+
+        bool empty() const
+        {
+            return base.empty();
+        }
+
+        size_type size() const
+        {
+            return base.size();
+        }
+
+        size_type max_size() const
+        {
+            return base.max_size();
+        }
+
+        // iterators
+
+        iterator begin()
+        {
+            return iterator(base.data_.begin());
+        }
+
+        const_iterator begin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        iterator end()
+        {
+            return iterator(base.data_.end());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        const_iterator cbegin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        const_iterator cend() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        // modifiers
+
+#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
+        template <class... Args>
+        std::pair<iterator, bool> emplace(Args&&... args)
+        {
+            return boost::unordered_detail::pair_cast<iterator, bool>(
+                base.insert(std::forward<Args>(args)...));
+        }
+
+        template <class... Args>
+        iterator emplace_hint(const_iterator hint, Args&&... args)
+        {
+            return iterator(
+                base.insert_hint(get(hint), std::forward<Args>(args)...));
+        }
+#endif
+
+        std::pair<iterator, bool> insert(const value_type& obj)
+        {
+            return boost::unordered_detail::pair_cast<iterator, bool>(
+                    base.insert(obj));
+        }
+
+        iterator insert(const_iterator hint, const value_type& obj)
+        {
+            return iterator(base.insert_hint(get(hint), obj));
+        }
+
+        template <class InputIterator>
+            void insert(InputIterator first, InputIterator last)
+        {
+            base.insert_range(first, last);
+        }
+
+        iterator erase(const_iterator position)
+        {
+            return iterator(base.data_.erase(get(position)));
+        }
+
+        size_type erase(const key_type& k)
+        {
+            return base.erase_key(k);
+        }
+
+        iterator erase(const_iterator first, const_iterator last)
+        {
+            return iterator(base.data_.erase_range(get(first), get(last)));
+        }
+
+        void clear()
+        {
+            base.data_.clear();
+        }
+
+        void swap(unordered_set& other)
+        {
+            base.swap(other.base);
+        }
+
+        // observers
+
+        hasher hash_function() const
+        {
+            return base.hash_function();
+        }
+
+        key_equal key_eq() const
+        {
+            return base.key_eq();
+        }
+
+        // lookup
+
+        const_iterator find(const key_type& k) const
+        {
+            return const_iterator(base.find(k));
+        }
+
+        size_type count(const key_type& k) const
+        {
+            return base.count(k);
+        }
+
+        std::pair<const_iterator, const_iterator>
+            equal_range(const key_type& k) const
+        {
+            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
+                    base.equal_range(k));
+        }
+
+        // bucket interface
+
+        size_type bucket_count() const
+        {
+            return base.bucket_count();
+        }
+
+        size_type max_bucket_count() const
+        {
+            return base.max_bucket_count();
+        }
+
+        size_type bucket_size(size_type n) const
+        {
+            return base.data_.bucket_size(n);
+        }
+
+        size_type bucket(const key_type& k) const
+        {
+            return base.bucket(k);
+        }
+
+        local_iterator begin(size_type n)
+        {
+            return local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator begin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        local_iterator end(size_type n)
+        {
+            return local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator end(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator cbegin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator cend(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        // hash policy
+
+        float load_factor() const
+        {
+            return base.load_factor();
+        }
+
+        float max_load_factor() const
+        {
+            return base.max_load_factor();
+        }
+
+        void max_load_factor(float m)
+        {
+            base.max_load_factor(m);
+        }
+
+        void rehash(size_type n)
+        {
+            base.rehash(n);
+        }
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_set const&, unordered_set const&);
+        friend bool operator!=(unordered_set const&, unordered_set const&);
+#else
+        friend bool operator==<>(unordered_set const&, unordered_set const&);
+        friend bool operator!=<>(unordered_set const&, unordered_set const&);
+#endif
+    }; // class template unordered_set
+
+    template <class T, class H, class P, class A>
+    inline bool operator==(unordered_set<T, H, P, A> const& m1,
+        unordered_set<T, H, P, A> const& m2)
+    {
+        return boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class T, class H, class P, class A>
+    inline bool operator!=(unordered_set<T, H, P, A> const& m1,
+        unordered_set<T, H, P, A> const& m2)
+    {
+        return !boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class T, class H, class P, class A>
+    inline void swap(unordered_set<T, H, P, A> &m1,
+            unordered_set<T, H, P, A> &m2)
+    {
+        m1.swap(m2);
+    }
+
+    template <class Value, class Hash, class Pred, class Alloc>
+    class unordered_multiset
+    {
+        typedef boost::unordered_detail::hash_types_equivalent_keys<
+            Value, Value, Hash, Pred, Alloc
+        > implementation;
+
+        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
+
+    public:
+
+        //types
+
+        typedef Value key_type;
+        typedef Value value_type;
+        typedef Hash hasher;
+        typedef Pred key_equal;
+
+        typedef Alloc allocator_type;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
+        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
+
+        // construct/destroy/copy
+
+        explicit unordered_multiset(
+                size_type n = boost::unordered_detail::default_initial_bucket_count,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+          : base(n, hf, eql, a)
+        {
+        }
+
+        explicit unordered_multiset(allocator_type const& a)
+            : base(boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), a)
+        {
+        }
+
+        unordered_multiset(unordered_multiset const& other, allocator_type const& a)
+            : base(other.base, a)
+        {
+        }
+
+        template <class InputIterator>
+        unordered_multiset(InputIterator f, InputIterator l)
+            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
+                hasher(), key_equal(), allocator_type())
+        {
+        }
+
+        template <class InputIterator>
+        unordered_multiset(InputIterator f, InputIterator l, size_type n,
+                const hasher &hf = hasher(),
+                const key_equal &eql = key_equal(),
+                const allocator_type &a = allocator_type())
+          : base(f, l, n, hf, eql, a)
+        {
+        }
+
+#if defined(BOOST_HAS_RVALUE_REFS)
+        unordered_multiset(unordered_multiset&& other)
+            : base(other.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_multiset(unordered_multiset&& other, allocator_type const& a)
+            : base(other.base, a, boost::unordered_detail::move_tag())
+        {
+        }
+
+        unordered_multiset& operator=(unordered_multiset&& x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#else
+        unordered_multiset(boost::unordered_detail::move_from<unordered_multiset<Value, Hash, Pred, Alloc> > other)
+            : base(other.source.base, boost::unordered_detail::move_tag())
+        {
+        }
+
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
+        unordered_multiset& operator=(unordered_multiset x)
+        {
+            base.move(x.base);
+            return *this;
+        }
+#endif
+#endif
+
+    private:
+
+        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
+            get(const_iterator const& it)
+        {
+            return boost::unordered_detail::iterator_access::get(it);
+        }
+
+    public:
+
+        allocator_type get_allocator() const
+        {
+            return base.get_allocator();
+        }
+
+        // size and capacity
+
+        bool empty() const
+        {
+            return base.empty();
+        }
+
+        size_type size() const
+        {
+            return base.size();
+        }
+
+        size_type max_size() const
+        {
+            return base.max_size();
+        }
+
+        // iterators
+
+        iterator begin()
+        {
+            return iterator(base.data_.begin());
+        }
+
+        const_iterator begin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        iterator end()
+        {
+            return iterator(base.data_.end());
+        }
+
+        const_iterator end() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        const_iterator cbegin() const
+        {
+            return const_iterator(base.data_.begin());
+        }
+
+        const_iterator cend() const
+        {
+            return const_iterator(base.data_.end());
+        }
+
+        // modifiers
+
+#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
+        template <class... Args>
+        iterator emplace(Args&&... args)
+        {
+            return iterator(base.insert(std::forward<Args>(args)...));
+        }
+
+        template <class... Args>
+        iterator emplace_hint(const_iterator hint, Args&&... args)
+        {
+            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
+        }
+#endif
+
+        iterator insert(const value_type& obj)
+        {
+            return iterator(base.insert(obj));
+        }
+
+        iterator insert(const_iterator hint, const value_type& obj)
+        {
+            return iterator(base.insert_hint(get(hint), obj));
+        }
+
+        template <class InputIterator>
+            void insert(InputIterator first, InputIterator last)
+        {
+            base.insert_range(first, last);
+        }
+
+        iterator erase(const_iterator position)
+        {
+            return iterator(base.data_.erase(get(position)));
+        }
+
+        size_type erase(const key_type& k)
+        {
+            return base.erase_key(k);
+        }
+
+        iterator erase(const_iterator first, const_iterator last)
+        {
+            return iterator(base.data_.erase_range(get(first), get(last)));
+        }
+
+        void clear()
+        {
+            base.data_.clear();
+        }
+
+        void swap(unordered_multiset& other)
+        {
+            base.swap(other.base);
+        }
+
+        // observers
+
+        hasher hash_function() const
+        {
+            return base.hash_function();
+        }
+
+        key_equal key_eq() const
+        {
+            return base.key_eq();
+        }
+
+        // lookup
+
+        const_iterator find(const key_type& k) const
+        {
+            return const_iterator(base.find(k));
+        }
+
+        size_type count(const key_type& k) const
+        {
+            return base.count(k);
+        }
+
+        std::pair<const_iterator, const_iterator>
+            equal_range(const key_type& k) const
+        {
+            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
+                    base.equal_range(k));
+        }
+
+        // bucket interface
+
+        size_type bucket_count() const
+        {
+            return base.bucket_count();
+        }
+
+        size_type max_bucket_count() const
+        {
+            return base.max_bucket_count();
+        }
+
+        size_type bucket_size(size_type n) const
+        {
+            return base.data_.bucket_size(n);
+        }
+
+        size_type bucket(const key_type& k) const
+        {
+            return base.bucket(k);
+        }
+
+        local_iterator begin(size_type n)
+        {
+            return local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator begin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        local_iterator end(size_type n)
+        {
+            return local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator end(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        const_local_iterator cbegin(size_type n) const
+        {
+            return const_local_iterator(base.data_.begin(n));
+        }
+
+        const_local_iterator cend(size_type n) const
+        {
+            return const_local_iterator(base.data_.end(n));
+        }
+
+        // hash policy
+
+        float load_factor() const
+        {
+            return base.load_factor();
+        }
+
+        float max_load_factor() const
+        {
+            return base.max_load_factor();
+        }
+
+        void max_load_factor(float m)
+        {
+            base.max_load_factor(m);
+        }
+
+        void rehash(size_type n)
+        {
+            base.rehash(n);
+        }
+
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+        friend bool operator==(unordered_multiset const&, unordered_multiset const&);
+        friend bool operator!=(unordered_multiset const&, unordered_multiset const&);
+#else
+        friend bool operator==<>(unordered_multiset const&, unordered_multiset const&);
+        friend bool operator!=<>(unordered_multiset const&, unordered_multiset const&);
+#endif
+    }; // class template unordered_multiset
+
+    template <class T, class H, class P, class A>
+    inline bool operator==(unordered_multiset<T, H, P, A> const& m1,
+        unordered_multiset<T, H, P, A> const& m2)
+    {
+        return boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class T, class H, class P, class A>
+    inline bool operator!=(unordered_multiset<T, H, P, A> const& m1,
+        unordered_multiset<T, H, P, A> const& m2)
+    {
+        return !boost::unordered_detail::equals(m1.base, m2.base);
+    }
+
+    template <class T, class H, class P, class A>
+    inline void swap(unordered_multiset<T, H, P, A> &m1,
+            unordered_multiset<T, H, P, A> &m2)
+    {
+        m1.swap(m2);
+    }
+
+} // namespace boost
+
+#endif // BOOST_UNORDERED_UNORDERED_SET_HPP_INCLUDED
diff --git a/include/boost/unordered/unordered_set_fwd.hpp b/include/boost/unordered/unordered_set_fwd.hpp
new file mode 100644
index 00000000..48a2caac
--- /dev/null
+++ b/include/boost/unordered/unordered_set_fwd.hpp
@@ -0,0 +1,51 @@
+
+// Copyright (C) 2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNORDERED_SET_FWD_HPP_INCLUDED
+#define BOOST_UNORDERED_SET_FWD_HPP_INCLUDED
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <boost/config.hpp>
+#include <memory>
+#include <functional>
+#include <boost/functional/hash_fwd.hpp>
+
+namespace boost
+{
+    template <class Value,
+        class Hash = hash<Value>,
+        class Pred = std::equal_to<Value>,
+        class Alloc = std::allocator<Value> >
+    class unordered_set;
+    template <class T, class H, class P, class A>
+    bool operator==(unordered_set<T, H, P, A> const&,
+        unordered_set<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    bool operator!=(unordered_set<T, H, P, A> const&,
+        unordered_set<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    void swap(unordered_set<T, H, P, A> &m1,
+            unordered_set<T, H, P, A> &m2);
+
+    template <class Value,
+        class Hash = hash<Value>,
+        class Pred = std::equal_to<Value>,
+        class Alloc = std::allocator<Value> >
+    class unordered_multiset;
+    template <class T, class H, class P, class A>
+    bool operator==(unordered_multiset<T, H, P, A> const&,
+        unordered_multiset<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    bool operator!=(unordered_multiset<T, H, P, A> const&,
+        unordered_multiset<T, H, P, A> const&);
+    template <class T, class H, class P, class A>
+    void swap(unordered_multiset<T, H, P, A> &m1,
+            unordered_multiset<T, H, P, A> &m2);
+}
+
+#endif
diff --git a/include/boost/unordered_map.hpp b/include/boost/unordered_map.hpp
index 484cf42f..00d3c91c 100644
--- a/include/boost/unordered_map.hpp
+++ b/include/boost/unordered_map.hpp
@@ -13,812 +13,6 @@
 # pragma once
 #endif
 
-#include <boost/config.hpp>
-
-#include <functional>
-#include <memory>
-
-#include <boost/functional/hash.hpp>
-#include <boost/unordered/detail/hash_table.hpp>
-
-#if !defined(BOOST_HAS_RVALUE_REFS)
-#include <boost/unordered/detail/move.hpp>
-#endif
-
-namespace boost
-{
-    template <class Key,
-        class T,
-        class Hash = hash<Key>,
-        class Pred = std::equal_to<Key>,
-        class Alloc = std::allocator<std::pair<const Key, T> > >
-    class unordered_map;
-    template <class K, class T, class H, class P, class A>
-    bool operator==(unordered_map<K, T, H, P, A> const&,
-        unordered_map<K, T, H, P, A> const&);
-    template <class K, class T, class H, class P, class A>
-    bool operator!=(unordered_map<K, T, H, P, A> const&,
-        unordered_map<K, T, H, P, A> const&);
-    template <class K, class T, class H, class P, class A>
-    void swap(unordered_map<K, T, H, P, A>&,
-            unordered_map<K, T, H, P, A>&);
-
-    template <class Key,
-        class T,
-        class Hash = hash<Key>,
-        class Pred = std::equal_to<Key>,
-        class Alloc = std::allocator<std::pair<const Key, T> > >
-    class unordered_multimap;
-    template <class K, class T, class H, class P, class A>
-    bool operator==(unordered_multimap<K, T, H, P, A> const&,
-        unordered_multimap<K, T, H, P, A> const&);
-    template <class K, class T, class H, class P, class A>
-    bool operator!=(unordered_multimap<K, T, H, P, A> const&,
-        unordered_multimap<K, T, H, P, A> const&);
-    template <class K, class T, class H, class P, class A>
-    void swap(unordered_multimap<K, T, H, P, A>&,
-            unordered_multimap<K, T, H, P, A>&);
-
-    template <class Key, class T, class Hash, class Pred, class Alloc>
-    class unordered_map
-    {
-        typedef boost::unordered_detail::hash_types_unique_keys<
-            std::pair<const Key, T>, Key, Hash, Pred, Alloc
-        > implementation;
-
-        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
-
-    public:
-
-        // types
-
-        typedef Key key_type;
-        typedef std::pair<const Key, T> value_type;
-        typedef T mapped_type;
-        typedef Hash hasher;
-        typedef Pred key_equal;
-
-        typedef Alloc allocator_type;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
-        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
-
-        // construct/destroy/copy
-
-        explicit unordered_map(
-                size_type n = boost::unordered_detail::default_initial_bucket_count,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-            : base(n, hf, eql, a)
-        {
-        }
-
-        explicit unordered_map(allocator_type const& a)
-            : base(boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), a)
-        {
-        }
-
-        unordered_map(unordered_map const& other, allocator_type const& a)
-            : base(other.base, a)
-        {
-        }
-
-        template <class InputIterator>
-        unordered_map(InputIterator f, InputIterator l)
-            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), allocator_type())
-        {
-        }
-
-        template <class InputIterator>
-        unordered_map(InputIterator f, InputIterator l,
-                size_type n,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-            : base(f, l, n, hf, eql, a)
-        {
-        }
-
-#if defined(BOOST_HAS_RVALUE_REFS)
-        unordered_map(unordered_map&& other)
-            : base(other.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_map(unordered_map&& other, allocator_type const& a)
-            : base(other.base, a, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_map& operator=(unordered_map&& x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#else
-        unordered_map(boost::unordered_detail::move_from<unordered_map<Key, T, Hash, Pred, Alloc> > other)
-            : base(other.source.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
-        unordered_map& operator=(unordered_map x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#endif
-#endif
-
-    private:
-
-        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
-            get(const_iterator const& it)
-        {
-            return boost::unordered_detail::iterator_access::get(it);
-        }
-
-    public:
-
-        allocator_type get_allocator() const
-        {
-            return base.get_allocator();
-        }
-
-        // size and capacity
-
-        bool empty() const
-        {
-            return base.empty();
-        }
-
-        size_type size() const
-        {
-            return base.size();
-        }
-
-        size_type max_size() const
-        {
-            return base.max_size();
-        }
-
-        // iterators
-
-        iterator begin()
-        {
-            return iterator(base.data_.begin());
-        }
-
-        const_iterator begin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        iterator end()
-        {
-            return iterator(base.data_.end());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        const_iterator cbegin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        const_iterator cend() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        // modifiers
-
-#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-        template <class... Args>
-        std::pair<iterator, bool> emplace(Args&&... args)
-        {
-            return boost::unordered_detail::pair_cast<iterator, bool>(
-                base.insert(std::forward<Args>(args)...));
-        }
-
-        template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
-        {
-            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
-        }
-#endif
-
-        std::pair<iterator, bool> insert(const value_type& obj)
-        {
-            return boost::unordered_detail::pair_cast<iterator, bool>(
-                    base.insert(obj));
-        }
-
-        iterator insert(const_iterator hint, const value_type& obj)
-        {
-            return iterator(base.insert_hint(get(hint), obj));
-        }
-
-        template <class InputIterator>
-            void insert(InputIterator first, InputIterator last)
-        {
-            base.insert_range(first, last);
-        }
-
-        iterator erase(const_iterator position)
-        {
-            return iterator(base.data_.erase(get(position)));
-        }
-
-        size_type erase(const key_type& k)
-        {
-            return base.erase_key(k);
-        }
-
-        iterator erase(const_iterator first, const_iterator last)
-        {
-            return iterator(base.data_.erase_range(get(first), get(last)));
-        }
-
-        void clear()
-        {
-            base.data_.clear();
-        }
-
-        void swap(unordered_map& other)
-        {
-            base.swap(other.base);
-        }
-
-        // observers
-
-        hasher hash_function() const
-        {
-            return base.hash_function();
-        }
-
-        key_equal key_eq() const
-        {
-            return base.key_eq();
-        }
-
-        mapped_type& operator[](const key_type &k)
-        {
-            return base[k].second;
-        }
-
-        mapped_type& at(const key_type& k)
-        {
-            return base.at(k).second;
-        }
-
-        mapped_type const& at(const key_type& k) const
-        {
-            return base.at(k).second;
-        }
-
-        // lookup
-
-        iterator find(const key_type& k)
-        {
-            return iterator(base.find(k));
-        }
-
-        const_iterator find(const key_type& k) const
-        {
-            return const_iterator(base.find(k));
-        }
-
-        size_type count(const key_type& k) const
-        {
-            return base.count(k);
-        }
-
-        std::pair<iterator, iterator>
-            equal_range(const key_type& k)
-        {
-            return boost::unordered_detail::pair_cast<iterator, iterator>(
-                    base.equal_range(k));
-        }
-
-        std::pair<const_iterator, const_iterator>
-            equal_range(const key_type& k) const
-        {
-            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
-                    base.equal_range(k));
-        }
-
-        // bucket interface
-
-        size_type bucket_count() const
-        {
-            return base.bucket_count();
-        }
-
-        size_type max_bucket_count() const
-        {
-            return base.max_bucket_count();
-        }
-
-        size_type bucket_size(size_type n) const
-        {
-            return base.data_.bucket_size(n);
-        }
-
-        size_type bucket(const key_type& k) const
-        {
-            return base.bucket(k);
-        }
-
-        local_iterator begin(size_type n)
-        {
-            return local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator begin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        local_iterator end(size_type n)
-        {
-            return local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator end(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator cbegin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator cend(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        // hash policy
-
-        float load_factor() const
-        {
-            return base.load_factor();
-        }
-
-        float max_load_factor() const
-        {
-            return base.max_load_factor();
-        }
-
-        void max_load_factor(float m)
-        {
-            base.max_load_factor(m);
-        }
-
-        void rehash(size_type n)
-        {
-            base.rehash(n);
-        }
-        
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-        friend bool operator==(unordered_map const&, unordered_map const&);
-        friend bool operator!=(unordered_map const&, unordered_map const&);
-#else
-        friend bool operator==<>(unordered_map const&, unordered_map const&);
-        friend bool operator!=<>(unordered_map const&, unordered_map const&);
-#endif
-    }; // class template unordered_map
-
-    template <class K, class T, class H, class P, class A>
-    inline bool operator==(unordered_map<K, T, H, P, A> const& m1,
-        unordered_map<K, T, H, P, A> const& m2)
-    {
-        return boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class K, class T, class H, class P, class A>
-    inline bool operator!=(unordered_map<K, T, H, P, A> const& m1,
-        unordered_map<K, T, H, P, A> const& m2)
-    {
-        return !boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class K, class T, class H, class P, class A>
-    inline void swap(unordered_map<K, T, H, P, A> &m1,
-            unordered_map<K, T, H, P, A> &m2)
-    {
-        m1.swap(m2);
-    }
-
-    template <class Key, class T, class Hash, class Pred, class Alloc>
-    class unordered_multimap
-    {
-        typedef boost::unordered_detail::hash_types_equivalent_keys<
-            std::pair<const Key, T>, Key, Hash, Pred, Alloc
-        > implementation;
-
-        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
-
-        public:
-
-        // types
-
-        typedef Key key_type;
-        typedef std::pair<const Key, T> value_type;
-        typedef T mapped_type;
-        typedef Hash hasher;
-        typedef Pred key_equal;
-
-        typedef Alloc allocator_type;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
-        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
-
-        // construct/destroy/copy
-
-        explicit unordered_multimap(
-                size_type n = boost::unordered_detail::default_initial_bucket_count,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-          : base(n, hf, eql, a)
-        {
-        }
-
-        explicit unordered_multimap(allocator_type const& a)
-            : base(boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), a)
-        {
-        }
-
-        unordered_multimap(unordered_multimap const& other, allocator_type const& a)
-            : base(other.base, a)
-        {
-        }
-
-        template <class InputIterator>
-        unordered_multimap(InputIterator f, InputIterator l)
-            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), allocator_type())
-        {
-        }
-
-        template <class InputIterator>
-        unordered_multimap(InputIterator f, InputIterator l,
-                size_type n,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-          : base(f, l, n, hf, eql, a)
-        {
-        }
-
-#if defined(BOOST_HAS_RVALUE_REFS)
-        unordered_multimap(unordered_multimap&& other)
-            : base(other.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_multimap(unordered_multimap&& other, allocator_type const& a)
-            : base(other.base, a, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_multimap& operator=(unordered_multimap&& x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#else
-        unordered_multimap(boost::unordered_detail::move_from<unordered_multimap<Key, T, Hash, Pred, Alloc> > other)
-            : base(other.source.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
-        unordered_multimap& operator=(unordered_multimap x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#endif
-#endif
-
-
-    private:
-
-        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
-            get(const_iterator const& it)
-        {
-            return boost::unordered_detail::iterator_access::get(it);
-        }
-
-    public:
-
-        allocator_type get_allocator() const
-        {
-            return base.get_allocator();
-        }
-
-        // size and capacity
-
-        bool empty() const
-        {
-            return base.empty();
-        }
-
-        size_type size() const
-        {
-            return base.size();
-        }
-
-        size_type max_size() const
-        {
-            return base.max_size();
-        }
-
-        // iterators
-
-        iterator begin()
-        {
-            return iterator(base.data_.begin());
-        }
-
-        const_iterator begin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        iterator end()
-        {
-            return iterator(base.data_.end());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        const_iterator cbegin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        const_iterator cend() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        // modifiers
-
-#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-        template <class... Args>
-        iterator emplace(Args&&... args)
-        {
-            return iterator(base.insert(std::forward<Args>(args)...));
-        }
-
-        template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
-        {
-            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
-        }
-#endif
-
-        iterator insert(const value_type& obj)
-        {
-            return iterator(base.insert(obj));
-        }
-
-        iterator insert(const_iterator hint, const value_type& obj)
-        {
-            return iterator(base.insert_hint(get(hint), obj));
-        }
-
-        template <class InputIterator>
-            void insert(InputIterator first, InputIterator last)
-        {
-            base.insert_range(first, last);
-        }
-
-        iterator erase(const_iterator position)
-        {
-            return iterator(base.data_.erase(get(position)));
-        }
-
-        size_type erase(const key_type& k)
-        {
-            return base.erase_key(k);
-        }
-
-        iterator erase(const_iterator first, const_iterator last)
-        {
-            return iterator(base.data_.erase_range(get(first), get(last)));
-        }
-
-        void clear()
-        {
-            base.data_.clear();
-        }
-
-        void swap(unordered_multimap& other)
-        {
-            base.swap(other.base);
-        }
-
-        // observers
-
-        hasher hash_function() const
-        {
-            return base.hash_function();
-        }
-
-        key_equal key_eq() const
-        {
-            return base.key_eq();
-        }
-
-        // lookup
-
-        iterator find(const key_type& k)
-        {
-            return iterator(base.find(k));
-        }
-
-        const_iterator find(const key_type& k) const
-        {
-            return const_iterator(base.find(k));
-        }
-
-        size_type count(const key_type& k) const
-        {
-            return base.count(k);
-        }
-
-        std::pair<iterator, iterator>
-            equal_range(const key_type& k)
-        {
-            return boost::unordered_detail::pair_cast<iterator, iterator>(
-                    base.equal_range(k));
-        }
-
-        std::pair<const_iterator, const_iterator>
-            equal_range(const key_type& k) const
-        {
-            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
-                    base.equal_range(k));
-        }
-
-        // bucket interface
-
-        size_type bucket_count() const
-        {
-            return base.bucket_count();
-        }
-
-        size_type max_bucket_count() const
-        {
-            return base.max_bucket_count();
-        }
-
-        size_type bucket_size(size_type n) const
-        {
-            return base.data_.bucket_size(n);
-        }
-
-        size_type bucket(const key_type& k) const
-        {
-            return base.bucket(k);
-        }
-
-        local_iterator begin(size_type n)
-        {
-            return local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator begin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        local_iterator end(size_type n)
-        {
-            return local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator end(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator cbegin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator cend(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        // hash policy
-
-        float load_factor() const
-        {
-            return base.load_factor();
-        }
-
-        float max_load_factor() const
-        {
-            return base.max_load_factor();
-        }
-
-        void max_load_factor(float m)
-        {
-            base.max_load_factor(m);
-        }
-
-        void rehash(size_type n)
-        {
-            base.rehash(n);
-        }
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-        friend bool operator==(unordered_multimap const&, unordered_multimap const&);
-        friend bool operator!=(unordered_multimap const&, unordered_multimap const&);
-#else
-        friend bool operator==<>(unordered_multimap const&, unordered_multimap const&);
-        friend bool operator!=<>(unordered_multimap const&, unordered_multimap const&);
-#endif
-    }; // class template unordered_multimap
-
-    template <class K, class T, class H, class P, class A>
-    inline bool operator==(unordered_multimap<K, T, H, P, A> const& m1,
-        unordered_multimap<K, T, H, P, A> const& m2)
-    {
-        return boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class K, class T, class H, class P, class A>
-    inline bool operator!=(unordered_multimap<K, T, H, P, A> const& m1,
-        unordered_multimap<K, T, H, P, A> const& m2)
-    {
-        return !boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class K, class T, class H, class P, class A>
-    inline void swap(unordered_multimap<K, T, H, P, A> &m1,
-            unordered_multimap<K, T, H, P, A> &m2)
-    {
-        m1.swap(m2);
-    }
-
-} // namespace boost
+#include <boost/unordered/unordered_map.hpp>
 
 #endif // BOOST_UNORDERED_MAP_HPP_INCLUDED
diff --git a/include/boost/unordered_set.hpp b/include/boost/unordered_set.hpp
index 5b82f002..98c3ce1d 100644
--- a/include/boost/unordered_set.hpp
+++ b/include/boost/unordered_set.hpp
@@ -13,767 +13,6 @@
 # pragma once
 #endif
 
-#include <boost/config.hpp>
-
-#include <functional>
-#include <memory>
-
-#include <boost/functional/hash.hpp>
-#include <boost/unordered/detail/hash_table.hpp>
-
-#if !defined(BOOST_HAS_RVALUE_REFS)
-#include <boost/unordered/detail/move.hpp>
-#endif
-
-namespace boost
-{
-    template <class Value,
-        class Hash = hash<Value>,
-        class Pred = std::equal_to<Value>,
-        class Alloc = std::allocator<Value> >
-    class unordered_set;
-    template <class T, class H, class P, class A>
-    bool operator==(unordered_set<T, H, P, A> const&,
-        unordered_set<T, H, P, A> const&);
-    template <class T, class H, class P, class A>
-    bool operator!=(unordered_set<T, H, P, A> const&,
-        unordered_set<T, H, P, A> const&);
-    template <class T, class H, class P, class A>
-    void swap(unordered_set<T, H, P, A> &m1,
-            unordered_set<T, H, P, A> &m2);
-
-    template <class Value,
-        class Hash = hash<Value>,
-        class Pred = std::equal_to<Value>,
-        class Alloc = std::allocator<Value> >
-    class unordered_multiset;
-    template <class T, class H, class P, class A>
-    bool operator==(unordered_multiset<T, H, P, A> const&,
-        unordered_multiset<T, H, P, A> const&);
-    template <class T, class H, class P, class A>
-    bool operator!=(unordered_multiset<T, H, P, A> const&,
-        unordered_multiset<T, H, P, A> const&);
-    template <class T, class H, class P, class A>
-    void swap(unordered_multiset<T, H, P, A> &m1,
-            unordered_multiset<T, H, P, A> &m2);
-
-    template <class Value, class Hash, class Pred, class Alloc>
-    class unordered_set
-    {
-        typedef boost::unordered_detail::hash_types_unique_keys<
-            Value, Value, Hash, Pred, Alloc
-        > implementation;
-
-        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
-
-    public:
-
-        // types
-
-        typedef Value key_type;
-        typedef Value value_type;
-        typedef Hash hasher;
-        typedef Pred key_equal;
-
-        typedef Alloc allocator_type;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
-        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
-
-        // construct/destroy/copy
-
-        explicit unordered_set(
-                size_type n = boost::unordered_detail::default_initial_bucket_count,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-            : base(n, hf, eql, a)
-        {
-        }
-
-        explicit unordered_set(allocator_type const& a)
-            : base(boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), a)
-        {
-        }
-
-        unordered_set(unordered_set const& other, allocator_type const& a)
-            : base(other.base, a)
-        {
-        }
-
-        template <class InputIterator>
-        unordered_set(InputIterator f, InputIterator l)
-            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), allocator_type())
-        {
-        }
-
-        template <class InputIterator>
-        unordered_set(InputIterator f, InputIterator l, size_type n,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-            : base(f, l, n, hf, eql, a)
-        {
-        }
-
-#if defined(BOOST_HAS_RVALUE_REFS)
-        unordered_set(unordered_set&& other)
-            : base(other.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_set(unordered_set&& other, allocator_type const& a)
-            : base(other.base, a, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_set& operator=(unordered_set&& x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#else
-        unordered_set(boost::unordered_detail::move_from<unordered_set<Value, Hash, Pred, Alloc> > other)
-            : base(other.source.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
-        unordered_set& operator=(unordered_set x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#endif
-#endif
-
-    private:
-
-        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
-            get(const_iterator const& it)
-        {
-            return boost::unordered_detail::iterator_access::get(it);
-        }
-
-    public:
-
-        allocator_type get_allocator() const
-        {
-            return base.get_allocator();
-        }
-
-        // size and capacity
-
-        bool empty() const
-        {
-            return base.empty();
-        }
-
-        size_type size() const
-        {
-            return base.size();
-        }
-
-        size_type max_size() const
-        {
-            return base.max_size();
-        }
-
-        // iterators
-
-        iterator begin()
-        {
-            return iterator(base.data_.begin());
-        }
-
-        const_iterator begin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        iterator end()
-        {
-            return iterator(base.data_.end());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        const_iterator cbegin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        const_iterator cend() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        // modifiers
-
-#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-        template <class... Args>
-        std::pair<iterator, bool> emplace(Args&&... args)
-        {
-            return boost::unordered_detail::pair_cast<iterator, bool>(
-                base.insert(std::forward<Args>(args)...));
-        }
-
-        template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
-        {
-            return iterator(
-                base.insert_hint(get(hint), std::forward<Args>(args)...));
-        }
-#endif
-
-        std::pair<iterator, bool> insert(const value_type& obj)
-        {
-            return boost::unordered_detail::pair_cast<iterator, bool>(
-                    base.insert(obj));
-        }
-
-        iterator insert(const_iterator hint, const value_type& obj)
-        {
-            return iterator(base.insert_hint(get(hint), obj));
-        }
-
-        template <class InputIterator>
-            void insert(InputIterator first, InputIterator last)
-        {
-            base.insert_range(first, last);
-        }
-
-        iterator erase(const_iterator position)
-        {
-            return iterator(base.data_.erase(get(position)));
-        }
-
-        size_type erase(const key_type& k)
-        {
-            return base.erase_key(k);
-        }
-
-        iterator erase(const_iterator first, const_iterator last)
-        {
-            return iterator(base.data_.erase_range(get(first), get(last)));
-        }
-
-        void clear()
-        {
-            base.data_.clear();
-        }
-
-        void swap(unordered_set& other)
-        {
-            base.swap(other.base);
-        }
-
-        // observers
-
-        hasher hash_function() const
-        {
-            return base.hash_function();
-        }
-
-        key_equal key_eq() const
-        {
-            return base.key_eq();
-        }
-
-        // lookup
-
-        const_iterator find(const key_type& k) const
-        {
-            return const_iterator(base.find(k));
-        }
-
-        size_type count(const key_type& k) const
-        {
-            return base.count(k);
-        }
-
-        std::pair<const_iterator, const_iterator>
-            equal_range(const key_type& k) const
-        {
-            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
-                    base.equal_range(k));
-        }
-
-        // bucket interface
-
-        size_type bucket_count() const
-        {
-            return base.bucket_count();
-        }
-
-        size_type max_bucket_count() const
-        {
-            return base.max_bucket_count();
-        }
-
-        size_type bucket_size(size_type n) const
-        {
-            return base.data_.bucket_size(n);
-        }
-
-        size_type bucket(const key_type& k) const
-        {
-            return base.bucket(k);
-        }
-
-        local_iterator begin(size_type n)
-        {
-            return local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator begin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        local_iterator end(size_type n)
-        {
-            return local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator end(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator cbegin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator cend(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        // hash policy
-
-        float load_factor() const
-        {
-            return base.load_factor();
-        }
-
-        float max_load_factor() const
-        {
-            return base.max_load_factor();
-        }
-
-        void max_load_factor(float m)
-        {
-            base.max_load_factor(m);
-        }
-
-        void rehash(size_type n)
-        {
-            base.rehash(n);
-        }
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-        friend bool operator==(unordered_set const&, unordered_set const&);
-        friend bool operator!=(unordered_set const&, unordered_set const&);
-#else
-        friend bool operator==<>(unordered_set const&, unordered_set const&);
-        friend bool operator!=<>(unordered_set const&, unordered_set const&);
-#endif
-    }; // class template unordered_set
-
-    template <class T, class H, class P, class A>
-    inline bool operator==(unordered_set<T, H, P, A> const& m1,
-        unordered_set<T, H, P, A> const& m2)
-    {
-        return boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class T, class H, class P, class A>
-    inline bool operator!=(unordered_set<T, H, P, A> const& m1,
-        unordered_set<T, H, P, A> const& m2)
-    {
-        return !boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class T, class H, class P, class A>
-    inline void swap(unordered_set<T, H, P, A> &m1,
-            unordered_set<T, H, P, A> &m2)
-    {
-        m1.swap(m2);
-    }
-
-    template <class Value, class Hash, class Pred, class Alloc>
-    class unordered_multiset
-    {
-        typedef boost::unordered_detail::hash_types_equivalent_keys<
-            Value, Value, Hash, Pred, Alloc
-        > implementation;
-
-        BOOST_DEDUCED_TYPENAME implementation::hash_table base;
-
-    public:
-
-        //types
-
-        typedef Value key_type;
-        typedef Value value_type;
-        typedef Hash hasher;
-        typedef Pred key_equal;
-
-        typedef Alloc allocator_type;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
-        typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
-        typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
-
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
-        typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
-
-        // construct/destroy/copy
-
-        explicit unordered_multiset(
-                size_type n = boost::unordered_detail::default_initial_bucket_count,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-          : base(n, hf, eql, a)
-        {
-        }
-
-        explicit unordered_multiset(allocator_type const& a)
-            : base(boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), a)
-        {
-        }
-
-        unordered_multiset(unordered_multiset const& other, allocator_type const& a)
-            : base(other.base, a)
-        {
-        }
-
-        template <class InputIterator>
-        unordered_multiset(InputIterator f, InputIterator l)
-            : base(f, l, boost::unordered_detail::default_initial_bucket_count,
-                hasher(), key_equal(), allocator_type())
-        {
-        }
-
-        template <class InputIterator>
-        unordered_multiset(InputIterator f, InputIterator l, size_type n,
-                const hasher &hf = hasher(),
-                const key_equal &eql = key_equal(),
-                const allocator_type &a = allocator_type())
-          : base(f, l, n, hf, eql, a)
-        {
-        }
-
-#if defined(BOOST_HAS_RVALUE_REFS)
-        unordered_multiset(unordered_multiset&& other)
-            : base(other.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_multiset(unordered_multiset&& other, allocator_type const& a)
-            : base(other.base, a, boost::unordered_detail::move_tag())
-        {
-        }
-
-        unordered_multiset& operator=(unordered_multiset&& x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#else
-        unordered_multiset(boost::unordered_detail::move_from<unordered_multiset<Value, Hash, Pred, Alloc> > other)
-            : base(other.source.base, boost::unordered_detail::move_tag())
-        {
-        }
-
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0593)
-        unordered_multiset& operator=(unordered_multiset x)
-        {
-            base.move(x.base);
-            return *this;
-        }
-#endif
-#endif
-
-    private:
-
-        BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
-            get(const_iterator const& it)
-        {
-            return boost::unordered_detail::iterator_access::get(it);
-        }
-
-    public:
-
-        allocator_type get_allocator() const
-        {
-            return base.get_allocator();
-        }
-
-        // size and capacity
-
-        bool empty() const
-        {
-            return base.empty();
-        }
-
-        size_type size() const
-        {
-            return base.size();
-        }
-
-        size_type max_size() const
-        {
-            return base.max_size();
-        }
-
-        // iterators
-
-        iterator begin()
-        {
-            return iterator(base.data_.begin());
-        }
-
-        const_iterator begin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        iterator end()
-        {
-            return iterator(base.data_.end());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        const_iterator cbegin() const
-        {
-            return const_iterator(base.data_.begin());
-        }
-
-        const_iterator cend() const
-        {
-            return const_iterator(base.data_.end());
-        }
-
-        // modifiers
-
-#if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-        template <class... Args>
-        iterator emplace(Args&&... args)
-        {
-            return iterator(base.insert(std::forward<Args>(args)...));
-        }
-
-        template <class... Args>
-        iterator emplace(const_iterator hint, Args&&... args)
-        {
-            return iterator(base.insert_hint(get(hint), std::forward<Args>(args)...));
-        }
-#endif
-
-        iterator insert(const value_type& obj)
-        {
-            return iterator(base.insert(obj));
-        }
-
-        iterator insert(const_iterator hint, const value_type& obj)
-        {
-            return iterator(base.insert_hint(get(hint), obj));
-        }
-
-        template <class InputIterator>
-            void insert(InputIterator first, InputIterator last)
-        {
-            base.insert_range(first, last);
-        }
-
-        iterator erase(const_iterator position)
-        {
-            return iterator(base.data_.erase(get(position)));
-        }
-
-        size_type erase(const key_type& k)
-        {
-            return base.erase_key(k);
-        }
-
-        iterator erase(const_iterator first, const_iterator last)
-        {
-            return iterator(base.data_.erase_range(get(first), get(last)));
-        }
-
-        void clear()
-        {
-            base.data_.clear();
-        }
-
-        void swap(unordered_multiset& other)
-        {
-            base.swap(other.base);
-        }
-
-        // observers
-
-        hasher hash_function() const
-        {
-            return base.hash_function();
-        }
-
-        key_equal key_eq() const
-        {
-            return base.key_eq();
-        }
-
-        // lookup
-
-        const_iterator find(const key_type& k) const
-        {
-            return const_iterator(base.find(k));
-        }
-
-        size_type count(const key_type& k) const
-        {
-            return base.count(k);
-        }
-
-        std::pair<const_iterator, const_iterator>
-            equal_range(const key_type& k) const
-        {
-            return boost::unordered_detail::pair_cast<const_iterator, const_iterator>(
-                    base.equal_range(k));
-        }
-
-        // bucket interface
-
-        size_type bucket_count() const
-        {
-            return base.bucket_count();
-        }
-
-        size_type max_bucket_count() const
-        {
-            return base.max_bucket_count();
-        }
-
-        size_type bucket_size(size_type n) const
-        {
-            return base.data_.bucket_size(n);
-        }
-
-        size_type bucket(const key_type& k) const
-        {
-            return base.bucket(k);
-        }
-
-        local_iterator begin(size_type n)
-        {
-            return local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator begin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        local_iterator end(size_type n)
-        {
-            return local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator end(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        const_local_iterator cbegin(size_type n) const
-        {
-            return const_local_iterator(base.data_.begin(n));
-        }
-
-        const_local_iterator cend(size_type n) const
-        {
-            return const_local_iterator(base.data_.end(n));
-        }
-
-        // hash policy
-
-        float load_factor() const
-        {
-            return base.load_factor();
-        }
-
-        float max_load_factor() const
-        {
-            return base.max_load_factor();
-        }
-
-        void max_load_factor(float m)
-        {
-            base.max_load_factor(m);
-        }
-
-        void rehash(size_type n)
-        {
-            base.rehash(n);
-        }
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-        friend bool operator==(unordered_multiset const&, unordered_multiset const&);
-        friend bool operator!=(unordered_multiset const&, unordered_multiset const&);
-#else
-        friend bool operator==<>(unordered_multiset const&, unordered_multiset const&);
-        friend bool operator!=<>(unordered_multiset const&, unordered_multiset const&);
-#endif
-    }; // class template unordered_multiset
-
-    template <class T, class H, class P, class A>
-    inline bool operator==(unordered_multiset<T, H, P, A> const& m1,
-        unordered_multiset<T, H, P, A> const& m2)
-    {
-        return boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class T, class H, class P, class A>
-    inline bool operator!=(unordered_multiset<T, H, P, A> const& m1,
-        unordered_multiset<T, H, P, A> const& m2)
-    {
-        return !boost::unordered_detail::equals(m1.base, m2.base);
-    }
-
-    template <class T, class H, class P, class A>
-    inline void swap(unordered_multiset<T, H, P, A> &m1,
-            unordered_multiset<T, H, P, A> &m2)
-    {
-        m1.swap(m2);
-    }
-
-} // namespace boost
+#include <boost/unordered/unordered_set.hpp>
 
 #endif // BOOST_UNORDERED_SET_HPP_INCLUDED
diff --git a/test/objects/minimal.hpp b/test/objects/minimal.hpp
index 7fcfc63c..07441f09 100644
--- a/test/objects/minimal.hpp
+++ b/test/objects/minimal.hpp
@@ -240,7 +240,7 @@ namespace minimal
         size_type max_size() const { return 1000; }
 
 #if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP) || \
-        BOOST_WORKAROUND(MSVC, <= 1300)
+        BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
     public: allocator& operator=(allocator const&) { return *this;}
 #else
     private: allocator& operator=(allocator const&);
diff --git a/test/unordered/Jamfile.v2 b/test/unordered/Jamfile.v2
index d913e8e8..9ecec284 100644
--- a/test/unordered/Jamfile.v2
+++ b/test/unordered/Jamfile.v2
@@ -14,6 +14,8 @@ project unordered-test/unordered
 
 test-suite unordered
     :
+        [ run fwd_set_test.cpp ]
+        [ run fwd_map_test.cpp ]
         [ run compile_set.cpp ]
         [ run compile_map.cpp ]
         [ run link_test_1.cpp link_test_2.cpp ]
diff --git a/test/unordered/compile_tests.hpp b/test/unordered/compile_tests.hpp
index 34265fca..9ace8597 100644
--- a/test/unordered/compile_tests.hpp
+++ b/test/unordered/compile_tests.hpp
@@ -290,7 +290,7 @@ void unordered_test(X&, Key& k, T& t, Hash& hf, Pred& eq)
     const_iterator q = a.cbegin();
     test::check_return_type<iterator>::equals(a.insert(q, t));
 #if defined(BOOST_HAS_RVALUE_REFS) && defined(BOOST_HAS_VARIADIC_TMPL)
-    test::check_return_type<iterator>::equals(a.emplace(q, t));
+    test::check_return_type<iterator>::equals(a.emplace_hint(q, t));
 #endif
 
     a.insert(i, j);
diff --git a/test/unordered/fwd_map_test.cpp b/test/unordered/fwd_map_test.cpp
new file mode 100644
index 00000000..a0d118e5
--- /dev/null
+++ b/test/unordered/fwd_map_test.cpp
@@ -0,0 +1,62 @@
+
+// Copyright 2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/unordered/unordered_map_fwd.hpp>
+
+typedef boost::unordered_map<int, int> int_map;
+
+void call_swap(int_map& x, int_map& y) {
+    swap(x,y);
+}
+
+bool call_equals(int_map& x, int_map& y) {
+    return x == y;
+}
+
+bool call_not_equals(int_map& x, int_map& y) {
+    return x != y;
+}
+
+typedef boost::unordered_multimap<int, int> int_multimap;
+
+void call_swap(int_multimap& x, int_multimap& y) {
+    swap(x,y);
+}
+
+bool call_equals(int_multimap& x, int_multimap& y) {
+    return x == y;
+}
+
+bool call_not_equals(int_multimap& x, int_multimap& y) {
+    return x != y;
+}
+
+#include <boost/unordered_map.hpp>
+#include "../helpers/test.hpp"
+
+UNORDERED_AUTO_TEST(use_map_fwd_declared_function) {
+    int_map x, y;
+    x[1] = 2;
+    y[2] = 1;
+    call_swap(x, y);
+
+    BOOST_CHECK(y.find(1) != y.end() && y.find(1)->second == 2);
+    BOOST_CHECK(y.find(2) == y.end());
+
+    BOOST_CHECK(x.find(1) == x.end());
+    BOOST_CHECK(x.find(2) != x.end() && x.find(2)->second == 1);
+
+    BOOST_CHECK(!call_equals(x, y));
+    BOOST_CHECK(call_not_equals(x, y));
+}
+
+UNORDERED_AUTO_TEST(use_multimap_fwd_declared_function) {
+    int_multimap x, y;
+    call_swap(x, y);
+    BOOST_CHECK(call_equals(x, y));
+    BOOST_CHECK(!call_not_equals(x, y));
+}
+
+RUN_TESTS()
diff --git a/test/unordered/fwd_set_test.cpp b/test/unordered/fwd_set_test.cpp
new file mode 100644
index 00000000..3b39f8b3
--- /dev/null
+++ b/test/unordered/fwd_set_test.cpp
@@ -0,0 +1,84 @@
+
+// Copyright 2008 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/unordered/unordered_set_fwd.hpp>
+
+struct true_type { char x[100]; };
+struct false_type { char x; };
+
+false_type is_unordered_set_impl(void*);
+
+template <class Value, class Hash, class Pred, class Alloc>
+true_type is_unordered_set_impl(
+        boost::unordered_set<Value, Hash, Pred, Alloc>*);
+
+typedef boost::unordered_set<int> int_set;
+
+void call_swap(int_set& x, int_set& y) {
+    swap(x,y);
+}
+
+bool call_equals(int_set& x, int_set& y) {
+    return x == y;
+}
+
+bool call_not_equals(int_set& x, int_set& y) {
+    return x != y;
+}
+
+typedef boost::unordered_multiset<int> int_multiset;
+
+void call_swap(int_multiset& x, int_multiset& y) {
+    swap(x,y);
+}
+
+bool call_equals(int_multiset& x, int_multiset& y) {
+    return x == y;
+}
+
+bool call_not_equals(int_multiset& x, int_multiset& y) {
+    return x != y;
+}
+
+#include "../helpers/test.hpp"
+
+UNORDERED_AUTO_TEST(use_fwd_declared_trait_without_definition) {
+    BOOST_CHECK(sizeof(is_unordered_set_impl((int_set*) 0)) == sizeof(true_type));
+}
+
+#include <boost/unordered_set.hpp>
+
+UNORDERED_AUTO_TEST(use_fwd_declared_trait) {
+    boost::unordered_set<int> x;
+    BOOST_CHECK(sizeof(is_unordered_set_impl(&x)) == sizeof(true_type));
+
+    int dummy;
+    BOOST_CHECK(sizeof(is_unordered_set_impl(&dummy)) == sizeof(false_type));
+}
+
+UNORDERED_AUTO_TEST(use_set_fwd_declared_function) {
+    int_set x, y;
+    x.insert(1);
+    y.insert(2);
+    call_swap(x, y);
+
+    BOOST_CHECK(y.find(1) != y.end());
+    BOOST_CHECK(y.find(2) == y.end());
+
+    BOOST_CHECK(x.find(1) == x.end());
+    BOOST_CHECK(x.find(2) != x.end());
+
+    BOOST_CHECK(!call_equals(x, y));
+    BOOST_CHECK(call_not_equals(x, y));
+}
+
+UNORDERED_AUTO_TEST(use_multiset_fwd_declared_function) {
+    int_multiset x, y;
+    call_swap(x, y);
+    BOOST_CHECK(call_equals(x, y));
+    BOOST_CHECK(!call_not_equals(x, y));
+}
+
+RUN_TESTS()