diff --git a/include/zenoh-pico/system/platform/arduino/esp32.h b/include/zenoh-pico/system/platform/arduino/esp32.h
index 9f8c34da9..af09722a2 100644
--- a/include/zenoh-pico/system/platform/arduino/esp32.h
+++ b/include/zenoh-pico/system/platform/arduino/esp32.h
@@ -15,8 +15,6 @@
 #ifndef ZENOH_PICO_SYSTEM_ESP32_TYPES_H
 #define ZENOH_PICO_SYSTEM_ESP32_TYPES_H
 
-#include <Arduino.h>
-
 #include "zenoh-pico/config.h"
 
 #if Z_FEATURE_MULTI_THREAD == 1
@@ -24,7 +22,7 @@
 #endif  // Z_FEATURE_MULTI_THREAD == 1
 
 #if Z_FEATURE_MULTI_THREAD == 1
-typedef TaskHandle_t _z_task_t;
+typedef void *_z_task_t;
 typedef void *z_task_attr_t;  // Not used in ESP32
 typedef pthread_mutex_t _z_mutex_t;
 typedef pthread_cond_t _z_condvar_t;
diff --git a/src/system/arduino/esp32/system.c b/src/system/arduino/esp32/system.c
index 3e3266c0a..d9df00044 100644
--- a/src/system/arduino/esp32/system.c
+++ b/src/system/arduino/esp32/system.c
@@ -12,6 +12,7 @@
 //   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
 //
 
+#include <Arduino.h>
 #include <esp_heap_caps.h>
 #include <stddef.h>
 #include <sys/time.h>