diff --git a/src/Nazara/Core/EnvironmentVariables.cpp b/src/Nazara/Core/EnvironmentVariables.cpp
index b328aad4b..c2ef6c17e 100644
--- a/src/Nazara/Core/EnvironmentVariables.cpp
+++ b/src/Nazara/Core/EnvironmentVariables.cpp
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/EnvironmentVariables.hpp>
+#include <array>
 #include <cstdlib>
 #include <string_view>
 #include <Nazara/Core/Debug.hpp>
diff --git a/src/Nazara/Graphics/DepthPipelinePass.cpp b/src/Nazara/Graphics/DepthPipelinePass.cpp
index a4e0baf87..7c2f3e954 100644
--- a/src/Nazara/Graphics/DepthPipelinePass.cpp
+++ b/src/Nazara/Graphics/DepthPipelinePass.cpp
@@ -7,11 +7,9 @@
 #include <Nazara/Graphics/ElementRenderer.hpp>
 #include <Nazara/Graphics/ElementRendererRegistry.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
-#include <Nazara/Graphics/FramePipeline.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
-#include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Graphics/MaterialInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Graphics/ForwardFramePipeline.cpp b/src/Nazara/Graphics/ForwardFramePipeline.cpp
index a83ef925b..52b3c8c20 100644
--- a/src/Nazara/Graphics/ForwardFramePipeline.cpp
+++ b/src/Nazara/Graphics/ForwardFramePipeline.cpp
@@ -6,24 +6,13 @@
 #include <Nazara/Graphics/FrameGraph.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
-#include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/MaterialInstance.hpp>
 #include <Nazara/Graphics/PipelineViewer.hpp>
-#include <Nazara/Graphics/PointLight.hpp>
-#include <Nazara/Graphics/PredefinedShaderStructs.hpp>
-#include <Nazara/Graphics/RenderElement.hpp>
 #include <Nazara/Graphics/RenderTarget.hpp>
-#include <Nazara/Graphics/SpotLight.hpp>
-#include <Nazara/Graphics/ViewerInstance.hpp>
 #include <Nazara/Graphics/WorldInstance.hpp>
-#include <Nazara/Math/Angle.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/Framebuffer.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
-#include <Nazara/Renderer/UploadPool.hpp>
-#include <NazaraUtils/StackArray.hpp>
 #include <NazaraUtils/StackVector.hpp>
-#include <array>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Graphics/ForwardPipelinePass.cpp b/src/Nazara/Graphics/ForwardPipelinePass.cpp
index 1a364f6e8..8557ee453 100644
--- a/src/Nazara/Graphics/ForwardPipelinePass.cpp
+++ b/src/Nazara/Graphics/ForwardPipelinePass.cpp
@@ -11,14 +11,12 @@
 #include <Nazara/Graphics/FramePipeline.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
-#include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/MaterialInstance.hpp>
 #include <Nazara/Graphics/PointLight.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Graphics/SpotLight.hpp>
 #include <Nazara/Graphics/SpotLightShadowData.hpp>
-#include <Nazara/Graphics/ViewerInstance.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
@@ -100,7 +98,7 @@ namespace Nz
 				elementRenderer.Reset(*m_elementRendererData[elementType], frameData.renderResources);
 			});
 
