diff --git a/arch/risc-v/src/bl602/bl602_spiflash.c b/arch/risc-v/src/bl602/bl602_spiflash.c
index 0f196856415..a43d08993d6 100644
--- a/arch/risc-v/src/bl602/bl602_spiflash.c
+++ b/arch/risc-v/src/bl602/bl602_spiflash.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <syslog.h>
 
 #ifdef CONFIG_BL602_SPIFLASH
diff --git a/arch/risc-v/src/esp32c3/esp32c3_irq.c b/arch/risc-v/src/esp32c3/esp32c3_irq.c
index b91aff946d0..42522995221 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_irq.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_irq.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <sys/errno.h>
+#include <errno.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_partition.c b/arch/risc-v/src/esp32c3/esp32c3_partition.c
index 1c9cc78ccb3..02960955073 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_partition.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_partition.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <debug.h>
 #include <stdio.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <nuttx/kmalloc.h>
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
index 918c349fb72..284e59eda1f 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/init.h>
diff --git a/arch/xtensa/src/esp32/esp32_emac.c b/arch/xtensa/src/esp32/esp32_emac.c
index d798a10918a..c9dfcca2ca8 100644
--- a/arch/xtensa/src/esp32/esp32_emac.c
+++ b/arch/xtensa/src/esp32/esp32_emac.c
@@ -31,7 +31,7 @@
 #include <debug.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <arpa/inet.h>
 #include <net/if.h>
diff --git a/arch/xtensa/src/esp32/esp32_partition.c b/arch/xtensa/src/esp32/esp32_partition.c
index 107dcc06d40..e3b595ba61f 100644
--- a/arch/xtensa/src/esp32/esp32_partition.c
+++ b/arch/xtensa/src/esp32/esp32_partition.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <debug.h>
 #include <stdio.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <nuttx/kmalloc.h>
 
diff --git a/arch/xtensa/src/esp32/esp32_spicache.c b/arch/xtensa/src/esp32/esp32_spicache.c
index 65fca75aea1..76bb5395ff7 100644
--- a/arch/xtensa/src/esp32/esp32_spicache.c
+++ b/arch/xtensa/src/esp32/esp32_spicache.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include "xtensa.h"
 #include "xtensa_attr.h"
diff --git a/arch/xtensa/src/esp32/esp32_spiflash.c b/arch/xtensa/src/esp32/esp32_spiflash.c
index 4f8b4ee3594..a4081b24612 100644
--- a/arch/xtensa/src/esp32/esp32_spiflash.c
+++ b/arch/xtensa/src/esp32/esp32_spiflash.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/init.h>
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index 81336c30fec..13d0048774f 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -35,7 +35,7 @@
 #include <debug.h>
 #include <stdio.h>
 
-#include <sys/errno.h>
+#include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
 
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
index 06cd427a1cf..85f0cc7f3f1 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_bringup.c
@@ -35,7 +35,7 @@
 #include <debug.h>
 #include <stdio.h>
 
-#include <sys/errno.h>
+#include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>
 
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
index 9dcf950470a..9f4557208e3 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_bringup.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 
 #include <syslog.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/himem/himem.h>