--- libmalloc/libmalloc-657.80.3/src/trace.h
+++ libmalloc/libmalloc-166.251.2/src/trace.h
@@ -30,11 +30,8 @@
 
 #ifndef _MALLOC_BUILDING_CODES_
 #include <sys/kdebug.h>
-__attribute__((cold))
-extern int
-kdebug_trace(uint32_t, uint64_t, uint64_t, uint64_t, uint64_t);
 #define MALLOC_TRACE(code,arg1,arg2,arg3,arg4) \
-	{ if (malloc_traced()) { kdebug_trace(code, arg1, arg2, arg3, arg4); } }
+	{ if (malloc_tracing_enabled) { kdebug_trace(code, arg1, arg2, arg3, arg4); } }
 #define TRACE_CODE(name, subclass, code) \
 	static const int TRACE_##name = KDBG_EVENTID(DBG_UMALLOC, subclass, code)
 #else
@@ -53,7 +50,6 @@
 TRACE_CODE(memalign, DBG_UMALLOC_EXTERNAL, 0x04);
 TRACE_CODE(calloc, DBG_UMALLOC_EXTERNAL, 0x05);
 TRACE_CODE(valloc, DBG_UMALLOC_EXTERNAL, 0x06);
-TRACE_CODE(malloc_options, DBG_UMALLOC_EXTERNAL, 0x07);
 
 // "internal" trace points
 TRACE_CODE(nano_malloc, DBG_UMALLOC_INTERNAL, 0x1);
@@ -71,18 +67,5 @@
 TRACE_CODE(medium_free, DBG_UMALLOC_INTERNAL, 0xd);
 
 TRACE_CODE(nanov2_region_allocation, DBG_UMALLOC_INTERNAL, 0x10);
-TRACE_CODE(nanov2_region_reservation, DBG_UMALLOC_INTERNAL, 0x20);
-TRACE_CODE(nanov2_region_protection, DBG_UMALLOC_INTERNAL, 0x30);
-
-TRACE_CODE(xzone_malloc_install_skip, DBG_UMALLOC_INTERNAL, 0x100);
-TRACE_CODE(xzone_malloc_full_skip, DBG_UMALLOC_INTERNAL, 0x200);
-TRACE_CODE(xzone_malloc_success, DBG_UMALLOC_INTERNAL, 0x300);
-TRACE_CODE(xzone_malloc_from_empty, DBG_UMALLOC_INTERNAL, 0x400);
-TRACE_CODE(xzone_malloc_from_fresh, DBG_UMALLOC_INTERNAL, 0x500);
-TRACE_CODE(xzone_free, DBG_UMALLOC_INTERNAL, 0x600);
-TRACE_CODE(xzone_free_madvise, DBG_UMALLOC_INTERNAL, 0x700);
-TRACE_CODE(xzone_slot_upgrade, DBG_UMALLOC_INTERNAL, 0x800);
-TRACE_CODE(xzone_walk_lock, DBG_UMALLOC_INTERNAL, 0x900);
-TRACE_CODE(xzone_walk_unlock, DBG_UMALLOC_INTERNAL, 0xa00);
 
 #endif // __TRACE_H