Include-What-You-Use (#137)

* IWYU Core

* IWYU Noise

* IWYU Utility

* IWYU Audio

* IWYU Platform

* IWYU Lua

* IWYU Network

* IWYU Physics2D

* IWYU Physics3D

* IWYU Renderer

* IWYU Graphics

* IWYU NDKServer

* IWYU Fix

* Try to fix compilation

* Other fixes

src/Nazara/Audio/Music.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Audio/Music.hpp>
-#include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Audio/OpenAL.hpp>
 #include <Nazara/Audio/SoundStream.hpp>
 #include <Nazara/Core/Mutex.hpp>

src/Nazara/Audio/Sound.cpp

@@ -3,13 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Audio/Sound.hpp>
-#include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Audio/Config.hpp>
 #include <Nazara/Audio/OpenAL.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <cstring>
-#include <memory>
-#include <stdexcept>
 #include <Nazara/Audio/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/ByteArray.cpp

@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/ByteArray.hpp>
-#include <Nazara/Core/AbstractHash.hpp>
-#include <ostream>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/ByteStream.cpp

@@ -6,7 +6,6 @@
 #include <Nazara/Core/MemoryStream.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <algorithm>
-#include <cstring>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Clock.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Clock.hpp>
-#include <Nazara/Core/Error.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <Nazara/Core/Win32/ClockImpl.hpp>

src/Nazara/Core/Core.cpp

@@ -4,7 +4,6 @@
 
 #include <Nazara/Core/Core.hpp>
 #include <Nazara/Core/Config.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/HardwareInfo.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/PluginManager.hpp>

src/Nazara/Core/File.cpp

@@ -5,12 +5,11 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/AbstractHash.hpp>
 #include <Nazara/Core/Config.hpp>
+#include <Nazara/Core/Directory.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/StringStream.hpp>
-#include <cstring>
 #include <memory>
-#include <utility>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <Nazara/Core/Win32/FileImpl.hpp>

src/Nazara/Core/GuillotineBinPack.cpp

@@ -9,8 +9,6 @@
 #include <Nazara/Core/GuillotineBinPack.hpp>
 #include <Nazara/Core/Config.hpp>
 #include <algorithm>
-#include <cstdlib>
-#include <cmath>
 #include <limits>
 #include <Nazara/Core/Debug.hpp>
 

src/Nazara/Core/HardwareInfo.cpp

@@ -5,7 +5,6 @@
 #include <Nazara/Core/HardwareInfo.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <algorithm>
-#include <cstdlib>
 #include <cstring>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)

src/Nazara/Core/MemoryManager.cpp

@@ -5,9 +5,9 @@
 #include <Nazara/Core/MemoryManager.hpp>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <ctime>
 #include <new>
-#include <stdexcept>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <windows.h>

src/Nazara/Core/ParameterList.cpp

@@ -7,8 +7,6 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
 #include <cstring>
-#include <limits>
-#include <new>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/ClockImpl.cpp

@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Posix/ClockImpl.hpp>
-#include <Nazara/Core/Error.hpp>
-#include <ctime>
 #include <sys/time.h>
 #include <Nazara/Core/Debug.hpp>
 

src/Nazara/Core/Posix/ConditionVariableImpl.cpp

@@ -4,6 +4,8 @@
 
 #include <Nazara/Core/Posix/ConditionVariableImpl.hpp>
 #include <Nazara/Core/Posix/MutexImpl.hpp>
+#include <sys/time.h>
+#include <time.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/ConditionVariableImpl.hpp

@@ -11,8 +11,6 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <pthread.h>
-#include <unistd.h>
-#include <sys/time.h>
 
 namespace Nz
 {

src/Nazara/Core/Posix/DirectoryImpl.cpp

@@ -4,10 +4,12 @@
 
 #include <Nazara/Core/Posix/DirectoryImpl.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Debug.hpp>
-
+#include <Nazara/Core/String.hpp>
 #include <errno.h>
 #include <sys/param.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Core/Posix/DirectoryImpl.hpp

@@ -9,9 +9,6 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <dirent.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 namespace Nz
 {

src/Nazara/Core/Posix/DynLibImpl.cpp

@@ -4,8 +4,8 @@
 
 #include <Nazara/Core/Posix/DynLibImpl.hpp>
 #include <Nazara/Core/DynLib.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/String.hpp>
+#include <dlfcn.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/DynLibImpl.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_DYNLIBIMPL_HPP
 
 #include <Nazara/Core/DynLib.hpp>
-#include <dlfcn.h>
 
 namespace Nz
 {

src/Nazara/Core/Posix/FileImpl.cpp

@@ -4,8 +4,10 @@
 
 #include <Nazara/Core/Posix/FileImpl.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <cstdio>
-#include <sys/file.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/FileImpl.hpp

@@ -12,12 +12,8 @@
 #endif
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/File.hpp>
+#include <Nazara/Core/Enums.hpp>
 #include <ctime>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
 
 namespace Nz
 {

src/Nazara/Core/Posix/HardwareInfoImpl.cpp

@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Posix/HardwareInfoImpl.hpp>
-#include <Nazara/Core/Error.hpp>
+#include <unistd.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/HardwareInfoImpl.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_HARDWAREINFOIMPL_POSIX_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <unistd.h>
 
 namespace Nz
 {

src/Nazara/Core/Posix/SemaphoreImpl.cpp

@@ -3,9 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Posix/SemaphoreImpl.hpp>
-#include <Nazara/Core/Config.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <limits>
+#include <time.h>
 #include <sys/time.h>
 #include <Nazara/Core/Debug.hpp>
 

src/Nazara/Core/Posix/TaskSchedulerImpl.cpp

@@ -3,8 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Core/Posix/TaskSchedulerImpl.hpp>
-#include <Nazara/Core/Config.hpp>
-#include <Nazara/Core/Error.hpp>
+#include <Nazara/Core/Functor.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/TaskSchedulerImpl.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_TASKSCHEDULERIMPL_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/Functor.hpp>
 #include <atomic>
 #include <memory>
 #include <pthread.h>
@@ -16,6 +15,8 @@
 
 namespace Nz
 {
+	struct Functor;
+
 	class TaskSchedulerImpl
 	{
 		public:

src/Nazara/Core/Posix/ThreadImpl.cpp

@@ -5,9 +5,10 @@
 #include <Nazara/Core/Posix/ThreadImpl.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Functor.hpp>
+#include <Nazara/Core/String.hpp>
+#include <errno.h>
 #include <sched.h>
 #include <time.h>
-#include <unistd.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Posix/ThreadImpl.hpp

@@ -8,7 +8,6 @@
 #define NAZARA_THREADIMPL_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Core/String.hpp>
 
 #if defined(__GNUC__) && !defined(_GNU_SOURCE)
 #define _GNU_SOURCE
@@ -19,6 +18,7 @@
 namespace Nz
 {
 	struct Functor;
+	class String;
 
 	class ThreadImpl
 	{

src/Nazara/Core/RefCounted.cpp

@@ -5,13 +5,6 @@
 #include <Nazara/Core/RefCounted.hpp>
 #include <Nazara/Core/Config.hpp>
 #include <Nazara/Core/Error.hpp>
-
-#if NAZARA_CORE_THREADSAFE && NAZARA_THREADSAFETY_REFCOUNTED
-	#include <Nazara/Core/ThreadSafety.hpp>
-#else
-	#include <Nazara/Core/ThreadSafetyOff.hpp>
-#endif
-
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz

src/Nazara/Core/Thread.cpp

@@ -7,8 +7,6 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/HardwareInfo.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
-#include <ostream>
-#include <stdexcept>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <Nazara/Core/Win32/ThreadImpl.hpp>

src/Nazara/Graphics/AbstractRenderTechnique.cpp

@@ -3,9 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/RenderTechniques.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/Billboard.cpp

@@ -4,10 +4,6 @@
 
 #include <Nazara/Graphics/Billboard.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <Nazara/Math/Algorithm.hpp>
-#include <cstring>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ColorBackground.cpp

@@ -3,8 +3,10 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/ColorBackground.hpp>
+#include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredBloomPass.cpp

@@ -4,7 +4,6 @@
 
 #include <Nazara/Graphics/DeferredBloomPass.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredDOFPass.cpp

@@ -3,10 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DeferredDOFPass.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredFXAAPass.cpp

@@ -5,7 +5,7 @@
 #include <Nazara/Graphics/DeferredFXAAPass.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredFinalPass.cpp

@@ -3,9 +3,12 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DeferredFinalPass.hpp>
+#include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/Shader.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredFogPass.cpp

@@ -4,9 +4,9 @@
 
 #include <Nazara/Graphics/DeferredFogPass.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredForwardPass.cpp

@@ -6,6 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Graphics/ForwardRenderTechnique.hpp>
 #include <Nazara/Renderer/Renderer.hpp>

src/Nazara/Graphics/DeferredGeometryPass.cpp

@@ -8,12 +8,9 @@
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
-#include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
-#include <Nazara/Utility/VertexStruct.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredPhongLightingPass.cpp

@@ -3,12 +3,13 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DeferredPhongLightingPass.hpp>
+#include <Nazara/Core/Primitive.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredRenderQueue.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderTexture.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredRenderPass.cpp

@@ -3,8 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DeferredRenderPass.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
+#include <Nazara/Graphics/DeferredRenderQueue.hpp>
+#include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DeferredRenderQueue.cpp

@@ -3,9 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DeferredRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
-#include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 ///TODO: Render billboards using Deferred Shading if possible

src/Nazara/Graphics/DeferredRenderTechnique.cpp

@@ -8,7 +8,6 @@
 
 #include <Nazara/Graphics/DeferredRenderTechnique.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/DeferredBloomPass.hpp>
 #include <Nazara/Graphics/DeferredDOFPass.hpp>
@@ -18,18 +17,13 @@
 #include <Nazara/Graphics/DeferredFXAAPass.hpp>
 #include <Nazara/Graphics/DeferredGeometryPass.hpp>
 #include <Nazara/Graphics/DeferredPhongLightingPass.hpp>
-#include <Nazara/Graphics/Drawable.hpp>
-#include <Nazara/Graphics/Light.hpp>
-#include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/ShaderStage.hpp>
-#include <limits>
 #include <memory>
-#include <random>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DepthRenderQueue.cpp

@@ -5,6 +5,7 @@
 #include <Nazara/Graphics/DepthRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/DepthRenderTechnique.cpp

@@ -5,19 +5,14 @@
 #include <Nazara/Graphics/DepthRenderTechnique.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/OffsetOf.hpp>
-#include <Nazara/Graphics/AbstractBackground.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Graphics/Drawable.hpp>
-#include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
 #include <limits>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/Formats/MeshLoader.cpp

@@ -3,13 +3,11 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/Formats/MeshLoader.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Graphics/SkeletalModel.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Utility/Mesh.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/Formats/TextureLoader.cpp

@@ -5,7 +5,6 @@
 #include <Nazara/Graphics/Formats/TextureLoader.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Renderer/Texture.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ForwardRenderQueue.cpp

@@ -4,7 +4,7 @@
 
 #include <Nazara/Graphics/ForwardRenderQueue.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
-#include <Nazara/Graphics/Light.hpp>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 ///TODO: Replace sinus/cosinus by a lookup table (which will lead to a speed up about 10x)

src/Nazara/Graphics/ForwardRenderTechnique.cpp

@@ -10,14 +10,12 @@
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
 #include <limits>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/GuillotineTextureAtlas.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/GuillotineTextureAtlas.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 

src/Nazara/Graphics/Light.cpp

@@ -8,9 +8,6 @@
 #include <Nazara/Graphics/Enums.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Math/Sphere.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Renderer/Shader.hpp>
-#include <cstring>
 #include <Nazara/Graphics/Debug.hpp>
 
 ///TODO: Use of UBOs

src/Nazara/Graphics/Material.cpp

@@ -5,8 +5,7 @@
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ParticleDeclaration.cpp

@@ -10,7 +10,6 @@
 #include <Nazara/Graphics/Enums.hpp>
 #include <Nazara/Graphics/ParticleStruct.hpp>
 #include <Nazara/Utility/Utility.hpp>
-#include <cstring>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ParticleEmitter.cpp

@@ -3,13 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/ParticleEmitter.hpp>
-#include <Nazara/Core/CallOnExit.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Graphics/ParticleMapper.hpp>
 #include <Nazara/Graphics/ParticleGroup.hpp>
-#include <cstdlib>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ParticleGroup.cpp

@@ -7,8 +7,6 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Graphics/ParticleMapper.hpp>
-#include <cstdlib>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/ParticleMapper.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/ParticleMapper.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/SkeletalModel.cpp

@@ -6,8 +6,8 @@
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/SkinningManager.hpp>
-#include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/MeshData.hpp>
+#include <Nazara/Utility/Sequence.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
 #include <memory>
 #include <Nazara/Graphics/Debug.hpp>

src/Nazara/Graphics/SkinningManager.cpp

@@ -6,10 +6,10 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/TaskScheduler.hpp>
 #include <Nazara/Utility/Algorithm.hpp>
+#include <Nazara/Utility/Joint.hpp>
+#include <Nazara/Utility/Skeleton.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
-#include <Nazara/Utility/VertexMapper.hpp>
-#include <memory>
 #include <unordered_map>
 #include <Nazara/Graphics/Debug.hpp>
 

src/Nazara/Graphics/SkyboxBackground.cpp

@@ -6,10 +6,11 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <Nazara/Utility/VertexDeclaration.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/Sprite.cpp

@@ -4,9 +4,7 @@
 
 #include <Nazara/Graphics/Sprite.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/TextSprite.cpp

@@ -6,9 +6,9 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/SparsePtr.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
-#include <memory>
+#include <Nazara/Utility/AbstractTextDrawer.hpp>
 #include <Nazara/Utility/Font.hpp>
+#include <memory>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/TextureBackground.cpp

@@ -4,7 +4,8 @@
 
 #include <Nazara/Graphics/TextureBackground.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <memory>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/UberShaderInstance.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Graphics/TileMap.cpp

@@ -4,10 +4,8 @@
 
 #include <Nazara/Graphics/TileMap.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
-#include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <cstring>
-#include <memory>
+#include <Nazara/Utility/VertexStruct.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz

src/Nazara/Lua/LuaCoroutine.cpp

@@ -3,9 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Lua/LuaCoroutine.hpp>
-#include <Lua/lauxlib.h>
 #include <Lua/lua.h>
-#include <Lua/lualib.h>
 #include <Nazara/Lua/LuaInstance.hpp>
 #include <Nazara/Lua/Debug.hpp>
 

src/Nazara/Lua/LuaInstance.cpp

@@ -8,14 +8,9 @@
 #include <Lua/lualib.h>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/File.hpp>
-#include <Nazara/Core/MemoryHelper.hpp>
-#include <Nazara/Core/MemoryView.hpp>
-#include <Nazara/Core/StringStream.hpp>
 #include <cassert>
 #include <cstdlib>
 #include <stdexcept>
-#include <unordered_map>
 #include <Nazara/Lua/Debug.hpp>
 
 namespace Nz

src/Nazara/Lua/LuaState.cpp

@@ -5,7 +5,6 @@
 #include <Nazara/Lua/LuaState.hpp>
 #include <Lua/lauxlib.h>
 #include <Lua/lua.h>
-#include <Lua/lualib.h>
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
@@ -14,9 +13,6 @@
 #include <Nazara/Core/StringStream.hpp>
 #include <Nazara/Lua/LuaCoroutine.hpp>
 #include <Nazara/Lua/LuaInstance.hpp>
-#include <cstdlib>
-#include <stdexcept>
-#include <unordered_map>
 #include <Nazara/Lua/Debug.hpp>
 
 namespace Nz

src/Nazara/Network/AbstractSocket.cpp

@@ -4,7 +4,6 @@
 
 #include <Nazara/Network/AbstractSocket.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <utility>
 #include <Nazara/Network/Debug.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)

src/Nazara/Network/IpAddress.cpp

@@ -8,7 +8,6 @@
 #include <Nazara/Network/Algorithm.hpp>
 #include <algorithm>
 #include <limits>
-#include <Nazara/Network/SystemSocket.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 #include <Nazara/Network/Win32/IpAddressImpl.hpp>

src/Nazara/Network/Network.cpp

@@ -10,7 +10,6 @@
 #include <Nazara/Network/Config.hpp>
 #include <Nazara/Network/NetPacket.hpp>
 #include <Nazara/Network/RUdpConnection.hpp>
-#include <Nazara/Network/Debug.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 #include <Nazara/Network/Win32/SocketImpl.hpp>

src/Nazara/Network/Posix/SocketImpl.cpp

@@ -4,8 +4,8 @@
 
 #include <Nazara/Network/Posix/SocketImpl.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
+#include <Nazara/Network/NetBuffer.hpp>
 #include <Nazara/Network/Posix/IpAddressImpl.hpp>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>

src/Nazara/Network/Posix/SocketImpl.hpp

@@ -10,12 +10,13 @@
 #include <Nazara/Network/SocketHandle.hpp>
 #include <Nazara/Network/Enums.hpp>
 #include <Nazara/Network/IpAddress.hpp>
-#include <Nazara/Network/NetBuffer.hpp>
 
 #define NAZARA_NETWORK_POLL_SUPPORT 1
 
 namespace Nz
 {
+	struct NetBuffer;
+
 	struct PollSocket
 	{
 		SocketHandle fd;

src/Nazara/Network/Posix/SocketPollerImpl.hpp

@@ -7,7 +7,6 @@
 #ifndef NAZARA_SOCKETPOLLERIMPL_HPP
 #define NAZARA_SOCKETPOLLERIMPL_HPP
 
-#include <Nazara/Network/IpAddress.hpp>
 #include <Nazara/Network/SocketHandle.hpp>
 #include <Nazara/Network/Posix/SocketImpl.hpp>
 #include <unordered_map>

src/Nazara/Network/TcpServer.cpp

@@ -3,10 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Network/TcpServer.hpp>
-#include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Network/TcpClient.hpp>
-#include <limits>
 #include <Nazara/Network/Debug.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)

src/Nazara/Noise/Perlin.cpp

@@ -4,8 +4,6 @@
 
 #include <Nazara/Noise/Perlin.hpp>
 #include <Nazara/Noise/NoiseTools.hpp>
-#include <exception>
-#include <stdexcept>
 #include <Nazara/Noise/Debug.hpp>
 
 namespace Nz

src/Nazara/Noise/Simplex.cpp

@@ -4,8 +4,6 @@
 
 #include <Nazara/Noise/Simplex.hpp>
 #include <Nazara/Noise/NoiseTools.hpp>
-#include <exception>
-#include <stdexcept>
 #include <Nazara/Noise/Debug.hpp>
 
 namespace Nz

src/Nazara/Noise/Worley.cpp

@@ -4,7 +4,6 @@
 
 #include <Nazara/Noise/Worley.hpp>
 #include <Nazara/Noise/NoiseTools.hpp>
-#include <exception>
 #include <stdexcept>
 #include <Nazara/Noise/Debug.hpp>
 

src/Nazara/Physics2D/RigidBody2D.cpp

@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Physics2D/RigidBody2D.hpp>
-#include <Nazara/Math/Algorithm.hpp>
-#include <Nazara/Physics2D/Config.hpp>
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
 #include <chipmunk/chipmunk.h>
 #include <chipmunk/chipmunk_private.h>

src/Nazara/Physics3D/Collider3D.cpp

@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Physics3D/Collider3D.hpp>
+#include <Nazara/Core/PrimitiveList.hpp>
 #include <Nazara/Physics3D/PhysWorld3D.hpp>
 #include <Newton/Newton.h>
-#include <memory>
 #include <Nazara/Physics3D/Debug.hpp>
 
 namespace Nz
@@ -50,7 +50,7 @@ namespace Nz
 	{
 		Vector3f min, max;
 
-		// Si nous n'avons aucune instance, nous en créons une temporaire
+		// Si nous n'avons aucune instance, nous en cr<EFBFBD>ons une temporaire
 		if (m_handles.empty())
 		{
 			PhysWorld3D world;
@@ -61,7 +61,7 @@ namespace Nz
 			}
 			NewtonDestroyCollision(collision);
 		}
-		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute façon)
+		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute fa<EFBFBD>on)
 			NewtonCollisionCalculateAABB(m_handles.begin()->second, offsetMatrix, min, max);
 
 		return Boxf(scale * min, scale * max);
@@ -72,7 +72,7 @@ namespace Nz
 		float inertiaMatrix[3];
 		float origin[3];
 
-		// Si nous n'avons aucune instance, nous en créons une temporaire
+		// Si nous n'avons aucune instance, nous en cr<EFBFBD>ons une temporaire
 		if (m_handles.empty())
 		{
 			PhysWorld3D world;
@@ -83,7 +83,7 @@ namespace Nz
 			}
 			NewtonDestroyCollision(collision);
 		}
-		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute façon)
+		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute fa<EFBFBD>on)
 			NewtonConvexCollisionCalculateInertialMatrix(m_handles.begin()->second, inertiaMatrix, origin);
 
 		if (inertia)
@@ -97,7 +97,7 @@ namespace Nz
 	{
 		float volume;
 
-		// Si nous n'avons aucune instance, nous en créons une temporaire
+		// Si nous n'avons aucune instance, nous en cr<EFBFBD>ons une temporaire
 		if (m_handles.empty())
 		{
 			PhysWorld3D world;
@@ -108,7 +108,7 @@ namespace Nz
 			}
 			NewtonDestroyCollision(collision);
 		}
-		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute façon)
+		else // Sinon on utilise une instance au hasard (elles sont toutes identiques de toute fa<EFBFBD>on)
 			volume = NewtonConvexCollisionCalculateVolume(m_handles.begin()->second);
 
 		return volume;

src/Nazara/Physics3D/RigidBody3D.cpp

@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Physics3D/RigidBody3D.hpp>
-#include <Nazara/Math/Algorithm.hpp>
-#include <Nazara/Physics3D/Config.hpp>
 #include <Nazara/Physics3D/PhysWorld3D.hpp>
 #include <Newton/Newton.h>
 #include <algorithm>

src/Nazara/Platform/Window.cpp

@@ -5,12 +5,9 @@
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/LockGuard.hpp>
 #include <Nazara/Platform/Cursor.hpp>
 #include <Nazara/Platform/Icon.hpp>
-#include <Nazara/Utility/Image.hpp>
-#include <stdexcept>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 	#include <Nazara/Platform/Win32/WindowImpl.hpp>

src/Nazara/Platform/X11/CursorImpl.cpp

@@ -6,8 +6,8 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Platform/X11/Display.hpp>
+#include <Nazara/Platform/X11/ScopedXCB.hpp>
 #include <xcb/xcb_image.h>
 
 // Some older versions of xcb/util-renderutil (notably the one available on Travis CI) use `template` as an argument name

src/Nazara/Platform/X11/Display.cpp

@@ -4,8 +4,8 @@
 
 #include <Nazara/Platform/X11/Display.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/String.hpp>
+#include <Nazara/Platform/X11/ScopedXCB.hpp>
 #include <xcb/xcb_keysyms.h>
 #include <map>
 #include <Nazara/Platform/Debug.hpp>

src/Nazara/Platform/X11/Display.hpp

@@ -8,8 +8,9 @@
 #define NAZARA_X11DISPLAY_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/Platform/WindowHandle.hpp>
-#include <Nazara/Platform/X11/ScopedXCB.hpp>
+#include <Nazara/Platform/Config.hpp>
+#include <xcb/xcb.h>
+#include <xcb/xcb_ewmh.h>
 
 typedef struct _XCBKeySymbols xcb_key_symbols_t;
 

src/Nazara/Platform/X11/IconImpl.cpp

@@ -6,7 +6,6 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Platform/X11/Display.hpp>
 #include <Nazara/Platform/Debug.hpp>
 

src/Nazara/Platform/X11/InputImpl.cpp

@@ -6,6 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Platform/X11/Display.hpp>
+#include <Nazara/Platform/X11/ScopedXCB.hpp>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <X11/Xlib.h>

src/Nazara/Platform/X11/ScopedXCB.hpp

@@ -10,6 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <xcb/xcb.h>
 #include <xcb/xcb_ewmh.h>
+#include <cstdlib>
 
 namespace Nz
 {

src/Nazara/Platform/X11/ScopedXCB.inl

@@ -2,7 +2,6 @@
 // This file is part of the "Nazara Engine - Platform module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Platform/Debug.hpp>
 
 namespace Nz

src/Nazara/Platform/X11/VideoModeImpl.cpp

@@ -6,6 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Platform/VideoMode.hpp>
 #include <Nazara/Platform/X11/Display.hpp>
+#include <Nazara/Platform/X11/ScopedXCB.hpp>
 #include <xcb/randr.h>
 #include <algorithm>
 #include <Nazara/Platform/Debug.hpp>

src/Nazara/Platform/X11/WindowImpl.cpp

@@ -13,12 +13,11 @@
 #include <Nazara/Platform/VideoMode.hpp>
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Platform/X11/CursorImpl.hpp>
+#include <Nazara/Platform/X11/Display.hpp>
 #include <Nazara/Platform/X11/IconImpl.hpp>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
-#include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <xcb/xcb_cursor.h>
 #include <xcb/xcb_keysyms.h>
 #include <Nazara/Platform/Debug.hpp>
 

src/Nazara/Platform/X11/WindowImpl.hpp

@@ -14,7 +14,7 @@
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/Enums.hpp>
 #include <Nazara/Platform/Keyboard.hpp>
-#include <Nazara/Platform/X11/Display.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <xcb/randr.h>
 #include <xcb/xcb_icccm.h>
 

src/Nazara/Renderer/DebugDrawer.cpp

@@ -4,17 +4,17 @@
 
 #include <Nazara/Renderer/DebugDrawer.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderStates.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
+#include <Nazara/Utility/Joint.hpp>
 #include <Nazara/Utility/Mesh.hpp>
 #include <Nazara/Utility/Skeleton.hpp>
+#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <Nazara/Utility/VertexDeclaration.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
-#include <memory>
 #include <Nazara/Renderer/Debug.hpp>
 
 ///TODO: Améliorer

src/Nazara/Renderer/GpuQuery.cpp

@@ -7,7 +7,6 @@
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
 

src/Nazara/Renderer/HardwareBuffer.cpp

@@ -3,13 +3,11 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Renderer/HardwareBuffer.hpp>
-#include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Utility/Buffer.hpp>
 #include <cstring>
-#include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

src/Nazara/Renderer/OpenGL.cpp

@@ -6,13 +6,12 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
 #if defined(NAZARA_PLATFORM_GLX)
 #include <Nazara/Platform/X11/Display.hpp>
 #endif // NAZARA_PLATFORM_GLX
-#include <cstring>
 #include <set>
 #include <sstream>
 #include <stdexcept>

src/Nazara/Renderer/RenderWindow.cpp

@@ -9,8 +9,6 @@
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
-#include <Nazara/Renderer/Texture.hpp>
-#include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

src/Nazara/Renderer/Renderer.cpp

@@ -14,15 +14,17 @@
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/DebugDrawer.hpp>
 #include <Nazara/Renderer/GlslWriter.hpp>
+#include <Nazara/Renderer/GpuQuery.hpp>
 #include <Nazara/Renderer/HardwareBuffer.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Renderer/RenderBuffer.hpp>
 #include <Nazara/Renderer/RenderTarget.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 #include <Nazara/Renderer/Texture.hpp>
+#include <Nazara/Renderer/TextureSampler.hpp>
 #include <Nazara/Renderer/UberShader.hpp>
-#include <Nazara/Utility/AbstractBuffer.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/Utility.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
@@ -30,8 +32,6 @@
 #include <Nazara/Platform/Platform.hpp>
 #include <map>
 #include <memory>
-#include <set>
-#include <stdexcept>
 #include <tuple>
 #include <unordered_map>
 #include <vector>

src/Nazara/Renderer/Shader.cpp

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Renderer/Shader.hpp>
+#include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>

src/Nazara/Renderer/Texture.cpp

@@ -10,8 +10,6 @@
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
-#include <memory>
-#include <stdexcept>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

src/Nazara/Renderer/UberShaderInstance.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Renderer/UberShaderInstance.hpp>
-#include <algorithm>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz

src/Nazara/Renderer/UberShaderPreprocessor.cpp

@@ -5,10 +5,9 @@
 #include <Nazara/Renderer/UberShaderPreprocessor.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/File.hpp>
-#include <Nazara/Core/Log.hpp>
+#include <Nazara/Core/ParameterList.hpp>
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <algorithm>
-#include <memory>
 #include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz