diff --git a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
index 0c5f5189c..427e8733c 100644
--- a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
+++ b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
@@ -148,7 +148,7 @@ void board_init(void)
   LPC_USB->OTGClkCtrl = clk_en;
   while ( (LPC_USB->OTGClkSt & clk_en) != clk_en );
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   // set portfunc to host !!!
   LPC_USB->StCtrl = 0x3; // should be 1
 #endif
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index c4ec88416..8d7c2bd40 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && CFG_TUH_CDC)
+#if (TUSB_OPT_HOST_ENABLED && CFG_TUH_CDC)
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/class/cdc/cdc_rndis_host.c b/src/class/cdc/cdc_rndis_host.c
index df4a29938..ae61bf8b5 100644
--- a/src/class/cdc/cdc_rndis_host.c
+++ b/src/class/cdc/cdc_rndis_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && CFG_TUH_CDC && CFG_TUH_CDC_RNDIS)
+#if (TUSB_OPT_HOST_ENABLED && CFG_TUH_CDC && CFG_TUH_CDC_RNDIS)
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/class/custom/custom_host.c b/src/class/custom/custom_host.c
index 9f0b70afb..2a8206e36 100644
--- a/src/class/custom/custom_host.c
+++ b/src/class/custom/custom_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && CFG_TUSB_HOST_CUSTOM_CLASS)
+#if (TUSB_OPT_HOST_ENABLED && CFG_TUSB_HOST_CUSTOM_CLASS)
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
index 14398aa67..980381bf5 100644
--- a/src/class/hid/hid_host.c
+++ b/src/class/hid/hid_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && HOST_CLASS_HID)
+#if (TUSB_OPT_HOST_ENABLED && HOST_CLASS_HID)
 
 #define _TINY_USB_SOURCE_FILE_
 //--------------------------------------------------------------------+
diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 0c52011df..57a409ffd 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if MODE_HOST_SUPPORTED & CFG_TUH_MSC
+#if TUSB_OPT_HOST_ENABLED & CFG_TUH_MSC
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index 8e40804d5..d18f19195 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -38,7 +38,7 @@
 
 #include "common/tusb_common.h"
 
-#if MODE_HOST_SUPPORTED && (CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX)
+#if TUSB_OPT_HOST_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX)
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/host/hcd.h b/src/host/hcd.h
index db80994c0..387fbcf1c 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -79,7 +79,7 @@ typedef struct
 
 } hcd_event_t;
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
 // Max number of endpoints per device
 enum {
   HCD_MAX_ENDPOINT = CFG_TUH_HUB + CFG_TUH_HID_KEYBOARD + CFG_TUH_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC +
diff --git a/src/host/hub.c b/src/host/hub.c
index 28814ebd7..04618d448 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && CFG_TUH_HUB)
+#if (TUSB_OPT_HOST_ENABLED && CFG_TUH_HUB)
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 3944d72d0..2c22a3c98 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -38,7 +38,7 @@
 
 #include <common/tusb_common.h>
 
-#if MODE_HOST_SUPPORTED && (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
+#if TUSB_OPT_HOST_ENABLED && (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC40XX)
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 4c4fd5319..d97b4b0d3 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -38,7 +38,7 @@
 
 #include "common/tusb_common.h"
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
 
 #define _TINY_USB_SOURCE_FILE_
 
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index 4da5cffc8..ff37113c6 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -134,7 +134,7 @@ extern void dcd_int_disable(uint8_t rhport);
 extern void dcd_int_enable(uint8_t rhport);
 #endif
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
 extern void hcd_int_disable(uint8_t rhport);
 extern void hcd_int_enable(uint8_t rhport);
 #endif
@@ -167,7 +167,7 @@ static inline void _osal_q_lock(osal_queue_t qhdl)
   if (qhdl->role == OPT_MODE_DEVICE) dcd_int_disable(TUD_OPT_RHPORT);
 #endif
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   if (qhdl->role == OPT_MODE_HOST) hcd_int_disable(TUH_OPT_RHPORT);
 #endif
 }
@@ -179,7 +179,7 @@ static inline void _osal_q_unlock(osal_queue_t qhdl)
   if (qhdl->role == OPT_MODE_DEVICE) dcd_int_enable(TUD_OPT_RHPORT);
 #endif
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   if (qhdl->role == OPT_MODE_HOST) hcd_int_enable(TUH_OPT_RHPORT);
 #endif
 }