-			const auto& viewerInstance = m_viewer->GetViewerInstance();
+			const ViewerInstance& viewerInstance = m_viewer->GetViewerInstance();
 
 			m_elementRegistry.ProcessRenderQueue(m_renderQueue, [&](std::size_t elementType, const Pointer<const RenderElement>* elements, std::size_t elementCount)
 			{
diff --git a/src/Nazara/Graphics/MaterialInstance.cpp b/src/Nazara/Graphics/MaterialInstance.cpp
index 6c580ffc9..a1fdc15a4 100644
--- a/src/Nazara/Graphics/MaterialInstance.cpp
+++ b/src/Nazara/Graphics/MaterialInstance.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Graphics/MaterialPass.hpp>
 #include <Nazara/Graphics/MaterialPipeline.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
diff --git a/src/Nazara/Graphics/PointLightShadowData.cpp b/src/Nazara/Graphics/PointLightShadowData.cpp
index 97c4369c5..f966da7f3 100644
--- a/src/Nazara/Graphics/PointLightShadowData.cpp
+++ b/src/Nazara/Graphics/PointLightShadowData.cpp
@@ -21,7 +21,7 @@ namespace Nz
 			 Quaternionf::RotationBetween(Vector3f::Forward(), -Vector3f::UnitX()),
 			 Quaternionf::RotationBetween(Vector3f::Forward(),  Vector3f::UnitY()),
 			 Quaternionf::RotationBetween(Vector3f::Forward(), -Vector3f::UnitY()),
-			 Quaternionf::RotationBetween(Vector3f::Forward(), -Vector3f::UnitZ()), //< FIXME: Find out why Z is reversed
+			 Quaternionf::RotationBetween(Vector3f::Forward(), -Vector3f::UnitZ()), //< Z is reversed as the cubemap convention is left-handed
 			 Quaternionf::RotationBetween(Vector3f::Forward(),  Vector3f::UnitZ()),
 		};
 
diff --git a/src/Nazara/Graphics/PostProcessPipelinePass.cpp b/src/Nazara/Graphics/PostProcessPipelinePass.cpp
index af02d10cd..26700bc41 100644
--- a/src/Nazara/Graphics/PostProcessPipelinePass.cpp
+++ b/src/Nazara/Graphics/PostProcessPipelinePass.cpp
@@ -3,10 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/PostProcessPipelinePass.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
@@ -89,7 +87,7 @@ namespace Nz
 			m_shaderBinding->Update({
 				{
 					0,
-					Nz::ShaderBinding::SampledTextureBinding {
+					ShaderBinding::SampledTextureBinding {
 						sourceTexture.get(), sampler.get()
 					}
 				}
diff --git a/src/Nazara/Graphics/RenderWindow.cpp b/src/Nazara/Graphics/RenderWindow.cpp
index 5429e212a..1396309a6 100644
--- a/src/Nazara/Graphics/RenderWindow.cpp
+++ b/src/Nazara/Graphics/RenderWindow.cpp
@@ -6,7 +6,6 @@
 #include <Nazara/Graphics/BakedFrameGraph.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/Swapchain.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <cassert>
diff --git a/src/Nazara/Graphics/SkeletonInstance.cpp b/src/Nazara/Graphics/SkeletonInstance.cpp
index 444b8b085..0a96f5227 100644
--- a/src/Nazara/Graphics/SkeletonInstance.cpp
+++ b/src/Nazara/Graphics/SkeletonInstance.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <Nazara/Utility/Joint.hpp>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/SpriteChainRenderer.cpp b/src/Nazara/Graphics/SpriteChainRenderer.cpp
index a44c116af..8b911018f 100644
--- a/src/Nazara/Graphics/SpriteChainRenderer.cpp
+++ b/src/Nazara/Graphics/SpriteChainRenderer.cpp
@@ -8,7 +8,7 @@
 #include <Nazara/Graphics/RenderSpriteChain.hpp>
 #include <Nazara/Graphics/ViewerInstance.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <iostream>
 #include <utility>
diff --git a/src/Nazara/Graphics/SubmeshRenderer.cpp b/src/Nazara/Graphics/SubmeshRenderer.cpp
index ad5ff7cf6..9d2ced492 100644
--- a/src/Nazara/Graphics/SubmeshRenderer.cpp
+++ b/src/Nazara/Graphics/SubmeshRenderer.cpp
@@ -9,7 +9,7 @@
 #include <Nazara/Graphics/SkeletonInstance.hpp>
 #include <Nazara/Graphics/ViewerInstance.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Graphics/Systems/RenderSystem.cpp b/src/Nazara/Graphics/Systems/RenderSystem.cpp
index 3028f50f9..3075ec2c4 100644
--- a/src/Nazara/Graphics/Systems/RenderSystem.cpp
+++ b/src/Nazara/Graphics/Systems/RenderSystem.cpp
@@ -10,7 +10,7 @@
 #include <Nazara/Graphics/Components/CameraComponent.hpp>
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <Nazara/Renderer/WindowSwapchain.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
diff --git a/src/Nazara/Graphics/ViewerInstance.cpp b/src/Nazara/Graphics/ViewerInstance.cpp
index d15b3c0e5..b57c9a717 100644
--- a/src/Nazara/Graphics/ViewerInstance.cpp
+++ b/src/Nazara/Graphics/ViewerInstance.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Graphics/MaterialSettings.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <NazaraUtils/StackVector.hpp>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/WorldInstance.cpp b/src/Nazara/Graphics/WorldInstance.cpp
index 809a936cd..b1ae80cc6 100644
--- a/src/Nazara/Graphics/WorldInstance.cpp
+++ b/src/Nazara/Graphics/WorldInstance.cpp
@@ -7,7 +7,7 @@
 #include <Nazara/Graphics/MaterialSettings.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <NazaraUtils/StackVector.hpp>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Renderer/DebugDrawer.cpp b/src/Nazara/Renderer/DebugDrawer.cpp
index 8872ae384..3709d647d 100644
--- a/src/Nazara/Renderer/DebugDrawer.cpp
+++ b/src/Nazara/Renderer/DebugDrawer.cpp
@@ -5,9 +5,9 @@
 #include <Nazara/Renderer/DebugDrawer.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
-#include <Nazara/Renderer/RenderFrame.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
+#include <Nazara/Renderer/RenderResources.hpp>
 #include <Nazara/Utility/Joint.hpp>
 #include <Nazara/Utility/Skeleton.hpp>
 #include <NZSL/Serializer.hpp>