Index: uspace/srv/hid/input/port/adb.c
===================================================================
--- uspace/srv/hid/input/port/adb.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/adb.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -37,11 +37,11 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <input.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <vfs/vfs.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <loc.h>
+#include "../input.h"
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
Index: uspace/srv/hid/input/port/adb_mouse.c
===================================================================
--- uspace/srv/hid/input/port/adb_mouse.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/adb_mouse.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -37,10 +37,10 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <input.h>
-#include <mouse_port.h>
-#include <mouse.h>
 #include <errno.h>
 #include <loc.h>
 #include <stdio.h>
+#include "../mouse.h"
+#include "../mouse_port.h"
+#include "../input.h"
 
 static mouse_dev_t *mouse_dev;
Index: uspace/srv/hid/input/port/chardev.c
===================================================================
--- uspace/srv/hid/input/port/chardev.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/chardev.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -37,10 +37,10 @@
 #include <ipc/char.h>
 #include <async.h>
-#include <input.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <loc.h>
 #include <errno.h>
 #include <stdio.h>
+#include "../input.h"
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
Index: uspace/srv/hid/input/port/gxemul.c
===================================================================
--- uspace/srv/hid/input/port/gxemul.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/gxemul.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -31,15 +31,15 @@
  * @{
  * @ingroup  kbd
- */ 
+ */
 /** @file
- * @brief	GXEmul keyboard port driver.
+ * @brief GXEmul keyboard port driver.
  */
 
 #include <async.h>
 #include <sysinfo.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <ddi.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int gxemul_port_init(kbd_dev_t *);
Index: uspace/srv/hid/input/port/msim.c
===================================================================
--- uspace/srv/hid/input/port/msim.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/msim.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -38,8 +38,8 @@
 #include <async.h>
 #include <sysinfo.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <ddi.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int msim_port_init(kbd_dev_t *);
Index: uspace/srv/hid/input/port/niagara.c
===================================================================
--- uspace/srv/hid/input/port/niagara.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/niagara.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -31,7 +31,7 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief	Niagara console keyboard port driver.
+ * @brief Niagara console keyboard port driver.
  */
 
@@ -39,6 +39,4 @@
 #include <ddi.h>
 #include <async.h>
-#include <kbd.h>
-#include <kbd_port.h>
 #include <sysinfo.h>
 #include <stdio.h>
@@ -46,4 +44,6 @@
 #include <bool.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int niagara_port_init(kbd_dev_t *);
Index: uspace/srv/hid/input/port/ns16550.c
===================================================================
--- uspace/srv/hid/input/port/ns16550.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/ns16550.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -39,9 +39,9 @@
 #include <async.h>
 #include <sysinfo.h>
-#include <input.h>
-#include <kbd.h>
-#include <kbd_port.h>
 #include <ddi.h>
 #include <errno.h>
+#include "../input.h"
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int ns16550_port_init(kbd_dev_t *);
Index: uspace/srv/hid/input/port/pl050.c
===================================================================
--- uspace/srv/hid/input/port/pl050.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/pl050.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -41,9 +41,9 @@
 #include <unistd.h>
 #include <sysinfo.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <ddi.h>
 #include <stdio.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int pl050_port_init(kbd_dev_t *);
Index: uspace/srv/hid/input/port/ski.c
===================================================================
--- uspace/srv/hid/input/port/ski.c	(revision 8486c070d3e8193fcd8774597aa3c3438d3ba2c9)
+++ uspace/srv/hid/input/port/ski.c	(revision c9d011e461c8de4fa3666deea96193e56c492cca)
@@ -31,17 +31,16 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief	Ski console keyboard port driver.
+ * @brief Ski console keyboard port driver.
  */
-
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <kbd.h>
-#include <kbd_port.h>
 #include <sys/types.h>
 #include <thread.h>
 #include <bool.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int ski_port_init(kbd_dev_t *);