diff --git a/include/boost/histogram/adaptive_storage.hpp b/include/boost/histogram/adaptive_storage.hpp
index bcf6af79..85748ce4 100644
--- a/include/boost/histogram/adaptive_storage.hpp
+++ b/include/boost/histogram/adaptive_storage.hpp
@@ -18,7 +18,8 @@
 #include <boost/histogram/fwd.hpp>
 #include <boost/histogram/weight.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
 #if defined BOOST_CLANG
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
diff --git a/include/boost/histogram/algorithm/project.hpp b/include/boost/histogram/algorithm/project.hpp
index aeb0e463..fd987f7b 100644
--- a/include/boost/histogram/algorithm/project.hpp
+++ b/include/boost/histogram/algorithm/project.hpp
@@ -12,7 +12,9 @@
 #include <boost/histogram/histogram.hpp>
 #include <boost/histogram/indexed.hpp>
 #include <boost/histogram/unsafe_access.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/set.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <type_traits>
diff --git a/include/boost/histogram/axis/regular.hpp b/include/boost/histogram/axis/regular.hpp
index d3514be3..5baf45eb 100644
--- a/include/boost/histogram/axis/regular.hpp
+++ b/include/boost/histogram/axis/regular.hpp
@@ -13,7 +13,6 @@
 #include <boost/histogram/axis/iterator.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
 #include <boost/throw_exception.hpp>
 #include <cmath>
 #include <limits>
diff --git a/include/boost/histogram/axis/variant.hpp b/include/boost/histogram/axis/variant.hpp
index 3ca4e5b6..36d53c4d 100644
--- a/include/boost/histogram/axis/variant.hpp
+++ b/include/boost/histogram/axis/variant.hpp
@@ -14,7 +14,9 @@
 #include <boost/histogram/detail/cat.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/bind.hpp>
+#include <boost/mp11/function.hpp>
+#include <boost/mp11/list.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/get.hpp>
diff --git a/include/boost/histogram/detail/axes.hpp b/include/boost/histogram/detail/axes.hpp
index 3d701c70..f1cb20b3 100644
--- a/include/boost/histogram/detail/axes.hpp
+++ b/include/boost/histogram/detail/axes.hpp
@@ -12,7 +12,9 @@
 #include <boost/histogram/axis/variant.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/tuple.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <tuple>
@@ -73,7 +75,7 @@ bool axes_equal(const std::tuple<Ts...>& ts, const std::tuple<Us...>& us) {
             [&](auto I) { equal &= relaxed_equal(std::get<I>(ts), std::get<I>(us)); });
         return equal;
       },
-      [](const std::tuple<Ts...>&, const std::tuple<Us...>&) { return false; }, ts, us);
+      [](const auto&, const auto&) { return false; }, ts, us);
 }
 
 template <class... Ts, class U>
diff --git a/include/boost/histogram/detail/common_type.hpp b/include/boost/histogram/detail/common_type.hpp
index 93ce33a1..a6600faf 100644
--- a/include/boost/histogram/detail/common_type.hpp
+++ b/include/boost/histogram/detail/common_type.hpp
@@ -9,7 +9,8 @@
 
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/utility.hpp>
 #include <tuple>
 #include <type_traits>
 
@@ -24,7 +25,7 @@ using common_axes = mp11::mp_cond<
   is_tuple<U>, U,
   is_sequence_of_axis<T>, T,
   is_sequence_of_axis<U>, U,
-  mp11::mp_true, T
+  std::true_type, T
 >;
 // clang-format on
 
diff --git a/include/boost/histogram/detail/linearize.hpp b/include/boost/histogram/detail/linearize.hpp
index 9ef1d4e1..d4efcd5f 100644
--- a/include/boost/histogram/detail/linearize.hpp
+++ b/include/boost/histogram/detail/linearize.hpp
@@ -15,7 +15,11 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
 #include <boost/histogram/unsafe_access.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/function.hpp>
+#include <boost/mp11/integral.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/tuple.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <tuple>
diff --git a/include/boost/histogram/detail/meta.hpp b/include/boost/histogram/detail/meta.hpp
index e1d4cec1..4fc157b8 100644
--- a/include/boost/histogram/detail/meta.hpp
+++ b/include/boost/histogram/detail/meta.hpp
@@ -31,7 +31,11 @@
 #endif
 #include <boost/container/static_vector.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/function.hpp>
+#include <boost/mp11/integer_sequence.hpp>
+#include <boost/mp11/list.hpp>
+#include <boost/mp11/utility.hpp>
 #include <functional>
 #include <iterator>
 #include <limits>
@@ -59,9 +63,6 @@ using copy_qualifiers = mp11::mp_if<
                             const T2&, T2&>,
                 mp11::mp_if<std::is_const<T1>, const T2, T2>>>;
 
-template <class S, class L>
-using mp_set_union = mp11::mp_apply_q<mp11::mp_bind_front<mp11::mp_set_push_back, S>, L>;
-
 template <class L>
 using mp_last = mp11::mp_at_c<L, (mp11::mp_size<L>::value - 1)>;
 
diff --git a/include/boost/histogram/histogram.hpp b/include/boost/histogram/histogram.hpp
index 6e75c163..04e5b0fe 100644
--- a/include/boost/histogram/histogram.hpp
+++ b/include/boost/histogram/histogram.hpp
@@ -12,7 +12,7 @@
 #include <boost/histogram/detail/linearize.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/list.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <tuple>
