Clean a bit the includes up

This marginally increases the portability of hardened_malloc,
eg. on OSX.

h_malloc.c

@@ -6,9 +6,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <threads.h>
 
+#if CONFIG_STATS
 #include <malloc.h>
+#endif
 #include <pthread.h>
 #include <unistd.h>
 
@@ -62,7 +63,7 @@ static_assert(N_ARENA <= 256, "maximum number of arenas is currently 256");
 
 #if N_ARENA > 1
 __attribute__((tls_model("initial-exec")))
-static thread_local unsigned thread_arena = N_ARENA;
+static _Thread_local unsigned thread_arena = N_ARENA;
 static atomic_uint thread_arena_counter = 0;
 #else
 static const unsigned thread_arena = 0;

memory.c

@@ -1,7 +1,10 @@
 #include <errno.h>
 
 #include <sys/mman.h>
+
+#ifdef LABEL_MEMORY
 #include <sys/prctl.h>
+#endif
 
 #ifndef PR_SET_VMA
 #define PR_SET_VMA 0x53564d41

test/impossibly_large_malloc.c

@@ -1,5 +1,4 @@
-#include <malloc.h>
-#include <stddef.h>
+#include <stdlib.h>
 
 #include "test_util.h"
 

test/invalid_malloc_object_size_small.c

@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "test_util.h"
 

test/invalid_malloc_object_size_small_quarantine.c

@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "test_util.h"
 

test/mallinfo.c

@@ -1,6 +1,9 @@
+#include <stdlib.h>
 #include <stdio.h>
 
+#if defined(__GLIBC__) || defined(__ANDROID__)
 #include <malloc.h>
+#endif
 
 #include "test_util.h"
 

test/mallinfo2.c

@@ -1,6 +1,9 @@
 #include <stdio.h>
+#include <stdlib.h>
 
+#if defined(__GLIBC__)
 #include <malloc.h>
+#endif
 
 #include "test_util.h"
 

test/malloc_info.c

@@ -1,7 +1,9 @@
 #include <pthread.h>
 #include <stdio.h>
 
+#if defined(__GLIBC__) || defined(__ANDROID__)
 #include <malloc.h>
+#endif
 
 #include "test_util.h"
 #include "../util.h"

test/malloc_object_size.c

@@ -1,5 +1,5 @@
 #include <stdbool.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "test_util.h"
 

test/malloc_object_size_offset.c

@@ -1,5 +1,5 @@
 #include <stdbool.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #include "test_util.h"
 

test/write_after_free_large.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <string.h>
 
 #include "test_util.h"
 

test/write_after_free_small.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <string.h>
 
 #include "test_util.h"
 

test/write_after_free_small_reuse.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <string.h>
 
 #include "test_util.h"
 #include "../util.h"

test/write_zero_size.c

@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "test_util.h"