diff --git a/include/boost/unordered/detail/buckets.hpp b/include/boost/unordered/detail/buckets.hpp
index 232944b0..31e1ee59 100644
--- a/include/boost/unordered/detail/buckets.hpp
+++ b/include/boost/unordered/detail/buckets.hpp
@@ -583,12 +583,12 @@ namespace boost { namespace unordered { namespace detail {
     // TODO: Maybe not if std::size_t is smaller than long long.
 #if !defined(BOOST_NO_LONG_LONG)
     template <>
-    struct pick_policy<long long> {
+    struct pick_policy<boost::long_long_type> {
         typedef prime_policy<std::size_t> type;
     };
 
     template <>
-    struct pick_policy<unsigned long long> {
+    struct pick_policy<boost::ulong_long_type> {
         typedef prime_policy<std::size_t> type;
     };
 #endif
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index b6a362dc..e31f1534 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -11,9 +11,9 @@ project unordered-test/unordered
         <toolset>intel:<warnings>on
         # Would be nice to define -Wundef, but I'm getting warnings from
         # Boost.Preprocessor on trunk.
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow -Wno-long-long"
+        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-pedantic -Wextra -Wno-long-long"
+        <toolset>clang:<cxxflags>"-pedantic -Wextra"
     ;
 
 #alias framework : /boost/test//boost_unit_test_framework ;