Index: uspace/srv/hid/input/ctl/apple.c
===================================================================
--- uspace/srv/hid/input/ctl/apple.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/apple.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -36,9 +36,9 @@
  */
 
-#include <kbd.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
+#include "../kbd.h"
+#include "../kbd_ctl.h"
+#include "../kbd_port.h"
 
 static void apple_ctl_parse(sysarg_t);
Index: uspace/srv/hid/input/ctl/gxe_fb.c
===================================================================
--- uspace/srv/hid/input/ctl/gxe_fb.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/gxe_fb.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -33,14 +33,14 @@
 /**
  * @file
- * @brief	GXEmul framebuffer-mode keyboard controller driver.
+ * @brief GXEmul framebuffer-mode keyboard controller driver.
  */
 
-#include <kbd.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
-#include <gsp.h>
-#include <stroke.h>
+#include "../stroke.h"
+#include "../gsp.h"
+#include "../kbd.h"
+#include "../kbd_port.h"
+#include "../kbd_ctl.h"
 
 static void gxe_fb_ctl_parse(sysarg_t);
Index: uspace/srv/hid/input/ctl/kbdev.c
===================================================================
--- uspace/srv/hid/input/ctl/kbdev.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/kbdev.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -40,16 +40,16 @@
 #include <errno.h>
 #include <fcntl.h>
-#include <gsp.h>
 #include <io/console.h>
 #include <io/keycode.h>
 #include <ipc/kbdev.h>
-#include <input.h>
-#include <kbd.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
 #include <loc.h>
 #include <stdlib.h>
 #include <vfs/vfs_sess.h>
 #include <sys/typefmt.h>
+#include "../gsp.h"
+#include "../input.h"
+#include "../kbd.h"
+#include "../kbd_ctl.h"
+#include "../kbd_port.h"
 
 static int kbdev_ctl_init(kbd_dev_t *);
Index: uspace/srv/hid/input/ctl/pc.c
===================================================================
--- uspace/srv/hid/input/ctl/pc.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/pc.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -36,10 +36,10 @@
  */
 
-#include <kbd.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
-#include <gsp.h>
+#include "../gsp.h"
+#include "../kbd.h"
+#include "../kbd_port.h"
+#include "../kbd_ctl.h"
 
 static void pc_ctl_parse(sysarg_t);
Index: uspace/srv/hid/input/ctl/stty.c
===================================================================
--- uspace/srv/hid/input/ctl/stty.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/stty.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -38,10 +38,10 @@
  */
 
-#include <kbd.h>
 #include <io/keycode.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
-#include <gsp.h>
-#include <stroke.h>
+#include "../stroke.h"
+#include "../gsp.h"
+#include "../kbd.h"
+#include "../kbd_port.h"
+#include "../kbd_ctl.h"
 
 static void stty_ctl_parse(sysarg_t);
Index: uspace/srv/hid/input/ctl/sun.c
===================================================================
--- uspace/srv/hid/input/ctl/sun.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
+++ uspace/srv/hid/input/ctl/sun.c	(revision b6a088fcb1dd32d5b6970439fa4b960a6545239e)
@@ -37,9 +37,9 @@
  */
 
-#include <kbd.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include <kbd_ctl.h>
-#include <kbd_port.h>
+#include "../kbd.h"
+#include "../kbd_port.h"
+#include "../kbd_ctl.h"
 
 static void sun_ctl_parse(sysarg_t);