diff --git a/drivers/usb/include/usb/USBCDC_ECM.h b/drivers/usb/include/usb/USBCDC_ECM.h
index 70ddb9a94b..6f01053625 100644
--- a/drivers/usb/include/usb/USBCDC_ECM.h
+++ b/drivers/usb/include/usb/USBCDC_ECM.h
@@ -22,10 +22,10 @@
 #include "USBDescriptor.h"
 #include "USBDevice.h"
 #include "ByteBuffer.h"
-#include "Mutex.h"
+#include "rtos/Mutex.h"
 #include "EventFlags.h"
 #include "events/EventQueue.h"
-#include "Thread.h"
+#include "rtos/Thread.h"
 #include "Callback.h"
 
 #define MAX_PACKET_SIZE_INT     (64)
diff --git a/drivers/usb/include/usb/USBMIDI.h b/drivers/usb/include/usb/USBMIDI.h
index 3d7582b767..4c08950fd7 100644
--- a/drivers/usb/include/usb/USBMIDI.h
+++ b/drivers/usb/include/usb/USBMIDI.h
@@ -25,7 +25,7 @@
 #include "USBDevice.h"
 #include "MIDIMessage.h"
 #include "EventFlags.h"
-#include "Mutex.h"
+#include "rtos/Mutex.h"
 #include "Callback.h"
 
 #define DEFAULT_CONFIGURATION (1)
diff --git a/drivers/usb/include/usb/USBMSD.h b/drivers/usb/include/usb/USBMSD.h
index dc956fb085..a570df7d82 100644
--- a/drivers/usb/include/usb/USBMSD.h
+++ b/drivers/usb/include/usb/USBMSD.h
@@ -25,7 +25,7 @@
 #include "usb/internal/PolledQueue.h"
 #include "usb/internal/Task.h"
 #include "BlockDevice.h"
-#include "Mutex.h"
+#include "rtos/Mutex.h"
 
 #include "USBDevice.h"
 
diff --git a/drivers/usb/include/usb/internal/AsyncOp.h b/drivers/usb/include/usb/internal/AsyncOp.h
index 84789fb5f9..16f8d64162 100644
--- a/drivers/usb/include/usb/internal/AsyncOp.h
+++ b/drivers/usb/include/usb/internal/AsyncOp.h
@@ -18,8 +18,8 @@
 #ifndef MBED_ASYNC_OP_H
 #define MBED_ASYNC_OP_H
 
-#include "Mutex.h"
-#include "Semaphore.h"
+#include "rtos/Mutex.h"
+#include "rtos/Semaphore.h"
 #include "Callback.h"
 
 #include "LinkEntry.h"