diff --git a/drivers/source/usb/CMakeLists.txt b/drivers/source/usb/CMakeLists.txt
deleted file mode 100644
index d80d4c8543..0000000000
--- a/drivers/source/usb/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-usb INTERFACE)
-
-target_include_directories(mbed-usb
-    INTERFACE
-        .
-)
-
-target_sources(mbed-usb
-    INTERFACE
-        AsyncOp.cpp
-        ByteBuffer.cpp
-        EndpointResolver.cpp
-        LinkedListBase.cpp
-        OperationListBase.cpp
-        PolledQueue.cpp
-        TaskBase.cpp
-        USBAudio.cpp
-        USBCDC.cpp
-        USBCDC_ECM.cpp
-        USBDevice.cpp
-        USBHID.cpp
-        USBKeyboard.cpp
-        USBMIDI.cpp
-        USBMSD.cpp
-        USBMouse.cpp
-        USBMouseKeyboard.cpp
-        USBSerial.cpp
-)
-
-target_link_libraries(mbed-usb INTERFACE mbed-storage)
diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
new file mode 100644
index 0000000000..6a456d0222
--- /dev/null
+++ b/drivers/usb/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-usb INTERFACE)
+
+target_include_directories(mbed-usb
+    INTERFACE
+        include
+        include/usb
+)
+
+target_sources(mbed-usb
+    INTERFACE
+        source/AsyncOp.cpp
+        source/ByteBuffer.cpp
+        source/EndpointResolver.cpp
+        source/LinkedListBase.cpp
+        source/OperationListBase.cpp
+        source/PolledQueue.cpp
+        source/TaskBase.cpp
+        source/USBAudio.cpp
+        source/USBCDC.cpp
+        source/USBCDC_ECM.cpp
+        source/USBDevice.cpp
+        source/USBHID.cpp
+        source/USBKeyboard.cpp
+        source/USBMIDI.cpp
+        source/USBMSD.cpp
+        source/USBMouse.cpp
+        source/USBMouseKeyboard.cpp
+        source/USBSerial.cpp
+)
+
+target_link_libraries(mbed-usb INTERFACE mbed-storage)