--- Gnu-Mach/include/mach_debug/mach_debug.defs	2020/09/02 04:43:04	1.1.1.2
+++ Gnu-Mach/include/mach_debug/mach_debug.defs	2020/09/02 04:50:18	1.1.1.5
@@ -27,12 +27,6 @@
  *	Matchmaker definitions file for Mach kernel debugging interface.
  */
 
-#ifdef	MACH_KERNEL
-#include <mach_ipc_debug.h>
-#include <mach_vm_debug.h>
-#include <mach_kdb.h>
-#endif
-
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
@@ -48,17 +42,7 @@ skip;	/* host_ipc_statistics_reset */
 skip;	/* host_callout_info */
 skip;	/* host_callout_statistics */
 skip;	/* host_callout_statistics_reset */
-
-/*
- *	Returns information about the memory allocation zones.
- */
-routine host_zone_info(
-		host		: host_t;
-	out	names		: zone_name_array_t,
-					CountInOut, Dealloc;
-	out	info		: zone_info_array_t,
-					CountInOut, Dealloc);
-
+skip;	/* host_zone_info */
 skip;	/* host_ipc_bucket_info */
 
 #if	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
@@ -73,14 +57,7 @@ routine	mach_port_get_srights(
 		name		: mach_port_name_t;
 	out	srights		: mach_port_rights_t);
 
-/*
- *	Returns information about the global reverse hash table.
- */
-
-routine host_ipc_hash_info(
-		host		: host_t;
-	out	info		: hash_info_bucket_array_t,
-					CountInOut, Dealloc);
+skip;	/* host_ipc_hash_info */
 
 /*
  *	Returns information about the marequest hash table.
@@ -92,17 +69,7 @@ routine host_ipc_marequest_info(
 	out	info		: hash_info_bucket_array_t,
 					CountInOut, Dealloc);
 
-/*
- *	Returns information about an IPC space.
- */
-
-routine mach_port_space_info(
-		task		: ipc_space_t;
-	out	info		: ipc_info_space_t;
-	out	table_info	: ipc_info_name_array_t,
-					CountInOut, Dealloc;
-	out	tree_info	: ipc_info_tree_name_array_t,
-					CountInOut, Dealloc);
+skip;	/* mach_port_space_info */
 
 /*
  *	Returns information about the dead-name requests
@@ -239,3 +206,11 @@ skip;	/* mach_vm_region_info */
 skip;	/* mach_vm_object_info */
 skip;	/* mach_vm_object_pages */
 #endif	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
+
+/*
+ *	Returns information about the memory allocation caches.
+ */
+routine host_slab_info(
+		host		: host_t;
+	out	info		: cache_info_array_t,
+					CountInOut, Dealloc);