diff --git a/test/add_const_test.cpp b/test/add_const_test.cpp
index f61aef8..b91535b 100644
--- a/test/add_const_test.cpp
+++ b/test/add_const_test.cpp
@@ -21,7 +21,7 @@ BOOST_DECL_TRANSFORM_TEST(add_const_test_10, ::tt::add_const, const*, const*cons
 BOOST_DECL_TRANSFORM_TEST(add_const_test_11, ::tt::add_const, volatile*, volatile*const)
 BOOST_DECL_TRANSFORM_TEST(add_const_test_5, ::tt::add_const, const &, const&)
 BOOST_DECL_TRANSFORM_TEST(add_const_test_6, ::tt::add_const, &, &)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_const_test_5a, ::tt::add_const, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(add_const_test_6a, ::tt::add_const, &&, &&)
 #endif
@@ -45,7 +45,7 @@ TT_TEST_BEGIN(add_const)
    add_const_test_9();
    add_const_test_12();
    add_const_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_const_test_5a();
    add_const_test_6a();
 #endif
diff --git a/test/add_cv_test.cpp b/test/add_cv_test.cpp
index 45244a7..c1f4353 100644
--- a/test/add_cv_test.cpp
+++ b/test/add_cv_test.cpp
@@ -21,7 +21,7 @@ BOOST_DECL_TRANSFORM_TEST(add_cv_test_10, ::tt::add_cv, const*, const*const vola
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_11, ::tt::add_cv, volatile*, volatile*const volatile )
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_5, ::tt::add_cv, const &, const&)
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_6, ::tt::add_cv, &, &)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_5a, ::tt::add_cv, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_6a, ::tt::add_cv, &&, &&)
 #endif
@@ -45,7 +45,7 @@ TT_TEST_BEGIN(add_const)
    add_cv_test_9();
    add_cv_test_12();
    add_cv_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_cv_test_5a();
    add_cv_test_6a();
 #endif
diff --git a/test/add_lvalue_reference_test.cpp b/test/add_lvalue_reference_test.cpp
index 18931b9..1a9c1cb 100644
--- a/test/add_lvalue_reference_test.cpp
+++ b/test/add_lvalue_reference_test.cpp
@@ -25,7 +25,7 @@ BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_10, ::tt::add_lvalue_referen
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_11, ::tt::add_lvalue_reference, volatile*, volatile*&)
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_12, ::tt::add_lvalue_reference, const[2][3], const (&)[2][3])
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_13, ::tt::add_lvalue_reference, (&)[2], (&)[2])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_5a, ::tt::add_lvalue_reference, const &&, const&)
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_6a, ::tt::add_lvalue_reference, &&, &)
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_13a, ::tt::add_lvalue_reference, (&&)[2], (&)[2])
@@ -46,7 +46,7 @@ TT_TEST_BEGIN(add_lvalue_reference)
    add_lvalue_reference_test_11();
    add_lvalue_reference_test_12();
    add_lvalue_reference_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_lvalue_reference_test_5a();
    add_lvalue_reference_test_6a();
    add_lvalue_reference_test_13a();
diff --git a/test/add_reference_test.cpp b/test/add_reference_test.cpp
index 5e47dd2..458ceb5 100644
--- a/test/add_reference_test.cpp
+++ b/test/add_reference_test.cpp
@@ -25,7 +25,7 @@ BOOST_DECL_TRANSFORM_TEST(add_reference_test_10, ::tt::add_reference, const*, co
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_11, ::tt::add_reference, volatile*, volatile*&)
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_12, ::tt::add_reference, const[2][3], const (&)[2][3])
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_13, ::tt::add_reference, (&)[2], (&)[2])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_5a, ::tt::add_reference, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_6a, ::tt::add_reference, &&, &&)
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_13a, ::tt::add_reference, (&&)[2], (&&)[2])
@@ -46,7 +46,7 @@ TT_TEST_BEGIN(add_reference)
    add_reference_test_11();
    add_reference_test_12();
    add_reference_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_reference_test_5a();
    add_reference_test_6a();
    add_reference_test_13a();
