diff --git a/demos/host/tusb_config.h b/demos/host/tusb_config.h
index f04e946ef..22c1778ae 100644
--- a/demos/host/tusb_config.h
+++ b/demos/host/tusb_config.h
@@ -60,13 +60,16 @@
 //--------------------------------------------------------------------+
 #define TUSB_CFG_HOST
 
-//------------- CORE/CONTROLLER -------------//
+//------------- CONTROLLER -------------//
 #define TUSB_CFG_HOST_CONTROLLER_NUM 1
 #define TUSB_CFG_HOST_CONTROLLER_START_INDEX 0
 
 #define TUSB_CFG_HOST_DEVICE_MAX     1
 #define TUSB_CFG_CONFIGURATION_MAX   1
 
+//------------- USBD -------------//
+#define TUSB_CFG_HOST_ENUM_BUFFER_SIZE 256
+
 //------------- CLASS -------------//
 #define TUSB_CFG_HOST_HID_KEYBOARD  1
 #define TUSB_CFG_HOST_HID_KEYBOARD_ENDPOINT_SIZE  64
diff --git a/tests/test/host/ehci/test_ehci.c b/tests/test/host/ehci/test_ehci.c
index e3a82ecb9..83f81787e 100644
--- a/tests/test/host/ehci/test_ehci.c
+++ b/tests/test/host/ehci/test_ehci.c
@@ -276,6 +276,11 @@ void test_register_portsc(void)
   TEST_ASSERT_EQUAL( 26 , BITFIELD_OFFSET_OF_MEMBER(ehci_registers_t, portsc_bit, nxp_port_speed));
 }
 
+//--------------------------------------------------------------------+
+// EHCI Data Organiztion
+//--------------------------------------------------------------------+
+
+
 //--------------------------------------------------------------------+
 // Helper
 //--------------------------------------------------------------------+
diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index 888c216e6..109bdbd03 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -103,7 +103,7 @@ void test_keyboard_install_ok(void)
   tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
   TEST_ASSERT_EQUAL(0, tusbh_hid_keyboard_no_instances(device_hdl));
 
-  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, class_hid_keyboard_install(device_hdl, (uint8_t*) &kbd_descriptor));
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, hidh_keyboard_install(device_hdl, (uint8_t*) &kbd_descriptor));
   tusbh_device_status_get_IgnoreAndReturn(TUSB_DEVICE_STATUS_READY);
   TEST_ASSERT_EQUAL(1, tusbh_hid_keyboard_no_instances(device_hdl));
 }
@@ -113,7 +113,7 @@ void test_keyboard_init(void)
   class_hid_keyboard_info_t keyboard_info_zero[TUSB_CFG_HOST_DEVICE_MAX];
   memset(keyboard_info_zero, 0, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 
-  class_hid_keyboard_init();
+  hidh_keyboard_init();
 
   TEST_ASSERT_EQUAL_MEMORY(keyboard_info_zero, keyboard_info_pool, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 }
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index 07abb7e6a..56f8cf56b 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -37,7 +37,7 @@
 
 #include "tusb_option.h"
 
-#if defined TUSB_CFG_HOST && defined DEVICE_CLASS_HID
+#if defined TUSB_CFG_HOST && defined HOST_CLASS_HID
 
 #define _TINY_USB_SOURCE_FILE_
 
@@ -47,6 +47,7 @@
 #include "common/common.h"
 #include "hid_host.h"
 
+#if TUSB_CFG_HOST_HID_KEYBOARD
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
@@ -89,16 +90,17 @@ uint8_t tusbh_hid_keyboard_no_instances(tusb_handle_device_t const device_hdl)
 //--------------------------------------------------------------------+
 // CLASS-USBD API (don't require to verify parameters)
 //--------------------------------------------------------------------+
-void class_hid_keyboard_init(void)
+void hidh_keyboard_init(void)
 {
   memclr_(&keyboard_info_pool, sizeof(class_hid_keyboard_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 }
 
-tusb_error_t class_hid_keyboard_install(uint8_t const dev_addr, uint8_t const *descriptor)
+tusb_error_t hidh_keyboard_install(uint8_t const dev_addr, uint8_t const *descriptor)
 {
   keyboard_info_pool[dev_addr].instance_count++;
 
   return TUSB_ERROR_NONE;
 }
+#endif
 
 #endif
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index c2b60a77a..453fab996 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -57,6 +57,7 @@
 #define MCU_LPC13UXX 1
 #define MCU_LPC11UXX 2
 #define MCU_LPC43XX  3
+#define MCU_LPC18XX  4
 
 #if MCU == 0
   #error MCU is not defined or supported
diff --git a/tinyusb/host/hcd.c b/tinyusb/host/hcd.c
index 6960d2cfa..ad72d49c1 100644
--- a/tinyusb/host/hcd.c
+++ b/tinyusb/host/hcd.c
@@ -39,9 +39,5 @@
 
 #ifdef TUSB_CFG_HOST
 
-tusb_error_t hcd_init(uint8_t coreid)
-{
-  return TUSB_ERROR_NONE;
-}
 
 #endif
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 6c81e97bc..071715300 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -44,8 +44,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
-#include "osal/osal.h"
+#include "tusb.h"
 #include "usbh_hcd.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index f34504c35..eaa05d07c 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -59,6 +59,7 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
+#include "osal/osal.h"
 #include "hcd.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/tusb.c b/tinyusb/tusb.c
index 56fe393e3..6fbcd98f4 100644
--- a/tinyusb/tusb.c
+++ b/tinyusb/tusb.c
@@ -44,7 +44,7 @@ tusb_error_t tusb_init(void)
   ASSERT_STATUS( hal_init() ) ; /* HARDWARE INIT */
 
 #ifdef TUSB_CFG_HOST
-  ASSERT_STATUS( hcd_init(0) );
+  ASSERT_STATUS( usbh_init() );
 #endif
 
 #ifdef TUSB_CFG_DEVICE
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index a29b36d60..45c125ed8 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -49,6 +49,7 @@
 #endif
 
 #include "common/common.h"
+#include "hal/hal.h"
 
 #ifdef TUSB_CFG_HOST
   #include "host/usbh.h"
diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h
index 3fab8f1f2..62a9b8e06 100644
--- a/tinyusb/tusb_option.h
+++ b/tinyusb/tusb_option.h
@@ -124,7 +124,6 @@
   #endif
 
   #define HOST_CLASS_HID   ( TUSB_CFG_HOST_HID_KEYBOARD )
-  #define HOST_EHCI
 #endif // end TUSB_CFG_HOST
 
 //--------------------------------------------------------------------+