Index: uspace/drv/hid/adb-kbd/adb-kbd.c
===================================================================
--- uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/adb-kbd/adb-kbd.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -34,5 +34,5 @@
 #include <ddf/log.h>
 #include <errno.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 #include <ipc/adb.h>
 #include <ipc/kbdev.h>
Index: uspace/drv/hid/adb-kbd/ctl.c
===================================================================
--- uspace/drv/hid/adb-kbd/ctl.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/adb-kbd/ctl.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -33,5 +33,5 @@
 
 #include <errno.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
 
Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <ddf/log.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
 #include <io/chardev.h>
-#include <io/console.h>
 #include <ipc/kbdev.h>
 #include <abi/ipc/methods.h>
Index: uspace/drv/hid/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -40,5 +40,4 @@
 #include <io/keycode.h>
 #include <io/chardev.h>
-#include <io/console.h>
 #include <ipc/mouseev.h>
 #include <abi/ipc/methods.h>
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -41,5 +41,5 @@
 
 #include <io/keycode.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 #include <abi/ipc/methods.h>
 #include <ipc/kbdev.h>
Index: uspace/drv/hid/usbhid/kbd/kbdrepeat.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbdrepeat.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/usbhid/kbd/kbdrepeat.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -36,6 +36,6 @@
 
 #include <fibril_synch.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
-#include <io/console.h>
 #include <errno.h>
 
Index: uspace/drv/hid/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/usbhid/mouse/mousedev.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -46,5 +46,4 @@
 #include <str_error.h>
 #include <ipc/mouseev.h>
-#include <io/console.h>
 
 #include <ipc/kbdev.h>
Index: uspace/drv/hid/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -51,5 +51,5 @@
 
 #include <ipc/kbdev.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 
 #define NAME  "multimedia-keys"
Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision 590cb6d21c857534d940c4c0a165a9997826a0b0)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision a635535739c9e7901c0b9b5b1890f38965383f17)
@@ -39,5 +39,5 @@
 #include <io/keycode.h>
 #include <io/chardev.h>
-#include <io/console.h>
+#include <io/kbd_event.h>
 #include <ipc/kbdev.h>
 #include <abi/ipc/methods.h>