diff --git a/sys-kernel/linux-headers/linux-headers-5.15.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
similarity index 87%
rename from sys-kernel/linux-headers/linux-headers-5.15.ebuild
rename to sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
index 8ac754c008dea..ec21c8e94f69a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.15.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
@@ -30,6 +30,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	if use elibc_musl ; then
+		# TODO: May need forward porting to newer versions
+		eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+	fi
+
 	# avoid kernel-2_src_prepare
 	default
 }