[libc++] Granularize the rest of memory
Reviewed By: ldionne, #libc
Spies: vitalybuka, paulkirth, libcxx-commits, mgorny
Differential Revision: https://reviews.llvm.org/D132790
NOKEYCHECK=True
GitOrigin-RevId: d5e26775d089d099d02b168de8ea52179b1b1f75
diff --git a/src/cxa_guard_impl.h b/src/cxa_guard_impl.h
index 72940cc..f7e79bd 100644
--- a/src/cxa_guard_impl.h
+++ b/src/cxa_guard_impl.h
@@ -54,9 +54,11 @@
# endif
#endif
+#include <__threading_support>
+#include <cstring>
#include <limits.h>
#include <stdlib.h>
-#include <__threading_support>
+
#ifndef _LIBCXXABI_HAS_NO_THREADS
# if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
# pragma comment(lib, "pthread")
diff --git a/src/demangle/ItaniumDemangle.h b/src/demangle/ItaniumDemangle.h
index e3f0c6d..7da8231 100644
--- a/src/demangle/ItaniumDemangle.h
+++ b/src/demangle/ItaniumDemangle.h
@@ -26,6 +26,7 @@
#include <cstdlib>
#include <cstring>
#include <limits>
+#include <new>
#include <utility>
DEMANGLE_NAMESPACE_BEGIN
