diff --git a/examples/pipe/pipe_main.c b/examples/pipe/pipe_main.c
index a8e85c696a9..d34845ce794 100644
--- a/examples/pipe/pipe_main.c
+++ b/examples/pipe/pipe_main.c
@@ -30,6 +30,7 @@
 #include <sched.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "pipe.h"
 
diff --git a/examples/pipe/redirect_test.c b/examples/pipe/redirect_test.c
index de45f2d054c..9f9a07dca9e 100644
--- a/examples/pipe/redirect_test.c
+++ b/examples/pipe/redirect_test.c
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <sched.h>
 #include <errno.h>
+#include <pthread.h>
 
 #include "pipe.h"
 
diff --git a/system/libuv/0001-libuv-port-for-nuttx.patch b/system/libuv/0001-libuv-port-for-nuttx.patch
index 237ff58b6bc..0c2eb18dd7d 100644
--- a/system/libuv/0001-libuv-port-for-nuttx.patch
+++ b/system/libuv/0001-libuv-port-for-nuttx.patch
@@ -3960,3 +3960,15 @@ index 57afeb2c..ec8eeb08 100644
 +  return UV_ENOTSUP;
 +}
 +#endif
+diff --color -ur libuv_back/src/unix/thread.c libuv/src/unix/thread.c
+--- libuv_back/src/unix/thread.c	2024-11-13 09:37:22.507687159 +0800
++++ libuv/src/unix/thread.c	2024-11-13 09:37:47.822236556 +0800
+@@ -41,7 +41,7 @@
+ #include <gnu/libc-version.h>  /* gnu_get_libc_version() */
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined (__NuttX__)
+ # include <sched.h>
+ # define uv__cpu_set_t cpu_set_t
+ #elif defined(__FreeBSD__)
diff --git a/system/popen/popen.c b/system/popen/popen.c
index a873f38645c..d4dd63cf175 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -35,6 +35,7 @@
 #include <assert.h>
 #include <debug.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "nshlib/nshlib.h"
 
diff --git a/testing/cmocka/cmocka_main.c b/testing/cmocka/cmocka_main.c
index 29955095440..00b0189940a 100644
--- a/testing/cmocka/cmocka_main.c
+++ b/testing/cmocka/cmocka_main.c
@@ -31,6 +31,7 @@
 #include <setjmp.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <sys/wait.h>
 #include <builtin/builtin.h>
diff --git a/testing/drivertest/drivertest_pm_runtime.c b/testing/drivertest/drivertest_pm_runtime.c
index 9e80a0f4288..3b8aa9a900a 100644
--- a/testing/drivertest/drivertest_pm_runtime.c
+++ b/testing/drivertest/drivertest_pm_runtime.c
@@ -32,6 +32,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <string.h>
+#include <unistd.h>
 #include <cmocka.h>
 #include <nuttx/power/pm_runtime.h>
 
diff --git a/testing/drivertest/drivertest_posix_timer.c b/testing/drivertest/drivertest_posix_timer.c
index 5fc2092f8b5..fed2f0ce117 100644
--- a/testing/drivertest/drivertest_posix_timer.c
+++ b/testing/drivertest/drivertest_posix_timer.c
@@ -31,6 +31,8 @@
 #include <stdint.h>
 #include <cmocka.h>
 #include <syslog.h>
+#include <getopt.h>
+#include <time.h>
 #include <nuttx/timers/timer.h>
 
 /****************************************************************************
diff --git a/testing/drivertest/drivertest_rtc.c b/testing/drivertest/drivertest_rtc.c
index 0dbf9cebb8a..01ce8ee70df 100644
--- a/testing/drivertest/drivertest_rtc.c
+++ b/testing/drivertest/drivertest_rtc.c
@@ -39,6 +39,7 @@
 #include <stdint.h>
 #include <cmocka.h>
 #include <syslog.h>
+#include <getopt.h>
 #include <nuttx/timers/rtc.h>
 #include <nuttx/clock.h>
 
diff --git a/testing/drivertest/drivertest_uart.c b/testing/drivertest/drivertest_uart.c
index 91b6a0d970e..d26d07005cf 100644
--- a/testing/drivertest/drivertest_uart.c
+++ b/testing/drivertest/drivertest_uart.c
@@ -31,6 +31,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 #include <cmocka.h>
 
diff --git a/testing/testsuites/kernel/fs/cases/fs_getfilep_test.c b/testing/testsuites/kernel/fs/cases/fs_getfilep_test.c
index 97037fbc811..f894c17162a 100644
--- a/testing/testsuites/kernel/fs/cases/fs_getfilep_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_getfilep_test.c
@@ -27,6 +27,9 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
+
+#include <nuttx/fs/fs.h>
+
 #include "fstest.h"
 
 /****************************************************************************
diff --git a/testing/testsuites/kernel/mm/cases/mm_test_008.c b/testing/testsuites/kernel/mm/cases/mm_test_008.c
index f49148b7813..892de5bff40 100644
--- a/testing/testsuites/kernel/mm/cases/mm_test_008.c
+++ b/testing/testsuites/kernel/mm/cases/mm_test_008.c
@@ -39,6 +39,9 @@
 #include <setjmp.h>
 #include <cmocka.h>
 #include <malloc.h>
+
+#include <nuttx/sched.h>
+
 #include "MmTest.h"
 
 /****************************************************************************
diff --git a/wireless/bluetooth/btsak/btsak.h b/wireless/bluetooth/btsak/btsak.h
index 0affe0f8bcd..a07b4cd2bed 100644
--- a/wireless/bluetooth/btsak/btsak.h
+++ b/wireless/bluetooth/btsak/btsak.h
@@ -32,6 +32,7 @@
 
 #include <nuttx/config.h>
 
+#include <stdbool.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netpacket/bluetooth.h>