diff --git a/library.json b/library.json
index 520dcb44..29a6a46e 100644
--- a/library.json
+++ b/library.json
@@ -18,8 +18,7 @@
         "srcFilter": [
             "+<libs/main/core/*.cpp>",
             "+<libs/main/containers/*.cpp>",
-            "+<libs/main/math/*.cpp>",
-            "+<libs/main/thread/*.cpp>"
+            "+<libs/main/math/*.cpp>"
         ],
         "extraScript": "platformio_pre.py",
         "flags": "-DPIP_FREERTOS"
diff --git a/libs/main/core/piincludes_p.h b/libs/main/core/piincludes_p.h
index b2f8a348..e3c622ca 100644
--- a/libs/main/core/piincludes_p.h
+++ b/libs/main/core/piincludes_p.h
@@ -40,6 +40,15 @@ typedef LONG(NTAPI*PINtSetTimerResolution)(ULONG, BOOLEAN, PULONG);
 #include <cstdio>
 #include <iostream>
 
+#ifdef FREERTOS
+#  ifdef ESP_PLATFORM
+#    include "freertos/FreeRTOS.h"
+#    include "freertos/task.h"
+#  endif
+#  ifdef ARDUINO_ARCH_STM32
+#    include <STM32FreeRTOS.h>
+#  endif
+#endif
 
 
 #endif // PIINCLUDES_P_H
diff --git a/libs/main/core/pitime.cpp b/libs/main/core/pitime.cpp
index 605c4707..bca22117 100644
--- a/libs/main/core/pitime.cpp
+++ b/libs/main/core/pitime.cpp
@@ -31,10 +31,6 @@
 //#  include <crt_externs.h>
    extern clock_serv_t __pi_mac_clock;
 #endif
-#ifdef FREERTOS
-#  include "freertos/FreeRTOS.h"
-#  include "freertos/task.h"
-#endif
 #ifdef MICRO_PIP
 #  include <sys/time.h>
 #endif