Apply inclusion fix

include/Nazara/Core/ByteArray.inl

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

include/Nazara/Core/ByteStream.inl

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

include/Nazara/Core/CallOnExit.inl

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

include/Nazara/Core/Endianness.inl

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

include/Nazara/Core/File.inl

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

include/Nazara/Core/Functor.inl

@@ -2,7 +2,9 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Core/Functor.hpp>
 #include <utility>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -88,3 +90,5 @@ namespace Nz
 		(m_object->*m_func)();
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/HandledObject.inl

@@ -8,6 +8,7 @@
 #include <cassert>
 #include <type_traits>
 #include <utility>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -132,3 +133,5 @@ namespace Nz
 		m_handleData->object = static_cast<T*>(this);
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/Initializer.inl

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

include/Nazara/Core/MemoryStream.inl

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

include/Nazara/Core/MovablePtr.inl

@@ -4,6 +4,7 @@
 
 #include <Nazara/Core/MovablePtr.hpp>
 #include <utility>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -59,3 +60,5 @@ namespace Nz
 		return *this;
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/MovableValue.inl

@@ -4,6 +4,7 @@
 
 #include <Nazara/Core/MovableValue.hpp>
 #include <utility>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -59,3 +60,5 @@ namespace Nz
 		return *this;
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/ObjectHandle.inl

@@ -6,6 +6,7 @@
 #include <functional>
 #include <limits>
 #include <sstream>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -549,3 +550,5 @@ namespace std
 		lhs.Swap(rhs);
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/ParameterList.inl

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

include/Nazara/Core/Primitive.inl

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

include/Nazara/Core/ResourceLoader.inl

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

include/Nazara/Core/ResourceManager.inl

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

include/Nazara/Core/ResourceSaver.inl

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

include/Nazara/Core/SerializationContext.inl

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

include/Nazara/Core/Stream.inl

@@ -2,7 +2,9 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Core/Stream.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -143,3 +145,5 @@ namespace Nz
 		return WriteBlock(buffer, size);
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Core/TaskScheduler.inl

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

include/Nazara/Graphics/Camera.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Components/CameraComponent.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 

include/Nazara/Graphics/MaterialPipeline.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Graphics module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Graphics/MaterialPipeline.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <functional>
 #include <Nazara/Graphics/Debug.hpp>

include/Nazara/Graphics/PredefinedShaderStructs.inl

@@ -3,7 +3,10 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
+#include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
 {
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>

include/Nazara/Graphics/RenderElement.inl

@@ -4,6 +4,7 @@
 
 #include <Nazara/Graphics/RenderElement.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
 {
@@ -22,3 +23,5 @@ namespace Nz
 		return m_elementType;
 	}
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>

include/Nazara/Graphics/RenderQueue.inl

@@ -4,6 +4,7 @@
 
 #include <Nazara/Graphics/RenderQueue.hpp>
 #include <algorithm>
+#include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
 {
@@ -53,3 +54,5 @@ namespace Nz
 		return m_data.size();
 	}
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>

include/Nazara/Math/Algorithm.inl

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

include/Nazara/Math/BoundingVolume.inl

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

include/Nazara/Math/Box.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Box.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <algorithm>

include/Nazara/Math/Frustum.inl

@@ -6,6 +6,7 @@
 // http://www.crownandcutlass.com/features/technicaldetails/frustum.html
 // http://www.lighthouse3d.com/tutorials/view-frustum-culling/
 
+#include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Math/Matrix4.inl

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

include/Nazara/Math/OrientedBox.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/OrientedBox.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Math/PidController.inl

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Math/PidController.hpp>
+#include <Nazara/Core/Debug.hpp>
 
 namespace Nz
 {
@@ -26,3 +27,5 @@ namespace Nz
 		return currentError * m_pFactor + m_integral * m_iFactor + deriv * m_dFactor;
 	}
 }
+
+#include <Nazara/Core/DebugOff.hpp>

include/Nazara/Math/Plane.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Plane.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Math/Ray.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Ray.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <limits>
 #include <sstream>

include/Nazara/Math/Rect.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Rect.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <algorithm>

include/Nazara/Math/Sphere.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Sphere.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Math/Box.hpp>

include/Nazara/Math/Vector2.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Math/Vector3.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Math/Vector4.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Math module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Math/Vector4.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <cstring>

include/Nazara/Network/AbstractSocket.inl

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

