diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp
index 44540452e..6601a7947 100644
--- a/include/Nazara/Graphics.hpp
+++ b/include/Nazara/Graphics.hpp
@@ -33,12 +33,16 @@
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/CullingList.hpp>
 #include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/GraphicalMesh.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/MaterialPipeline.hpp>
 #include <Nazara/Graphics/MaterialSettings.hpp>
+#include <Nazara/Graphics/Model.hpp>
+#include <Nazara/Graphics/ModelInstance.hpp>
 #include <Nazara/Graphics/PhongLightingMaterial.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Graphics/RenderQueue.hpp>
+#include <Nazara/Graphics/UberShader.hpp>
 
 #endif // NAZARA_GLOBAL_GRAPHICS_HPP
diff --git a/include/Nazara/Shader.hpp b/include/Nazara/Shader.hpp
index d72fa4367..f8e41ff22 100644
--- a/include/Nazara/Shader.hpp
+++ b/include/Nazara/Shader.hpp
@@ -34,8 +34,10 @@
 #include <Nazara/Shader/Shader.hpp>
 #include <Nazara/Shader/ShaderAst.hpp>
 #include <Nazara/Shader/ShaderAstCloner.hpp>
+#include <Nazara/Shader/ShaderAstOptimizer.hpp>
 #include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
 #include <Nazara/Shader/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/ShaderAstUtils.hpp>
 #include <Nazara/Shader/ShaderAstValidator.hpp>
 #include <Nazara/Shader/ShaderAstVisitor.hpp>
 #include <Nazara/Shader/ShaderAstVisitorExcept.hpp>
@@ -49,6 +51,7 @@
 #include <Nazara/Shader/ShaderVarVisitorExcept.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/Shader/SpirvAstVisitor.hpp>
+#include <Nazara/Shader/SpirvBlock.hpp>
 #include <Nazara/Shader/SpirvConstantCache.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
 #include <Nazara/Shader/SpirvExpressionLoad.hpp>