From 956c87fcbe76feabd9e3ecc5849de6d7967ec301 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 1 Oct 2009 12:28:54 +0100
Subject: [PATCH] stubdom/minios: re-structure headers

As part of making stubdom usable on NetBSD, it is necessary to
restructure the minios headers to avoid conflicts with NetBSD's
crossbuild toolchain.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 arch/ia64/common.c     | 26 +++++++++++++-------------
 arch/ia64/debug.c      |  2 +-
 arch/ia64/efi.c        | 10 +++++-----
 arch/ia64/fw.S         | 12 ++++++------
 arch/ia64/gen_off.c    |  8 ++++----
 arch/ia64/ia64.S       | 12 ++++++------
 arch/ia64/ivt.S        | 10 +++++-----
 arch/ia64/mm.c         |  4 ++--
 arch/ia64/sal.c        |  8 ++++----
 arch/ia64/sched.c      | 10 +++++-----
 arch/ia64/time.c       | 10 +++++-----
 arch/ia64/xencomm.c    |  4 ++--
 arch/x86/ioremap.c     | 10 +++++-----
 arch/x86/mm.c          | 12 ++++++------
 arch/x86/sched.c       | 20 ++++++++++----------
 arch/x86/setup.c       |  4 ++--
 arch/x86/time.c        | 14 +++++++-------
 arch/x86/traps.c       | 12 ++++++------
 arch/x86/x86_32.S      |  4 ++--
 arch/x86/x86_64.S      |  4 ++--
 blkfront.c             | 15 ++++++++-------
 console/console.c      | 16 ++++++++--------
 console/xencons_ring.c | 20 ++++++++++----------
 events.c               | 10 +++++-----
 fbfront.c              | 14 +++++++-------
 fs-front.c             | 17 +++++++++--------
 gntmap.c               |  7 ++++---
 gnttab.c               |  8 ++++----
 hypervisor.c           |  7 ++++---
 kernel.c               | 32 ++++++++++++++++----------------
 lib/math.c             |  6 +++---
 lib/printf.c           | 14 +++++++-------
 lib/stack_chk_fail.c   |  4 ++--
 lib/string.c           |  8 ++++----
 lib/xmalloc.c          | 12 ++++++------
 mm.c                   | 12 ++++++------
 netfront.c             | 18 +++++++++---------
 pcifront.c             | 16 +++++++++-------
 sched.c                | 20 ++++++++++----------
 xenbus/xenbus.c        | 22 +++++++++++-----------
 40 files changed, 240 insertions(+), 234 deletions(-)

diff --git a/arch/ia64/common.c b/arch/ia64/common.c
index c82e604..14958cd 100644
--- a/arch/ia64/common.c
+++ b/arch/ia64/common.c
@@ -31,19 +31,19 @@
  */
 
 
-#include "os.h"
-#include "types.h"
-#include "lib.h"
-#include "page.h"
-#include "xen/xen.h"
-#include "privop.h"
-#include "xen/callback.h"
-#include "ia64_cpu.h"
-#include "hypervisor.h"
-#include "events.h"
-#include "console.h"
-#include "time.h"
-#include "xmalloc.h"
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/page.h>
+#include <xen/xen.h>
+#include <mini-os/privop.h>
+#include <xen/callback.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/console.h>
+#include <mini-os/time.h>
+#include <mini-os/xmalloc.h>
 
 
 /* For more console boot messages. */
