diff --git a/include/boost/mp11.hpp b/include/boost/mp11.hpp
index 32cbb01..e623917 100644
--- a/include/boost/mp11.hpp
+++ b/include/boost/mp11.hpp
@@ -9,6 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/mp11/list.hpp>
+#include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/integral.hpp>
 #include <boost/mp11/utility.hpp>
 
diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
new file mode 100644
index 0000000..1111370
--- /dev/null
+++ b/include/boost/mp11/algorithm.hpp
@@ -0,0 +1,188 @@
+#ifndef BOOST_MP11_ALGORITHM_HPP_INCLUDED
+#define BOOST_MP11_ALGORITHM_HPP_INCLUDED
+
+//  Copyright 2015 Peter Dimov.
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//
+//  See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/integral.hpp>
+#include <boost/mp11/detail/mp_plus.hpp>
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+#include <type_traits>
+
+namespace boost
+{
+
+// mp_assign<L1, L2>
+namespace detail
+{
+
+template<class L1, class L2> struct mp_assign_impl;
+
+template<template<class...> class L1, class... T, template<class...> class L2, class... U> struct mp_assign_impl<L1<T...>, L2<U...>>
+{
+    using type = L1<U...>;
+};
+
+} // namespace detail
+
+template<class L1, class L2> using mp_assign = typename detail::mp_assign_impl<L1, L2>::type;
+
+// mp_clear<L>
+template<class L> using mp_clear = mp_assign<L, mp_list<>>;
+
+// mp_transform<F, L...>
+namespace detail
+{
+
+template<template<class...> class F, class... L> struct mp_transform_impl;
+
+template<template<class...> class F, class... L> using mp_transform = typename mp_transform_impl<F, L...>::type;
+
+template<template<class...> class F, template<class...> class L, class... T> struct mp_transform_impl<F, L<T...>>
+{
+    using type = L<F<T>...>;
+};
+
+template<template<class...> class F, template<class...> class L1, class... T1, template<class...> class L2, class... T2> struct mp_transform_impl<F, L1<T1...>, L2<T2...>>
+{
+    static_assert( sizeof...(T1) == sizeof...(T2), "The arguments of mp_transform should be of the same size" );
+    using type = L1<F<T1,T2>...>;
+};
+
+template<template<class...> class F, template<class...> class L1, class... T1, template<class...> class L2, class... T2, template<class...> class L3, class... T3> struct mp_transform_impl<F, L1<T1...>, L2<T2...>, L3<T3...>>
+{
+    static_assert( sizeof...(T1) == sizeof...(T2) && sizeof...(T1) == sizeof...(T3), "The arguments of mp_transform should be of the same size" );
+    using type = L1<F<T1,T2,T3>...>;
+};
+
+} // namespace detail
+
+template<template<class...> class F, class... L> using mp_transform = typename detail::mp_transform_impl<F, L...>::type;
+
+// mp_fill<L, V>
+namespace detail
+{
+
+template<class L, class V> struct mp_fill_impl;
+
+template<template<class...> class L, class... T, class V> struct mp_fill_impl<L<T...>, V>
+{
+#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
+
+    template<class...> struct _f { using type = V; };
+    using type = L<typename _f<T>::type...>;
+
+#else
+
+    template<class...> using _f = V;
+    using type = L<_f<T>...>;
+
+#endif
+};
+
+} // namespace detail
+
+template<class L, class V> using mp_fill = typename detail::mp_fill_impl<L, V>::type;
+
+// mp_count<L, V>
+namespace detail
+{
+
+template<class L, class V> struct mp_count_impl;
+
+template<template<class...> class L, class... T, class V> struct mp_count_impl<L<T...>, V>
+{
+    using type = mp_plus<std::is_same<T, V>...>;
+};
+
+} // namespace detail
+
+template<class L, class V> using mp_count = typename detail::mp_count_impl<L, V>::type;
+
+// mp_count_if<L, P>
+namespace detail
+{
+
+template<class L, template<class...> class P> struct mp_count_if_impl;
+
+template<template<class...> class L, class... T, template<class...> class P> struct mp_count_if_impl<L<T...>, P>
+{
+#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
+
+    template<class T> struct _f { using type = mp_to_bool<P<T>>; };
+    using type = mp_plus<typename _f<T>::type...>;
+
+#else
+
+    using type = mp_plus<mp_to_bool<P<T>>...>;
+
+#endif
+};
+
+} // namespace detail
+
+template<class L, template<class...> class P> using mp_count_if = typename detail::mp_count_if_impl<L, P>::type;
+
+// mp_contains<L, V>
+template<class L, class V> using mp_contains = mp_to_bool<mp_count<L, V>>;
+
+// mp_repeat(_c)<L, N>
+namespace detail
+{
+
+template<class L, std::size_t N> struct mp_repeat_c_impl
+{
+    using _l1 = typename mp_repeat_c_impl<L, N/2>::type;
+    using _l2 = typename mp_repeat_c_impl<L, N%2>::type;
+
+    using type = mp_append<_l1, _l1, _l2>;
+};
+
+template<class L> struct mp_repeat_c_impl<L, 0>
+{
+    using type = mp_clear<L>;
+};
+
+template<class L> struct mp_repeat_c_impl<L, 1>
+{
+    using type = L;
+};
+
+template<class L, class N> struct mp_repeat_impl
+{
+    static_assert( N::value >= 0, "mp_repeat<L, N>: N must not be negative" );
+
+    using type = typename mp_repeat_c_impl<L, N::value>::type;
+};
+
+} // namespace detail
+
+template<class L, std::size_t N> using mp_repeat_c = typename detail::mp_repeat_c_impl<L, N>::type;
+template<class L, class N> using mp_repeat = typename detail::mp_repeat_impl<L, N>::type;
+
+// mp_drop<L, N>
+// mp_take<L, N>
+// mp_find<L, V>
+// mp_find_if<L, P>
+// mp_find_index<L, V>
+// mp_find_index_if<L, P>
+// mp_reverse<L>
+// mp_copy_if<L, P>
+// mp_remove_if<L, P>
+// mp_product<L...>?
+// mp_fold<L, V, F>
+// mp_reverse_fold<L, V, F>
+// mp_replace<L, V1, V2>?
+// mp_replace_if<L, P, V2>?
+// mp_partition<L, P>
+// mp_sort<L>
+
+} // namespace boost
+
+#endif // #ifndef BOOST_MP11_ALGORITHM_HPP_INCLUDED
diff --git a/include/boost/mp11/list.hpp b/include/boost/mp11/list.hpp
index d13d2b2..ecc672e 100644
--- a/include/boost/mp11/list.hpp
+++ b/include/boost/mp11/list.hpp
@@ -9,10 +9,6 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/mp11/integral.hpp>
-#include <boost/mp11/detail/mp_plus.hpp>
-#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
-#include <type_traits>
 
 namespace boost
 {
@@ -176,171 +172,6 @@ template<template<class...> class L1, class... T1, template<class...> class L2,
 
 template<class... L> using mp_append = typename detail::mp_append_impl<L...>::type;
 
-// mp_assign<L1, L2>
-namespace detail
-{
-
-template<class L1, class L2> struct mp_assign_impl;
-
-template<template<class...> class L1, class... T, template<class...> class L2, class... U> struct mp_assign_impl<L1<T...>, L2<U...>>
-{
-    using type = L1<U...>;
-};
-
-} // namespace detail
-
-template<class L1, class L2> using mp_assign = typename detail::mp_assign_impl<L1, L2>::type;
-
-// mp_clear<L>
-template<class L> using mp_clear = mp_assign<L, mp_list<>>;
-
-// mp_transform<F, L...>
-namespace detail
-{
-
-template<template<class...> class F, class... L> struct mp_transform_impl;
-
-template<template<class...> class F, class... L> using mp_transform = typename mp_transform_impl<F, L...>::type;
-
-template<template<class...> class F, template<class...> class L, class... T> struct mp_transform_impl<F, L<T...>>
-{
-    using type = L<F<T>...>;
-};
-
-template<template<class...> class F, template<class...> class L1, class... T1, template<class...> class L2, class... T2> struct mp_transform_impl<F, L1<T1...>, L2<T2...>>
-{
-    static_assert( sizeof...(T1) == sizeof...(T2), "The arguments of mp_transform should be of the same size" );
-    using type = L1<F<T1,T2>...>;
-};
-
-template<template<class...> class F, template<class...> class L1, class... T1, template<class...> class L2, class... T2, template<class...> class L3, class... T3> struct mp_transform_impl<F, L1<T1...>, L2<T2...>, L3<T3...>>
-{
-    static_assert( sizeof...(T1) == sizeof...(T2) && sizeof...(T1) == sizeof...(T3), "The arguments of mp_transform should be of the same size" );
-    using type = L1<F<T1,T2,T3>...>;
-};
-
-} // namespace detail
-
-template<template<class...> class F, class... L> using mp_transform = typename detail::mp_transform_impl<F, L...>::type;
-
-// mp_fill<L, V>
-namespace detail
-{
-
-template<class L, class V> struct mp_fill_impl;
-
-template<template<class...> class L, class... T, class V> struct mp_fill_impl<L<T...>, V>
-{
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
-
-    template<class...> struct _f { using type = V; };
-    using type = L<typename _f<T>::type...>;
-
-#else
-
-    template<class...> using _f = V;
-    using type = L<_f<T>...>;
-
-#endif
-};
-
-} // namespace detail
-
-template<class L, class V> using mp_fill = typename detail::mp_fill_impl<L, V>::type;
-
-// mp_count<L, V>
-namespace detail
-{
-
-template<class L, class V> struct mp_count_impl;
-
-template<template<class...> class L, class... T, class V> struct mp_count_impl<L<T...>, V>
-{
-    using type = mp_plus<std::is_same<T, V>...>;
-};
-
-} // namespace detail
-
-template<class L, class V> using mp_count = typename detail::mp_count_impl<L, V>::type;
-
-// mp_count_if<L, P>
-namespace detail
-{
-
-template<class L, template<class...> class P> struct mp_count_if_impl;
-
-template<template<class...> class L, class... T, template<class...> class P> struct mp_count_if_impl<L<T...>, P>
-{
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
-
-    template<class T> struct _f { using type = mp_to_bool<P<T>>; };
-    using type = mp_plus<typename _f<T>::type...>;
-
-#else
-
-    using type = mp_plus<mp_to_bool<P<T>>...>;
-
-#endif
-};
-
-} // namespace detail
-
-template<class L, template<class...> class P> using mp_count_if = typename detail::mp_count_if_impl<L, P>::type;
-
-// mp_contains<L, V>
-template<class L, class V> using mp_contains = mp_to_bool<mp_count<L, V>>;
-
-// mp_repeat(_c)<L, N>
-namespace detail
-{
-
-template<class L, std::size_t N> struct mp_repeat_c_impl
-{
-    using _l1 = typename mp_repeat_c_impl<L, N/2>::type;
-    using _l2 = typename mp_repeat_c_impl<L, N%2>::type;
-
-    using type = mp_append<_l1, _l1, _l2>;
-};
-
-template<class L> struct mp_repeat_c_impl<L, 0>
-{
-    using type = mp_clear<L>;
-};
-
-template<class L> struct mp_repeat_c_impl<L, 1>
-{
-    using type = L;
-};
-
-template<class L, class N> struct mp_repeat_impl
-{
-    static_assert( N::value >= 0, "mp_repeat<L, N>: N must not be negative" );
-
-    using type = typename mp_repeat_c_impl<L, N::value>::type;
-};
-
-} // namespace detail
-
-template<class L, std::size_t N> using mp_repeat_c = typename detail::mp_repeat_c_impl<L, N>::type;
-template<class L, class N> using mp_repeat = typename detail::mp_repeat_impl<L, N>::type;
-
-// mp_drop<L, N>
-// mp_take<L, N>
-// mp_find<L, V>
-// mp_find_if<L, P>
-// mp_find_index<L, V>
-// mp_find_index_if<L, P>
-// mp_reverse<L>
-// mp_copy_if<L, P>
-// mp_remove_if<L, P>
-// mp_product<L...>?
-// mp_fold<L, V, F>
-// mp_reverse_fold<L, V, F>
-// mp_replace<L, V1, V2>?
-// mp_replace_if<L, P, V2>?
-// mp_partition<L, P>
-// mp_sort<L>
-
 } // namespace boost
 
 #endif // #ifndef BOOST_MP11_LIST_HPP_INCLUDED
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 249e876..3f3d35a 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -11,6 +11,9 @@ import ../../config/checks/config : requires ;
 
 REQ = ; #[ requires cxx11_variadic_templates cxx11_template_aliases cxx11_hdr_type_traits cxx11_hdr_tuple ] ;
 
