diff --git a/build/scripts/tools/openglrenderer.lua b/build/scripts/tools/openglrenderer.lua
index 32392739c..48b198327 100644
--- a/build/scripts/tools/openglrenderer.lua
+++ b/build/scripts/tools/openglrenderer.lua
@@ -27,6 +27,7 @@ TOOL.Files = {
 TOOL.Libraries = {
 	"NazaraCore",
 	"NazaraRenderer",
+	"NazaraShader",
 	"NazaraUtility"
 }
 
diff --git a/build/scripts/tools/vulkanrenderer.lua b/build/scripts/tools/vulkanrenderer.lua
index 6e6a5bed2..4e7f2be10 100644
--- a/build/scripts/tools/vulkanrenderer.lua
+++ b/build/scripts/tools/vulkanrenderer.lua
@@ -28,6 +28,7 @@ TOOL.Files = {
 TOOL.Libraries = {
 	"NazaraCore",
 	"NazaraRenderer",
+	"NazaraShader",
 	"NazaraUtility"
 }
 
diff --git a/src/Nazara/OpenGLRenderer/OpenGLShaderStage.cpp b/src/Nazara/OpenGLRenderer/OpenGLShaderStage.cpp
index 7f6e92a34..068ef9634 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLShaderStage.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLShaderStage.cpp
@@ -6,9 +6,9 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/OpenGLRenderer/Utils.hpp>
-#include <Nazara/Renderer/GlslWriter.hpp>
-#include <Nazara/Renderer/ShaderAst.hpp>
-#include <Nazara/Renderer/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/GlslWriter.hpp>
+#include <Nazara/Shader/ShaderAst.hpp>
+#include <Nazara/Shader/ShaderAstSerializer.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
diff --git a/src/Nazara/VulkanRenderer/VulkanShaderStage.cpp b/src/Nazara/VulkanRenderer/VulkanShaderStage.cpp
index c0b510dd8..9459ccfe3 100644
--- a/src/Nazara/VulkanRenderer/VulkanShaderStage.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanShaderStage.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/VulkanShaderStage.hpp>
-#include <Nazara/Renderer/ShaderAst.hpp>
-#include <Nazara/Renderer/ShaderAstSerializer.hpp>
-#include <Nazara/Renderer/SpirvWriter.hpp>
+#include <Nazara/Shader/ShaderAst.hpp>
+#include <Nazara/Shader/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/SpirvWriter.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz