diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
index 4cad722..ac19959 100644
--- a/include/boost/mp11/algorithm.hpp
+++ b/include/boost/mp11/algorithm.hpp
@@ -23,6 +23,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_assign<L1, L2>
 namespace detail
@@ -751,6 +753,7 @@ template<class L, template<class...> class P> using mp_none_of = mp_bool< mp_cou
 // mp_any_of<L, P>
 template<class L, template<class...> class P> using mp_any_of = mp_bool< mp_count_if<L, P>::value != 0 >;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_ALGORITHM_HPP_INCLUDED
diff --git a/include/boost/mp11/detail/mp_count.hpp b/include/boost/mp11/detail/mp_count.hpp
index 782e5c6..c03128f 100644
--- a/include/boost/mp11/detail/mp_count.hpp
+++ b/include/boost/mp11/detail/mp_count.hpp
@@ -15,6 +15,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_count<L, V>
 namespace detail
@@ -87,6 +89,7 @@ template<template<class...> class L, class... T, template<class...> class P> str
 
 template<class L, template<class...> class P> using mp_count_if = typename detail::mp_count_if_impl<L, P>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_DETAIL_MP_COUNT_HPP_INCLUDED
diff --git a/include/boost/mp11/detail/mp_list.hpp b/include/boost/mp11/detail/mp_list.hpp
index e0e285a..8e8d3e5 100644
--- a/include/boost/mp11/detail/mp_list.hpp
+++ b/include/boost/mp11/detail/mp_list.hpp
@@ -10,12 +10,15 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_list<T...>
 template<class... T> struct mp_list
 {
 };
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_DETAIL_MP_LIST_HPP_INCLUDED
diff --git a/include/boost/mp11/detail/mp_map_find.hpp b/include/boost/mp11/detail/mp_map_find.hpp
index 6c01e45..ec0fabd 100644
--- a/include/boost/mp11/detail/mp_map_find.hpp
+++ b/include/boost/mp11/detail/mp_map_find.hpp
@@ -12,6 +12,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_map_find
 namespace detail
@@ -35,6 +37,7 @@ template<template<class...> class M, class... T, class K> struct mp_map_find_imp
 
 template<class M, class K> using mp_map_find = typename detail::mp_map_find_impl<M, K>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_DETAIL_MP_MAP_FIND_HPP_INCLUDED
diff --git a/include/boost/mp11/detail/mp_plus.hpp b/include/boost/mp11/detail/mp_plus.hpp
index 88e34ef..c27e6de 100644
--- a/include/boost/mp11/detail/mp_plus.hpp
+++ b/include/boost/mp11/detail/mp_plus.hpp
@@ -13,6 +13,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_plus
 namespace detail
@@ -41,6 +43,7 @@ template<class T1, class T2, class T3, class T4, class T5, class T6, class T7, c
 
 template<class... T> using mp_plus = typename detail::mp_plus_impl<T...>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_DETAIL_MP_PLUS_HPP_INCLUDED
diff --git a/include/boost/mp11/function.hpp b/include/boost/mp11/function.hpp
index cefec1a..0fd4f6e 100644
--- a/include/boost/mp11/function.hpp
+++ b/include/boost/mp11/function.hpp
@@ -15,6 +15,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_equal_to<T1, T2>
 template<class T1, class T2> using mp_equal_to = mp_bool< T1::value == T2::value >;
@@ -75,6 +77,7 @@ template<class T1, class... T> struct mp_or_impl<T1, T...>
 
 } // namespace detail
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_FUNCTION_HPP_INCLUDED
diff --git a/include/boost/mp11/integral.hpp b/include/boost/mp11/integral.hpp
index ebe52b5..3e0ba19 100644
--- a/include/boost/mp11/integral.hpp
+++ b/include/boost/mp11/integral.hpp
@@ -13,6 +13,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_bool
 template<bool B> using mp_bool = std::integral_constant<bool, B>;
@@ -32,6 +34,7 @@ template<int I> using mp_int = std::integral_constant<int, I>;
 // mp_size_t
 template<std::size_t N> using mp_size_t = std::integral_constant<std::size_t, N>;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_INTEGRAL_HPP_INCLUDED
diff --git a/include/boost/mp11/list.hpp b/include/boost/mp11/list.hpp
index 6f09d25..bb319d6 100644
--- a/include/boost/mp11/list.hpp
+++ b/include/boost/mp11/list.hpp
@@ -13,6 +13,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_size<L>
 namespace detail