diff --git a/src/portable/nxp/lpc17_40/hal_lpc17_40.c b/src/portable/nxp/lpc17_40/hal_lpc17_40.c
index 2acd19f6e..04aebf920 100644
--- a/src/portable/nxp/lpc17_40/hal_lpc17_40.c
+++ b/src/portable/nxp/lpc17_40/hal_lpc17_40.c
@@ -47,7 +47,7 @@ extern void hal_dcd_isr(uint8_t rhport);
 
 void USB_IRQHandler(void)
 {
-  #if MODE_HOST_SUPPORTED
+  #if TUSB_OPT_HOST_ENABLED
     hal_hcd_isr(0);
   #endif
 
diff --git a/src/portable/nxp/lpc18_43/hal_lpc18_43.c b/src/portable/nxp/lpc18_43/hal_lpc18_43.c
index 48a25f99a..ef3977995 100644
--- a/src/portable/nxp/lpc18_43/hal_lpc18_43.c
+++ b/src/portable/nxp/lpc18_43/hal_lpc18_43.c
@@ -48,7 +48,7 @@ extern void hal_hcd_isr(uint8_t hostid);
 #if CFG_TUSB_RHPORT0_MODE
 void USB0_IRQHandler(void)
 {
-  #if MODE_HOST_SUPPORTED
+  #if TUSB_OPT_HOST_ENABLED
     hal_hcd_isr(0);
   #endif
 
@@ -61,7 +61,7 @@ void USB0_IRQHandler(void)
 #if CFG_TUSB_RHPORT1_MODE
 void USB1_IRQHandler(void)
 {
-  #if MODE_HOST_SUPPORTED
+  #if TUSB_OPT_HOST_ENABLED
     hal_hcd_isr(1);
   #endif
 
diff --git a/src/tusb.c b/src/tusb.c
index 931cc0ebe..4f7996664 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -55,7 +55,7 @@ bool tusb_init(void)
   // skip if already initialized
   if (_initialized) return true;
 
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   TU_VERIFY( usbh_init() ); // init host stack
 #endif
 
@@ -71,7 +71,7 @@ bool tusb_init(void)
 #if CFG_TUSB_OS == OPT_OS_NONE
 void tusb_task(void)
 {
-  #if MODE_HOST_SUPPORTED
+  #if TUSB_OPT_HOST_ENABLED
   usbh_task(NULL);
   #endif
 
diff --git a/src/tusb.h b/src/tusb.h
index e31513f87..4d65c80e1 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -52,7 +52,7 @@
 #include "common/tusb_fifo.h"
 
 //------------- HOST -------------//
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   #include "host/usbh.h"
 
   #if HOST_CLASS_HID
diff --git a/src/tusb_option.h b/src/tusb_option.h
index ad5025235..e8baf4149 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -109,13 +109,6 @@
   #error "tinyusb does not support same modes on more than 1 roothub port"
 #endif
 
-// TODO remove
-#define CONTROLLER_HOST_NUMBER (\
-    ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) ? 1 : 0) + \
-    ((CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST) ? 1 : 0))
-
-#define MODE_HOST_SUPPORTED     (CONTROLLER_HOST_NUMBER > 0)
-
 // Which roothub port is configured as host
 #define TUH_OPT_RHPORT          ( (CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) ? 0 : ((CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST) ? 1 : -1) )
 #define TUSB_OPT_HOST_ENABLED   ( TUH_OPT_RHPORT >= 0 )
@@ -206,7 +199,7 @@
 //--------------------------------------------------------------------
 // HOST OPTIONS
 //--------------------------------------------------------------------
-#if MODE_HOST_SUPPORTED
+#if TUSB_OPT_HOST_ENABLED
   #ifndef CFG_TUSB_HOST_DEVICE_MAX
     #define CFG_TUSB_HOST_DEVICE_MAX 1
     #warning CFG_TUSB_HOST_DEVICE_MAX is not defined, default value is 1
@@ -228,7 +221,7 @@
   #endif
 
   //------------- CLASS -------------//
-#endif // MODE_HOST_SUPPORTED
+#endif // TUSB_OPT_HOST_ENABLED
 
 
 //------------------------------------------------------------------