diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -418,7 +418,8 @@
 	uint8_t bLength;
 	uint8_t bDescriptorType;
 	uint16_t wTotalLength;
-	uint8_t bNumDeviceCapabilities;
+#define	bNumDeviceCapabilities bNumDeviceCaps
+	uint8_t bNumDeviceCaps;
 	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
 	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
 	struct libusb_bos_dev_capability_descriptor **dev_capability;
diff --git a/lib/libusb/libusb10_desc.c b/lib/libusb/libusb10_desc.c
--- a/lib/libusb/libusb10_desc.c
+++ b/lib/libusb/libusb10_desc.c
@@ -470,10 +470,11 @@
 			ptr->bDescriptorType = dtype;
 			ptr->wTotalLength = ((const uint8_t *)buf)[2] |
 			    (((const uint8_t *)buf)[3] << 8);
-			ptr->bNumDeviceCapabilities = ((const uint8_t *)buf)[4];
+			ptr->bNumDeviceCaps = ((const uint8_t *)buf)[4];
 			ptr->usb_2_0_ext_cap = NULL;
 			ptr->ss_usb_cap = NULL;
-			ptr->dev_capability = calloc(ptr->bNumDeviceCapabilities, sizeof(void *));
+			ptr->dev_capability = calloc(ptr->bNumDeviceCaps,
+			    sizeof(void *));
 			if (ptr->dev_capability == NULL) {
 				free(ptr);
 				return (LIBUSB_ERROR_NO_MEM);
@@ -485,7 +486,7 @@
 		if (dlen >= 3 &&
 		    ptr != NULL &&
 		    dtype == LIBUSB_DT_DEVICE_CAPABILITY) {
-			if (index != ptr->bNumDeviceCapabilities) {
+			if (index != ptr->bNumDeviceCaps) {
 				ptr->dev_capability[index] = malloc(dlen);
 				if (ptr->dev_capability[index] == NULL) {
 					libusb_free_bos_descriptor(ptr);
@@ -542,7 +543,7 @@
 	}
 
 	if (ptr != NULL) {
-		ptr->bNumDeviceCapabilities = index;
+		ptr->bNumDeviceCaps = index;
 		return (0);		/* success */
 	}
 
@@ -557,7 +558,7 @@
 	if (bos == NULL)
 		return;
 
-	for (i = 0; i != bos->bNumDeviceCapabilities; i++)
+	for (i = 0; i != bos->bNumDeviceCaps; i++)
 		free(bos->dev_capability[i]);
 	free(bos->dev_capability);
 	free(bos);