Index: uspace/srv/hid/input/ctl/kbdev.c
===================================================================
--- uspace/srv/hid/input/ctl/kbdev.c	(revision 16dc8870242df10ae64ee7bcbf125aa8607cb7fb)
+++ uspace/srv/hid/input/ctl/kbdev.c	(revision 6d605e69652806366168cf5466d2498cf2f28dbf)
@@ -50,7 +50,6 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <vfs/vfs_sess.h>
 #include <sys/typefmt.h>
-#include <vfs/vfs_sess.h>
-
 
 static int kbdev_ctl_init(kbd_dev_t *);
Index: uspace/srv/hid/input/generic/input.c
===================================================================
--- uspace/srv/hid/input/generic/input.c	(revision 16dc8870242df10ae64ee7bcbf125aa8607cb7fb)
+++ uspace/srv/hid/input/generic/input.c	(revision 6d605e69652806366168cf5466d2498cf2f28dbf)
@@ -488,5 +488,4 @@
  *
  */
-#include <sys/typefmt.h>
 static int dev_discovery_fibril(void *arg)
 {
@@ -615,5 +614,5 @@
 	/* Add legacy keyboard devices. */
 	kbd_add_legacy_devs();
-
+	
 	/* Add legacy mouse devices. */
 	mouse_add_legacy_devs();