Index: kernel/arch/ppc32/src/asm.S
===================================================================
--- kernel/arch/ppc32/src/asm.S	(revision 655f70bc5b9e0071345a88b9cbe16715a93be963)
+++ kernel/arch/ppc32/src/asm.S	(revision 62e29ae5f645bf21d435ed963fd911061e16c11d)
@@ -28,5 +28,5 @@
 
 #include <arch/asm/regname.h>
-#include <arch/cpu.h>
+#include <arch/msr.h>
 
 .text
Index: kernel/arch/ppc32/src/exception.S
===================================================================
--- kernel/arch/ppc32/src/exception.S	(revision 655f70bc5b9e0071345a88b9cbe16715a93be963)
+++ kernel/arch/ppc32/src/exception.S	(revision 62e29ae5f645bf21d435ed963fd911061e16c11d)
@@ -28,5 +28,5 @@
 
 #include <arch/asm/regname.h>
-#include <arch/cpu.h>
+#include <arch/msr.h>
 #include <arch/mm/page.h>
 
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision 655f70bc5b9e0071345a88b9cbe16715a93be963)
+++ kernel/arch/ppc32/src/ppc32.c	(revision 62e29ae5f645bf21d435ed963fd911061e16c11d)
@@ -41,10 +41,10 @@
 #include <interrupt.h>
 #include <genarch/fb/fb.h>
-#include <genarch/fb/visuals.h>
+#include <abi/fb/visuals.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <genarch/ofw/pci.h>
 #include <userspace.h>
 #include <mm/page.h>
-#include <proc/uarg.h>
+#include <abi/proc/uarg.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>