diff --git a/include/Nazara/Core/ByteArray.inl b/include/Nazara/Core/ByteArray.inl
index 706632896..ffbd2d694 100644
--- a/include/Nazara/Core/ByteArray.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/ByteStream.inl b/include/Nazara/Core/ByteStream.inl
index a128488f1..183b5fa2d 100644
--- a/include/Nazara/Core/ByteStream.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/CallOnExit.inl b/include/Nazara/Core/CallOnExit.inl
index eb7e284d2..8ddaf5a61 100644
--- a/include/Nazara/Core/CallOnExit.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/Endianness.inl b/include/Nazara/Core/Endianness.inl
index e51d77139..c2eba0068 100644
--- a/include/Nazara/Core/Endianness.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/File.inl b/include/Nazara/Core/File.inl
index 82ccc153e..d25f04eeb 100644
--- a/include/Nazara/Core/File.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/Functor.inl b/include/Nazara/Core/Functor.inl
index a95269218..578e60611 100644
--- a/include/Nazara/Core/Functor.inl
+++ b/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>
diff --git a/include/Nazara/Core/HandledObject.inl b/include/Nazara/Core/HandledObject.inl
index a89b83e36..277804644 100644
--- a/include/Nazara/Core/HandledObject.inl
+++ b/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>
diff --git a/include/Nazara/Core/Initializer.inl b/include/Nazara/Core/Initializer.inl
index f6192d15d..19ba89b28 100644
--- a/include/Nazara/Core/Initializer.inl
+++ b/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
diff --git a/include/Nazara/Core/MemoryStream.inl b/include/Nazara/Core/MemoryStream.inl
index a2a6fb7ab..12f952e3a 100644
--- a/include/Nazara/Core/MemoryStream.inl
+++ b/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>
 
diff --git a/include/Nazara/Core/MovablePtr.inl b/include/Nazara/Core/MovablePtr.inl
index 51024f2dc..2e88b5c81 100644
--- a/include/Nazara/Core/MovablePtr.inl
+++ b/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>
diff --git a/include/Nazara/Core/MovableValue.inl b/include/Nazara/Core/MovableValue.inl
index 5742b78d5..57a49c64f 100644
--- a/include/Nazara/Core/MovableValue.inl
+++ b/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>
diff --git a/include/Nazara/Core/ObjectHandle.inl b/include/Nazara/Core/ObjectHandle.inl
index 18845c97a..79047702c 100644
--- a/include/Nazara/Core/ObjectHandle.inl
+++ b/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>
diff --git a/include/Nazara/Core/ParameterList.inl b/include/Nazara/Core/ParameterList.inl
index cb96c8a9b..4637a401c 100644
--- a/include/Nazara/Core/ParameterList.inl
+++ b/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
diff --git a/include/Nazara/Core/Primitive.inl b/include/Nazara/Core/Primitive.inl
index aff4825dc..745e55547 100644
--- a/include/Nazara/Core/Primitive.inl
+++ b/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
diff --git a/include/Nazara/Core/ResourceLoader.inl b/include/Nazara/Core/ResourceLoader.inl
index 0b1d7a793..810924e74 100644
--- a/include/Nazara/Core/ResourceLoader.inl
+++ b/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>
diff --git a/include/Nazara/Core/ResourceManager.inl b/include/Nazara/Core/ResourceManager.inl
index 8fec99235..fdb20c092 100644
--- a/include/Nazara/Core/ResourceManager.inl
+++ b/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>
diff --git a/include/Nazara/Core/ResourceSaver.inl b/include/Nazara/Core/ResourceSaver.inl
index 0fc0e4f08..d6d05b3d7 100644
--- a/include/Nazara/Core/ResourceSaver.inl
+++ b/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>
diff --git a/include/Nazara/Core/SerializationContext.inl b/include/Nazara/Core/SerializationContext.inl
index 725a95993..37c2dcba1 100644
--- a/include/Nazara/Core/SerializationContext.inl
+++ b/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
diff --git a/include/Nazara/Core/Stream.inl b/include/Nazara/Core/Stream.inl
index b8a5eabd1..405414942 100644
--- a/include/Nazara/Core/Stream.inl
+++ b/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>
diff --git a/include/Nazara/Core/TaskScheduler.inl b/include/Nazara/Core/TaskScheduler.inl
index bf032fc74..0329d5e11 100644
--- a/include/Nazara/Core/TaskScheduler.inl
+++ b/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
diff --git a/include/Nazara/Graphics/Camera.inl b/include/Nazara/Graphics/Camera.inl
index 8c0b1ee0a..d2ab600d3 100644
--- a/include/Nazara/Graphics/Camera.inl
+++ b/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>
 
