diff --git a/src/add-ons/kernel/drivers/bus/usb/Jamfile b/src/add-ons/kernel/drivers/bus/usb/Jamfile
index f16a36e7fd..0884d39bf8 100644
--- a/src/add-ons/kernel/drivers/bus/usb/Jamfile
+++ b/src/add-ons/kernel/drivers/bus/usb/Jamfile
@@ -1,5 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel drivers bus usb ;
 
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
 UsePrivateHeaders kernel ;
 
 KernelAddon usb_raw : kernel drivers bus usb :
diff --git a/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp b/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
index a677a5253a..a3c148766a 100644
--- a/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
+++ b/src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "usb_raw.h"
+#include "BeOSCompatibility.h"
 
 
 #define TRACE_USB_RAW
@@ -33,7 +34,7 @@ uint32 gDeviceCount = 0;
 benaphore gDeviceListLock;
 
 static status_t
-usb_raw_device_added(const usb_device *newDevice, void **cookie)
+usb_raw_device_added(usb_device newDevice, void **cookie)
 {
 	TRACE((DRIVER_NAME": device_added()\n"));
 	raw_device *device = (raw_device *)malloc(sizeof(raw_device));
@@ -52,7 +53,7 @@ usb_raw_device_added(const usb_device *newDevice, void **cookie)
 	}
 
 	char deviceName[32];
-	memcpy(deviceName, &newDevice, sizeof(usb_device *));
+	memcpy(deviceName, &newDevice, sizeof(usb_device));
 	if (gUSBModule->usb_ioctl('DNAM', deviceName, sizeof(deviceName)) >= B_OK) {
 		sprintf(device->name, "bus/usb/%s", deviceName);
 	} else {
@@ -433,8 +434,8 @@ usb_raw_ioctl(void *cookie, uint32 op, void *buffer, size_t length)
 			if (gUSBModule->queue_request(device->device,
 				command->control.request_type, command->control.request,
 				command->control.value, command->control.index,
-				command->control.length, device->buffer, command->control.length,
-				usb_raw_callback, device) < B_OK) {
+				command->control.length, device->buffer, usb_raw_callback,
+				device) < B_OK) {
 				command->control.status = RAW_STATUS_FAILED;
 				command->control.length = 0;
 				benaphore_unlock(&device->lock);
diff --git a/src/add-ons/kernel/drivers/bus/usb/usb_raw.h b/src/add-ons/kernel/drivers/bus/usb/usb_raw.h
index d855ac7426..4c2a92bcea 100644
--- a/src/add-ons/kernel/drivers/bus/usb/usb_raw.h
+++ b/src/add-ons/kernel/drivers/bus/usb/usb_raw.h
@@ -11,7 +11,7 @@
 
 
 #include <lock.h>
-#include <USB.h>
+#include <USB3.h>
 
 
 typedef enum {
@@ -131,7 +131,7 @@ typedef union {
 
 
 typedef struct {
-	const usb_device	*device;
+	usb_device			device;
 	benaphore			lock;
 
 	char				name[32];