diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 175dcf705..29a5c9038 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -151,7 +151,11 @@ void loop( void ) ;
 // USB
 #ifdef USE_TINYUSB
   // Needed for declaring Serial
-  #include "Adafruit_USBD_CDC.h"
+  #if defined(PLATFORMIO)
+    #include "arduino/Adafruit_USBD_CDC.h"
+  #else
+    #include "Adafruit_USBD_CDC.h"
+  #endif
 #else
   #include "USB/USBDesc.h"
   #include "USB/USBCore.h"
diff --git a/libraries/Adafruit_TinyUSB_Arduino b/libraries/Adafruit_TinyUSB_Arduino
deleted file mode 160000
index 3e5369cd4..000000000
--- a/libraries/Adafruit_TinyUSB_Arduino
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e5369cd4720c63d9caf31db6ca4c18ce7bcd0b7
diff --git a/libraries/Adafruit_ZeroDMA b/libraries/Adafruit_ZeroDMA
deleted file mode 160000
index 5b48867c1..000000000
--- a/libraries/Adafruit_ZeroDMA
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b48867c1d3015ec63cd8f31def45f5a2d8e49bd