Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 1875a0cf8b7ababbd10c80d697a15be242d70773)
+++ uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299)
@@ -192,5 +192,5 @@
 static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
 {	
-	/* Create the function exposed under /dev/devices. */
+	/* Create the exposed function. */
 	/** @todo Generate numbers for the devices? */
 	usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 1875a0cf8b7ababbd10c80d697a15be242d70773)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299)
@@ -524,5 +524,5 @@
 	assert(kbd_dev != NULL);
 	
-	/* Create the function exposed under /dev/devices. */
+	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
 	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 1875a0cf8b7ababbd10c80d697a15be242d70773)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299)
@@ -325,5 +325,5 @@
 	assert(mouse != NULL);
 	
-	/* Create the function exposed under /dev/devices. */
+	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
 	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
Index: uspace/drv/bus/usb/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision 1875a0cf8b7ababbd10c80d697a15be242d70773)
+++ uspace/drv/bus/usb/usbhid/multimedia/multimedia.c	(revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299)
@@ -185,5 +185,5 @@
     usb_multimedia_t *multim_dev)
 {
-	/* Create the function exposed under /dev/devices. */
+	/* Create the exposed function. */
 	ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
 	    NAME);
Index: uspace/drv/bus/usb/vhc/main.c
===================================================================
--- uspace/drv/bus/usb/vhc/main.c	(revision 1875a0cf8b7ababbd10c80d697a15be242d70773)
+++ uspace/drv/bus/usb/vhc/main.c	(revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299)
@@ -34,5 +34,5 @@
  */
 
-#include <devmap.h>
+#include <loc.h>
 #include <async.h>
 #include <unistd.h>