diff --git a/include/boost/json/detail/storage_adaptor.hpp b/include/boost/json/detail/storage_adaptor.hpp
index 008fec1c..28b6cc2d 100644
--- a/include/boost/json/detail/storage_adaptor.hpp
+++ b/include/boost/json/detail/storage_adaptor.hpp
@@ -11,24 +11,39 @@
 #define BOOST_JSON_DETAIL_STORAGE_ADAPTOR_HPP
 
 #include <boost/json/detail/config.hpp>
-#include <boost/beast/core/detail/allocator.hpp>
 #include <boost/json/storage.hpp>
 #include <boost/align/align_up.hpp>
-#include <boost/assert.hpp>
 #include <boost/core/empty_value.hpp>
+#include <boost/config.hpp>
+#include <boost/assert.hpp>
 #include <atomic>
 #include <cstddef>
 
+#ifdef BOOST_NO_CXX11_ALLOCATOR
+#include <boost/container/allocator_traits.hpp>
+#else
+#include <memory>
+#endif
+
 namespace boost {
 namespace beast {
 namespace json {
 namespace detail {
 
+#ifdef BOOST_NO_CXX11_ALLOCATOR
 template<class Allocator>
 using allocator_of_char =
-    typename beast::detail::allocator_traits<
+    typename boost::container::allocator_traits<
         Allocator>::template rebind_alloc<char>;
 
+#else
+template<class Allocator>
+using allocator_of_char =
+    typename std::allocator_traits<
+        Allocator>::template rebind_alloc<char>;
+
+#endif
+
 template<class Allocator>
 struct storage_adaptor
     : boost::empty_value<