Index: kernel/genarch/include/kbd/i8042.h
===================================================================
--- kernel/genarch/include/kbd/i8042.h	(revision 253f35a1d714bef0e93e4a79768b7342ccc84123)
+++ kernel/genarch/include/kbd/i8042.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -36,8 +36,11 @@
 #define KERN_I8042_H_
 
+#include <typedefs.h>
+
 extern void i8042_init(void);
 extern void i8042_poll(void);
 extern void i8042_grab(void);
 extern void i8042_release(void);
+extern char i8042_key_read(chardev_t *d);
 
 #endif
Index: kernel/genarch/include/kbd/key.h
===================================================================
--- kernel/genarch/include/kbd/key.h	(revision 253f35a1d714bef0e93e4a79768b7342ccc84123)
+++ kernel/genarch/include/kbd/key.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -50,6 +50,4 @@
 extern void active_read_key_pressed(uint8_t sc);
 
-extern char key_read(chardev_t *d);
-
 #endif
 
Index: kernel/genarch/include/kbd/ns16550.h
===================================================================
--- kernel/genarch/include/kbd/ns16550.h	(revision 253f35a1d714bef0e93e4a79768b7342ccc84123)
+++ kernel/genarch/include/kbd/ns16550.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -38,8 +38,11 @@
 #define KERN_NS16550_H_
 
+#include <typedefs.h>
+
 extern void ns16550_init(void);
 extern void ns16550_poll(void);
 extern void ns16550_grab(void);
 extern void ns16550_release(void);
+extern char ns16550_key_read(chardev_t *d);
 
 #endif
Index: kernel/genarch/include/kbd/z8530.h
===================================================================
--- kernel/genarch/include/kbd/z8530.h	(revision 253f35a1d714bef0e93e4a79768b7342ccc84123)
+++ kernel/genarch/include/kbd/z8530.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -49,4 +49,5 @@
 extern void z8530_release(void);
 extern void z8530_interrupt(void);
+extern char z8530_key_read(chardev_t *d);
 
 #endif