diff --git a/include/boost/histogram/indexed.hpp b/include/boost/histogram/indexed.hpp
index 259fb840..8832a1d3 100644
--- a/include/boost/histogram/indexed.hpp
+++ b/include/boost/histogram/indexed.hpp
@@ -13,7 +13,6 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mp11.hpp>
 #include <type_traits>
 #include <utility>
 
@@ -23,9 +22,9 @@ namespace histogram {
 /// Range over histogram bins with multi-dimensional index.
 template <class Histogram>
 class BOOST_HISTOGRAM_NODISCARD indexed_range {
-  using histogram_iterator =
-      mp11::mp_if<std::is_const<Histogram>, typename Histogram::const_iterator,
-                  typename Histogram::iterator>;
+  using histogram_iterator = std::conditional_t<std::is_const<Histogram>::value,
+                                                typename Histogram::const_iterator,
+                                                typename Histogram::iterator>;
   struct cache_item {
     int idx, begin, end, extend;
   };
diff --git a/include/boost/histogram/make_histogram.hpp b/include/boost/histogram/make_histogram.hpp
index 2a17e12f..899ec5ad 100644
--- a/include/boost/histogram/make_histogram.hpp
+++ b/include/boost/histogram/make_histogram.hpp
@@ -13,7 +13,7 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/histogram.hpp>
 #include <boost/histogram/storage_adaptor.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/utility.hpp>
 #include <tuple>
 
 namespace boost {
diff --git a/include/boost/histogram/storage_adaptor.hpp b/include/boost/histogram/storage_adaptor.hpp
index be6e117f..0af2bd1f 100644
--- a/include/boost/histogram/storage_adaptor.hpp
+++ b/include/boost/histogram/storage_adaptor.hpp
@@ -14,6 +14,7 @@
 #include <boost/histogram/fwd.hpp>
 #include <boost/histogram/weight.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/mp11/utility.hpp>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 #include <type_traits>
diff --git a/test/indexed_test.cpp b/test/indexed_test.cpp
index 0d2c0c3c..e4476111 100644
--- a/test/indexed_test.cpp
+++ b/test/indexed_test.cpp
@@ -10,7 +10,8 @@
 #include <boost/histogram/histogram.hpp>
 #include <boost/histogram/indexed.hpp>
 #include <boost/histogram/literals.hpp>
-#include <boost/mp11.hpp>
+#include <boost/mp11/algorithm.hpp>
+#include <boost/mp11/list.hpp>
 #include <iterator>
 #include <vector>
 #include "utility_histogram.hpp"
diff --git a/test/meta_test.cpp b/test/meta_test.cpp
index 0f8912f7..bd225d87 100644
--- a/test/meta_test.cpp
+++ b/test/meta_test.cpp
@@ -15,7 +15,6 @@
 #include <boost/histogram/literals.hpp>
 #include <boost/histogram/sample.hpp>
 #include <boost/histogram/weight.hpp>
-#include <boost/mp11.hpp>
 #include <deque>
 #include <iterator>
 #include <map>
@@ -30,7 +29,6 @@
 namespace bh = boost::histogram;
 using namespace bh::detail;
 using namespace bh::literals;
-namespace mp11 = boost::mp11;
 
 struct VisitorTestFunctor {
   template <typename T>
@@ -285,18 +283,9 @@ int main() {
     BOOST_TEST_TRAIT_TRUE((std::is_same<copy_qualifiers<int&&, long>, long&&>));
   }
 
-  // mp_set_union
-  {
-    using L1 = mp11::mp_list<int, char, long>;
-    using L2 = mp11::mp_list<char, int, char, char*>;
-    using result = mp_set_union<L1, L2>;
-    using expected = mp11::mp_list<int, char, long, char*>;
-    BOOST_TEST_TRAIT_TRUE((std::is_same<result, expected>));
-  }
-
   // mp_last
   {
-    using L = mp11::mp_list<int, char, long>;
+    using L = std::tuple<int, char, long>;
     BOOST_TEST_TRAIT_TRUE((std::is_same<mp_last<L>, long>));
   }
 
diff --git a/test/speed_cpp.cpp b/test/speed_cpp.cpp
index edf43282..db4385b5 100644
--- a/test/speed_cpp.cpp
+++ b/test/speed_cpp.cpp
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <boost/histogram.hpp>
-#include <boost/mp11.hpp>
 #include <cstdio>
 #include <ctime>
 #include <limits>
@@ -15,7 +14,6 @@
 #include "utility_histogram.hpp"
 
 using namespace boost::histogram;
-using boost::mp11::mp_list;
 
 std::unique_ptr<double[]> random_array(unsigned n, int type) {
   std::unique_ptr<double[]> r(new double[n]);
diff --git a/test/utility_meta.hpp b/test/utility_meta.hpp
index fd5157cd..e6cc53b1 100644
--- a/test/utility_meta.hpp
+++ b/test/utility_meta.hpp
@@ -10,6 +10,7 @@
 #include <array>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/mp11/tuple.hpp>
+#include <boost/mp11/utility.hpp>
 #include <ostream>
 #include <vector>