Index: uspace/drv/usbhid/usbhid.h
===================================================================
--- uspace/drv/usbhid/usbhid.h	(revision 662da502d6b512eb18ec62af4266220ef8e12574)
+++ uspace/drv/usbhid/usbhid.h	(revision d0225002b3721b9a95b472cb786542ddff10ab0a)
@@ -46,13 +46,14 @@
 #include <bool.h>
 
-struct usb_hid_dev;
+typedef struct usb_hid_dev usb_hid_dev_t;
+typedef struct usb_hid_subdriver usb_hid_subdriver_t;
 
-typedef int (*usb_hid_driver_init_t)(struct usb_hid_dev *, void **data);
-typedef void (*usb_hid_driver_deinit_t)(struct usb_hid_dev *, void *data);
-typedef bool (*usb_hid_driver_poll_t)(struct usb_hid_dev *, void *data);
-typedef int (*usb_hid_driver_poll_ended_t)(struct usb_hid_dev *, void *data, 
+typedef int (*usb_hid_driver_init_t)(usb_hid_dev_t *dev, void **data);
+typedef void (*usb_hid_driver_deinit_t)(usb_hid_dev_t *dev, void *data);
+typedef bool (*usb_hid_driver_poll_t)(usb_hid_dev_t *dev, void *data);
+typedef int (*usb_hid_driver_poll_ended_t)(usb_hid_dev_t *dev, void *data,
                                          bool reason);
 
-typedef struct usb_hid_subdriver {	
+struct usb_hid_subdriver {
 	/** Function to be called when initializing HID device. */
 	usb_hid_driver_init_t init;
@@ -65,5 +66,5 @@
 	/** Arbitrary data needed by the subdriver. */
 	void *data;
-} usb_hid_subdriver_t;
+};
 
 /*----------------------------------------------------------------------------*/
@@ -71,5 +72,5 @@
  * Structure for holding general HID device data.
  */
-typedef struct usb_hid_dev {
+struct usb_hid_dev {
 	/** Structure holding generic USB device information. */
 	usb_device_t *usb_dev;
@@ -101,5 +102,5 @@
 	
 	int report_nr;
-} usb_hid_dev_t;
+};
 
 /*----------------------------------------------------------------------------*/
