From cbfa9cbb65c0974ade5c52b182e8c57975d4d693 Mon Sep 17 00:00:00 2001
From: vittorioromeo <vittorio.romeo@outlook.com>
Date: Mon, 24 Apr 2023 14:13:52 +0200
Subject: [PATCH] Reorder includes hierarchically

---
 .clang-format                                 | 22 ++++++++++++++-----
 examples/X11/X11.cpp                          |  3 ++-
 examples/android/app/src/main/jni/main.cpp    |  8 +++++--
 examples/cocoa/NSString+stdstring.mm          |  4 ++--
 examples/island/Island.cpp                    |  7 +++---
 examples/opengl/OpenGL.cpp                    |  3 ++-
 examples/shader/Effect.hpp                    |  3 ++-
 examples/shader/Shader.cpp                    |  4 ++--
 examples/sound_capture/SoundCapture.cpp       |  3 ++-
 examples/tennis/Tennis.cpp                    |  3 ++-
 examples/voip/Client.cpp                      |  1 +
 examples/voip/Server.cpp                      |  4 +++-
 examples/vulkan/Vulkan.cpp                    |  6 +++--
 examples/win32/Win32.cpp                      |  3 ++-
 examples/window/Window.cpp                    |  3 ++-
 include/SFML/Audio.hpp                        |  1 +
 include/SFML/Audio/InputSoundFile.hpp         |  3 ++-
 include/SFML/Audio/SoundBuffer.hpp            |  1 +
 include/SFML/Audio/SoundRecorder.hpp          |  1 +
 include/SFML/Audio/SoundSource.hpp            |  1 +
 include/SFML/Audio/SoundStream.hpp            |  4 +++-
 include/SFML/Graphics.hpp                     |  1 +
 include/SFML/Graphics/Glsl.hpp                |  1 +
 include/SFML/Graphics/RenderTexture.hpp       |  1 +
 include/SFML/Graphics/RenderWindow.hpp        |  1 +
 include/SFML/Graphics/Shader.hpp              |  4 +++-
 include/SFML/Graphics/Shape.hpp               |  1 +
 include/SFML/Graphics/Text.hpp                |  1 +
 include/SFML/Graphics/Texture.hpp             |  1 +
 include/SFML/Graphics/Transform.hpp           |  1 +
 include/SFML/Graphics/Transformable.hpp       |  1 +
 include/SFML/Graphics/Vertex.hpp              |  1 +
 include/SFML/Graphics/VertexBuffer.hpp        |  1 +
 include/SFML/Graphics/View.hpp                |  1 +
 include/SFML/Network.hpp                      |  1 +
 include/SFML/Network/Ftp.hpp                  |  1 +
 include/SFML/Network/Http.hpp                 |  1 +
 include/SFML/Network/Packet.hpp               |  3 ++-
 include/SFML/Network/TcpSocket.hpp            |  1 +
 include/SFML/System/FileInputStream.hpp       |  3 ++-
 include/SFML/System/Time.hpp                  |  1 +
 include/SFML/System/Utf.hpp                   |  3 ++-
 include/SFML/Window.hpp                       |  3 ++-
 include/SFML/Window/Context.hpp               |  6 +++--
 include/SFML/Window/Cursor.hpp                |  3 ++-
 include/SFML/Window/Vulkan.hpp                |  3 ++-
 include/SFML/Window/Window.hpp                |  5 +++--
 include/SFML/Window/WindowBase.hpp            |  3 ++-
 src/SFML/Audio/ALCheck.cpp                    |  1 +
 src/SFML/Audio/AudioDevice.cpp                |  1 +
 src/SFML/Audio/InputSoundFile.cpp             |  1 +
 src/SFML/Audio/Music.cpp                      |  1 +
 src/SFML/Audio/SoundBuffer.cpp                |  1 +
 src/SFML/Audio/SoundBufferRecorder.cpp        |  1 +
 src/SFML/Audio/SoundFileFactory.cpp           |  1 +
 src/SFML/Audio/SoundFileReaderFlac.cpp        |  4 +++-
 src/SFML/Audio/SoundFileReaderMp3.cpp         |  2 ++
 src/SFML/Audio/SoundFileReaderOgg.cpp         |  4 +++-
 src/SFML/Audio/SoundFileReaderWav.cpp         |  4 +++-
 src/SFML/Audio/SoundFileWriterFlac.cpp        |  4 +++-
 src/SFML/Audio/SoundFileWriterOgg.cpp         |  6 +++--
 src/SFML/Audio/SoundFileWriterWav.cpp         |  4 +++-
 src/SFML/Audio/SoundRecorder.cpp              |  4 +++-
 src/SFML/Audio/SoundStream.cpp                |  4 +++-
 src/SFML/Graphics/Font.cpp                    |  5 +++--
 src/SFML/Graphics/GLCheck.cpp                 |  1 +
 src/SFML/Graphics/GLExtensions.cpp            |  4 +++-
 src/SFML/Graphics/Image.cpp                   |  4 +++-
 src/SFML/Graphics/ImageLoader.cpp             |  1 +
 src/SFML/Graphics/RenderTarget.cpp            |  9 +++++---
 src/SFML/Graphics/RenderTexture.cpp           |  1 +
 .../Graphics/RenderTextureImplDefault.cpp     |  1 +
 .../Graphics/RenderTextureImplDefault.hpp     |  1 +
 src/SFML/Graphics/RenderTextureImplFBO.cpp    |  4 +++-
 src/SFML/Graphics/RenderTextureImplFBO.hpp    |  1 +
 src/SFML/Graphics/RenderWindow.cpp            |  1 +
 src/SFML/Graphics/Shader.cpp                  |  4 +++-
 src/SFML/Graphics/Text.cpp                    |  3 ++-
 src/SFML/Graphics/Texture.cpp                 |  9 +++++---
 src/SFML/Graphics/Transform.cpp               |  1 +
 src/SFML/Graphics/VertexBuffer.cpp            |  6 +++--
 src/SFML/Main/MainAndroid.cpp                 |  5 +++--
 src/SFML/Network/Ftp.cpp                      |  6 +++--
 src/SFML/Network/Http.cpp                     |  1 +
 src/SFML/Network/IpAddress.cpp                |  3 ++-
 src/SFML/Network/Packet.cpp                   |  1 +
 src/SFML/Network/Socket.cpp                   |  1 +
 src/SFML/Network/SocketSelector.cpp           |  1 +
 src/SFML/Network/TcpListener.cpp              |  1 +
 src/SFML/Network/TcpSocket.cpp                |  4 +++-
 src/SFML/Network/UdpSocket.cpp                |  4 +++-
 src/SFML/Network/Unix/SocketImpl.cpp          |  6 +++--
 src/SFML/Network/Unix/SocketImpl.hpp          |  3 ++-
 src/SFML/Network/Win32/SocketImpl.hpp         |  4 +++-
 src/SFML/PCH.hpp                              | 11 +++++-----
 src/SFML/System/Err.cpp                       |  3 ++-
 src/SFML/System/FileInputStream.cpp           |  3 ++-
 src/SFML/System/String.cpp                    |  3 ++-
 src/SFML/System/Utils.hpp                     |  3 ++-
 src/SFML/System/Vector2.cpp                   |  3 ++-
 src/SFML/System/Vector3.cpp                   |  3 ++-
 src/SFML/Window/Android/ClipboardImpl.cpp     |  3 ++-
 src/SFML/Window/Android/CursorImpl.hpp        |  3 ++-
 src/SFML/Window/Android/InputImpl.cpp         |  3 ++-
 src/SFML/Window/Android/SensorImpl.cpp        |  3 ++-
 src/SFML/Window/Android/VideoModeImpl.cpp     |  3 ++-
 src/SFML/Window/Android/WindowImplAndroid.cpp |  3 ++-
 src/SFML/Window/Android/WindowImplAndroid.hpp |  3 ++-
 src/SFML/Window/Clipboard.cpp                 |  3 ++-
 src/SFML/Window/Context.cpp                   |  3 ++-
 src/SFML/Window/Cursor.cpp                    |  3 ++-
 src/SFML/Window/DRM/ClipboardImpl.cpp         |  3 ++-
 src/SFML/Window/DRM/CursorImpl.hpp            |  3 ++-
 src/SFML/Window/DRM/DRMContext.cpp            | 12 +++++-----
 src/SFML/Window/DRM/InputImplUDev.cpp         | 12 +++++-----
 src/SFML/Window/DRM/VideoModeImpl.cpp         |  3 ++-
 src/SFML/Window/DRM/WindowImplDRM.cpp         |  3 ++-
 src/SFML/Window/EGLCheck.cpp                  |  3 ++-
 src/SFML/Window/EglContext.cpp                |  5 +++--
 src/SFML/Window/FreeBSD/JoystickImpl.cpp      |  3 ++-
 src/SFML/Window/GlContext.cpp                 | 12 +++++-----
 src/SFML/Window/GlContext.hpp                 |  3 ++-
 src/SFML/Window/Keyboard.cpp                  |  3 ++-
 src/SFML/Window/NetBSD/JoystickImpl.cpp       |  3 ++-
 src/SFML/Window/OSX/ClipboardImpl.mm          |  3 ++-
 src/SFML/Window/OSX/CursorImpl.hpp            |  3 ++-
 src/SFML/Window/OSX/HIDInputManager.hpp       |  3 ++-
 src/SFML/Window/OSX/HIDInputManager.mm        |  3 ++-
 src/SFML/Window/OSX/InputImpl.mm              |  3 ++-
 src/SFML/Window/OSX/JoystickImpl.cpp          |  3 ++-
 src/SFML/Window/OSX/JoystickImpl.hpp          |  3 ++-
 src/SFML/Window/OSX/NSImage+raw.h             |  1 +
 src/SFML/Window/OSX/SFContext.mm              |  3 ++-
 src/SFML/Window/OSX/SFOpenGLView.mm           |  3 ++-
 src/SFML/Window/OSX/SFViewController.mm       |  3 ++-
 src/SFML/Window/OSX/SFWindowController.mm     |  3 ++-
 src/SFML/Window/OSX/VideoModeImpl.cpp         |  3 ++-
 src/SFML/Window/OSX/WindowImplCocoa.mm        |  5 +++--
 .../Window/OSX/WindowImplDelegateProtocol.h   |  1 +
 src/SFML/Window/OSX/cg_sf_conversion.mm       |  3 ++-
 src/SFML/Window/OSX/cpp_objc_conversion.mm    |  3 ++-
 src/SFML/Window/SensorManager.cpp             |  3 ++-
 src/SFML/Window/Unix/ClipboardImpl.cpp        |  5 +++--
 src/SFML/Window/Unix/ClipboardImpl.hpp        |  3 ++-
 src/SFML/Window/Unix/CursorImpl.cpp           |  3 ++-
 src/SFML/Window/Unix/CursorImpl.hpp           |  3 ++-
 src/SFML/Window/Unix/Display.cpp              |  8 ++++---
 src/SFML/Window/Unix/GlxContext.cpp           |  3 ++-
 src/SFML/Window/Unix/InputImpl.cpp            |  3 ++-
 src/SFML/Window/Unix/JoystickImpl.cpp         |  8 ++++---
 src/SFML/Window/Unix/KeyboardImpl.cpp         |  8 ++++---
 src/SFML/Window/Unix/VideoModeImpl.cpp        |  3 ++-
 src/SFML/Window/Unix/WindowImplX11.cpp        | 16 ++++++++------
 src/SFML/Window/Win32/ClipboardImpl.cpp       |  3 ++-
 src/SFML/Window/Win32/CursorImpl.cpp          |  8 ++++---
 src/SFML/Window/Win32/CursorImpl.hpp          |  3 ++-
 src/SFML/Window/Win32/InputImpl.cpp           |  5 +++--
 src/SFML/Window/Win32/JoystickImpl.cpp        |  8 ++++---
 src/SFML/Window/Win32/JoystickImpl.hpp        |  3 ++-
 src/SFML/Window/Win32/VideoModeImpl.cpp       |  3 ++-
 src/SFML/Window/Win32/VulkanImplWin32.cpp     |  3 ++-
 src/SFML/Window/Win32/WglContext.cpp          |  3 ++-
 src/SFML/Window/Win32/WindowImplWin32.cpp     |  7 +++---
 src/SFML/Window/Win32/WindowImplWin32.hpp     |  3 ++-
 src/SFML/Window/Window.cpp                    |  5 +++--
 src/SFML/Window/WindowBase.cpp                |  3 ++-
 src/SFML/Window/WindowImpl.cpp                |  8 ++++---
 src/SFML/Window/iOS/ClipboardImpl.mm          |  3 ++-
 src/SFML/Window/iOS/CursorImpl.hpp            |  3 ++-
 src/SFML/Window/iOS/EaglContext.hpp           |  5 +++--
 src/SFML/Window/iOS/EaglContext.mm            |  7 +++---
 src/SFML/Window/iOS/InputImpl.mm              |  3 ++-
 src/SFML/Window/iOS/SFAppDelegate.hpp         |  3 ++-
 src/SFML/Window/iOS/SFView.mm                 |  4 +++-
 src/SFML/Window/iOS/SensorImpl.mm             |  3 ++-
 src/SFML/Window/iOS/WindowImplUIKit.mm        |  3 ++-
 test/Graphics/Rect.test.cpp                   |  1 +
 test/Graphics/RenderWindow.test.cpp           |  4 +++-
 test/Graphics/Transform.test.cpp              |  4 +++-
 test/System/FileInputStream.test.cpp          |  3 ++-
 test/System/String.test.cpp                   |  3 ++-
 test/System/Vector2.test.cpp                  |  3 ++-
 test/Window/Window.test.cpp                   |  3 ++-
 test/Window/WindowBase.test.cpp               |  3 ++-
 test/install/Install.cpp                      |  4 +++-
 .../SFML/SFML App.xctemplate/main.cpp         |  3 ++-
 .../SFML/SFML CLT.xctemplate/main.cpp         |  3 ++-
 187 files changed, 448 insertions(+), 207 deletions(-)

diff --git a/.clang-format b/.clang-format
index 7e5a36bdb..3c083a123 100644
--- a/.clang-format
+++ b/.clang-format
@@ -96,15 +96,27 @@ MaxEmptyLinesToKeep: 2
 IncludeBlocks: Regroup
 IncludeCategories:
   - Priority: 1
-    Regex: '^<SFML\/Config.hpp>$'
+    Regex: '^\"(.+)\"$'
   - Priority: 2
-    Regex: '^<SFML\/(.+)\/Export.hpp>$'
+    Regex: '^<SFML\/Config.hpp>$'
   - Priority: 3
-    Regex: '^<SFML\/'
+    Regex: '^<SFML\/(.+)\/Export.hpp>$'
   - Priority: 4
-    Regex: '^<(glad|gl|X11|jni|android|stb_|GLES2|vorbis|doctest)'
+    Regex: '^<SFML\/Graphics'
   - Priority: 5
-    Regex: '^<(.+)>$'
+    Regex: '^<SFML\/Audio'
+  - Priority: 6
+    Regex: '^<SFML\/Network'
+  - Priority: 7
+    Regex: '^<SFML\/Window'
+  - Priority: 8
+    Regex: '^<SFML\/System'
+  - Priority: 9
+    Regex: '^<(glad|gl|X11|jni|android|stb_|GLES2|vorbis|doctest)'
+  - Priority: 10
+    Regex: '^<([^c](.+)|coroutine|charconv|chrono|complex|concepts|condition_variable)>$'
+  - Priority: 11
+    Regex: '^<c(.+)>$'
 SortIncludes: true
 SortUsingDeclarations: true
 
diff --git a/examples/X11/X11.cpp b/examples/X11/X11.cpp
index babb9fd61..642ca2841 100644
--- a/examples/X11/X11.cpp
+++ b/examples/X11/X11.cpp
@@ -9,9 +9,10 @@
 #include <gl.h>
 
 #include <array>
+#include <iostream>
+
 #include <cmath>
 #include <cstdlib>
-#include <iostream>
 
 ////////////////////////////////////////////////////////////
 /// Initialize OpenGL states into the specified view
diff --git a/examples/android/app/src/main/jni/main.cpp b/examples/android/app/src/main/jni/main.cpp
index e0eff329b..b90682411 100644
--- a/examples/android/app/src/main/jni/main.cpp
+++ b/examples/android/app/src/main/jni/main.cpp
@@ -1,9 +1,13 @@
-#include <SFML/Audio.hpp>
 #include <SFML/Graphics.hpp>
+
+#include <SFML/Audio.hpp>
+
 #include <SFML/Network.hpp>
-#include <SFML/System.hpp>
+
 #include <SFML/Window.hpp>
 
+#include <SFML/System.hpp>
+
 // Do we want to showcase direct JNI/NDK interaction?
 // Undefine this to get real cross-platform code.
 // Uncomment this to try JNI access; this seems to be broken in latest NDKs
diff --git a/examples/cocoa/NSString+stdstring.mm b/examples/cocoa/NSString+stdstring.mm
index 15724ea07..92da07778 100644
--- a/examples/cocoa/NSString+stdstring.mm
+++ b/examples/cocoa/NSString+stdstring.mm
@@ -23,10 +23,10 @@
 //
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System/Utf.hpp>
-
 #import "NSString+stdstring.h"
 
+#include <SFML/System/Utf.hpp>
+
 @implementation NSString (NSString_stdstring)
 
 + (id)stringWithstdstring:(const std::string&)string
diff --git a/examples/island/Island.cpp b/examples/island/Island.cpp
index 863f076c0..368c4d6e2 100644
--- a/examples/island/Island.cpp
+++ b/examples/island/Island.cpp
@@ -9,9 +9,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
 #include <deque>
 #include <iostream>
 #include <mutex>
