diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index 325485425..4ce927725 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -45,7 +45,7 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/tusb_common.h"
-#include "common/timeout_timer.h"
+#include "common/tusb_timeout.h"
 #include "hid_device.h"
 #include "device/usbd_pvt.h"
 
diff --git a/src/common/timeout_timer.h b/src/common/tusb_timeout.h
similarity index 92%
rename from src/common/timeout_timer.h
rename to src/common/tusb_timeout.h
index 5c62c6904..400434708 100644
--- a/src/common/timeout_timer.h
+++ b/src/common/tusb_timeout.h
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*!
-    @file     timeout_timer.h
+    @file     tusb_timeout.h
     @author   hathach (tinyusb.org)
 
     @section LICENSE
@@ -41,8 +41,8 @@
  *  @{ */
 
 
-#ifndef _TUSB_TIMEOUT_TTIMER_H_
-#define _TUSB_TIMEOUT_TTIMER_H_
+#ifndef _TUSB_TIMEOUT_H_
+#define _TUSB_TIMEOUT_H_
 
 #include "tusb_compiler.h"
 #include "tusb_hal.h"
@@ -80,6 +80,6 @@ static inline void timeout_blocking_wait(uint32_t msec)
  }
 #endif
 
-#endif /* _TUSB_TIMEOUT_TTIMER_H_ */
+#endif /* _TUSB_TIMEOUT_H_ */
 
 /** @} */
diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index c9cd39378..9e326ec53 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/timeout_timer.h"
+#include "common/tusb_timeout.h"
 
 #include "../hcd.h"
 #include "../usbh_hcd.h"
diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 5788aac94..73e9d887e 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/timeout_timer.h"
+#include "common/tusb_timeout.h"
 
 #include "../hcd.h"
 #include "../usbh_hcd.h"
diff --git a/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c b/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
index f0472f41d..0bb79090e 100644
--- a/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
+++ b/src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c
@@ -51,7 +51,7 @@
 #include "common/tusb_common.h"
 #include "hal/hal.h"
 #include "osal/osal.h"
-#include "common/timeout_timer.h"
+#include "common/tusb_timeout.h"
 
 #include "device/dcd.h"
 #include "usbd_dcd.h"
diff --git a/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c b/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
index a08e20a3f..6c076baa8 100644
--- a/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
+++ b/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
@@ -46,7 +46,7 @@
 #include "common/tusb_common.h"
 #include "tusb_hal.h"
 #include "osal/osal.h"
-#include "common/timeout_timer.h"
+#include "common/tusb_timeout.h"
 
 #include "device/dcd.h"
 #include "dcd_lpc43xx.h"