diff --git a/tools/testing/selftests/bpf/prog_tests/assign_reuse.c b/tools/testing/selftests/bpf/prog_tests/assign_reuse.c
index 6fa08c47357c..0fc27d5bdcfa 100644
--- a/tools/testing/selftests/bpf/prog_tests/assign_reuse.c
+++ b/tools/testing/selftests/bpf/prog_tests/assign_reuse.c
@@ -3,7 +3,6 @@
 #include <uapi/linux/if_link.h>
 #include <test_progs.h>
 
-#include <netinet/tcp.h>
 #include <netinet/udp.h>
 
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/bind_perm.c b/tools/testing/selftests/bpf/prog_tests/bind_perm.c
index 3016fba668a6..6d4ede3b3245 100644
--- a/tools/testing/selftests/bpf/prog_tests/bind_perm.c
+++ b/tools/testing/selftests/bpf/prog_tests/bind_perm.c
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sched.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 
 #include "test_progs.h"
 #include "cap_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
index e6fc6dfbcb7b..16f48deaf930 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2019 Facebook */
 
-#include <linux/err.h>
-#include <netinet/tcp.h>
 #include <test_progs.h>
 #include "network_helpers.h"
 #include "bpf_dctcp.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c b/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c
index 7288707c8319..89ae96b40983 100644
--- a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c
@@ -3,15 +3,6 @@
 
 #define _GNU_SOURCE
 #include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sched.h>
-#include <net/if.h>
-#include <linux/compiler.h>
-#include <bpf/libbpf.h>
 
 #include "network_helpers.h"
 #include "test_progs.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/cb_refs.c b/tools/testing/selftests/bpf/prog_tests/cb_refs.c
index 3bff680de16c..29d878afd38f 100644
--- a/tools/testing/selftests/bpf/prog_tests/cb_refs.c
+++ b/tools/testing/selftests/bpf/prog_tests/cb_refs.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "bpf/libbpf.h"
 #include <test_progs.h>
 #include <network_helpers.h>
 
diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c b/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
index a1542faf7873..9361dcb727e0 100644
--- a/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
@@ -2,9 +2,7 @@
 /* Copyright (c) 2023 Facebook */
 #include <test_progs.h>
 #include <linux/in6.h>
-#include <sys/socket.h>
 #include <sched.h>
-#include <unistd.h>
 #include "cgroup_helpers.h"
 #include "testing_helpers.h"
 #include "cgroup_tcp_skb.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c b/tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c
index 747761572098..7f28373beda0 100644
--- a/tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgrp_local_storage.c
@@ -2,9 +2,7 @@
 /* Copyright (c) 2022 Meta Platforms, Inc. and affiliates.*/
 
 #define _GNU_SOURCE
-#include <unistd.h>
 #include <sys/syscall.h>
-#include <sys/types.h>
 #include <test_progs.h>
 #include "cgrp_ls_tp_btf.skel.h"
 #include "cgrp_ls_recursion.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/check_mtu.c b/tools/testing/selftests/bpf/prog_tests/check_mtu.c
index 2a9a30650350..9efbfce69aa1 100644
--- a/tools/testing/selftests/bpf/prog_tests/check_mtu.c
+++ b/tools/testing/selftests/bpf/prog_tests/check_mtu.c
@@ -6,7 +6,6 @@
 #include "test_check_mtu.skel.h"
 #include "network_helpers.h"
 
-#include <stdlib.h>
 #include <inttypes.h>
 
 #define IFINDEX_LO 1
diff --git a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
index 34b59f6baca1..bdb591bdb64b 100644
--- a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
@@ -3,11 +3,7 @@
 
 #define _GNU_SOURCE
 
-#include <arpa/inet.h>
-#include <string.h>
-
 #include <linux/pkt_cls.h>
-#include <netinet/tcp.h>
 
 #include <test_progs.h>
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c b/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c
index ce6ceac8a812..680ece4c190a 100644
--- a/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c
+++ b/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <linux/in6.h>
 #include <linux/if_alg.h>
 
diff --git a/tools/testing/selftests/bpf/prog_tests/decap_sanity.c b/tools/testing/selftests/bpf/prog_tests/decap_sanity.c
index 9528b039ad33..0227147448b9 100644
--- a/tools/testing/selftests/bpf/prog_tests/decap_sanity.c
+++ b/tools/testing/selftests/bpf/prog_tests/decap_sanity.c
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <linux/in6.h>
 
 #include "test_progs.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/empty_skb.c b/tools/testing/selftests/bpf/prog_tests/empty_skb.c
index 438583e1f2d1..cf3649e01455 100644
--- a/tools/testing/selftests/bpf/prog_tests/empty_skb.c
+++ b/tools/testing/selftests/bpf/prog_tests/empty_skb.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 #include <network_helpers.h>
-#include <net/if.h>
 #include "empty_skb.skel.h"
 
 void test_empty_skb(void)