diff --git a/include/Nazara/Graphics/MaterialPipeline.inl b/include/Nazara/Graphics/MaterialPipeline.inl
index dc8b9ce78..cd4a062d0 100644
--- a/include/Nazara/Graphics/MaterialPipeline.inl
+++ b/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>
diff --git a/include/Nazara/Graphics/PredefinedShaderStructs.inl b/include/Nazara/Graphics/PredefinedShaderStructs.inl
index 408ce6d41..80e59df73 100644
--- a/include/Nazara/Graphics/PredefinedShaderStructs.inl
+++ b/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>
diff --git a/include/Nazara/Graphics/RenderElement.inl b/include/Nazara/Graphics/RenderElement.inl
index a54e4b2bc..f14d98031 100644
--- a/include/Nazara/Graphics/RenderElement.inl
+++ b/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>
diff --git a/include/Nazara/Graphics/RenderQueue.inl b/include/Nazara/Graphics/RenderQueue.inl
index 5f61a8526..4c59c4fcf 100644
--- a/include/Nazara/Graphics/RenderQueue.inl
+++ b/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>
diff --git a/include/Nazara/Math/Algorithm.inl b/include/Nazara/Math/Algorithm.inl
index 08c316909..aed80993c 100644
--- a/include/Nazara/Math/Algorithm.inl
+++ b/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>
diff --git a/include/Nazara/Math/BoundingVolume.inl b/include/Nazara/Math/BoundingVolume.inl
index 4bf276a9d..7dad91f7b 100644
--- a/include/Nazara/Math/BoundingVolume.inl
+++ b/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>
diff --git a/include/Nazara/Math/Box.inl b/include/Nazara/Math/Box.inl
index 4dc9e54e8..60b30ed88 100644
--- a/include/Nazara/Math/Box.inl
+++ b/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>
diff --git a/include/Nazara/Math/Frustum.inl b/include/Nazara/Math/Frustum.inl
index 5b35488db..1e388f1b3 100644
--- a/include/Nazara/Math/Frustum.inl
+++ b/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>
diff --git a/include/Nazara/Math/Matrix4.inl b/include/Nazara/Math/Matrix4.inl
index abff3682b..a184db9ac 100644
--- a/include/Nazara/Math/Matrix4.inl
+++ b/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>
diff --git a/include/Nazara/Math/OrientedBox.inl b/include/Nazara/Math/OrientedBox.inl
index a1fb945b2..263a18df5 100644
--- a/include/Nazara/Math/OrientedBox.inl
+++ b/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>
diff --git a/include/Nazara/Math/PidController.inl b/include/Nazara/Math/PidController.inl
index 5defb3c14..fe3a26fc3 100644
--- a/include/Nazara/Math/PidController.inl
+++ b/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>
diff --git a/include/Nazara/Math/Plane.inl b/include/Nazara/Math/Plane.inl
index bc8668240..1c0263125 100644
--- a/include/Nazara/Math/Plane.inl
+++ b/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>
diff --git a/include/Nazara/Math/Ray.inl b/include/Nazara/Math/Ray.inl
index 491897f41..fe0aeda3d 100644
--- a/include/Nazara/Math/Ray.inl
+++ b/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>
diff --git a/include/Nazara/Math/Rect.inl b/include/Nazara/Math/Rect.inl
index 429b3fb36..89a8ceff0 100644
--- a/include/Nazara/Math/Rect.inl
+++ b/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>
diff --git a/include/Nazara/Math/Sphere.inl b/include/Nazara/Math/Sphere.inl
index f985b4a41..2565a4e89 100644
--- a/include/Nazara/Math/Sphere.inl
+++ b/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>
diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl
index 4d280aee9..cf88b7770 100644
--- a/include/Nazara/Math/Vector2.inl
+++ b/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>
diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl
index d485bc506..be6a5d77f 100644
--- a/include/Nazara/Math/Vector3.inl
+++ b/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>
diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl
index 583f2fa26..e9da302d8 100644
--- a/include/Nazara/Math/Vector4.inl
+++ b/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>
diff --git a/include/Nazara/Network/AbstractSocket.inl b/include/Nazara/Network/AbstractSocket.inl
index 4039fe8a5..7d40d6409 100644
--- a/include/Nazara/Network/AbstractSocket.inl
+++ b/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
diff --git a/include/Nazara/Network/IpAddress.inl b/include/Nazara/Network/IpAddress.inl
index 97aca6bd7..0f6b5d5e5 100644
--- a/include/Nazara/Network/IpAddress.inl
+++ b/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>
diff --git a/include/Nazara/Network/NetPacket.inl b/include/Nazara/Network/NetPacket.inl
index adca9975c..923ac67c3 100644
--- a/include/Nazara/Network/NetPacket.inl
+++ b/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>
diff --git a/include/Nazara/Network/SocketPoller.inl b/include/Nazara/Network/SocketPoller.inl
index 86884209c..059654b35 100644
--- a/include/Nazara/Network/SocketPoller.inl
+++ b/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
diff --git a/include/Nazara/Network/TcpClient.inl b/include/Nazara/Network/TcpClient.inl
index c6cea4912..d86d16a01 100644
--- a/include/Nazara/Network/TcpClient.inl
+++ b/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
diff --git a/include/Nazara/Network/TcpServer.inl b/include/Nazara/Network/TcpServer.inl
index e6c9972b3..2e772e87d 100644
--- a/include/Nazara/Network/TcpServer.inl
+++ b/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>
 
