diff --git a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
index f4979b23b..6f14c8232 100644
--- a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
+++ b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
@@ -14,7 +14,7 @@
 #include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
 #include <unordered_map>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 namespace Nz
 {
diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
index b3286b01f..9310c5034 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 namespace Nz 
 {
diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
index 55da61cf5..59e00e985 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
@@ -11,7 +11,7 @@
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 namespace Nz 
 {
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp
index 0dadcdfed..4516bf7f5 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp
@@ -13,7 +13,7 @@
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <array>
 #include <memory>
 #include <unordered_set>
diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
index 812777dbd..e2b9d30c6 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <string>
 
 namespace Nz 
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
index 2b17e0ffa..18e25307c 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
@@ -10,10 +10,39 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <string>
 #include <unordered_set>
 
+// Don't include vulkan.h because it does includes X11 headers which has some defines like "None", breaking compilation
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#include <vulkan/vulkan_android.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#include <wayland-client.h>
+#include <vulkan/vulkan_wayland.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+#include <windows.h>
+#include <vulkan/vulkan_win32.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+#include <xcb/xcb.h>
+#include <vulkan/vulkan_xcb.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+typedef struct _XDisplay Display;
+typedef unsigned long XID;
+typedef XID Window;
+typedef unsigned long VisualID;
+
+#include <vulkan/vulkan_xlib.h>
+#endif
+
 namespace Nz 
 {
 	namespace Vk
diff --git a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp
index f1b9d431c..b55312274 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <string>
 
 namespace Nz 
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
index 63ae252c3..cd60a750a 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp b/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
index 0e95917c2..5e027252f 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP
 #define NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <unordered_set>
 #include <vector>
 
diff --git a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp
index e4569efca..fd57befd1 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 namespace Nz 
 {
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
index 70bdf42ee..7253fbc95 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
@@ -11,7 +11,6 @@
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
-#include <vulkan/vulkan.h>
 
 namespace Nz 
 {