diff --git a/include/xtensor/xutils.hpp b/include/xtensor/xutils.hpp
index 21c452489..46929cb84 100644
--- a/include/xtensor/xutils.hpp
+++ b/include/xtensor/xutils.hpp
@@ -807,12 +807,12 @@ namespace xt
     {
         using base_type = A;
         using value_type = typename A::value_type;
-        using reference = typename A::reference;
-        using const_reference = typename A::const_reference;
-        using pointer = typename A::pointer;
-        using const_pointer = typename A::const_pointer;
-        using size_type = typename A::size_type;
-        using difference_type = typename A::difference_type;
+        using reference = value_type&;
+        using const_reference = const value_type&;
+        using pointer = typename std::allocator_traits<A>::pointer;
+        using const_pointer = typename std::allocator_traits<A>::const_pointer;
+        using size_type = typename std::allocator_traits<A>::size_type;
+        using difference_type = typename std::allocator_traits<A>::difference_type;
 
         tracking_allocator() = default;
 
@@ -835,9 +835,13 @@ namespace xt
             return base_type::allocate(n);
         }
 
-        using base_type::construct;
         using base_type::deallocate;
+
+// Construct and destroy are removed in --std=c++-20
+#if ((defined(__cplusplus) && __cplusplus < 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG < 202002L))
+        using base_type::construct;
         using base_type::destroy;
+#endif
 
         template <class U>
         struct rebind
diff --git a/test/test_xbuffer_adaptor.cpp b/test/test_xbuffer_adaptor.cpp
index f58e54620..7af7ad2cd 100644
--- a/test/test_xbuffer_adaptor.cpp
+++ b/test/test_xbuffer_adaptor.cpp
@@ -76,9 +76,9 @@ namespace xt
     {
     public:
 
-        size_t* allocate(size_t n, const void* hint = 0)
+        size_t* allocate(size_t n)
         {
-            size_t* res = std::allocator<size_t>::allocate(n, hint);
+            size_t* res = std::allocator<size_t>::allocate(n);
             // store the size into the result so we can
             // check if the size is correct when we deallocate.
             res[0] = n;