diff --git a/canutils/slcan/slcan.c b/canutils/slcan/slcan.c
index c2657781406..f6b6c4e3ccc 100644
--- a/canutils/slcan/slcan.c
+++ b/canutils/slcan/slcan.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 #include <syslog.h>
 #include <sys/uio.h>
-#include <net/if.h>
 #include <termios.h>
 #include <nuttx/can.h>
 
diff --git a/examples/can/can_main.c b/examples/can/can_main.c
index bba0b2275c3..94402fdfeaf 100644
--- a/examples/can/can_main.c
+++ b/examples/can/can_main.c
@@ -36,7 +36,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <debug.h>
-#include <unistd.h>
 
 #include <nuttx/can/can.h>
 
diff --git a/examples/module/main/module_main.c b/examples/module/main/module_main.c
index 0d31fb38b51..74dc98b7c3e 100644
--- a/examples/module/main/module_main.c
+++ b/examples/module/main/module_main.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 #include <syslog.h>
 #include <errno.h>
 #include <debug.h>
diff --git a/examples/nimble/nimble_main.c b/examples/nimble/nimble_main.c
index 829e02cdb08..ba46199f7fc 100644
--- a/examples/nimble/nimble_main.c
+++ b/examples/nimble/nimble_main.c
@@ -34,8 +34,6 @@
 #include <unistd.h>
 #include <sys/boardctl.h>
 #include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
 
 #include "netutils/netinit.h"
 
@@ -51,7 +49,6 @@
 #include "services/ias/ble_svc_ias.h"
 #include "services/lls/ble_svc_lls.h"
 #include "services/tps/ble_svc_tps.h"
-#include "services/gap/ble_svc_gap.h"
 #include "services/bas/ble_svc_bas.h"
 #include "services/dis/ble_svc_dis.h"
 
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c b/examples/nrf24l01_btle/nrf24l01_btle.c
index 1f0e68a13a0..ee373798f45 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <poll.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include "nrf24l01_btle.h"
 
diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c
index 1d6695027e6..f5ab6fb7bb0 100644
--- a/examples/relays/relays_main.c
+++ b/examples/relays/relays_main.c
@@ -36,8 +36,6 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/arch.h>
-
 #ifdef CONFIG_ARCH_RELAYS
 
 /****************************************************************************
diff --git a/examples/rpmsgsocket/rpsock_server.c b/examples/rpmsgsocket/rpsock_server.c
index a0ba62b7126..467f4f853d0 100644
--- a/examples/rpmsgsocket/rpsock_server.c
+++ b/examples/rpmsgsocket/rpsock_server.c
@@ -34,7 +34,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
diff --git a/examples/usbserial/host.c b/examples/usbserial/host.c
index a001ef5eb7b..c479c4491b9 100644
--- a/examples/usbserial/host.c
+++ b/examples/usbserial/host.c
@@ -24,8 +24,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <stdio.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/examples/usrsocktest/usrsocktest_noblock_connect.c b/examples/usrsocktest/usrsocktest_noblock_connect.c
index 820ea9f50f4..bc7264bfea7 100644
--- a/examples/usrsocktest/usrsocktest_noblock_connect.c
+++ b/examples/usrsocktest/usrsocktest_noblock_connect.c
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <unistd.h>
 
 #include "defines.h"
 
diff --git a/netutils/pppd/pppd.c b/netutils/pppd/pppd.c
index cc3d2b047af..73efa27c971 100644
--- a/netutils/pppd/pppd.c
+++ b/netutils/pppd/pppd.c
@@ -50,7 +50,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <poll.h>
-#include <time.h>
 #include <debug.h>
 #include <unistd.h>
 
diff --git a/netutils/telnetc/telnetc.c b/netutils/telnetc/telnetc.c
index 24f63c206d1..c39c5471ac5 100644
--- a/netutils/telnetc/telnetc.c
+++ b/netutils/telnetc/telnetc.c
@@ -47,7 +47,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <string.h>
 #include <stdarg.h>
 
 #if defined(HAVE_ZLIB)
diff --git a/netutils/thttpd/fdwatch.c b/netutils/thttpd/fdwatch.c
index 320cf1a8571..105fea30f6b 100644
--- a/netutils/thttpd/fdwatch.c
+++ b/netutils/thttpd/fdwatch.c
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <debug.h>
 #include <poll.h>
-#include <debug.h>
 
 #include "config.h"
 #include "thttpd_alloc.h"
diff --git a/system/vi/vi.c b/system/vi/vi.c
index be4abbd84e0..d2c894cf30e 100644
--- a/system/vi/vi.c
+++ b/system/vi/vi.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
 #include <syslog.h>
diff --git a/system/zmodem/zm_state.c b/system/zmodem/zm_state.c
index 4b7f4cfaf95..d3add1c6ee3 100644
--- a/system/zmodem/zm_state.c
+++ b/system/zmodem/zm_state.c
@@ -44,7 +44,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
-#include <ctype.h>
 #include <fcntl.h>
 #include <sched.h>
 #include <assert.h>
diff --git a/testing/drivertest/drivertest_framebuffer.c b/testing/drivertest/drivertest_framebuffer.c
index 1436d779d30..03edb568033 100644
--- a/testing/drivertest/drivertest_framebuffer.c
+++ b/testing/drivertest/drivertest_framebuffer.c
@@ -31,7 +31,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/testing/drivertest/drivertest_i2c_spi.c b/testing/drivertest/drivertest_i2c_spi.c
index 1157a2a4ef1..1faaef177a5 100644
--- a/testing/drivertest/drivertest_i2c_spi.c
+++ b/testing/drivertest/drivertest_i2c_spi.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/testing/drivertest/drivertest_lcd.c b/testing/drivertest/drivertest_lcd.c
index 2a4519cb24e..22195b8bfb3 100644
--- a/testing/drivertest/drivertest_lcd.c
+++ b/testing/drivertest/drivertest_lcd.c
@@ -33,7 +33,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/param.h>
 
 #include <stdio.h>
diff --git a/testing/drivertest/drivertest_watchdog.c b/testing/drivertest/drivertest_watchdog.c
index 865c381edff..8efa41eb2b2 100644
--- a/testing/drivertest/drivertest_watchdog.c
+++ b/testing/drivertest/drivertest_watchdog.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 #include <debug.h>
 #include <inttypes.h>
diff --git a/testing/ostest/schedlock.c b/testing/ostest/schedlock.c
index b6e60f8d088..69d2ef0a387 100644
--- a/testing/ostest/schedlock.c
+++ b/testing/ostest/schedlock.c
@@ -44,7 +44,6 @@
 #include <pthread.h>
 #include <errno.h>
 #include <sched.h>
-#include <unistd.h>
 #include <stdint.h>
 
 #ifdef CONFIG_SIM_WALLTIME_SLEEP
diff --git a/testing/testsuites/kernel/fs/cases/fs_append_test.c b/testing/testsuites/kernel/fs/cases/fs_append_test.c
index 990f4d93dff..d96d3046104 100644
--- a/testing/testsuites/kernel/fs/cases/fs_append_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_append_test.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <syslog.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_creat_test.c b/testing/testsuites/kernel/fs/cases/fs_creat_test.c
index 23fcab888f0..3d7d8833060 100644
--- a/testing/testsuites/kernel/fs/cases/fs_creat_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_creat_test.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <syslog.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_pread_test.c b/testing/testsuites/kernel/fs/cases/fs_pread_test.c
index f1a710cf996..1095a4827e4 100644
--- a/testing/testsuites/kernel/fs/cases/fs_pread_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_pread_test.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 #include <nuttx/config.h>
 #include <errno.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -33,11 +32,9 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
-#include <stdio.h>
 #include "fstest.h"
 
 /****************************************************************************
diff --git a/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c b/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
index 1afa3d1cfd4..b44e87b096b 100644
--- a/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_pwrite_test.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 #include <nuttx/config.h>
 #include <errno.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -33,7 +32,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_read_test.c b/testing/testsuites/kernel/fs/cases/fs_read_test.c
index 1ffb0bb8e43..d9659cf8689 100644
--- a/testing/testsuites/kernel/fs/cases/fs_read_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_read_test.c
@@ -33,7 +33,6 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_readlink_test.c b/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
index c3617c0973b..c6318e4393d 100644
--- a/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_readlink_test.c
@@ -25,7 +25,6 @@
  ****************************************************************************/
 #include <nuttx/config.h>
 #include <errno.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -34,7 +33,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_sendfile_test.c b/testing/testsuites/kernel/fs/cases/fs_sendfile_test.c
