diff --git a/include/boost/container_hash/detail/hash_float.hpp b/include/boost/container_hash/detail/hash_float.hpp
index 2245b48..bae264f 100644
--- a/include/boost/container_hash/detail/hash_float.hpp
+++ b/include/boost/container_hash/detail/hash_float.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/container_hash/detail/float_functions.hpp>
 #include <boost/container_hash/detail/limits.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/type_traits/enable_if.hpp>
 #include <boost/integer/static_log2.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/assert.hpp>
@@ -103,7 +103,7 @@ namespace boost
 
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
-            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+            BOOST_DEDUCED_TYPENAME boost::enable_if_<
                 enable_binary_hash<Float, 24, 128>::value,
                 std::size_t>::type)
         {
@@ -113,7 +113,7 @@ namespace boost
 
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
-            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+            BOOST_DEDUCED_TYPENAME boost::enable_if_<
                 enable_binary_hash<Float, 53, 1024>::value,
                 std::size_t>::type)
         {
@@ -122,7 +122,7 @@ namespace boost
 
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
-            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+            BOOST_DEDUCED_TYPENAME boost::enable_if_<
                 enable_binary_hash<Float, 64, 16384>::value,
                 std::size_t>::type)
         {
@@ -131,7 +131,7 @@ namespace boost
 
         template <typename Float>
         inline std::size_t float_hash_impl(Float v,
-            BOOST_DEDUCED_TYPENAME boost::enable_if_c<
+            BOOST_DEDUCED_TYPENAME boost::enable_if_<
                 enable_binary_hash<Float, 113, 16384>::value,
                 std::size_t>::type)
         {
diff --git a/include/boost/container_hash/detail/hash_tuple.hpp b/include/boost/container_hash/detail/hash_tuple.hpp
index 7260716..597cee9 100644
--- a/include/boost/container_hash/detail/hash_tuple.hpp
+++ b/include/boost/container_hash/detail/hash_tuple.hpp
@@ -7,6 +7,7 @@
 #define BOOST_HASH_DETAIL_HASH_TUPLE_LIKE_HPP
 
 #include <boost/container_hash/hash_fwd.hpp>
+#include <boost/type_traits/enable_if.hpp>
 #include <boost/config.hpp>
 
 #if defined(BOOST_NO_CXX11_HDR_TUPLE)
@@ -23,14 +24,14 @@ namespace hash_detail
 {
 
 template <std::size_t I, typename T>
-inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),
+inline typename boost::enable_if_<(I == std::tuple_size<T>::value),
         void>::type
     hash_combine_tuple(std::size_t&, T const&)
 {
 }
 
 template <std::size_t I, typename T>
-inline typename boost::enable_if_c<(I < std::tuple_size<T>::value),
+inline typename boost::enable_if_<(I < std::tuple_size<T>::value),
         void>::type
     hash_combine_tuple(std::size_t& seed, T const& v)
 {
diff --git a/include/boost/container_hash/detail/is_range.hpp b/include/boost/container_hash/detail/is_range.hpp
index b85aa6e..41288e9 100644
--- a/include/boost/container_hash/detail/is_range.hpp
+++ b/include/boost/container_hash/detail/is_range.hpp
@@ -9,7 +9,6 @@
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/declval.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/core/enable_if.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
 #include <iterator>
diff --git a/include/boost/container_hash/hash.hpp b/include/boost/container_hash/hash.hpp
index c041ca7..7b80f29 100644
--- a/include/boost/container_hash/hash.hpp
+++ b/include/boost/container_hash/hash.hpp
@@ -26,7 +26,7 @@
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
-#include <boost/core/enable_if.hpp>
+#include <boost/type_traits/enable_if.hpp>
 #include <boost/cstdint.hpp>
 #include <string>
 #include <iterator>
@@ -109,7 +109,7 @@ namespace boost
     } // namespace hash_detail
 
     template <typename T>
-    typename boost::enable_if<boost::is_integral<T>, std::size_t>::type
+    typename boost::enable_if_<boost::is_integral<T>::value, std::size_t>::type
         hash_value( T v )
     {
         return hash_detail::hash_integral_impl<T, (sizeof(T) > sizeof(std::size_t)), (sizeof(std::size_t) * CHAR_BIT >= 64)>::fn( v );
@@ -118,7 +118,7 @@ namespace boost
     // enumeration types
 
     template <typename T>
-    typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
+    typename boost::enable_if_<boost::is_enum<T>::value, std::size_t>::type
         hash_value( T v )
     {
         return static_cast<std::size_t>( v );
@@ -127,7 +127,7 @@ namespace boost
     // floating point types
 
     template <typename T>
-    typename boost::enable_if<boost::is_floating_point<T>, std::size_t>::type
+    typename boost::enable_if_<boost::is_floating_point<T>::value, std::size_t>::type
         hash_value( T v )
     {
         return boost::hash_detail::float_hash_value( v );
@@ -186,7 +186,7 @@ namespace boost
     // ranges (list, set, deque...)
 
     template <typename T>
-    typename boost::enable_if_c<hash_detail::is_range<T>::value && !hash_detail::is_contiguous_range<T>::value && !hash_detail::is_unordered_range<T>::value, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_range<T>::value && !hash_detail::is_contiguous_range<T>::value && !hash_detail::is_unordered_range<T>::value, std::size_t>::type
         hash_value( T const& v )
     {
         return boost::hash_range( v.begin(), v.end() );
@@ -195,7 +195,7 @@ namespace boost
     // contiguous ranges (string, vector, array)
 
     template <typename T>
-    typename boost::enable_if<hash_detail::is_contiguous_range<T>, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_contiguous_range<T>::value, std::size_t>::type
         hash_value( T const& v )
     {
         return boost::hash_range( v.data(), v.data() + v.size() );
@@ -204,7 +204,7 @@ namespace boost
     // unordered ranges (unordered_set, unordered_map)
 
     template <typename T>
-    typename boost::enable_if<hash_detail::is_unordered_range<T>, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_unordered_range<T>::value, std::size_t>::type
         hash_value( T const& v )
     {
         return boost::hash_unordered_range( v.begin(), v.end() );
@@ -215,7 +215,7 @@ namespace boost
     // resolve ambiguity with unconstrained stdext::hash_value in <xhash> :-/
 
     template<template<class...> class L, class... T>
-    typename boost::enable_if_c<hash_detail::is_range<L<T...>>::value && !hash_detail::is_contiguous_range<L<T...>>::value && !hash_detail::is_unordered_range<L<T...>>::value, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_range<L<T...>>::value && !hash_detail::is_contiguous_range<L<T...>>::value && !hash_detail::is_unordered_range<L<T...>>::value, std::size_t>::type
         hash_value( L<T...> const& v )
     {
         return boost::hash_range( v.begin(), v.end() );
@@ -224,14 +224,14 @@ namespace boost
     // contiguous ranges (string, vector, array)
 
     template<template<class...> class L, class... T>
-    typename boost::enable_if<hash_detail::is_contiguous_range<L<T...>>, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_contiguous_range<L<T...>>::value, std::size_t>::type
         hash_value( L<T...> const& v )
     {
         return boost::hash_range( v.data(), v.data() + v.size() );
     }
 
     template<template<class, std::size_t> class L, class T, std::size_t N>
-    typename boost::enable_if<hash_detail::is_contiguous_range<L<T, N>>, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_contiguous_range<L<T, N>>::value, std::size_t>::type
         hash_value( L<T, N> const& v )
     {
         return boost::hash_range( v.data(), v.data() + v.size() );
@@ -240,7 +240,7 @@ namespace boost
     // unordered ranges (unordered_set, unordered_map)
 
     template<template<class...> class L, class... T>
-    typename boost::enable_if<hash_detail::is_unordered_range<L<T...>>, std::size_t>::type
+    typename boost::enable_if_<hash_detail::is_unordered_range<L<T...>>::value, std::size_t>::type
         hash_value( L<T...> const& v )
     {
         return boost::hash_unordered_range( v.begin(), v.end() );