diff --git a/vulkan/vulkan_context.cpp b/vulkan/vulkan_context.cpp
index 9fb8be81..68b2ec5f 100644
--- a/vulkan/vulkan_context.cpp
+++ b/vulkan/vulkan_context.cpp
@@ -105,7 +105,7 @@ bool Context::init_win32(HINSTANCE hinstance, HWND hwnd, int preferred_device)
     auto win32_surface_create_info = vk::Win32SurfaceCreateInfoKHR{}
         .setHinstance(hinstance)
         .setHwnd(hwnd);
-    surface = instance->createWin32SurfaceKHRUnique(win32_surface_create_info);
+    surface = instance->createWin32SurfaceKHRUnique(win32_surface_create_info).value;
     if (!surface)
         return false;
     return init(preferred_device);
diff --git a/vulkan/vulkan_context.hpp b/vulkan/vulkan_context.hpp
index c0c1b840..e9ace37c 100644
--- a/vulkan/vulkan_context.hpp
+++ b/vulkan/vulkan_context.hpp
@@ -9,7 +9,7 @@
 #endif
 #include <cstdio>
 #include <cstdint>
-#include "vulkan/vulkan.hpp"
+#include "vulkan/vulkan_hpp_wrapper.hpp"
 #include "../external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.hpp"
 #include "vulkan_swapchain.hpp"
 #include <memory>
diff --git a/vulkan/vulkan_hpp_storage.cpp b/vulkan/vulkan_hpp_storage.cpp
index e361ab6f..a576f047 100644
--- a/vulkan/vulkan_hpp_storage.cpp
+++ b/vulkan/vulkan_hpp_storage.cpp
@@ -1,2 +1,2 @@
-#include "vulkan/vulkan.hpp"
+#include "vulkan_hpp_wrapper.hpp"
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
\ No newline at end of file
diff --git a/vulkan/vulkan_hpp_wrapper.hpp b/vulkan/vulkan_hpp_wrapper.hpp
new file mode 100644
index 00000000..d92a0aa6
--- /dev/null
+++ b/vulkan/vulkan_hpp_wrapper.hpp
@@ -0,0 +1,4 @@
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include "vulkan/vulkan.hpp"
diff --git a/vulkan/vulkan_slang_pipeline.hpp b/vulkan/vulkan_slang_pipeline.hpp
index 2e34ffa0..b9e813a3 100644
--- a/vulkan/vulkan_slang_pipeline.hpp
+++ b/vulkan/vulkan_slang_pipeline.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "vulkan/vulkan.hpp"
+#include "vulkan/vulkan_hpp_wrapper.hpp"
 #include "slang_shader.hpp"
 #include "vulkan_context.hpp"
 #include "vulkan_pipeline_image.hpp"
diff --git a/vulkan/vulkan_swapchain.hpp b/vulkan/vulkan_swapchain.hpp
index 30270081..c2ba4505 100644
--- a/vulkan/vulkan_swapchain.hpp
+++ b/vulkan/vulkan_swapchain.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
-#include "vulkan/vulkan.hpp"
-#include "vulkan/vulkan_handles.hpp"
-#include "vulkan/vulkan_structs.hpp"
+#include "vulkan/vulkan_hpp_wrapper.hpp"
 #include <functional>
 
 namespace Vulkan