--- libmalloc/libmalloc-715.100.22/src/internal.h
+++ libmalloc/libmalloc-646.40.3/src/internal.h
@@ -93,7 +93,6 @@
 	uint64_t opaque[2];
 } plat_map_exclaves_t;
 #if !MALLOC_TARGET_EXCLAVES
-# include <mach/error.h>
 # include <mach/mach.h>
 # include <mach/mach_init.h>
 # include <mach/mach_time.h>
@@ -105,7 +104,6 @@
 # include <mach/vm_page_size.h>
 # include <mach/vm_param.h>
 # include <mach/vm_reclaim.h>
-# include <mach/vm_reclaim_private.h>
 # include <mach/vm_statistics.h>
 # include <machine/cpu_capabilities.h>
 
@@ -126,7 +124,6 @@
 # define vm_page_size PAGE_SIZE
 # define PAGE_MASK (PAGE_SIZE-1)
 
-typedef uint64_t mach_vm_reclaim_id_t;
 # define mach_vm_round_page(x) (((mach_vm_offset_t)(x) + PAGE_MASK) & ~((signed)PAGE_MASK))
 # define round_page(x) (((vm_offset_t)(x) + PAGE_MASK) & ~((vm_offset_t)PAGE_MASK))
 
@@ -173,7 +170,6 @@
 # include <pthread/private.h>  // _pthread_threadid_self_np_direct()
 # include <pthread/tsd_private.h>  // TSD keys
 #else
-# include <platform/platform.h>
 # include <pthread.h>
 #endif // !MALLOC_TARGET_EXCLAVES
 
@@ -241,7 +237,7 @@
 # define __TSD_MALLOC_ZERO_CORRUPTION_COUNTER   __PTK_LIBMALLOC_KEY1
 # define __TSD_MALLOC_THREAD_OPTIONS            __PTK_LIBMALLOC_KEY2
 # define __TSD_MALLOC_TYPE_DESCRIPTOR           __PTK_LIBMALLOC_KEY3
-# define __TSD_MALLOC_XZONE_THREAD_CACHE        __PTK_LIBMALLOC_KEY4
+# define __TSD_MALLOC_UNUSED4                   __PTK_LIBMALLOC_KEY4
 #else
 # include "liblibc_overrides.h"
 # define __TSD_MALLOC_TYPE_DESCRIPTOR           __LIBLIBC_XZONE_TSS_KEY
@@ -262,8 +258,8 @@
 #endif // !MALLOC_TARGET_EXCLAVES
 #include "malloc/malloc.h"
 #include "early_malloc.h"
-#include "instrumentation.h"
-#if !MALLOC_TARGET_EXCLAVES
+#if !MALLOC_TARGET_EXCLAVES
+# include "instrumentation.h"
 # include "frozen_malloc.h"
 # include "legacy_malloc.h"
 # include "magazine_malloc.h"
@@ -309,11 +305,11 @@
  *  - freed pages are not aggressively madvised by default
  *  - the large cache is enabled (and not enrolled in deferred reclamation)
  */
-#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM)
+#if CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM)
 #define MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF ( \
 		NOTE_MEMORYSTATUS_PRESSURE_WARN | \
 		NOTE_MEMORYSTATUS_PRESSURE_NORMAL)
-#else /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_MAGAZINE_DEFERRED_RECLAIM) */
+#else /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM) */
 #define MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF 0
 #endif
 
@@ -480,23 +476,7 @@
 #endif // TARGET_OS_SIMULATOR
 }
 
-#if !MALLOC_TARGET_EXCLAVES
-typedef union {
-	malloc_thread_options_t options;
-	void *storage;
-} th_opts_t;
-
-MALLOC_STATIC_ASSERT(sizeof(th_opts_t) == sizeof(void *), "Options fit into pointer bits");
-
-static inline void
-_malloc_set_thread_options(malloc_thread_options_t opts)
-{
-	th_opts_t x = {.options = opts};
-	_pthread_setspecific_direct(__TSD_MALLOC_THREAD_OPTIONS, x.storage);
-}
-#endif // MALLOC_TARGET_EXCLAVES
-
-#if CONFIG_CLUSTER_AWARE
+#if CONFIG_MAGAZINE_PER_CLUSTER
 
 static inline unsigned int
 _malloc_cpu_cluster_number(void)
@@ -518,7 +498,7 @@
 #endif
 }
 
-#endif // CONFIG_CLUSTER_AWARE
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
 
 // Gets the allocation size for a calloc(). Multiples size by num_items and adds
 // extra_size, storing the result in *total_size. Returns 0 on success, -1 (with
@@ -590,11 +570,14 @@
 #if TARGET_OS_SIMULATOR
 #define malloc_secure_feature_enabled(name, fallback, simulator_default) \
 	(simulator_default)
-#else
+#elif CONFIG_CHECK_SECURITY_POLICY
 // TODO: Do we want the secure fallback to be the same as the no-ff fallback?
 #define malloc_secure_feature_enabled(name, fallback, simulator_default) \
 	(malloc_internal_security_policy ? \
 			os_feature_enabled_simple(libmalloc, name, fallback) : (fallback))
+#else
+#define malloc_secure_feature_enabled(name, fallback, simulator_default) \
+	os_feature_enabled_simple(libmalloc, name, fallback)
 #endif // TARGET_OS_SIMULATOR
 #endif // CONFIG_FEATUREFLAGS_SIMPLE