diff --git a/test/add_rvalue_reference_test.cpp b/test/add_rvalue_reference_test.cpp
index 8527094..92c6cc8 100644
--- a/test/add_rvalue_reference_test.cpp
+++ b/test/add_rvalue_reference_test.cpp
@@ -12,7 +12,7 @@
 #  include <boost/type_traits/add_rvalue_reference.hpp>
 #endif
 
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
 
 BOOST_DECL_TRANSFORM_TEST(add_rvalue_reference_test_1, ::tt::add_rvalue_reference, const, const)
 BOOST_DECL_TRANSFORM_TEST(add_rvalue_reference_test_2, ::tt::add_rvalue_reference, volatile, volatile)
@@ -63,7 +63,7 @@ TT_TEST_BEGIN(add_rvalue_reference)
    add_rvalue_reference_test_11();
    add_rvalue_reference_test_12();
    add_rvalue_reference_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_rvalue_reference_test_5a();
    add_rvalue_reference_test_6a();
    add_rvalue_reference_test_13a();
diff --git a/test/add_volatile_test.cpp b/test/add_volatile_test.cpp
index a9d5161..cc9aeed 100644
--- a/test/add_volatile_test.cpp
+++ b/test/add_volatile_test.cpp
@@ -21,7 +21,7 @@ BOOST_DECL_TRANSFORM_TEST(add_volatile_test_10, ::tt::add_volatile, const*, cons
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_11, ::tt::add_volatile, volatile*, volatile*volatile)
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_5, ::tt::add_volatile, const &, const&)
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_6, ::tt::add_volatile, &, &)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_6a, ::tt::add_volatile, &&, &&)
 #endif
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_8, ::tt::add_volatile, const [2], const volatile [2])
@@ -44,7 +44,7 @@ TT_TEST_BEGIN(add_volatile)
    add_volatile_test_9();
    add_volatile_test_12();
    add_volatile_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_volatile_test_6a();
 #endif
 
diff --git a/test/common_type_2_test.cpp b/test/common_type_2_test.cpp
index c76c2ef..99ada63 100644
--- a/test/common_type_2_test.cpp
+++ b/test/common_type_2_test.cpp
@@ -92,7 +92,7 @@ TT_TEST_BEGIN(common_type)
     typedef tt::common_type<C1C2&, C1&>::type T1;
     typedef tt::common_type<C3*, C2*>::type T2;
     typedef tt::common_type<int*, int const*>::type T3;
-#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
+#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
     // fails if BOOST_COMMON_TYPE_DONT_USE_TYPEOF:
     typedef tt::common_type<int volatile*, int const*>::type T4;
 #endif
diff --git a/test/common_type_test.cpp b/test/common_type_test.cpp
index bd1a54a..87a43e5 100644
--- a/test/common_type_test.cpp
+++ b/test/common_type_test.cpp
@@ -89,7 +89,7 @@ TT_TEST_BEGIN(common_type)
     typedef tt::common_type<C1C2&, C1&>::type T1;
     typedef tt::common_type<C3*, C2*>::type T2;
     typedef tt::common_type<int*, int const*>::type T3;
-#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
+#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
     // fails if BOOST_COMMON_TYPE_DONT_USE_TYPEOF:
     typedef tt::common_type<int volatile*, int const*>::type T4;
 #endif
diff --git a/test/extent_test.cpp b/test/extent_test.cpp
index 6e5b699..007896c 100644
--- a/test/extent_test.cpp
+++ b/test/extent_test.cpp
@@ -34,7 +34,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::extent<int[5][10][40],3>::value), 0);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::extent<int*>::value, 0);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::extent<int&>::value, 0);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::extent<int&&>::value, 0);
 #endif
 
