diff --git a/cores/rp2040/sdkoverride/tusb_gamepad16.h b/cores/rp2040/sdkoverride/tusb_gamepad16.h
index f487eacce..497cd94a2 100644
--- a/cores/rp2040/sdkoverride/tusb_gamepad16.h
+++ b/cores/rp2040/sdkoverride/tusb_gamepad16.h
@@ -62,14 +62,4 @@
     HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
   HID_COLLECTION_END \
 
-// HID Gamepad Protocol Report.
-typedef struct TU_ATTR_PACKED {
-    int16_t x;         ///< Delta x  movement of left analog-stick
-    int16_t y;         ///< Delta y  movement of left analog-stick
-    int16_t z;         ///< Delta z  movement of right analog-joystick
-    int16_t rz;        ///< Delta Rz movement of right analog-joystick
-    int16_t rx;        ///< Delta Rx movement of analog left trigger
-    int16_t ry;        ///< Delta Ry movement of analog right trigger
-    uint8_t hat;       ///< Buttons mask for currently pressed buttons in the DPad/hat
-    uint32_t buttons;  ///< Buttons mask for currently pressed buttons
-} hid_gamepad16_report_t;
+#include "tusb_gamepad16_report.h"
diff --git a/cores/rp2040/sdkoverride/tusb_gamepad16_report.h b/cores/rp2040/sdkoverride/tusb_gamepad16_report.h
new file mode 100644
index 000000000..2e37b541b
--- /dev/null
+++ b/cores/rp2040/sdkoverride/tusb_gamepad16_report.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+// HID Gamepad Protocol Report.
+typedef struct TU_ATTR_PACKED {
+    int16_t x;         ///< Delta x  movement of left analog-stick
+    int16_t y;         ///< Delta y  movement of left analog-stick
+    int16_t z;         ///< Delta z  movement of right analog-joystick
+    int16_t rz;        ///< Delta Rz movement of right analog-joystick
+    int16_t rx;        ///< Delta Rx movement of analog left trigger
+    int16_t ry;        ///< Delta Ry movement of analog right trigger
+    uint8_t hat;       ///< Buttons mask for currently pressed buttons in the DPad/hat
+    uint32_t buttons;  ///< Buttons mask for currently pressed buttons
+} hid_gamepad16_report_t;
diff --git a/libraries/HID_Joystick b/libraries/HID_Joystick
index c28cfadd8..cbfdd2c99 160000
--- a/libraries/HID_Joystick
+++ b/libraries/HID_Joystick
@@ -1 +1 @@
-Subproject commit c28cfadd83278d7de2b6db1eb3226f4115f92945
+Subproject commit cbfdd2c99796b7e07d4c2b8e53f529554f40832a
diff --git a/libraries/Joystick/src/Joystick.cpp b/libraries/Joystick/src/Joystick.cpp
index d16334443..d55d4ef97 100644
--- a/libraries/Joystick/src/Joystick.cpp
+++ b/libraries/Joystick/src/Joystick.cpp
@@ -27,6 +27,7 @@
 
 #include "tusb.h"
 #include "class/hid/hid_device.h"
+#include <sdkoverride/tusb_gamepad16.h>
 
 static const uint8_t desc_hid_report_joystick[] = { TUD_HID_REPORT_DESC_GAMEPAD16(HID_REPORT_ID(1)) };
 
diff --git a/libraries/Joystick/src/Joystick.h b/libraries/Joystick/src/Joystick.h
index e140cf9b8..c06f60532 100644
--- a/libraries/Joystick/src/Joystick.h
+++ b/libraries/Joystick/src/Joystick.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <HID_Joystick.h>
-#include <class/hid/hid.h>
 
 //======================================================================
 class Joystick_ : public HID_Joystick {