diff --git a/include/boost/unordered/detail/buckets.hpp b/include/boost/unordered/detail/buckets.hpp
index 0f513e44..c4b8a898 100644
--- a/include/boost/unordered/detail/buckets.hpp
+++ b/include/boost/unordered/detail/buckets.hpp
@@ -10,12 +10,19 @@
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/unordered/detail/node.hpp>
+#include <boost/unordered/detail/util.hpp>
 
 namespace boost { namespace unordered_detail {
     
     ////////////////////////////////////////////////////////////////////////////
     // Buckets
     
+    template <class A, class G>
+    inline std::size_t hash_buckets<A, G>::max_bucket_count() const {
+        // -1 to account for the sentinel.
+        return prev_prime(this->bucket_alloc().max_size() - 1);
+    }
+
     template <class A, class G>
     inline BOOST_DEDUCED_TYPENAME hash_buckets<A, G>::bucket_ptr
         hash_buckets<A, G>::get_bucket(std::size_t num) const
diff --git a/include/boost/unordered/detail/fwd.hpp b/include/boost/unordered/detail/fwd.hpp
index 3a5e3f73..a7298780 100644
--- a/include/boost/unordered/detail/fwd.hpp
+++ b/include/boost/unordered/detail/fwd.hpp
@@ -298,10 +298,7 @@ namespace boost { namespace unordered_detail {
             return allocators_.first(); }
         node_allocator& node_alloc() {
             return allocators_.second(); }
-        std::size_t max_bucket_count() const {
-            // -1 to account for the sentinel.
-            return prev_prime(this->bucket_alloc().max_size() - 1);
-        }
+        std::size_t max_bucket_count() const;
 
         // Constructors
 
diff --git a/include/boost/unordered/detail/table.hpp b/include/boost/unordered/detail/table.hpp
index bba3a07f..66c9d744 100644
--- a/include/boost/unordered/detail/table.hpp
+++ b/include/boost/unordered/detail/table.hpp
@@ -14,7 +14,6 @@
 #include <boost/iterator/iterator_categories.hpp>
 
 #include <boost/unordered/detail/buckets.hpp>
-#include <boost/unordered/detail/util.hpp>
 
 namespace boost { namespace unordered_detail {
 
diff --git a/test/unordered/Jamfile.v2 b/test/unordered/Jamfile.v2
index d21e3da1..882ec132 100644
--- a/test/unordered/Jamfile.v2
+++ b/test/unordered/Jamfile.v2
@@ -11,7 +11,7 @@ project unordered-test/unordered
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
         <toolset>msvc:<cxxflags>/W4
-        <toolset>gcc:<cxxflags>"-Wsign-promo -Wunused-parameter"
+        <toolset>gcc:<cxxflags>"-Wsign-promo -Wunused-parameter -pedantic"
     ;
 
 test-suite unordered