diff --git a/test/has_nothrow_assign_test.cpp b/test/has_nothrow_assign_test.cpp
index 1bcf3ac..ec3d110 100644
--- a/test/has_nothrow_assign_test.cpp
+++ b/test/has_nothrow_assign_test.cpp
@@ -184,7 +184,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_assign<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_assign<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_assign<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_assign<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_assign<const int&>::value, false);
diff --git a/test/has_nothrow_constr_test.cpp b/test/has_nothrow_constr_test.cpp
index 94bce1e..4ac8032 100644
--- a/test/has_nothrow_constr_test.cpp
+++ b/test/has_nothrow_constr_test.cpp
@@ -142,7 +142,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_constructor<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_constructor<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_constructor<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_constructor<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_constructor<const int&>::value, false);
diff --git a/test/has_nothrow_copy_test.cpp b/test/has_nothrow_copy_test.cpp
index 8b993f9..9c6c8df 100644
--- a/test/has_nothrow_copy_test.cpp
+++ b/test/has_nothrow_copy_test.cpp
@@ -181,7 +181,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_copy<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_copy<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_copy<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_copy<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_nothrow_copy<const int&>::value, false);
diff --git a/test/has_operator_new_test.cpp b/test/has_operator_new_test.cpp
index da57e48..5d24350 100644
--- a/test/has_operator_new_test.cpp
+++ b/test/has_operator_new_test.cpp
@@ -188,7 +188,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<cmf>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<enum_UDT>::value, false);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_new_operator<const int&>::value, false);
diff --git a/test/has_trivial_assign_test.cpp b/test/has_trivial_assign_test.cpp
index 39b1716..cc8ad45 100644
--- a/test/has_trivial_assign_test.cpp
+++ b/test/has_trivial_assign_test.cpp
@@ -176,7 +176,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_assign<const int&>::value, false);
diff --git a/test/has_trivial_constr_test.cpp b/test/has_trivial_constr_test.cpp
index cc2d4c0..e163a6b 100644
--- a/test/has_trivial_constr_test.cpp
+++ b/test/has_trivial_constr_test.cpp
@@ -142,7 +142,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_constructor<const int&>::value, false);
diff --git a/test/has_trivial_copy_test.cpp b/test/has_trivial_copy_test.cpp
index 85e9d0d..6ed8df8 100644
--- a/test/has_trivial_copy_test.cpp
+++ b/test/has_trivial_copy_test.cpp
@@ -177,7 +177,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_trivial_copy<const int&>::value, false);
diff --git a/test/has_virtual_destructor_test.cpp b/test/has_virtual_destructor_test.cpp
index ea5f323..5f03ac5 100644
--- a/test/has_virtual_destructor_test.cpp
+++ b/test/has_virtual_destructor_test.cpp
@@ -41,7 +41,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<empty_UDT>::value, fa
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<UDT*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<UDT[2]>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<UDT&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<UDT&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::has_virtual_destructor<void>::value, false);
diff --git a/test/is_abstract_test.cpp b/test/is_abstract_test.cpp
index 17c7bd2..d82d5ec 100644
--- a/test/is_abstract_test.cpp
+++ b/test/is_abstract_test.cpp
@@ -226,7 +226,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_abstract<volatile const TestAE>::value),
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_abstract<volatile const TestAF>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_abstract<volatile const TestAG>::value), false);
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_abstract<TestA&&>::value), false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_abstract<TestA&>::value), false);
diff --git a/test/is_arithmetic_test.cpp b/test/is_arithmetic_test.cpp
index 77fdc8b..68b5e73 100644
--- a/test/is_arithmetic_test.cpp
+++ b/test/is_arithmetic_test.cpp
@@ -136,7 +136,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<empty_UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<float*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<float&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<float&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_arithmetic<const float&>::value, false);
diff --git a/test/is_array_test.cpp b/test/is_array_test.cpp
index 3161906..cd89c9f 100644
--- a/test/is_array_test.cpp
+++ b/test/is_array_test.cpp
@@ -32,7 +32,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<const volatile int[2]>::value, true
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<int[2][3]>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<UDT[2]>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<int(&)[2]>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<int(&&)[2]>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_array<f1>::value, false);
diff --git a/test/is_class_test.cpp b/test/is_class_test.cpp
index 6dd33d7..3c67d5f 100644
--- a/test/is_class_test.cpp
+++ b/test/is_class_test.cpp
@@ -23,7 +23,7 @@ TT_TEST_BEGIN(is_class)
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<int[2]>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<int const[2]>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<int&&>::value, false);
 #endif
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_class<mf4>::value, false);
diff --git a/test/is_const_test.cpp b/test/is_const_test.cpp
index 856da5c..3280ea4 100644
--- a/test/is_const_test.cpp
+++ b/test/is_const_test.cpp
@@ -23,7 +23,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<const int>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<const UDT>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<const volatile UDT>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<const int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<const int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_const<cr_type>::value, false);
diff --git a/test/is_convertible_test.cpp b/test/is_convertible_test.cpp
index ce309e7..6378a18 100644
--- a/test/is_convertible_test.cpp
+++ b/test/is_convertible_test.cpp
@@ -24,7 +24,7 @@ struct base2 { };
 struct middle2 : public virtual base2 { };
 struct derived2 : public middle2 { };
 
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
 template<typename T>
 struct test_bug_4530
