diff --git a/usr/include/Makefile b/usr/include/Makefile
index 595996eefcc6..ae365d32269a 100644
--- a/usr/include/Makefile
+++ b/usr/include/Makefile
@@ -48,11 +48,7 @@ no-header-test += xen/privcmd.h
 
 # More headers are broken in some architectures
 
-ifeq ($(SRCARCH),arc)
-no-header-test += linux/bpf_perf_event.h
-endif
-
-ifeq ($(SRCARCH),openrisc)
+ifneq ($(filter arc openrisc xtensa, $(SRCARCH)),)
 no-header-test += linux/bpf_perf_event.h
 endif
 
@@ -61,10 +57,6 @@ no-header-test += asm/uctx.h
 no-header-test += asm/fbio.h
 endif
 
-ifeq ($(SRCARCH),xtensa)
-no-header-test += linux/bpf_perf_event.h
-endif
-
 # asm-generic/*.h is used by asm/*.h, and should not be included directly
 no-header-test += asm-generic/%