diff --git a/include/Nazara/Graphics/UberShader.hpp b/include/Nazara/Graphics/UberShader.hpp
index cdf56f5a5..a2a18316b 100644
--- a/include/Nazara/Graphics/UberShader.hpp
+++ b/include/Nazara/Graphics/UberShader.hpp
@@ -11,8 +11,8 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
-#include <NZSL/ModuleResolver.hpp>
 #include <NazaraUtils/Signal.hpp>
+#include <NZSL/ModuleResolver.hpp>
 #include <NZSL/Ast/Module.hpp>
 #include <unordered_map>
 
diff --git a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp b/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
index 5af7db0aa..389a8d202 100644
--- a/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
+++ b/include/Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp
@@ -13,8 +13,8 @@
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/CoreFunctions.hpp>
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
-#include <NZSL/GlslWriter.hpp>
 #include <NazaraUtils/Bitset.hpp>
+#include <NZSL/GlslWriter.hpp>
 #include <memory>
 #include <type_traits>
 #include <vector>
diff --git a/include/Nazara/Renderer/RenderPipelineLayout.hpp b/include/Nazara/Renderer/RenderPipelineLayout.hpp
index d45b8cd1d..546186661 100644
--- a/include/Nazara/Renderer/RenderPipelineLayout.hpp
+++ b/include/Nazara/Renderer/RenderPipelineLayout.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/ShaderBinding.hpp>
-#include <NZSL/Enums.hpp>
 #include <NazaraUtils/MovablePtr.hpp>
+#include <NZSL/Enums.hpp>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/Nazara/Audio/Formats/libflacLoader.cpp b/src/Nazara/Audio/Formats/libflacLoader.cpp
index 396c5ef39..dd1ae7317 100644
--- a/src/Nazara/Audio/Formats/libflacLoader.cpp
+++ b/src/Nazara/Audio/Formats/libflacLoader.cpp
@@ -12,9 +12,9 @@
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Stream.hpp>
-#include <FLAC/stream_decoder.h>
 #include <NazaraUtils/CallOnExit.hpp>
 #include <NazaraUtils/Endianness.hpp>
+#include <FLAC/stream_decoder.h>
 #include <optional>
 #include <set>
 #include <Nazara/Audio/Debug.hpp>
diff --git a/src/Nazara/Platform/SDL2/CursorImpl.hpp b/src/Nazara/Platform/SDL2/CursorImpl.hpp
index 9c7d26c51..3d50b25e8 100644
--- a/src/Nazara/Platform/SDL2/CursorImpl.hpp
+++ b/src/Nazara/Platform/SDL2/CursorImpl.hpp
@@ -11,8 +11,8 @@
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/Enums.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <SDL_mouse.h>
 #include <NazaraUtils/MovablePtr.hpp>
+#include <SDL_mouse.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Platform/SDL2/IconImpl.hpp b/src/Nazara/Platform/SDL2/IconImpl.hpp
index 6d021c212..35fd95c9e 100644
--- a/src/Nazara/Platform/SDL2/IconImpl.hpp
+++ b/src/Nazara/Platform/SDL2/IconImpl.hpp
@@ -9,8 +9,8 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Utility/Image.hpp>
-#include <SDL_surface.h>
 #include <NazaraUtils/MovablePtr.hpp>
+#include <SDL_surface.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Platform/SDL2/InputImpl.cpp b/src/Nazara/Platform/SDL2/InputImpl.cpp
index e1ec2048e..07bfab864 100644
--- a/src/Nazara/Platform/SDL2/InputImpl.cpp
+++ b/src/Nazara/Platform/SDL2/InputImpl.cpp
@@ -7,11 +7,11 @@
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Platform/SDL2/SDLHelper.hpp>
 #include <Nazara/Platform/SDL2/WindowImpl.hpp>
+#include <NazaraUtils/CallOnExit.hpp>
 #include <SDL_clipboard.h>
 #include <SDL_keyboard.h>
 #include <SDL_keycode.h>
 #include <SDL_mouse.h>
-#include <NazaraUtils/CallOnExit.hpp>
 #include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
diff --git a/xmake/actions/checkfiles.lua b/xmake/actions/checkfiles.lua
index f54eebd9b..8538a4482 100644
--- a/xmake/actions/checkfiles.lua
+++ b/xmake/actions/checkfiles.lua
@@ -498,7 +498,7 @@ on_run(function ()
 						order = 1 -- top engine includes
 					elseif inclusions[i].path == "Nazara/" .. debugIncludeModule .. "/Debug.hpp" then
 						order = 6 -- debug include
-					elseif inclusions[i].path:match("^Nazara/Utils/") then
+					elseif inclusions[i].path:match("^NazaraUtils/") then
 						order = 2.1 -- NazaraUtils
 					elseif inclusions[i].path:match("^Nazara/") then
 						order = 2 -- engine includes