diff --git a/Controllers/MSI3ZoneController/MSI3ZoneController.h b/Controllers/MSI3ZoneController/MSI3ZoneController.h
index 12eb81e6..e3bcf183 100644
--- a/Controllers/MSI3ZoneController/MSI3ZoneController.h
+++ b/Controllers/MSI3ZoneController/MSI3ZoneController.h
@@ -10,7 +10,7 @@
 #include "RGBController.h"
 
 #include <string>
-#include "hidapi.h"
+#include <hidapi/hidapi.h>
 
 #pragma once
 
diff --git a/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp b/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp
index b031f0b7..b070b15f 100644
--- a/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp
+++ b/Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp
@@ -2,7 +2,7 @@
 #include "RGBController.h"
 #include "RGBController_MSI3Zone.h"
 #include <vector>
-#include "hidapi.h"
+#include <hidapi/hidapi.h>
 
 #define MSI_3_ZONE_KEYBOARD_VID 0x1770
 #define MSI_3_ZONE_KEYBOARD_PID 0xFF00
diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBController.h b/Controllers/PoseidonZRGBController/PoseidonZRGBController.h
index f0e0773a..c4bea0ff 100644
--- a/Controllers/PoseidonZRGBController/PoseidonZRGBController.h
+++ b/Controllers/PoseidonZRGBController/PoseidonZRGBController.h
@@ -11,7 +11,7 @@
 #include "RGBController.h"
 
 #include <string>
-#include "hidapi.h"
+#include <hidapi/hidapi.h>
 
 #pragma once
 
diff --git a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp b/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp
index 60ee7923..cb1234e7 100644
--- a/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp
+++ b/Controllers/PoseidonZRGBController/PoseidonZRGBControllerDetect.cpp
@@ -2,7 +2,7 @@
 #include "RGBController.h"
 #include "RGBController_PoseidonZRGB.h"
 #include <vector>
-#include "hidapi.h"
+#include <hidapi/hidapi.h>
 
 #define TT_POSEIDON_Z_RGB_VID 0x264A
 #define TT_POSEIDON_Z_RGB_PID 0x3006
diff --git a/OpenRGB.pro b/OpenRGB.pro
index 7aa1fdf3..bd584882 100644
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -90,7 +90,6 @@ HEADERS +=                                                              \
     qt/OpenRGBDialog.h                                                  \
     i2c_smbus/i2c_smbus.h                                               \
     i2c_tools/i2c_tools.h                                               \
-    hidapi/hidapi.h                                                     \
     net_port/net_port.h                                                 \
     qt/OpenRGBDialog2.h                                                 \
     qt/OpenRGBSystemInfoPage.h                                          \
@@ -191,7 +190,17 @@ unix:HEADERS +=                                                         \
 
 unix:LIBS +=                                                            \
     -lusb-1.0                                                           \
-    -lhidapi
+
+packagesExist(hidapi-libusb){
+    unix:LIBS += -lhidapi-libusb
+} else {
+    packagesExist(hidapi) {
+        unix:LIBS += -lhidapi
+    } else {
+        unix:LIBS += -lhidapi-libusb
+    }
+}
+
 
 unix:SOURCES +=                                                         \
     i2c_smbus/i2c_smbus_linux.cpp                                       \
diff --git a/dependencies/hidapi/hidapi.h b/dependencies/hidapi/hidapi/hidapi.h
similarity index 100%
rename from dependencies/hidapi/hidapi.h
rename to dependencies/hidapi/hidapi/hidapi.h