diff --git a/arch/amd64/boot.c b/arch/amd64/boot.c
index fb1e3b3..82bb811 100644
--- a/arch/amd64/boot.c
+++ b/arch/amd64/boot.c
@@ -3,8 +3,8 @@
  */
 #undef BOOTSTRAP
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "sys_info.h"
diff --git a/arch/amd64/elfload.c b/arch/amd64/elfload.c
index c035846..4821b06 100644
--- a/arch/amd64/elfload.c
+++ b/arch/amd64/elfload.c
@@ -9,7 +9,7 @@
 #include "asm/elf.h"
 #include "elf_boot.h"
 #include "sys_info.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #define printf printk
 #define debug printk
diff --git a/arch/amd64/linux_load.c b/arch/amd64/linux_load.c
index c93d359..1e8074e 100644
--- a/arch/amd64/linux_load.c
+++ b/arch/amd64/linux_load.c
@@ -10,7 +10,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"
 #include "segment.h"
diff --git a/arch/amd64/openbios.c b/arch/amd64/openbios.c
index d14efbc..aba80e1 100644
--- a/arch/amd64/openbios.c
+++ b/arch/amd64/openbios.c
@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "asm/types.h"
 #include "dict.h"
 #include "kernel/kernel.h"
diff --git a/arch/ppc/briq/init.c b/arch/ppc/briq/init.c
index 5328f51..1f909e5 100644
--- a/arch/ppc/briq/init.c
+++ b/arch/ppc/briq/init.c
@@ -20,10 +20,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/nvram.h"
 #include "briq/briq.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "openbios-version.h"
 
 extern void unexpected_excep( int vector );
diff --git a/arch/ppc/briq/main.c b/arch/ppc/briq/main.c
index cb139ae..ffc1c62 100644
--- a/arch/ppc/briq/main.c
+++ b/arch/ppc/briq/main.c
@@ -17,13 +17,13 @@
 
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "briq/briq.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 static void
 transfer_control_to_elf( ulong entry )
diff --git a/arch/ppc/briq/methods.c b/arch/ppc/briq/methods.c
index 6a2eedb..ff98e50 100644
--- a/arch/ppc/briq/methods.c
+++ b/arch/ppc/briq/methods.c
@@ -19,10 +19,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
 #include "briq/briq.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 /************************************************************************/
 /*	RTAS (run-time abstraction services)				*/
