6 files changed, 10 insertions, 10 deletions
diff --git a/tests/test/host/test_enum_task.c b/tests/test/host/test_enum_task.c
index ba8ae282b..c64a7ce3c 100644
--- a/tests/test/host/test_enum_task.c
+++ b/tests/test/host/test_enum_task.c
@@ -37,11 +37,13 @@
 
 #include "unity.h"
 #include "errors.h"
-#include "usbh.h"
 #include "descriptor_test.h"
+
 #include "mock_osal.h"
+#include "usbh.h"
 #include "mock_hcd.h"
-#include "mock_usbh_hcd.h"
+#include "usbh_hcd.h"
+
 #include "mock_tusb_callback.h"
 #include "mock_hid_host.h"
 
diff --git a/tests/test/host/test_usbh.c b/tests/test/host/test_usbh.c
index beb1b1559..3ca029219 100644
--- a/tests/test/host/test_usbh.c
+++ b/tests/test/host/test_usbh.c
@@ -37,10 +37,12 @@
 
 #include "unity.h"
 #include "errors.h"
-#include "usbh.h"
+
 #include "mock_osal.h"
+#include "usbh.h"
 #include "mock_hcd.h"
-#include "mock_usbh_hcd.h"
+#include "usbh_hcd.h"
+
 #include "mock_tusb_callback.h"
 #include "mock_hid_host.h"
 
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 071715300..960a5da2d 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -35,7 +35,7 @@
  * This file is part of the tiny usb stack.
  */
 
-#include "tusb_option.h"
+#include "common/common.h"
 
 #ifdef TUSB_CFG_HOST
 
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index eaa05d07c..1f7e492c2 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -58,8 +58,6 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
-#include "osal/osal.h"
 #include "hcd.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index 0fc831cb9..28bb7e1fe 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -59,9 +59,6 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
-#include "osal/osal.h"
-#include "hcd.h"
-#include "usbh.h"
 
 //--------------------------------------------------------------------+
 // USBH
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index 45c125ed8..1129fec6a 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -50,6 +50,7 @@
 
 #include "common/common.h"
 #include "hal/hal.h"
+#include "osal/osal.h"
 
 #ifdef TUSB_CFG_HOST
   #include "host/usbh.h"