--- libmalloc/libmalloc-792.41.1/src/base.h
+++ libmalloc/libmalloc-521.120.7/src/base.h
@@ -46,12 +46,6 @@
 		__builtin_trap(); \
 	} \
 })
-
-#ifdef DEBUG
-#define MALLOC_DEBUG_ASSERT(e) MALLOC_ASSERT(e)
-#else
-#define MALLOC_DEBUG_ASSERT(e)
-#endif
 
 #define MALLOC_FATAL_ERROR(cause, message) ({ \
 		_os_set_crash_log_cause_and_message((cause), "FATAL ERROR - " message); \
@@ -104,14 +98,7 @@
 #define MALLOC_COLD __attribute__((cold))
 #define MALLOC_NOESCAPE __attribute__((noescape))
 #define MALLOC_PRESERVE_MOST __attribute__((preserve_most))
-#define MALLOC_FALLTHROUGH __attribute__((fallthrough))
 #define CHECK_MAGAZINE_PTR_LOCKED(szone, mag_ptr, fun) {}
-
-#if __has_feature(bounds_safety)
-#define __malloc_bidi_indexable __bidi_indexable
-#else
-#define __malloc_bidi_indexable
-#endif
 
 #define SCRIBBLE_BYTE 0xaa /* allocated scribble */
 #define SCRABBLE_BYTE 0x55 /* free()'d scribble */
@@ -200,20 +187,8 @@
 #define MALLOC_PURGEABLE (1 << 7)
 // call abort() on malloc errors, but not on out of memory.
 #define MALLOC_ABORT_ON_CORRUPTION (1 << 8)
-// don't populate the mapping for this allocation
+// don't populate the mapping for the allocation
 #define MALLOC_NO_POPULATE (1 << 9)
-// enable faulting anywhere within this allocation
-#define MALLOC_CAN_FAULT (1 << 12)
-// guarded metadata allocation
-#define MALLOC_GUARDED_METADATA (1 << 13)
-
-// See malloc_implementation.h
-// MALLOC_MSL_LITE_WRAPPED_ZONE_FLAGS == (1 << 10)
-
-#if CONFIG_MTE
-// allocate objects such that they can be MTE-tagged
-#define MALLOC_MTE_TAGGABLE (1 << 11)
-#endif
 
 /*
  * These commpage routines provide fast access to the logical cpu number
@@ -223,9 +198,9 @@
 extern unsigned int hyper_shift;
 extern unsigned int logical_ncpus;
 extern unsigned int phys_ncpus;
-#if CONFIG_CLUSTER_AWARE
+#if CONFIG_MAGAZINE_PER_CLUSTER
 extern unsigned int ncpuclusters;
-#endif // CONFIG_CLUSTER_AWARE
+#endif // CONFIG_MAGAZINE_PER_CLUSTER
 
 /*
  * msize - a type to refer to the number of quanta of a tiny or small