diff --git a/tools/testing/selftests/bpf/prog_tests/fib_lookup.c b/tools/testing/selftests/bpf/prog_tests/fib_lookup.c
index 9de05603098d..67520b01a42b 100644
--- a/tools/testing/selftests/bpf/prog_tests/fib_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/fib_lookup.c
@@ -2,8 +2,6 @@
 /* Copyright (c) 2023 Meta Platforms, Inc. and affiliates. */
 
 #include <linux/rtnetlink.h>
-#include <sys/types.h>
-#include <net/if.h>
 
 #include "test_progs.h"
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c b/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
index 948e1ca287a2..f572c4cae537 100644
--- a/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
+++ b/tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
-#include <net/if.h>
 #include <linux/netfilter.h>
 #include <network_helpers.h>
 #include "ip_check_defrag.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c b/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
index 130a3b21e467..916695511026 100644
--- a/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
+++ b/tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <test_progs.h>
 #include <bpf/btf.h>
 
diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
index 70b80171f7f4..967ab0a6681a 100644
--- a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
@@ -42,21 +42,10 @@
  *  Case 1,2 use tap device to test redirect to device that requires MAC
  *  header, and tun device to test the case with no MAC header added.
  */
-#include <sys/socket.h>
-#include <net/if.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
-#include <linux/if_tun.h>
-#include <linux/icmp.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <errno.h>
 #include <stdbool.h>
-#include <stdlib.h>
 
 #define NETNS "ns_lwt_redirect"
 #include "lwt_helpers.h"
-#include "test_progs.h"
 
 #define BPF_OBJECT            "test_lwt_redirect.bpf.o"
 #define INGRESS_SEC(need_mac) ((need_mac) ? "redir_ingress" : "redir_ingress_nomac")
diff --git a/tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c b/tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
index 653b0a20fab9..2dbae35216a0 100644
--- a/tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
+++ b/tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
@@ -23,9 +23,6 @@
  * Author: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
  */
 
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
 #include "test_progs.h"
 #include "test_migrate_reuseport.skel.h"
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
index b4af39dbc449..87ca3c42e2d6 100644
--- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
+++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
@@ -5,11 +5,8 @@
 #include <test_progs.h>
 #include "test_ns_current_pid_tgid.skel.h"
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <sys/syscall.h>
 #include <sched.h>
-#include <sys/wait.h>
 #include <sys/mount.h>
 #include <sys/fcntl.h>
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/preempt_lock.c b/tools/testing/selftests/bpf/prog_tests/preempt_lock.c
index 02917c672441..accf5e133088 100644
--- a/tools/testing/selftests/bpf/prog_tests/preempt_lock.c
+++ b/tools/testing/selftests/bpf/prog_tests/preempt_lock.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
-#include <network_helpers.h>
 #include <preempt_lock.skel.h>
 
 void test_preempt_lock(void)
diff --git a/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c b/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
index 6abd78c7ed13..9c91581f7133 100644
--- a/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
+++ b/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
@@ -5,7 +5,6 @@
 #include <sched.h>
 #include <linux/socket.h>
 #include <linux/tls.h>
-#include <net/if.h>
 
 #include "test_progs.h"
 #include "cgroup_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
index 597d0467a926..9fea0b0c6b36 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
@@ -15,20 +15,6 @@
  */
 
 #define _GNU_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <errno.h>
-#include <error.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <bpf/libbpf.h>
-#include <bpf/bpf.h>
-
 #include "test_progs.h"
 #include "bpf_util.h"
 #include "cgroup_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c b/tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c
index 547ae53cde74..7aaef9c17824 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2020 Facebook */
 
-#include <sys/types.h>
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
 #include "test_progs.h"
 #include "network_helpers.h"
 #include "test_sk_storage_trace_itself.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/sock_destroy.c b/tools/testing/selftests/bpf/prog_tests/sock_destroy.c
index 1d3abc7a92c4..d9b3351f689f 100644
--- a/tools/testing/selftests/bpf/prog_tests/sock_destroy.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_destroy.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
-#include <bpf/bpf_endian.h>
 
 #include "sock_destroy_prog.skel.h"
 #include "sock_destroy_prog_fail.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/sock_fields.c b/tools/testing/selftests/bpf/prog_tests/sock_fields.c
index bb1bbda86329..da3315ea3a61 100644
--- a/tools/testing/selftests/bpf/prog_tests/sock_fields.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_fields.c
@@ -4,14 +4,8 @@
 #define _GNU_SOURCE
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <unistd.h>
 #include <sched.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
 #include <linux/compiler.h>
 
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/tailcalls.c b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
index 59993fc9c0d7..cd4f7d1aac5d 100644
--- a/tools/testing/selftests/bpf/prog_tests/tailcalls.c
+++ b/tools/testing/selftests/bpf/prog_tests/tailcalls.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <unistd.h>
 #include <test_progs.h>
 #include <network_helpers.h>
 #include "tailcall_poke.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
index 2ba1fe3f56f1..cf5762d7b3cd 100644
--- a/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/tc_redirect.c
@@ -10,17 +10,13 @@
  * to drop unexpected traffic.
  */
 
-#include <arpa/inet.h>
 #include <linux/if_tun.h>
 #include <linux/limits.h>
 #include <linux/sysctl.h>
 #include <linux/time_types.h>
 #include <linux/net_tstamp.h>
