From a02b1952c0adfdf81bb7cf850944664d1e2ccffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Thu, 28 Oct 2021 09:53:56 +0200
Subject: [PATCH] Apply header order fix

---
 include/Nazara/Core/Core.hpp                                | 2 +-
 include/Nazara/Core/MemoryPool.inl                          | 2 +-
 include/Nazara/Graphics/Camera.inl                          | 2 ++
 include/Nazara/Graphics/Components/CameraComponent.inl      | 2 ++
 include/Nazara/Graphics/Components/GraphicsComponent.inl    | 2 ++
 include/Nazara/Graphics/FrameGraph.hpp                      | 2 +-
 include/Nazara/Graphics/FramePass.hpp                       | 2 +-
 include/Nazara/Graphics/Graphics.hpp                        | 2 +-
 include/Nazara/Graphics/ViewerInstance.hpp                  | 2 +-
 include/Nazara/Graphics/WorldInstance.hpp                   | 2 +-
 include/Nazara/Network/ENetProtocol.inl                     | 2 ++
 include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp              | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp       | 4 ++--
 .../Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp    | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLCommandPool.hpp         | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLDevice.hpp              | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp         | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp         | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLRenderPass.hpp          | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp      | 2 +-
 .../Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp    | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLRenderer.hpp            | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp        | 4 ++--
 include/Nazara/OpenGLRenderer/OpenGLTexture.hpp             | 2 +-
 include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp      | 2 +-
 include/Nazara/OpenGLRenderer/Utils.hpp                     | 2 +-
 .../Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp    | 2 +-
 include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp            | 2 +-
 include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp    | 4 ++--
 include/Nazara/Physics2D/RigidBody2D.hpp                    | 2 +-
 include/Nazara/Physics3D/RigidBody3D.hpp                    | 2 +-
 include/Nazara/Platform/Platform.hpp                        | 2 +-
 include/Nazara/Renderer/CommandPool.hpp                     | 2 +-
 include/Nazara/Renderer/RenderDevice.hpp                    | 2 +-
 include/Nazara/Renderer/RenderPassCache.hpp                 | 2 +-
 include/Nazara/Renderer/RenderWindow.hpp                    | 2 +-
 include/Nazara/Renderer/Texture.hpp                         | 2 +-
 include/Nazara/Shader/Ast/AstCloner.hpp                     | 2 +-
 include/Nazara/Shader/Ast/AstUtils.hpp                      | 2 +-
 include/Nazara/Shader/Ast/ExpressionType.hpp                | 2 +-
 include/Nazara/Shader/Ast/Nodes.hpp                         | 2 +-
 include/Nazara/Shader/SpirvConstantCache.hpp                | 6 +++---
 include/Nazara/Shader/SpirvSectionBase.hpp                  | 2 +-
 include/Nazara/Shader/SpirvWriter.hpp                       | 4 ++--
 include/Nazara/Utility/Formats/MD5AnimParser.hpp            | 2 +-
 include/Nazara/Utility/Image.hpp                            | 2 +-
 include/Nazara/Utility/Mesh.inl                             | 2 +-
 include/Nazara/Utility/PixelFormat.inl                      | 2 +-
 .../Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp    | 2 +-
 include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp        | 4 ++--
 include/Nazara/VulkanRenderer/VulkanShaderModule.hpp        | 2 +-
 include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl      | 2 +-
 include/Nazara/VulkanRenderer/Wrapper/Surface.hpp           | 2 +-
 include/Nazara/Widgets/Widgets.hpp                          | 2 +-
 src/Nazara/Audio/Formats/libflacLoader.cpp                  | 2 +-
 src/Nazara/Core/Posix/FileImpl.cpp                          | 2 +-
 src/Nazara/Core/Posix/TaskSchedulerImpl.hpp                 | 2 +-
 src/Nazara/Core/StringExt.cpp                               | 2 +-
 src/Nazara/Graphics/FrameGraph.cpp                          | 2 +-
 src/Nazara/Graphics/MaterialPass.cpp                        | 2 +-
 src/Nazara/Network/AlgorithmNetwork.cpp                     | 2 +-
 src/Nazara/Network/Posix/SocketImpl.cpp                     | 6 +++---
 src/Nazara/Network/Posix/SocketImpl.hpp                     | 2 +-
 src/Nazara/Network/TcpClient.cpp                            | 2 +-
 src/Nazara/Network/Win32/IpAddressImpl.hpp                  | 2 +-
 src/Nazara/Network/Win32/SocketPollerImpl.hpp               | 2 +-
 src/Nazara/OpenGLRenderer/OpenGLDevice.cpp                  | 2 +-
 src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp          | 2 +-
 src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp                | 4 ++--
 src/Nazara/Physics2D/Collider2D.cpp                         | 2 +-
 src/Nazara/Physics2D/PhysWorld2D.cpp                        | 2 +-
 src/Nazara/Physics3D/Physics3D.cpp                          | 2 +-
 src/Nazara/Platform/SDL2/IconImpl.cpp                       | 2 +-
 src/Nazara/Platform/SDL2/InputImpl.cpp                      | 4 ++--
 src/Nazara/Platform/SDL2/VideoModeImpl.cpp                  | 4 ++--
 src/Nazara/Platform/SDL2/WindowImpl.cpp                     | 2 --
 src/Nazara/Platform/SDL2/WindowImpl.hpp                     | 2 +-
 src/Nazara/Platform/VideoMode.cpp                           | 2 +-
 src/Nazara/Shader/Ast/SanitizeVisitor.cpp                   | 2 +-
 src/Nazara/Shader/SpirvAstVisitor.cpp                       | 2 +-
 src/Nazara/Shader/SpirvWriter.cpp                           | 2 +-
 src/Nazara/Utility/AlgorithmUtility.cpp                     | 4 ++--
 src/Nazara/Utility/Animation.cpp                            | 2 +-
 src/Nazara/Utility/Formats/MD5AnimLoader.cpp                | 2 +-
 src/Nazara/Utility/Formats/STBSaver.cpp                     | 2 +-
 src/Nazara/VulkanRenderer/Utils_VulkanRenderer.cpp          | 2 +-
 src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp    | 4 ++--
 src/Nazara/VulkanRenderer/VulkanRenderImage.cpp             | 2 +-
 src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp    | 2 +-
 src/Nazara/VulkanRenderer/VulkanRenderer.cpp                | 2 +-
 src/Nazara/VulkanRenderer/VulkanTexture.cpp                 | 2 +-
 src/Nazara/VulkanRenderer/Wrapper/Instance.cpp              | 2 +-
 src/Nazara/Widgets/BaseWidget.cpp                           | 2 +-
 93 files changed, 110 insertions(+), 104 deletions(-)

