--- libmalloc/libmalloc-374.40.6/private/malloc_private.h
+++ libmalloc/libmalloc-140.50.6/private/malloc_private.h
@@ -26,15 +26,13 @@
 
 /* Here be dragons (SPIs) */
 
-#include <mach/boolean.h>
 #include <sys/cdefs.h>
 #include <Availability.h>
-#include <os/availability.h>
-#include <malloc/malloc.h>
 
 /*********	Callbacks	************/
 
-API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
+__OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0)
+__TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0)
 void malloc_enter_process_memory_limit_warn_mode(void);
 	/* A callback invoked once the process receives a warning for approaching
 	 * memory limit. */
@@ -45,83 +43,12 @@
 	/* A function invoked when malloc needs to handle any flavor of
 	 * memory pressure notification or process memory limit notification. */
 
-API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
+__OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0)
+__TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0)
 void * reallocarray(void * in_ptr, size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarray) __result_use_check;
 
-API_AVAILABLE(macos(10.12), ios(10.0), tvos(10.0), watchos(3.0))
+__OSX_AVAILABLE(10.12) __IOS_AVAILABLE(10.0)
+__TVOS_AVAILABLE(10.0) __WATCHOS_AVAILABLE(3.0)
 void * reallocarrayf(void * in_ptr, size_t nmemb, size_t size) __DARWIN_EXTSN(reallocarrayf) __result_use_check;
 
-/*
- * Checks whether an address might belong to any registered zone. False positives
- * are allowed (e.g. the memory was freed, or it's in a part of the address
- * space used by malloc that has not yet been allocated.) False negatives are
- * not allowed.
- */
-API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-boolean_t malloc_claimed_address(void *ptr) __result_use_check;
-
-/*
- * Checks whether an address might belong to a given zone. False positives are
- * allowed (e.g. the memory was freed, or it's in a part of the address space
- * used by malloc that has not yet been allocated.) False negatives are not
- * allowed.
- */
-API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-boolean_t malloc_zone_claimed_address(malloc_zone_t *zone, void *ptr) __result_use_check;
-
-/**
- * Returns whether the nano allocator is engaged. The return value is 0 if Nano
- * is not engaged and the allocator version otherwise.
- */
-API_AVAILABLE(macos(10.14), ios(12.0), tvos(12.0), watchos(5.0))
-int malloc_engaged_nano(void) __result_use_check;
-
-/****** Crash Reporter integration ******/
-
-typedef struct {
-	uint64_t thread_id;
-	uint64_t time;
-	uint32_t num_frames;
-	vm_address_t frames[64];
-} stack_trace_t;
-
-/**
- * Like memory_reader_t, but caller must free returned memory if not NULL.
- */
-typedef void *(*crash_reporter_memory_reader_t)(task_t task, vm_address_t address, size_t size);
-
-/****** Probabilistic Guard Malloc ******/
-
-typedef struct {
-	// diagnose_page_fault
-	const char *error_type;
-	const char *confidence;
-	vm_address_t fault_address;
-	// fill_in_report
-	vm_address_t nearest_allocation;
-	size_t allocation_size;
-	const char *allocation_state;
-	uint32_t num_traces;
-	// fill_in_trace
-	stack_trace_t alloc_trace;
-	stack_trace_t dealloc_trace;
-} pgm_report_t;
-
-kern_return_t pgm_diagnose_fault_from_crash_reporter(vm_address_t fault_address, pgm_report_t *report,
-		task_t task, vm_address_t zone_address, crash_reporter_memory_reader_t crm_reader) __result_use_check;
-
-/****** Quarantine Zone ******/
-
-typedef struct {
-	vm_address_t fault_address;
-	vm_address_t nearest_allocation;
-	size_t allocation_size;
-	stack_trace_t alloc_trace;
-	stack_trace_t dealloc_trace;
-} quarantine_report_t;
-
-kern_return_t quarantine_diagnose_fault_from_crash_reporter(vm_address_t fault_address, quarantine_report_t *report,
-		task_t task, vm_address_t zone_address, crash_reporter_memory_reader_t crm_reader) __result_use_check;
-
-
 #endif /* _MALLOC_PRIVATE_H_ */