@@ -168,6 +170,7 @@ template<template<class...> class L1, class... T1, template<class...> class L2,
 
 template<class... L> using mp_append = typename detail::mp_append_impl<L...>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_LIST_HPP_INCLUDED
diff --git a/include/boost/mp11/map.hpp b/include/boost/mp11/map.hpp
index b12f48c..05778f1 100644
--- a/include/boost/mp11/map.hpp
+++ b/include/boost/mp11/map.hpp
@@ -17,6 +17,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_map_contains<M, K>
 template<class M, class K> using mp_map_contains = mp_not<std::is_same<mp_map_find<M, K>, void>>;
@@ -77,6 +79,7 @@ template<class M, class K> struct mp_map_erase_impl
 
 template<class M, class K> using mp_map_erase = typename detail::mp_map_erase_impl<M, K>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_MAP_HPP_INCLUDED
diff --git a/include/boost/mp11/set.hpp b/include/boost/mp11/set.hpp
index 568273a..a3b3b38 100644
--- a/include/boost/mp11/set.hpp
+++ b/include/boost/mp11/set.hpp
@@ -13,6 +13,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_set_contains<S, V>
 namespace detail
@@ -76,6 +78,7 @@ template<template<class...> class L, class... U, class T1, class... T> struct mp
 
 template<class S, class... T> using mp_set_push_front = typename detail::mp_set_push_front_impl<S, T...>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_SET_HPP_INCLUDED
diff --git a/include/boost/mp11/utility.hpp b/include/boost/mp11/utility.hpp
index 220155f..8ac684c 100644
--- a/include/boost/mp11/utility.hpp
+++ b/include/boost/mp11/utility.hpp
@@ -12,6 +12,8 @@
 
 namespace boost
 {
+namespace mp11
+{
 
 // mp_identity
 template<class T> struct mp_identity
@@ -125,6 +127,7 @@ template<template<class...> class F, class... T, class... U> struct mp_unquote_i
 
 template<class Q, class... T> using mp_unquote = typename detail::mp_unquote_impl<Q, T...>::type;
 
+} // namespace mp11
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_UTILITY_HPP_INCLUDED
diff --git a/test/integral.cpp b/test/integral.cpp
index 82002b5..ce0f961 100644
--- a/test/integral.cpp
+++ b/test/integral.cpp
@@ -14,29 +14,29 @@
 
 int main()
 {
-    using boost::mp_bool;
+    using boost::mp11::mp_bool;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_bool<false>, std::integral_constant<bool, false>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_bool<true>, std::integral_constant<bool, true>>));
 
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_false, std::integral_constant<bool, false>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_true, std::integral_constant<bool, true>>));
 
-    using boost::mp_int;
+    using boost::mp11::mp_int;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_int<0>, std::integral_constant<int, 0>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_int<814>, std::integral_constant<int, 814>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_int<-144>, std::integral_constant<int, -144>>));
 
-    using boost::mp_size_t;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_size_t<0>, std::integral_constant<std::size_t, 0>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_size_t<1972>, std::integral_constant<std::size_t, 1972>>));
 
-    using boost::mp_to_bool;
+    using boost::mp11::mp_to_bool;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_to_bool<mp_false>, mp_false>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_to_bool<mp_true>, mp_true>));
@@ -51,7 +51,7 @@ int main()
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_to_bool<mp_size_t<1>>, mp_true>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_to_bool<mp_size_t<442>>, mp_true>));
 
-    using boost::mp_not;
+    using boost::mp11::mp_not;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_not<mp_false>, mp_true>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_not<mp_true>, mp_false>));
diff --git a/test/mp_all.cpp b/test/mp_all.cpp
index 651c208..6b5e2d7 100644
--- a/test/mp_all.cpp
+++ b/test/mp_all.cpp
@@ -14,11 +14,11 @@
 
 int main()
 {
-    using boost::mp_all;
-    using boost::mp_true;
-    using boost::mp_false;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_all;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_all<>, mp_true>));
 
diff --git a/test/mp_all_of.cpp b/test/mp_all_of.cpp
index a19b18e..6e01aec 100644
--- a/test/mp_all_of.cpp
+++ b/test/mp_all_of.cpp
@@ -19,10 +19,10 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_all_of;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_all_of;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_and.cpp b/test/mp_and.cpp
index d75552f..6c06ded 100644
--- a/test/mp_and.cpp
+++ b/test/mp_and.cpp
@@ -14,11 +14,11 @@
 
 int main()
 {
-    using boost::mp_and;
-    using boost::mp_true;
-    using boost::mp_false;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_and;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_and<>, mp_true>));
 
diff --git a/test/mp_any.cpp b/test/mp_any.cpp
index f7e45c9..9619522 100644
--- a/test/mp_any.cpp
+++ b/test/mp_any.cpp
@@ -14,11 +14,11 @@
 
 int main()
 {
-    using boost::mp_any;
-    using boost::mp_true;
-    using boost::mp_false;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_any;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_any<>, mp_false>));
 
diff --git a/test/mp_any_of.cpp b/test/mp_any_of.cpp
index bcf3c19..e6aa3b1 100644
--- a/test/mp_any_of.cpp
+++ b/test/mp_any_of.cpp
@@ -19,10 +19,10 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_any_of;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_any_of;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_append.cpp b/test/mp_append.cpp
index cfe8e3f..25482c4 100644
--- a/test/mp_append.cpp
+++ b/test/mp_append.cpp
@@ -22,8 +22,8 @@ struct X6 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_append;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_append;
 
     using L1 = mp_list<char[1], char[1]>;
     using L2 = mp_list<char[2], char[2]>;
diff --git a/test/mp_assign.cpp b/test/mp_assign.cpp
index cd6bea5..823607a 100644
--- a/test/mp_assign.cpp
+++ b/test/mp_assign.cpp
@@ -20,8 +20,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_assign;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_assign;
 
     using L1 = mp_list<int, void(), float[]>;
 
diff --git a/test/mp_at.cpp b/test/mp_at.cpp
index ef22280..6ff3fd4 100644
--- a/test/mp_at.cpp
+++ b/test/mp_at.cpp
@@ -23,10 +23,10 @@ struct X5 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_at;
-    using boost::mp_at_c;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_at;
+    using boost::mp11::mp_at_c;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<X1, X2, X3, X4, X5>;
diff --git a/test/mp_clear.cpp b/test/mp_clear.cpp
index 991d5a5..3ecd530 100644
--- a/test/mp_clear.cpp
+++ b/test/mp_clear.cpp
@@ -16,8 +16,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_clear;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_clear;
 
     using L1 = mp_list<int, void(), float[]>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_clear<L1>, mp_list<>>));
diff --git a/test/mp_contains.cpp b/test/mp_contains.cpp
index deef491..04bfac6 100644
--- a/test/mp_contains.cpp
+++ b/test/mp_contains.cpp
@@ -21,10 +21,10 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_contains;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_contains;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_copy_if.cpp b/test/mp_copy_if.cpp
index d67f120..1545c18 100644
--- a/test/mp_copy_if.cpp
+++ b/test/mp_copy_if.cpp
@@ -19,8 +19,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_copy_if;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_copy_if;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_count.cpp b/test/mp_count.cpp
index 15c128a..41df7dd 100644
--- a/test/mp_count.cpp
+++ b/test/mp_count.cpp
@@ -21,9 +21,9 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_count;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_count;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_count_if.cpp b/test/mp_count_if.cpp
index 311cf12..ad728a9 100644
--- a/test/mp_count_if.cpp
+++ b/test/mp_count_if.cpp
@@ -19,9 +19,9 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_count_if;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_count_if;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_defer.cpp b/test/mp_defer.cpp
index e6fdbc7..492e32b 100644
--- a/test/mp_defer.cpp
+++ b/test/mp_defer.cpp
@@ -12,17 +12,21 @@
 #include <boost/core/lightweight_test_trait.hpp>
 #include <type_traits>
 
+using boost::mp11::mp_identity;
+using boost::mp11::mp_true;
+using boost::mp11::mp_false;
+
 template<class T> struct has_type
 {
-    template<class U> static boost::mp_true f( boost::mp_identity<typename U::type>* );
-    template<class U> static boost::mp_false f( ... );
+    template<class U> static mp_true f( mp_identity<typename U::type>* );
+    template<class U> static mp_false f( ... );
 
     using type = decltype( f<T>(0) );
 
     static const auto value = type::value;
 };
 
-using boost::mp_defer;
+using boost::mp11::mp_defer;
 
 template<class T> using add_pointer = T*;
 template<class... T> using add_pointer_impl = mp_defer<add_pointer, T...>;
diff --git a/test/mp_drop.cpp b/test/mp_drop.cpp
index 6cadc27..186aa94 100644
--- a/test/mp_drop.cpp
+++ b/test/mp_drop.cpp
@@ -23,10 +23,10 @@ struct X5 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_drop;
-    using boost::mp_drop_c;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_drop;
+    using boost::mp11::mp_drop_c;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_empty.cpp b/test/mp_empty.cpp
index 7e137a8..87e0fb7 100644
--- a/test/mp_empty.cpp
+++ b/test/mp_empty.cpp
@@ -16,10 +16,10 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_empty;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_empty;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     using L1 = mp_list<>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_empty<L1>, mp_true>));
diff --git a/test/mp_eval_if.cpp b/test/mp_eval_if.cpp
index 218b8d1..1c8ed39 100644
--- a/test/mp_eval_if.cpp
+++ b/test/mp_eval_if.cpp
@@ -14,23 +14,23 @@
 
 int main()
 {
-    using boost::mp_eval_if_c;
-    using boost::mp_identity;
+    using boost::mp11::mp_eval_if_c;
+    using boost::mp11::mp_identity;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if_c<true, char[], mp_identity, void, void, void>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if_c<false, char[], mp_identity, void()>, mp_identity<void()>>));
 
-    using boost::mp_eval_if;
+    using boost::mp11::mp_eval_if;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<std::true_type, char[], mp_identity, void, void, void>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<std::false_type, char[], mp_identity, void()>, mp_identity<void()>>));
 
-    using boost::mp_int;
+    using boost::mp11::mp_int;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<mp_int<-7>, char[], mp_identity, void, void, void>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<mp_int<0>, char[], mp_identity, void()>, mp_identity<void()>>));
 
-    using boost::mp_size_t;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<mp_size_t<14>, char[], mp_identity, void, void, void>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_eval_if<mp_size_t<0>, char[], mp_identity, void()>, mp_identity<void()>>));
diff --git a/test/mp_fill.cpp b/test/mp_fill.cpp
index e12f538..1b5fc2e 100644
--- a/test/mp_fill.cpp
+++ b/test/mp_fill.cpp
@@ -18,8 +18,8 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_fill;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_fill;
 
     using L1 = mp_list<int, void(), float[]>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_fill<L1, X1>, mp_list<X1, X1, X1>>));
diff --git a/test/mp_find.cpp b/test/mp_find.cpp
index c9ee794..21aeb26 100644
--- a/test/mp_find.cpp
+++ b/test/mp_find.cpp
@@ -21,9 +21,9 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_find;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_find;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_find_if.cpp b/test/mp_find_if.cpp
index 2500381..6310390 100644
--- a/test/mp_find_if.cpp
+++ b/test/mp_find_if.cpp
@@ -19,9 +19,9 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_find_if;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_find_if;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_fold.cpp b/test/mp_fold.cpp
index eb5070a..4a0fa73 100644
--- a/test/mp_fold.cpp
+++ b/test/mp_fold.cpp
@@ -22,8 +22,8 @@ template<class T1, class T2> struct F {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_fold;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_fold;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_fold<mp_list<>, void, F>, void>));
@@ -41,13 +41,13 @@ int main()
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_fold<std::tuple<X1, X2, X3, X4>, void, F>, F<F<F<F<void, X1>, X2>, X3>, X4>>));
     }
 
-    using boost::mp_push_back;
+    using boost::mp11::mp_push_back;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_fold<std::tuple<X1, X2, X3, X4>, mp_list<>, mp_push_back>, mp_list<X1, X2, X3, X4>>));
     }
 
-    using boost::mp_push_front;
+    using boost::mp11::mp_push_front;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_fold<std::tuple<X1, X2, X3, X4>, mp_list<>, mp_push_front>, mp_list<X4, X3, X2, X1>>));
diff --git a/test/mp_front.cpp b/test/mp_front.cpp
index 90a0976..3edb856 100644
--- a/test/mp_front.cpp
+++ b/test/mp_front.cpp
@@ -15,9 +15,9 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_front;
-    using boost::mp_first;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_front;
+    using boost::mp11::mp_first;
 
     using L1 = mp_list<void>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_front<L1>, void>));
