5 files changed, 36 insertions, 4 deletions
diff --git a/boost/mp11/detail/config.hpp b/boost/mp11/detail/config.hpp
index 68413d77cc..489914d661 100644
--- a/boost/mp11/detail/config.hpp
+++ b/boost/mp11/detail/config.hpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 #if defined( BOOST_NO_CXX11_CONSTEXPR )
 
diff --git a/boost/mp11/detail/mp_append.hpp b/boost/mp11/detail/mp_append.hpp
index 67ac03e042..e58c8a70c5 100644
--- a/boost/mp11/detail/mp_append.hpp
+++ b/boost/mp11/detail/mp_append.hpp
@@ -11,7 +11,7 @@
 #include <boost/mp11/detail/mp_list.hpp>
 #include <boost/mp11/utility.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {
diff --git a/boost/mp11/detail/mp_fold.hpp b/boost/mp11/detail/mp_fold.hpp
index ae6f97471d..9afe01337b 100644
--- a/boost/mp11/detail/mp_fold.hpp
+++ b/boost/mp11/detail/mp_fold.hpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {
diff --git a/boost/mp11/detail/mp_plus.hpp b/boost/mp11/detail/mp_plus.hpp
index 1028fa5ec5..f6d75acdf3 100644
--- a/boost/mp11/detail/mp_plus.hpp
+++ b/boost/mp11/detail/mp_plus.hpp
@@ -9,7 +9,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/mp11/detail/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <type_traits>
 
 namespace boost
diff --git a/boost/mp11/detail/mp_void.hpp b/boost/mp11/detail/mp_void.hpp
new file mode 100644
index 0000000000..a7ac7b7162
--- /dev/null
+++ b/boost/mp11/detail/mp_void.hpp
@@ -0,0 +1,32 @@
+#ifndef BOOST_MP11_DETAIL_MP_VOID_HPP_INCLUDED
+#define BOOST_MP11_DETAIL_MP_VOID_HPP_INCLUDED
+
+//  Copyright 2015-2017 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
+
+namespace boost
+{
+namespace mp11
+{
+
+// mp_void<T...>
+namespace detail
+{
+
+template<class... T> struct mp_void_impl
+{
+    using type = void;
+};
+
+} // namespace detail
+
+template<class... T> using mp_void = typename detail::mp_void_impl<T...>::type;
+
+} // namespace mp11
+} // namespace boost
+
+#endif // #ifndef BOOST_MP11_DETAIL_MP_VOID_HPP_INCLUDED