diff --git a/demos/device/keyboard/.cproject b/demos/device/keyboard/.cproject
index 078e72167..19402f70d 100644
--- a/demos/device/keyboard/.cproject
+++ b/demos/device/keyboard/.cproject
@@ -422,6 +422,7 @@
 					</profile>
 				</scannerConfigBuildInfo>
 			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 		</cconfiguration>
 		<cconfiguration id="com.crt.advproject.config.exe.release.2127212492">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.release.2127212492" moduleId="org.eclipse.cdt.core.settings" name="Release">
@@ -825,6 +826,7 @@
 					</profile>
 				</scannerConfigBuildInfo>
 			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
diff --git a/demos/device/keyboard/descriptors.c b/demos/device/keyboard/descriptors.c
index 54c5ed9e1..2b8cbc854 100644
--- a/demos/device/keyboard/descriptors.c
+++ b/demos/device/keyboard/descriptors.c
@@ -173,7 +173,7 @@ ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_FsConfigDescriptor =
     // IAD points to CDC Interfaces
     .CDC_IAD =
     {
-        .bLength           = sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR),
+        .bLength           = sizeof(USB_Descriptor_InterfaceAssociation_t),
         .bDescriptorType   = USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE,
 
         .bFirstInterface   = 0,
diff --git a/demos/device/keyboard/descriptors.h b/demos/device/keyboard/descriptors.h
index 0cff44557..1200192b5 100644
--- a/demos/device/keyboard/descriptors.h
+++ b/demos/device/keyboard/descriptors.h
@@ -118,7 +118,7 @@ typedef struct
   USB_CONFIGURATION_DESCRIPTOR                Config;
 
 #if IAD_DESC_REQUIRED
-  USB_INTERFACE_ASSOCIATION_DESCRIPTOR        CDC_IAD;
+  USB_Descriptor_InterfaceAssociation_t        CDC_IAD;
 #endif
 
 #ifdef CFG_CLASS_CDC
diff --git a/tinyusb/class/hid.c b/tinyusb/class/hid.c
index 579860b9e..76a93d572 100644
--- a/tinyusb/class/hid.c
+++ b/tinyusb/class/hid.c
@@ -37,7 +37,7 @@
 
 #include "hid.h"
 
-#ifdef CLASS_HID
+#ifdef TUSB_CLASS_HID
 
 #ifdef CFG_CLASS_HID_KEYBOARD
 USB_HID_KeyboardReport_t hid_keyboard_report;
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index dbe99b2dd..97bc32ae3 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -67,6 +67,7 @@
 #include "compiler/compiler.h"
 #include "errors.h"
 #include "core/tusb_types.h"
+#include "core/std_descriptors.h"
 
 /// min value
 #ifndef MIN
diff --git a/tinyusb/common/compiler/compiler.h b/tinyusb/common/compiler/compiler.h
index 5a29a2138..b09900a2a 100644
--- a/tinyusb/common/compiler/compiler.h
+++ b/tinyusb/common/compiler/compiler.h
@@ -53,7 +53,7 @@
 
 #if defined(__GNUC__)
   #include "compiler_gcc.h"
-#elif deinfed __ICCARM__ // IAR compiler
+#elif defined __ICCARM__ // IAR compiler
   #include "compiler_iar.h"
 #endif
 
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index ca6fafe76..480db2119 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -59,7 +59,7 @@ ErrorCode_t USB_Configure_Event (USBD_HANDLE_T hUsb)
   USB_CORE_CTRL_T* pCtrl = (USB_CORE_CTRL_T*)hUsb;
   if (pCtrl->config_value)
   {
-    #if defined(CLASS_HID)
+    #if defined(TUSB_CLASS_HID)
     ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
     #endif
 
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index dfe659850..2bb667057 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -68,10 +68,10 @@
 
 TUSB_Error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
 
-TUSB_Error_t hcd_pipe_open(
-    uint8_t hostid, uint8_t device_address,
-
-    )ATTR_WARN_UNUSED_RESULT;
+//TUSB_Error_t hcd_pipe_open(
+//    uint8_t hostid, uint8_t device_address,
+//
+//    )ATTR_WARN_UNUSED_RESULT;
 TUSB_Error_t hcd_pipe_close()ATTR_WARN_UNUSED_RESULT;
 TUSB_Error_t hcd_pipe_transfer()ATTR_WARN_UNUSED_RESULT;
 TUSB_Error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT;
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index 285e6f56e..2bfefbd96 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -58,7 +58,7 @@
   #include "device/dcd.h"
 #endif
 
-#if CLASS_HID
+#if TUSB_CLASS_HID
   #include "class/hid.h"
 #endif