@@ -100,7 +100,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<const int *, int*>::value),
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<const int&, int&>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<const int*, int[3]>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<const int&, int>::value), true);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<const int&&, int>::value), true);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<int&&, const int&>::value), true);
 #if !defined(__GNUC__) || ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6)))
@@ -182,7 +182,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<__int64,char>::value), true)
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<__int64,float>::value), true);
 #endif
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 // Test bug case 4530:
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_convertible<test_bug_4530<A4530>,A4530>::value), true);
 #endif
diff --git a/test/is_empty_test.cpp b/test/is_empty_test.cpp
index 83da327..a398c3c 100644
--- a/test/is_empty_test.cpp
+++ b/test/is_empty_test.cpp
@@ -24,7 +24,7 @@ TT_TEST_BEGIN(is_empty)
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<int>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<int*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_empty<void>::value, false);
diff --git a/test/is_enum_test.cpp b/test/is_enum_test.cpp
index ddf3995..624d523 100644
--- a/test/is_enum_test.cpp
+++ b/test/is_enum_test.cpp
@@ -12,7 +12,7 @@
 #  include <boost/type_traits/is_enum.hpp>
 #endif
 
-#ifndef BOOST_NO_SCOPED_ENUMS
+#ifndef BOOST_NO_CXX11_SCOPED_ENUMS
 
 enum class test_enum
 {
@@ -27,13 +27,13 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<int>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<enum_UDT>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<int_convertible>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<boost::noncopyable>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<test_abc1>::value, false);
-#ifndef BOOST_NO_SCOPED_ENUMS
+#ifndef BOOST_NO_CXX11_SCOPED_ENUMS
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_enum<test_enum>::value, true);
 #endif
 
diff --git a/test/is_float_test.cpp b/test/is_float_test.cpp
index 4deaa2c..5cd8865 100644
--- a/test/is_float_test.cpp
+++ b/test/is_float_test.cpp
@@ -39,7 +39,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<empty_UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<float*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<float&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<float&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_float<const float&>::value, false);
diff --git a/test/is_floating_point_test.cpp b/test/is_floating_point_test.cpp
index 8b7bb63..3b70b5f 100644
--- a/test/is_floating_point_test.cpp
+++ b/test/is_floating_point_test.cpp
@@ -39,7 +39,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<empty_UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<float*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<float&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<float&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_floating_point<const float&>::value, false);
diff --git a/test/is_function_test.cpp b/test/is_function_test.cpp
index 902f94a..67cdca7 100644
--- a/test/is_function_test.cpp
+++ b/test/is_function_test.cpp
@@ -30,7 +30,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function<int>::value, false);
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_function<int&&>::value, false);
 #endif
 #else
