Index: uspace/drv/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/usbhid/generic/hiddev.c	(revision c32a585afa54f27e19b8efa3723fa795f5e27446)
+++ uspace/drv/usbhid/generic/hiddev.c	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
@@ -39,4 +39,5 @@
 
 #include "hiddev.h"
+#include "usbhid.h"
 
 /*----------------------------------------------------------------------------*/
@@ -54,9 +55,9 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
+bool usb_generic_hid_polling_callback(usb_hid_dev_t *hid_dev, 
+    uint8_t *buffer, size_t buffer_size)
 {
-	usb_log_debug("usb_hid_polling_callback(%p, %p, %zu, %p)\n",
-	    dev, buffer, buffer_size, arg);
+	usb_log_debug("usb_hid_polling_callback(%p, %p, %zu)\n",
+	    hid_dev, buffer, buffer_size);
 	usb_debug_str_buffer(buffer, buffer_size, 0);
 	return true;
Index: uspace/drv/usbhid/generic/hiddev.h
===================================================================
--- uspace/drv/usbhid/generic/hiddev.h	(revision c32a585afa54f27e19b8efa3723fa795f5e27446)
+++ uspace/drv/usbhid/generic/hiddev.h	(revision 60c0573469b97a8a312f0304101cbd58ad38e764)
@@ -39,4 +39,6 @@
 #include <usb/devdrv.h>
 
+struct usb_hid_dev;
+
 usb_endpoint_description_t usb_hid_generic_poll_endpoint_description;
 
@@ -44,6 +46,6 @@
 const char *HID_GENERIC_CLASS_NAME;
 
-bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg);
+bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev,
+    uint8_t *buffer, size_t buffer_size);
 
 #endif // USB_HIDDDEV_H_