diff --git a/3rdParty/taocpp-json/include/tao/json/external/pegtl/internal/demangle.hpp b/3rdParty/taocpp-json/include/tao/json/external/pegtl/internal/demangle.hpp
index ae1205b57121..094c3ebd0cf9 100644
--- a/3rdParty/taocpp-json/include/tao/json/external/pegtl/internal/demangle.hpp
+++ b/3rdParty/taocpp-json/include/tao/json/external/pegtl/internal/demangle.hpp
@@ -4,7 +4,11 @@
 #ifndef TAO_JSON_PEGTL_INTERNAL_DEMANGLE_HPP
 #define TAO_JSON_PEGTL_INTERNAL_DEMANGLE_HPP
 
+#if __cplusplus >= 202002L
+#include <version>
+#else
 #include <ciso646>
+#endif
 #include <string_view>
 
 #include "../config.hpp"
diff --git a/lib/Basics/ResourceUsage.h b/lib/Basics/ResourceUsage.h
index 2b45c9f4abe8..d0714684092a 100644
--- a/lib/Basics/ResourceUsage.h
+++ b/lib/Basics/ResourceUsage.h
@@ -23,12 +23,13 @@
 
 #pragma once
 
-#include "Basics/NumberUtils.h"
-
 #include <atomic>
 #include <cstdint>
 #include <memory>
 
+#include "Basics/NumberUtils.h"
+#include "Basics/debugging.h"
+
 namespace arangodb {
 class GlobalResourceMonitor;
 
@@ -149,7 +150,7 @@ class ResourceUsageAllocatorBase : public Allocator {
   using size_type = typename std::allocator_traits<Allocator>::size_type;
   using value_type = typename std::allocator_traits<Allocator>::value_type;
 
-  ResourceUsageAllocatorBase() = delete;
+  ResourceUsageAllocatorBase() { /* We shouldn't be here */ TRI_ASSERT(false); }
 
   template<typename... Args>
   ResourceUsageAllocatorBase(ResourceMonitor& resourceMonitor, Args&&... args)