Index: uspace/drv/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.c	(revision a49e17176a379a47b42277c9a627431062cf002e)
+++ uspace/drv/usbhid/mouse/mousedev.c	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
@@ -231,5 +231,5 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_init(struct usb_hid_dev_t *hid_dev)
+int usb_mouse_init(usb_hid_dev_t *hid_dev)
 {
 	usb_log_debug("Initializing HID/Mouse structure...\n");
@@ -252,11 +252,9 @@
 	
 	// set handler for incoming calls
-	// TODO: now does this behave when we have more such handlers in
-	//       one actual driver??
 	hid_dev->ops.default_handler = default_connection_handler;
 	
 	// TODO: how to know if the device supports the request???
-//	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
-//	    hid_dev->usb_dev->interface_no, IDLE_RATE);
+	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
+	    hid_dev->usb_dev->interface_no, IDLE_RATE);
 	
 	return EOK;
@@ -265,11 +263,11 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
+bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, uint8_t *buffer,
+     size_t buffer_size)
 {
 	usb_log_debug("usb_mouse_polling_callback()\n");
 	usb_debug_str_buffer(buffer, buffer_size, 0);
 	
-	if (arg == NULL) {
+	if (hid_dev == NULL) {
 		usb_log_error("Missing argument to the mouse polling callback."
 		    "\n");
@@ -277,5 +275,4 @@
 	}
 	
-	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
 	if (hid_dev->data == NULL) {
 		usb_log_error("Wrong argument to the mouse polling callback."
@@ -290,5 +287,5 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_mouse_deinit(struct usb_hid_dev_t *hid_dev)
+void usb_mouse_deinit(usb_hid_dev_t *hid_dev)
 {
 	usb_mouse_free((usb_mouse_t **)&hid_dev->data);
@@ -297,5 +294,5 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_set_boot_protocol(struct usb_hid_dev_t *hid_dev)
+int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
 	int rc = usb_hid_parse_report_descriptor(hid_dev->parser, 
Index: uspace/drv/usbhid/mouse/mousedev.h
===================================================================
--- uspace/drv/usbhid/mouse/mousedev.h	(revision a49e17176a379a47b42277c9a627431062cf002e)
+++ uspace/drv/usbhid/mouse/mousedev.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
@@ -39,5 +39,5 @@
 #include <usb/devdrv.h>
 
-struct usb_hid_dev_t;
+struct usb_hid_dev;
 
 /*----------------------------------------------------------------------------*/
@@ -60,12 +60,12 @@
 /*----------------------------------------------------------------------------*/
 
-int usb_mouse_init(struct usb_hid_dev_t *hid_dev);
+int usb_mouse_init(struct usb_hid_dev *hid_dev);
 
-bool usb_mouse_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg);
+bool usb_mouse_polling_callback(struct usb_hid_dev *hid_dev, uint8_t *buffer,
+    size_t buffer_size);
 
-void usb_mouse_deinit(struct usb_hid_dev_t *hid_dev);
+void usb_mouse_deinit(struct usb_hid_dev *hid_dev);
 
-int usb_mouse_set_boot_protocol(struct usb_hid_dev_t *hid_dev);
+int usb_mouse_set_boot_protocol(struct usb_hid_dev *hid_dev);
 
 /*----------------------------------------------------------------------------*/