diff --git a/include/Nazara/Network/UdpSocket.inl b/include/Nazara/Network/UdpSocket.inl
index ee652c18d..d8861bc69 100644
--- a/include/Nazara/Network/UdpSocket.inl
+++ b/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
diff --git a/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp b/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
index 211d019ae..88b159834 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
@@ -61,4 +61,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLCOMMANDBUFFERBUILDER_HPP
diff --git a/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp
index 3cd5ce6ad..0f5b397e4 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp
@@ -42,4 +42,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLFBOFRAMEBUFFER_HPP
diff --git a/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.inl b/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.inl
index 697edd997..6ceef1f07 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLFboFramebuffer.inl
+++ b/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>
 
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
index 3f2ac517a..3ace2a69f 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
+++ b/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
diff --git a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp b/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
index 0cbebeeb6..043bb7af9 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
+++ b/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
diff --git a/include/Nazara/OpenGLRenderer/OpenGLVaoCache.hpp b/include/Nazara/OpenGLRenderer/OpenGLVaoCache.hpp
index e489859cc..42ceb3eea 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLVaoCache.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLVaoCache.hpp
@@ -70,4 +70,4 @@ namespace Nz::GL
 
 #include <Nazara/OpenGLRenderer/OpenGLVaoCache.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLVAOCACHE_HPP
diff --git a/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp
index 5e0b5be6b..e456ed8b9 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.hpp
@@ -36,4 +36,4 @@ namespace Nz
 
 #include <Nazara/OpenGLRenderer/OpenGLWindowFramebuffer.inl>
 
-#endif
+#endif // NAZARA_OPENGLRENDERER_OPENGLWINDOWFRAMEBUFFER_HPP
diff --git a/include/Nazara/Platform/Icon.inl b/include/Nazara/Platform/Icon.inl
index 3ac7dcb7c..55964f3bd 100644
--- a/include/Nazara/Platform/Icon.inl
+++ b/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>
 
diff --git a/include/Nazara/Renderer/RenderWindow.inl b/include/Nazara/Renderer/RenderWindow.inl
index 86869e90b..9cae3b23c 100644
--- a/include/Nazara/Renderer/RenderWindow.inl
+++ b/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>
diff --git a/include/Nazara/Renderer/ShaderModule.hpp b/include/Nazara/Renderer/ShaderModule.hpp
index fa1a2011b..b0efb69ff 100644
--- a/include/Nazara/Renderer/ShaderModule.hpp
+++ b/include/Nazara/Renderer/ShaderModule.hpp
@@ -21,4 +21,4 @@ namespace Nz
 	};
 }
 
