diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake
index 85bf51e4f..8ca64a031 100644
--- a/platform/linux/linux.cmake
+++ b/platform/linux/linux.cmake
@@ -16,7 +16,7 @@ pkg_search_module(ICUUC icu-uc)
 pkg_search_module(ICUI18N icu-i18n)
 find_program(ARMERGE NAMES armerge)
 
-if(MLN_WITH_WAYLAND)
+if(MLN_WITH_WAYLAND AND NOT MLN_WITH_VULKAN)
     # See https://github.com/maplibre/maplibre-native/pull/2022
 
     # MLN_WITH_EGL needs to be set for Wayland, otherwise this CMakeLists will
diff --git a/vendor/vulkan.cmake b/vendor/vulkan.cmake
index f8be93761..6cb545d48 100644
--- a/vendor/vulkan.cmake
+++ b/vendor/vulkan.cmake
@@ -44,6 +44,9 @@ endif()
 
 get_target_property(glslang_inc glslang INTERFACE_INCLUDE_DIRECTORIES)
 set_target_properties(glslang PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${glslang_inc})
+if (NOT (WIN32 OR MINGW))
+    target_compile_options(SPIRV PRIVATE -include cstdint)
+endif()
 
 set_target_properties(
     glslang