diff --git a/test/mp_identity.cpp b/test/mp_identity.cpp
index 46ce6a4..3198718 100644
--- a/test/mp_identity.cpp
+++ b/test/mp_identity.cpp
@@ -15,14 +15,14 @@ struct X {};
 
 int main()
 {
-    using boost::mp_identity;
+    using boost::mp11::mp_identity;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity<void const volatile>::type, void const volatile>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity<void()>::type, void()>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity<int const[]>::type, int const[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity<X>::type, X>));
 
-    using boost::mp_identity_t;
+    using boost::mp11::mp_identity_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity_t<void const volatile>, void const volatile>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_identity_t<void()>, void()>));
diff --git a/test/mp_if.cpp b/test/mp_if.cpp
index 88036f9..1a5bca9 100644
--- a/test/mp_if.cpp
+++ b/test/mp_if.cpp
@@ -14,22 +14,22 @@
 
 int main()
 {
-    using boost::mp_if_c;
+    using boost::mp11::mp_if_c;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if_c<true, char[], void()>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if_c<false, char[], void()>, void()>));
 
-    using boost::mp_if;
+    using boost::mp11::mp_if;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<std::true_type, char[], void()>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<std::false_type, char[], void()>, void()>));
 
-    using boost::mp_int;
+    using boost::mp11::mp_int;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<mp_int<-7>, char[], void()>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<mp_int<0>, char[], void()>, void()>));
 
-    using boost::mp_size_t;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<mp_size_t<14>, char[], void()>, char[]>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_if<mp_size_t<0>, char[], void()>, void()>));
diff --git a/test/mp_inherit.cpp b/test/mp_inherit.cpp
index cf9ec09..dfd5fc4 100644
--- a/test/mp_inherit.cpp
+++ b/test/mp_inherit.cpp
@@ -17,7 +17,7 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_inherit;
+    using boost::mp11::mp_inherit;
 
     BOOST_TEST_TRAIT_TRUE((std::is_base_of<X1, mp_inherit<X1, X2, X3>>));
     BOOST_TEST_TRAIT_TRUE((std::is_base_of<X2, mp_inherit<X1, X2, X3>>));
diff --git a/test/mp_iota.cpp b/test/mp_iota.cpp
index a1eadfc..044251d 100644
--- a/test/mp_iota.cpp
+++ b/test/mp_iota.cpp
@@ -14,11 +14,11 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_iota;
-    using boost::mp_iota_c;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_iota;
+    using boost::mp11::mp_iota_c;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_iota_c<0>, mp_list<>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_iota_c<1>, mp_list<mp_size_t<0>>>));
diff --git a/test/mp_map_contains.cpp b/test/mp_map_contains.cpp
index e9d36b2..777b5c8 100644
--- a/test/mp_map_contains.cpp
+++ b/test/mp_map_contains.cpp
@@ -17,10 +17,10 @@
 
 int main()
 {
-    using boost::mp_map_contains;
-    using boost::mp_list;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_map_contains;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_contains<mp_list<>, char>, mp_false>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_contains<std::tuple<>, int>, mp_false>));
diff --git a/test/mp_map_erase.cpp b/test/mp_map_erase.cpp
index 466f4c9..db0c691 100644
--- a/test/mp_map_erase.cpp
+++ b/test/mp_map_erase.cpp
@@ -16,8 +16,8 @@
 
 int main()
 {
-    using boost::mp_map_erase;
-    using boost::mp_list;
+    using boost::mp11::mp_map_erase;
+    using boost::mp11::mp_list;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_erase<mp_list<>, void>, mp_list<>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_erase<std::tuple<>, int>, std::tuple<>>));
diff --git a/test/mp_map_find.cpp b/test/mp_map_find.cpp
index 6c26b9b..2bd614d 100644
--- a/test/mp_map_find.cpp
+++ b/test/mp_map_find.cpp
@@ -16,8 +16,8 @@
 
 int main()
 {
-    using boost::mp_map_find;
-    using boost::mp_list;
+    using boost::mp11::mp_map_find;
+    using boost::mp11::mp_list;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_find<mp_list<>, char>, void>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_find<std::tuple<>, int>, void>));
diff --git a/test/mp_map_insert.cpp b/test/mp_map_insert.cpp
index b334c9f..11920a7 100644
--- a/test/mp_map_insert.cpp
+++ b/test/mp_map_insert.cpp
@@ -16,9 +16,9 @@
 
 int main()
 {
-    using boost::mp_map_insert;
-    using boost::mp_list;
-    using boost::mp_push_back;
+    using boost::mp11::mp_map_insert;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_push_back;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_insert<mp_list<>, mp_list<void>>, mp_list<mp_list<void>>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_insert<std::tuple<>, std::tuple<int>>, std::tuple<std::tuple<int>>>));
diff --git a/test/mp_map_replace.cpp b/test/mp_map_replace.cpp
index 416a0fb..c68b059 100644
--- a/test/mp_map_replace.cpp
+++ b/test/mp_map_replace.cpp
@@ -16,9 +16,9 @@
 
 int main()
 {
-    using boost::mp_map_replace;
-    using boost::mp_list;
-    using boost::mp_push_back;
+    using boost::mp11::mp_map_replace;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_push_back;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_replace<mp_list<>, mp_list<void>>, mp_list<mp_list<void>>>));
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_map_replace<std::tuple<>, std::tuple<int>>, std::tuple<std::tuple<int>>>));
diff --git a/test/mp_map_update.cpp b/test/mp_map_update.cpp
index 0069072..24e7e77 100644
--- a/test/mp_map_update.cpp
+++ b/test/mp_map_update.cpp
@@ -15,14 +15,14 @@
 #include <tuple>
 #include <utility>
 
-using boost::mp_int;
+using boost::mp11::mp_int;
 
 template<class T, class U> using inc = mp_int<U::value + 1>;
 
 int main()
 {
-    using boost::mp_map_update;
-    using boost::mp_list;
+    using boost::mp11::mp_map_update;
+    using boost::mp11::mp_list;
 
     using M1 = mp_list<>;
 
diff --git a/test/mp_none_of.cpp b/test/mp_none_of.cpp
index 1ee4099..c0bd37e 100644
--- a/test/mp_none_of.cpp
+++ b/test/mp_none_of.cpp
@@ -19,10 +19,10 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_none_of;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_none_of;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_or.cpp b/test/mp_or.cpp
index 3e4c842..e468be5 100644
--- a/test/mp_or.cpp
+++ b/test/mp_or.cpp
@@ -14,11 +14,11 @@
 
 int main()
 {
-    using boost::mp_or;
-    using boost::mp_true;
-    using boost::mp_false;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_or;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_or<>, mp_false>));
 
diff --git a/test/mp_partition.cpp b/test/mp_partition.cpp
index 461645e..8dc1ac2 100644
--- a/test/mp_partition.cpp
+++ b/test/mp_partition.cpp
@@ -19,8 +19,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_partition;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_partition;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_pop_front.cpp b/test/mp_pop_front.cpp
index f92dce9..f1ff16a 100644
--- a/test/mp_pop_front.cpp
+++ b/test/mp_pop_front.cpp
@@ -15,9 +15,9 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_pop_front;
-    using boost::mp_rest;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_pop_front;
+    using boost::mp11::mp_rest;
 
     using L1 = mp_list<void>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_pop_front<L1>, mp_list<>>));
diff --git a/test/mp_product.cpp b/test/mp_product.cpp
index 351ea38..696965b 100644
--- a/test/mp_product.cpp
+++ b/test/mp_product.cpp
@@ -27,8 +27,8 @@ template<class T1, class T2, class T3> struct F {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_product;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_product;
 
     {
         using L1 = std::tuple<X1, X2, X3>;
diff --git a/test/mp_push_back.cpp b/test/mp_push_back.cpp
index 6bd1935..c74fb03 100644
--- a/test/mp_push_back.cpp
+++ b/test/mp_push_back.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_push_back;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_push_back;
 
     using L1 = mp_list<>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_push_back<L1>, mp_list<>>));
diff --git a/test/mp_push_front.cpp b/test/mp_push_front.cpp
index 303fddc..73fcc8b 100644
--- a/test/mp_push_front.cpp
+++ b/test/mp_push_front.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_push_front;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_push_front;
 
     using L1 = mp_list<>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_push_front<L1>, mp_list<>>));
diff --git a/test/mp_quote.cpp b/test/mp_quote.cpp
index 39ab385..26a84af 100644
--- a/test/mp_quote.cpp
+++ b/test/mp_quote.cpp
@@ -11,7 +11,7 @@
 #include <boost/core/lightweight_test_trait.hpp>
 #include <type_traits>
 
-using boost::mp_unquote;
+using boost::mp11::mp_unquote;
 
 template<class...> struct X {};
 
