diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index befde6708c335d86adaad61db996c86be5ffbdf2..f9713a71d77e8be3d7766ba91cf69556d401bedc 100644
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -8,6 +8,7 @@
 
 #include <signal.h>
 #include <sys/mman.h>
+#include <sys/wait.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index 0f34ab7a9ec12ba50373448c5b79f3001e503b10..9e0b35cd0eeae3e7a072cbd0f11a99ee1685c97c 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
+#include <poll.h>
 
 #include "debug.h"
 #include <subcmd/parse-options.h>
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 129af3e9c728b84fdb77383a36e041fdfbbce23e..f309c3773522dee5c5c8a515b1c278757fca58c6 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -30,6 +30,7 @@
 #include <linux/time64.h>
 #include <errno.h>
 #include <inttypes.h>
+#include <poll.h>
 #include <termios.h>
 #include <semaphore.h>
 #include <signal.h>
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 32a9a68d38a24e680ed8de92457ae0fd3879c339..ee7d0a82ccd073cb52a49cea6b15e14d827436ad 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -44,10 +44,12 @@
 
 #include <errno.h>
 #include <inttypes.h>
+#include <poll.h>
 #include <unistd.h>
 #include <sched.h>
 #include <signal.h>
 #include <sys/mman.h>
+#include <sys/wait.h>
 #include <asm/bug.h>
 #include <linux/time64.h>
 
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index eb3cc0b9a9e4446a2d38f85545c7f571c52bdb86..a935b502373253217d6f43680e6b88a6ab143bfe 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -78,6 +78,7 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "sane_ctype.h"
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index ef3613f2fe6a6b0981adab9c8410af98f7bd1fee..eaa66fb57347642a617026d5423e3ad57b73a979 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -45,6 +45,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <libaudit.h> /* FIXME: Still needed for audit_errno_to_name */
+#include <poll.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 552fd9aca08da2b59b314b5d81911b7807fe174f..9e08d297f1a905f57554bf6fd7b9555e980ad10a 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
+#include <sys/wait.h>
 #include "builtin.h"
 #include "hist.h"
 #include "intlist.h"
diff --git a/tools/perf/tests/event-times.c b/tools/perf/tests/event-times.c
index 4683514751d636b1b1e29d1829a8850772568e77..634f20c631d8f9981dc89499998e3315d7661243 100644
--- a/tools/perf/tests/event-times.c
+++ b/tools/perf/tests/event-times.c
@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <string.h>
+#include <sys/wait.h>
 #include "tests.h"
 #include "evlist.h"
 #include "evsel.h"
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 9eaf86f4003b73a8d108de04d0008e9f19265d8b..a5b3777ffee601aa28e358c4f9928fd16088d1c8 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <sys/wait.h>
 #include <api/debug.h>
 #include <linux/time64.h>
 #ifdef HAVE_BACKTRACE_SUPPORT
diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c
index 34201440ac03dca697c0c28eeced7344ac747f5d..1c88ad6425b8ce722a5fad4ebe0ee99509dc4462 100644
--- a/tools/perf/util/help-unknown-cmd.c
+++ b/tools/perf/util/help-unknown-cmd.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "config.h"
+#include <poll.h>
 #include <stdio.h>
 #include <subcmd/help.h>
 #include "../builtin.h"
diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index 824356488ce6a8c7d9ecda1748456b262f0a7114..c6a15f204c03827bec7fa4cfdf879d8d9d5b89fc 100644
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -12,6 +12,7 @@
 #include "llvm-utils.h"
 #include "config.h"
 #include "util.h"
+#include <sys/wait.h>
 
 #define CLANG_BPF_CMD_DEFAULT_TEMPLATE				\
 		"$CLANG_EXEC -D__KERNEL__ -D__NR_CPUS__=$NR_CPUS "\
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index bd883f25b76eeba2f689428b5888b8bdce72ce8a..3852b6d3270a06067560d3f854aa29c8289854b8 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -12,8 +12,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <sys/wait.h>
-#include <poll.h>
 #include <linux/types.h>
 
 extern char buildid_dir[];