diff --git a/subsys/usb/class/cdc_acm.h b/include/usb/class/cdc_acm.h
similarity index 100%
rename from subsys/usb/class/cdc_acm.h
rename to include/usb/class/cdc_acm.h
diff --git a/subsys/usb/class/mass_storage.h b/include/usb/class/mass_storage.h
similarity index 100%
rename from subsys/usb/class/mass_storage.h
rename to include/usb/class/mass_storage.h
diff --git a/samples/subsys/usb/webusb/src/webusb_serial.c b/samples/subsys/usb/webusb/src/webusb_serial.c
index 69fd6a5406..d8a95b8d3b 100644
--- a/samples/subsys/usb/webusb/src/webusb_serial.c
+++ b/samples/subsys/usb/webusb/src/webusb_serial.c
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <misc/byteorder.h>
 #include <logging/sys_log.h>
-#include "cdc_acm.h"
+#include <usb/class/cdc_acm.h>
 #include <usb/usb_device.h>
 #include <usb/usb_common.h>
 #include "webusb_serial.h"
diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c
index a900fa89b6..1d2f9116bd 100644
--- a/subsys/usb/class/cdc_acm.c
+++ b/subsys/usb/class/cdc_acm.c
@@ -42,9 +42,9 @@
 #include <uart.h>
 #include <string.h>
 #include <misc/byteorder.h>
-#include "cdc_acm.h"
-#include "usb_device.h"
-#include "usb_common.h"
+#include <usb/class/cdc_acm.h>
+#include <usb/usb_device.h>
+#include <usb/usb_common.h>
 
 #ifndef CONFIG_UART_INTERRUPT_DRIVEN
 #error "CONFIG_UART_INTERRUPT_DRIVEN must be set for CDC ACM driver"
diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c
index b0d3a3273e..2ede67f5c0 100644
--- a/subsys/usb/class/mass_storage.c
+++ b/subsys/usb/class/mass_storage.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <misc/__assert.h>
 #include <disk_access.h>
-#include "mass_storage.h"
+#include <usb/class/mass_storage.h>
 #include <usb/usb_device.h>
 #include <usb/usb_common.h>