-#include <net/if.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "test_progs.h"
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c b/tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c
index f8a16324d51a..bd4c03617f75 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_custom_syncookie.c
@@ -3,8 +3,6 @@
 
 #define _GNU_SOURCE
 #include <sched.h>
-#include <stdlib.h>
-#include <net/if.h>
 
 #include "test_progs.h"
 #include "cgroup_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c b/tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c
index ac3bde570f1b..eb548d51be78 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c
@@ -3,9 +3,6 @@
 
 #define _GNU_SOURCE
 #include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/socket.h>
 #include <linux/compiler.h>
 
 #include "test_progs.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
index f19e8177bcec..289d142b5970 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_tunnel.c
@@ -56,11 +56,8 @@
 #include <linux/sysctl.h>
 #include <linux/time_types.h>
 #include <linux/net_tstamp.h>
-#include <net/if.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include "test_progs.h"
 #include "network_helpers.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/time_tai.c b/tools/testing/selftests/bpf/prog_tests/time_tai.c
index f45af1b0ef2c..1994ecd58087 100644
--- a/tools/testing/selftests/bpf/prog_tests/time_tai.c
+++ b/tools/testing/selftests/bpf/prog_tests/time_tai.c
@@ -6,7 +6,6 @@
 
 #include "test_time_tai.skel.h"
 
-#include <time.h>
 #include <stdint.h>
 
 #define TAI_THRESHOLD	1000000000ULL /* 1s */
diff --git a/tools/testing/selftests/bpf/prog_tests/vrf_socket_lookup.c b/tools/testing/selftests/bpf/prog_tests/vrf_socket_lookup.c
index 2a5e207edad6..93c3e393725c 100644
--- a/tools/testing/selftests/bpf/prog_tests/vrf_socket_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/vrf_socket_lookup.c
@@ -40,8 +40,6 @@
  *     d) 1 from device outside VRF to server outside VRF
  */
 
-#include <net/if.h>
-
 #include "test_progs.h"
 #include "network_helpers.h"
 #include "vrf_socket_lookup.skel.h"
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
index 76967d8ace9c..d4996246c443 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 #include <network_helpers.h>
-#include <net/if.h>
 #include "test_xdp.skel.h"
 #include "test_xdp_bpf2bpf.skel.h"
 
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c b/tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c
index 315777a4c7ce..cfe720e9fe37 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include <net/if.h>
 #include <test_progs.h>
 #include <network_helpers.h>
 
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c b/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
index 27cb409a237f..c23fcc89efd8 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
@@ -1,14 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 #include <network_helpers.h>
-#include <net/if.h>
-#include <linux/if_ether.h>
-#include <linux/if_packet.h>
 #include <linux/if_link.h>
 #include <linux/ipv6.h>
 #include <linux/in6.h>
 #include <linux/udp.h>
-#include <bpf/bpf_endian.h>
 #include <uapi/linux/netdev.h>
 #include "test_xdp_do_redirect.skel.h"
 
diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
index f76b5d67a3ee..f4ec7a7bdf7b 100644
--- a/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
@@ -12,7 +12,6 @@
 #include <linux/net_tstamp.h>
 #include <linux/udp.h>
 #include <sys/mman.h>
-#include <net/if.h>
 #include <poll.h>
 
 #define TX_NAME "veTX"
diff --git a/tools/testing/selftests/bpf/prog_tests/xfrm_info.c b/tools/testing/selftests/bpf/prog_tests/xfrm_info.c
index d37f5394e199..3b2433ddd155 100644
--- a/tools/testing/selftests/bpf/prog_tests/xfrm_info.c
+++ b/tools/testing/selftests/bpf/prog_tests/xfrm_info.c
@@ -43,7 +43,6 @@
  *  5) requested if_id is compared with received if_id
  */
 
-#include <net/if.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_link.h>
 
diff --git a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
index b0a7bbac3dfc..23b18c06014f 100644
--- a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
+++ b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
@@ -9,8 +9,6 @@
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 
 #include <bpf/bpf.h>
 #include <bpf/libbpf.h>
diff --git a/tools/testing/selftests/bpf/xskxceiver.c b/tools/testing/selftests/bpf/xskxceiver.c
index 2eac0895b0a1..accbc80aba88 100644
--- a/tools/testing/selftests/bpf/xskxceiver.c
+++ b/tools/testing/selftests/bpf/xskxceiver.c
@@ -77,13 +77,11 @@
 #include <errno.h>
 #include <getopt.h>
 #include <linux/if_link.h>
-#include <linux/if_ether.h>
 #include <linux/mman.h>
 #include <linux/netdev.h>
 #include <linux/bitmap.h>
 #include <linux/ethtool.h>
 #include <arpa/inet.h>
-#include <net/if.h>
 #include <locale.h>
 #include <poll.h>
 #include <pthread.h>
@@ -93,9 +91,7 @@
 #include <string.h>
 #include <stddef.h>
 #include <sys/mman.h>
-#include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "xsk_xdp_progs.skel.h"