diff --git a/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c b/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
index 8b6df2b5..dfae099e 100644
--- a/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
+++ b/tests/lpc175x_6x/test/test_dcd_lpc175x_6x.c
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "type_helper.h"
 
 #include "mock_usbd_dcd.h"
diff --git a/tests/lpc175x_6x/test/test_usbd.c b/tests/lpc175x_6x/test/test_usbd.c
index 0fe37083..6a86f630 100644
--- a/tests/lpc175x_6x/test/test_usbd.c
+++ b/tests/lpc175x_6x/test/test_usbd.c
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "type_helper.h"
 
 #include "tusb_descriptors.h"
diff --git a/tests/lpc18xx_43xx/project.yml b/tests/lpc18xx_43xx/project.yml
index 4493b690..795bd703 100644
--- a/tests/lpc18xx_43xx/project.yml
+++ b/tests/lpc18xx_43xx/project.yml
@@ -32,11 +32,11 @@
     
   :source:
     - ../../tinyusb/**
-    - +:../../demos/bsp/lpc43xx/**
+    - +:../../mcu/lpc43xx/**
     #- +:../../demos/device/keyboard/*
     - -:../../demos/
-    - ../../vendor/freertos/freertos/Source/*
-    - ../../vendor/freertos/freertos/Source/portable/MSVC-MingW/*
+    #- ../../vendor/freertos/freertos/Source/*
+    #- ../../vendor/freertos/freertos/Source/portable/MSVC-MingW/*
 
 :defines:
   # in order to add common defines:
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
index 015d2a73..08d3593e 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
index 40973efe..9e930207 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
index 86103d84..bad29cbf 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_init.c
@@ -40,7 +40,7 @@
 #include "unity.h"
 #include "type_helper.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 
 #include "hal.h"
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c
index 0d5f2d81..d1604938 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_isr.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c
index 3ca2f3e4..08eb961f 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_structure.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
index a505f53d..bd5847ef 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
index 9a3d0a36..6bf02f40 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_open.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
index 221fe0ee..0c678ff1 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
index 7cfdec4b..a42a6ccb 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_open.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
index 74d6751b..4ffb276c 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
index 946d8f0c..d040a3a1 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_open.c
@@ -38,7 +38,7 @@
 
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
index 21d7b3f7..e6c7fb3e 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c
index b2ebbf94..f516d88b 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_isochronous_open.c
@@ -38,7 +38,7 @@
 
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c b/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
index 618d4bd9..95027a72 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hid_host.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 #include "common/common.h"
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
index d3d7f9ca..1af7b12d 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_generic.c
@@ -38,7 +38,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "type_helper.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "common/common.h"
 
 #include "hid_host.h"
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
index ed9d9023..9a5f5c3c 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "type_helper.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "common/common.h"
 #include "hid_host.h"
 #include "mock_osal.h"
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
index 28d22ac4..acee6492 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "type_helper.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "common/common.h"
 
 #include "hid_host.h"
diff --git a/tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c b/tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c
index a9fec44a..1288c42e 100644
--- a/tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c
+++ b/tests/lpc18xx_43xx/test/host/integration/test_hidh_keyboard_integrate.c
@@ -40,7 +40,7 @@
 //#include "unity.h"
 //#include "type_helper.h"
 //#include "tusb_option.h"
-//#include "errors.h"
+//#include "tusb_errors.h"
 //
 //#include "mock_osal.h"
 //#include "hcd.h"
diff --git a/tests/lpc18xx_43xx/test/host/msc/test_msc_host.c b/tests/lpc18xx_43xx/test/host/msc/test_msc_host.c
index 75a7549d..30f4e46d 100644
--- a/tests/lpc18xx_43xx/test/host/msc/test_msc_host.c
+++ b/tests/lpc18xx_43xx/test/host/msc/test_msc_host.c
@@ -39,7 +39,7 @@
 #include "stdlib.h"
 #include "unity.h"
 #include "tusb_option.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "binary.h"
 #include "type_helper.h"
 
diff --git a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
index 8eacd761..b409209f 100644
--- a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
+++ b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
@@ -37,7 +37,7 @@
 /**************************************************************************/
 
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "descriptor_test.h"
 
 #include "mock_osal.h"
diff --git a/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c b/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
index 2289fe68..6ae72914 100644
--- a/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
+++ b/tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "type_helper.h"
 
 #include "mock_osal.h"
diff --git a/tests/lpc18xx_43xx/test/test_assertion.c b/tests/lpc18xx_43xx/test/test_assertion.c
index c0e2b3b7..2b465d07 100644
--- a/tests/lpc18xx_43xx/test/test_assertion.c
+++ b/tests/lpc18xx_43xx/test/test_assertion.c
@@ -45,7 +45,7 @@
 #include "CException.h"
 #include "binary.h"
 #include "common/assertion.h"
-#include "errors.h"
+#include "tusb_errors.h"
 
 CEXCEPTION_T e;
 
diff --git a/tests/lpc18xx_43xx/test/test_osal_freeRTOS.c b/tests/lpc18xx_43xx/test/test_osal_freeRTOS.c
index b22797e5..767553ae 100644
--- a/tests/lpc18xx_43xx/test/test_osal_freeRTOS.c
+++ b/tests/lpc18xx_43xx/test/test_osal_freeRTOS.c
@@ -37,7 +37,7 @@
 /**************************************************************************/
 
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 //#include "freeRTOS.h"
 //#include "osal_freeRTOS.h"
 //#include "mock_task.h"
diff --git a/tests/lpc18xx_43xx/test/test_osal_none.c b/tests/lpc18xx_43xx/test/test_osal_none.c
index ab84c845..1ed61168 100644
--- a/tests/lpc18xx_43xx/test/test_osal_none.c
+++ b/tests/lpc18xx_43xx/test/test_osal_none.c
@@ -41,7 +41,7 @@
 #endif
 
 #include "unity.h"
-#include "errors.h"
+#include "tusb_errors.h"
 #include "osal_none.h"
 
 #define QUEUE_DEPTH 10