Index: uspace/drv/usbkbd/conv.c
===================================================================
--- uspace/drv/usbkbd/conv.c	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/conv.c	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -26,4 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+/** @addtogroup drvusbhid
+ * @{
+ */
+/** @file
+ * USB scancode parser.
+ */
+
 #include <io/keycode.h>
 #include <stdint.h>
@@ -185,2 +193,6 @@
 	return key;
 }
+
+/**
+ * @}
+ */
Index: uspace/drv/usbkbd/conv.h
===================================================================
--- uspace/drv/usbkbd/conv.h	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/conv.h	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -27,9 +27,9 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbhid
  * @{
  */
 /** @file
- * @brief USB Scancode parser.
+ * USB scancode parser.
  */
 
@@ -40,2 +40,6 @@
 
 #endif
+
+/**
+ * @}
+ */
Index: uspace/drv/usbkbd/descdump.c
===================================================================
--- uspace/drv/usbkbd/descdump.c	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/descdump.c	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -26,6 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhid
  * @{
+ */
+/** @file
+ * Descriptor dumping.
  */
 
Index: uspace/drv/usbkbd/descdump.h
===================================================================
--- uspace/drv/usbkbd/descdump.h	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/descdump.h	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -26,7 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhid
  * @{
  */
+/** @file
+ * Descriptor dumping.
+ */
+
 #ifndef USBHID_DESCDUMP_H_
 #define USBHID_DESCDUMP_H_
Index: uspace/drv/usbkbd/descparser.c
===================================================================
--- uspace/drv/usbkbd/descparser.c	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/descparser.c	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -26,6 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhid
  * @{
+ */
+/** @file
+ * Descriptor parser.
  */
 
Index: uspace/drv/usbkbd/descparser.h
===================================================================
--- uspace/drv/usbkbd/descparser.h	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/descparser.h	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -26,6 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhid
  * @{
+ */
+/** @file
+ * Descriptor parser.
  */
 
Index: uspace/drv/usbkbd/kbd.h
===================================================================
--- uspace/drv/usbkbd/kbd.h	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/kbd.h	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -0,0 +1,5 @@
+/*
+ * Dummy file because of shared layout sources.
+ *
+ * Do not delete.
+ */
Index: uspace/drv/usbkbd/layout.h
===================================================================
--- uspace/drv/usbkbd/layout.h	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/layout.h	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -1,3 +1,4 @@
 /*
+ * Copyright (c) 2009 Jiri Svoboda
  * Copyright (c) 2011 Lubos Slovak 
  * (copied from /uspace/srv/hid/kbd/include/layout.h)
@@ -28,10 +29,9 @@
  */
 
-/** @addtogroup usb
- * @brief 
- * @ingroup
+/** @addtogroup drvusbhid
  * @{
  */
 /** @file
+ * Keyboard layout.
  */
 
Index: uspace/drv/usbkbd/main.c
===================================================================
--- uspace/drv/usbkbd/main.c	(revision 76d9eb7e8b3eaa6b16eca5cc29e8ed76d6e7f21c)
+++ uspace/drv/usbkbd/main.c	(revision 1c13dac34485edef8150ea75b0f2e85c20e46259)
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -26,7 +27,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhid
  * @{
  */
+/**
+ * @file
+ * Main routines of USB HID driver.
+ */
+
 #include <usb/usbdrv.h>
 #include <driver.h>