From c2340b1cb34a9f5d1eff4d6a8dcebb6e5829ed03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 9 Nov 2026 22:30:59 +0100
Subject: [PATCH] Declare VulkanCustomDriverAllowedByOS() in the Vulkan-free
 header

DriverManagerScreen.cpp included VulkanLoader.h, which pulls in X11 on
Linux, whose Screen typedef clashes with our Screen class.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Common/GPU/Vulkan/VulkanDriverVars.h | 3 +++
 Common/GPU/Vulkan/VulkanLoader.h     | 3 ---
 UI/DriverManagerScreen.cpp           | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Common/GPU/Vulkan/VulkanDriverVars.h b/Common/GPU/Vulkan/VulkanDriverVars.h
index 34ec7c299c..8ad15da167 100644
--- a/Common/GPU/Vulkan/VulkanDriverVars.h
+++ b/Common/GPU/Vulkan/VulkanDriverVars.h
@@ -15,3 +15,6 @@ struct AdrenoEnvVarDef {
 };
 
 const AdrenoEnvVarDef *GetAdrenoEnvVarDefs(int *count);
+
+// False where AdrenoTools' linker namespace tricks are known or suspected to break (Android 17 and its previews).
+bool VulkanCustomDriverAllowedByOS();
diff --git a/Common/GPU/Vulkan/VulkanLoader.h b/Common/GPU/Vulkan/VulkanLoader.h
index d7ec184fde..97785cee27 100644
--- a/Common/GPU/Vulkan/VulkanLoader.h
+++ b/Common/GPU/Vulkan/VulkanLoader.h
@@ -282,9 +282,6 @@ struct VulkanExtensions {
 
 void VulkanApplyCustomDriverEnvVars(AdrenoEnvVar envVars);
 
-// False where AdrenoTools' linker namespace tricks are known or suspected to break (Android 17 and its previews).
-bool VulkanCustomDriverAllowedByOS();
-
 // Way to do a quick check before even attempting to load.
 void VulkanSetNativeLibDir(std::string_view nativeLibDir);
 bool VulkanMayBeAvailable();
diff --git a/UI/DriverManagerScreen.cpp b/UI/DriverManagerScreen.cpp
index 4a213c5d07..cffc46d67e 100644
--- a/UI/DriverManagerScreen.cpp
+++ b/UI/DriverManagerScreen.cpp
@@ -4,7 +4,6 @@
 #include "Common/System/Request.h"
 #include "Common/System/OSD.h"
 #include "Common/GPU/Vulkan/VulkanDriverVars.h"
-#include "Common/GPU/Vulkan/VulkanLoader.h"
 #include "Common/Log.h"
 #include "Common/StringUtils.h"
 #include "Common/UI/PopupScreens.h"