Index: uspace/srv/kbd/layout/cz.c
===================================================================
--- uspace/srv/kbd/layout/cz.c	(revision fe24a52e32df33ad65aa19e51965156f5a123965)
+++ uspace/srv/kbd/layout/cz.c	(revision 215abc165fc8eda817e4c859ba67ddcadb7c1e64)
@@ -28,21 +28,21 @@
 
 /** @addtogroup kbd
- * @brief	US QWERTY leyout.
+ * @brief US QWERTY leyout.
  * @{
- */ 
+ */
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <bool.h>
 #include <layout.h>
 
 static void layout_reset(void);
-static wchar_t layout_parse_ev(kbd_event_t *ev);
+static wchar_t layout_parse_ev(console_event_t *ev);
 
 enum m_state {
 	ms_start,
 	ms_hacek,
-	ms_carka	
+	ms_carka
 };
 
@@ -273,5 +273,5 @@
 }
 
-static wchar_t parse_ms_hacek(kbd_event_t *ev)
+static wchar_t parse_ms_hacek(console_event_t *ev)
 {
 	wchar_t c;
@@ -291,5 +291,5 @@
 }
 
-static wchar_t parse_ms_carka(kbd_event_t *ev)
+static wchar_t parse_ms_carka(console_event_t *ev)
 {
 	wchar_t c;
@@ -309,5 +309,5 @@
 }
 
-static wchar_t parse_ms_start(kbd_event_t *ev)
+static wchar_t parse_ms_start(console_event_t *ev)
 {
 	wchar_t c;
@@ -384,16 +384,19 @@
 }
 
-static wchar_t layout_parse_ev(kbd_event_t *ev)
-{
-	if (ev->type != KE_PRESS)
-		return '\0';
-
+static wchar_t layout_parse_ev(console_event_t *ev)
+{
+	if (ev->type != KEY_PRESS)
+		return 0;
+	
 	if (key_is_mod(ev->key))
-		return '\0';
-
+		return 0;
+	
 	switch (mstate) {
-	case ms_start: return parse_ms_start(ev);
-	case ms_hacek: return parse_ms_hacek(ev);
-	case ms_carka: return parse_ms_carka(ev);
+	case ms_start:
+		return parse_ms_start(ev);
+	case ms_hacek:
+		return parse_ms_hacek(ev);
+	case ms_carka:
+		return parse_ms_carka(ev);
 	}
 }
@@ -401,3 +404,3 @@
 /**
  * @}
- */ 
+ */
Index: uspace/srv/kbd/layout/us_dvorak.c
===================================================================
--- uspace/srv/kbd/layout/us_dvorak.c	(revision fe24a52e32df33ad65aa19e51965156f5a123965)
+++ uspace/srv/kbd/layout/us_dvorak.c	(revision 215abc165fc8eda817e4c859ba67ddcadb7c1e64)
@@ -33,10 +33,10 @@
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <layout.h>
 
 static void layout_reset(void);
-static wchar_t layout_parse_ev(kbd_event_t *ev);
+static wchar_t layout_parse_ev(console_event_t *ev);
 
 layout_op_t us_dvorak_op = {
@@ -210,5 +210,5 @@
 }
 
-static wchar_t layout_parse_ev(kbd_event_t *ev)
+static wchar_t layout_parse_ev(console_event_t *ev)
 {
 	wchar_t c;
Index: uspace/srv/kbd/layout/us_qwerty.c
===================================================================
--- uspace/srv/kbd/layout/us_qwerty.c	(revision fe24a52e32df33ad65aa19e51965156f5a123965)
+++ uspace/srv/kbd/layout/us_qwerty.c	(revision 215abc165fc8eda817e4c859ba67ddcadb7c1e64)
@@ -33,10 +33,10 @@
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <layout.h>
 
 static void layout_reset(void);
-static wchar_t layout_parse_ev(kbd_event_t *ev);
+static wchar_t layout_parse_ev(console_event_t *ev);
 
 layout_op_t us_qwerty_op = {
@@ -204,5 +204,5 @@
 }
 
-static wchar_t layout_parse_ev(kbd_event_t *ev)
+static wchar_t layout_parse_ev(console_event_t *ev)
 {
 	wchar_t c;