diff --git a/include/Nazara/Core/Core.hpp b/include/Nazara/Core/Core.hpp
index 8db72d173..467e60329 100644
--- a/include/Nazara/Core/Core.hpp
+++ b/include/Nazara/Core/Core.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_CORE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/Modules.hpp>
 #include <Nazara/Core/ModuleBase.hpp>
+#include <Nazara/Core/Modules.hpp>
 #include <Nazara/Core/TypeList.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Core/MemoryPool.inl b/include/Nazara/Core/MemoryPool.inl
index 8b5663cad..d395aa1f6 100644
--- a/include/Nazara/Core/MemoryPool.inl
+++ b/include/Nazara/Core/MemoryPool.inl
@@ -4,8 +4,8 @@
 
 #include <Nazara/Core/MemoryPool.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
-#include <utility>
 #include <stdexcept>
+#include <utility>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Graphics/Camera.inl b/include/Nazara/Graphics/Camera.inl
index d2ab600d3..0aebd05d4 100644
--- a/include/Nazara/Graphics/Camera.inl
+++ b/include/Nazara/Graphics/Camera.inl
@@ -201,3 +201,5 @@ namespace Nz
 		UpdateProjectionMatrix();
 	}
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>
diff --git a/include/Nazara/Graphics/Components/CameraComponent.inl b/include/Nazara/Graphics/Components/CameraComponent.inl
index 72cc206ef..8756817a6 100644
--- a/include/Nazara/Graphics/Components/CameraComponent.inl
+++ b/include/Nazara/Graphics/Components/CameraComponent.inl
@@ -8,3 +8,5 @@
 namespace Nz
 {
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>
diff --git a/include/Nazara/Graphics/Components/GraphicsComponent.inl b/include/Nazara/Graphics/Components/GraphicsComponent.inl
index a738eed5f..c1dcffffc 100644
--- a/include/Nazara/Graphics/Components/GraphicsComponent.inl
+++ b/include/Nazara/Graphics/Components/GraphicsComponent.inl
@@ -40,3 +40,5 @@ namespace Nz
 		return m_worldInstance;
 	}
 }
+
+#include <Nazara/Graphics/DebugOff.hpp>
diff --git a/include/Nazara/Graphics/FrameGraph.hpp b/include/Nazara/Graphics/FrameGraph.hpp
index b250b1ffc..b594414b2 100644
--- a/include/Nazara/Graphics/FrameGraph.hpp
+++ b/include/Nazara/Graphics/FrameGraph.hpp
@@ -16,9 +16,9 @@
 #include <Nazara/Renderer/RenderPass.hpp>
 #include <optional>
 #include <string>
-#include <vector>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 namespace Nz
 {
diff --git a/include/Nazara/Graphics/FramePass.hpp b/include/Nazara/Graphics/FramePass.hpp
index 2766d6ead..638a73bf7 100644
--- a/include/Nazara/Graphics/FramePass.hpp
+++ b/include/Nazara/Graphics/FramePass.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
-#include <Nazara/Math/Rect.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/FramePassAttachment.hpp>
+#include <Nazara/Math/Rect.hpp>
 #include <functional>
 #include <limits>
 #include <optional>
diff --git a/include/Nazara/Graphics/Graphics.hpp b/include/Nazara/Graphics/Graphics.hpp
index 90f6045fe..f08ece840 100644
--- a/include/Nazara/Graphics/Graphics.hpp
+++ b/include/Nazara/Graphics/Graphics.hpp
@@ -11,10 +11,10 @@
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/MaterialPassRegistry.hpp>
 #include <Nazara/Graphics/TextureSamplerCache.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/RenderPassCache.hpp>
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
+#include <Nazara/Renderer/Renderer.hpp>
 #include <optional>
 
 namespace Nz
diff --git a/include/Nazara/Graphics/ViewerInstance.hpp b/include/Nazara/Graphics/ViewerInstance.hpp
index 07a60c7e4..66e249e60 100644
--- a/include/Nazara/Graphics/ViewerInstance.hpp
+++ b/include/Nazara/Graphics/ViewerInstance.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_GRAPHICS_VIEWERINSTANCE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Graphics/Config.hpp>
+#include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Renderer/ShaderBinding.hpp>
 #include <memory>
 
diff --git a/include/Nazara/Graphics/WorldInstance.hpp b/include/Nazara/Graphics/WorldInstance.hpp
index dc1901625..9a65ef89c 100644
--- a/include/Nazara/Graphics/WorldInstance.hpp
+++ b/include/Nazara/Graphics/WorldInstance.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_GRAPHICS_WORLDINSTANCE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Graphics/Config.hpp>
+#include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Renderer/ShaderBinding.hpp>
 #include <memory>
 
diff --git a/include/Nazara/Network/ENetProtocol.inl b/include/Nazara/Network/ENetProtocol.inl
index 4b482f521..8c2c7f3cc 100644
--- a/include/Nazara/Network/ENetProtocol.inl
+++ b/include/Nazara/Network/ENetProtocol.inl
@@ -32,3 +32,5 @@ namespace Nz
 		return !ENetTimeLess(a, b);
 	}
 }
+
+#include <Nazara/Network/DebugOff.hpp>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp
index ded9beb0f..04f05fcdc 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLBuffer.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_OPENGLRENDERER_OPENGLBUFFER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Utility/AbstractBuffer.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLDevice.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Buffer.hpp>
+#include <Nazara/Utility/AbstractBuffer.hpp>
 #include <memory>
 #include <vector>
 
diff --git a/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp
index 2d3335051..e40d9a49f 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp
@@ -10,12 +10,12 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <Nazara/Renderer/CommandBuffer.hpp>
-#include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLBuffer.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp>
+#include <Nazara/Renderer/CommandBuffer.hpp>
+#include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <optional>
 #include <variant>
 #include <vector>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp b/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
index 88b159834..034a34ad8 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLCommandBufferBuilder.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_OPENGLRENDERER_OPENGLCOMMANDBUFFERBUILDER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/CommandBufferBuilder.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
+#include <Nazara/Renderer/CommandBufferBuilder.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/OpenGLRenderer/OpenGLCommandPool.hpp b/include/Nazara/OpenGLRenderer/OpenGLCommandPool.hpp
index 5f5309ebd..2dfa77c39 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLCommandPool.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLCommandPool.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Bitset.hpp>
-#include <Nazara/Renderer/CommandPool.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLCommandBuffer.hpp>
+#include <Nazara/Renderer/CommandPool.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp b/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp
index 41f953356..ea1bc1562 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLDevice.hpp
@@ -8,9 +8,9 @@
 #define NAZARA_OPENGLRENDERER_OPENGLDEVICE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/RenderDeviceInfo.hpp>
 #include <unordered_set>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp b/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp
index 67629ce2a..f16570eef 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLFramebuffer.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_OPENGLRENDERER_OPENGLFRAMEBUFFER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/Framebuffer.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
+#include <Nazara/Renderer/Framebuffer.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp
index 3058dd53b..9b9443f67 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderImage.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_OPENGLRENDERER_OPENGLRENDERIMAGE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/RenderImage.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLUploadPool.hpp>
+#include <Nazara/Renderer/RenderImage.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderPass.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderPass.hpp
index 8cbe618e8..ccc4b8486 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderPass.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderPass.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_OPENGLRENDERER_OPENGLRENDERPASS_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/RenderPass.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
+#include <Nazara/Renderer/RenderPass.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp
index 7dbd58f48..213882c5f 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
-#include <Nazara/Renderer/RenderPipeline.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Program.hpp>
+#include <Nazara/Renderer/RenderPipeline.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
index 3ace2a69f..7847e4914 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
@@ -9,11 +9,11 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Bitset.hpp>
-#include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLShaderBinding.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp>
+#include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
 #include <memory>
 #include <type_traits>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderer.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderer.hpp
index c15527ed7..4df65a042 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderer.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderer.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_OPENGLRENDERER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/RendererImpl.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLDevice.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
+#include <Nazara/Renderer/RendererImpl.hpp>
 #include <memory>
 
 namespace Nz
diff --git a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp b/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
index 043bb7af9..883cc7c1b 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLShaderModule.hpp
@@ -8,11 +8,11 @@
 #define NAZARA_OPENGLRENDERER_OPENGLSHADERMODULE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Renderer/ShaderModule.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Program.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Shader.hpp>
+#include <Nazara/Renderer/Enums.hpp>
+#include <Nazara/Renderer/ShaderModule.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
 #include <Nazara/Shader/Ast/Nodes.hpp>
 #include <vector>
diff --git a/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp b/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp
index 06e8e3ac8..872547fc4 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLTexture.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_OPENGLRENDERER_OPENGLTEXTURE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Texture.hpp>
+#include <Nazara/Renderer/Texture.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp b/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp
index f25f7af0d..b0974caa1 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp
@@ -8,9 +8,9 @@
 #define NAZARA_OPENGLRENDERER_OPENGLTEXTURESAMPLER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/TextureSampler.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Sampler.hpp>
+#include <Nazara/Renderer/TextureSampler.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/OpenGLRenderer/Utils.hpp b/include/Nazara/OpenGLRenderer/Utils.hpp
index 39772372e..60ba7c2cc 100644
--- a/include/Nazara/OpenGLRenderer/Utils.hpp
+++ b/include/Nazara/OpenGLRenderer/Utils.hpp
@@ -8,9 +8,9 @@
 #define NAZARA_OPENGLRENDERER_UTILS_HPP
 
 #include <Nazara/Prerequisites.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Utility/Enums.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <optional>
 #include <string>
 
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp
index 3cfb331f7..8995af901 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/EGL/EGLContextBase.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
-#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <string>
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp
index 218afe43e..024e4f2d6 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/Loader.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_OPENGLRENDERER_WRAPPER_LOADER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <memory>
 
 namespace Nz
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
index 68ebfa1ac..bd9cdc9a3 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
@@ -9,11 +9,11 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
-#include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/OpenGLRenderer/Config.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp>
+#include <Nazara/Platform/WindowHandle.hpp>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
diff --git a/include/Nazara/Physics2D/RigidBody2D.hpp b/include/Nazara/Physics2D/RigidBody2D.hpp
index a45897f70..0c2da9225 100644
--- a/include/Nazara/Physics2D/RigidBody2D.hpp
+++ b/include/Nazara/Physics2D/RigidBody2D.hpp
@@ -12,8 +12,8 @@
 #include <Nazara/Core/Signal.hpp>
 #include <Nazara/Math/Angle.hpp>
 #include <Nazara/Math/Rect.hpp>
-#include <Nazara/Physics2D/Config.hpp>
 #include <Nazara/Physics2D/Collider2D.hpp>
+#include <Nazara/Physics2D/Config.hpp>
 #include <functional>
 #include <limits>
 
diff --git a/include/Nazara/Physics3D/RigidBody3D.hpp b/include/Nazara/Physics3D/RigidBody3D.hpp
index 65516f01e..bd9e40408 100644
--- a/include/Nazara/Physics3D/RigidBody3D.hpp
+++ b/include/Nazara/Physics3D/RigidBody3D.hpp
@@ -13,8 +13,8 @@
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
-#include <Nazara/Physics3D/Config.hpp>
 #include <Nazara/Physics3D/Collider3D.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 
 class NewtonBody;
 
diff --git a/include/Nazara/Platform/Platform.hpp b/include/Nazara/Platform/Platform.hpp
index 017be409d..265e78f98 100644
--- a/include/Nazara/Platform/Platform.hpp
+++ b/include/Nazara/Platform/Platform.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_PLATFORM_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Utility/Utility.hpp>
 #include <Nazara/Platform/Config.hpp>
+#include <Nazara/Utility/Utility.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/Renderer/CommandPool.hpp b/include/Nazara/Renderer/CommandPool.hpp
index 530503694..0b1d31830 100644
--- a/include/Nazara/Renderer/CommandPool.hpp
+++ b/include/Nazara/Renderer/CommandPool.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_RENDERER_COMMANDPOOL_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/CommandBuffer.hpp>
+#include <Nazara/Renderer/Config.hpp>
 #include <functional>
 
 namespace Nz