@@ -28,8 +28,8 @@ template<class... T> using is_base_of_t = typename std::is_base_of<T...>::type;
 
 int main()
 {
-    using boost::mp_identity_t;
-    using boost::mp_quote;
+    using boost::mp11::mp_identity_t;
+    using boost::mp11::mp_quote;
 
     {
         using Q = mp_quote<mp_identity_t>;
diff --git a/test/mp_remove.cpp b/test/mp_remove.cpp
index 8daff77..87d9c61 100644
--- a/test/mp_remove.cpp
+++ b/test/mp_remove.cpp
@@ -19,8 +19,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_remove;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_remove;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_remove_if.cpp b/test/mp_remove_if.cpp
index f1fdfc9..733f9fb 100644
--- a/test/mp_remove_if.cpp
+++ b/test/mp_remove_if.cpp
@@ -19,8 +19,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_remove_if;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_remove_if;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_rename.cpp b/test/mp_rename.cpp
index c0f3b60..e124683 100644
--- a/test/mp_rename.cpp
+++ b/test/mp_rename.cpp
@@ -18,8 +18,8 @@ template<class... T> using Y = X<T...>;
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_rename;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_rename;
 
     using L1 = mp_list<>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_rename<L1, mp_list>, mp_list<>>));
diff --git a/test/mp_repeat.cpp b/test/mp_repeat.cpp
index a145fc8..574b4fe 100644
--- a/test/mp_repeat.cpp
+++ b/test/mp_repeat.cpp
@@ -20,13 +20,13 @@ struct X2 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_repeat;
-    using boost::mp_repeat_c;
-    using boost::mp_true;
-    using boost::mp_false;
-    using boost::mp_int;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_repeat;
+    using boost::mp11::mp_repeat_c;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
+    using boost::mp11::mp_int;
+    using boost::mp11::mp_size_t;
 
     using L1 = mp_list<>;
 
diff --git a/test/mp_replace.cpp b/test/mp_replace.cpp
index 9562bfe..36a0ac6 100644
--- a/test/mp_replace.cpp
+++ b/test/mp_replace.cpp
@@ -20,8 +20,8 @@ struct X3 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_replace;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_replace;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_replace_if.cpp b/test/mp_replace_if.cpp
index c075494..98845d3 100644
--- a/test/mp_replace_if.cpp
+++ b/test/mp_replace_if.cpp
@@ -18,8 +18,8 @@ struct X1 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_replace_if;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_replace_if;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_reverse.cpp b/test/mp_reverse.cpp
index 740716c..79d7cb6 100644
--- a/test/mp_reverse.cpp
+++ b/test/mp_reverse.cpp
@@ -25,8 +25,8 @@ struct X9 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_reverse;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_reverse;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_reverse<mp_list<>>, mp_list<>>));
diff --git a/test/mp_reverse_fold.cpp b/test/mp_reverse_fold.cpp
index d646a11..f88b645 100644
--- a/test/mp_reverse_fold.cpp
+++ b/test/mp_reverse_fold.cpp
@@ -20,13 +20,16 @@ struct X4 {};
 
 template<class T1, class T2> struct F {};
 
-template<class T, class L> using rev_push_back = boost::mp_push_back<L, T>;
-template<class T, class L> using rev_push_front = boost::mp_push_front<L, T>;
+using boost::mp11::mp_push_back;
+using boost::mp11::mp_push_front;
+
+template<class T, class L> using rev_push_back = mp_push_back<L, T>;
+template<class T, class L> using rev_push_front = mp_push_front<L, T>;
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_reverse_fold;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_reverse_fold;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_reverse_fold<mp_list<>, void, F>, void>));
diff --git a/test/mp_second.cpp b/test/mp_second.cpp
index 202a18f..f585bea 100644
--- a/test/mp_second.cpp
+++ b/test/mp_second.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_second;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_second;
 
     using L1 = mp_list<void, char[]>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_second<L1>, char[]>));