@@ -19,6 +16,10 @@
 #include <thread>
 #include <vector>
 
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+
 
 namespace
 {
diff --git a/examples/opengl/OpenGL.cpp b/examples/opengl/OpenGL.cpp
index 19ac60934..340749f1b 100644
--- a/examples/opengl/OpenGL.cpp
+++ b/examples/opengl/OpenGL.cpp
@@ -5,9 +5,10 @@
 #include <SFML/Graphics.hpp>
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
 
+#include <cstdlib>
+
 #define GLAD_GL_IMPLEMENTATION
 #include <gl.h>
 
diff --git a/examples/shader/Effect.hpp b/examples/shader/Effect.hpp
index 55487137b..4f9949d3a 100644
--- a/examples/shader/Effect.hpp
+++ b/examples/shader/Effect.hpp
@@ -5,10 +5,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics.hpp>
 
-#include <cassert>
 #include <string>
 #include <utility>
 
+#include <cassert>
+
 
 ////////////////////////////////////////////////////////////
 // Base class for effects
diff --git a/examples/shader/Shader.cpp b/examples/shader/Shader.cpp
index 58507ed07..8342d847c 100644
--- a/examples/shader/Shader.cpp
+++ b/examples/shader/Shader.cpp
@@ -2,11 +2,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include "Effect.hpp"
+
 #include <array>
 #include <random>
 
-#include "Effect.hpp"
-
 
 namespace
 {
diff --git a/examples/sound_capture/SoundCapture.cpp b/examples/sound_capture/SoundCapture.cpp
index 602be8816..492d54cff 100644
--- a/examples/sound_capture/SoundCapture.cpp
+++ b/examples/sound_capture/SoundCapture.cpp
@@ -4,9 +4,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio.hpp>
 
-#include <cstdlib>
 #include <iostream>
 
+#include <cstdlib>
+
 
 ////////////////////////////////////////////////////////////
 /// Entry point of application
diff --git a/examples/tennis/Tennis.cpp b/examples/tennis/Tennis.cpp
index aab250d9d..42b0ac12d 100644
--- a/examples/tennis/Tennis.cpp
+++ b/examples/tennis/Tennis.cpp
@@ -2,9 +2,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Audio.hpp>
 #include <SFML/Graphics.hpp>
 
+#include <SFML/Audio.hpp>
+
 #include <random>
 
 #ifdef SFML_SYSTEM_IOS
diff --git a/examples/voip/Client.cpp b/examples/voip/Client.cpp
index 14db815d8..39d0fda50 100644
--- a/examples/voip/Client.cpp
+++ b/examples/voip/Client.cpp
@@ -3,6 +3,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio.hpp>
+
 #include <SFML/Network.hpp>
 
 #include <iostream>
diff --git a/examples/voip/Server.cpp b/examples/voip/Server.cpp
index b0d9c60ee..6893a4021 100644
--- a/examples/voip/Server.cpp
+++ b/examples/voip/Server.cpp
@@ -3,13 +3,15 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio.hpp>
+
 #include <SFML/Network.hpp>
 
-#include <cstring>
 #include <iostream>
 #include <iterator>
 #include <mutex>
 
+#include <cstring>
+
 
 const std::uint8_t serverAudioData   = 1;
 const std::uint8_t serverEndOfStream = 2;
diff --git a/examples/vulkan/Vulkan.cpp b/examples/vulkan/Vulkan.cpp
index a1b7f4862..c0e136ab2 100644
--- a/examples/vulkan/Vulkan.cpp
+++ b/examples/vulkan/Vulkan.cpp
@@ -7,16 +7,18 @@
 
 // Include graphics because we use sf::Image for loading images
 #include <SFML/Graphics.hpp>
+
 #include <SFML/Window.hpp>
 
 #include <algorithm>
 #include <array>
-#include <cmath>
-#include <cstring>
 #include <iostream>
 #include <limits>
 #include <vector>
 
+#include <cmath>
+#include <cstring>
+
 
 ////////////////////////////////////////////////////////////
 // Helper functions
diff --git a/examples/win32/Win32.cpp b/examples/win32/Win32.cpp
index d2169e1be..dcd96ae3f 100644
--- a/examples/win32/Win32.cpp
+++ b/examples/win32/Win32.cpp
@@ -6,9 +6,10 @@
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
-#include <cmath>
 #include <windows.h>
 
+#include <cmath>
+
 HWND button;
 
 
diff --git a/examples/window/Window.cpp b/examples/window/Window.cpp
index 85251c30c..98bd3a7b7 100644
--- a/examples/window/Window.cpp
+++ b/examples/window/Window.cpp
@@ -13,9 +13,10 @@
 #endif
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
 
+#include <cstdlib>
+
 ////////////////////////////////////////////////////////////
 /// Entry point of application
 ///
diff --git a/include/SFML/Audio.hpp b/include/SFML/Audio.hpp
index fe2128814..bd3f8861e 100644
--- a/include/SFML/Audio.hpp
+++ b/include/SFML/Audio.hpp
@@ -41,6 +41,7 @@
 #include <SFML/Audio/SoundRecorder.hpp>
 #include <SFML/Audio/SoundSource.hpp>
 #include <SFML/Audio/SoundStream.hpp>
+
 #include <SFML/System.hpp>
 
 
diff --git a/include/SFML/Audio/InputSoundFile.hpp b/include/SFML/Audio/InputSoundFile.hpp
index 20b946ee6..9138fbc43 100644
--- a/include/SFML/Audio/InputSoundFile.hpp
+++ b/include/SFML/Audio/InputSoundFile.hpp
@@ -31,10 +31,11 @@
 
 #include <SFML/Audio/SoundFileReader.hpp>
 
-#include <cstddef>
 #include <filesystem>
 #include <memory>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp
index c45abcea1..db0e77a99 100644
--- a/include/SFML/Audio/SoundBuffer.hpp
+++ b/include/SFML/Audio/SoundBuffer.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Audio/Export.hpp>
 
 #include <SFML/Audio/AlResource.hpp>
+
 #include <SFML/System/Time.hpp>
 
 #include <filesystem>
diff --git a/include/SFML/Audio/SoundRecorder.hpp b/include/SFML/Audio/SoundRecorder.hpp
index 2215d9ca7..9a321a0d0 100644
--- a/include/SFML/Audio/SoundRecorder.hpp
+++ b/include/SFML/Audio/SoundRecorder.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Audio/Export.hpp>
 
 #include <SFML/Audio/AlResource.hpp>
+
 #include <SFML/System/Time.hpp>
 
 #include <string>
diff --git a/include/SFML/Audio/SoundSource.hpp b/include/SFML/Audio/SoundSource.hpp
index 72f16daf7..f75feb643 100644
--- a/include/SFML/Audio/SoundSource.hpp
+++ b/include/SFML/Audio/SoundSource.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Audio/Export.hpp>
 
 #include <SFML/Audio/AlResource.hpp>
+
 #include <SFML/System/Vector3.hpp>
 
 
diff --git a/include/SFML/Audio/SoundStream.hpp b/include/SFML/Audio/SoundStream.hpp
index 7f8b587dc..c6bd19fa3 100644
--- a/include/SFML/Audio/SoundStream.hpp
+++ b/include/SFML/Audio/SoundStream.hpp
@@ -30,12 +30,14 @@
 #include <SFML/Audio/Export.hpp>
 
 #include <SFML/Audio/SoundSource.hpp>
+
 #include <SFML/System/Time.hpp>
 
-#include <cstdlib>
 #include <mutex>
 #include <thread>
 
+#include <cstdlib>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics.hpp b/include/SFML/Graphics.hpp
index 048f01e4f..8fe31bb28 100644
--- a/include/SFML/Graphics.hpp
+++ b/include/SFML/Graphics.hpp
@@ -54,6 +54,7 @@
 #include <SFML/Graphics/VertexArray.hpp>
 #include <SFML/Graphics/VertexBuffer.hpp>
 #include <SFML/Graphics/View.hpp>
+
 #include <SFML/Window.hpp>
 
 
diff --git a/include/SFML/Graphics/Glsl.hpp b/include/SFML/Graphics/Glsl.hpp
index 1d06f636e..2df9fa255 100644
--- a/include/SFML/Graphics/Glsl.hpp
+++ b/include/SFML/Graphics/Glsl.hpp
@@ -29,6 +29,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Vector2.hpp>
 #include <SFML/System/Vector3.hpp>
 
diff --git a/include/SFML/Graphics/RenderTexture.hpp b/include/SFML/Graphics/RenderTexture.hpp
index 89f38170b..f8073427d 100644
--- a/include/SFML/Graphics/RenderTexture.hpp
+++ b/include/SFML/Graphics/RenderTexture.hpp
@@ -31,6 +31,7 @@
 
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Texture.hpp>
+
 #include <SFML/Window/ContextSettings.hpp>
 
 #include <memory>
diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
index c70ee3a92..794143cdd 100644
--- a/include/SFML/Graphics/RenderWindow.hpp
+++ b/include/SFML/Graphics/RenderWindow.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/RenderTarget.hpp>
+
 #include <SFML/Window/Window.hpp>
 
 
diff --git a/include/SFML/Graphics/Shader.hpp b/include/SFML/Graphics/Shader.hpp
index 09d7f380a..6d2d88429 100644
--- a/include/SFML/Graphics/Shader.hpp
+++ b/include/SFML/Graphics/Shader.hpp
@@ -30,9 +30,11 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Glsl.hpp>
+
+#include <SFML/Window/GlResource.hpp>
+
 #include <SFML/System/Vector2.hpp>
 #include <SFML/System/Vector3.hpp>
-#include <SFML/Window/GlResource.hpp>
 
 #include <filesystem>
 #include <string>
diff --git a/include/SFML/Graphics/Shape.hpp b/include/SFML/Graphics/Shape.hpp
index 23e3375b1..6901309d9 100644
--- a/include/SFML/Graphics/Shape.hpp
+++ b/include/SFML/Graphics/Shape.hpp
@@ -32,6 +32,7 @@
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 
diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp
index eed583c9c..e70bdec45 100644
--- a/include/SFML/Graphics/Text.hpp
+++ b/include/SFML/Graphics/Text.hpp
@@ -33,6 +33,7 @@
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
+
 #include <SFML/System/String.hpp>
 
 #include <vector>
diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp
index f49763bb6..f1f251c70 100644
--- a/include/SFML/Graphics/Texture.hpp
+++ b/include/SFML/Graphics/Texture.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Rect.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <filesystem>
diff --git a/include/SFML/Graphics/Transform.hpp b/include/SFML/Graphics/Transform.hpp
index b510b87f5..14bc2579e 100644
--- a/include/SFML/Graphics/Transform.hpp
+++ b/include/SFML/Graphics/Transform.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Rect.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 
diff --git a/include/SFML/Graphics/Transformable.hpp b/include/SFML/Graphics/Transformable.hpp
index bde2e6d37..5933746d3 100644
--- a/include/SFML/Graphics/Transformable.hpp
+++ b/include/SFML/Graphics/Transformable.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 
 
diff --git a/include/SFML/Graphics/Vertex.hpp b/include/SFML/Graphics/Vertex.hpp
index 657129df7..bed30345a 100644
--- a/include/SFML/Graphics/Vertex.hpp
+++ b/include/SFML/Graphics/Vertex.hpp
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 
diff --git a/include/SFML/Graphics/VertexBuffer.hpp b/include/SFML/Graphics/VertexBuffer.hpp
index a76a4098c..c9a060e88 100644
--- a/include/SFML/Graphics/VertexBuffer.hpp
+++ b/include/SFML/Graphics/VertexBuffer.hpp
@@ -31,6 +31,7 @@
 
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/PrimitiveType.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <cstddef>
diff --git a/include/SFML/Graphics/View.hpp b/include/SFML/Graphics/View.hpp
index 1e7b2fb5a..4b226f0ca 100644
--- a/include/SFML/Graphics/View.hpp
+++ b/include/SFML/Graphics/View.hpp
@@ -31,6 +31,7 @@
 
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 #include <SFML/System/Vector2.hpp>
 
diff --git a/include/SFML/Network.hpp b/include/SFML/Network.hpp
index 5891626b0..0e770425e 100644
--- a/include/SFML/Network.hpp
+++ b/include/SFML/Network.hpp
@@ -38,6 +38,7 @@
 #include <SFML/Network/TcpListener.hpp>
 #include <SFML/Network/TcpSocket.hpp>
 #include <SFML/Network/UdpSocket.hpp>
+
 #include <SFML/System.hpp>
 
 
diff --git a/include/SFML/Network/Ftp.hpp b/include/SFML/Network/Ftp.hpp
index 4fe77770e..75871b8a5 100644
--- a/include/SFML/Network/Ftp.hpp
+++ b/include/SFML/Network/Ftp.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Network/Export.hpp>
 
 #include <SFML/Network/TcpSocket.hpp>
+
 #include <SFML/System/Time.hpp>
 
 #include <filesystem>
diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp
index 0fa5781ed..0495d26c2 100644
--- a/include/SFML/Network/Http.hpp
+++ b/include/SFML/Network/Http.hpp
@@ -31,6 +31,7 @@
 
 #include <SFML/Network/IpAddress.hpp>
 #include <SFML/Network/TcpSocket.hpp>
+
 #include <SFML/System/Time.hpp>
 
 #include <map>
diff --git a/include/SFML/Network/Packet.hpp b/include/SFML/Network/Packet.hpp
index e37d0f62a..e7e3a3ac1 100644
--- a/include/SFML/Network/Packet.hpp
+++ b/include/SFML/Network/Packet.hpp
@@ -29,10 +29,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Export.hpp>
 
-#include <cstddef>
 #include <string>
 #include <vector>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Network/TcpSocket.hpp b/include/SFML/Network/TcpSocket.hpp
index 907a7256c..afccfbd97 100644
--- a/include/SFML/Network/TcpSocket.hpp
+++ b/include/SFML/Network/TcpSocket.hpp
@@ -30,6 +30,7 @@
 #include <SFML/Network/Export.hpp>
 
 #include <SFML/Network/Socket.hpp>
+
 #include <SFML/System/Time.hpp>
 
 #include <optional>
diff --git a/include/SFML/System/FileInputStream.hpp b/include/SFML/System/FileInputStream.hpp
index b85177efe..01320aee9 100644
--- a/include/SFML/System/FileInputStream.hpp
+++ b/include/SFML/System/FileInputStream.hpp
@@ -33,10 +33,11 @@
 
 #include <SFML/System/InputStream.hpp>
 
-#include <cstdio>
 #include <filesystem>
 #include <memory>
 
+#include <cstdio>
+
 #ifdef SFML_SYSTEM_ANDROID
 namespace sf::priv
 {
diff --git a/include/SFML/System/Time.hpp b/include/SFML/System/Time.hpp
index bce33f4ad..c7d8a4028 100644
--- a/include/SFML/System/Time.hpp
+++ b/include/SFML/System/Time.hpp
@@ -30,6 +30,7 @@
 #include <SFML/System/Export.hpp>
 
 #include <chrono>
+
 #include <cstdint>
 
 
diff --git a/include/SFML/System/Utf.hpp b/include/SFML/System/Utf.hpp
index 086d9e627..b56ea7e97 100644
--- a/include/SFML/System/Utf.hpp
+++ b/include/SFML/System/Utf.hpp
@@ -29,9 +29,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
 
-#include <cstdlib>
 #include <locale>
 
+#include <cstdlib>
+
 
 namespace sf
 {
diff --git a/include/SFML/Window.hpp b/include/SFML/Window.hpp
index f3429d330..77d15f8b9 100644
--- a/include/SFML/Window.hpp
+++ b/include/SFML/Window.hpp
@@ -28,7 +28,6 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System.hpp>
 #include <SFML/Window/Clipboard.hpp>
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/ContextSettings.hpp>
@@ -44,6 +43,8 @@
 #include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System.hpp>
+
 
 ////////////////////////////////////////////////////////////
 /// \defgroup window Window module
diff --git a/include/SFML/Window/Context.hpp b/include/SFML/Window/Context.hpp
index ac6a1607b..6c3499f7d 100644
--- a/include/SFML/Window/Context.hpp
+++ b/include/SFML/Window/Context.hpp
@@ -29,12 +29,14 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Export.hpp>
 
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/GlResource.hpp>
 
-#include <cstdint>
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/include/SFML/Window/Cursor.hpp b/include/SFML/Window/Cursor.hpp
index bd2869b22..d2a43a47a 100644
--- a/include/SFML/Window/Cursor.hpp
+++ b/include/SFML/Window/Cursor.hpp
@@ -31,9 +31,10 @@
 
 #include <SFML/System/Vector2.hpp>
 
-#include <cstdint>
 #include <memory>
 
+#include <cstdint>
+
 namespace sf
 {
 namespace priv
diff --git a/include/SFML/Window/Vulkan.hpp b/include/SFML/Window/Vulkan.hpp
index 9a36e4d71..b1f1a7244 100644
--- a/include/SFML/Window/Vulkan.hpp
+++ b/include/SFML/Window/Vulkan.hpp
@@ -29,9 +29,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Export.hpp>
 
-#include <cstdint>
 #include <vector>
 
+#include <cstdint>
+
 
 using VkInstance = struct VkInstance_T*;
 
diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp
index 698d07457..2dc8bd0f9 100644
--- a/include/SFML/Window/Window.hpp
+++ b/include/SFML/Window/Window.hpp
@@ -27,12 +27,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Clock.hpp>
-#include <SFML/System/Time.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/GlResource.hpp>
 #include <SFML/Window/WindowBase.hpp>
 
+#include <SFML/System/Clock.hpp>
+#include <SFML/System/Time.hpp>
+
 #include <memory>
 
 
diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp
index 789c27387..637be9a1c 100644
--- a/include/SFML/Window/WindowBase.hpp
+++ b/include/SFML/Window/WindowBase.hpp
@@ -29,11 +29,12 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Export.hpp>
 
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Vulkan.hpp>
 #include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
 
diff --git a/src/SFML/Audio/ALCheck.cpp b/src/SFML/Audio/ALCheck.cpp
index f3fc8cf58..d816ef3aa 100644
--- a/src/SFML/Audio/ALCheck.cpp
+++ b/src/SFML/Audio/ALCheck.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/ALCheck.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
diff --git a/src/SFML/Audio/AudioDevice.cpp b/src/SFML/Audio/AudioDevice.cpp
index 62cf520ce..6e632353c 100644
--- a/src/SFML/Audio/AudioDevice.cpp
+++ b/src/SFML/Audio/AudioDevice.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Audio/ALCheck.hpp>
 #include <SFML/Audio/AudioDevice.hpp>
 #include <SFML/Audio/Listener.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <optional>
diff --git a/src/SFML/Audio/InputSoundFile.cpp b/src/SFML/Audio/InputSoundFile.cpp
index 2719ff66e..46eb3b05e 100644
--- a/src/SFML/Audio/InputSoundFile.cpp
+++ b/src/SFML/Audio/InputSoundFile.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Audio/InputSoundFile.hpp>
 #include <SFML/Audio/SoundFileFactory.hpp>
 #include <SFML/Audio/SoundFileReader.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/FileInputStream.hpp>
 #include <SFML/System/InputStream.hpp>
diff --git a/src/SFML/Audio/Music.cpp b/src/SFML/Audio/Music.cpp
index 605589c68..305e41d38 100644
--- a/src/SFML/Audio/Music.cpp
+++ b/src/SFML/Audio/Music.cpp
@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/ALCheck.hpp>
 #include <SFML/Audio/Music.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Time.hpp>
 
diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp
index 3fd4cbafb..c3accbaa3 100644
--- a/src/SFML/Audio/SoundBuffer.cpp
+++ b/src/SFML/Audio/SoundBuffer.cpp
@@ -31,6 +31,7 @@
 #include <SFML/Audio/OutputSoundFile.hpp>
 #include <SFML/Audio/Sound.hpp>
 #include <SFML/Audio/SoundBuffer.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Time.hpp>
 
diff --git a/src/SFML/Audio/SoundBufferRecorder.cpp b/src/SFML/Audio/SoundBufferRecorder.cpp
index 07359d735..bc5625e57 100644
--- a/src/SFML/Audio/SoundBufferRecorder.cpp
+++ b/src/SFML/Audio/SoundBufferRecorder.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>
diff --git a/src/SFML/Audio/SoundFileFactory.cpp b/src/SFML/Audio/SoundFileFactory.cpp
index 40504cdea..592cc4526 100644
--- a/src/SFML/Audio/SoundFileFactory.cpp
+++ b/src/SFML/Audio/SoundFileFactory.cpp
@@ -33,6 +33,7 @@
 #include <SFML/Audio/SoundFileWriterFlac.hpp>
 #include <SFML/Audio/SoundFileWriterOgg.hpp>
 #include <SFML/Audio/SoundFileWriterWav.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/FileInputStream.hpp>
 #include <SFML/System/MemoryInputStream.hpp>
diff --git a/src/SFML/Audio/SoundFileReaderFlac.cpp b/src/SFML/Audio/SoundFileReaderFlac.cpp
index 865b32b5a..226b6c5c9 100644
--- a/src/SFML/Audio/SoundFileReaderFlac.cpp
+++ b/src/SFML/Audio/SoundFileReaderFlac.cpp
@@ -26,12 +26,14 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReaderFlac.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 
-#include <cassert>
 #include <ostream>
 
+#include <cassert>
+
 
 namespace
 {
diff --git a/src/SFML/Audio/SoundFileReaderMp3.cpp b/src/SFML/Audio/SoundFileReaderMp3.cpp
index 995d1bc8e..b7c251ac5 100644
--- a/src/SFML/Audio/SoundFileReaderMp3.cpp
+++ b/src/SFML/Audio/SoundFileReaderMp3.cpp
@@ -51,9 +51,11 @@
 #undef MINIMP3_NO_STDIO
 
 #include <SFML/Audio/SoundFileReaderMp3.hpp>
+
 #include <SFML/System/InputStream.hpp>
 
 #include <algorithm>
+
 #include <cstring>
 
 
diff --git a/src/SFML/Audio/SoundFileReaderOgg.cpp b/src/SFML/Audio/SoundFileReaderOgg.cpp
index b9c6c0a11..70e5b63f7 100644
--- a/src/SFML/Audio/SoundFileReaderOgg.cpp
+++ b/src/SFML/Audio/SoundFileReaderOgg.cpp
@@ -26,12 +26,14 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReaderOgg.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/MemoryInputStream.hpp>
 
+#include <ostream>
+
 #include <cassert>
 #include <cctype>
-#include <ostream>
 
 
 namespace
diff --git a/src/SFML/Audio/SoundFileReaderWav.cpp b/src/SFML/Audio/SoundFileReaderWav.cpp
index ef8a9424b..5a2704a5f 100644
--- a/src/SFML/Audio/SoundFileReaderWav.cpp
+++ b/src/SFML/Audio/SoundFileReaderWav.cpp
@@ -26,14 +26,16 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReaderWav.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 
 #include <algorithm>
+#include <ostream>
+
 #include <cassert>
 #include <cctype>
 #include <cstring>
-#include <ostream>
 
 
 namespace
diff --git a/src/SFML/Audio/SoundFileWriterFlac.cpp b/src/SFML/Audio/SoundFileWriterFlac.cpp
index a3f73a0b3..d1bf8c0e3 100644
--- a/src/SFML/Audio/SoundFileWriterFlac.cpp
+++ b/src/SFML/Audio/SoundFileWriterFlac.cpp
@@ -26,13 +26,15 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileWriterFlac.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Utils.hpp>
 
 #include <algorithm>
+#include <ostream>
+
 #include <cassert>
 #include <cctype>
-#include <ostream>
 
 
 namespace sf::priv
diff --git a/src/SFML/Audio/SoundFileWriterOgg.cpp b/src/SFML/Audio/SoundFileWriterOgg.cpp
index 354f75e91..7cbefeb9c 100644
--- a/src/SFML/Audio/SoundFileWriterOgg.cpp
+++ b/src/SFML/Audio/SoundFileWriterOgg.cpp
@@ -26,15 +26,17 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileWriterOgg.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Utils.hpp>
 
 #include <algorithm>
-#include <cassert>
-#include <cctype>
 #include <ostream>
 #include <random>
 
+#include <cassert>
+#include <cctype>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileWriterWav.cpp b/src/SFML/Audio/SoundFileWriterWav.cpp
index 5ce7cc7ac..ef86b519f 100644
--- a/src/SFML/Audio/SoundFileWriterWav.cpp
+++ b/src/SFML/Audio/SoundFileWriterWav.cpp
@@ -26,12 +26,14 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileWriterWav.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Utils.hpp>
 
-#include <cassert>
 #include <ostream>
 
+#include <cassert>
+
 
 namespace
 {
diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp
index cf08aca27..22c0cc5d4 100644
--- a/src/SFML/Audio/SoundRecorder.cpp
+++ b/src/SFML/Audio/SoundRecorder.cpp
@@ -28,12 +28,14 @@
 #include <SFML/Audio/ALCheck.hpp>
 #include <SFML/Audio/AudioDevice.hpp>
 #include <SFML/Audio/SoundRecorder.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Sleep.hpp>
 
+#include <ostream>
+
 #include <cassert>
 #include <cstring>
-#include <ostream>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4355) // 'this' used in base member initializer list
diff --git a/src/SFML/Audio/SoundStream.cpp b/src/SFML/Audio/SoundStream.cpp
index fee7c1c31..030429863 100644
--- a/src/SFML/Audio/SoundStream.cpp
+++ b/src/SFML/Audio/SoundStream.cpp
@@ -28,13 +28,15 @@
 #include <SFML/Audio/ALCheck.hpp>
 #include <SFML/Audio/AudioDevice.hpp>
 #include <SFML/Audio/SoundStream.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Sleep.hpp>
 
-#include <cassert>
 #include <mutex>
 #include <ostream>
 
+#include <cassert>
+
 #ifdef _MSC_VER
 #pragma warning(disable : 4355) // 'this' used in base member initializer list
 #endif
diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
index 3ecdce06c..77a1e59f7 100644
--- a/src/SFML/Graphics/Font.cpp
+++ b/src/SFML/Graphics/Font.cpp
@@ -41,11 +41,12 @@
 #include FT_OUTLINE_H
 #include FT_BITMAP_H
 #include FT_STROKER_H
+#include <ostream>
+#include <type_traits>
+
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include <ostream>
-#include <type_traits>
 
 
 namespace
diff --git a/src/SFML/Graphics/GLCheck.cpp b/src/SFML/Graphics/GLCheck.cpp
index 9b45795ad..c6d5dd014 100644
--- a/src/SFML/Graphics/GLCheck.cpp
+++ b/src/SFML/Graphics/GLCheck.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
diff --git a/src/SFML/Graphics/GLExtensions.cpp b/src/SFML/Graphics/GLExtensions.cpp
index 59d220086..8b35c71bf 100644
--- a/src/SFML/Graphics/GLExtensions.cpp
+++ b/src/SFML/Graphics/GLExtensions.cpp
@@ -26,9 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLExtensions.hpp>
-#include <SFML/System/Err.hpp>
+
 #include <SFML/Window/Context.hpp>
 
+#include <SFML/System/Err.hpp>
+
 // We check for this definition in order to avoid multiple definitions of GLAD
 // entities during unity builds of SFML.
 #ifndef SF_GLAD_GL_IMPLEMENTATION_INCLUDED
diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
index de1d0aba1..4f84c9de9 100644
--- a/src/SFML/Graphics/Image.cpp
+++ b/src/SFML/Graphics/Image.cpp
@@ -27,14 +27,16 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/ImageLoader.hpp>
+
 #include <SFML/System/Err.hpp>
 #ifdef SFML_SYSTEM_ANDROID
 #include <SFML/System/Android/ResourceStream.hpp>
 #endif
 #include <algorithm>
-#include <cstring>
 #include <ostream>
 
+#include <cstring>
+
 
 namespace sf
 {
diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp
index d5965838c..bdf108257 100644
--- a/src/SFML/Graphics/ImageLoader.cpp
+++ b/src/SFML/Graphics/ImageLoader.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/ImageLoader.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 #include <SFML/System/Utils.hpp>
diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp
index 3eb3130c0..806ff0247 100644
--- a/src/SFML/Graphics/RenderTarget.cpp
+++ b/src/SFML/Graphics/RenderTarget.cpp
@@ -32,17 +32,20 @@
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
 #include <SFML/Graphics/VertexBuffer.hpp>
-#include <SFML/System/Err.hpp>
+
 #include <SFML/Window/Context.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <algorithm>
-#include <cassert>
-#include <cmath>
 #include <iostream>
 #include <mutex>
 #include <ostream>
 #include <unordered_map>
 
+#include <cassert>
+#include <cmath>
+
 
 namespace
 {
diff --git a/src/SFML/Graphics/RenderTexture.cpp b/src/SFML/Graphics/RenderTexture.cpp
index a6c873a89..f38945c60 100644
--- a/src/SFML/Graphics/RenderTexture.cpp
+++ b/src/SFML/Graphics/RenderTexture.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Graphics/RenderTexture.hpp>
 #include <SFML/Graphics/RenderTextureImplDefault.hpp>
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <memory>
diff --git a/src/SFML/Graphics/RenderTextureImplDefault.cpp b/src/SFML/Graphics/RenderTextureImplDefault.cpp
index 9894e5b6b..2cf9f1d89 100644
--- a/src/SFML/Graphics/RenderTextureImplDefault.cpp
+++ b/src/SFML/Graphics/RenderTextureImplDefault.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/RenderTextureImplDefault.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>
+
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 
diff --git a/src/SFML/Graphics/RenderTextureImplDefault.hpp b/src/SFML/Graphics/RenderTextureImplDefault.hpp
index 82c2ffad4..f97e6ab63 100644
--- a/src/SFML/Graphics/RenderTextureImplDefault.hpp
+++ b/src/SFML/Graphics/RenderTextureImplDefault.hpp
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTextureImpl.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <memory>
diff --git a/src/SFML/Graphics/RenderTextureImplFBO.cpp b/src/SFML/Graphics/RenderTextureImplFBO.cpp
index 223a23496..eea18150c 100644
--- a/src/SFML/Graphics/RenderTextureImplFBO.cpp
+++ b/src/SFML/Graphics/RenderTextureImplFBO.cpp
@@ -28,10 +28,12 @@
 #include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
 #include <SFML/Graphics/Texture.hpp>
-#include <SFML/System/Err.hpp>
+
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <mutex>
 #include <ostream>
 #include <set>
diff --git a/src/SFML/Graphics/RenderTextureImplFBO.hpp b/src/SFML/Graphics/RenderTextureImplFBO.hpp
index 435623b3f..faa4f5168 100644
--- a/src/SFML/Graphics/RenderTextureImplFBO.hpp
+++ b/src/SFML/Graphics/RenderTextureImplFBO.hpp
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTextureImpl.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <memory>
diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp
index ef7d457ce..344a0a32a 100644
--- a/src/SFML/Graphics/RenderWindow.cpp
+++ b/src/SFML/Graphics/RenderWindow.cpp
@@ -30,6 +30,7 @@
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include <SFML/Graphics/Texture.hpp>
+
 #include <SFML/Window/VideoMode.hpp>
 
 
diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp
index 1698c40b3..08b556460 100644
--- a/src/SFML/Graphics/Shader.cpp
+++ b/src/SFML/Graphics/Shader.cpp
@@ -31,10 +31,12 @@
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/Transform.hpp>
+
+#include <SFML/Window/Context.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 #include <SFML/System/Utils.hpp>
-#include <SFML/Window/Context.hpp>
 
 #include <fstream>
 #include <iomanip>
diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp
index f1ecef46e..ca36a92ba 100644
--- a/src/SFML/Graphics/Text.cpp
+++ b/src/SFML/Graphics/Text.cpp
@@ -31,9 +31,10 @@
 #include <SFML/Graphics/Texture.hpp>
 
 #include <algorithm>
-#include <cmath>
 #include <utility>
 
+#include <cmath>
+
 
 namespace
 {
diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp
index 0d928a49f..c7a67e3f6 100644
--- a/src/SFML/Graphics/Texture.cpp
+++ b/src/SFML/Graphics/Texture.cpp
@@ -29,16 +29,19 @@
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>
-#include <SFML/System/Err.hpp>
+
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/Window.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <atomic>
+#include <ostream>
+#include <utility>
+
 #include <cassert>
 #include <climits>
 #include <cstring>
-#include <ostream>
-#include <utility>
 
 
 namespace
diff --git a/src/SFML/Graphics/Transform.cpp b/src/SFML/Graphics/Transform.cpp
index 07cb337ef..91742c136 100644
--- a/src/SFML/Graphics/Transform.cpp
+++ b/src/SFML/Graphics/Transform.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 
 #include <cmath>
diff --git a/src/SFML/Graphics/VertexBuffer.cpp b/src/SFML/Graphics/VertexBuffer.cpp
index df7c12fd2..296c93915 100644
--- a/src/SFML/Graphics/VertexBuffer.cpp
+++ b/src/SFML/Graphics/VertexBuffer.cpp
@@ -29,12 +29,14 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Vertex.hpp>
 #include <SFML/Graphics/VertexBuffer.hpp>
+
 #include <SFML/System/Err.hpp>
 
+#include <ostream>
+#include <utility>
+
 #include <cstddef>
 #include <cstring>
-#include <ostream>
-#include <utility>
 
 namespace
 {
diff --git a/src/SFML/Main/MainAndroid.cpp b/src/SFML/Main/MainAndroid.cpp
index aa71e77e5..86d8912eb 100644
--- a/src/SFML/Main/MainAndroid.cpp
+++ b/src/SFML/Main/MainAndroid.cpp
@@ -46,11 +46,12 @@
 #include <android/native_activity.h>
 #include <android/window.h>
 
-#include <cassert>
-#include <cstring>
 #include <mutex>
 #include <thread>
 
+#include <cassert>
+#include <cstring>
+
 #define SF_GLAD_EGL_IMPLEMENTATION
 #include <glad/egl.h>
 
diff --git a/src/SFML/Network/Ftp.cpp b/src/SFML/Network/Ftp.cpp
index 1b56300dd..ed36b40a7 100644
--- a/src/SFML/Network/Ftp.cpp
+++ b/src/SFML/Network/Ftp.cpp
@@ -27,17 +27,19 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Ftp.hpp>
 #include <SFML/Network/IpAddress.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>
-#include <cctype>
-#include <cstdio>
 #include <fstream>
 #include <iterator>
 #include <ostream>
 #include <sstream>
 #include <utility>
 
+#include <cctype>
+#include <cstdio>
+
 
 namespace sf
 {
diff --git a/src/SFML/Network/Http.cpp b/src/SFML/Network/Http.cpp
index 02841ae9e..a55995889 100644
--- a/src/SFML/Network/Http.cpp
+++ b/src/SFML/Network/Http.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Http.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Utils.hpp>
 
diff --git a/src/SFML/Network/IpAddress.cpp b/src/SFML/Network/IpAddress.cpp
index 6e297680b..be4c3e407 100644
--- a/src/SFML/Network/IpAddress.cpp
+++ b/src/SFML/Network/IpAddress.cpp
@@ -29,11 +29,12 @@
 #include <SFML/Network/IpAddress.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 
-#include <cstring>
 #include <istream>
 #include <ostream>
 #include <utility>
 
+#include <cstring>
+
 
 namespace sf
 {
diff --git a/src/SFML/Network/Packet.cpp b/src/SFML/Network/Packet.cpp
index 3f41038db..e67384681 100644
--- a/src/SFML/Network/Packet.cpp
+++ b/src/SFML/Network/Packet.cpp
@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
+
 #include <SFML/System/String.hpp>
 
 #include <cstring>
diff --git a/src/SFML/Network/Socket.cpp b/src/SFML/Network/Socket.cpp
index ecae65f78..a1e0352ab 100644
--- a/src/SFML/Network/Socket.cpp
+++ b/src/SFML/Network/Socket.cpp
@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Socket.hpp>
 #include <SFML/Network/SocketImpl.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
diff --git a/src/SFML/Network/SocketSelector.cpp b/src/SFML/Network/SocketSelector.cpp
index c7fb08364..bc8bf1c8b 100644
--- a/src/SFML/Network/SocketSelector.cpp
+++ b/src/SFML/Network/SocketSelector.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Network/Socket.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/Network/SocketSelector.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>
diff --git a/src/SFML/Network/TcpListener.cpp b/src/SFML/Network/TcpListener.cpp
index ab1ba8408..40bdaa8a6 100644
--- a/src/SFML/Network/TcpListener.cpp
+++ b/src/SFML/Network/TcpListener.cpp
@@ -28,6 +28,7 @@
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/Network/TcpListener.hpp>
 #include <SFML/Network/TcpSocket.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp
index a94f8a43d..890a5ef42 100644
--- a/src/SFML/Network/TcpSocket.cpp
+++ b/src/SFML/Network/TcpSocket.cpp
@@ -29,12 +29,14 @@
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/Network/TcpSocket.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>
-#include <cstring>
 #include <ostream>
 
+#include <cstring>
+
 #ifdef _MSC_VER
 #pragma warning(disable : 4127) // "conditional expression is constant" generated by the FD_SET macro
 #endif
diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp
index 1247b3aea..5e1ea1052 100644
--- a/src/SFML/Network/UdpSocket.cpp
+++ b/src/SFML/Network/UdpSocket.cpp
@@ -29,11 +29,13 @@
 #include <SFML/Network/Packet.hpp>
 #include <SFML/Network/SocketImpl.hpp>
 #include <SFML/Network/UdpSocket.hpp>
+
 #include <SFML/System/Err.hpp>
 
-#include <cstddef>
 #include <ostream>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/src/SFML/Network/Unix/SocketImpl.cpp b/src/SFML/Network/Unix/SocketImpl.cpp
index 876c8c290..1eeb626c6 100644
--- a/src/SFML/Network/Unix/SocketImpl.cpp
+++ b/src/SFML/Network/Unix/SocketImpl.cpp
@@ -26,12 +26,14 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Unix/SocketImpl.hpp>
+
 #include <SFML/System/Err.hpp>
 
+#include <fcntl.h>
+#include <ostream>
+
 #include <cerrno>
 #include <cstring>
-#include <fcntl.h>
-#include <ostream>
 
 
 namespace sf::priv
diff --git a/src/SFML/Network/Unix/SocketImpl.hpp b/src/SFML/Network/Unix/SocketImpl.hpp
index a8ae7ecf4..f2bc26128 100644
--- a/src/SFML/Network/Unix/SocketImpl.hpp
+++ b/src/SFML/Network/Unix/SocketImpl.hpp
@@ -30,7 +30,6 @@
 #include <SFML/Network/Socket.hpp>
 
 #include <arpa/inet.h>
-#include <cstdint>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -38,6 +37,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Network/Win32/SocketImpl.hpp b/src/SFML/Network/Win32/SocketImpl.hpp
index 1e394f0b7..10d8c32c0 100644
--- a/src/SFML/Network/Win32/SocketImpl.hpp
+++ b/src/SFML/Network/Win32/SocketImpl.hpp
@@ -28,12 +28,14 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Socket.hpp>
+
 #include <SFML/System/Win32/WindowsHeader.hpp>
 
-#include <cstdint>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/PCH.hpp b/src/SFML/PCH.hpp
index 8009cc5f0..06ff90e7f 100644
--- a/src/SFML/PCH.hpp
+++ b/src/SFML/PCH.hpp
@@ -45,12 +45,7 @@
 #include <SFML/System/Vector2.hpp>
 
 #include <algorithm>
-#include <cassert>
 #include <chrono>
-#include <cmath>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
 #include <filesystem>
 #include <iostream>
 #include <locale>
@@ -61,3 +56,9 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+
+#include <cassert>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
diff --git a/src/SFML/System/Err.cpp b/src/SFML/System/Err.cpp
index d35e95abf..bd81ae8c1 100644
--- a/src/SFML/System/Err.cpp
+++ b/src/SFML/System/Err.cpp
@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Err.hpp>
 
-#include <cstdio>
 #include <iostream>
 #include <streambuf>
 
+#include <cstdio>
+
 
 namespace
 {
diff --git a/src/SFML/System/FileInputStream.cpp b/src/SFML/System/FileInputStream.cpp
index 40fd093cf..eb85c0d09 100644
--- a/src/SFML/System/FileInputStream.cpp
+++ b/src/SFML/System/FileInputStream.cpp
@@ -29,9 +29,10 @@
 #ifdef SFML_SYSTEM_ANDROID
 #include <SFML/System/Android/ResourceStream.hpp>
 #endif
-#include <cstddef>
 #include <memory>
 
+#include <cstddef>
+
 namespace sf
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/String.cpp b/src/SFML/System/String.cpp
index 32333b5e1..4c0e99495 100644
--- a/src/SFML/System/String.cpp
+++ b/src/SFML/System/String.cpp
@@ -28,10 +28,11 @@
 #include <SFML/System/String.hpp>
 #include <SFML/System/Utf.hpp>
 
-#include <cstring>
 #include <iterator>
 #include <utility>
 
+#include <cstring>
+
 
 namespace sf
 {
diff --git a/src/SFML/System/Utils.hpp b/src/SFML/System/Utils.hpp
index 2a6760026..30dda7960 100644
--- a/src/SFML/System/Utils.hpp
+++ b/src/SFML/System/Utils.hpp
@@ -27,11 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <cctype>
 #include <filesystem>
 #include <sstream>
 #include <string>
 
+#include <cctype>
+
 
 namespace sf
 {
diff --git a/src/SFML/System/Vector2.cpp b/src/SFML/System/Vector2.cpp
index 53b1a8d69..397ea8aec 100644
--- a/src/SFML/System/Vector2.cpp
+++ b/src/SFML/System/Vector2.cpp
@@ -24,9 +24,10 @@
 
 #include <SFML/System/Vector2.hpp>
 
+#include <type_traits>
+
 #include <cassert>
 #include <cmath>
-#include <type_traits>
 
 
 namespace sf
diff --git a/src/SFML/System/Vector3.cpp b/src/SFML/System/Vector3.cpp
index ccfe8e10e..313539fc8 100644
--- a/src/SFML/System/Vector3.cpp
+++ b/src/SFML/System/Vector3.cpp
@@ -24,9 +24,10 @@
 
 #include <SFML/System/Vector3.hpp>
 
+#include <type_traits>
+
 #include <cassert>
 #include <cmath>
-#include <type_traits>
 
 
 namespace sf
diff --git a/src/SFML/Window/Android/ClipboardImpl.cpp b/src/SFML/Window/Android/ClipboardImpl.cpp
index aa38e41cb..d1e9cfe57 100644
--- a/src/SFML/Window/Android/ClipboardImpl.cpp
+++ b/src/SFML/Window/Android/ClipboardImpl.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Android/ClipboardImpl.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/String.hpp>
-#include <SFML/Window/Android/ClipboardImpl.hpp>
 
 #include <ostream>
 
diff --git a/src/SFML/Window/Android/CursorImpl.hpp b/src/SFML/Window/Android/CursorImpl.hpp
index 9b7d4b9b9..23f7ee811 100644
--- a/src/SFML/Window/Android/CursorImpl.hpp
+++ b/src/SFML/Window/Android/CursorImpl.hpp
@@ -27,9 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/Android/InputImpl.cpp b/src/SFML/Window/Android/InputImpl.cpp
index e75f8289a..b9a0d8c7b 100644
--- a/src/SFML/Window/Android/InputImpl.cpp
+++ b/src/SFML/Window/Android/InputImpl.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Android/InputImpl.hpp>
+
 #include <SFML/System/Android/Activity.hpp>
 #include <SFML/System/Err.hpp>
-#include <SFML/Window/Android/InputImpl.hpp>
 
 #include <jni.h>
 
diff --git a/src/SFML/Window/Android/SensorImpl.cpp b/src/SFML/Window/Android/SensorImpl.cpp
index be976f4cb..cecd32aa5 100644
--- a/src/SFML/Window/Android/SensorImpl.cpp
+++ b/src/SFML/Window/Android/SensorImpl.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Time.hpp>
 #include <SFML/Window/SensorImpl.hpp>
 
+#include <SFML/System/Time.hpp>
+
 #include <android/looper.h>
 
 #if defined(__clang__) || defined(__GNUC__)
diff --git a/src/SFML/Window/Android/VideoModeImpl.cpp b/src/SFML/Window/Android/VideoModeImpl.cpp
index b66ab10f9..c857ba5e4 100644
--- a/src/SFML/Window/Android/VideoModeImpl.cpp
+++ b/src/SFML/Window/Android/VideoModeImpl.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/VideoModeImpl.hpp>
+
 #include <SFML/System/Android/Activity.hpp>
 #include <SFML/System/Sleep.hpp>
 #include <SFML/System/Vector2.hpp>
-#include <SFML/Window/VideoModeImpl.hpp>
 
 #include <mutex>
 
diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp
index 415bf5a99..265d76b06 100644
--- a/src/SFML/Window/Android/WindowImplAndroid.cpp
+++ b/src/SFML/Window/Android/WindowImplAndroid.cpp
@@ -26,11 +26,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Android/WindowImplAndroid.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <android/looper.h>
 
 #include <mutex>
diff --git a/src/SFML/Window/Android/WindowImplAndroid.hpp b/src/SFML/Window/Android/WindowImplAndroid.hpp
index 4f9866c08..96f641df2 100644
--- a/src/SFML/Window/Android/WindowImplAndroid.hpp
+++ b/src/SFML/Window/Android/WindowImplAndroid.hpp
@@ -27,11 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Android/Activity.hpp>
 #include <SFML/Window/EglContext.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Android/Activity.hpp>
+
 #include <android/input.h>
 
 
diff --git a/src/SFML/Window/Clipboard.cpp b/src/SFML/Window/Clipboard.cpp
index cd55c2756..c1be12189 100644
--- a/src/SFML/Window/Clipboard.cpp
+++ b/src/SFML/Window/Clipboard.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/Clipboard.hpp>
 #include <SFML/Window/ClipboardImpl.hpp>
 
+#include <SFML/System/String.hpp>
+
 
 namespace sf
 {
diff --git a/src/SFML/Window/Context.cpp b/src/SFML/Window/Context.cpp
index 6076e7efb..a3ee080b2 100644
--- a/src/SFML/Window/Context.cpp
+++ b/src/SFML/Window/Context.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/GlContext.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ostream>
 
 
diff --git a/src/SFML/Window/Cursor.cpp b/src/SFML/Window/Cursor.cpp
index 37a79d6c2..265d83b11 100644
--- a/src/SFML/Window/Cursor.cpp
+++ b/src/SFML/Window/Cursor.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 #include <SFML/Window/CursorImpl.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
 namespace sf
diff --git a/src/SFML/Window/DRM/ClipboardImpl.cpp b/src/SFML/Window/DRM/ClipboardImpl.cpp
index 02f946e25..3fc2f7e5c 100644
--- a/src/SFML/Window/DRM/ClipboardImpl.cpp
+++ b/src/SFML/Window/DRM/ClipboardImpl.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/DRM/ClipboardImpl.hpp>
 
+#include <SFML/System/String.hpp>
+
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/DRM/CursorImpl.hpp b/src/SFML/Window/DRM/CursorImpl.hpp
index 0039c509b..9c958c73e 100644
--- a/src/SFML/Window/DRM/CursorImpl.hpp
+++ b/src/SFML/Window/DRM/CursorImpl.hpp
@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 #include <SFML/Window/WindowStyle.hpp> // Prevent conflict with macro None from Xlib
 
+#include <SFML/System/Vector2.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/DRM/DRMContext.cpp b/src/SFML/Window/DRM/DRMContext.cpp
index 5cfeb8749..43bd3659a 100644
--- a/src/SFML/Window/DRM/DRMContext.cpp
+++ b/src/SFML/Window/DRM/DRMContext.cpp
@@ -26,19 +26,21 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Sleep.hpp>
 #include <SFML/Window/DRM/DRMContext.hpp>
 #include <SFML/Window/DRM/WindowImplDRM.hpp>
 
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Sleep.hpp>
+
 #include <fcntl.h>
 #include <poll.h>
 #include <unistd.h>
 #include <xf86drm.h>
 
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
+
 // We check for this definition in order to avoid multiple definitions of GLAD
 // entities during unity builds of SFML.
 #ifndef SF_GLAD_EGL_IMPLEMENTATION_INCLUDED
diff --git a/src/SFML/Window/DRM/InputImplUDev.cpp b/src/SFML/Window/DRM/InputImplUDev.cpp
index af7df8bdd..ccddfe0b1 100644
--- a/src/SFML/Window/DRM/InputImplUDev.cpp
+++ b/src/SFML/Window/DRM/InputImplUDev.cpp
@@ -25,14 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/DRM/InputImplUDev.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <algorithm>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <mutex>
@@ -43,6 +40,11 @@
 #include <unistd.h>
 #include <vector>
 
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 
 namespace
 {
diff --git a/src/SFML/Window/DRM/VideoModeImpl.cpp b/src/SFML/Window/DRM/VideoModeImpl.cpp
index 6c1bacddd..69867b6ec 100644
--- a/src/SFML/Window/DRM/VideoModeImpl.cpp
+++ b/src/SFML/Window/DRM/VideoModeImpl.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/DRM/DRMContext.hpp>
 #include <SFML/Window/VideoModeImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/DRM/WindowImplDRM.cpp b/src/SFML/Window/DRM/WindowImplDRM.cpp
index b3ba7315d..5b98139ca 100644
--- a/src/SFML/Window/DRM/WindowImplDRM.cpp
+++ b/src/SFML/Window/DRM/WindowImplDRM.cpp
@@ -25,13 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/DRM/DRMContext.hpp>
 #include <SFML/Window/DRM/InputImplUDev.hpp>
 #include <SFML/Window/DRM/WindowImplDRM.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System/Err.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/EGLCheck.cpp b/src/SFML/Window/EGLCheck.cpp
index 7d4d76468..a81b0417b 100644
--- a/src/SFML/Window/EGLCheck.cpp
+++ b/src/SFML/Window/EGLCheck.cpp
@@ -26,9 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/EGLCheck.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <glad/egl.h>
 
 #include <ostream>
diff --git a/src/SFML/Window/EglContext.cpp b/src/SFML/Window/EglContext.cpp
index 925921853..2f07f6a50 100644
--- a/src/SFML/Window/EglContext.cpp
+++ b/src/SFML/Window/EglContext.cpp
@@ -26,11 +26,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Sleep.hpp>
 #include <SFML/Window/EglContext.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Sleep.hpp>
+
 #include <memory>
 #include <mutex>
 #include <ostream>
diff --git a/src/SFML/Window/FreeBSD/JoystickImpl.cpp b/src/SFML/Window/FreeBSD/JoystickImpl.cpp
index 305fc0935..20c67f3ec 100644
--- a/src/SFML/Window/FreeBSD/JoystickImpl.cpp
+++ b/src/SFML/Window/FreeBSD/JoystickImpl.cpp
@@ -28,7 +28,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
 
-#include <cstring>
 #include <dirent.h>
 #include <fcntl.h>
 #include <string>
@@ -37,6 +36,8 @@
 #include <unordered_map>
 #include <utility>
 
+#include <cstring>
+
 ////////////////////////////////////////////////////////////
 /// \brief This file implements FreeBSD driver joystick
 ///
diff --git a/src/SFML/Window/GlContext.cpp b/src/SFML/Window/GlContext.cpp
index 636ed6cde..4c3e31001 100644
--- a/src/SFML/Window/GlContext.cpp
+++ b/src/SFML/Window/GlContext.cpp
@@ -25,18 +25,15 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/GlContext.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <glad/gl.h>
 
 #include <algorithm>
 #include <atomic>
-#include <cassert>
-#include <cctype>
-#include <cstdlib>
-#include <cstring>
 #include <iomanip>
 #include <memory>
 #include <mutex>
@@ -47,6 +44,11 @@
 #include <utility>
 #include <vector>
 
+#include <cassert>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+
 
 #if defined(SFML_SYSTEM_WINDOWS)
 
diff --git a/src/SFML/Window/GlContext.hpp b/src/SFML/Window/GlContext.hpp
index 96f1c8981..a42587495 100644
--- a/src/SFML/Window/GlContext.hpp
+++ b/src/SFML/Window/GlContext.hpp
@@ -33,9 +33,10 @@
 #include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/GlResource.hpp>
 
-#include <cstdint>
 #include <memory>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/Keyboard.cpp b/src/SFML/Window/Keyboard.cpp
index e5923686a..449ae0d62 100644
--- a/src/SFML/Window/Keyboard.cpp
+++ b/src/SFML/Window/Keyboard.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/InputImpl.hpp>
 #include <SFML/Window/Keyboard.hpp>
 
+#include <SFML/System/String.hpp>
+
 
 namespace sf
 {
diff --git a/src/SFML/Window/NetBSD/JoystickImpl.cpp b/src/SFML/Window/NetBSD/JoystickImpl.cpp
index 4d8c5adec..e62ba3489 100644
--- a/src/SFML/Window/NetBSD/JoystickImpl.cpp
+++ b/src/SFML/Window/NetBSD/JoystickImpl.cpp
@@ -28,7 +28,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
 
-#include <cstring>
 #include <dirent.h>
 #include <fcntl.h>
 #include <string>
@@ -37,6 +36,8 @@
 #include <unordered_map>
 #include <utility>
 
+#include <cstring>
+
 ////////////////////////////////////////////////////////////
 /// \brief This file implements NetBSD driver joystick
 ///
diff --git a/src/SFML/Window/OSX/ClipboardImpl.mm b/src/SFML/Window/OSX/ClipboardImpl.mm
index 4b80cbe2b..55d7ddef3 100644
--- a/src/SFML/Window/OSX/ClipboardImpl.mm
+++ b/src/SFML/Window/OSX/ClipboardImpl.mm
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/ClipboardImpl.hpp>
 
+#include <SFML/System/String.hpp>
+
 #import <AppKit/AppKit.h>
 
 namespace sf::priv
diff --git a/src/SFML/Window/OSX/CursorImpl.hpp b/src/SFML/Window/OSX/CursorImpl.hpp
index e97bdfa0e..3610af6d3 100644
--- a/src/SFML/Window/OSX/CursorImpl.hpp
+++ b/src/SFML/Window/OSX/CursorImpl.hpp
@@ -28,9 +28,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 ////////////////////////////////////////////////////////////
 // Predefine OBJ-C classes
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/OSX/HIDInputManager.hpp b/src/SFML/Window/OSX/HIDInputManager.hpp
index 5440f709f..64d5d1838 100644
--- a/src/SFML/Window/OSX/HIDInputManager.hpp
+++ b/src/SFML/Window/OSX/HIDInputManager.hpp
@@ -31,11 +31,12 @@
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/Window/Keyboard.hpp>
 
-#include <Carbon/Carbon.h>
 #include <IOKit/hid/IOHIDDevice.h>
 #include <IOKit/hid/IOHIDManager.h>
 #include <vector>
 
+#include <Carbon/Carbon.h>
+
 namespace sf::priv
 {
 
diff --git a/src/SFML/Window/OSX/HIDInputManager.mm b/src/SFML/Window/OSX/HIDInputManager.mm
index 95c75f7ab..758cce971 100644
--- a/src/SFML/Window/OSX/HIDInputManager.mm
+++ b/src/SFML/Window/OSX/HIDInputManager.mm
@@ -26,9 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/OSX/HIDInputManager.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <AppKit/AppKit.h>
 #include <ostream>
 
diff --git a/src/SFML/Window/OSX/InputImpl.mm b/src/SFML/Window/OSX/InputImpl.mm
index 82e3a6e8a..4749c3090 100644
--- a/src/SFML/Window/OSX/InputImpl.mm
+++ b/src/SFML/Window/OSX/InputImpl.mm
@@ -26,7 +26,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/HIDInputManager.hpp>
 #include <SFML/Window/OSX/InputImpl.hpp>
@@ -34,6 +33,8 @@
 #include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/Window.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #import <AppKit/AppKit.h>
 #include <ostream>
 
diff --git a/src/SFML/Window/OSX/JoystickImpl.cpp b/src/SFML/Window/OSX/JoystickImpl.cpp
index 1a2b68074..9f73ab657 100644
--- a/src/SFML/Window/OSX/JoystickImpl.cpp
+++ b/src/SFML/Window/OSX/JoystickImpl.cpp
@@ -26,12 +26,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/HIDInputManager.hpp>
 #include <SFML/Window/OSX/HIDJoystickManager.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ostream>
 
 
diff --git a/src/SFML/Window/OSX/JoystickImpl.hpp b/src/SFML/Window/OSX/JoystickImpl.hpp
index 6608f0a59..0067b991a 100644
--- a/src/SFML/Window/OSX/JoystickImpl.hpp
+++ b/src/SFML/Window/OSX/JoystickImpl.hpp
@@ -30,12 +30,13 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
 
-#include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDDevice.h>
 #include <IOKit/hid/IOHIDKeys.h>
 #include <unordered_map>
 #include <vector>
 
+#include <CoreFoundation/CoreFoundation.h>
+
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/OSX/NSImage+raw.h b/src/SFML/Window/OSX/NSImage+raw.h
index d37c6b685..7c0fa92c4 100644
--- a/src/SFML/Window/OSX/NSImage+raw.h
+++ b/src/SFML/Window/OSX/NSImage+raw.h
@@ -29,6 +29,7 @@
 #include <SFML/Config.hpp>
 
 #import <AppKit/AppKit.h>
+
 #include <cstdint>
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/OSX/SFContext.mm b/src/SFML/Window/OSX/SFContext.mm
index 8579436d8..e5535aa46 100644
--- a/src/SFML/Window/OSX/SFContext.mm
+++ b/src/SFML/Window/OSX/SFContext.mm
@@ -26,11 +26,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #include <SFML/Window/OSX/SFContext.hpp>
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <dlfcn.h>
 #include <ostream>
 
diff --git a/src/SFML/Window/OSX/SFOpenGLView.mm b/src/SFML/Window/OSX/SFOpenGLView.mm
index f1d2cb379..3ed94cda5 100644
--- a/src/SFML/Window/OSX/SFOpenGLView.mm
+++ b/src/SFML/Window/OSX/SFOpenGLView.mm
@@ -26,12 +26,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #import <SFML/Window/OSX/SFOpenGLView+mouse_priv.h>
 #import <SFML/Window/OSX/SFOpenGLView.h>
 #import <SFML/Window/OSX/SFSilentResponder.h>
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 
diff --git a/src/SFML/Window/OSX/SFViewController.mm b/src/SFML/Window/OSX/SFViewController.mm
index ba4a10d7a..8e9acbaa0 100644
--- a/src/SFML/Window/OSX/SFViewController.mm
+++ b/src/SFML/Window/OSX/SFViewController.mm
@@ -26,12 +26,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #import <SFML/Window/OSX/SFApplication.h>
 #import <SFML/Window/OSX/SFOpenGLView.h>
 #import <SFML/Window/OSX/SFViewController.h>
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ostream>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/src/SFML/Window/OSX/SFWindowController.mm b/src/SFML/Window/OSX/SFWindowController.mm
index 5403982e5..17d67ed54 100644
--- a/src/SFML/Window/OSX/SFWindowController.mm
+++ b/src/SFML/Window/OSX/SFWindowController.mm
@@ -26,7 +26,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #import <SFML/Window/OSX/NSImage+raw.h>
 #import <SFML/Window/OSX/SFApplication.h>
 #import <SFML/Window/OSX/SFOpenGLView.h>
@@ -38,6 +37,8 @@
 #include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ApplicationServices/ApplicationServices.h>
 #import <OpenGL/OpenGL.h>
 #include <algorithm>
diff --git a/src/SFML/Window/OSX/VideoModeImpl.cpp b/src/SFML/Window/OSX/VideoModeImpl.cpp
index f92e1dc96..b8f40ebb6 100644
--- a/src/SFML/Window/OSX/VideoModeImpl.cpp
+++ b/src/SFML/Window/OSX/VideoModeImpl.cpp
@@ -26,10 +26,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/OSX/cg_sf_conversion.hpp>
 #include <SFML/Window/VideoModeImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <algorithm>
 #include <ostream>
 
diff --git a/src/SFML/Window/OSX/WindowImplCocoa.mm b/src/SFML/Window/OSX/WindowImplCocoa.mm
index 7870264e1..57fc3c741 100644
--- a/src/SFML/Window/OSX/WindowImplCocoa.mm
+++ b/src/SFML/Window/OSX/WindowImplCocoa.mm
@@ -26,8 +26,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/String.hpp>
 #include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
 #import <SFML/Window/OSX/SFApplication.h>
 #import <SFML/Window/OSX/SFApplicationDelegate.h>
@@ -38,6 +36,9 @@
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 #import <SFML/Window/OSX/cpp_objc_conversion.h>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
+
 #include <ostream>
 
 namespace sf::priv
diff --git a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h
index 811215614..f8063d98a 100644
--- a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h
+++ b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h
@@ -31,6 +31,7 @@
 #include <SFML/Window/WindowHandle.hpp>
 
 #import <AppKit/AppKit.h>
+
 #include <cstdint>
 
 #pragma GCC diagnostic push
diff --git a/src/SFML/Window/OSX/cg_sf_conversion.mm b/src/SFML/Window/OSX/cg_sf_conversion.mm
index fe134dd6e..143583c9d 100644
--- a/src/SFML/Window/OSX/cg_sf_conversion.mm
+++ b/src/SFML/Window/OSX/cg_sf_conversion.mm
@@ -26,10 +26,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #import <SFML/Window/OSX/Scaling.h>
 #include <SFML/Window/OSX/cg_sf_conversion.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 namespace sf::priv
diff --git a/src/SFML/Window/OSX/cpp_objc_conversion.mm b/src/SFML/Window/OSX/cpp_objc_conversion.mm
index fa805377e..33b62b949 100644
--- a/src/SFML/Window/OSX/cpp_objc_conversion.mm
+++ b/src/SFML/Window/OSX/cpp_objc_conversion.mm
@@ -26,9 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Utf.hpp>
 #import <SFML/Window/OSX/cpp_objc_conversion.h>
 
+#include <SFML/System/Utf.hpp>
+
 #import <Foundation/Foundation.h>
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/SensorManager.cpp b/src/SFML/Window/SensorManager.cpp
index 23f4f077d..a26e9cd1b 100644
--- a/src/SFML/Window/SensorManager.cpp
+++ b/src/SFML/Window/SensorManager.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/SensorManager.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ostream>
 
 
diff --git a/src/SFML/Window/Unix/ClipboardImpl.cpp b/src/SFML/Window/Unix/ClipboardImpl.cpp
index 1ac66c17b..4f3a3e28a 100644
--- a/src/SFML/Window/Unix/ClipboardImpl.cpp
+++ b/src/SFML/Window/Unix/ClipboardImpl.cpp
@@ -25,11 +25,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Unix/ClipboardImpl.hpp>
+#include <SFML/Window/Unix/Display.hpp>
+
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Time.hpp>
-#include <SFML/Window/Unix/ClipboardImpl.hpp>
-#include <SFML/Window/Unix/Display.hpp>
 
 #include <X11/Xatom.h>
 
diff --git a/src/SFML/Window/Unix/ClipboardImpl.hpp b/src/SFML/Window/Unix/ClipboardImpl.hpp
index cf317f765..9a35dc674 100644
--- a/src/SFML/Window/Unix/ClipboardImpl.hpp
+++ b/src/SFML/Window/Unix/ClipboardImpl.hpp
@@ -27,9 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/WindowStyle.hpp> // Prevent conflict with macro None from Xlib
 
+#include <SFML/System/String.hpp>
+
 #include <X11/Xlib.h>
 
 #include <deque>
diff --git a/src/SFML/Window/Unix/CursorImpl.cpp b/src/SFML/Window/Unix/CursorImpl.cpp
index b9844f5c9..2b2ab31a1 100644
--- a/src/SFML/Window/Unix/CursorImpl.cpp
+++ b/src/SFML/Window/Unix/CursorImpl.cpp
@@ -32,9 +32,10 @@
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 
+#include <vector>
+
 #include <cassert>
 #include <cstdlib>
-#include <vector>
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/Unix/CursorImpl.hpp b/src/SFML/Window/Unix/CursorImpl.hpp
index d0369bd1d..efde7a74d 100644
--- a/src/SFML/Window/Unix/CursorImpl.hpp
+++ b/src/SFML/Window/Unix/CursorImpl.hpp
@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 #include <SFML/Window/WindowStyle.hpp> // Prevent conflict with macro None from Xlib
 
+#include <SFML/System/Vector2.hpp>
+
 #include <X11/Xlib.h>
 
 namespace sf::priv
diff --git a/src/SFML/Window/Unix/Display.cpp b/src/SFML/Window/Unix/Display.cpp
index 68a4779be..29da83c9b 100644
--- a/src/SFML/Window/Unix/Display.cpp
+++ b/src/SFML/Window/Unix/Display.cpp
@@ -25,17 +25,19 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <X11/keysym.h>
 
-#include <cassert>
-#include <cstdlib>
 #include <mutex>
 #include <ostream>
 #include <unordered_map>
 
+#include <cassert>
+#include <cstdlib>
+
 
 namespace
 {
diff --git a/src/SFML/Window/Unix/GlxContext.cpp b/src/SFML/Window/Unix/GlxContext.cpp
index cc18829bb..6e91d101b 100644
--- a/src/SFML/Window/Unix/GlxContext.cpp
+++ b/src/SFML/Window/Unix/GlxContext.cpp
@@ -26,11 +26,12 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/GlxContext.hpp>
 #include <SFML/Window/Unix/WindowImplX11.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <mutex>
 #include <ostream>
 #include <vector>
diff --git a/src/SFML/Window/Unix/InputImpl.cpp b/src/SFML/Window/Unix/InputImpl.cpp
index 6ed139bac..0c5a4001a 100644
--- a/src/SFML/Window/Unix/InputImpl.cpp
+++ b/src/SFML/Window/Unix/InputImpl.cpp
@@ -25,13 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/InputImpl.hpp>
 #include <SFML/Window/Unix/KeyboardImpl.hpp>
 #include <SFML/Window/WindowBase.hpp>
 #include <SFML/Window/WindowHandle.hpp>
 
+#include <SFML/System/String.hpp>
+
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
diff --git a/src/SFML/Window/Unix/JoystickImpl.cpp b/src/SFML/Window/Unix/JoystickImpl.cpp
index bbea7ad33..67414dcaf 100644
--- a/src/SFML/Window/Unix/JoystickImpl.cpp
+++ b/src/SFML/Window/Unix/JoystickImpl.cpp
@@ -25,11 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 
-#include <cerrno>
-#include <cstring>
+#include <SFML/System/Err.hpp>
+
 #include <fcntl.h>
 #include <libudev.h>
 #include <linux/joystick.h>
@@ -39,6 +38,9 @@
 #include <unistd.h>
 #include <vector>
 
+#include <cerrno>
+#include <cstring>
+
 namespace
 {
 udev*         udevContext = nullptr;
diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp
index f4628a3d5..abacd9bf1 100644
--- a/src/SFML/Window/Unix/KeyboardImpl.cpp
+++ b/src/SFML/Window/Unix/KeyboardImpl.cpp
@@ -25,22 +25,24 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-#include <SFML/System/Utf.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/KeySymToKeyMapping.hpp>
 #include <SFML/Window/Unix/KeySymToUnicodeMapping.hpp>
 #include <SFML/Window/Unix/KeyboardImpl.hpp>
 
+#include <SFML/System/String.hpp>
+#include <SFML/System/Utf.hpp>
+
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 
-#include <cstring>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
+#include <cstring>
+
 namespace
 {
 
diff --git a/src/SFML/Window/Unix/VideoModeImpl.cpp b/src/SFML/Window/Unix/VideoModeImpl.cpp
index c8393be56..3f6602c19 100644
--- a/src/SFML/Window/Unix/VideoModeImpl.cpp
+++ b/src/SFML/Window/Unix/VideoModeImpl.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/VideoModeImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 
diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp
index 0f3666ae7..527cfd46d 100644
--- a/src/SFML/Window/Unix/WindowImplX11.cpp
+++ b/src/SFML/Window/Unix/WindowImplX11.cpp
@@ -26,17 +26,18 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Sleep.hpp>
-#include <SFML/System/String.hpp>
-#include <SFML/System/Time.hpp>
-#include <SFML/System/Utf.hpp>
 #include <SFML/Window/Unix/ClipboardImpl.hpp>
 #include <SFML/Window/Unix/Display.hpp>
 #include <SFML/Window/Unix/InputImpl.hpp>
 #include <SFML/Window/Unix/KeyboardImpl.hpp>
 #include <SFML/Window/Unix/WindowImplX11.hpp>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Sleep.hpp>
+#include <SFML/System/String.hpp>
+#include <SFML/System/Time.hpp>
+#include <SFML/System/Utf.hpp>
+
 #include <X11/Xlibint.h>
 #undef min // Defined by `Xlibint.h`, conflicts with standard headers
 #undef max // Defined by `Xlibint.h`, conflicts with standard headers
@@ -48,8 +49,6 @@
 
 #include <algorithm>
 #include <bitset>
-#include <cassert>
-#include <cstring>
 #include <fcntl.h>
 #include <filesystem>
 #include <libgen.h>
@@ -61,6 +60,9 @@
 #include <unistd.h>
 #include <vector>
 
+#include <cassert>
+#include <cstring>
+
 #ifdef SFML_OPENGL_ES
 #include <SFML/Window/EglContext.hpp>
 using ContextType = sf::priv::EglContext;
diff --git a/src/SFML/Window/Win32/ClipboardImpl.cpp b/src/SFML/Window/Win32/ClipboardImpl.cpp
index 373a9e87b..4faac36b0 100644
--- a/src/SFML/Window/Win32/ClipboardImpl.cpp
+++ b/src/SFML/Window/Win32/ClipboardImpl.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Win32/ClipboardImpl.hpp>
+
 #include <SFML/System/Err.hpp>
 #include <SFML/System/String.hpp>
 #include <SFML/System/Win32/WindowsHeader.hpp>
-#include <SFML/Window/Win32/ClipboardImpl.hpp>
 
 #include <ostream>
 
diff --git a/src/SFML/Window/Win32/CursorImpl.cpp b/src/SFML/Window/Win32/CursorImpl.cpp
index f4a1ef406..b6900f408 100644
--- a/src/SFML/Window/Win32/CursorImpl.cpp
+++ b/src/SFML/Window/Win32/CursorImpl.cpp
@@ -25,13 +25,15 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/Win32/CursorImpl.hpp>
 
-#include <cstring>
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 #include <ostream>
 
+#include <cstring>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/Win32/CursorImpl.hpp b/src/SFML/Window/Win32/CursorImpl.hpp
index 660c6b841..09e812458 100644
--- a/src/SFML/Window/Win32/CursorImpl.hpp
+++ b/src/SFML/Window/Win32/CursorImpl.hpp
@@ -27,9 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Win32/InputImpl.cpp b/src/SFML/Window/Win32/InputImpl.cpp
index 5ce16e28f..32a9a21fd 100644
--- a/src/SFML/Window/Win32/InputImpl.cpp
+++ b/src/SFML/Window/Win32/InputImpl.cpp
@@ -25,11 +25,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/Win32/InputImpl.hpp>
 #include <SFML/Window/Window.hpp>
 
+#include <SFML/System/String.hpp>
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Win32/JoystickImpl.cpp b/src/SFML/Window/Win32/JoystickImpl.cpp
index 9cfa2f33e..704565d2c 100644
--- a/src/SFML/Window/Win32/JoystickImpl.cpp
+++ b/src/SFML/Window/Win32/JoystickImpl.cpp
@@ -25,15 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/JoystickImpl.hpp>
+
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Time.hpp>
 #include <SFML/System/Win32/WindowsHeader.hpp>
-#include <SFML/Window/JoystickImpl.hpp>
 
 #include <algorithm>
-#include <cmath>
-#include <cstring>
 #include <iomanip>
 #include <ostream>
 #include <regstr.h>
@@ -42,6 +41,9 @@
 #include <tchar.h>
 #include <vector>
 
+#include <cmath>
+#include <cstring>
+
 
 ////////////////////////////////////////////////////////////
 // DirectInput
diff --git a/src/SFML/Window/Win32/JoystickImpl.hpp b/src/SFML/Window/Win32/JoystickImpl.hpp
index 08200a8e2..a3d01ebdb 100644
--- a/src/SFML/Window/Win32/JoystickImpl.hpp
+++ b/src/SFML/Window/Win32/JoystickImpl.hpp
@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/Joystick.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 #include <dinput.h>
 #include <mmsystem.h>
 
diff --git a/src/SFML/Window/Win32/VideoModeImpl.cpp b/src/SFML/Window/Win32/VideoModeImpl.cpp
index ce0124c56..318f2cf85 100644
--- a/src/SFML/Window/Win32/VideoModeImpl.cpp
+++ b/src/SFML/Window/Win32/VideoModeImpl.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/VideoModeImpl.hpp>
 
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 #include <algorithm>
 
 
diff --git a/src/SFML/Window/Win32/VulkanImplWin32.cpp b/src/SFML/Window/Win32/VulkanImplWin32.cpp
index d0050a6ba..4f9c9ddb5 100644
--- a/src/SFML/Window/Win32/VulkanImplWin32.cpp
+++ b/src/SFML/Window/Win32/VulkanImplWin32.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/Win32/VulkanImplWin32.hpp>
 
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 #include <map>
 #include <string_view>
 #define VK_USE_PLATFORM_WIN32_KHR
diff --git a/src/SFML/Window/Win32/WglContext.cpp b/src/SFML/Window/Win32/WglContext.cpp
index 57618553f..da0a7edf2 100644
--- a/src/SFML/Window/Win32/WglContext.cpp
+++ b/src/SFML/Window/Win32/WglContext.cpp
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/Win32/WglContext.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <mutex>
 #include <ostream>
 #include <sstream>
diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index c0ce5f057..f077c15d4 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -25,13 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/String.hpp>
-#include <SFML/System/Utf.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/Window/Win32/WindowImplWin32.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
+#include <SFML/System/Utf.hpp>
+
 #include <cstring>
 // dbt.h is lowercase here, as a cross-compile on linux with mingw-w64
 // expects lowercase, and a native compile on windows, whether via msvc
diff --git a/src/SFML/Window/Win32/WindowImplWin32.hpp b/src/SFML/Window/Win32/WindowImplWin32.hpp
index 66cc37e67..d46aba8e0 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.hpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.hpp
@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Win32/WindowsHeader.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Win32/WindowsHeader.hpp>
+
 
 namespace sf
 {
diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
index d7641ec6e..1ca045459 100644
--- a/src/SFML/Window/Window.cpp
+++ b/src/SFML/Window/Window.cpp
@@ -25,12 +25,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Sleep.hpp>
 #include <SFML/Window/GlContext.hpp>
 #include <SFML/Window/Window.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Sleep.hpp>
+
 #include <ostream>
 
 
diff --git a/src/SFML/Window/WindowBase.cpp b/src/SFML/Window/WindowBase.cpp
index f60736afb..7c969a5f3 100644
--- a/src/SFML/Window/WindowBase.cpp
+++ b/src/SFML/Window/WindowBase.cpp
@@ -25,11 +25,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/WindowBase.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <ostream>
 
 
diff --git a/src/SFML/Window/WindowImpl.cpp b/src/SFML/Window/WindowImpl.cpp
index 6db218ba3..7c9a17fdf 100644
--- a/src/SFML/Window/WindowImpl.cpp
+++ b/src/SFML/Window/WindowImpl.cpp
@@ -25,18 +25,20 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Sleep.hpp>
-#include <SFML/System/Time.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/Window/JoystickManager.hpp>
 #include <SFML/Window/SensorManager.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Sleep.hpp>
+#include <SFML/System/Time.hpp>
+
 #include <algorithm>
-#include <cmath>
 #include <memory>
 
+#include <cmath>
+
 #if defined(SFML_SYSTEM_WINDOWS)
 
 #include <SFML/Window/Win32/WindowImplWin32.hpp>
diff --git a/src/SFML/Window/iOS/ClipboardImpl.mm b/src/SFML/Window/iOS/ClipboardImpl.mm
index b3b8aab4e..c3f9d261b 100644
--- a/src/SFML/Window/iOS/ClipboardImpl.mm
+++ b/src/SFML/Window/iOS/ClipboardImpl.mm
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
 #include <SFML/Window/iOS/ClipboardImpl.hpp>
 
+#include <SFML/System/String.hpp>
+
 #import <UIKit/UIKit.h>
 
 namespace sf::priv
diff --git a/src/SFML/Window/iOS/CursorImpl.hpp b/src/SFML/Window/iOS/CursorImpl.hpp
index 4f6051a48..9444a473f 100644
--- a/src/SFML/Window/iOS/CursorImpl.hpp
+++ b/src/SFML/Window/iOS/CursorImpl.hpp
@@ -27,9 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/Cursor.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/iOS/EaglContext.hpp b/src/SFML/Window/iOS/EaglContext.hpp
index 159c78d76..8a0fab14f 100644
--- a/src/SFML/Window/iOS/EaglContext.hpp
+++ b/src/SFML/Window/iOS/EaglContext.hpp
@@ -27,11 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Clock.hpp>
-#include <SFML/System/Vector2.hpp>
 #include <SFML/Window/GlContext.hpp>
 #include <SFML/Window/iOS/ObjCType.hpp>
 
+#include <SFML/System/Clock.hpp>
+#include <SFML/System/Vector2.hpp>
+
 #include <glad/gl.h>
 
 #pragma GCC diagnostic push
diff --git a/src/SFML/Window/iOS/EaglContext.mm b/src/SFML/Window/iOS/EaglContext.mm
index 8f7a8b4df..a9b058f98 100644
--- a/src/SFML/Window/iOS/EaglContext.mm
+++ b/src/SFML/Window/iOS/EaglContext.mm
@@ -25,13 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Sleep.hpp>
-#include <SFML/System/Time.hpp>
 #include <SFML/Window/iOS/EaglContext.hpp>
 #include <SFML/Window/iOS/SFView.hpp>
 #include <SFML/Window/iOS/WindowImplUIKit.hpp>
 
+#include <SFML/System/Err.hpp>
+#include <SFML/System/Sleep.hpp>
+#include <SFML/System/Time.hpp>
+
 #include <OpenGLES/EAGL.h>
 #include <OpenGLES/EAGLDrawable.h>
 #include <QuartzCore/CAEAGLLayer.h>
diff --git a/src/SFML/Window/iOS/InputImpl.mm b/src/SFML/Window/iOS/InputImpl.mm
index c722b582b..5886c62bd 100644
--- a/src/SFML/Window/iOS/InputImpl.mm
+++ b/src/SFML/Window/iOS/InputImpl.mm
@@ -25,12 +25,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/Window.hpp>
 #include <SFML/Window/iOS/InputImpl.hpp>
 #include <SFML/Window/iOS/SFAppDelegate.hpp>
 
+#include <SFML/System/Err.hpp>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/iOS/SFAppDelegate.hpp b/src/SFML/Window/iOS/SFAppDelegate.hpp
index 8b08ad60c..c3b733410 100644
--- a/src/SFML/Window/iOS/SFAppDelegate.hpp
+++ b/src/SFML/Window/iOS/SFAppDelegate.hpp
@@ -29,9 +29,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/iOS/WindowImplUIKit.hpp>
 
-#include <CoreMotion/CoreMotion.h>
 #include <UIKit/UIKit.h>
 
+#include <CoreMotion/CoreMotion.h>
+
 
 ////////////////////////////////////////////////////////////
 /// \brief Our custom application delegate
diff --git a/src/SFML/Window/iOS/SFView.mm b/src/SFML/Window/iOS/SFView.mm
index f8d4dc7d7..71ee667f2 100644
--- a/src/SFML/Window/iOS/SFView.mm
+++ b/src/SFML/Window/iOS/SFView.mm
@@ -25,11 +25,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Utf.hpp>
 #include <SFML/Window/iOS/SFAppDelegate.hpp>
 #include <SFML/Window/iOS/SFView.hpp>
 
+#include <SFML/System/Utf.hpp>
+
 #include <QuartzCore/CAEAGLLayer.h>
+
 #include <cstring>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/src/SFML/Window/iOS/SensorImpl.mm b/src/SFML/Window/iOS/SensorImpl.mm
index 91b59b695..463eb4fb3 100644
--- a/src/SFML/Window/iOS/SensorImpl.mm
+++ b/src/SFML/Window/iOS/SensorImpl.mm
@@ -25,10 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Angle.hpp>
 #include <SFML/Window/SensorImpl.hpp>
 #include <SFML/Window/iOS/SFAppDelegate.hpp>
 
+#include <SFML/System/Angle.hpp>
+
 
 namespace
 {
diff --git a/src/SFML/Window/iOS/WindowImplUIKit.mm b/src/SFML/Window/iOS/WindowImplUIKit.mm
index 9152bc22a..30d539621 100644
--- a/src/SFML/Window/iOS/WindowImplUIKit.mm
+++ b/src/SFML/Window/iOS/WindowImplUIKit.mm
@@ -25,13 +25,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
 #include <SFML/Window/WindowStyle.hpp>
 #include <SFML/Window/iOS/SFAppDelegate.hpp>
 #include <SFML/Window/iOS/SFView.hpp>
 #include <SFML/Window/iOS/SFViewController.hpp>
 #include <SFML/Window/iOS/WindowImplUIKit.hpp>
 
+#include <SFML/System/Err.hpp>
+
 #include <UIKit/UIKit.h>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/test/Graphics/Rect.test.cpp b/test/Graphics/Rect.test.cpp
index 5daeb529f..b2cfaacd0 100644
--- a/test/Graphics/Rect.test.cpp
+++ b/test/Graphics/Rect.test.cpp
@@ -1,4 +1,5 @@
 #include <SFML/Graphics/Rect.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 #include <doctest/doctest.h>
diff --git a/test/Graphics/RenderWindow.test.cpp b/test/Graphics/RenderWindow.test.cpp
index 1bf285f2b..8a771a80f 100644
--- a/test/Graphics/RenderWindow.test.cpp
+++ b/test/Graphics/RenderWindow.test.cpp
@@ -3,9 +3,11 @@
 // Other 1st party headers
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/Texture.hpp>
-#include <SFML/System/String.hpp>
+
 #include <SFML/Window/VideoMode.hpp>
 
+#include <SFML/System/String.hpp>
+
 #include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
diff --git a/test/Graphics/Transform.test.cpp b/test/Graphics/Transform.test.cpp
index 9f107cbf0..cb8ec9605 100644
--- a/test/Graphics/Transform.test.cpp
+++ b/test/Graphics/Transform.test.cpp
@@ -1,13 +1,15 @@
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 
 #include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
-#include <cassert>
 #include <type_traits>
 #include <vector>
 
+#include <cassert>
+
 static_assert(std::is_copy_constructible_v<sf::Transform>);
 static_assert(std::is_copy_assignable_v<sf::Transform>);
 static_assert(std::is_nothrow_move_constructible_v<sf::Transform>);
diff --git a/test/System/FileInputStream.test.cpp b/test/System/FileInputStream.test.cpp
index 6b2a7d697..d7ff9a158 100644
--- a/test/System/FileInputStream.test.cpp
+++ b/test/System/FileInputStream.test.cpp
@@ -2,13 +2,14 @@
 
 #include <doctest/doctest.h>
 
-#include <cassert>
 #include <fstream>
 #include <sstream>
 #include <string_view>
 #include <type_traits>
 #include <utility>
 
+#include <cassert>
+
 static_assert(!std::is_copy_constructible_v<sf::FileInputStream>);
 static_assert(!std::is_copy_assignable_v<sf::FileInputStream>);
 static_assert(std::is_nothrow_move_constructible_v<sf::FileInputStream>);
diff --git a/test/System/String.test.cpp b/test/System/String.test.cpp
index a0f966619..6365aa685 100644
--- a/test/System/String.test.cpp
+++ b/test/System/String.test.cpp
@@ -4,11 +4,12 @@
 
 #include <GraphicsUtil.hpp>
 #include <array>
-#include <cassert>
 #include <iomanip>
 #include <sstream>
 #include <type_traits>
 
+#include <cassert>
+
 static_assert(std::is_copy_constructible_v<sf::String>);
 static_assert(std::is_copy_assignable_v<sf::String>);
 static_assert(std::is_nothrow_move_constructible_v<sf::String>);
diff --git a/test/System/Vector2.test.cpp b/test/System/Vector2.test.cpp
index 489a02e7f..89fd7574a 100644
--- a/test/System/Vector2.test.cpp
+++ b/test/System/Vector2.test.cpp
@@ -3,9 +3,10 @@
 #include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
-#include <cmath>
 #include <type_traits>
 
+#include <cmath>
+
 using namespace sf::Literals;
 
 // Use sf::Vector2i for tests (except for float vector algebra).
diff --git a/test/Window/Window.test.cpp b/test/Window/Window.test.cpp
index 13c5815ef..24fa215d5 100644
--- a/test/Window/Window.test.cpp
+++ b/test/Window/Window.test.cpp
@@ -1,9 +1,10 @@
 #include <SFML/Window/Window.hpp>
 
 // Other 1st party headers
-#include <SFML/System/String.hpp>
 #include <SFML/Window/VideoMode.hpp>
 
+#include <SFML/System/String.hpp>
+
 #include <doctest/doctest.h>
 
 #include <WindowUtil.hpp>
diff --git a/test/Window/WindowBase.test.cpp b/test/Window/WindowBase.test.cpp
index 8038b56f4..5fe52a4e1 100644
--- a/test/Window/WindowBase.test.cpp
+++ b/test/Window/WindowBase.test.cpp
@@ -1,10 +1,11 @@
 #include <SFML/Window/WindowBase.hpp>
 
 // Other 1st party headers
-#include <SFML/System/String.hpp>
 #include <SFML/Window/Event.hpp>
 #include <SFML/Window/VideoMode.hpp>
 
+#include <SFML/System/String.hpp>
+
 #include <doctest/doctest.h>
 
 #include <WindowUtil.hpp>
diff --git a/test/install/Install.cpp b/test/install/Install.cpp
index 09cf70820..98c5caf85 100644
--- a/test/install/Install.cpp
+++ b/test/install/Install.cpp
@@ -1,5 +1,7 @@
-#include <SFML/Audio.hpp>
 #include <SFML/Graphics.hpp>
+
+#include <SFML/Audio.hpp>
+
 #include <SFML/Network.hpp>
 
 // Instantiate some types from each module to test for linker issues. This program is not meant be ran.
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp b/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp
index 15ce66a17..c2b32be99 100644
--- a/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp	
+++ b/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp	
@@ -14,9 +14,10 @@
 // function `resourcePath()` from ResourcePath.hpp
 //
 
-#include <SFML/Audio.hpp>
 #include <SFML/Graphics.hpp>
 
+#include <SFML/Audio.hpp>
+
 // Here is a small helper for you! Have a look.
 #include "ResourcePath.hpp"
 
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp b/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp
index 33b329e15..1ad9be987 100644
--- a/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp	
+++ b/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp	
@@ -15,9 +15,10 @@
 // - Click OK.
 //
 
-#include <SFML/Audio.hpp>
 #include <SFML/Graphics.hpp>
 
+#include <SFML/Audio.hpp>
+
 int main()
 {
     // Create the main window