diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
index 776af732..00fa6a20 100644
--- a/module_usb_audio/usb_buffer/decouple.xc
+++ b/module_usb_audio/usb_buffer/decouple.xc
@@ -25,7 +25,7 @@
 #include "xud.h"
 #include "usb.h"
 #ifdef HID_CONTROLS
-#include "vendor_hid.h"
+#include "user_hid.h"
 #endif
 
 #define MAX(x,y) ((x)>(y) ? (x) : (y))
diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
index 9a8e8680..482983bd 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -14,7 +14,7 @@
 #include "testct_byref.h"
 
 #ifdef HID_CONTROLS
-#include "vendor_hid.h"
+#include "user_hid.h"
 unsigned char g_hidData[1] = {0};
 #endif
 
@@ -593,7 +593,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
             case XUD_SetData_Select(c_hid, ep_hid, tmp):
             {
                 g_hidData[0]=0;
-                Vendor_ReadHIDButtons(g_hidData);
+                UserReadHIDButtons(g_hidData);
                 XUD_SetReady_In(ep_hid, g_hidData, 1);
             }
             break;