diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 37d4eb9..13af820 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -49,6 +49,18 @@
 #include <vm/memory_object_proxy.h>
 #include <device/ds_routines.h>
 
+#include <kern/mach.server.h>
+#include <ipc/mach_port.server.h>
+#include <kern/mach_host.server.h>
+#include <device/device.server.h>
+#include <device/device_pager.server.h>
+#include <kern/mach4.server.h>
+#include <kern/gnumach.server.h>
+
+#if MACH_DEBUG
+#include <kern/mach_debug.server.h>
+#endif
+
 #if	MACH_MACHINE_ROUTINES
 #include <machine/machine_routines.h>
 #endif
@@ -146,17 +158,6 @@ ipc_kobject_server(request)
 	 * to perform the kernel function
 	 */
     {
-	extern mig_routine_t	mach_server_routine(),
-				mach_port_server_routine(),
-				mach_host_server_routine(),
-				device_server_routine(),
-				device_pager_server_routine(),
-				mach4_server_routine(),
-				gnumach_server_routine();
-#if	MACH_DEBUG
-	extern mig_routine_t	mach_debug_server_routine();
-#endif
-
 #if	MACH_MACHINE_ROUTINES
 	extern mig_routine_t	MACHINE_SERVER_ROUTINE();
 #endif
diff --git a/vm/memory_object_proxy.h b/vm/memory_object_proxy.h
index 3de6996..dc0ea74 100644
--- a/vm/memory_object_proxy.h
+++ b/vm/memory_object_proxy.h
@@ -30,17 +30,6 @@
 
 extern void memory_object_proxy_init (void);
 extern boolean_t memory_object_proxy_notify (mach_msg_header_t *msg);
-extern kern_return_t memory_object_create_proxy (const ipc_space_t space,
-                                                 vm_prot_t max_protection,
-                                                 ipc_port_t *object,
-                                                 natural_t object_count,
-                                                 const vm_offset_t *offset,
-                                                 natural_t offset_count,
-                                                 const vm_offset_t *start,
-                                                 natural_t start_count,
-                                                 const vm_offset_t *len,
-                                                 natural_t len_count,
-                                                 ipc_port_t *port);
 extern kern_return_t memory_object_proxy_lookup (ipc_port_t port,
                                                  ipc_port_t *object,
                                                  vm_prot_t *max_protection);