diff --git a/src/kernel/drivers/arch/x86/console/console.c b/src/kernel/drivers/arch/x86/console/console.c
index e28d1f66cb..af6bf1e0cc 100755
--- a/src/kernel/drivers/arch/x86/console/console.c
+++ b/src/kernel/drivers/arch/x86/console/console.c
@@ -3,22 +3,15 @@
 ** Distributed under the terms of the NewOS License.
 */
 
-#include <kernel.h>
-#include <console.h>
-#include <debug.h>
-#include <memheap.h>
-#include <int.h>
-#include <vm.h>
-#include <lock.h>
+#include <KernelExport.h>
 #include <Drivers.h>
-#include <Errors.h>
+#include <console.h>
+#include <vm.h>
 #include <devfs.h>
 
-#include <arch/cpu.h>
-#include <arch/int.h>
-
 #include <string.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include <arch/x86/console_dev.h>
 
@@ -200,7 +193,7 @@ static status_t
 console_read(void *cookie, off_t pos, void *buf, size_t *len)
 {
 	/* XXX - optimistic!! */
-	*len = _kern_read(keyboard_fd, 0, buf, *len);
+	*len = read_pos(keyboard_fd, 0, buf, *len);
 	return B_OK;
 }
 
@@ -327,7 +320,7 @@ console_dev_init(kernel_args *ka)
 		update_cursor(x, y);
 
 		mutex_init(&console_lock, "console_lock");
-		keyboard_fd = _kern_open("/dev/keyboard", 0);
+		keyboard_fd = open("/dev/keyboard", O_RDONLY);
 		if (keyboard_fd < 0)
 			panic("console_dev_init: error opening /dev/keyboard\n");
 
diff --git a/src/kernel/drivers/fb_console/fb_console.c b/src/kernel/drivers/fb_console/fb_console.c
index 8eb3af2a12..52d79bf6e1 100755
--- a/src/kernel/drivers/fb_console/fb_console.c
+++ b/src/kernel/drivers/fb_console/fb_console.c
@@ -1,6 +1,6 @@
 /*
 ** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
-** Distributed under the terms of the OpenBeOS License.
+** Distributed under the terms of the Haiku License.
 **
 ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
 ** Distributed under the terms of the NewOS License.
@@ -322,7 +322,7 @@ console_close(void * cookie)
 static status_t
 console_read(void * cookie, off_t pos, void *buffer, size_t *_length)
 {
-	ssize_t bytesRead = _kern_read(console.keyboard_fd, 0, buffer, *_length);
+	ssize_t bytesRead = read_pos(console.keyboard_fd, 0, buffer, *_length);
 	if (bytesRead >= 0) {
 		*_length = bytesRead;
 		return B_OK;
@@ -507,7 +507,7 @@ fb_console_dev_init(kernel_args *ka)
 		repaint();
 
 		mutex_init(&console.lock, "console_lock");
-		console.keyboard_fd = _kern_open("/dev/keyboard", 0);
+		console.keyboard_fd = open("/dev/keyboard", O_RDONLY);
 		if (console.keyboard_fd < 0)
 			panic("fb_console_dev_init: error opening /dev/keyboard\n");