diff --git a/test/mp_set_contains.cpp b/test/mp_set_contains.cpp
index adc97d6..d533146 100644
--- a/test/mp_set_contains.cpp
+++ b/test/mp_set_contains.cpp
@@ -16,10 +16,10 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_set_contains;
-    using boost::mp_true;
-    using boost::mp_false;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_set_contains;
+    using boost::mp11::mp_true;
+    using boost::mp11::mp_false;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_set_push_back.cpp b/test/mp_set_push_back.cpp
index f39cfbb..0855536 100644
--- a/test/mp_set_push_back.cpp
+++ b/test/mp_set_push_back.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_set_push_back;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_set_push_back;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_set_push_front.cpp b/test/mp_set_push_front.cpp
index 3c33c41..a027ac3 100644
--- a/test/mp_set_push_front.cpp
+++ b/test/mp_set_push_front.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_set_push_front;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_set_push_front;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_size.cpp b/test/mp_size.cpp
index ae8969c..a8ea75f 100644
--- a/test/mp_size.cpp
+++ b/test/mp_size.cpp
@@ -16,9 +16,9 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_size;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_size;
+    using boost::mp11::mp_size_t;
 
     using L1 = mp_list<>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_size<L1>, mp_size_t<0>>));
diff --git a/test/mp_sort.cpp b/test/mp_sort.cpp
index d339d29..d6b677f 100644
--- a/test/mp_sort.cpp
+++ b/test/mp_sort.cpp
@@ -14,14 +14,14 @@
 #include <type_traits>
 #include <tuple>
 
-using boost::mp_bool;
+using boost::mp11::mp_bool;
 
 template<class T, class U> using sizeof_less = mp_bool<(sizeof(T) < sizeof(U))>;
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_sort;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_sort;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_take.cpp b/test/mp_take.cpp
index eac3f12..6648ccf 100644
--- a/test/mp_take.cpp
+++ b/test/mp_take.cpp
@@ -23,10 +23,10 @@ struct X5 {};
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_take;
-    using boost::mp_take_c;
-    using boost::mp_size_t;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_take;
+    using boost::mp11::mp_take_c;
+    using boost::mp11::mp_size_t;
 
     {
         using L1 = mp_list<>;
diff --git a/test/mp_third.cpp b/test/mp_third.cpp
index 75ad293..c43b85d 100644
--- a/test/mp_third.cpp
+++ b/test/mp_third.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_third;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_third;
 
     using L1 = mp_list<int[], void, float[]>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_third<L1>, float[]>));
diff --git a/test/mp_transform.cpp b/test/mp_transform.cpp
index 3d17a16..6782278 100644
--- a/test/mp_transform.cpp
+++ b/test/mp_transform.cpp
@@ -34,8 +34,8 @@ template<class T, class U> using is_same = typename std::is_same<T, U>::type;
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_transform;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_transform;
 
     using L1 = mp_list<X1, X2, X3, X4>;
 
diff --git a/test/mp_transform_if.cpp b/test/mp_transform_if.cpp
index 99b6bb7..0151ac5 100644
--- a/test/mp_transform_if.cpp
+++ b/test/mp_transform_if.cpp
@@ -20,13 +20,15 @@ struct X2 {};
 struct X3 {};
 struct X4 {};
 
+using boost::mp11::mp_not;
+
 template<class T> using add_pointer = T*;
-template<class T> using is_not_ref = boost::mp_not<std::is_reference<T>>;
+template<class T> using is_not_ref = mp_not<std::is_reference<T>>;
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_transform_if;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_transform_if;
 
     using L1 = mp_list<X1, X2&, X3 const, X4 const&>;
 
diff --git a/test/mp_unique.cpp b/test/mp_unique.cpp
index cdc2f98..697d4ce 100644
--- a/test/mp_unique.cpp
+++ b/test/mp_unique.cpp
@@ -15,8 +15,8 @@
 
 int main()
 {
-    using boost::mp_list;
-    using boost::mp_unique;
+    using boost::mp11::mp_list;
+    using boost::mp11::mp_unique;
 
     {
         BOOST_TEST_TRAIT_TRUE((std::is_same<mp_unique<mp_list<>>, mp_list<>>));
diff --git a/test/mp_valid.cpp b/test/mp_valid.cpp
index ed11ed1..a096442 100644
--- a/test/mp_valid.cpp
+++ b/test/mp_valid.cpp
@@ -27,8 +27,8 @@ template<class T> using add_extents = T[];
 
 int main()
 {
-    using boost::mp_valid;
-    using boost::mp_identity;
+	using boost::mp11::mp_valid;
+    using boost::mp11::mp_identity;
 
     BOOST_TEST_TRAIT_FALSE((mp_valid<mp_identity>));
     BOOST_TEST_TRAIT_TRUE((mp_valid<mp_identity, void>));