diff --git a/hash/test/hash_std_array_test.cpp b/hash/test/hash_std_array_test.cpp
index 540b676..6f67a67 100644
--- a/hash/test/hash_std_array_test.cpp
+++ b/hash/test/hash_std_array_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_ARRAY)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_ARRAY)
 #define TEST_ARRAY
 #include <array>
 #include <vector>
diff --git a/hash/test/hash_std_tuple_test.cpp b/hash/test/hash_std_tuple_test.cpp
index 15ef483..9314336 100644
--- a/hash/test/hash_std_tuple_test.cpp
+++ b/hash/test/hash_std_tuple_test.cpp
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_0X_HDR_TUPLE)
+#if defined(TEST_EXTENSIONS) && !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #define TEST_TUPLE
 #include <tuple>
 #include <vector>
diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
index 917bca9..27fcfff 100644
--- a/hash/test/hash_type_index_test.cpp
+++ b/hash/test/hash_type_index_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 
 #include <typeindex>
 
@@ -43,7 +43,7 @@ void test_type_index() {
 
 int main()
 {
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     test_type_index();
 #else
     std::cout<<"<type_index> not available."<<std::endl;
diff --git a/include/boost/functional/hash/detail/container_fwd_0x.hpp b/include/boost/functional/hash/detail/container_fwd_0x.hpp
index 566f2af..442ec6c 100644
--- a/include/boost/functional/hash/detail/container_fwd_0x.hpp
+++ b/include/boost/functional/hash/detail/container_fwd_0x.hpp
@@ -10,7 +10,7 @@
 
 // std::array
 
-#if !defined(BOOST_NO_0X_HDR_ARRAY)
+#if !defined(BOOST_NO_CXX11_HDR_ARRAY)
     // Don't forward declare std::array for Dinkumware, as it seems to be
     // just 'using std::tr1::array'.
 #   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
@@ -26,7 +26,7 @@ namespace std {
 
 // std::tuple
 
-#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#if !defined(BOOST_NO_CXX11_HDR_TUPLE)
 #   if (defined(BOOST_DETAIL_NO_CONTAINER_FWD) && \
         !defined(BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD)) || \
         defined(BOOST_NO_VARIADIC_TEMPLATES)
diff --git a/include/boost/functional/hash/extensions.hpp b/include/boost/functional/hash/extensions.hpp
index e61c2f3..9c4a6be 100644
--- a/include/boost/functional/hash/extensions.hpp
+++ b/include/boost/functional/hash/extensions.hpp
@@ -114,7 +114,7 @@ namespace boost
         return seed;
     }
 
-#if !defined(BOOST_NO_0X_HDR_ARRAY)
+#if !defined(BOOST_NO_CXX11_HDR_ARRAY)
     template <class T, std::size_t N>
     std::size_t hash_value(std::array<T, N> const& v)
     {
@@ -122,7 +122,7 @@ namespace boost
     }
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TUPLE)
+#if !defined(BOOST_NO_CXX11_HDR_TUPLE)
     namespace hash_detail {
         template <std::size_t I, typename T>
         inline typename boost::enable_if_c<(I == std::tuple_size<T>::value),
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 7559e56..c179fab 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -20,7 +20,7 @@
 #include <boost/type_traits/is_pointer.hpp>
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
 #include <typeindex>
 #endif
 
@@ -111,7 +111,7 @@ namespace boost
     template <typename T>
     typename boost::hash_detail::float_numbers<T>::type hash_value(T);
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     std::size_t hash_value(std::type_index);
 #endif
 
@@ -299,7 +299,7 @@ namespace boost
         return boost::hash_detail::float_hash_value(v);
     }
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     inline std::size_t hash_value(std::type_index v)
     {
         return v.hash_code();
@@ -410,7 +410,7 @@ namespace boost
     BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif
 
-#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+#if !defined(BOOST_NO_CXX11_HDR_TYPEINDEX)
     BOOST_HASH_SPECIALIZE(std::type_index)
 #endif