diff --git a/include/Nazara/Renderer/RenderDevice.hpp b/include/Nazara/Renderer/RenderDevice.hpp
index 0186f97e0..4edb137c7 100644
--- a/include/Nazara/Renderer/RenderDevice.hpp
+++ b/include/Nazara/Renderer/RenderDevice.hpp
@@ -17,8 +17,8 @@
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
-#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <memory>
diff --git a/include/Nazara/Renderer/RenderPassCache.hpp b/include/Nazara/Renderer/RenderPassCache.hpp
index 7a8cdbb36..58697661d 100644
--- a/include/Nazara/Renderer/RenderPassCache.hpp
+++ b/include/Nazara/Renderer/RenderPassCache.hpp
@@ -11,8 +11,8 @@
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/RenderPass.hpp>
 #include <memory>
-#include <variant>
 #include <unordered_map>
+#include <variant>
 
 namespace Nz
 {
diff --git a/include/Nazara/Renderer/RenderWindow.hpp b/include/Nazara/Renderer/RenderWindow.hpp
index 80cbdf483..34a7df4de 100644
--- a/include/Nazara/Renderer/RenderWindow.hpp
+++ b/include/Nazara/Renderer/RenderWindow.hpp
@@ -11,10 +11,10 @@
 #include <Nazara/Core/Clock.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Math/Vector3.hpp>
+#include <Nazara/Platform/Window.hpp>
 #include <Nazara/Renderer/RenderSurface.hpp>
 #include <Nazara/Renderer/RenderWindowImpl.hpp>
 #include <Nazara/Renderer/RenderWindowParameters.hpp>
-#include <Nazara/Platform/Window.hpp>
 #include <memory>
 
 namespace Nz
diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp
index cf5004a8d..ae554d951 100644
--- a/include/Nazara/Renderer/Texture.hpp
+++ b/include/Nazara/Renderer/Texture.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
+#include <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
 #include <Nazara/Core/ResourceManager.hpp>
-#include <Nazara/Core/Resource.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Enums.hpp>
diff --git a/include/Nazara/Shader/Ast/AstCloner.hpp b/include/Nazara/Shader/Ast/AstCloner.hpp
index 2c5a775ea..e346509ca 100644
--- a/include/Nazara/Shader/Ast/AstCloner.hpp
+++ b/include/Nazara/Shader/Ast/AstCloner.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
 #include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/Ast/AstUtils.hpp b/include/Nazara/Shader/Ast/AstUtils.hpp
index e9ea838d1..0082fdd4c 100644
--- a/include/Nazara/Shader/Ast/AstUtils.hpp
+++ b/include/Nazara/Shader/Ast/AstUtils.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/Ast/ExpressionType.hpp b/include/Nazara/Shader/Ast/ExpressionType.hpp
index 05d66a651..a2799fcb5 100644
--- a/include/Nazara/Shader/Ast/ExpressionType.hpp
+++ b/include/Nazara/Shader/Ast/ExpressionType.hpp
@@ -8,9 +8,9 @@
 #define NAZARA_SHADER_AST_EXPRESSIONTYPE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/Enums.hpp>
+#include <Nazara/Utility/Enums.hpp>
 #include <optional>
 #include <string>
 #include <variant>
diff --git a/include/Nazara/Shader/Ast/Nodes.hpp b/include/Nazara/Shader/Ast/Nodes.hpp
index ce64848d5..d8219109d 100644
--- a/include/Nazara/Shader/Ast/Nodes.hpp
+++ b/include/Nazara/Shader/Ast/Nodes.hpp
@@ -12,9 +12,9 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Math/Vector4.hpp>
 #include <Nazara/Shader/Config.hpp>
+#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/ConstantValue.hpp>
 #include <Nazara/Shader/Ast/Enums.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <array>
 #include <memory>
diff --git a/include/Nazara/Shader/SpirvConstantCache.hpp b/include/Nazara/Shader/SpirvConstantCache.hpp
index 4a9304aac..86abefcf6 100644
--- a/include/Nazara/Shader/SpirvConstantCache.hpp
+++ b/include/Nazara/Shader/SpirvConstantCache.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_SHADER_SPIRVCONSTANTCACHE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/Ast/Enums.hpp>
-#include <Nazara/Shader/Ast/ConstantValue.hpp>
-#include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/Ast/ConstantValue.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
+#include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/include/Nazara/Shader/SpirvSectionBase.hpp b/include/Nazara/Shader/SpirvSectionBase.hpp
index 118325f37..5931c127a 100644
--- a/include/Nazara/Shader/SpirvSectionBase.hpp
+++ b/include/Nazara/Shader/SpirvSectionBase.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_SHADER_SPIRVSECTIONBASE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <string>
 #include <vector>
 
diff --git a/include/Nazara/Shader/SpirvWriter.hpp b/include/Nazara/Shader/SpirvWriter.hpp
index 0c82895ab..0242583c4 100644
--- a/include/Nazara/Shader/SpirvWriter.hpp
+++ b/include/Nazara/Shader/SpirvWriter.hpp
@@ -9,10 +9,10 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/Ast/ConstantValue.hpp>
-#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/Shader/SpirvConstantCache.hpp>
+#include <Nazara/Shader/Ast/ConstantValue.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <string>
 #include <string_view>
 #include <unordered_map>
diff --git a/include/Nazara/Utility/Formats/MD5AnimParser.hpp b/include/Nazara/Utility/Formats/MD5AnimParser.hpp
index 02db3a33b..ed2cee3b4 100644
--- a/include/Nazara/Utility/Formats/MD5AnimParser.hpp
+++ b/include/Nazara/Utility/Formats/MD5AnimParser.hpp
@@ -8,10 +8,10 @@
 #define NAZARA_UTILITY_FORMATS_MD5ANIMPARSER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Utility/Config.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
+#include <Nazara/Utility/Config.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp
index a80326c86..5ef38abb4 100644
--- a/include/Nazara/Utility/Image.hpp
+++ b/include/Nazara/Utility/Image.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Color.hpp>
-#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/MovablePtr.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/Resource.hpp>
 #include <Nazara/Core/ResourceLoader.hpp>
 #include <Nazara/Core/ResourceManager.hpp>
diff --git a/include/Nazara/Utility/Mesh.inl b/include/Nazara/Utility/Mesh.inl
index 12e7cdd1d..6c0d5573b 100644
--- a/include/Nazara/Utility/Mesh.inl
+++ b/include/Nazara/Utility/Mesh.inl
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/Mesh.hpp>
-#include <memory>
 #include <Nazara/Utility/StaticMesh.hpp>
+#include <memory>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Utility/PixelFormat.inl b/include/Nazara/Utility/PixelFormat.inl
index 3f7823422..3ee68c0a1 100644
--- a/include/Nazara/Utility/PixelFormat.inl
+++ b/include/Nazara/Utility/PixelFormat.inl
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/PixelFormat.hpp>
-#include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Algorithm.hpp>
+#include <Nazara/Core/Error.hpp>
 #include <array>
 #include <cstring>
 #include <Nazara/Utility/Debug.hpp>
diff --git a/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp b/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
index ecd30e935..a78f07e89 100644
--- a/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp
@@ -12,10 +12,10 @@
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp>
 #include <memory>
 #include <type_traits>
diff --git a/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp b/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp
index 3897210a1..fd262fa6a 100644
--- a/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanRenderWindow.hpp
@@ -12,13 +12,13 @@
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Renderer/Enums.hpp>
-#include <Nazara/Renderer/RendererImpl.hpp>
 #include <Nazara/Renderer/RenderWindowImpl.hpp>
+#include <Nazara/Renderer/RendererImpl.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <Nazara/VulkanRenderer/VulkanDevice.hpp>
-#include <Nazara/VulkanRenderer/VulkanWindowFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderImage.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderPass.hpp>
+#include <Nazara/VulkanRenderer/VulkanWindowFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
diff --git a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
index 2e32f17a4..964cc36bd 100644
--- a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
@@ -10,8 +10,8 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/ShaderModule.hpp>
-#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
 #include <vector>
 
diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
index dd1b588cc..774fe862a 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
+++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.inl
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Vulkan.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
index 35680d225..56977248f 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 
 namespace Nz 
 {
diff --git a/include/Nazara/Widgets/Widgets.hpp b/include/Nazara/Widgets/Widgets.hpp
index 0609e6e25..fd1705a99 100644
--- a/include/Nazara/Widgets/Widgets.hpp
+++ b/include/Nazara/Widgets/Widgets.hpp
@@ -8,8 +8,8 @@
 #define NAZARA_WIDGETS_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Core/ECS.hpp>
+#include <Nazara/Core/ModuleBase.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Widgets/Config.hpp>
 
diff --git a/src/Nazara/Audio/Formats/libflacLoader.cpp b/src/Nazara/Audio/Formats/libflacLoader.cpp
index b5c9374ee..9aa23abd5 100644
--- a/src/Nazara/Audio/Formats/libflacLoader.cpp
+++ b/src/Nazara/Audio/Formats/libflacLoader.cpp
@@ -14,9 +14,9 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
+#include <FLAC/stream_decoder.h>
 #include <optional>
 #include <set>
-#include <FLAC/stream_decoder.h>
 #include <Nazara/Audio/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp
index 12b0e4706..41cf29dbe 100644
--- a/src/Nazara/Core/Posix/FileImpl.cpp
+++ b/src/Nazara/Core/Posix/FileImpl.cpp
@@ -6,10 +6,10 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <cstdio>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
index 190fa464a..944f0813e 100644
--- a/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
+++ b/src/Nazara/Core/Posix/TaskSchedulerImpl.hpp
@@ -10,8 +10,8 @@
 #include <Nazara/Prerequisites.hpp>
 #include <atomic>
 #include <memory>
-#include <pthread.h>
 #include <queue>
+#include <pthread.h>
 
 #if defined(NAZARA_PLATFORM_MACOSX)
 	typedef int pthread_barrierattr_t;
diff --git a/src/Nazara/Core/StringExt.cpp b/src/Nazara/Core/StringExt.cpp
index 2e59889fd..b776de5ae 100644
--- a/src/Nazara/Core/StringExt.cpp
+++ b/src/Nazara/Core/StringExt.cpp
@@ -4,8 +4,8 @@
 
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Core/Algorithm.hpp>
-#include <cinttypes>
 #include <Utfcpp/utf8.h>
+#include <cinttypes>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Graphics/FrameGraph.cpp b/src/Nazara/Graphics/FrameGraph.cpp
index da02a2dee..fa7c45585 100644
--- a/src/Nazara/Graphics/FrameGraph.cpp
+++ b/src/Nazara/Graphics/FrameGraph.cpp
@@ -6,8 +6,8 @@
 // https://themaister.net/blog/2017/08/15/render-graphs-and-vulkan-a-deep-dive/
 
 #include <Nazara/Graphics/FrameGraph.hpp>
-#include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Core/StackArray.hpp>
+#include <Nazara/Graphics/Graphics.hpp>
 #include <stdexcept>
 #include <unordered_set>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/MaterialPass.cpp b/src/Nazara/Graphics/MaterialPass.cpp
index a78cef04e..9c355acdd 100644
--- a/src/Nazara/Graphics/MaterialPass.cpp
+++ b/src/Nazara/Graphics/MaterialPass.cpp
@@ -7,8 +7,8 @@
 #include <Nazara/Graphics/BasicMaterial.hpp>
 #include <Nazara/Graphics/UberShader.hpp>
 #include <Nazara/Renderer/CommandBufferBuilder.hpp>
-#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/RenderFrame.hpp>
+#include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/UploadPool.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Network/AlgorithmNetwork.cpp b/src/Nazara/Network/AlgorithmNetwork.cpp
index e43fe5646..3b794c336 100644
--- a/src/Nazara/Network/AlgorithmNetwork.cpp
+++ b/src/Nazara/Network/AlgorithmNetwork.cpp
@@ -2,8 +2,8 @@
 // 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/Algorithm.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <Nazara/Network/Algorithm.hpp>
 #include <cstring>
 #include <Nazara/Network/Debug.hpp>
 
diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp
index 98d4911ba..38b5d3de8 100644
--- a/src/Nazara/Network/Posix/SocketImpl.cpp
+++ b/src/Nazara/Network/Posix/SocketImpl.cpp
@@ -9,13 +9,13 @@
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Network/NetBuffer.hpp>
 #include <Nazara/Network/Posix/IpAddressImpl.hpp>
+#include <cstring>
+#include <poll.h>
+#include <unistd.h>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <poll.h>
-#include <unistd.h>
-#include <cstring>
 #include <Nazara/Network/Debug.hpp>
 
 #if !defined(TCP_KEEPIDLE) && defined(TCP_KEEPALIVE)
diff --git a/src/Nazara/Network/Posix/SocketImpl.hpp b/src/Nazara/Network/Posix/SocketImpl.hpp
index 62e3be3d1..97b46e34a 100644
--- a/src/Nazara/Network/Posix/SocketImpl.hpp
+++ b/src/Nazara/Network/Posix/SocketImpl.hpp
@@ -7,9 +7,9 @@
 #ifndef NAZARA_NETWORK_POSIX_SOCKETIMPL_HPP
 #define NAZARA_NETWORK_POSIX_SOCKETIMPL_HPP
 
-#include <Nazara/Network/SocketHandle.hpp>
 #include <Nazara/Network/Enums.hpp>
 #include <Nazara/Network/IpAddress.hpp>
+#include <Nazara/Network/SocketHandle.hpp>
 
 #define NAZARA_NETWORK_POLL_SUPPORT 1
 
diff --git a/src/Nazara/Network/TcpClient.cpp b/src/Nazara/Network/TcpClient.cpp
index 175f3aa79..283121f54 100644
--- a/src/Nazara/Network/TcpClient.cpp
+++ b/src/Nazara/Network/TcpClient.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <limits>
 #include <Nazara/Network/NetPacket.hpp>
+#include <limits>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 #include <Nazara/Network/Win32/SocketImpl.hpp>
diff --git a/src/Nazara/Network/Win32/IpAddressImpl.hpp b/src/Nazara/Network/Win32/IpAddressImpl.hpp
index 5f836733b..e549ae121 100644
--- a/src/Nazara/Network/Win32/IpAddressImpl.hpp
+++ b/src/Nazara/Network/Win32/IpAddressImpl.hpp
@@ -8,9 +8,9 @@
 #define NAZARA_NETWORK_WIN32_IPADDRESSIMPL_HPP
 
 #include <Nazara/Network/IpAddress.hpp>
-#include <string>
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include <string>
 
 namespace Nz
 {
diff --git a/src/Nazara/Network/Win32/SocketPollerImpl.hpp b/src/Nazara/Network/Win32/SocketPollerImpl.hpp
index 41782c16c..0b9f64fba 100644
--- a/src/Nazara/Network/Win32/SocketPollerImpl.hpp
+++ b/src/Nazara/Network/Win32/SocketPollerImpl.hpp
@@ -10,10 +10,10 @@
 #include <Nazara/Network/IpAddress.hpp>
 #include <Nazara/Network/SocketHandle.hpp>
 #include <Nazara/Network/Win32/SocketImpl.hpp>
+#include <winsock2.h>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include <winsock2.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
index c252dd481..332dcc5d6 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/OpenGLRenderer/OpenGLDevice.hpp>
-#include <Nazara/Renderer/CommandPool.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLBuffer.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLCommandPool.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLFboFramebuffer.hpp>
@@ -14,6 +13,7 @@
 #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
+#include <Nazara/Renderer/CommandPool.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp
index 2eab4e397..4551a6fc9 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLRenderPipeline.cpp
@@ -4,9 +4,9 @@
 
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipeline.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <Nazara/OpenGLRenderer/Utils.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp>
 #include <Nazara/OpenGLRenderer/OpenGLShaderModule.hpp>
+#include <Nazara/OpenGLRenderer/Utils.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
 #include <cassert>
diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
index bf30d44e7..89e04983f 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
@@ -4,11 +4,11 @@
 
 #include <Nazara/OpenGLRenderer/OpenGLRenderer.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
+#include <Nazara/OpenGLRenderer/DummySurface.hpp>
+#include <Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/Renderer/RenderSurface.hpp>
 #include <Nazara/Renderer/RenderWindowImpl.hpp>
-#include <Nazara/OpenGLRenderer/DummySurface.hpp>
-#include <Nazara/OpenGLRenderer/OpenGLRenderWindow.hpp>
 #include <cassert>
 #include <sstream>
 
diff --git a/src/Nazara/Physics2D/Collider2D.cpp b/src/Nazara/Physics2D/Collider2D.cpp
index e8ec094f1..d7957a7cc 100644
--- a/src/Nazara/Physics2D/Collider2D.cpp
+++ b/src/Nazara/Physics2D/Collider2D.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StackArray.hpp>
 #include <Nazara/Math/Quaternion.hpp>
-#include <Nazara/Physics2D/RigidBody2D.hpp>
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
+#include <Nazara/Physics2D/RigidBody2D.hpp>
 #include <chipmunk/chipmunk.h>
 #include <chipmunk/chipmunk_structs.h>
 #include <array>
diff --git a/src/Nazara/Physics2D/PhysWorld2D.cpp b/src/Nazara/Physics2D/PhysWorld2D.cpp
index 632cacb58..655e0c8f7 100644
--- a/src/Nazara/Physics2D/PhysWorld2D.cpp
+++ b/src/Nazara/Physics2D/PhysWorld2D.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
-#include <Nazara/Physics2D/Arbiter2D.hpp>
 #include <Nazara/Core/StackArray.hpp>
+#include <Nazara/Physics2D/Arbiter2D.hpp>
 #include <chipmunk/chipmunk.h>
 #include <Nazara/Physics2D/Debug.hpp>
 
diff --git a/src/Nazara/Physics3D/Physics3D.cpp b/src/Nazara/Physics3D/Physics3D.cpp
index 5c3e0b83d..33ec8ef32 100644
--- a/src/Nazara/Physics3D/Physics3D.cpp
+++ b/src/Nazara/Physics3D/Physics3D.cpp
@@ -7,8 +7,8 @@
 #include <Nazara/Core/ECS.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/Physics3D/Config.hpp>
 #include <Nazara/Physics3D/Collider3D.hpp>
+#include <Nazara/Physics3D/Config.hpp>
 #include <newton/Newton.h>
 #include <Nazara/Physics3D/Debug.hpp>
 
diff --git a/src/Nazara/Platform/SDL2/IconImpl.cpp b/src/Nazara/Platform/SDL2/IconImpl.cpp
index 7bd4a138c..4a89f3d08 100644
--- a/src/Nazara/Platform/SDL2/IconImpl.cpp
+++ b/src/Nazara/Platform/SDL2/IconImpl.cpp
@@ -3,10 +3,10 @@
 // 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/Utility/Image.hpp>
 #include <Nazara/Utility/PixelFormat.hpp>
+#include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Platform/SDL2/InputImpl.cpp b/src/Nazara/Platform/SDL2/InputImpl.cpp
index 8b8e4a1c5..203046664 100644
--- a/src/Nazara/Platform/SDL2/InputImpl.cpp
+++ b/src/Nazara/Platform/SDL2/InputImpl.cpp
@@ -4,13 +4,13 @@
 
 #include <Nazara/Platform/SDL2/InputImpl.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/Platform/Debug.hpp>
+#include <Nazara/Platform/Window.hpp>
 #include <Nazara/Platform/SDL2/SDLHelper.hpp>
 #include <Nazara/Platform/SDL2/WindowImpl.hpp>
-#include <Nazara/Platform/Window.hpp>
 #include <SDL2/SDL_keyboard.h>
 #include <SDL2/SDL_keycode.h>
 #include <SDL2/SDL_mouse.h>
+#include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Platform/SDL2/VideoModeImpl.cpp b/src/Nazara/Platform/SDL2/VideoModeImpl.cpp
index 33b578c68..927f41da0 100644
--- a/src/Nazara/Platform/SDL2/VideoModeImpl.cpp
+++ b/src/Nazara/Platform/SDL2/VideoModeImpl.cpp
@@ -3,11 +3,11 @@
 // 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/VideoMode.hpp>
 #include <SDL2/SDL_video.h>
+#include <algorithm>
+#include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Platform/SDL2/WindowImpl.cpp b/src/Nazara/Platform/SDL2/WindowImpl.cpp
index c5f07586c..a5742026a 100644
--- a/src/Nazara/Platform/SDL2/WindowImpl.cpp
+++ b/src/Nazara/Platform/SDL2/WindowImpl.cpp
@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Platform/SDL2/WindowImpl.hpp>
-#include <cstdio>
-#include <memory>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Platform/Config.hpp>
diff --git a/src/Nazara/Platform/SDL2/WindowImpl.hpp b/src/Nazara/Platform/SDL2/WindowImpl.hpp
index 59123213d..35e9fb580 100644
--- a/src/Nazara/Platform/SDL2/WindowImpl.hpp
+++ b/src/Nazara/Platform/SDL2/WindowImpl.hpp
@@ -9,6 +9,7 @@
 #ifndef NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP
 #define NAZARA_PLATFORM_SDL2_WINDOWIMPL_HPP
 
+#include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Rect.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/Config.hpp>
@@ -16,7 +17,6 @@
 #include <Nazara/Platform/Mouse.hpp>
 #include <Nazara/Platform/VideoMode.hpp>
 #include <Nazara/Platform/Window.hpp>
-#include <Nazara/Prerequisites.hpp>
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_keyboard.h>
 #include <SDL2/SDL_video.h>
diff --git a/src/Nazara/Platform/VideoMode.cpp b/src/Nazara/Platform/VideoMode.cpp
index 85a11ff5d..956c09d9f 100644
--- a/src/Nazara/Platform/VideoMode.cpp
+++ b/src/Nazara/Platform/VideoMode.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Platform/VideoMode.hpp>
+#include <Nazara/Platform/SDL2/VideoModeImpl.hpp>
 #include <algorithm>
 #include <functional>
-#include <Nazara/Platform/SDL2/VideoModeImpl.hpp>
 #include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp b/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
index 4231697f5..fecfd5211 100644
--- a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
+++ b/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StackArray.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Ast/AstOptimizer.hpp>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <stdexcept>
 #include <unordered_set>
diff --git a/src/Nazara/Shader/SpirvAstVisitor.cpp b/src/Nazara/Shader/SpirvAstVisitor.cpp
index f01957b80..e8f30c291 100644
--- a/src/Nazara/Shader/SpirvAstVisitor.cpp
+++ b/src/Nazara/Shader/SpirvAstVisitor.cpp
@@ -6,9 +6,9 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StackArray.hpp>
 #include <Nazara/Core/StackVector.hpp>
-#include <Nazara/Shader/SpirvSection.hpp>
 #include <Nazara/Shader/SpirvExpressionLoad.hpp>
 #include <Nazara/Shader/SpirvExpressionStore.hpp>
+#include <Nazara/Shader/SpirvSection.hpp>
 #include <Nazara/Shader/SpirvWriter.hpp>
 #include <SpirV/GLSL.std.450.h>
 #include <Nazara/Shader/Debug.hpp>
diff --git a/src/Nazara/Shader/SpirvWriter.cpp b/src/Nazara/Shader/SpirvWriter.cpp
index 166a2106b..d0eb79ae9 100644
--- a/src/Nazara/Shader/SpirvWriter.cpp
+++ b/src/Nazara/Shader/SpirvWriter.cpp
@@ -14,9 +14,9 @@
 #include <Nazara/Shader/Ast/AstOptimizer.hpp>
 #include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
+#include <SpirV/GLSL.std.450.h>
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
-#include <SpirV/GLSL.std.450.h>
 #include <cassert>
 #include <map>
 #include <stdexcept>
diff --git a/src/Nazara/Utility/AlgorithmUtility.cpp b/src/Nazara/Utility/AlgorithmUtility.cpp
index 4e39b3c3a..ed86a2a07 100644
--- a/src/Nazara/Utility/AlgorithmUtility.cpp
+++ b/src/Nazara/Utility/AlgorithmUtility.cpp
@@ -28,11 +28,11 @@
 #include <Nazara/Utility/Algorithm.hpp>
 #include <Nazara/Utility/IndexIterator.hpp>
 #include <Nazara/Utility/Joint.hpp>
+#include <Nazara/Utility/Mesh.hpp>
+#include <Nazara/Utility/SkeletalMesh.hpp>
 #include <algorithm>
 #include <unordered_map>
 #include <Nazara/Utility/Debug.hpp>
-#include <Nazara/Utility/Mesh.hpp>
-#include <Nazara/Utility/SkeletalMesh.hpp>
 
 namespace Nz
 {
diff --git a/src/Nazara/Utility/Animation.cpp b/src/Nazara/Utility/Animation.cpp
index 9935b4f3b..8c7f16866 100644
--- a/src/Nazara/Utility/Animation.cpp
+++ b/src/Nazara/Utility/Animation.cpp
@@ -9,8 +9,8 @@
 #include <Nazara/Utility/Sequence.hpp>
 #include <Nazara/Utility/Skeleton.hpp>
 #include <Nazara/Utility/Utility.hpp>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
index 90f134858..9e1014711 100644
--- a/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
+++ b/src/Nazara/Utility/Formats/MD5AnimLoader.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/Formats/MD5AnimLoader.hpp>
-#include <Nazara/Utility/Formats/MD5AnimParser.hpp>
 #include <Nazara/Utility/Animation.hpp>
 #include <Nazara/Utility/Sequence.hpp>
+#include <Nazara/Utility/Formats/MD5AnimParser.hpp>
 #include <Nazara/Utility/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Utility/Formats/STBSaver.cpp b/src/Nazara/Utility/Formats/STBSaver.cpp
index a274617d1..e92938111 100644
--- a/src/Nazara/Utility/Formats/STBSaver.cpp
+++ b/src/Nazara/Utility/Formats/STBSaver.cpp
@@ -3,9 +3,9 @@
 // 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>
+#include <Nazara/Utility/Formats/STBLoader.hpp>
 #include <map>
 #include <stdexcept>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
diff --git a/src/Nazara/VulkanRenderer/Utils_VulkanRenderer.cpp b/src/Nazara/VulkanRenderer/Utils_VulkanRenderer.cpp
index 67212329d..3c5f22c9e 100644
--- a/src/Nazara/VulkanRenderer/Utils_VulkanRenderer.cpp
+++ b/src/Nazara/VulkanRenderer/Utils_VulkanRenderer.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Engine - Vulkan renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/Core/StringExt.hpp>
+#include <Nazara/VulkanRenderer/Utils.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp b/src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp
index c87758da4..bacc8e278 100644
--- a/src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanCommandBufferBuilder.cpp
@@ -5,14 +5,14 @@
 #include <Nazara/VulkanRenderer/VulkanCommandBufferBuilder.hpp>
 #include <Nazara/Core/StackArray.hpp>
 #include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
-#include <Nazara/VulkanRenderer/VulkanWindowFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderPass.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderPipeline.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
-#include <Nazara/VulkanRenderer/VulkanTextureFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
 #include <Nazara/VulkanRenderer/VulkanTexture.hpp>
+#include <Nazara/VulkanRenderer/VulkanTextureFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanUploadPool.hpp>
+#include <Nazara/VulkanRenderer/VulkanWindowFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VulkanRenderImage.cpp b/src/Nazara/VulkanRenderer/VulkanRenderImage.cpp
index ee10ff893..d1c14ed22 100644
--- a/src/Nazara/VulkanRenderer/VulkanRenderImage.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanRenderImage.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/VulkanRenderImage.hpp>
-#include <Nazara/VulkanRenderer/VulkanRenderWindow.hpp>
 #include <Nazara/VulkanRenderer/VulkanCommandBuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanCommandBufferBuilder.hpp>
+#include <Nazara/VulkanRenderer/VulkanRenderWindow.hpp>
 #include <stdexcept>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
diff --git a/src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp b/src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp
index 048b1107c..51cb34af3 100644
--- a/src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanRenderPipelineLayout.cpp
@@ -3,12 +3,12 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
-#include <Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
 #include <Nazara/Core/StackArray.hpp>
 #include <Nazara/Core/StackVector.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
+#include <Nazara/VulkanRenderer/VulkanDescriptorSetLayoutCache.hpp>
 #include <cassert>
 #include <stdexcept>
 #include <Nazara/VulkanRenderer/Debug.hpp>
diff --git a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
index 7f11e8f93..3c0df8601 100644
--- a/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanRenderer.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Renderer/RenderDevice.hpp>
 #include <Nazara/VulkanRenderer/VulkanBuffer.hpp>
-#include <Nazara/VulkanRenderer/VulkanSurface.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderWindow.hpp>
+#include <Nazara/VulkanRenderer/VulkanSurface.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
 #include <cassert>
 #include <sstream>
diff --git a/src/Nazara/VulkanRenderer/VulkanTexture.cpp b/src/Nazara/VulkanRenderer/VulkanTexture.cpp
index a9ff15295..89c698941 100644
--- a/src/Nazara/VulkanRenderer/VulkanTexture.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanTexture.cpp
@@ -7,8 +7,8 @@
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp>
-#include <stdexcept>
 #include <vma/vk_mem_alloc.h>
+#include <stdexcept>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp b/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
index 3e98f86b1..6897589ef 100644
--- a/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
+++ b/src/Nazara/VulkanRenderer/Wrapper/Instance.cpp
@@ -6,8 +6,8 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/Log.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp>
 #include <Nazara/VulkanRenderer/Utils.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/DebugUtilsMessengerEXT.hpp>
 #include <sstream>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
diff --git a/src/Nazara/Widgets/BaseWidget.cpp b/src/Nazara/Widgets/BaseWidget.cpp
index 44e8222e5..15670178a 100644
--- a/src/Nazara/Widgets/BaseWidget.cpp
+++ b/src/Nazara/Widgets/BaseWidget.cpp
@@ -3,11 +3,11 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Widgets/BaseWidget.hpp>
-#include <Nazara/Widgets/Canvas.hpp>
 #include <Nazara/Graphics/BasicMaterial.hpp>
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/Components/GraphicsComponent.hpp>
 #include <Nazara/Utility/Components/NodeComponent.hpp>
+#include <Nazara/Widgets/Canvas.hpp>
 #include <algorithm>
 #include <Nazara/Widgets/Debug.hpp>