2 files changed, 11 insertions, 1 deletions
diff --git a/header.c b/header.c
index 1bc570f..23e5686 100644
--- a/header.c
+++ b/header.c
@@ -154,6 +154,8 @@ WriteServerHeader(FILE *file, const statement_t *stats)
     const char *protect = strconcat(SubsystemName, "_server_");
 
     WriteProlog(file, protect);
+    fprintf(file, "#include <mach/mig_errors.h>\n"); /* For mig_routine_t. */
+
     for (stat = stats; stat != stNULL; stat = stat->stNext)
 	switch (stat->stKind)
 	{
@@ -170,6 +172,14 @@ WriteServerHeader(FILE *file, const statement_t *stats)
 	    fatal("WriteServerHeader(): bad statement_kind_t (%d)",
 		  (int) stat->stKind);
 	}
+    fprintf(file, "\n");
+
+    /*
+     * Include the x_server_routine function so it can be inlined.
+     */
+    fprintf(file, "extern mig_routine_t %s_routines[];\n", ServerDemux);
+    WriteSubsystemServerRoutine(file, "extern inline");
+
     WriteEpilog(file, protect);
 }
 
diff --git a/server.c b/server.c
index 6a35607..129cec3 100644
--- a/server.c
+++ b/server.c
@@ -161,7 +161,7 @@ WriteEpilog(FILE *file, const statement_t *stats)
     /*
      * First, the symbol table
      */
-     fprintf(file, "static mig_routine_t %s_routines[] = {\n", ServerDemux);
+     fprintf(file, "mig_routine_t %s_routines[] = {\n", ServerDemux);
 
      WriteArrayEntries(file, stats);