index 5163e7cbfeb..30337e3ae64 100644
--- a/testing/testsuites/kernel/fs/cases/fs_sendfile_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_sendfile_test.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <syslog.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_stat_test.c b/testing/testsuites/kernel/fs/cases/fs_stat_test.c
index fb2c096d429..6a4bfb00cb2 100644
--- a/testing/testsuites/kernel/fs/cases/fs_stat_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_stat_test.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_stream_test.c b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
index fbea3e4e4da..2f7f1670f20 100644
--- a/testing/testsuites/kernel/fs/cases/fs_stream_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_stream_test.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <syslog.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/fs/cases/fs_symlink_test.c b/testing/testsuites/kernel/fs/cases/fs_symlink_test.c
index a12d727e580..395bb5fe6eb 100644
--- a/testing/testsuites/kernel/fs/cases/fs_symlink_test.c
+++ b/testing/testsuites/kernel/fs/cases/fs_symlink_test.c
@@ -25,13 +25,10 @@
  ****************************************************************************/
 #include <nuttx/config.h>
 #include <errno.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 #include <syslog.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/mm/cmocka_mm_test.c b/testing/testsuites/kernel/mm/cmocka_mm_test.c
index 1c861326bce..3d4e8ee8ca8 100644
--- a/testing/testsuites/kernel/mm/cmocka_mm_test.c
+++ b/testing/testsuites/kernel/mm/cmocka_mm_test.c
@@ -27,10 +27,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <setjmp.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "MmTest.h"
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/mutex/cmocka_mutex_test.c b/testing/testsuites/kernel/mutex/cmocka_mutex_test.c
index 64df27069b9..91b64017700 100644
--- a/testing/testsuites/kernel/mutex/cmocka_mutex_test.c
+++ b/testing/testsuites/kernel/mutex/cmocka_mutex_test.c
@@ -27,10 +27,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <setjmp.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "MutexTest.h"
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/pthread/cmocka_pthread_test.c b/testing/testsuites/kernel/pthread/cmocka_pthread_test.c
index 8c7b17598e1..5e04ac87a86 100644
--- a/testing/testsuites/kernel/pthread/cmocka_pthread_test.c
+++ b/testing/testsuites/kernel/pthread/cmocka_pthread_test.c
@@ -27,10 +27,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <setjmp.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "PthreadTest.h"
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/socket/cmocka_socket_test.c b/testing/testsuites/kernel/socket/cmocka_socket_test.c
index 7b6627272f0..ea070b4a0ba 100644
--- a/testing/testsuites/kernel/socket/cmocka_socket_test.c
+++ b/testing/testsuites/kernel/socket/cmocka_socket_test.c
@@ -27,10 +27,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <setjmp.h>
-#include <stdint.h>
 #include <stdio.h>
 #include "SocketTest.h"
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/syscall/cases/accept_test.c b/testing/testsuites/kernel/syscall/cases/accept_test.c
index b1d16c17f4d..7bb32ad5809 100644
--- a/testing/testsuites/kernel/syscall/cases/accept_test.c
+++ b/testing/testsuites/kernel/syscall/cases/accept_test.c
@@ -36,8 +36,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <setjmp.h>
-#include <cmocka.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
diff --git a/testing/testsuites/kernel/syscall/cases/bind_test.c b/testing/testsuites/kernel/syscall/cases/bind_test.c
index 1ae9cf39e42..2b01a5a3e13 100644
--- a/testing/testsuites/kernel/syscall/cases/bind_test.c
+++ b/testing/testsuites/kernel/syscall/cases/bind_test.c
@@ -38,9 +38,7 @@
 #include <cmocka.h>
 #include <grp.h>
 #include <pwd.h>
-#include <sys/types.h>
 #include <syslog.h>