include/Nazara/Network/IpAddress.inl

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

include/Nazara/Network/NetPacket.inl

@@ -2,10 +2,11 @@
 // This file is part of the "Nazara Engine - Network module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Network/NetPacket.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Network/Enums.hpp>
 #include <cstring>
-#include <Nazara/Core/Debug.hpp>
+#include <Nazara/Network/Debug.hpp>
 
 namespace Nz
 {
@@ -220,4 +221,4 @@ namespace Nz
 	}
 }
 
-#include <Nazara/Core/DebugOff.hpp>
+#include <Nazara/Network/DebugOff.hpp>

include/Nazara/Network/SocketPoller.inl

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

include/Nazara/Network/TcpClient.inl

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

include/Nazara/Network/TcpServer.inl

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

include/Nazara/Network/UdpSocket.inl

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

include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp

@@ -61,4 +61,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLCOMMANDBUFFERBUILDER_HPP

include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp

@@ -42,4 +42,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLFBOFRAMEBUFFER_HPP

include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - OpenGL renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 

include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp

@@ -86,4 +86,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.inl>
 
-#endif // NAZARA_OPENGLRENDERER_OPENGLRENDERPIPELINE_HPP
+#endif // NAZARA_OPENGLRENDERER_OPENGLRENDERPIPELINELAYOUT_HPP

include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp

@@ -62,4 +62,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLShaderModule.inl>
 
-#endif // NAZARA_OPENGLRENDERER_OPENGLSHADERSTAGE_HPP
+#endif // NAZARA_OPENGLRENDERER_OPENGLSHADERMODULE_HPP

include/Nazara/OpenGLRenderer/OpenGLVaoCache.hpp

@@ -70,4 +70,4 @@ namespace Nz::GL
 
 #include <Nazara/OpenGLRenderer/OpenGLVaoCache.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLVAOCACHE_HPP

include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp

@@ -36,4 +36,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLWINDOWFRAMEBUFFER_HPP

include/Nazara/Platform/Icon.inl

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

include/Nazara/Renderer/RenderWindow.inl

@@ -4,6 +4,7 @@
 
 #include <Nazara/Renderer/RenderWindow.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
+#include <Nazara/Renderer/Debug.hpp>
 
 namespace Nz
 {
@@ -57,3 +58,5 @@ namespace Nz
 		m_framerateLimit = limit;
 	}
 }
+
+#include <Nazara/Renderer/DebugOff.hpp>

include/Nazara/Renderer/ShaderModule.hpp

@@ -21,4 +21,4 @@ namespace Nz
 	};
 }
 
-#endif // NAZARA_RENDERER_SHADERSTAGE_HPP
+#endif // NAZARA_RENDERER_SHADERMODULE_HPP

include/Nazara/Shader/Ast/Enums.hpp

@@ -144,4 +144,4 @@ namespace Nz
 	}
 }
 
-#endif // NAZARA_SHADER_ENUMS_HPP
+#endif // NAZARA_SHADER_AST_ENUMS_HPP

include/Nazara/Shader/Ast/ExpressionType.hpp

@@ -106,4 +106,4 @@ namespace Nz::ShaderAst
 
 #include <Nazara/Shader/Ast/ExpressionType.inl>
 
-#endif
+#endif // NAZARA_SHADER_AST_EXPRESSIONTYPE_HPP

include/Nazara/Shader/Ast/Nodes.hpp

@@ -369,4 +369,4 @@ namespace Nz::ShaderAst
 
 #include <Nazara/Shader/Ast/Nodes.inl>
 
-#endif
+#endif // NAZARA_SHADER_AST_NODES_HPP

include/Nazara/Utility/Buffer.inl

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

include/Nazara/Utility/Formats/MTLParser.inl

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

include/Nazara/Utility/IndexBuffer.inl

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

include/Nazara/Utility/IndexIterator.inl

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Utility/IndexIterator.hpp>
 #include <Nazara/Utility/IndexMapper.hpp>
 #include <iterator>
 #include <Nazara/Utility/Debug.hpp>
@@ -172,4 +173,4 @@ namespace std
 	};
 }
 
-#include <Nazara/Core/DebugOff.hpp>
+#include <Nazara/Utility/DebugOff.hpp>

include/Nazara/Utility/Skeleton.inl

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

include/Nazara/Utility/StaticMesh.inl

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

include/Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp

@@ -55,4 +55,4 @@ namespace Nz
 
 #include <Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.inl>
 
-#endif
+#endif // NAZARA_VULKANRENDERER_VULKANDESCRIPTORSETLAYOUTCACHE_HPP

include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp

@@ -66,4 +66,4 @@ namespace Nz
 
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.inl>
 
-#endif // NAZARA_VULKANRENDERER_VULKANRENDERPIPELINE_HPP
+#endif // NAZARA_VULKANRENDERER_VULKANRENDERPIPELINELAYOUT_HPP

include/Nazara/Widgets/BaseWidget.inl

@@ -6,6 +6,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <limits>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {
@@ -274,3 +275,5 @@ namespace Nz
 		m_canvasIndex = index;
 	}
 }
+
+#include <Nazara/Widgets/DebugOff.hpp>

include/Nazara/Widgets/ButtonWidget.inl

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Widgets/ButtonWidget.hpp>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {
@@ -69,3 +70,5 @@ namespace Nz
 		Layout();
 	}
 }
+
+#include <Nazara/Widgets/DebugOff.hpp>

include/Nazara/Widgets/LabelWidget.inl

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Widgets/LabelWidget.hpp>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {
@@ -15,3 +16,5 @@ namespace Nz
 		SetPreferredSize(size);
 	}
 }
+
+#include <Nazara/Widgets/DebugOff.hpp>

src/Nazara/Audio/Formats/libflacLoader.cpp

@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Audio module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Audio/Formats/libvorbisLoader.hpp>
+#include <Nazara/Audio/Formats/libflacLoader.hpp>
 #include <Nazara/Audio/Algorithm.hpp>
 #include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Audio/Config.hpp>

src/Nazara/Audio/SoundStream.cpp

@@ -4,6 +4,7 @@
 
 #include <Nazara/Audio/SoundStream.hpp>
 #include <Nazara/Audio/Audio.hpp>
+#include <Nazara/Audio/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Physics2D/Arbiter2D.cpp

@@ -4,7 +4,7 @@
 
 #include <Nazara/Physics2D/Arbiter2D.hpp>
 #include <chipmunk/chipmunk.h>
-#include <Nazara/Physics3D/Debug.hpp>
+#include <Nazara/Physics2D/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Physics2D/RigidBody2D.cpp

@@ -9,7 +9,7 @@
 #include <chipmunk/chipmunk_private.h>
 #include <algorithm>
 #include <cmath>
-#include <Nazara/Physics3D/Debug.hpp>
+#include <Nazara/Physics2D/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Platform/SDL2/IconImpl.cpp

@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Platform module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Platform/SDL2/IconImpl.hpp>
 #include <Nazara/Platform/Debug.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/Platform/SDL2/IconImpl.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
 

src/Nazara/Platform/SDL2/SDLHelper.cpp

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

src/Nazara/Platform/SDL2/VideoModeImpl.cpp

@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - Platform module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Platform/SDL2/VideoModeImpl.hpp>
 #include <algorithm>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Platform/Debug.hpp>
-#include <Nazara/Platform/SDL2/VideoModeImpl.hpp>
 #include <Nazara/Platform/VideoMode.hpp>
 #include <SDL2/SDL_video.h>
 

src/Nazara/Platform/SDL2/WindowImpl.cpp

@@ -19,6 +19,7 @@
 #include <Utfcpp/utf8.h>
 #include <cstdio>
 #include <memory>
+#include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Shader/SpirvData.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <Nazara/Shader/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Utility/Formats/OBJSaver.cpp

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Utility/Formats/OBJSaver.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Utility/Mesh.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>

src/Nazara/Utility/Formats/STBSaver.cpp

@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Utility module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Utility/Formats/STBSaver.hpp>
 #include <Nazara/Utility/Formats/STBLoader.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>

src/Nazara/Widgets/BaseWidget.cpp

@@ -9,6 +9,7 @@
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
 #include <algorithm>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Widgets/ButtonWidget.cpp

@@ -7,6 +7,7 @@
 #include <Nazara/Widgets/ButtonWidget.hpp>
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Widgets/Canvas.cpp

@@ -4,6 +4,7 @@
 
 #include <Nazara/Widgets/Canvas.hpp>
 #include <limits>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {

src/Nazara/Widgets/LabelWidget.cpp

@@ -8,6 +8,7 @@
 #include <Nazara/Graphics/MaterialPass.hpp>
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {