diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 9b48894561b5..44bdb4bd21f1 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -254,7 +254,7 @@ struct libusb_context;
 struct libusb_device;
 struct libusb_transfer;
 struct libusb_device_handle;
-struct libusb_hotplug_callback_handle;
+struct libusb_hotplug_callback_handle_struct;
 
 struct libusb_pollfd {
 	int	fd;
@@ -276,7 +276,7 @@ typedef struct libusb_device_handle libusb_device_handle;
 typedef struct libusb_pollfd libusb_pollfd;
 typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data);
 typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data);
-typedef struct libusb_hotplug_callback_handle *libusb_hotplug_callback_handle;
+typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle;
 
 typedef struct libusb_device_descriptor {
 	uint8_t	bLength;
diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h
index ad3f934b08ba..86bf5e393dd7 100644
--- a/lib/libusb/libusb10.h
+++ b/lib/libusb/libusb10.h
@@ -75,8 +75,8 @@ struct libusb_super_transfer {
 #define	LIBUSB_SUPER_XFER_ST_PEND 1
 };
 
-struct libusb_hotplug_callback_handle {
-	TAILQ_ENTRY(libusb_hotplug_callback_handle) entry;
+struct libusb_hotplug_callback_handle_struct {
+	TAILQ_ENTRY(libusb_hotplug_callback_handle_struct) entry;
 	int events;
 	int vendor;
 	int product;
@@ -101,7 +101,7 @@ struct libusb_context {
 
 	TAILQ_HEAD(, libusb_super_pollfd) pollfds;
 	TAILQ_HEAD(, libusb_super_transfer) tr_done;
-	TAILQ_HEAD(, libusb_hotplug_callback_handle) hotplug_cbh;
+	TAILQ_HEAD(, libusb_hotplug_callback_handle_struct) hotplug_cbh;
   	TAILQ_HEAD(, libusb_device) hotplug_devs;
 
 	struct libusb_super_pollfd ctx_poll;