diff --git a/tinyusb/class/hid_device.h b/tinyusb/class/hid_device.h
index 9d89a139a..fe2e838ee 100644
--- a/tinyusb/class/hid_device.h
+++ b/tinyusb/class/hid_device.h
@@ -51,12 +51,12 @@
 #ifndef _TUSB_HID_DEVICE_H_
 #define _TUSB_HID_DEVICE_H_
 
+#include "hid.h"
+
 #ifdef __cplusplus
  extern "C" {
 #endif
 
-#include "hid.h"
-
 #ifdef DEVICE_ROMDRIVER
 /** \brief Initialize HID driver
  *
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index 4df7292c7..45c6fbeac 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -141,7 +141,7 @@ typedef enum {
   TUSB_CLASS_DIAGNOSTIC           = 0xDC ,
   TUSB_CLASS_WIRELESS_CONTROLLER  = 0xE0 ,
   TUSB_CLASS_MISC                 = 0xEF ,
-  TUSB_CLASS_APPLICATION_SPECIFIC = 0xEF ,
+  TUSB_CLASS_APPLICATION_SPECIFIC = 0xFE ,
   TUSB_CLASS_VENDOR_SPECIFIC      = 0xFF
 }tusb_std_class_code_t;
 
diff --git a/tinyusb/host/ehci/ehci.h b/tinyusb/host/ehci/ehci.h
index 290d5f088..b07bdbb27 100644
--- a/tinyusb/host/ehci/ehci.h
+++ b/tinyusb/host/ehci/ehci.h
@@ -70,8 +70,6 @@
  extern "C" {
 #endif
 
-#include "tusb_option.h"
-
 //--------------------------------------------------------------------+
 // EHCI CONFIGURATION & CONSTANTS
 //--------------------------------------------------------------------+