diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h
index 3f14a00979..b675f9f8fe 100644
--- a/rpcs3/Emu/RSX/VK/VulkanAPI.h
+++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h
@@ -6,8 +6,13 @@
 #define VK_USE_PLATFORM_MACOS_MVK
 #elif defined(ANDROID)
 #define VK_USE_PLATFORM_ANDROID_KHR
-#elif HAVE_X11
-#define VK_USE_PLATFORM_XLIB_KHR
+#else
+#if defined(HAVE_X11)
+ #define VK_USE_PLATFORM_XLIB_KHR
+#endif
+#if defined(HAVE_WAYLAND)
+ #define VK_USE_PLATFORM_WAYLAND_KHR
+#endif
 #endif
 
 #ifdef _MSC_VER
diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp
index 5df7eec5b6..608bcefd6d 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/instance.cpp
@@ -174,14 +174,14 @@ namespace vk
 				found_surface_ext = true;
 			}
 #endif
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#ifdef HAVE_WAYLAND
 			if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
 			{
 				extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
 				found_surface_ext = true;
 			}
 #endif //(WAYLAND)
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#ifdef ANDROID
 			if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME))
 			{
 				extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
diff --git a/rpcs3/Emu/RSX/display.h b/rpcs3/Emu/RSX/display.h
index 1cad84dba5..191a111e75 100644
--- a/rpcs3/Emu/RSX/display.h
+++ b/rpcs3/Emu/RSX/display.h
@@ -11,7 +11,7 @@ using Display = struct _XDisplay;
 using Window  = unsigned long;
 #endif
 
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#ifdef HAVE_WAYLAND
 #include <wayland-client.h>
 #endif
 
@@ -22,14 +22,14 @@ using display_handle_t = void*; // NSView
 #else
 #include <variant>
 using display_handle_t = std::variant<
-#if defined(HAVE_X11) && defined(VK_USE_PLATFORM_WAYLAND_KHR)
+#if defined(HAVE_X11) && defined(HAVE_WAYLAND)
 	std::pair<Display*, Window>, std::pair<wl_display*, wl_surface*>
 #elif defined(HAVE_X11)
 	std::pair<Display*, Window>
-#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
+#elif defined(HAVE_WAYLAND)
 	std::pair<wl_display*, wl_surface*>
 #elif defined(ANDROID)
-	struct ANativeWindow *
+	struct ANativeWindow*
 #endif
 >;
 #endif