diff --git a/test/is_fundamental_test.cpp b/test/is_fundamental_test.cpp
index 6eee342..ca2a6b8 100644
--- a/test/is_fundamental_test.cpp
+++ b/test/is_fundamental_test.cpp
@@ -140,7 +140,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<empty_UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<float*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<float&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<float&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_fundamental<const float&>::value, false);
diff --git a/test/is_integral_test.cpp b/test/is_integral_test.cpp
index 7b28824..c466c9b 100644
--- a/test/is_integral_test.cpp
+++ b/test/is_integral_test.cpp
@@ -134,7 +134,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<empty_UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<int*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_integral<const int&>::value, false);
diff --git a/test/is_lvalue_reference_test.cpp b/test/is_lvalue_reference_test.cpp
index 513df43..a14b9f6 100644
--- a/test/is_lvalue_reference_test.cpp
+++ b/test/is_lvalue_reference_test.cpp
@@ -35,7 +35,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<foo0_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<incomplete_type>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<int&&>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<UDT&&>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_lvalue_reference<const UDT&&>::value, false);
diff --git a/test/is_object_test.cpp b/test/is_object_test.cpp
index 1be06d6..3288999 100644
--- a/test/is_object_test.cpp
+++ b/test/is_object_test.cpp
@@ -17,7 +17,7 @@ TT_TEST_BEGIN(is_object)
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_object<int>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_object<UDT>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_object<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_object<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_object<void>::value, false);
diff --git a/test/is_pod_test.cpp b/test/is_pod_test.cpp
index c9d3135..1fca2d5 100644
--- a/test/is_pod_test.cpp
+++ b/test/is_pod_test.cpp
@@ -142,7 +142,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pod<cmf>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pod<enum_UDT>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pod<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pod<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pod<const int&>::value, false);
diff --git a/test/is_pointer_test.cpp b/test/is_pointer_test.cpp
index 6e4ea07..5b71b92 100644
--- a/test/is_pointer_test.cpp
+++ b/test/is_pointer_test.cpp
@@ -16,7 +16,7 @@ TT_TEST_BEGIN(is_pointer)
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pointer<int>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pointer<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pointer<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_pointer<int*>::value, true);
diff --git a/test/is_polymorphic_test.cpp b/test/is_polymorphic_test.cpp
index b49c606..c73a1d5 100644
--- a/test/is_polymorphic_test.cpp
+++ b/test/is_polymorphic_test.cpp
@@ -32,7 +32,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int*>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int* const>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int[2]>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_polymorphic<mf4>::value, false);
diff --git a/test/is_reference_test.cpp b/test/is_reference_test.cpp
index aa5ed7f..4e561a4 100644
--- a/test/is_reference_test.cpp
+++ b/test/is_reference_test.cpp
@@ -35,7 +35,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<foo0_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<incomplete_type>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<int&&>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<UDT&&>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<const UDT&&>::value, true);
diff --git a/test/is_rvalue_reference_test.cpp b/test/is_rvalue_reference_test.cpp
index 4c4bd10..0804c43 100644
--- a/test/is_rvalue_reference_test.cpp
+++ b/test/is_rvalue_reference_test.cpp
@@ -34,7 +34,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<test_abc1>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<foo0_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<incomplete_type>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<int&&>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<UDT&&>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<const UDT&&>::value, true);
diff --git a/test/is_same_test.cpp b/test/is_same_test.cpp
index 6f30cf7..4b40f92 100644
--- a/test/is_same_test.cpp
+++ b/test/is_same_test.cpp
@@ -16,12 +16,12 @@ TT_TEST_BEGIN(is_same)
 
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int, int>::value), true);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int&, int&>::value), true);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int&&, int&&>::value), true);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int, const int>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int, int&>::value), false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<int, int&&>::value), false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<const int, int&>::value), false);
diff --git a/test/is_scalar_test.cpp b/test/is_scalar_test.cpp
index 06c6914..116db1f 100644
--- a/test/is_scalar_test.cpp
+++ b/test/is_scalar_test.cpp
@@ -144,7 +144,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<enum_UDT>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<void>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_scalar<test_abc1>::value, false);
diff --git a/test/is_signed_test.cpp b/test/is_signed_test.cpp
index 28bc070..c76a97a 100644
--- a/test/is_signed_test.cpp
+++ b/test/is_signed_test.cpp
@@ -25,7 +25,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_signed<unsigned char>::value, false);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_signed<UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_signed<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_signed<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_signed<int*>::value, false);
diff --git a/test/is_stateless_test.cpp b/test/is_stateless_test.cpp
index ab3381c..ed5f1dd 100644
--- a/test/is_stateless_test.cpp
+++ b/test/is_stateless_test.cpp
@@ -142,7 +142,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<cmf>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<enum_UDT>::value, false);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<int&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_stateless<const int&>::value, false);
diff --git a/test/is_union_test.cpp b/test/is_union_test.cpp
index b021b29..9d3f37d 100644
--- a/test/is_union_test.cpp
+++ b/test/is_union_test.cpp
@@ -22,7 +22,7 @@ TT_TEST_BEGIN(is_union)
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<int* const>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<int[2]>::value, false);
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<int&&>::value, false);
 #endif
    BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_union<mf4>::value, false);
