diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject
index 98b1e0a1..7540a09e 100644
--- a/demos/device/device_os_none/.cproject
+++ b/demos/device/device_os_none/.cproject
@@ -230,8 +230,9 @@
 								</option>
 								<option id="gnu.c.compiler.option.misc.other.2122594924" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
 								<option id="gnu.c.compiler.option.include.paths.1913705177" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/cmsis/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/CMSIS_LPC43xx_DriverLib/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw/mcu/nxp/lpc43xx/usb}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hw}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/tinyusb}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
diff --git a/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h b/hw/mcu/nxp/lpc43xx/usb/hal_usb.h
similarity index 93%
rename from hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h
rename to hw/mcu/nxp/lpc43xx/usb/hal_usb.h
index ecc892d4..6b0d9488 100644
--- a/hw/mcu/nxp/lpc43xx/usb/hal_lpc43xx.h
+++ b/hw/mcu/nxp/lpc43xx/usb/hal_usb.h
@@ -36,8 +36,8 @@
 */
 /**************************************************************************/
 
-#ifndef _TUSB_HAL_LPC43XX_H_
-#define _TUSB_HAL_LPC43XX_H_
+#ifndef _TUSB_HAL_USB_H_
+#define _TUSB_HAL_USB_H_
 
 #include "LPC43xx.h"
 #include "lpc43xx_cgu.h"
@@ -52,5 +52,5 @@
  }
 #endif
 
-#endif /* _TUSB_HAL_LPC43XX_H_ */
+#endif /* _TUSB_HAL_USB_H_ */
 
diff --git a/hw/mcu/readme.md b/hw/readme.md
similarity index 100%
rename from hw/mcu/readme.md
rename to hw/readme.md
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index cdaa3c77..65b21961 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -83,20 +83,7 @@ void hal_interrupt_enable(uint8_t coreid);
  */
 void hal_interrupt_disable(uint8_t coreid);
 
-//--------------------------------------------------------------------+
-// INCLUDE DRIVEN
-//--------------------------------------------------------------------+
-#if TUSB_CFG_MCU == MCU_LPC11UXX
-  #include "hal_lpc11uxx.h"
-#elif TUSB_CFG_MCU == MCU_LPC13UXX
-  #include "hal_lpc13uxx.h"
-#elif TUSB_CFG_MCU == MCU_LPC43XX
-  #include "mcu/nxp/lpc43xx/usb/hal_lpc43xx.h"
-#elif TUSB_CFG_MCU == MCU_LPC175X_6X
-  #include "hal_lpc175x_6x.h"
-#else
-  #error MCU is not defined or supported yet
-#endif
+#include "hal_usb.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,7 +101,6 @@ static inline bool hal_debugger_is_attached(void)
 #endif
 }
 
-static inline void hal_debugger_breakpoint(void) ATTR_ALWAYS_INLINE;
 static inline void hal_debugger_breakpoint(void)
 {
 #ifndef _TEST_