--- xnu/xnu-12377.121.6/bsd/sys/kdebug_kernel.h
+++ xnu/xnu-8019.80.24/bsd/sys/kdebug_kernel.h
@@ -33,7 +33,6 @@
 #include <mach/clock_types.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stddef.h>
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
@@ -297,7 +296,7 @@
 	do {                                                               \
 	        if (KDBG_IMPROBABLE(kdebug_enable & ~KDEBUG_ENABLE_PPT)) {     \
 	                kernel_debug_flags((x), (uintptr_t)(a), (uintptr_t)(b),    \
-	                        (uintptr_t)(c), (uintptr_t)(d), KDBG_NON_PROCESS); \
+	                        (uintptr_t)(c), (uintptr_t)(d), KDBG_FLAG_NOPROCFILT); \
 	        }                                                              \
 	} while (0)
 #else /* (KDEBUG_LEVEL >= KDEBUG_LEVEL_IST) */
@@ -420,13 +419,11 @@
 void kernel_debug1(uint32_t debugid, uintptr_t arg1, uintptr_t arg2,
     uintptr_t arg3, uintptr_t arg4, uintptr_t arg5);
 
-__options_decl(kdebug_emit_flags_t, uint64_t, {
-	KDBG_FILTER_ONLY = 0x01,
-	KDBG_NON_PROCESS = 0x02,
-});
+#define KDBG_FLAG_FILTERED 0x01
+#define KDBG_FLAG_NOPROCFILT 0x02
 
 void kernel_debug_flags(uint32_t debugid, uintptr_t arg1, uintptr_t arg2,
-    uintptr_t arg3, uintptr_t arg4, kdebug_emit_flags_t flags);
+    uintptr_t arg3, uintptr_t arg4, uint64_t flags);
 
 void kernel_debug_filtered(uint32_t debugid, uintptr_t arg1, uintptr_t arg2,
     uintptr_t arg3, uintptr_t arg4);
@@ -434,8 +431,6 @@
 #pragma mark - xnu API
 
 #ifdef XNU_KERNEL_PRIVATE
-
-void kdebug_startup(void);
 
 /* Used in early boot to log events. */
 void kernel_debug_early(uint32_t  debugid, uintptr_t arg1, uintptr_t arg2,
@@ -471,31 +466,20 @@
 
 struct proc;
 void kdbg_trace_data(struct proc *proc, long *arg_pid, long *arg_uniqueid);
-
-__options_decl(kdebug_vfs_lookup_flags_t, uint32_t, {
-	KDBG_VFSLKUP_LOOKUP = 0x01,
-	KDBG_VFSLKUP_NOPROCFILT = 0x02,
-});
+void kdbg_trace_string(struct proc *proc, long *arg1, long *arg2, long *arg3,
+    long *arg4);
+
 #define KDBG_VFS_LOOKUP_FLAG_LOOKUP 0x01
 #define KDBG_VFS_LOOKUP_FLAG_NOPROCFILT 0x02
-void kdebug_vfs_lookup(const char *path_words, size_t path_len, void *vnp,
-    kdebug_vfs_lookup_flags_t flags);
-
-void ktriage_extract(uint64_t thread_id, void *buf, uint32_t bufsz);
+void kdebug_vfs_lookup(unsigned long *path_words, int path_len, void *vnp,
+    uint32_t flags);
+
+void kernel_triage_record(uint64_t thread_id, uint64_t debugid, uintptr_t arg1);
+void kernel_triage_extract(uint64_t thread_id, void *buf, uint32_t bufsz);
 
 #endif /* XNU_KERNEL_PRIVATE */
 
 #ifdef KERNEL_PRIVATE
-
-typedef struct ktriage_strings {
-	int num_strings;
-	const char **strings;
-} ktriage_strings_t;
-
-int ktriage_register_subsystem_strings(uint8_t subsystem, ktriage_strings_t *subsystem_strings);
-int ktriage_unregister_subsystem_strings(uint8_t subsystem);
-
-void ktriage_record(uint64_t thread_id, uint64_t debugid, uintptr_t arg);
 
 #define NUMPARMS 23
 void kdebug_lookup_gen_events(long *path_words, int path_len, void *vnp,