diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp
index 8edb750..e3a5904 100644
--- a/include/boost/mp11/algorithm.hpp
+++ b/include/boost/mp11/algorithm.hpp
@@ -20,7 +20,7 @@
 #include <boost/mp11/detail/config.hpp>
 #include <boost/mp11/integer_sequence.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <type_traits>
 #include <utility>
 
diff --git a/include/boost/mp11/detail/config.hpp b/include/boost/mp11/detail/config.hpp
index 68413d7..489914d 100644
--- a/include/boost/mp11/detail/config.hpp
+++ b/include/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/include/boost/mp11/detail/mp_append.hpp b/include/boost/mp11/detail/mp_append.hpp
index 67ac03e..e58c8a7 100644
--- a/include/boost/mp11/detail/mp_append.hpp
+++ b/include/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/include/boost/mp11/detail/mp_plus.hpp b/include/boost/mp11/detail/mp_plus.hpp
index 1028fa5..f6d75ac 100644
--- a/include/boost/mp11/detail/mp_plus.hpp
+++ b/include/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/include/boost/mp11/list.hpp b/include/boost/mp11/list.hpp
index 8e9288f..a2bc36a 100644
--- a/include/boost/mp11/list.hpp
+++ b/include/boost/mp11/list.hpp
@@ -12,7 +12,7 @@
 #include <boost/mp11/detail/mp_list.hpp>
 #include <boost/mp11/detail/mp_append.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {
diff --git a/include/boost/mp11/tuple.hpp b/include/boost/mp11/tuple.hpp
index afcd119..38e9094 100644
--- a/include/boost/mp11/tuple.hpp
+++ b/include/boost/mp11/tuple.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/mp11/integer_sequence.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <tuple>
 #include <utility>
 #include <type_traits>
diff --git a/include/boost/mp11/utility.hpp b/include/boost/mp11/utility.hpp
index f82d613..4d961ef 100644
--- a/include/boost/mp11/utility.hpp
+++ b/include/boost/mp11/utility.hpp
@@ -10,7 +10,7 @@
 
 #include <boost/mp11/integral.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 namespace boost
 {
diff --git a/test/construct_from_tuple.cpp b/test/construct_from_tuple.cpp
index d56bd3c..5c15ccc 100644
--- a/test/construct_from_tuple.cpp
+++ b/test/construct_from_tuple.cpp
@@ -10,7 +10,7 @@
 #include <boost/mp11/tuple.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <tuple>
 #include <memory>
 #include <utility>
diff --git a/test/mp_fold.cpp b/test/mp_fold.cpp
index ee1e422..a8b1a7e 100644
--- a/test/mp_fold.cpp
+++ b/test/mp_fold.cpp
@@ -12,7 +12,7 @@
 #include <boost/mp11/integral.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <type_traits>
 #include <tuple>
 
diff --git a/test/mp_for_each.cpp b/test/mp_for_each.cpp
index 4f2cfe3..1b3e531 100644
--- a/test/mp_for_each.cpp
+++ b/test/mp_for_each.cpp
@@ -11,7 +11,7 @@
 #include <boost/mp11/list.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <tuple>
 
 #if !defined( BOOST_NO_CXX14_CONSTEXPR )
diff --git a/test/mp_reverse.cpp b/test/mp_reverse.cpp
index 74c5461..d1f2794 100644
--- a/test/mp_reverse.cpp
+++ b/test/mp_reverse.cpp
@@ -12,7 +12,7 @@
 #include <boost/mp11/integral.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <type_traits>
 #include <tuple>
 
diff --git a/test/mp_reverse_fold.cpp b/test/mp_reverse_fold.cpp
index 3bba659..8452b7b 100644
--- a/test/mp_reverse_fold.cpp
+++ b/test/mp_reverse_fold.cpp
@@ -12,7 +12,7 @@
 #include <boost/mp11/integral.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <type_traits>
 #include <tuple>
 
diff --git a/test/mp_with_index.cpp b/test/mp_with_index.cpp
index a54a5bc..567bc84 100644
--- a/test/mp_with_index.cpp
+++ b/test/mp_with_index.cpp
@@ -10,7 +10,7 @@
 #include <boost/mp11/algorithm.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 #include <tuple>
 
 using boost::mp11::mp_size_t;
diff --git a/test/mp_with_index_cx.cpp b/test/mp_with_index_cx.cpp
index 97fdcc4..94370f9 100644
--- a/test/mp_with_index_cx.cpp
+++ b/test/mp_with_index_cx.cpp
@@ -17,7 +17,7 @@ int main() {}
 #include <boost/mp11/algorithm.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
 
 using boost::mp11::mp_size_t;
 using boost::mp11::mp_with_index;