Index: kernel/genarch/include/kbd/ns16550.h
===================================================================
--- kernel/genarch/include/kbd/ns16550.h	(revision 33b1903874cd850ebac379b21a620e3f022b3fe1)
+++ kernel/genarch/include/kbd/ns16550.h	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
@@ -39,4 +39,5 @@
 
 #include <typedefs.h>
+#include <irq.h>
 
 extern void ns16550_init(void);
@@ -45,4 +46,6 @@
 extern void ns16550_release(void);
 extern char ns16550_key_read(chardev_t *d);
+extern irq_ownership_t ns16550_claim(void);
+extern void ns16550_irq_handler(irq_t *irq, void *arg, ...);
 
 #endif
Index: kernel/genarch/include/kbd/z8530.h
===================================================================
--- kernel/genarch/include/kbd/z8530.h	(revision 33b1903874cd850ebac379b21a620e3f022b3fe1)
+++ kernel/genarch/include/kbd/z8530.h	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
@@ -38,7 +38,6 @@
 #define KERN_Z8530_H_
 
+#include <irq.h>
 #include <typedefs.h>
-
-#define Z8530_INTRCV_DATA0	0x39	/* hardcoded for use in Simics */
 
 extern bool z8530_belongs_to_kernel;
@@ -50,4 +49,6 @@
 extern void z8530_interrupt(void);
 extern char z8530_key_read(chardev_t *d);
+extern irq_ownership_t z8530_claim(void);
+extern void z8530_irq_handler(irq_t *irq, void *arg, ...);
 
 #endif