Index: arch/ia32/src/drivers/i8254.c
===================================================================
--- arch/ia32/src/drivers/i8254.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/drivers/i8254.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -31,6 +31,6 @@
 #include <time/delay.h>
 #include <arch/interrupt.h>
-#include <arch/i8259.h>
-#include <arch/i8254.h>
+#include <arch/drivers/i8259.h>
+#include <arch/drivers/i8254.h>
 #include <cpu.h>
 #include <config.h>
Index: arch/ia32/src/drivers/i8259.c
===================================================================
--- arch/ia32/src/drivers/i8259.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/drivers/i8259.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -27,5 +27,5 @@
  */
 
-#include <arch/i8259.h>
+#include <arch/drivers/i8259.h>
 #include <cpu.h>
 #include <arch/types.h>
Index: arch/ia32/src/drivers/vesa.c
===================================================================
--- arch/ia32/src/drivers/vesa.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/drivers/vesa.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -30,5 +30,5 @@
 
 #include <genarch/fb/fb.h>
-#include <arch/vesa.h>
+#include <arch/drivers/vesa.h>
 #include <putchar.h>
 #include <mm/page.h>
Index: arch/ia32/src/ia32.c
===================================================================
--- arch/ia32/src/ia32.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/ia32.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -35,8 +35,8 @@
 
 #include <arch/drivers/ega.h>
-#include <arch/vesa.h>
+#include <arch/drivers/vesa.h>
 #include <genarch/i8042/i8042.h>
-#include <arch/i8254.h>
-#include <arch/i8259.h>
+#include <arch/drivers/i8254.h>
+#include <arch/drivers/i8259.h>
 
 #include <arch/context.h>
Index: arch/ia32/src/interrupt.c
===================================================================
--- arch/ia32/src/interrupt.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/interrupt.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -32,5 +32,5 @@
 #include <debug.h>
 #include <panic.h>
-#include <arch/i8259.h>
+#include <arch/drivers/i8259.h>
 #include <func.h>
 #include <cpu.h>
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision 41d33aca6323fda79c1a11fc827a1a73ba58c85f)
+++ arch/ia32/src/smp/smp.c	(revision 152b2b0ca223d7a95abf0fbd5e89c977c114a9ce)
@@ -48,5 +48,5 @@
 #include <print.h>
 #include <memstr.h>
-#include <arch/i8259.h>
+#include <arch/drivers/i8259.h>
 
 #ifdef CONFIG_SMP