Shuffle headers ... because shuffling is fun.

So apparently this file breaks if I remove "#include <stdarg.h>"
from <mini-os/console.h>.  Yea, no idea.  Need to continue
untangling the mess ...

diff --git a/platform/xen/init.c b/platform/xen/init.c
index 06947c3d2665c5c9aaf8544011c7c767535dd855..9ff499d7d404a9cf9bd4eb3a5f3d3a2d8e674115 100644 (file)
--- a/platform/xen/init.c
+++ b/platform/xen/init.c
@@ -23,18 +23,20 @@
  * SUCH DAMAGE.
  */
 
+#include <bmk-rumpuser/core_types.h> /* XXX */
+
 #include <mini-os/types.h>
 #include <mini-os/hypervisor.h>
 #include <mini-os/kernel.h>
 #include <mini-os/xenbus.h>
 #include <xen/xen.h>
 
-#include <rumprun-base/config.h>
-#include <rumprun-base/rumprun.h>
-
 #include <bmk-core/platform.h>
 #include <bmk-core/printf.h>
 
+#include <rumprun-base/config.h>
+#include <rumprun-base/rumprun.h>
+
 static char hardcoded_jsoncfg[] = "";
 
 static char *