Index: kernel/genarch/include/drivers/z8530/z8530.h
===================================================================
--- kernel/genarch/include/drivers/z8530/z8530.h	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/genarch/include/drivers/z8530/z8530.h	(revision 449d4ecc8ed0c2a118f9433897e4bc57e096211c)
@@ -121,5 +121,5 @@
 } z8530_instance_t;
 
-extern devin_t *z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *);
+extern indev_t *z8530_init(z8530_t *, devno_t, inr_t, cir_t, void *);
 
 #endif
Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c
===================================================================
--- kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision 449d4ecc8ed0c2a118f9433897e4bc57e096211c)
@@ -40,5 +40,5 @@
 #include <arch/asm.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
 	.poll = NULL
 };
Index: kernel/genarch/src/drivers/i8042/i8042.c
===================================================================
--- kernel/genarch/src/drivers/i8042/i8042.c	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/genarch/src/drivers/i8042/i8042.c	(revision 449d4ecc8ed0c2a118f9433897e4bc57e096211c)
@@ -43,5 +43,5 @@
 #include <mm/slab.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
 	.poll = NULL
 };
Index: kernel/genarch/src/drivers/ns16550/ns16550.c
===================================================================
--- kernel/genarch/src/drivers/ns16550/ns16550.c	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 449d4ecc8ed0c2a118f9433897e4bc57e096211c)
@@ -43,5 +43,5 @@
 #define LSR_DATA_READY  0x01
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
 	.poll = NULL
 };
@@ -65,5 +65,5 @@
 	if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
 		uint8_t x = pio_read_8(&dev->rbr);
-		chardev_push_character(&instance->kbrdin, x);
+		indev_push_character(&instance->kbrdin, x);
 	}
 }
Index: kernel/genarch/src/drivers/z8530/z8530.c
===================================================================
--- kernel/genarch/src/drivers/z8530/z8530.c	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/genarch/src/drivers/z8530/z8530.c	(revision 449d4ecc8ed0c2a118f9433897e4bc57e096211c)
@@ -41,5 +41,5 @@
 #include <mm/slab.h>
 
-indev_operations_t kbrdin_ops = {
+static indev_operations_t kbrdin_ops = {
 	.poll = NULL
 };
@@ -83,5 +83,5 @@
 	if (z8530_read(&dev->ctl_a, RR0) & RR0_RCA) {
 		uint8_t x = z8530_read(&dev->ctl_a, RR8);
-		chardev_push_character(&instance->kbrdin, x);
+		indev_push_character(&instance->kbrdin, x);
 	}
 }