diff --git a/include/Nazara/Core.hpp b/include/Nazara/Core.hpp
index 0bcef73cf..24725ceb6 100644
--- a/include/Nazara/Core.hpp
+++ b/include/Nazara/Core.hpp
@@ -61,6 +61,8 @@
 #include <Nazara/Core/MemoryPool.hpp>
 #include <Nazara/Core/MemoryStream.hpp>
 #include <Nazara/Core/MemoryView.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
+#include <Nazara/Core/Modules.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Core/MovableValue.hpp>
 #include <Nazara/Core/ObjectHandle.hpp>
@@ -89,6 +91,7 @@
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Core/TaskScheduler.hpp>
+#include <Nazara/Core/TypeList.hpp>
 #include <Nazara/Core/TypeTag.hpp>
 #include <Nazara/Core/Unicode.hpp>
 #include <Nazara/Core/Updatable.hpp>
diff --git a/include/Nazara/OpenGLRenderer.hpp b/include/Nazara/OpenGLRenderer.hpp
index e74b11c6a..f60b0ee85 100644
--- a/include/Nazara/OpenGLRenderer.hpp
+++ b/include/Nazara/OpenGLRenderer.hpp
@@ -51,6 +51,5 @@
 #include <Nazara/OpenGLRenderer/OpenGLVaoCache.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp>
 #include <Nazara/OpenGLRenderer/Utils.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper.hpp>
 
 #endif // NAZARA_GLOBAL_OPENGLRENDERER_HPP
diff --git a/include/Nazara/Renderer.hpp b/include/Nazara/Renderer.hpp
index 69153a0d4..3b792a6b1 100644
--- a/include/Nazara/Renderer.hpp
+++ b/include/Nazara/Renderer.hpp
@@ -42,6 +42,7 @@
 #include <Nazara/Renderer/RenderDeviceInfo.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RendererImpl.hpp>
+#include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/RenderImage.hpp>
 #include <Nazara/Renderer/RenderPass.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
diff --git a/include/Nazara/Shader.hpp b/include/Nazara/Shader.hpp
index cd9e02507..d72fa4367 100644
--- a/include/Nazara/Shader.hpp
+++ b/include/Nazara/Shader.hpp
@@ -1,7 +1,7 @@
 // This file was automatically generated
 
 /*
-	Nazara Engine - Module name
+	Nazara Engine - Shader generator
 
 	Copyright (C) 2020 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
 
@@ -38,13 +38,23 @@
 #include <Nazara/Shader/ShaderAstSerializer.hpp>
 #include <Nazara/Shader/ShaderAstValidator.hpp>
 #include <Nazara/Shader/ShaderAstVisitor.hpp>
+#include <Nazara/Shader/ShaderAstVisitorExcept.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
+#include <Nazara/Shader/ShaderConstantValue.hpp>
 #include <Nazara/Shader/ShaderEnums.hpp>
 #include <Nazara/Shader/ShaderExpressionType.hpp>
 #include <Nazara/Shader/ShaderNodes.hpp>
 #include <Nazara/Shader/ShaderVariables.hpp>
 #include <Nazara/Shader/ShaderVarVisitor.hpp>
+#include <Nazara/Shader/ShaderVarVisitorExcept.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
+#include <Nazara/Shader/SpirvAstVisitor.hpp>
+#include <Nazara/Shader/SpirvConstantCache.hpp>
+#include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/SpirvExpressionLoad.hpp>
+#include <Nazara/Shader/SpirvExpressionStore.hpp>
+#include <Nazara/Shader/SpirvPrinter.hpp>
+#include <Nazara/Shader/SpirvSection.hpp>
 #include <Nazara/Shader/SpirvWriter.hpp>
 
 #endif // NAZARA_GLOBAL_SHADER_HPP
diff --git a/include/Nazara/VulkanRenderer/Wrapper.hpp b/include/Nazara/VulkanRenderer/Wrapper.hpp
new file mode 100644
index 000000000..df6896383
--- /dev/null
+++ b/include/Nazara/VulkanRenderer/Wrapper.hpp
@@ -0,0 +1,38 @@
+// This file was automatically generated
+
+#pragma once
+
+#ifndef NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP
+#define NAZARA_GLOBAL_VULKANRENDERER_WRAPPER_HPP
+
+#include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Buffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.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/Fence.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/InstanceObject.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/QueueHandle.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Sampler.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