--- libmalloc/libmalloc-409.40.6/src/magazine_malloc.h
+++ libmalloc/libmalloc-166.220.1/src/magazine_malloc.h
@@ -34,8 +34,6 @@
 szone_t *
 create_scalable_szone(size_t initial_size, unsigned debug_flags);
 
-// Allegedly exported for performance/debugging tools
-
 MALLOC_EXPORT
 boolean_t
 scalable_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats, unsigned subzone);
@@ -44,38 +42,7 @@
 extern int max_magazines;
 
 MALLOC_NOEXPORT
-extern int max_medium_magazines;
-
-MALLOC_NOEXPORT
 extern int recirc_retained_regions;
-
-MALLOC_NOEXPORT
-extern bool magazine_medium_enabled;
-
-MALLOC_NOEXPORT
-extern uint64_t magazine_medium_active_threshold;
-
-#if CONFIG_MEDIUM_ALLOCATOR
-MALLOC_NOEXPORT
-extern uint64_t magazine_medium_madvise_dram_scale_divisor;
-
-MALLOC_NOEXPORT
-extern uint64_t magazine_medium_madvise_window_scale_factor;
-#endif // CONFIG_MEDIUM_ALLOCATOR
-
-
-MALLOC_NOEXPORT
-extern uint64_t magazine_large_expanded_cache_threshold;
-
-#if CONFIG_AGGRESSIVE_MADVISE
-MALLOC_NOEXPORT
-extern bool aggressive_madvise_enabled;
-#endif // CONFIG_AGGRESSIVE_MADVISE
-
-#if CONFIG_LARGE_CACHE
-MALLOC_NOEXPORT
-extern bool large_cache_enabled;
-#endif // CONFIG_LARGE_CACHE
 
 // MARK: magazine_malloc utility functions
 
@@ -160,12 +127,7 @@
 
 MALLOC_NOEXPORT
 boolean_t
-tiny_check(rack_t *rack, unsigned counter);
-
-MALLOC_NOEXPORT
-boolean_t
-tiny_free_no_lock(rack_t *rack, magazine_t *tiny_mag_ptr, mag_index_t mag_index,
-		region_t region, void *ptr, msize_t msize, uint32_t flags);
+tiny_free_no_lock(rack_t *rack, magazine_t *tiny_mag_ptr, mag_index_t mag_index, region_t region, void *ptr, msize_t msize);
 
 MALLOC_NOEXPORT
 size_t
@@ -206,8 +168,7 @@
 
 MALLOC_NOEXPORT
 void
-free_tiny(rack_t *rack, void *ptr, region_t tiny_region, size_t known_size,
-		boolean_t partial_free);
+free_tiny(rack_t *rack, void *ptr, region_t tiny_region, size_t known_size);
 
 MALLOC_NOEXPORT
 size_t
@@ -223,20 +184,11 @@
 
 MALLOC_NOEXPORT
 void
-print_tiny_free_list(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, rack_t *rack);
-
-MALLOC_NOEXPORT
-void
-print_tiny_region(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, int level, region_t region,
-		size_t bytes_at_start, size_t bytes_at_end);
-
-#if CONFIG_MADVISE_PRESSURE_RELIEF
-MALLOC_NOEXPORT
-void
-tiny_madvise_pressure_relief(rack_t *rack);
-#endif // CONFIG_MADVISE_PRESSURE_RELIEF
+print_tiny_free_list(rack_t *rack);
+
+MALLOC_NOEXPORT
+void
+print_tiny_region(boolean_t verbose, region_t region, size_t bytes_at_start, size_t bytes_at_end);
 
 // MARK: small region allocation functions
 
@@ -300,107 +252,17 @@
 
 MALLOC_NOEXPORT
 void
-print_small_free_list(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, rack_t *rack);
-
-MALLOC_NOEXPORT
-void
-print_small_region(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, szone_t *szone, int level,
-		region_t region, size_t bytes_at_start, size_t bytes_at_end);
-
-#if CONFIG_MADVISE_PRESSURE_RELIEF
-MALLOC_NOEXPORT
-void
-small_madvise_pressure_relief(rack_t *rack);
-#endif // CONFIG_MADVISE_PRESSURE_RELIEF
-
-// MARK: medium region allocation functions
-
-MALLOC_NOEXPORT
-boolean_t
-medium_check_region(rack_t *rack, region_t region, size_t region_index,
-		unsigned counter);
-
-MALLOC_NOEXPORT
-void
-medium_finalize_region(rack_t *rack, magazine_t *medium_mag_ptr);
-
-MALLOC_NOEXPORT
-int
-medium_free_detach_region(rack_t *rack, magazine_t *medium_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-boolean_t
-medium_free_list_check(rack_t *rack, grain_t slot, unsigned counter);
-
-MALLOC_NOEXPORT
-size_t
-medium_free_reattach_region(rack_t *rack, magazine_t *medium_mag_ptr, region_t r);
-
-MALLOC_NOEXPORT
-void
-medium_free_scan_madvise_free(rack_t *rack, magazine_t *depot_ptr, region_t r);
-
-MALLOC_NOEXPORT
-kern_return_t
-medium_in_use_enumerator(task_t task, void *context, unsigned type_mask, szone_t *szone, memory_reader_t reader,
-		vm_range_recorder_t recorder);
-
-MALLOC_NOEXPORT
-void *
-medium_malloc_should_clear(rack_t *rack, msize_t msize, boolean_t cleared_requested);
-
-MALLOC_NOEXPORT
-void *
-medium_memalign(szone_t *szone, size_t alignment, size_t size, size_t span);
-
-MALLOC_NOEXPORT
-boolean_t
-medium_claimed_address(rack_t *rack, void *ptr);
-
-MALLOC_NOEXPORT
-void *
-medium_try_shrink_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_good_size);
-
-MALLOC_NOEXPORT
-boolean_t
-medium_try_realloc_in_place(rack_t *rack, void *ptr, size_t old_size, size_t new_size);
-
-MALLOC_NOEXPORT
-void
-free_medium(rack_t *rack, void *ptr, region_t medium_region, size_t known_size);
-
-MALLOC_NOEXPORT
-size_t
-medium_size(rack_t *rack, const void *ptr);
-
-MALLOC_NOEXPORT
-void
-print_medium_free_list(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, rack_t *rack);
-
-MALLOC_NOEXPORT
-void
-print_medium_region(task_t task, memory_reader_t reader,
-		print_task_printer_t printer, szone_t *szone, int level,
-		region_t region, size_t bytes_at_start, size_t bytes_at_end);
-
-MALLOC_NOEXPORT
-void
-print_medium_region_vis(szone_t *szone, region_t region);
-
-#if CONFIG_MADVISE_PRESSURE_RELIEF
-MALLOC_NOEXPORT
-void
-medium_madvise_pressure_relief(rack_t *rack);
-#endif // CONFIG_MADVISE_PRESSURE_RELIEF
+print_small_free_list(rack_t *rack);
+
+MALLOC_NOEXPORT
+void
+print_small_region(szone_t *szone, boolean_t verbose, region_t region, size_t bytes_at_start, size_t bytes_at_end);
 
 // MARK: large region allocator functions
 
 MALLOC_NOEXPORT
-bool
-free_large(szone_t *szone, void *ptr, bool try);
+void
+free_large(szone_t *szone, void *ptr);
 
 MALLOC_NOEXPORT
 void
@@ -431,20 +293,25 @@
 boolean_t
 large_claimed_address(szone_t *szone, void *ptr);
 
-#if CONFIG_LARGE_CACHE
-MALLOC_NOEXPORT
-void
-large_destroy_cache(szone_t *szone);
-#endif // CONFIG_LARGE_CACHE
-
-
-MALLOC_NOEXPORT
-void
-large_debug_print(task_t task, unsigned level, vm_address_t zone_address,
-		memory_reader_t reader, print_task_printer_t printer);
-
 MALLOC_NOEXPORT
 void *
 szone_malloc_should_clear(szone_t *szone, size_t size, boolean_t cleared_requested);
 
+// MARK: stack logging lite functionality
+
+#define MALLOC_STOCK_LOGGING_LITE_ZONE_NAME "MallocStackLoggingLiteZone"
+
+// These enable/disable stack logging lite for malloc allocations, not VM-only lite mode
+MALLOC_NOEXPORT
+void
+enable_stack_logging_lite();
+
+MALLOC_NOEXPORT
+void
+disable_stack_logging_lite();
+
+MALLOC_NOEXPORT
+malloc_zone_t *
+create_stack_logging_lite_zone(size_t initial_size, malloc_zone_t *helper_zone, unsigned debug_flags);
+
 #endif // __MAGAZINE_MALLOC_H