Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
+++ kernel/genarch/src/kbd/ns16550.c	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -40,5 +40,5 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/ns16550.h>
-#include <irq.h>
+#include <ddi/irq.h>
 #include <arch/interrupt.h>
 #include <cpu.h>
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
+++ kernel/genarch/src/kbd/z8530.c	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -40,5 +40,5 @@
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/z8530.h>
-#include <irq.h>
+#include <ddi/irq.h>
 #include <arch/interrupt.h>
 #include <arch/drivers/kbd.h>