diff --git a/arch/ppc/briq/tree.c b/arch/ppc/briq/tree.c
index cdd5e4e..50e963a 100644
--- a/arch/ppc/briq/tree.c
+++ b/arch/ppc/briq/tree.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 
 void devtree_init( void )
 {
diff --git a/arch/ppc/briq/vfd.c b/arch/ppc/briq/vfd.c
index 4c0cf40..bb307c2 100644
--- a/arch/ppc/briq/vfd.c
+++ b/arch/ppc/briq/vfd.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "briq/briq.h"
 
 static int vfd_is_open;
diff --git a/arch/ppc/kernel.c b/arch/ppc/kernel.c
index f466f0b..d5609b0 100644
--- a/arch/ppc/kernel.c
+++ b/arch/ppc/kernel.c
@@ -19,7 +19,7 @@
 
 #include "openbios/config.h"
 #include "dict.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/stack.h"
 #include "kernel/kernel.h"
 #include "libc/string.h"
diff --git a/arch/ppc/mol/console.c b/arch/ppc/mol/console.c
index e1c5ef9..415414c 100644
--- a/arch/ppc/mol/console.c
+++ b/arch/ppc/mol/console.c
@@ -16,10 +16,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 #include "osi_calls.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "mol/mol.h"
 #include "boothelper_sh.h"
 #include "video_sh.h"
diff --git a/arch/ppc/mol/init.c b/arch/ppc/mol/init.c
index f115271..a474c29 100644
--- a/arch/ppc/mol/init.c
+++ b/arch/ppc/mol/init.c
@@ -16,10 +16,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/nvram.h"
 #include "mol/mol.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "mol/prom.h"
 #include "openbios-version.h"
 #include "osi_calls.h"
diff --git a/arch/ppc/mol/main.c b/arch/ppc/mol/main.c
index 7b8a846..99d3f67 100644
--- a/arch/ppc/mol/main.c
+++ b/arch/ppc/mol/main.c
@@ -16,13 +16,13 @@
 
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "mol/mol.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "osi_calls.h"
 #include "ablk_sh.h"
 #include "boothelper_sh.h"
diff --git a/arch/ppc/mol/methods.c b/arch/ppc/mol/methods.c
index 36df76a..030d261 100644
--- a/arch/ppc/mol/methods.c
+++ b/arch/ppc/mol/methods.c
@@ -15,10 +15,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
 #include "mol/mol.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "mol/prom.h"
 #include "osi_calls.h"
 #include "kbd_sh.h"
diff --git a/arch/ppc/mol/osi-blk.c b/arch/ppc/mol/osi-blk.c
index a3fb105..1d216b7 100644
--- a/arch/ppc/mol/osi-blk.c
+++ b/arch/ppc/mol/osi-blk.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "mol/mol.h"
 #include "osi_calls.h"
 
diff --git a/arch/ppc/mol/osi-scsi.c b/arch/ppc/mol/osi-scsi.c
index 16fd2b0..a413bd0 100644
--- a/arch/ppc/mol/osi-scsi.c
+++ b/arch/ppc/mol/osi-scsi.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "mol/mol.h"
 #include "scsi_sh.h"
 #include "osi_calls.h"
diff --git a/arch/ppc/mol/pseudodisk.c b/arch/ppc/mol/pseudodisk.c
index 3cd2862..7151b04 100644
--- a/arch/ppc/mol/pseudodisk.c
+++ b/arch/ppc/mol/pseudodisk.c
@@ -15,10 +15,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "osi_calls.h"
 #include "libc/string.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "mol/prom.h"
 #include "mol/mol.h"
 #include "osi_calls.h"
diff --git a/arch/ppc/mol/tree.c b/arch/ppc/mol/tree.c
index 30aa028..f83ad56 100644
--- a/arch/ppc/mol/tree.c
+++ b/arch/ppc/mol/tree.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "mol/mol.h"
 #include "mol/prom.h"
 
diff --git a/arch/ppc/ofmem.c b/arch/ppc/ofmem.c
index 4758eef..bbd3779 100644
--- a/arch/ppc/ofmem.c
+++ b/arch/ppc/ofmem.c
@@ -18,9 +18,9 @@
 /* TODO: Clean up MOLisms in a decent way */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "kernel.h"
 #ifdef I_WANT_MOLISMS
 #include "mol/prom.h"
diff --git a/arch/ppc/pearpc/console.c b/arch/ppc/pearpc/console.c
index 538d178..ef70ccc 100644
--- a/arch/ppc/pearpc/console.c
+++ b/arch/ppc/pearpc/console.c
@@ -13,9 +13,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "pearpc/pearpc.h"
 
 
diff --git a/arch/ppc/pearpc/init.c b/arch/ppc/pearpc/init.c
index d9a5f42..8cbaf54 100644
--- a/arch/ppc/pearpc/init.c
+++ b/arch/ppc/pearpc/init.c
@@ -21,10 +21,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/nvram.h"
 #include "pearpc/pearpc.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "openbios-version.h"
 
 extern void unexpected_excep( int vector );
diff --git a/arch/ppc/pearpc/main.c b/arch/ppc/pearpc/main.c
index f003824..c230d93 100644
--- a/arch/ppc/pearpc/main.c
+++ b/arch/ppc/pearpc/main.c
@@ -17,13 +17,13 @@
 
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "pearpc/pearpc.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 static void
 transfer_control_to_elf( ulong entry )
diff --git a/arch/ppc/pearpc/methods.c b/arch/ppc/pearpc/methods.c
index 8db589d..5d0f729 100644
--- a/arch/ppc/pearpc/methods.c
+++ b/arch/ppc/pearpc/methods.c
@@ -19,10 +19,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
 #include "pearpc/pearpc.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 /************************************************************************/
 /*	RTAS (run-time abstraction services)				*/
diff --git a/arch/ppc/pearpc/tree.c b/arch/ppc/pearpc/tree.c
index 1fe1543..4f0202a 100644
--- a/arch/ppc/pearpc/tree.c
+++ b/arch/ppc/pearpc/tree.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 
 void devtree_init( void )
 {
diff --git a/arch/ppc/pearpc/vfd.c b/arch/ppc/pearpc/vfd.c
index c1483bf..9d8f93a 100644
--- a/arch/ppc/pearpc/vfd.c
+++ b/arch/ppc/pearpc/vfd.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "pearpc/pearpc.h"
 
 static int vfd_is_open;
diff --git a/arch/ppc/qemu/console.c b/arch/ppc/qemu/console.c
index d4e2c30..3d070dd 100644
--- a/arch/ppc/qemu/console.c
+++ b/arch/ppc/qemu/console.c
@@ -12,7 +12,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE
diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index 8d76c84..857a374 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -21,12 +21,12 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/pci.h"
 #include "openbios/nvram.h"
 #include "openbios/drivers.h"
 #include "qemu/qemu.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "openbios-version.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
diff --git a/arch/ppc/qemu/kernel.c b/arch/ppc/qemu/kernel.c
index cb41d7a..4c188f2 100644
--- a/arch/ppc/qemu/kernel.c
+++ b/arch/ppc/qemu/kernel.c
@@ -20,7 +20,7 @@
 #include "qemu-dict.h"
 #include "openbios/config.h"
 #include "dict.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/stack.h"
 #include "kernel/kernel.h"
 #include "libc/string.h"
diff --git a/arch/ppc/qemu/main.c b/arch/ppc/qemu/main.c
index f9cc582..9543333 100644
--- a/arch/ppc/qemu/main.c
+++ b/arch/ppc/qemu/main.c
@@ -15,13 +15,13 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
 #include "kernel.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
 
diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c
index 823bd72..23fa4c4 100644
--- a/arch/ppc/qemu/methods.c
+++ b/arch/ppc/qemu/methods.c
@@ -19,11 +19,11 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "libc/string.h"
 #include "qemu/qemu.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "arch/ppc/processor.h"
 
 /************************************************************************/
diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c
index 1742039..7b1e497 100644
--- a/arch/ppc/qemu/ofmem.c
+++ b/arch/ppc/qemu/ofmem.c
@@ -16,9 +16,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "kernel.h"
 #include "mmutypes.h"
 #include "asm/processor.h"
diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c
index a80ee93..38e4df2 100644
--- a/arch/ppc/qemu/qemu.c
+++ b/arch/ppc/qemu/qemu.c
@@ -19,7 +19,7 @@
 #include "openbios/config.h"
 #include "kernel/kernel.h"
 #include "openbios/nvram.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "libc/vsprintf.h"
 #include "libc/string.h"
diff --git a/arch/ppc/qemu/vfd.c b/arch/ppc/qemu/vfd.c
index c918b75..68bdd83 100644
--- a/arch/ppc/qemu/vfd.c
+++ b/arch/ppc/qemu/vfd.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "qemu/qemu.h"
 
 static int vfd_is_open;
diff --git a/arch/sparc32/boot.c b/arch/sparc32/boot.c
index 70d351e..28e6cd4 100644
--- a/arch/sparc32/boot.c
+++ b/arch/sparc32/boot.c
@@ -3,8 +3,8 @@
  */
 #undef BOOTSTRAP
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "openbios/drivers.h"
 #include "libc/diskio.h"
diff --git a/arch/sparc32/console.c b/arch/sparc32/console.c
index c944bd4..82cb28d 100644
--- a/arch/sparc32/console.c
+++ b/arch/sparc32/console.c
@@ -10,7 +10,7 @@
 #include "openbios/drivers.h"
 #include "openbios.h"
 #include "video_subr.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #ifdef CONFIG_DEBUG_CONSOLE
 
diff --git a/arch/sparc32/elfload.c b/arch/sparc32/elfload.c
index 319631f..ddfb433 100644
--- a/arch/sparc32/elfload.c
+++ b/arch/sparc32/elfload.c
@@ -9,7 +9,7 @@
 #include "asm/elf.h"
 #include "elf_boot.h"
 #include "sys_info.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printf printk
diff --git a/arch/sparc32/forthload.c b/arch/sparc32/forthload.c
index 0199961..5ad427c 100644
--- a/arch/sparc32/forthload.c
+++ b/arch/sparc32/forthload.c
@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
diff --git a/arch/sparc32/lib.c b/arch/sparc32/lib.c
index 9f0899f..0306a6b 100644
--- a/arch/sparc32/lib.c
+++ b/arch/sparc32/lib.c
@@ -8,8 +8,8 @@
  */
 
 #include "libc/vsprintf.h"
-#include "openbios/bindings.h"
-#include "ofmem.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/ofmem.h"
 #include "asm/asi.h"
 #include "pgtsrmmu.h"
 #include "openprom.h"
diff --git a/arch/sparc32/linux_load.c b/arch/sparc32/linux_load.c
index 782d2fb..a18bf21 100644
--- a/arch/sparc32/linux_load.c
+++ b/arch/sparc32/linux_load.c
@@ -10,7 +10,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"
 #include "loadfs.h"
diff --git a/arch/sparc32/openbios.c b/arch/sparc32/openbios.c
index b84b051..446eda0 100644
--- a/arch/sparc32/openbios.c
+++ b/arch/sparc32/openbios.c
@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "asm/types.h"
 #include "dict.h"
diff --git a/arch/sparc32/romvec.c b/arch/sparc32/romvec.c
index d140b0d..91175ea 100644
--- a/arch/sparc32/romvec.c
+++ b/arch/sparc32/romvec.c
@@ -9,7 +9,7 @@
 
 #include "openprom.h"
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "sys_info.h"
 #include "boot.h"
diff --git a/arch/sparc64/boot.c b/arch/sparc64/boot.c
index 08b07ca..62826c3 100644
--- a/arch/sparc64/boot.c
+++ b/arch/sparc64/boot.c
@@ -3,8 +3,8 @@
  */
 #undef BOOTSTRAP
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "libc/vsprintf.h"
diff --git a/arch/sparc64/console.c b/arch/sparc64/console.c
index 0611ce9..df97cb9 100644
--- a/arch/sparc64/console.c
+++ b/arch/sparc64/console.c
@@ -6,10 +6,10 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "openbios/drivers.h"
-#include "openbios/fontdata.h"
+#include "libopenbios/fontdata.h"
 #include "openbios.h"
 #include "video_subr.h"
 #include "libc/vsprintf.h"
diff --git a/arch/sparc64/elfload.c b/arch/sparc64/elfload.c
index cc82043..2320377 100644
--- a/arch/sparc64/elfload.c
+++ b/arch/sparc64/elfload.c
@@ -9,7 +9,7 @@
 #include "asm/elf.h"
 #include "elf_boot.h"
 #include "sys_info.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"
 #define printf printk
diff --git a/arch/sparc64/fcodeload.c b/arch/sparc64/fcodeload.c
index 2cbe708..7368a26 100644
--- a/arch/sparc64/fcodeload.c
+++ b/arch/sparc64/fcodeload.c
@@ -4,7 +4,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
diff --git a/arch/sparc64/forthload.c b/arch/sparc64/forthload.c
index f4a5bdb..3bf04d9 100644
--- a/arch/sparc64/forthload.c
+++ b/arch/sparc64/forthload.c
@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
diff --git a/arch/sparc64/lib.c b/arch/sparc64/lib.c
index b64b81e..cd1fb80 100644
--- a/arch/sparc64/lib.c
+++ b/arch/sparc64/lib.c
@@ -9,7 +9,7 @@
 
 #include "openbios/config.h"
 #include "libc/vsprintf.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "spitfire.h"
 #include "sys_info.h"
 #include "boot.h"
diff --git a/arch/sparc64/linux_load.c b/arch/sparc64/linux_load.c
index 771e0c4..d160d56 100644
--- a/arch/sparc64/linux_load.c
+++ b/arch/sparc64/linux_load.c
@@ -10,7 +10,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"
 #include "loadfs.h"
diff --git a/arch/sparc64/ofmem_sparc64.c b/arch/sparc64/ofmem_sparc64.c
index c0474c2..5db9448 100644
--- a/arch/sparc64/ofmem_sparc64.c
+++ b/arch/sparc64/ofmem_sparc64.c
@@ -13,7 +13,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
 #include "ofmem_sparc64.h"
 #include "spitfire.h"
diff --git a/arch/sparc64/ofmem_sparc64.h b/arch/sparc64/ofmem_sparc64.h
index 6cfed4d..443c6c9 100644
--- a/arch/sparc64/ofmem_sparc64.h
+++ b/arch/sparc64/ofmem_sparc64.h
@@ -14,7 +14,7 @@
 #ifndef _H_OFMEM_SPARC64
 #define _H_OFMEM_SPARC64
 
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode);
 
diff --git a/arch/sparc64/openbios.c b/arch/sparc64/openbios.c
index 7a61e41..6d735de 100644
--- a/arch/sparc64/openbios.c
+++ b/arch/sparc64/openbios.c
@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "dict.h"
 #include "openbios/nvram.h"
@@ -20,7 +20,7 @@
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
 #include "video_subr.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
 
diff --git a/arch/unix/blk.c b/arch/unix/blk.c
index e2ee735..fb0852f 100644
--- a/arch/unix/blk.c
+++ b/arch/unix/blk.c
@@ -12,7 +12,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "blk.h"
 
 typedef struct {
diff --git a/arch/unix/boot.c b/arch/unix/boot.c
index 179cd5a..f4e2440 100644
--- a/arch/unix/boot.c
+++ b/arch/unix/boot.c
@@ -3,8 +3,8 @@
  */
 #undef BOOTSTRAP
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 
diff --git a/arch/unix/unix.c b/arch/unix/unix.c
index 786f926..a96152e 100644
--- a/arch/unix/unix.c
+++ b/arch/unix/unix.c
@@ -31,11 +31,11 @@
 #include "dict.h"
 #include "kernel/stack.h"
 #include "arch/unix/plugins.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios-version.h"
 
 #include "blk.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #define MEMORY_SIZE	(4*1024*1024)	/* 4M ram for hosted system */
 #define DICTIONARY_SIZE	(256*1024)	/* 256k for the dictionary   */
diff --git a/arch/x86/boot.c b/arch/x86/boot.c
index 7028d02..c4c10bd 100644
--- a/arch/x86/boot.c
+++ b/arch/x86/boot.c
@@ -8,8 +8,8 @@
 
 #undef BOOTSTRAP
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "openbios/nvram.h"
 #include "libc/diskio.h"
 #include "sys_info.h"
diff --git a/arch/x86/elfload.c b/arch/x86/elfload.c
index 383f9c0..af843d1 100644
--- a/arch/x86/elfload.c
+++ b/arch/x86/elfload.c
@@ -9,7 +9,7 @@
 #include "asm/elf.h"
 #include "elf_boot.h"
 #include "sys_info.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "loadfs.h"
 #include "boot.h"
 
diff --git a/arch/x86/exception.c b/arch/x86/exception.c
index 4750ea5..4d9f455 100644
--- a/arch/x86/exception.c
+++ b/arch/x86/exception.c
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "asm/types.h"
 
 
diff --git a/arch/x86/forthload.c b/arch/x86/forthload.c
index 2bb42ee..9fe632d 100644
--- a/arch/x86/forthload.c
+++ b/arch/x86/forthload.c
@@ -8,7 +8,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "loadfs.h"
 #include "boot.h"
diff --git a/arch/x86/linux_load.c b/arch/x86/linux_load.c
index 8798d01..289f1a3 100644
--- a/arch/x86/linux_load.c
+++ b/arch/x86/linux_load.c
@@ -10,7 +10,7 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "sys_info.h"
 #include "context.h"
 #include "segment.h"
diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c
index 39fbcf8..b6b1704 100644
--- a/arch/x86/openbios.c
+++ b/arch/x86/openbios.c
@@ -7,7 +7,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "asm/types.h"
 #include "dict.h"
 #include "kernel/kernel.h"
diff --git a/arch/x86/xbox/console.c b/arch/x86/xbox/console.c
index 4e47d0f..fa3db70 100644
--- a/arch/x86/xbox/console.c
+++ b/arch/x86/xbox/console.c
@@ -11,7 +11,7 @@
 
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 
 typedef struct osi_fb_info {
diff --git a/arch/x86/xbox/methods.c b/arch/x86/xbox/methods.c
index 412c70b..4a3a046 100644
--- a/arch/x86/xbox/methods.c
+++ b/arch/x86/xbox/methods.c
@@ -19,9 +19,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
-// #include "ofmem.h"
+// #include "libopenbios/ofmem.h"
 
 /************************************************************************/
 /*	stdout								*/
diff --git a/drivers/adb_bus.c b/drivers/adb_bus.c
index 289c405..44297cf 100644
--- a/drivers/adb_bus.c
+++ b/drivers/adb_bus.c
@@ -20,7 +20,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/vsprintf.h"
 
 #include "adb_bus.h"
diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c
index 063dc50..1ab51e2 100644
--- a/drivers/adb_kbd.c
+++ b/drivers/adb_kbd.c
@@ -20,7 +20,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 #include "kbd.h"
diff --git a/drivers/adb_mouse.c b/drivers/adb_mouse.c
index abf813b..061f88e 100644
--- a/drivers/adb_mouse.c
+++ b/drivers/adb_mouse.c
@@ -20,7 +20,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 
diff --git a/drivers/cuda.c b/drivers/cuda.c
index 28ddc83..a5d656a 100644
--- a/drivers/cuda.c
+++ b/drivers/cuda.c
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
diff --git a/drivers/escc.c b/drivers/escc.c
index b4ed72c..0924640 100644
--- a/drivers/escc.c
+++ b/drivers/escc.c
@@ -1,9 +1,9 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 #include "openbios/drivers.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #include "escc.h"
 
diff --git a/drivers/esp.c b/drivers/esp.c
index b4ef12d..472bb20 100644
--- a/drivers/esp.c
+++ b/drivers/esp.c
@@ -14,7 +14,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
@@ -24,7 +24,7 @@
 #include "scsi.h"
 #include "asm/dma.h"
 #include "esp.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #define BUFSIZE         4096
 
diff --git a/drivers/floppy.c b/drivers/floppy.c
index f1226e1..d8623e8 100644
--- a/drivers/floppy.c
+++ b/drivers/floppy.c
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
diff --git a/drivers/fw_cfg.c b/drivers/fw_cfg.c
index 3c5e267..1a8f2ae 100644
--- a/drivers/fw_cfg.c
+++ b/drivers/fw_cfg.c
@@ -1,7 +1,7 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
 
diff --git a/drivers/ide.c b/drivers/ide.c
index 2e30b28..b98bb1b 100644
--- a/drivers/ide.c
+++ b/drivers/ide.c
@@ -14,7 +14,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
diff --git a/drivers/iommu.c b/drivers/iommu.c
index 5e63f38..bed199f 100644
--- a/drivers/iommu.c
+++ b/drivers/iommu.c
@@ -5,10 +5,10 @@
  ** This code is licensed under GNU General Public License.
  **/
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/drivers.h"
 #include "iommu.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #ifdef CONFIG_DEBUG_IOMMU
 #define DPRINTF(fmt, args...)                   \
diff --git a/drivers/macio.c b/drivers/macio.c
index f43aaa8..9613689 100644
--- a/drivers/macio.c
+++ b/drivers/macio.c
@@ -10,7 +10,7 @@
 
 #include "openbios/config.h"
 #include "openbios/nvram.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 
diff --git a/drivers/obio.c b/drivers/obio.c
index 63591a5..fb9910e 100644
--- a/drivers/obio.c
+++ b/drivers/obio.c
@@ -11,14 +11,14 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 
 #include "openbios/drivers.h"
 #include "openbios/nvram.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "obio.h"
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
diff --git a/drivers/pc_kbd.c b/drivers/pc_kbd.c
index 4a099a8..6bf59ee 100644
--- a/drivers/pc_kbd.c
+++ b/drivers/pc_kbd.c
@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "libc/vsprintf.h"
diff --git a/drivers/pc_serial.c b/drivers/pc_serial.c
index 732cd0a..92b739a 100644
--- a/drivers/pc_serial.c
+++ b/drivers/pc_serial.c
@@ -6,7 +6,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "openbios/drivers.h"
 #include "libc/vsprintf.h"
diff --git a/drivers/pci.c b/drivers/pci.c
index 17a4097..b41c6a3 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -16,7 +16,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "openbios/pci.h"
 #include "libc/byteorder.h"
diff --git a/drivers/pci_database.c b/drivers/pci_database.c
index 553f7de..9008850 100644
--- a/drivers/pci_database.c
+++ b/drivers/pci_database.c
@@ -1,5 +1,5 @@
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/pci.h"
 #include "libc/vsprintf.h"
 
diff --git a/drivers/sbus.c b/drivers/sbus.c
index 684a3f6..1ccc9dd 100644
--- a/drivers/sbus.c
+++ b/drivers/sbus.c
@@ -11,12 +11,12 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "kernel/kernel.h"
 #include "libc/byteorder.h"
 #include "libc/vsprintf.h"
 #include "openbios/drivers.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #define SBUS_REGS        0x28
 #define SBUS_SLOTS       16
diff --git a/drivers/vga_vbe.c b/drivers/vga_vbe.c
index a05a1a9..26eadd3 100644
--- a/drivers/vga_vbe.c
+++ b/drivers/vga_vbe.c
@@ -18,14 +18,14 @@
 
 #include "openbios/config.h"
 #include "kernel/kernel.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/pci.h"
 #include "openbios/drivers.h"
-#include "openbios/fontdata.h"
+#include "libopenbios/fontdata.h"
 #include "asm/io.h"
 #include "libc/vsprintf.h"
 #include "video_subr.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 /* VGA init. We use the Bochs VESA VBE extensions  */
 #define VBE_DISPI_INDEX_ID              0x0
diff --git a/fs/ext2/ext2_utils.c b/fs/ext2/ext2_utils.c
index 8c34484..7773125 100644
--- a/fs/ext2/ext2_utils.c
+++ b/fs/ext2/ext2_utils.c
@@ -8,7 +8,7 @@
 
 #include "libext2.h"
 #include "ext2_utils.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 #include "libc/byteorder.h"
 
diff --git a/fs/grubfs/grubfs_fs.c b/fs/grubfs/grubfs_fs.c
index 330cb27..8baeb4c 100644
--- a/fs/grubfs/grubfs_fs.c
+++ b/fs/grubfs/grubfs_fs.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "fs/fs.h"
 #include "filesys.h"
 #include "glue.h"
diff --git a/fs/ioglue.c b/fs/ioglue.c
index 66be2fe..3bc6249 100644
--- a/fs/ioglue.c
+++ b/fs/ioglue.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "fs/fs.h"
 #include "libc/diskio.h"
 #include "os.h"
diff --git a/fs/iso9660/iso9660_mount.c b/fs/iso9660/iso9660_mount.c
index 8f2c0d0..88a38c9 100644
--- a/fs/iso9660/iso9660_mount.c
+++ b/fs/iso9660/iso9660_mount.c
@@ -9,7 +9,7 @@
  */
 
 #include "libiso9660.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 
 void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer)
diff --git a/fs/iso9660/iso9660_read.c b/fs/iso9660/iso9660_read.c
index 836abf4..22cc463 100644
--- a/fs/iso9660/iso9660_read.c
+++ b/fs/iso9660/iso9660_read.c
@@ -7,7 +7,7 @@
  */
 
 #include "libiso9660.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 
 size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count)
diff --git a/fs/iso9660/iso9660_readdir.c b/fs/iso9660/iso9660_readdir.c
index 7d97943..003ffb2 100644
--- a/fs/iso9660/iso9660_readdir.c
+++ b/fs/iso9660/iso9660_readdir.c
@@ -7,7 +7,7 @@
  */
 
 #include "libiso9660.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 
 #define offsetof(t,m)	((long)&(((t *)0)->m))
diff --git a/include/openbios/bindings.h b/include/libopenbios/bindings.h
similarity index 100%
rename from include/openbios/bindings.h
rename to include/libopenbios/bindings.h
diff --git a/include/openbios/elfload.h b/include/libopenbios/elfload.h
similarity index 100%
rename from include/openbios/elfload.h
rename to include/libopenbios/elfload.h
diff --git a/include/openbios/fontdata.h b/include/libopenbios/fontdata.h
similarity index 100%
rename from include/openbios/fontdata.h
rename to include/libopenbios/fontdata.h
diff --git a/include/ipchecksum.h b/include/libopenbios/ipchecksum.h
similarity index 100%
rename from include/ipchecksum.h
rename to include/libopenbios/ipchecksum.h
diff --git a/include/openbios/of.h b/include/libopenbios/of.h
similarity index 100%
rename from include/openbios/of.h
rename to include/libopenbios/of.h
diff --git a/include/ofmem.h b/include/libopenbios/ofmem.h
similarity index 100%
rename from include/ofmem.h
rename to include/libopenbios/ofmem.h
diff --git a/libc/diskio.c b/libc/diskio.c
index b82d829..99f91e1 100644
--- a/libc/diskio.c
+++ b/libc/diskio.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 
 typedef struct {
diff --git a/libc/extra.c b/libc/extra.c
index 7aeb22a..f40c2c5 100644
--- a/libc/extra.c
+++ b/libc/extra.c
@@ -17,7 +17,7 @@
 #include "openbios/config.h"
 #include "libc/string.h"
 #include "libc/vsprintf.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 
 /* strncpy without 0-pad */
 char *
diff --git a/libopenbios/bindings.c b/libopenbios/bindings.c
index 8c3f76e..243530a 100644
--- a/libopenbios/bindings.c
+++ b/libopenbios/bindings.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/string.h"
 #include "libc/stdlib.h"
 #include "libc/byteorder.h"
diff --git a/libopenbios/client.c b/libopenbios/client.c
index 84c1264..afd23d8 100644
--- a/libopenbios/client.c
+++ b/libopenbios/client.c
@@ -15,8 +15,8 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/of.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/of.h"
 
 /* Uncomment to enable debug printout of client interface calls */
 //#define DEBUG_CIF
diff --git a/libopenbios/console_common.c b/libopenbios/console_common.c
index 1839796..0cb0d74 100644
--- a/libopenbios/console_common.c
+++ b/libopenbios/console_common.c
@@ -13,8 +13,8 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/fontdata.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/fontdata.h"
 #include "video_subr.h"
 
 #define FONT_ADJ_HEIGHT	 (FONT_HEIGHT + 2)
diff --git a/libopenbios/elfload.c b/libopenbios/elfload.c
index 65509ab..c448893 100644
--- a/libopenbios/elfload.c
+++ b/libopenbios/elfload.c
@@ -30,8 +30,8 @@
 */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "openbios/elfload.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/elfload.h"
 #include "libc/diskio.h"
 #include "openbios/elf.h"
 
diff --git a/libopenbios/elfnote.c b/libopenbios/elfnote.c
index f46c881..546cec7 100644
--- a/libopenbios/elfnote.c
+++ b/libopenbios/elfnote.c
@@ -3,7 +3,7 @@
 #include "elf_boot.h"
 #include "sys_info.h"
 #include "asm/io.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "openbios-version.h"
 #define printf printk
 #define debug  printk
diff --git a/libopenbios/font_8x16.c b/libopenbios/font_8x16.c
index 30363d0..26c4e44 100644
--- a/libopenbios/font_8x16.c
+++ b/libopenbios/font_8x16.c
@@ -7,7 +7,7 @@
  *                                            *
  **********************************************/
 
-#include "openbios/fontdata.h"
+#include "libopenbios/fontdata.h"
 
 const unsigned char fontdata_8x16[FONTDATAMAX_8X16] = {
 
diff --git a/libopenbios/font_8x8.c b/libopenbios/font_8x8.c
index 3d662e7..861929e 100644
--- a/libopenbios/font_8x8.c
+++ b/libopenbios/font_8x8.c
@@ -4,7 +4,7 @@
 /*                                            */
 /**********************************************/
 
-#include "openbios/fontdata.h"
+#include "libopenbios/fontdata.h"
 
 const unsigned char fontdata_8x8[FONTDATAMAX_8X8] = {
 
diff --git a/libopenbios/ipchecksum.c b/libopenbios/ipchecksum.c
index b2822bd..83f39bc 100644
--- a/libopenbios/ipchecksum.c
+++ b/libopenbios/ipchecksum.c
@@ -1,6 +1,6 @@
 /* Taken from Etherboot */
 
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 
 unsigned short ipchksum(const void *data, unsigned long length)
 {
diff --git a/libopenbios/linuxbios.c b/libopenbios/linuxbios.c
index 84cde1f..72bc0f4 100644
--- a/libopenbios/linuxbios.c
+++ b/libopenbios/linuxbios.c
@@ -5,7 +5,7 @@
 #include "asm/types.h"
 #include "asm/io.h"
 #include "linuxbios.h"
-#include "ipchecksum.h"
+#include "libopenbios/ipchecksum.h"
 #include "sys_info.h"
 
 #ifdef CONFIG_DEBUG_BOOT
diff --git a/libopenbios/ofmem_common.c b/libopenbios/ofmem_common.c
index 760823d..8e7187c 100644
--- a/libopenbios/ofmem_common.c
+++ b/libopenbios/ofmem_common.c
@@ -13,8 +13,8 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
-#include "ofmem.h"
+#include "libopenbios/bindings.h"
+#include "libopenbios/ofmem.h"
 
 /*
  * define OFMEM_FILL_RANGE to claim any unclaimed virtual and
diff --git a/packages/bootinfo-loader.c b/packages/bootinfo-loader.c
index 43da43f..ece6db0 100644
--- a/packages/bootinfo-loader.c
+++ b/packages/bootinfo-loader.c
@@ -15,9 +15,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "packages.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "libc/vsprintf.h"
 
 //#define DEBUG_BOOTINFO
diff --git a/packages/cmdline.c b/packages/cmdline.c
index 0824187..7c3f396 100644
--- a/packages/cmdline.c
+++ b/packages/cmdline.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "packages.h"
 #include "libc/vsprintf.h"
 
diff --git a/packages/deblocker.c b/packages/deblocker.c
index 98e3d35..457a703 100644
--- a/packages/deblocker.c
+++ b/packages/deblocker.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 #include "packages.h"
 
diff --git a/packages/disk-label.c b/packages/disk-label.c
index 4b3c04a..a810d00 100644
--- a/packages/disk-label.c
+++ b/packages/disk-label.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
 #include "packages.h"
 
diff --git a/packages/elf-loader.c b/packages/elf-loader.c
index 455b8a7..87be749 100644
--- a/packages/elf-loader.c
+++ b/packages/elf-loader.c
@@ -15,9 +15,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "packages.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #include "openbios/elf.h"
 #include "asm/elf.h"
diff --git a/packages/mac-parts.c b/packages/mac-parts.c
index d3e9c4b..959a862 100644
--- a/packages/mac-parts.c
+++ b/packages/mac-parts.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "mac-parts.h"
 #include "packages.h"
 
diff --git a/packages/misc-files.c b/packages/misc-files.c
index 245dfe8..ce7a2eb 100644
--- a/packages/misc-files.c
+++ b/packages/misc-files.c
@@ -16,7 +16,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "fs/fs.h"
 #include "libc/diskio.h"
 #include "packages.h"
diff --git a/packages/nvram.c b/packages/nvram.c
index 95c6a6a..b7f052c 100644
--- a/packages/nvram.c
+++ b/packages/nvram.c
@@ -15,7 +15,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "openbios/nvram.h"
 
 #ifdef CONFIG_DEBUG_NVRAM
diff --git a/packages/pc-parts.c b/packages/pc-parts.c
index 2e0cd0b..ff22587 100644
--- a/packages/pc-parts.c
+++ b/packages/pc-parts.c
@@ -13,7 +13,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "packages.h"
 
diff --git a/packages/sun-parts.c b/packages/sun-parts.c
index 572705e..a74db47 100644
--- a/packages/sun-parts.c
+++ b/packages/sun-parts.c
@@ -13,7 +13,7 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/byteorder.h"
 #include "packages.h"
 
diff --git a/packages/video.c b/packages/video.c
index fe8f1a2..dee9728 100644
--- a/packages/video.c
+++ b/packages/video.c
@@ -15,9 +15,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "libc/diskio.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 #include "openbios/drivers.h"
 #include "video_subr.h"
 
diff --git a/packages/xcoff-loader.c b/packages/xcoff-loader.c
index 13d9148..5b5a415 100644
--- a/packages/xcoff-loader.c
+++ b/packages/xcoff-loader.c
@@ -15,9 +15,9 @@
  */
 
 #include "openbios/config.h"
-#include "openbios/bindings.h"
+#include "libopenbios/bindings.h"
 #include "packages.h"
-#include "ofmem.h"
+#include "libopenbios/ofmem.h"
 
 #include "openbios/xcoff.h"