+# include-only
+compile mp11.cpp : : : $(REQ) ;
+
 # list
 run mp_size.cpp : : : $(REQ) ;
 run mp_empty.cpp : : : $(REQ) ;
diff --git a/test/mp11.cpp b/test/mp11.cpp
new file mode 100644
index 0000000..6ab26cb
--- /dev/null
+++ b/test/mp11.cpp
@@ -0,0 +1,14 @@
+
+//  Copyright 2015 Peter Dimov.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+
+#include <boost/mp11.hpp>
+
+int main()
+{
+}
diff --git a/test/mp_assign.cpp b/test/mp_assign.cpp
index a586cf5..cd6bea5 100644
--- a/test/mp_assign.cpp
+++ b/test/mp_assign.cpp
@@ -8,6 +8,7 @@
 
 
 #include <boost/core/lightweight_test_trait.hpp>
+#include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
 #include <type_traits>
 #include <tuple>
diff --git a/test/mp_clear.cpp b/test/mp_clear.cpp
index e3fb626..991d5a5 100644
--- a/test/mp_clear.cpp
+++ b/test/mp_clear.cpp
@@ -8,6 +8,7 @@
 
 
 #include <boost/core/lightweight_test_trait.hpp>
+#include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
 #include <type_traits>
 #include <tuple>
diff --git a/test/mp_fill.cpp b/test/mp_fill.cpp
index b2fdf81..e12f538 100644
--- a/test/mp_fill.cpp
+++ b/test/mp_fill.cpp
@@ -8,6 +8,7 @@
 
 
 #include <boost/core/lightweight_test_trait.hpp>
+#include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
 #include <type_traits>
 #include <tuple>
diff --git a/test/mp_repeat.cpp b/test/mp_repeat.cpp
index 3f08a50..a145fc8 100644
--- a/test/mp_repeat.cpp
+++ b/test/mp_repeat.cpp
@@ -7,9 +7,10 @@
 // http://www.boost.org/LICENSE_1_0.txt
 
 
-#include <boost/core/lightweight_test_trait.hpp>
+#include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
 #include <boost/mp11/integral.hpp>
+#include <boost/core/lightweight_test_trait.hpp>
 #include <type_traits>
 #include <tuple>
 #include <utility>