diff --git a/build/scripts/actions/generateheaders.lua b/build/scripts/actions/generateheaders.lua
index 6bbd5782c..829d0caba 100644
--- a/build/scripts/actions/generateheaders.lua
+++ b/build/scripts/actions/generateheaders.lua
@@ -42,6 +42,15 @@ ACTION.Function = function ()
 		})
 	end
 	
+	table.insert(paths, {
+		Excludes = {},
+		HeaderGuard = "NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP",
+		Name = "Vulkan wrapper",
+		SearchDir = "../include/Nazara/VulkanRenderer/Wrapper", 
+		TopDir = "Nazara", 
+		Target = "../include/Nazara/VulkanRenderer/Wrapper.hpp"
+	})
+	
 	table.insert(paths, {
 		Excludes = {},
 		HeaderGuard = "NDK_COMPONENTS_GLOBAL_HPP",
diff --git a/include/Nazara/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer.hpp
index dba9f55e3..367c2a55a 100644
--- a/include/Nazara/VulkanRenderer.hpp
+++ b/include/Nazara/VulkanRenderer.hpp
@@ -31,33 +31,11 @@
 
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
-#include <Nazara/VulkanRenderer/VkBuffer.hpp>
-#include <Nazara/VulkanRenderer/VkCommandBuffer.hpp>
-#include <Nazara/VulkanRenderer/VkCommandPool.hpp>
-#include <Nazara/VulkanRenderer/VkDescriptorPool.hpp>
-#include <Nazara/VulkanRenderer/VkDescriptorSet.hpp>
-#include <Nazara/VulkanRenderer/VkDescriptorSetLayout.hpp>
-#include <Nazara/VulkanRenderer/VkDevice.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceMemory.hpp>
-#include <Nazara/VulkanRenderer/VkDeviceObject.hpp>
-#include <Nazara/VulkanRenderer/VkFramebuffer.hpp>
-#include <Nazara/VulkanRenderer/VkImage.hpp>
-#include <Nazara/VulkanRenderer/VkImageView.hpp>
-#include <Nazara/VulkanRenderer/VkInstance.hpp>
-#include <Nazara/VulkanRenderer/VkLoader.hpp>
-#include <Nazara/VulkanRenderer/VkPhysicalDevice.hpp>
-#include <Nazara/VulkanRenderer/VkPipeline.hpp>
-#include <Nazara/VulkanRenderer/VkPipelineCache.hpp>
-#include <Nazara/VulkanRenderer/VkPipelineLayout.hpp>
-#include <Nazara/VulkanRenderer/VkQueue.hpp>
-#include <Nazara/VulkanRenderer/VkRenderPass.hpp>
 #include <Nazara/VulkanRenderer/VkRenderTarget.hpp>
 #include <Nazara/VulkanRenderer/VkRenderWindow.hpp>
-#include <Nazara/VulkanRenderer/VkSemaphore.hpp>
-#include <Nazara/VulkanRenderer/VkShaderModule.hpp>
-#include <Nazara/VulkanRenderer/VkSurface.hpp>
-#include <Nazara/VulkanRenderer/VkSwapchain.hpp>
 #include <Nazara/VulkanRenderer/Vulkan.hpp>
+#include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper.hpp>
 
 #endif // NAZARA_GLOBAL_VULKANRENDERER_HPP
diff --git a/include/Nazara/VulkanRenderer/Wrapper.hpp b/include/Nazara/VulkanRenderer/Wrapper.hpp
new file mode 100644
index 000000000..651a8e04f
--- /dev/null
+++ b/include/Nazara/VulkanRenderer/Wrapper.hpp
@@ -0,0 +1,33 @@
+// This file was automatically generated
+
+#pragma once
+
+#ifndef NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP
+#define NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP
+
+#include <Nazara/VulkanRenderer/Wrapper/Buffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Image.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/ImageView.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Pipeline.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Queue.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Swapchain.hpp>
+
+#endif // NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP