diff --git a/implementations/Crafter.Graphics-Device.cpp b/implementations/Crafter.Graphics-Device.cpp
index 3a86070..55ca899 100644
--- a/implementations/Crafter.Graphics-Device.cpp
+++ b/implementations/Crafter.Graphics-Device.cpp
@@ -54,16 +54,16 @@ using namespace Crafter;
 const char* const instanceExtensionNames[] = {
     "VK_EXT_debug_utils",
     "VK_KHR_surface",
-    #ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32
+    #ifdef CRAFTER_GRAPHICS_WINDOW_WIN32
     "VK_KHR_win32_surface"
-    #else
+    #endif
+    #ifdef CRAFTER_GRAPHICS_WINDOW_WAYLAND
     "VK_KHR_wayland_surface"
     #endif
 };
 const char* const deviceExtensionNames[] = {
     "VK_KHR_swapchain",
     "VK_KHR_spirv_1_4",
-    "VK_EXT_mesh_shader",
     "VK_KHR_shader_float_controls",
     "VK_KHR_dynamic_rendering",
     "VK_KHR_acceleration_structure",