diff --git a/arch/ia64/debug.c b/arch/ia64/debug.c
index f5b3783..f0e5777 100644
--- a/arch/ia64/debug.c
+++ b/arch/ia64/debug.c
@@ -27,7 +27,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "os.h"
+#include <mini-os/os.h>
 
 static const char *ia64_vector_names[] = {
 	"VHPT Translation",			/* 0 */
diff --git a/arch/ia64/efi.c b/arch/ia64/efi.c
index cdb25b3..009375e 100644
--- a/arch/ia64/efi.c
+++ b/arch/ia64/efi.c
@@ -28,11 +28,11 @@
  */
 
 
-#include "os.h"
-#include "efi.h"
-#include "page.h"
-#include "lib.h"
-#include "console.h"
+#include <mini-os/os.h>
+#include <mini-os/efi.h>
+#include <mini-os/page.h>
+#include <mini-os/lib.h>
+#include <mini-os/console.h>
 
 
 /* The implementation is in fw.S. */
diff --git a/arch/ia64/fw.S b/arch/ia64/fw.S
index ef2c4d2..2ed4dc3 100644
--- a/arch/ia64/fw.S
+++ b/arch/ia64/fw.S
@@ -28,12 +28,12 @@
  */
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "ia64_fpu.h"
-#include "offsets.h"
-#include "xen/xen.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/ia64_fpu.h>
+#include <mini-os/offsets.h>
+#include <mini-os/xen/xen.h>
 
 
 /*
diff --git a/arch/ia64/gen_off.c b/arch/ia64/gen_off.c
index 2c67a8c..f547f23 100644
--- a/arch/ia64/gen_off.c
+++ b/arch/ia64/gen_off.c
@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  *
  */
-#include "types.h"
-#include "sched.h"
-#include "xen/xen.h"
-#include "xen/arch-ia64.h"
+#include <mini-os/types.h>
+#include <mini-os/sched.h>
+#include <xen/xen.h>
+#include <xen/arch-ia64.h>
 
 #define DEFINE(sym, val)					\
   asm volatile("\n->" sym " %0 /* " #val " */": : "i" (val))
diff --git a/arch/ia64/ia64.S b/arch/ia64/ia64.S
index adcf176..8fde089 100644
--- a/arch/ia64/ia64.S
+++ b/arch/ia64/ia64.S
@@ -23,12 +23,12 @@
 
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "ia64_fpu.h"
-#include "privop.h"
-#include "offsets.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/ia64_fpu.h>
+#include <mini-os/privop.h>
+#include <mini-os/offsets.h>
 
 
 
diff --git a/arch/ia64/ivt.S b/arch/ia64/ivt.S
index 8971b3b..863a498 100644
--- a/arch/ia64/ivt.S
+++ b/arch/ia64/ivt.S
@@ -24,11 +24,11 @@
  */
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "privop.h"
-#include "offsets.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/privop.h>
+#include <mini-os/offsets.h>
 
 
 /* General register usage in interrupt handling:
diff --git a/arch/ia64/mm.c b/arch/ia64/mm.c
index c6aef83..b171f75 100644
--- a/arch/ia64/mm.c
+++ b/arch/ia64/mm.c
@@ -26,8 +26,8 @@
  */
 
 
-#include "os.h"
-#include "mm.h"
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
 
 
 #define MAX_MEM_AREA	5
diff --git a/arch/ia64/sal.c b/arch/ia64/sal.c
index 286e5be..7fa7f94 100644
--- a/arch/ia64/sal.c
+++ b/arch/ia64/sal.c
@@ -27,10 +27,10 @@
  *
  */
 
-#include "os.h"
-#include "lib.h"
-#include "console.h"
-#include "page.h"
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/console.h>
+#include <mini-os/page.h>
 
 
 static struct ia64_fdesc sal_fdesc;
diff --git a/arch/ia64/sched.c b/arch/ia64/sched.c
index 5eea71e..ae9e661 100644
--- a/arch/ia64/sched.c
+++ b/arch/ia64/sched.c
@@ -25,11 +25,11 @@
  */
 
 
-#include "types.h"
-#include "sched.h"
-#include "lib.h"
-#include "xmalloc.h"
-#include "mm.h"
+#include <mini-os/types.h>
+#include <mini-os/sched.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/mm.h>
 
 /* The function is implemented in fw.S */
 extern void thread_starter(void);
diff --git a/arch/ia64/time.c b/arch/ia64/time.c
index 4a3a558..5341266 100644
--- a/arch/ia64/time.c
+++ b/arch/ia64/time.c
@@ -27,11 +27,11 @@
  * SUCH DAMAGE.
  */
 
-#include "os.h"
-#include "console.h"
-#include "time.h"
-#include "efi.h"
-#include "events.h"
+#include <mini-os/os.h>
+#include <mini-os/console.h>
+#include <mini-os/time.h>
+#include <mini-os/efi.h>
+#include <mini-os/events.h>
 
 struct timespec os_time;
 static uint64_t itc_alt;		/* itc on last update. */
diff --git a/arch/ia64/xencomm.c b/arch/ia64/xencomm.c
index fccfee2..9719e49 100644
--- a/arch/ia64/xencomm.c
+++ b/arch/ia64/xencomm.c
@@ -23,10 +23,10 @@
  */
 
 
-#include <os.h>
+#include <mini-os/os.h>
 #include <mini-os/errno.h>
 #include <mini-os/lib.h>
-#include <hypervisor.h>
+#include <mini-os/hypervisor.h>
 #include <xen/xencomm.h>
 #include <xen/grant_table.h>
 
diff --git a/arch/x86/ioremap.c b/arch/x86/ioremap.c
index d94f4e7..f55d9e0 100644
--- a/arch/x86/ioremap.c
+++ b/arch/x86/ioremap.c
@@ -21,11 +21,11 @@
  */
 
 
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <mm.h>
-#include <ioremap.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/mm.h>
+#include <mini-os/ioremap.h>
 
 /* Map a physical address range into virtual address space with provided
  * flags. Return a virtual address range it is mapped to. */
diff --git a/arch/x86/mm.c b/arch/x86/mm.c
index 723fc56..8d688fc 100644
--- a/arch/x86/mm.c
+++ b/arch/x86/mm.c
@@ -34,12 +34,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 #include <xen/memory.h>
 
 #ifdef MM_DEBUG
diff --git a/arch/x86/sched.c b/arch/x86/sched.c
index 9b98b93..8a05b58 100644
--- a/arch/x86/sched.c
+++ b/arch/x86/sched.c
@@ -35,16 +35,16 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <time.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <list.h>
-#include <sched.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/time.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/list.h>
+#include <mini-os/sched.h>
+#include <mini-os/semaphore.h>
 
 
 #ifdef SCHED_DEBUG
diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index 8509079..923901e 100644
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -26,8 +26,8 @@
  *
  */
 
-#include <os.h>
-
+#include <mini-os/os.h>
+#include <mini-os/lib.h> /* for printk, memcpy */
 
 /*
  * Shared page for communicating with the hypervisor.
diff --git a/arch/x86/time.c b/arch/x86/time.c
index a55bf59..89bc382 100644
--- a/arch/x86/time.c
+++ b/arch/x86/time.c
@@ -32,13 +32,13 @@
  */
 
 
-#include <os.h>
-#include <traps.h>
-#include <types.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <time.h>
-#include <lib.h>
+#include <mini-os/os.h>
+#include <mini-os/traps.h>
+#include <mini-os/types.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/time.h>
+#include <mini-os/lib.h>
 
 /************************************************************************
  * Time functions
diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index f641d90..516d133 100644
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -1,10 +1,10 @@
 
-#include <os.h>
-#include <traps.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <lib.h>
-#include <sched.h>
+#include <mini-os/os.h>
+#include <mini-os/traps.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/lib.h>
+#include <mini-os/sched.h>
 
 /*
  * These are assembler stubs in entry.S.
diff --git a/arch/x86/x86_32.S b/arch/x86/x86_32.S
index e1426ac..fb3e30a 100644
--- a/arch/x86/x86_32.S
+++ b/arch/x86/x86_32.S
@@ -1,5 +1,5 @@
-#include <os.h>
-#include <arch_limits.h>
+#include <mini-os/os.h>
+#include <mini-os/x86/arch_limits.h>
 #include <xen/arch-x86_32.h>
 
 .section __xen_guest
diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index a8b1933..a65e5d5 100644
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -1,5 +1,5 @@
-#include <os.h>
-#include <arch_limits.h>
+#include <mini-os/os.h>
+#include <mini-os/x86/arch_limits.h>
 #include <xen/features.h>
 
 .section __xen_guest
diff --git a/blkfront.c b/blkfront.c
index bba1a2f..a451e98 100644
--- a/blkfront.c
+++ b/blkfront.c
@@ -3,17 +3,18 @@
  * Based on netfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <stdint.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
 #include <xen/io/blkif.h>
 #include <xen/io/protocols.h>
-#include <gnttab.h>
-#include <xmalloc.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
 #include <time.h>
-#include <blkfront.h>
-#include <lib.h>
+#include <mini-os/blkfront.h>
+#include <mini-os/lib.h>
 #include <fcntl.h>
 
 #ifndef HAVE_LIBC
diff --git a/console/console.c b/console/console.c
index 81cedcb..1bd0405 100644
--- a/console/console.c
+++ b/console/console.c
@@ -34,14 +34,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
  
-#include <types.h>
-#include <wait.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <os.h>
-#include <lib.h>
-#include <xenbus.h>
+#include <mini-os/types.h>
+#include <mini-os/wait.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
 #include <xen/io/console.h>
 
 
diff --git a/console/xencons_ring.c b/console/xencons_ring.c
index a7a9827..3bb408f 100644
--- a/console/xencons_ring.c
+++ b/console/xencons_ring.c
@@ -1,16 +1,16 @@
-#include <types.h>
-#include <wait.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <os.h>
-#include <lib.h>
-#include <xenbus.h>
+#include <mini-os/types.h>
+#include <mini-os/wait.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
 #include <xen/io/console.h>
 #include <xen/io/protocols.h>
 #include <xen/io/ring.h>
-#include <xmalloc.h>
-#include <gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/gnttab.h>
 
 DECLARE_WAIT_QUEUE_HEAD(console_queue);
 
diff --git a/events.c b/events.c
index c907e65..2f359a5 100644
--- a/events.c
+++ b/events.c
@@ -16,11 +16,11 @@
  ****************************************************************************
  */
 
-#include <os.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <lib.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/lib.h>
 
 #define NR_EVS 1024
 
diff --git a/fbfront.c b/fbfront.c
index 1406de0..8cf1721 100644
--- a/fbfront.c
+++ b/fbfront.c
@@ -4,16 +4,16 @@
  * Based on blkfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <xen/io/kbdif.h>
 #include <xen/io/fbif.h>
 #include <xen/io/protocols.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <fbfront.h>
-#include <lib.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/fbfront.h>
+#include <mini-os/lib.h>
 
 DECLARE_WAIT_QUEUE_HEAD(kbdfront_queue);
 
diff --git a/fs-front.c b/fs-front.c
index 7c4d68d..dd664ca 100644
--- a/fs-front.c
+++ b/fs-front.c
@@ -25,15 +25,16 @@
  */
 
 #undef NDEBUG
-#include <os.h>
-#include <list.h>
-#include <xmalloc.h>
-#include <xenbus.h>
-#include <gnttab.h>
-#include <events.h>
+#include <stdint.h>
+#include <mini-os/os.h>
+#include <mini-os/list.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/events.h>
 #include <xen/io/fsif.h>
-#include <fs.h>
-#include <sched.h>
+#include <mini-os/fs.h>
+#include <mini-os/sched.h>
 
 #define preempt_disable()
 #define preempt_enable()
diff --git a/gntmap.c b/gntmap.c
index abbd91a..22ed450 100644
--- a/gntmap.c
+++ b/gntmap.c
@@ -30,12 +30,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 #include <errno.h>
 #include <xen/grant_table.h>
 #include <inttypes.h>
-#include "gntmap.h"
+#include <mini-os/gntmap.h>
 
 #define DEFAULT_MAX_GRANTS 128
 
diff --git a/gnttab.c b/gnttab.c
index 9b35052..ebfa8ac 100644
--- a/gnttab.c
+++ b/gnttab.c
@@ -15,10 +15,10 @@
  *
  ****************************************************************************
  */
-#include <os.h>
-#include <mm.h>
-#include <gnttab.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/semaphore.h>
 
 #define NR_RESERVED_ENTRIES 8
 
diff --git a/hypervisor.c b/hypervisor.c
index dad8b59..b4688a0 100644
--- a/hypervisor.c
+++ b/hypervisor.c
@@ -25,9 +25,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
 
 #define active_evtchns(cpu,sh,idx)              \
     ((sh)->evtchn_pending[idx] &                \
diff --git a/kernel.c b/kernel.c
index 33c91b5..19e4400 100644
--- a/kernel.c
+++ b/kernel.c
@@ -27,22 +27,22 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <events.h>
-#include <time.h>
-#include <types.h>
-#include <lib.h>
-#include <sched.h>
-#include <xenbus.h>
-#include <gnttab.h>
-#include <netfront.h>
-#include <blkfront.h>
-#include <fbfront.h>
-#include <pcifront.h>
-#include <fs.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/events.h>
+#include <mini-os/time.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/sched.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/netfront.h>
+#include <mini-os/blkfront.h>
+#include <mini-os/fbfront.h>
+#include <mini-os/pcifront.h>
+#include <mini-os/fs.h>
+#include <mini-os/xmalloc.h>
 #include <fcntl.h>
 #include <xen/features.h>
 #include <xen/version.h>
diff --git a/lib/math.c b/lib/math.c
index 55ece1e..00a13a5 100644
--- a/lib/math.c
+++ b/lib/math.c
@@ -55,9 +55,9 @@
  * $FreeBSD: src/sys/libkern/divdi3.c,v 1.6 1999/08/28 00:46:31 peter Exp $
 */
 
-#include <types.h>
-#include <lib.h>
-#include <time.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/time.h>
 
 	/* On ia64 these functions lead to crashes. These are replaced by
 	 * assembler functions. */
diff --git a/lib/printf.c b/lib/printf.c
index a986616..833bb96 100644
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -56,13 +56,13 @@
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <hypervisor.h>
-#include <lib.h>
-#include <mm.h>
-#include <ctype.h>
-#include <limits.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/lib.h>
+#include <mini-os/mm.h>
+#include <mini-os/ctype.h>
+#include <mini-os/limits.h>
 
 /**
  * simple_strtoul - convert a string to an unsigned long
diff --git a/lib/stack_chk_fail.c b/lib/stack_chk_fail.c
index ade0045..05aea20 100644
--- a/lib/stack_chk_fail.c
+++ b/lib/stack_chk_fail.c
@@ -1,5 +1,5 @@
-#include <kernel.h>
-#include <console.h>
+#include <mini-os/kernel.h>
+#include <mini-os/console.h>
 
 void __stack_chk_fail(void)
 {
diff --git a/lib/string.c b/lib/string.c
index a6f2abe..8b24146 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -57,10 +57,10 @@ int ffsll (long long int lli)
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 
 int memcmp(const void * cs,const void * ct,size_t count)
 {
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index c33c48a..14fe796 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -36,12 +36,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <os.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <list.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/list.h>
+#include <mini-os/xmalloc.h>
 
 #ifndef HAVE_LIBC
 static MINIOS_LIST_HEAD(freelist);
diff --git a/mm.c b/mm.c
index a5338b0..743d45d 100644
--- a/mm.c
+++ b/mm.c
@@ -34,13 +34,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
 #include <xen/memory.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 
 #ifdef MM_DEBUG
 #define DEBUG(_f, _a...) \
diff --git a/netfront.c b/netfront.c
index ea092df..fd1a315 100644
--- a/netfront.c
+++ b/netfront.c
@@ -5,17 +5,17 @@
  * Does not handle fragments or extras.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
 #include <xen/io/netif.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <time.h>
-#include <netfront.h>
-#include <lib.h>
-#include <semaphore.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/time.h>
+#include <mini-os/netfront.h>
+#include <mini-os/lib.h>
+#include <mini-os/semaphore.h>
 
 DECLARE_WAIT_QUEUE_HEAD(netfront_queue);
 
diff --git a/pcifront.c b/pcifront.c
index 70ea89b..d8a5a94 100644
--- a/pcifront.c
+++ b/pcifront.c
@@ -3,14 +3,16 @@
  * Based on blkfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <string.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <wait.h>
-#include <pcifront.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/wait.h>
+#include <mini-os/pcifront.h>
 
 #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))
 
diff --git a/sched.c b/sched.c
index b1e1d28..c0229c5 100644
--- a/sched.c
+++ b/sched.c
@@ -35,16 +35,16 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <time.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <list.h>
-#include <sched.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/time.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/list.h>
+#include <mini-os/sched.h>
+#include <mini-os/semaphore.h>
 
 
 #ifdef SCHED_DEBUG
diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c
index 958e010..916a389 100644
--- a/xenbus/xenbus.c
+++ b/xenbus/xenbus.c
@@ -15,18 +15,18 @@
  *
  ****************************************************************************
  **/
-#include <os.h>
-#include <mm.h>
-#include <traps.h>
-#include <lib.h>
-#include <xenbus.h>
-#include <events.h>
-#include <errno.h>
-#include <sched.h>
-#include <wait.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/traps.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
+#include <mini-os/errno.h>
+#include <mini-os/sched.h>
+#include <mini-os/wait.h>
 #include <xen/io/xs_wire.h>
-#include <spinlock.h>
-#include <xmalloc.h>
+#include <mini-os/spinlock.h>
+#include <mini-os/xmalloc.h>
 
 #define min(x,y) ({                       \
         typeof(x) tmpx = (x);                 \
-- 
2.39.5