diff --git a/media-libs/mesa/mesa-17.0.0_rc2.ebuild b/media-libs/mesa/mesa-17.0.0_rc2.ebuild
index 2268df1cdccbb..735dd56f2fe08 100644
--- a/media-libs/mesa/mesa-17.0.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-17.0.0_rc2.ebuild
@@ -384,6 +384,11 @@ multilib_src_install_all() {
 	# Install config file for eselect mesa
 	insinto /usr/share/mesa
 	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+
+	# Mesa should not install these
+	if use vulkan; then
+		rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
+	fi
 }
 
 multilib_src_test() {