diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index d66dab2..8d76c84 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -32,7 +32,7 @@
 #include "libc/vsprintf.h"
 #define NO_QEMU_PROTOS
 #include "openbios/fw_cfg.h"
-#include "ppc/processor.h"
+#include "arch/ppc/processor.h"
 
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
 
diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c
index 524ecf4..823bd72 100644
--- a/arch/ppc/qemu/methods.c
+++ b/arch/ppc/qemu/methods.c
@@ -24,7 +24,7 @@
 #include "libc/string.h"
 #include "qemu/qemu.h"
 #include "ofmem.h"
-#include "ppc/processor.h"
+#include "arch/ppc/processor.h"
 
 /************************************************************************/
 /*	RTAS (run-time abstraction services)				*/
diff --git a/arch/unix/unix.c b/arch/unix/unix.c
index 9f8a1f7..054e501 100644
--- a/arch/unix/unix.c
+++ b/arch/unix/unix.c
@@ -30,7 +30,7 @@
 #include "openbios/kernel.h"
 #include "dict.h"
 #include "openbios/stack.h"
-#include "unix/plugins.h"
+#include "arch/unix/plugins.h"
 #include "openbios/bindings.h"
 #include "openbios-version.h"
 
diff --git a/include/ppc/asmdefs.h b/include/arch/ppc/asmdefs.h
similarity index 100%
rename from include/ppc/asmdefs.h
rename to include/arch/ppc/asmdefs.h
diff --git a/include/ppc/elf.h b/include/arch/ppc/elf.h
similarity index 100%
rename from include/ppc/elf.h
rename to include/arch/ppc/elf.h
diff --git a/include/ppc/io.h b/include/arch/ppc/io.h
similarity index 100%
rename from include/ppc/io.h
rename to include/arch/ppc/io.h
diff --git a/include/ppc/pci.h b/include/arch/ppc/pci.h
similarity index 100%
rename from include/ppc/pci.h
rename to include/arch/ppc/pci.h
diff --git a/include/ppc/processor.h b/include/arch/ppc/processor.h
similarity index 100%
rename from include/ppc/processor.h
rename to include/arch/ppc/processor.h
diff --git a/include/ppc/types.h b/include/arch/ppc/types.h
similarity index 100%
rename from include/ppc/types.h
rename to include/arch/ppc/types.h
diff --git a/include/unix/plugin_pci.h b/include/arch/unix/plugin_pci.h
similarity index 100%
rename from include/unix/plugin_pci.h
rename to include/arch/unix/plugin_pci.h
diff --git a/include/unix/plugins.h b/include/arch/unix/plugins.h
similarity index 100%
rename from include/unix/plugins.h
rename to include/arch/unix/plugins.h