diff --git a/sys-devel/clang-common/clang-common-15.0.7-r4.ebuild b/sys-devel/clang-common/clang-common-15.0.7-r5.ebuild
similarity index 98%
rename from sys-devel/clang-common/clang-common-15.0.7-r4.ebuild
rename to sys-devel/clang-common/clang-common-15.0.7-r5.ebuild
index c7af956a5dd74..8d526d297a03d 100644
--- a/sys-devel/clang-common/clang-common-15.0.7-r4.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r5.ebuild
@@ -107,6 +107,9 @@ src_install() {
 	# without optimization and that would at the very least be very noisy
 	# during builds and at worst trigger many -Werror builds.
 	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
 	#ifndef _FORTIFY_SOURCE
 	# if defined(__has_feature)
 	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
diff --git a/sys-devel/clang-common/clang-common-16.0.0.ebuild b/sys-devel/clang-common/clang-common-16.0.0-r1.ebuild
similarity index 98%
rename from sys-devel/clang-common/clang-common-16.0.0.ebuild
rename to sys-devel/clang-common/clang-common-16.0.0-r1.ebuild
index 784fa3ae7a885..4acd801b683de 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0-r1.ebuild
@@ -106,6 +106,9 @@ src_install() {
 	# without optimization and that would at the very least be very noisy
 	# during builds and at worst trigger many -Werror builds.
 	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
 	#ifndef _FORTIFY_SOURCE
 	# if defined(__has_feature)
 	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index 808c1e1a0ae1a..5b4a6647f3cae 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -106,6 +106,9 @@ src_install() {
 	# without optimization and that would at the very least be very noisy
 	# during builds and at worst trigger many -Werror builds.
 	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
 	#ifndef _FORTIFY_SOURCE
 	# if defined(__has_feature)
 	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
diff --git a/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
index 808c1e1a0ae1a..5b4a6647f3cae 100644
--- a/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
@@ -106,6 +106,9 @@ src_install() {
 	# without optimization and that would at the very least be very noisy
 	# during builds and at worst trigger many -Werror builds.
 	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
 	#ifndef _FORTIFY_SOURCE
 	# if defined(__has_feature)
 	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230314.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230314-r1.ebuild
similarity index 98%
rename from sys-devel/clang-common/clang-common-17.0.0_pre20230314.ebuild
rename to sys-devel/clang-common/clang-common-17.0.0_pre20230314-r1.ebuild
index 808c1e1a0ae1a..5b4a6647f3cae 100644
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230314.ebuild
+++ b/sys-devel/clang-common/clang-common-17.0.0_pre20230314-r1.ebuild
@@ -106,6 +106,9 @@ src_install() {
 	# without optimization and that would at the very least be very noisy
 	# during builds and at worst trigger many -Werror builds.
 	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
 	#ifndef _FORTIFY_SOURCE
 	# if defined(__has_feature)
 	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)