Index: kernel/genarch/include/kbd/ns16550.h
===================================================================
--- kernel/genarch/include/kbd/ns16550.h	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
+++ kernel/genarch/include/kbd/ns16550.h	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -39,5 +39,5 @@
 
 #include <typedefs.h>
-#include <irq.h>
+#include <ddi/irq.h>
 
 extern void ns16550_init(void);
Index: kernel/genarch/include/kbd/z8530.h
===================================================================
--- kernel/genarch/include/kbd/z8530.h	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
+++ kernel/genarch/include/kbd/z8530.h	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -38,6 +38,6 @@
 #define KERN_Z8530_H_
 
-#include <irq.h>
 #include <typedefs.h>
+#include <ddi/irq.h>
 
 extern bool z8530_belongs_to_kernel;