diff --git a/src/add-ons/kernel/drivers/input/usb_hid/Jamfile b/src/add-ons/kernel/drivers/input/usb_hid/Jamfile
index b3eda98feb..619a361042 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/Jamfile
+++ b/src/add-ons/kernel/drivers/input/usb_hid/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers input usb_hid ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+SubDirSysHdrs $(HAIKU_TOP) headers os drivers ;
 UsePrivateHeaders input ;
 
 KernelAddon usb_hid : kernel drivers bin :
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/hid.c b/src/add-ons/kernel/drivers/input/usb_hid/hid.c
index fd60d32e80..43ab929b5b 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/hid.c
+++ b/src/add-ons/kernel/drivers/input/usb_hid/hid.c
@@ -29,13 +29,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 /*****************************************************************************/
-#include <support/Debug.h>
-#include <stdlib.h>
-#include <unistd.h>
+
 #include "hid.h"
 #include "kb_mouse_driver.h"
 #include "usbdevs.h"
 
+#include <Debug.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 static int keyboard_device_number = 0;
 static int mouse_device_number = 0;
 const char *keyboard_base_name = "input/keyboard/usb/";
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/hid.h b/src/add-ons/kernel/drivers/input/usb_hid/hid.h
index 11069444e7..d16471f23e 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/hid.h
+++ b/src/add-ons/kernel/drivers/input/usb_hid/hid.h
@@ -30,11 +30,12 @@
 // DEALINGS IN THE SOFTWARE.
 /*****************************************************************************/
 
-#include <drivers/Drivers.h>
-#include <drivers/USB.h>
-#include <drivers/usb/USB_hid.h>
 #include "hidparse.h"
 
+#include <Drivers.h>
+#include <USB.h>
+#include <usb/USB_hid.h>
+
 #if DEBUG
 	#define	DPRINTF_INFO(x)	dprintf x
 	#define	DPRINTF_ERR(x)	dprintf x