Properly fix how how hidapi and libusb dependencies are handled

2025-12-23 23:37:48 -05:00 · 2024-08-05 01:14:17 +00:00
parent 6140849e28
commit 66109be668
281 changed files with 304 additions and 352 deletions
--- a/Controllers/A4TechController/A4Tech_Detector.cpp
+++ b/Controllers/A4TechController/A4Tech_Detector.cpp
@@ -13,7 +13,7 @@
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "RGBController.h"

--- a/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h
+++ b/Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define HID_MAX_STR                     255
--- a/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h
+++ b/Controllers/A4TechController/BloodyMouseController/BloodyMouseController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------------------*\
--- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.h
+++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define AMD_WRAITH_PRISM_FAN_BRIGHTNESS_DEFAULT_MAX     0xFF
--- a/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp
+++ b/Controllers/AMDWraithPrismController/AMDWraithPrismControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "AMDWraithPrismController.h"
 #include "RGBController.h"
--- a/Controllers/AOCKeyboardController/AOCKeyboardController.h
+++ b/Controllers/AOCKeyboardController/AOCKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------*\
--- a/Controllers/AOCMouseController/AOCMouseController.h
+++ b/Controllers/AOCMouseController/AOCMouseController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------*\
--- a/Controllers/AOCMousematController/AOCMousematController.h
+++ b/Controllers/AOCMousematController/AOCMousematController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------*\
--- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h
+++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBController.h
@@ -13,7 +13,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*----------------------------------------------------------------------------------------------*\
--- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp
+++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "ASRockPolychromeUSBController.h"
 #include "RGBController.h"
--- a/Controllers/AlienwareController/AlienwareController.h
+++ b/Controllers/AlienwareController/AlienwareController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*----------------------------------------------------------------------------------------------*\
--- a/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h
+++ b/Controllers/AlienwareKeyboardController/AlienwareAW410KController/AlienwareAW410KController.h
@@ -13,7 +13,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h
+++ b/Controllers/AlienwareKeyboardController/AlienwareAW510KController/AlienwareAW510KController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp
+++ b/Controllers/AlienwareKeyboardController/AlienwareKeyboardControllerDetect.cpp
@@ -7,7 +7,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "AlienwareAW510KController.h"
 #include "AlienwareAW410KController.h"
--- a/Controllers/AnnePro2Controller/AnnePro2Controller.h
+++ b/Controllers/AnnePro2Controller/AnnePro2Controller.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class AnnePro2Controller
--- a/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp
+++ b/Controllers/AnnePro2Controller/AnnePro2ControllerDetect.cpp
@@ -13,7 +13,7 @@
 #include "AnnePro2Controller.h"
 #include "RGBController.h"
 #include "RGBController_AnnePro2.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 /*---------------------------------------------------------*\
 | Anne Pro 2 vendor IDs                                     |
--- a/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreController/AsusAuraCoreController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum AuraCoreDeviceType
--- a/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreControllerDetect.cpp
@@ -15,7 +15,7 @@
 #include "RGBController.h"
 #include "RGBController_AsusAuraCore.h"
 #include "RGBController_AsusAuraCoreLaptop.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define AURA_CORE_VID                   0x0B05

--- a/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h
+++ b/Controllers/AsusAuraCoreController/AsusAuraCoreLaptopController/AsusAuraCoreLaptopController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "LogManager.h"
 #include "RGBController.h"
 #include "ResourceManager.h"
--- a/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraHeadsetStandController/AsusAuraHeadsetStandController.h
@@ -11,7 +11,7 @@

 #pragma once

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraKeyboardController/AsusAuraKeyboardController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class AuraKeyboardController
--- a/Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraMonitorController/AsusAuraMonitorController.h
@@ -11,7 +11,7 @@

 #pragma once

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraMouseController/AsusAuraMouseController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraMouseDevices.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraMouseGen1Controller/AsusAuraMouseGen1Controller.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define HID_MAX_STR 255
--- a/Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraMousematController/AsusAuraMousematController.h
@@ -11,7 +11,7 @@

 #pragma once

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraRyuoAIOController/AsusAuraRyuoAIOController.h
@@ -13,7 +13,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraUSBController.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController/AsusAuraTUFKeyboardController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraTUFKeyboardLayouts.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraAddressableController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraUSBController.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraMainboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraUSBController.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.h
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBController/AsusAuraUSBController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "LogManager.h"

--- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp
+++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp
@@ -8,7 +8,7 @@
 \*---------------------------------------------------------*/

 #include <stdexcept>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "AsusAuraAddressableController.h"
 #include "AsusAuraHeadsetStandController.h"
--- a/Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.h
+++ b/Controllers/AsusAuraUSBController/AsusROGAllyController/AsusROGAllyController.h
@@ -11,7 +11,7 @@

 #pragma once

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h
+++ b/Controllers/AsusAuraUSBController/AsusROGStrixLCController/AsusROGStrixLCController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "AsusAuraUSBController.h"

--- a/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h
+++ b/Controllers/AsusLegacyUSBController/AsusCerberusKeyboardController/AsusCerberusKeyboardController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp
+++ b/Controllers/AsusLegacyUSBController/AsusLegacyUSBControllerDetect.cpp
@@ -8,7 +8,7 @@
 \*---------------------------------------------------------*/

 #include <stdexcept>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "AsusCerberusKeyboardController.h"
 #include "AsusSagarisKeyboardController.h"
--- a/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h
+++ b/Controllers/AsusLegacyUSBController/AsusSagarisKeyboardController/AsusSagarisKeyboardController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h
+++ b/Controllers/AsusLegacyUSBController/AsusStrixClawController/AsusStrixClawController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define HID_MAX_STR 255
--- a/Controllers/CherryKeyboardController/CherryKeyboardController.h
+++ b/Controllers/CherryKeyboardController/CherryKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CHERRY_KB_PACKET_SIZE                        64
--- a/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp
+++ b/Controllers/CherryKeyboardController/CherryKeyboardControllerDetect.cpp
@@ -10,7 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CherryKeyboardController.h"
 #include "RGBController.h"
--- a/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h
+++ b/Controllers/CoolerMasterController/CMARGBController/CMARGBController.h
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <array>
 #include <memory>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"  //Needed to set the direct mode

 #define CM_ARGB_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
--- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.h
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/CMARGBGen2A1Controller.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CM_ARGB_GEN2_A1_PACKET_LENGTH 65
--- a/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h
+++ b/Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardAbstractController.h
@@ -17,7 +17,7 @@
 #include <sstream>
 #include <map>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "CMKeyboardDevices.h"
 #include "KeyboardLayoutManager.h"
 #include "RGBController.h"
--- a/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h
+++ b/Controllers/CoolerMasterController/CMMM711Controller/CMMM711Controller.h
@@ -13,7 +13,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CM_MM711_PACKET_SIZE 65
--- a/Controllers/CoolerMasterController/CMMMController/CMMMController.h
+++ b/Controllers/CoolerMasterController/CMMMController/CMMMController.h
@@ -14,7 +14,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CM_MM_PACKET_SIZE 65
--- a/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h
+++ b/Controllers/CoolerMasterController/CMMP750Controller/CMMP750Controller.h
@@ -13,7 +13,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define CM_COLOUR_MODE_DATA_SIZE (sizeof(colour_mode_data[0]) / sizeof(colour_mode_data[0][0]))
 #define CM_INTERRUPT_TIMEOUT 250
--- a/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h
+++ b/Controllers/CoolerMasterController/CMMonitorController/CMMonitorController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CM_MONITOR_PACKET_LENGTH     65
--- a/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h
+++ b/Controllers/CoolerMasterController/CMR6000Controller/CMR6000Controller.h
@@ -13,7 +13,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define COOLERMASTER_RADEON_6000_PID            0x014D
--- a/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h
+++ b/Controllers/CoolerMasterController/CMRGBController/CMRGBController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CM_RGBC_NUM_LEDS 4
--- a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h
+++ b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h
@@ -13,7 +13,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"  //Needed to set the direct mode

 /*---------------------------------------------------------*\
--- a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp
+++ b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp
@@ -10,7 +10,7 @@
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "LogManager.h"
 #include "RGBController.h"
--- a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h
+++ b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreController.h
@@ -13,7 +13,7 @@

 #include <chrono>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "DeviceGuardManager.h"

--- a/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp
+++ b/Controllers/CorsairCommanderCoreController/CorsairCommanderCoreControllerDetect.cpp
@@ -10,7 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CorsairCommanderCoreController.h"
 #include "RGBController.h"
--- a/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h
+++ b/Controllers/CorsairHydro2Controller/CorsairHydro2Controller.h
@@ -12,11 +12,7 @@
 #pragma once

 #include <vector>
-#ifdef __FreeBSD__
 #include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
 #include "RGBController.h"

 class CorsairHydro2Controller
--- a/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp
+++ b/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp
@@ -10,11 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#ifdef __FreeBSD__
 #include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
 #include "Detector.h"
 #include "CorsairHydro2Controller.h"
 #include "RGBController.h"
--- a/Controllers/CorsairHydroController/CorsairHydroController.h
+++ b/Controllers/CorsairHydroController/CorsairHydroController.h
@@ -12,11 +12,7 @@
 #pragma once

 #include <vector>
-#ifdef __FreeBSD__
 #include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
 #include "RGBController.h"

 enum
--- a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp
+++ b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp
@@ -10,11 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#ifdef __FreeBSD__
 #include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
 #include "Detector.h"
 #include "CorsairHydroController.h"
 #include "RGBController.h"
--- a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h
+++ b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"
 #include "DeviceGuardManager.h"

--- a/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp
+++ b/Controllers/CorsairHydroPlatinumController/CorsairHydroPlatinumControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CorsairHydroPlatinumController.h"
 #include "RGBController.h"
--- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h
+++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeController.h
@@ -13,7 +13,7 @@

 #include <chrono>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "DeviceGuardManager.h"
 #include "RGBController.h"

--- a/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp
+++ b/Controllers/CorsairLightingNodeController/CorsairLightingNodeControllerDetect.cpp
@@ -10,7 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CorsairLightingNodeController.h"
 #include "RGBController.h"
--- a/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h
+++ b/Controllers/CorsairPeripheralController/CorsairK55RGBPROXTController.h
@@ -10,7 +10,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class CorsairK55RGBPROXTController
--- a/Controllers/CorsairPeripheralController/CorsairK65MiniController.h
+++ b/Controllers/CorsairPeripheralController/CorsairK65MiniController.h
@@ -10,7 +10,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define PACKET_LENGTH 1025
--- a/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h
+++ b/Controllers/CorsairPeripheralController/CorsairK95PlatinumXTController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string.h>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define K95_PLATINUM_XT_REPORT_LENGTH           65
--- a/Controllers/CorsairPeripheralController/CorsairPeripheralController.h
+++ b/Controllers/CorsairPeripheralController/CorsairPeripheralController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define CORSAIR_PERIPHERAL_PACKET_LENGTH 65
--- a/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp
+++ b/Controllers/CorsairPeripheralController/CorsairPeripheralControllerDetect.cpp
@@ -10,7 +10,7 @@
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "LogManager.h"
 #include "RGBController.h"
--- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h
+++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2Controller.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "LogManager.h"
 #include "RGBController.h"
 #include "CorsairPeripheralV2Devices.h"
--- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp
+++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2ControllerDetect.cpp
@@ -10,7 +10,7 @@
 /*-----------------------------------------------------*\
 | OpenRGB includes                                      |
 \*-----------------------------------------------------*/
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "LogManager.h"
 #include "RGBController.h"
--- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h
+++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2HardwareController.h
@@ -15,7 +15,7 @@
 #include "CorsairPeripheralV2Controller.h"

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #undef  CORSAIR_V2_WRITE_SIZE
 #define CORSAIR_V2_WRITE_SIZE       1025
--- a/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h
+++ b/Controllers/CorsairPeripheralV2Controller/CorsairPeripheralV2SoftwareController.h
@@ -15,7 +15,7 @@
 #include "CorsairPeripheralV2Controller.h"

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 class CorsairPeripheralV2SWController : public CorsairPeripheralV2Controller
 {
--- a/Controllers/CorsairWirelessController/CorsairWirelessController.h
+++ b/Controllers/CorsairWirelessController/CorsairWirelessController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class CorsairWirelessController
--- a/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp
+++ b/Controllers/CorsairWirelessController/CorsairWirelessControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CorsairWirelessController.h"
 #include "RGBController.h"
--- a/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
+++ b/Controllers/CougarController/CougarKeyboardController/CougarKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define COUGARKEYBOARDCONTROLLER_WRITE_PACKET_SIZE  65      //Buffer requires a prepended ReportID hence + 1
--- a/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
+++ b/Controllers/CougarController/CougarRevengerSTController/CougarRevengerSTController.h
@@ -14,7 +14,7 @@
 #include "RGBController.h"
 #include <map>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define PACKET_DATA_LENGTH 9

--- a/Controllers/CreativeController/CreativeControllerDetect.cpp
+++ b/Controllers/CreativeController/CreativeControllerDetect.cpp
@@ -7,7 +7,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "CreativeSoundBlasterXG6Controller.h"
 #include "RGBController_CreativeSoundBlasterXG6.h"
 #include "Detector.h"
--- a/Controllers/CreativeController/CreativeSoundBlasterXG6Controller.h
+++ b/Controllers/CreativeController/CreativeSoundBlasterXG6Controller.h
@@ -10,7 +10,7 @@
 #pragma once

 #include <cstring>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class CreativeSoundBlasterXG6Controller
--- a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h
+++ b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiController.h
@@ -13,7 +13,7 @@

 #include <string>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 enum
--- a/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp
+++ b/Controllers/CryorigH7QuadLumiController/CryorigH7QuadLumiControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "CryorigH7QuadLumiController.h"
 #include "RGBController.h"
--- a/Controllers/DRGBController/DRGBController.h
+++ b/Controllers/DRGBController/DRGBController.h
@@ -13,7 +13,7 @@

 #include <chrono>
 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define DRGB_V4_ONE_PACKAGE_SIZE    316
--- a/Controllers/DRGBController/DRGBControllerDetect.cpp
+++ b/Controllers/DRGBController/DRGBControllerDetect.cpp
@@ -10,7 +10,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "DRGBController.h"
 #include "RGBController.h"
--- a/Controllers/DarkProject/DarkProjectKeyboardController.h
+++ b/Controllers/DarkProject/DarkProjectKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define NA                                      0xFFFFFFFF
--- a/Controllers/DasKeyboardController/DasKeyboardController.h
+++ b/Controllers/DasKeyboardController/DasKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 class DasKeyboardController
--- a/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp
+++ b/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp
@@ -13,7 +13,7 @@
 #include "DasKeyboardController.h"
 #include "RGBController.h"
 #include "RGBController_DasKeyboard.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 /*-----------------------------------------------------*\
 | Das Keyboard vendor ID                                |
--- a/Controllers/DuckyKeyboardController/DuckyKeyboardController.h
+++ b/Controllers/DuckyKeyboardController/DuckyKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------------------*\
--- a/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp
+++ b/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp
@@ -13,7 +13,7 @@
 #include "DuckyKeyboardController.h"
 #include "RGBController.h"
 #include "RGBController_DuckyKeyboard.h"
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 /******************************************************************************************\
 *                                                                                          *
--- a/Controllers/EKController/EKController.h
+++ b/Controllers/EKController/EKController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define EK_COLOUR_MODE_DATA_SIZE    (sizeof(ek_colour_mode_data[0]) / sizeof(ek_colour_mode_data[0][0]))
 #define EK_DEVICE_NAME_SIZE         (sizeof(device_name) / sizeof(device_name[ 0 ]))
--- a/Controllers/EKController/EKControllerDetect.cpp
+++ b/Controllers/EKController/EKControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "EKController.h"
 #include "RGBController.h"
--- a/Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.h
+++ b/Controllers/EVGAUSBController/EVGAKeyboardController/EVGAKeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "LogManager.h"
 #include "RGBController.h"

--- a/Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.h
+++ b/Controllers/EVGAUSBController/EVGAMouseController/EVGAMouseController.h
@@ -13,7 +13,7 @@

 #include <array>
 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define EVGA_PERIPHERAL_PACKET_SIZE 65
--- a/Controllers/EVGAUSBController/EVGAUSBControllerDetect.cpp
+++ b/Controllers/EVGAUSBController/EVGAUSBControllerDetect.cpp
@@ -7,7 +7,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "LogManager.h"
 #include "RGBController.h"
--- a/Controllers/EVisionKeyboardController/EVisionKeyboardController.h
+++ b/Controllers/EVisionKeyboardController/EVisionKeyboardController.h
@@ -13,7 +13,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define EVISION_KB_MAX_PACKET_SIZE                  ( 0x36 )/* max packet size for color*/
--- a/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp
+++ b/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp
@@ -8,7 +8,7 @@
 \*---------------------------------------------------------*/

 #include <vector>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "EVisionKeyboardController.h"
 #include "EVisionV2KeyboardController.h"
--- a/Controllers/EVisionKeyboardController/EVisionV2KeyboardController.h
+++ b/Controllers/EVisionKeyboardController/EVisionV2KeyboardController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define EVISION_V2_PACKET_SIZE                       64
--- a/Controllers/EpomakerController/EpomakerController.h
+++ b/Controllers/EpomakerController/EpomakerController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>

 #define EPOMAKER_PACKET_LENGTH                      0x40
 #define EPOMAKER_COMMAND_RGB                        0x07
--- a/Controllers/EpomakerController/EpomakerControllerDetect.cpp
+++ b/Controllers/EpomakerController/EpomakerControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "EpomakerController.h"
 #include "RGBController.h"
--- a/Controllers/GaiZongGaiKeyboardController/GaiZhongGaiController.h
+++ b/Controllers/GaiZongGaiKeyboardController/GaiZhongGaiController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 /*-----------------------------------------------------*\
--- a/Controllers/GaiZongGaiKeyboardController/GaiZhongGaiControllerDetect.cpp
+++ b/Controllers/GaiZongGaiKeyboardController/GaiZhongGaiControllerDetect.cpp
@@ -9,7 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "GaiZhongGaiController.h"
 #include "RGBController.h"
--- a/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.h
+++ b/Controllers/GigabyteAorusCPUCoolerController/ATC800Controller.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 struct aorus_atc800_mode_config
--- a/Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp
+++ b/Controllers/GigabyteAorusCPUCoolerController/GigabyteAorusCPUCoolerControllerDetect.cpp
@@ -7,7 +7,7 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/

-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "Detector.h"
 #include "RGBController.h"
 #include "ATC800Controller.h"
--- a/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h
+++ b/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define GIGABYTE_AORUS_LAPTOP_REPORT_SIZE      8
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
@@ -12,7 +12,7 @@
 #pragma once

 #include <string>
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #include "RGBController.h"

 #define GIGABYTE_AORUS_MOUSE_REPORT_SIZE    8
--- a/Show More
+++ b/Show More