diff --git a/Makefile.common b/Makefile.common
index 068614ab3e..d2b3eb4550 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -39,10 +39,6 @@ ifeq ($(HAVE_SOCKET_LEGACY), 1)
    DEFINES += -DHAVE_SOCKET_LEGACY
 endif
 
-ifeq ($(HAVE_HID), 1)
-   DEFINES += -DHAVE_HID
-endif
-
 ifeq ($(HAVE_LIBRETRODB), 1)
    DEFINES += -DHAVE_LIBRETRODB
 endif
@@ -1014,17 +1010,10 @@ ifeq ($(HAVE_UDEV), 1)
 endif
 
 ifeq ($(HAVE_LIBUSB), 1)
-   ifeq ($(HAVE_THREADS), 1)
-      ifeq ($(HAVE_HID), 1)
-         DEFINES += -DHAVE_LIBUSB
-         OBJ += input/drivers_hid/libusb_hid.o
-         ifneq ($(findstring BSD,$(OS)),)
-            LIBS += -lusb
-         else
-            LIBS += -lusb-1.0
-         endif
-      endif
-   endif
+   DEFINES += -DHAVE_LIBUSB
+   OBJ += input/drivers_hid/libusb_hid.o
+   DEF_FLAGS += $(LIBUSB_CFLAGS)
+   LIBS += $(LIBUSB_LIBS)
 endif
 
 ifeq ($(HAVE_IOHIDMANAGER), 1)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 465fc9c64e..d492b67942 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -300,6 +300,7 @@ if [ "$HAVE_SSL" != 'no' ]; then
 fi
 
 check_enabled THREADS LIBUSB libusb 'Threads are' false
+check_enabled HID LIBUSB libusb 'HID is' false
 check_val '' LIBUSB -lusb-1.0 libusb-1.0 libusb-1.0 1.0.13 '' false
 
 check_lib '' DINPUT -ldinput8