diff --git a/test/is_unsigned_test.cpp b/test/is_unsigned_test.cpp
index 68b0890..484c11e 100644
--- a/test/is_unsigned_test.cpp
+++ b/test/is_unsigned_test.cpp
@@ -25,7 +25,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_unsigned<unsigned char>::value, true);
 
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_unsigned<UDT>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_unsigned<unsigned&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_unsigned<unsigned&&>::value, false);
 #endif
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_unsigned<unsigned*>::value, false);
diff --git a/test/is_void_test.cpp b/test/is_void_test.cpp
index 687fa40..c0a3f09 100644
--- a/test/is_void_test.cpp
+++ b/test/is_void_test.cpp
@@ -29,7 +29,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_void<foo3_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_void<foo4_t>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_void<incomplete_type>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_void<int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_void<int&&>::value, false);
 #endif
 
diff --git a/test/is_volatile_test.cpp b/test/is_volatile_test.cpp
index 1ce20f8..7708d63 100644
--- a/test/is_volatile_test.cpp
+++ b/test/is_volatile_test.cpp
@@ -34,7 +34,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<volatile int[]>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<int[]>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<int&>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<volatile int&>::value, false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<int&&>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_volatile<volatile int&&>::value, false);
 #endif
diff --git a/test/rank_test.cpp b/test/rank_test.cpp
index 049c311..2da7b64 100644
--- a/test/rank_test.cpp
+++ b/test/rank_test.cpp
@@ -21,7 +21,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT(::tt::rank<int[5][10]>::value, 2);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::rank<int[5][10][40]>::value, 3);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::rank<int (&)[5][10]>::value, 0);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::rank<int (*)[5][10]>::value, 0);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::rank<int (&&)[5][10]>::value, 0);
 #endif
 
diff --git a/test/remove_all_extents_test.cpp b/test/remove_all_extents_test.cpp
index 609d3e5..fe0d2d7 100644
--- a/test/remove_all_extents_test.cpp
+++ b/test/remove_all_extents_test.cpp
@@ -28,7 +28,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_13, ::tt::remove_all_extents,
 BOOST_DECL_TRANSFORM_TEST3(remove_all_extents_test_14, ::tt::remove_all_extents, [])
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_15, ::tt::remove_all_extents, const [], const)
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_16, ::tt::remove_all_extents, const[][3], const)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_5a, ::tt::remove_all_extents, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_13a, ::tt::remove_all_extents, (&&)[2], (&&)[2])
 #endif
@@ -51,7 +51,7 @@ TT_TEST_BEGIN(remove_all_extents)
    remove_all_extents_test_14();
    remove_all_extents_test_15();
    remove_all_extents_test_16();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_all_extents_test_5a();
    remove_all_extents_test_13a();
 #endif
diff --git a/test/remove_bounds_test.cpp b/test/remove_bounds_test.cpp
index 9929f14..cf0ab09 100644
--- a/test/remove_bounds_test.cpp
+++ b/test/remove_bounds_test.cpp
@@ -28,7 +28,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_13, ::tt::remove_bounds, (&)[2], (&
 BOOST_DECL_TRANSFORM_TEST3(remove_bounds_test_14, ::tt::remove_bounds, [])
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_15, ::tt::remove_bounds, const [], const)
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_16, ::tt::remove_bounds, const[][3], const[3])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_5a, ::tt::remove_bounds, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_13a, ::tt::remove_bounds, (&&)[2], (&&)[2])
 #endif
@@ -51,7 +51,7 @@ TT_TEST_BEGIN(remove_bounds)
    remove_bounds_test_14();
    remove_bounds_test_15();
    remove_bounds_test_16();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_bounds_test_5a();
    remove_bounds_test_13a();
 #endif
diff --git a/test/remove_cv_test.cpp b/test/remove_cv_test.cpp
index 869e25a..946f5e5 100644
--- a/test/remove_cv_test.cpp
+++ b/test/remove_cv_test.cpp
@@ -29,7 +29,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_cv_test_14, ::tt::remove_cv, const volatile[2],
 BOOST_DECL_TRANSFORM_TEST(remove_cv_test_15, ::tt::remove_cv, [2], [2])
 BOOST_DECL_TRANSFORM_TEST(remove_cv_test_16, ::tt::remove_cv, const*, const*)
 BOOST_DECL_TRANSFORM_TEST(remove_cv_test_17, ::tt::remove_cv, const*volatile, const*)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(remove_cv_test_5a, ::tt::remove_cv, const &&, const&&)
 #endif
 
@@ -52,7 +52,7 @@ TT_TEST_BEGIN(remove_cv)
    remove_cv_test_15();
    remove_cv_test_16();
    remove_cv_test_17();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_cv_test_5a();
 #endif
 
diff --git a/test/remove_extent_test.cpp b/test/remove_extent_test.cpp
index 66407ef..cf708a4 100644
--- a/test/remove_extent_test.cpp
+++ b/test/remove_extent_test.cpp
@@ -28,7 +28,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_extent_test_13, ::tt::remove_extent, (&)[2], (&
 BOOST_DECL_TRANSFORM_TEST3(remove_extent_test_14, ::tt::remove_extent, [])
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_15, ::tt::remove_extent, const [], const)
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_16, ::tt::remove_extent, const[][3], const[3])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_9a, ::tt::remove_extent, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_13a, ::tt::remove_extent, (&&)[2], (&&)[2])
 #endif
@@ -51,7 +51,7 @@ TT_TEST_BEGIN(remove_extent)
    remove_extent_test_14();
    remove_extent_test_15();
    remove_extent_test_16();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_extent_test_9a();
    remove_extent_test_13a();
 #endif
diff --git a/test/remove_pointer_test.cpp b/test/remove_pointer_test.cpp
index 8ea738b..6a74081 100644
--- a/test/remove_pointer_test.cpp
+++ b/test/remove_pointer_test.cpp
@@ -26,7 +26,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_10, ::tt::remove_pointer, const*,
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_11, ::tt::remove_pointer, volatile*, volatile)
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_12, ::tt::remove_pointer, const[2][3], const[2][3])
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_13, ::tt::remove_pointer, (&)[2], (&)[2])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_5a, ::tt::remove_pointer, const &&, const&&)
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_6a, ::tt::remove_pointer, &&, &&)
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_13a, ::tt::remove_pointer, (&&)[2], (&&)[2])
@@ -50,7 +50,7 @@ TT_TEST_BEGIN(remove_pointer)
    remove_pointer_test_11();
    remove_pointer_test_12();
    remove_pointer_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_pointer_test_5a();
    remove_pointer_test_6a();
    remove_pointer_test_13a();
diff --git a/test/remove_reference_test.cpp b/test/remove_reference_test.cpp
index d92f64c..980c125 100644
--- a/test/remove_reference_test.cpp
+++ b/test/remove_reference_test.cpp
@@ -25,7 +25,7 @@ BOOST_DECL_TRANSFORM_TEST(remove_reference_test_10, ::tt::remove_reference, cons
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_11, ::tt::remove_reference, volatile*, volatile*)
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_12, ::tt::remove_reference, const[2], const[2])
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_13, ::tt::remove_reference, (&)[2], [2])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST3(remove_reference_test_3a, ::tt::remove_reference, &&)
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_5a, ::tt::remove_reference, const &&, const)
 BOOST_DECL_TRANSFORM_TEST3(remove_reference_test_8a, ::tt::remove_reference, &&)
@@ -48,7 +48,7 @@ TT_TEST_BEGIN(remove_reference)
    remove_reference_test_11();
    remove_reference_test_12();
    remove_reference_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    remove_reference_test_3a();
    remove_reference_test_5a();
    remove_reference_test_8a();
diff --git a/test/tricky_add_pointer_test.cpp b/test/tricky_add_pointer_test.cpp
index 4d13497..06a1db1 100644
--- a/test/tricky_add_pointer_test.cpp
+++ b/test/tricky_add_pointer_test.cpp
@@ -18,7 +18,7 @@ BOOST_DECL_TRANSFORM_TEST(add_pointer_test_8, ::tt::add_pointer, const [2], cons
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_9, ::tt::add_pointer, const &, const*)
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_12, ::tt::add_pointer, const[2][3], const (*)[2][3])
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_13, ::tt::add_pointer, (&)[2], (*)[2])
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_5a, ::tt::add_pointer, const &&, const*)
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_6a, ::tt::add_pointer, &&, *)
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_9a, ::tt::add_pointer, const &&, const*)
@@ -33,7 +33,7 @@ TT_TEST_BEGIN(tricky_add_pointer_test)
    add_pointer_test_9();
    add_pointer_test_12();
    add_pointer_test_13();
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
    add_pointer_test_5a();
    add_pointer_test_6a();
    add_pointer_test_9a();
diff --git a/test/tricky_partial_spec_test.cpp b/test/tricky_partial_spec_test.cpp
index 1f7df70..140797e 100644
--- a/test/tricky_partial_spec_test.cpp
+++ b/test/tricky_partial_spec_test.cpp
@@ -63,7 +63,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&,Derived>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&,Derived&>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base,Derived&>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base,void>::value), false);
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&&,Derived>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base&&,Derived&&>::value), false);
 BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_base_of<Base,Derived&&>::value), false);
diff --git a/test/tricky_rvalue_test.cpp b/test/tricky_rvalue_test.cpp
index 1659f1f..85d4d9e 100644
--- a/test/tricky_rvalue_test.cpp
+++ b/test/tricky_rvalue_test.cpp
@@ -18,7 +18,7 @@
 
 TT_TEST_BEGIN(rvalue_reference_test)
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_reference<int (&&)(int)>::value, true);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<int (&)(int)>::value, false);
 BOOST_CHECK_INTEGRAL_CONSTANT(::tt::is_rvalue_reference<int (&&)(int)>::value, true);