3 files changed, 2 insertions, 133 deletions
diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c
index 57c3133a..7dca4b6b 100644
--- a/ipc/mach_debug.c
+++ b/ipc/mach_debug.c
@@ -41,7 +41,7 @@
 #include <mach/vm_param.h>
 #include <mach_debug/hash_info.h>
 #include <kern/host.h>
-#include <kern/mach_debug.h>
+#include <kern/mach_debug.server.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <ipc/ipc_space.h>
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index 67713a50..b35d8bcf 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -60,6 +60,7 @@
 #include <ipc/ipc_pset.h>
 #include <ipc/ipc_right.h>
 #include <ipc/mach_port.h>
+#include <ipc/mach_port.server.h>
 
 
 /*
diff --git a/ipc/mach_port.h b/ipc/mach_port.h
index ec260b31..e91e4952 100644
--- a/ipc/mach_port.h
+++ b/ipc/mach_port.h
@@ -34,136 +34,4 @@
 void db_debug_port_references (boolean_t enable);
 #endif	/* MACH_KDB */
 
-/* RPCs */
-
-extern kern_return_t
-mach_port_allocate_name (
-    ipc_space_t space,
-    mach_port_right_t right,
-    mach_port_name_t name);
-
-extern kern_return_t
-mach_port_allocate (
-    ipc_space_t space,
-    mach_port_right_t right,
-    mach_port_name_t *namep);
-
-extern kern_return_t
-mach_port_destroy(
-    ipc_space_t space,
-    mach_port_name_t name);
-
-extern kern_return_t
-mach_port_deallocate(
-    ipc_space_t space,
-    mach_port_name_t name);
-
-extern kern_return_t
-mach_port_insert_right(
-    ipc_space_t     space,
-    mach_port_name_t     name,
-    ipc_port_t      poly,
-    mach_msg_type_name_t    polyPoly);
-
-kern_return_t
-mach_port_get_receive_status(
-	ipc_space_t 		space,
-	mach_port_name_t 	name,
-	mach_port_status_t 	*statusp);
-
-kern_return_t
-mach_port_names(
-	ipc_space_t		space,
-	mach_port_name_t	**namesp,
-	mach_msg_type_number_t	*namesCnt,
-	mach_port_type_t	**typesp,
-	mach_msg_type_number_t	*typesCnt);
-
-kern_return_t
-mach_port_type(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_port_type_t	*typep);
-
-kern_return_t
-mach_port_rename(
-	ipc_space_t		space,
-	mach_port_name_t	oname,
-	mach_port_name_t	nname);
-
-kern_return_t
-mach_port_get_refs(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_port_right_t	right,
-	mach_port_urefs_t	*urefsp);
-
-kern_return_t
-mach_port_mod_refs(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_port_right_t	right,
-	mach_port_delta_t	delta);
-
-kern_return_t
-mach_port_set_qlimit(
-	ipc_space_t 		space,
-	mach_port_name_t 	name,
-	mach_port_msgcount_t 	qlimit);
-
-kern_return_t
-mach_port_set_mscount(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_port_mscount_t	mscount);
-
-kern_return_t
-mach_port_set_seqno(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_port_seqno_t	seqno);
-
-kern_return_t
-mach_port_get_set_status(
-	ipc_space_t			space,
-	mach_port_name_t		name,
-	mach_port_name_t		**members,
-	mach_msg_type_number_t		*membersCnt);
-
-kern_return_t
-mach_port_move_member(
-	ipc_space_t	space,
-	mach_port_name_t	member,
-	mach_port_name_t	after);
-
-kern_return_t
-mach_port_request_notification(
-	ipc_space_t		space,
-	mach_port_name_t		name,
-	mach_msg_id_t		id,
-	mach_port_mscount_t	sync,
-	ipc_port_t		notify,
-	ipc_port_t		*previousp);
-
-kern_return_t
-mach_port_extract_right(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	mach_msg_type_name_t	msgt_name,
-	ipc_port_t		*poly,
-	mach_msg_type_name_t	*polyPoly);
-
-kern_return_t
-mach_port_set_protected_payload(
-	ipc_space_t		space,
-	mach_port_name_t	name,
-	rpc_uintptr_t		payload);
-
-kern_return_t
-mach_port_clear_protected_payload(
-	ipc_space_t		space,
-	mach_port_name_t	name);
-
-/* End of RPCs */
-
 #endif /* _IPC_MACH_PORT_H_ */