diff --git a/include/Nazara/Debug.hpp b/include/Nazara/Debug.hpp
deleted file mode 100644
index 02acb0b8e..000000000
--- a/include/Nazara/Debug.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (C) 2015 Jérôme Leclercq
-// This file is part of the "Nazara Engine"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-// no header guards
-
-#include <Nazara/Core/Debug/MemoryLeakTracker.hpp>
diff --git a/include/Nazara/DebugOff.hpp b/include/Nazara/DebugOff.hpp
deleted file mode 100644
index 7e92572a6..000000000
--- a/include/Nazara/DebugOff.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (C) 2015 Jérôme Leclercq
-// This file is part of the "Nazara Engine"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-// no header guards
-
-#undef delete
-#undef new
diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp
index 665ec0de4..4639112eb 100644
--- a/include/Nazara/Graphics.hpp
+++ b/include/Nazara/Graphics.hpp
@@ -43,6 +43,7 @@
 #include <Nazara/Graphics/ForwardFramePipeline.hpp>
 #include <Nazara/Graphics/ForwardPipelinePass.hpp>
 #include <Nazara/Graphics/FrameGraph.hpp>
+#include <Nazara/Graphics/FrameGraphStructs.hpp>
 #include <Nazara/Graphics/FramePass.hpp>
 #include <Nazara/Graphics/FramePassAttachment.hpp>
 #include <Nazara/Graphics/FramePipeline.hpp>
@@ -52,6 +53,7 @@
 #include <Nazara/Graphics/GuillotineTextureAtlas.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Graphics/Light.hpp>
+#include <Nazara/Graphics/LightShadowData.hpp>
 #include <Nazara/Graphics/LinearSlicedSprite.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/MaterialInstance.hpp>
@@ -61,6 +63,7 @@
 #include <Nazara/Graphics/MaterialSettings.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Graphics/PointLight.hpp>
+#include <Nazara/Graphics/PointLightShadowData.hpp>
 #include <Nazara/Graphics/PredefinedMaterials.hpp>
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
 #include <Nazara/Graphics/RenderBufferPool.hpp>
@@ -72,9 +75,11 @@
 #include <Nazara/Graphics/RenderSpriteChain.hpp>
 #include <Nazara/Graphics/RenderSubmesh.hpp>
 #include <Nazara/Graphics/ShaderReflection.hpp>
+#include <Nazara/Graphics/ShadowViewer.hpp>
 #include <Nazara/Graphics/SkeletonInstance.hpp>
 #include <Nazara/Graphics/SlicedSprite.hpp>
 #include <Nazara/Graphics/SpotLight.hpp>
+#include <Nazara/Graphics/SpotLightShadowData.hpp>
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/SpriteChainRenderer.hpp>
 #include <Nazara/Graphics/SubmeshRenderer.hpp>
diff --git a/include/Nazara/Math/Matrix4.hpp b/include/Nazara/Math/Matrix4.hpp
index a51987d23..0b59dbae2 100644
--- a/include/Nazara/Math/Matrix4.hpp
+++ b/include/Nazara/Math/Matrix4.hpp
@@ -101,10 +101,10 @@ namespace Nz
 			Matrix4& Transpose();
 
 			T& operator()(std::size_t x, std::size_t y);
-			T operator()(std::size_t x, std::size_t y) const;
+			const T& operator()(std::size_t x, std::size_t y) const;
 
 			T& operator[](std::size_t i);
-			T operator[](std::size_t i) const;
+			const T& operator[](std::size_t i) const;
 
 			Matrix4& operator=(const Matrix4& matrix) = default;
 
diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl
index ccc70a6e2..a3cb38af8 100644
--- a/include/Nazara/Math/Matrix4.inl
+++ b/include/Nazara/Math/Matrix4.inl
@@ -1297,7 +1297,7 @@ namespace Nz
 	* \remark x and y must both be comprised in range [0,4[
 	*/
 	template<typename T>
-	T Matrix4<T>::operator()(std::size_t x, std::size_t y) const
+	const T& Matrix4<T>::operator()(std::size_t x, std::size_t y) const
 	{
 		NazaraAssert(x <= 3, "index out of range");
 		NazaraAssert(y <= 3, "index out of range");
@@ -1326,7 +1326,7 @@ namespace Nz
 	* \remark i must be comprised in range [0,16[
 	*/
 	template<typename T>
-	T Matrix4<T>::operator[](std::size_t i) const
+	const T& Matrix4<T>::operator[](std::size_t i) const
 	{
 		NazaraAssert(i <= 16, "index out of range");
 
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.inl b/include/Nazara/VulkanRenderer/Wrapper/Device.inl
index 7ff2896a9..1de6238c5 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Device.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/Device.inl
@@ -5,9 +5,9 @@
 #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Utils/StackArray.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/Utils/StackArray.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz::Vk