Index: uspace/drv/usbhid/generic/hiddev.h
===================================================================
--- uspace/drv/usbhid/generic/hiddev.h	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
+++ uspace/drv/usbhid/generic/hiddev.h	(revision 74a1ba9b8862d14bcdd1b8b0c0766790b1d5e6c5)
@@ -34,6 +34,6 @@
  */
 
-#ifndef USB_HIDD_H_
-#define USB_HIDD_H_
+#ifndef USB_HIDDDEV_H_
+#define USB_HIDDDEV_H_
 
 #include <usb/devdrv.h>
@@ -47,5 +47,5 @@
      size_t buffer_size, void *arg);
 
-#endif // USB_HIDD_H_
+#endif // USB_HIDDDEV_H_
 
 /**
Index: uspace/drv/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.c	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
+++ uspace/drv/usbhid/kbd/kbddev.c	(revision 74a1ba9b8862d14bcdd1b8b0c0766790b1d5e6c5)
@@ -238,5 +238,5 @@
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun,
+static void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {
Index: uspace/drv/usbhid/kbd/kbddev.h
===================================================================
--- uspace/drv/usbhid/kbd/kbddev.h	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
+++ uspace/drv/usbhid/kbd/kbddev.h	(revision 74a1ba9b8862d14bcdd1b8b0c0766790b1d5e6c5)
@@ -65,8 +65,4 @@
  */
 typedef struct usb_kbd_t {
-	/** Structure holding generic USB device information. */
-	//usbhid_dev_t *hid_dev;
-	//usb_device_t *usb_dev;
-	
 	/** Currently pressed keys (not translated to key codes). */
 	uint8_t *keys;
@@ -91,10 +87,4 @@
 	fibril_mutex_t *repeat_mtx;
 	
-	/** Report descriptor. */
-	//uint8_t *report_desc;
-
-	/** Report descriptor size. */
-	//size_t report_desc_size;
-	
 	uint8_t *output_buffer;
 	
@@ -106,7 +96,4 @@
 	
 	int32_t *led_data;
-
-	/** HID Report parser. */
-	//usb_hid_report_parser_t *parser;
 	
 	/** State of the structure (for checking before use). 
@@ -121,14 +108,4 @@
 /*----------------------------------------------------------------------------*/
 
-//enum {
-//	USB_KBD_POLL_EP_NO = 0,
-//	USB_HID_POLL_EP_NO = 1,
-//	USB_KBD_POLL_EP_COUNT = 2
-//};
-
-//usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1];
-
-//ddf_dev_ops_t keyboard_ops;
-
 usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
@@ -138,13 +115,8 @@
 /*----------------------------------------------------------------------------*/
 
-//usb_kbd_t *usb_kbd_new(void);
-
 int usb_kbd_init(struct usb_hid_dev_t *hid_dev);
 
 bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
      size_t buffer_size, void *arg);
-
-//void usb_kbd_polling_ended_callback(usb_device_t *dev, bool reason, 
-//     void *arg);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -157,5 +129,4 @@
     int type, unsigned int key);
 
-
 void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev);