[PATCH 2/2] kern: include the mig-generated server headers in ipc_kobject.c

[Justus Winter]

GNU MIG recently gained support for emitting x_server_routine
declarations in the generated server header file.  Using this
declaration, the x_server_routine functions can be inlined into the
ipc_kobject_server function.

* kern/ipc_kobject.c: Include the mig-generated server headers.
---
 kern/ipc_kobject.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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
-- 
1.8.5.2