clean up

cores/arduino/Arduino.h

@@ -150,8 +150,10 @@ void loop( void ) ;
 
 // USB
 #ifdef USE_TINYUSB
+#ifdef __cplusplus
   #include "Adafruit_USBD_Interface.h"
   #include "Adafruit_USBD_CDC.h"
+#endif
 #else
   #include "USB/USBDesc.h"
   #include "USB/USBCore.h"

cores/arduino/TinyUSB/Adafruit_USBD_CDC.h

@@ -25,8 +25,6 @@
 #ifndef ADAFRUIT_USBD_CDC_H_
 #define ADAFRUIT_USBD_CDC_H_
 
-#ifdef __cplusplus
-
 #include "Adafruit_USBD_Interface.h"
 #include "Stream.h"
 
@@ -73,5 +71,4 @@ private:
 
 extern Adafruit_USBD_CDC Serial;
 
-#endif // __cplusplus
 #endif

cores/arduino/TinyUSB/Adafruit_USBD_Interface.h

@@ -25,8 +25,6 @@
 #ifndef ADAFRUIT_USBD_INTERFACE_H_
 #define ADAFRUIT_USBD_INTERFACE_H_
 
-#ifdef __cplusplus
-
 class Adafruit_USBD_Interface
 {
   protected:
@@ -44,5 +42,3 @@ class Adafruit_USBD_Interface
 };
 
 #endif
-
-#endif

platform.txt

@@ -77,7 +77,7 @@ compiler.libraries.ldflags=
 
 # USB Flags
 # ---------
-build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{build.core.path}/TinyUSB" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore" "-I{build.core.path}/TinyUSB/Adafruit_TinyUSB_ArduinoCore/tinyusb/src"
+build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{build.core.path}/TinyUSB"
 
 # Default advertised device power setting in mA
 build.usb_power=100