-#include <errno.h>
 #include <pthread.h>
 #include <netinet/in.h>
 
diff --git a/testing/testsuites/kernel/syscall/cases/dup2_test.c b/testing/testsuites/kernel/syscall/cases/dup2_test.c
index 4a354463921..bdd7b0b9723 100644
--- a/testing/testsuites/kernel/syscall/cases/dup2_test.c
+++ b/testing/testsuites/kernel/syscall/cases/dup2_test.c
@@ -27,7 +27,6 @@
 #include <syslog.h>
 #include <stdio.h>
 #include <errno.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <stdint.h>
 #include <stdarg.h>
diff --git a/testing/testsuites/kernel/syscall/cases/dup_test.c b/testing/testsuites/kernel/syscall/cases/dup_test.c
index 7197b5713d7..0d31adae1a8 100644
--- a/testing/testsuites/kernel/syscall/cases/dup_test.c
+++ b/testing/testsuites/kernel/syscall/cases/dup_test.c
@@ -27,7 +27,6 @@
 #include <syslog.h>
 #include <stdio.h>
 #include <errno.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <stdint.h>
diff --git a/testing/testsuites/kernel/syscall/cases/fsync_test.c b/testing/testsuites/kernel/syscall/cases/fsync_test.c
index 0e4ad49af22..8aabf200295 100644
--- a/testing/testsuites/kernel/syscall/cases/fsync_test.c
+++ b/testing/testsuites/kernel/syscall/cases/fsync_test.c
@@ -28,7 +28,6 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/statvfs.h>
 #include <sys/resource.h>
 #include <time.h>
@@ -38,7 +37,6 @@
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/types.h>
-#include <sys/resource.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdint.h>
diff --git a/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c b/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
index 7c7cb5c733a..92861fd2181 100644
--- a/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
+++ b/testing/testsuites/kernel/syscall/cases/getTimeofday_test.c
@@ -29,7 +29,6 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
diff --git a/testing/testsuites/kernel/syscall/cases/lstat_test.c b/testing/testsuites/kernel/syscall/cases/lstat_test.c
index 19a71cc946a..8ea39e1f11c 100644
--- a/testing/testsuites/kernel/syscall/cases/lstat_test.c
+++ b/testing/testsuites/kernel/syscall/cases/lstat_test.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/testing/testsuites/kernel/syscall/cases/memcpy_test.c b/testing/testsuites/kernel/syscall/cases/memcpy_test.c
index 60733646d37..bd7fb28f5ca 100644
--- a/testing/testsuites/kernel/syscall/cases/memcpy_test.c
+++ b/testing/testsuites/kernel/syscall/cases/memcpy_test.c
@@ -36,7 +36,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <errno.h>
 #include <cmocka.h>
 #include "SyscallTest.h"
 
diff --git a/testing/testsuites/kernel/syscall/cases/memset_test.c b/testing/testsuites/kernel/syscall/cases/memset_test.c
index 5a40cea4e7f..bc1989daa83 100644
--- a/testing/testsuites/kernel/syscall/cases/memset_test.c
+++ b/testing/testsuites/kernel/syscall/cases/memset_test.c
@@ -36,7 +36,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
-#include <errno.h>
 #include <cmocka.h>
 #include "SyscallTest.h"
 
diff --git a/testing/testsuites/kernel/syscall/cases/readdir_test.c b/testing/testsuites/kernel/syscall/cases/readdir_test.c
index 13d123e62c1..007c8516615 100644
--- a/testing/testsuites/kernel/syscall/cases/readdir_test.c
+++ b/testing/testsuites/kernel/syscall/cases/readdir_test.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <syslog.h>
-#include <stdint.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <setjmp.h>
diff --git a/testing/testsuites/kernel/syscall/cases/sched_test.c b/testing/testsuites/kernel/syscall/cases/sched_test.c
index 65f227a464a..901a3464950 100644
--- a/testing/testsuites/kernel/syscall/cases/sched_test.c
+++ b/testing/testsuites/kernel/syscall/cases/sched_test.c
@@ -35,9 +35,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <time.h>
-#include <syslog.h>
 #include <sched.h>
-#include <sys/types.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <stddef.h>