-#endif // NAZARA_RENDERER_SHADERSTAGE_HPP
+#endif // NAZARA_RENDERER_SHADERMODULE_HPP
diff --git a/include/Nazara/Shader/Ast/Enums.hpp b/include/Nazara/Shader/Ast/Enums.hpp
index ccf5a9378..ad4775475 100644
--- a/include/Nazara/Shader/Ast/Enums.hpp
+++ b/include/Nazara/Shader/Ast/Enums.hpp
@@ -144,4 +144,4 @@ namespace Nz
 	}
 }
 
-#endif // NAZARA_SHADER_ENUMS_HPP
+#endif // NAZARA_SHADER_AST_ENUMS_HPP
diff --git a/include/Nazara/Shader/Ast/ExpressionType.hpp b/include/Nazara/Shader/Ast/ExpressionType.hpp
index 1b8c244c0..05d66a651 100644
--- a/include/Nazara/Shader/Ast/ExpressionType.hpp
+++ b/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
diff --git a/include/Nazara/Shader/Ast/Nodes.hpp b/include/Nazara/Shader/Ast/Nodes.hpp
index 86e5d7f2b..ce64848d5 100644
--- a/include/Nazara/Shader/Ast/Nodes.hpp
+++ b/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
diff --git a/include/Nazara/Utility/Buffer.inl b/include/Nazara/Utility/Buffer.inl
index 545165ef2..5f883b2f6 100644
--- a/include/Nazara/Utility/Buffer.inl
+++ b/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>
 
diff --git a/include/Nazara/Utility/Formats/MTLParser.inl b/include/Nazara/Utility/Formats/MTLParser.inl
index 9e9638b74..40ce10aa4 100644
--- a/include/Nazara/Utility/Formats/MTLParser.inl
+++ b/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>
 
diff --git a/include/Nazara/Utility/IndexBuffer.inl b/include/Nazara/Utility/IndexBuffer.inl
index 9a3d48be8..45938e004 100644
--- a/include/Nazara/Utility/IndexBuffer.inl
+++ b/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>
 
diff --git a/include/Nazara/Utility/IndexIterator.inl b/include/Nazara/Utility/IndexIterator.inl
index c6b414bfb..8a5a9daf8 100644
--- a/include/Nazara/Utility/IndexIterator.inl
+++ b/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>
diff --git a/include/Nazara/Utility/Skeleton.inl b/include/Nazara/Utility/Skeleton.inl
index 85d7ca6d4..795042e1e 100644
--- a/include/Nazara/Utility/Skeleton.inl
+++ b/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>
 
diff --git a/include/Nazara/Utility/StaticMesh.inl b/include/Nazara/Utility/StaticMesh.inl
index 85d7ca6d4..cf0c98fe8 100644
--- a/include/Nazara/Utility/StaticMesh.inl
+++ b/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>
 
diff --git a/include/Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp b/include/Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp
index e7aef9350..2212d0495 100644
--- a/include/Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp
@@ -55,4 +55,4 @@ namespace Nz
 
 #include <Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.inl>
 
-#endif
+#endif // NAZARA_VULKANRENDERER_VULKANDESCRIPTORSETLAYOUTCACHE_HPP
diff --git a/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp b/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
index 1345cf52e..ecd30e935 100644
--- a/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
+++ b/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
diff --git a/include/Nazara/Widgets/BaseWidget.inl b/include/Nazara/Widgets/BaseWidget.inl
index 179f6e737..22365e69e 100644
--- a/include/Nazara/Widgets/BaseWidget.inl
+++ b/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>
diff --git a/include/Nazara/Widgets/ButtonWidget.inl b/include/Nazara/Widgets/ButtonWidget.inl
index e305e6007..c98adbf09 100644
--- a/include/Nazara/Widgets/ButtonWidget.inl
+++ b/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>
diff --git a/include/Nazara/Widgets/LabelWidget.inl b/include/Nazara/Widgets/LabelWidget.inl
index f1b336b84..2d2cf9a1c 100644
--- a/include/Nazara/Widgets/LabelWidget.inl
+++ b/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>
diff --git a/src/Nazara/Audio/Formats/libflacLoader.cpp b/src/Nazara/Audio/Formats/libflacLoader.cpp
index fd0368ca6..b5c9374ee 100644
--- a/src/Nazara/Audio/Formats/libflacLoader.cpp
+++ b/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>
diff --git a/src/Nazara/Audio/SoundStream.cpp b/src/Nazara/Audio/SoundStream.cpp
index b1c4f27a4..ee317ae9b 100644
--- a/src/Nazara/Audio/SoundStream.cpp
+++ b/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
 {
diff --git a/src/Nazara/Physics2D/Arbiter2D.cpp b/src/Nazara/Physics2D/Arbiter2D.cpp
index 36bdd7d49..e3444076e 100644
--- a/src/Nazara/Physics2D/Arbiter2D.cpp
+++ b/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
 {
diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp
index c97b2e46d..57cc09e91 100644
--- a/src/Nazara/Physics2D/RigidBody2D.cpp
+++ b/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
 {
diff --git a/src/Nazara/Platform/SDL2/IconImpl.cpp b/src/Nazara/Platform/SDL2/IconImpl.cpp
index 751b52e10..7bd4a138c 100644
--- a/src/Nazara/Platform/SDL2/IconImpl.cpp
+++ b/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>
 
diff --git a/src/Nazara/Platform/SDL2/SDLHelper.cpp b/src/Nazara/Platform/SDL2/SDLHelper.cpp
index 08af940c3..faa664ac1 100644
--- a/src/Nazara/Platform/SDL2/SDLHelper.cpp
+++ b/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
 {
diff --git a/src/Nazara/Platform/SDL2/VideoModeImpl.cpp b/src/Nazara/Platform/SDL2/VideoModeImpl.cpp
index 5b7d38e59..33b578c68 100644
--- a/src/Nazara/Platform/SDL2/VideoModeImpl.cpp
+++ b/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>
 
diff --git a/src/Nazara/Platform/SDL2/WindowImpl.cpp b/src/Nazara/Platform/SDL2/WindowImpl.cpp
index 1588194bf..c5f07586c 100644
--- a/src/Nazara/Platform/SDL2/WindowImpl.cpp
+++ b/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
 {
diff --git a/src/Nazara/Shader/SpirvData.cpp b/src/Nazara/Shader/SpirvData.cpp
index 71fb78225..756b0f128 100644
--- a/src/Nazara/Shader/SpirvData.cpp
+++ b/src/Nazara/Shader/SpirvData.cpp
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <Nazara/Shader/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Utility/Formats/OBJSaver.cpp b/src/Nazara/Utility/Formats/OBJSaver.cpp
index 0b2d1170d..38c4ad907 100644
--- a/src/Nazara/Utility/Formats/OBJSaver.cpp
+++ b/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>
diff --git a/src/Nazara/Utility/Formats/STBSaver.cpp b/src/Nazara/Utility/Formats/STBSaver.cpp
index 5ea6e8a50..a274617d1 100644
--- a/src/Nazara/Utility/Formats/STBSaver.cpp
+++ b/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>
diff --git a/src/Nazara/Widgets/BaseWidget.cpp b/src/Nazara/Widgets/BaseWidget.cpp
index 40cc8161a..44e8222e5 100644
--- a/src/Nazara/Widgets/BaseWidget.cpp
+++ b/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
 {
diff --git a/src/Nazara/Widgets/ButtonWidget.cpp b/src/Nazara/Widgets/ButtonWidget.cpp
index a96009119..4b25990dc 100644
--- a/src/Nazara/Widgets/ButtonWidget.cpp
+++ b/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
 {
diff --git a/src/Nazara/Widgets/Canvas.cpp b/src/Nazara/Widgets/Canvas.cpp
index ce4b3c38e..961cfbf72 100644
--- a/src/Nazara/Widgets/Canvas.cpp
+++ b/src/Nazara/Widgets/Canvas.cpp
@@ -4,6 +4,7 @@
 
 #include <Nazara/Widgets/Canvas.hpp>
 #include <limits>
+#include <Nazara/Widgets/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Widgets/LabelWidget.cpp b/src/Nazara/Widgets/LabelWidget.cpp
index 461cfe6bc..ef9362486 100644
--- a/src/Nazara/Widgets/LabelWidget.cpp
+++ b/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
 {