From: Antti Kantee <pooka@iki.fi>
Date: Mon, 12 Oct 2015 15:55:45 +0000 (+0000)
Subject: Shuffle headers ... because shuffling is fun.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d4cc46499dc6c53977b3c10f276fa6070f791d18;p=osstest%2Frumprun.git

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 06947c3..9ff499d 100644
--- 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 *