Reorder includes hierarchically

.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
 

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

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

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

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
 {

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>
 

examples/shader/Effect.hpp

@@ -5,10 +5,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics.hpp>
 
-#include <cassert>
 #include <string>
 #include <utility>
 
+#include <cassert>
+
 
 ////////////////////////////////////////////////////////////
 // Base class for effects

examples/shader/Shader.cpp

@@ -2,11 +2,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include "Effect.hpp"
+
 #include <array>
 #include <random>
 
-#include "Effect.hpp"
-
 
 namespace
 {

examples/sound_capture/SoundCapture.cpp

@@ -4,9 +4,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio.hpp>
 
-#include <cstdlib>
 #include <iostream>
 
+#include <cstdlib>
+
 
 ////////////////////////////////////////////////////////////
 /// Entry point of application

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

examples/voip/Client.cpp

@@ -3,6 +3,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio.hpp>
+
 #include <SFML/Network.hpp>
 
 #include <iostream>

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;

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

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;
 
 

examples/window/Window.cpp

@@ -13,9 +13,10 @@
 #endif
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
 
+#include <cstdlib>
+
 ////////////////////////////////////////////////////////////
 /// Entry point of application
 ///

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>
 
 

include/SFML/Audio/InputSoundFile.hpp

@@ -31,10 +31,11 @@
 
 #include <SFML/Audio/SoundFileReader.hpp>
 
-#include <cstddef>
 #include <filesystem>
 #include <memory>
 
+#include <cstddef>
+
 
 namespace sf
 {

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>

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>

include/SFML/Audio/SoundSource.hpp

@@ -30,6 +30,7 @@
 #include <SFML/Audio/Export.hpp>
 
 #include <SFML/Audio/AlResource.hpp>
+
 #include <SFML/System/Vector3.hpp>
 
 

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
 {

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>
 
 

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>
 

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>

include/SFML/Graphics/RenderWindow.hpp

@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/RenderTarget.hpp>
+
 #include <SFML/Window/Window.hpp>
 
 

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>

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>
 
 

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>

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>

include/SFML/Graphics/Transform.hpp

@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Rect.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 

include/SFML/Graphics/Transformable.hpp

@@ -30,6 +30,7 @@
 #include <SFML/Graphics/Export.hpp>
 
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 
 

include/SFML/Graphics/Vertex.hpp

@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.hpp>
+
 #include <SFML/System/Vector2.hpp>
 
 

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>

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>
 

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>
 
 

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>

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>

include/SFML/Network/Packet.hpp

@@ -29,10 +29,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Export.hpp>
 
-#include <cstddef>
 #include <string>
 #include <vector>
 
+#include <cstddef>
+
 
 namespace sf
 {

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>

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
 {

include/SFML/System/Time.hpp

@@ -30,6 +30,7 @@
 #include <SFML/System/Export.hpp>
 
 #include <chrono>
+
 #include <cstdint>
 
 

include/SFML/System/Utf.hpp

@@ -29,9 +29,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.hpp>
 
-#include <cstdlib>
 #include <locale>
 
+#include <cstdlib>
+
 
 namespace sf
 {

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

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
 {

include/SFML/Window/Cursor.hpp

@@ -31,9 +31,10 @@
 
 #include <SFML/System/Vector2.hpp>
 
-#include <cstdint>
 #include <memory>
 
+#include <cstdint>
+
 namespace sf
 {
 namespace priv

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*;
 

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>
 
 

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>
 
 

src/SFML/Audio/ALCheck.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/ALCheck.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>

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>

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>

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>
 

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>
 

src/SFML/Audio/SoundBufferRecorder.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>

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>

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
 {

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>
 
 

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

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

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

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
 {

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
 {

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

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

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

src/SFML/Graphics/GLCheck.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/GLCheck.hpp>
+
 #include <SFML/System/Err.hpp>
 
 #include <ostream>

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

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
 {

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>

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
 {

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>

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>
 

src/SFML/Graphics/RenderTextureImplDefault.hpp

@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTextureImpl.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <memory>

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>

src/SFML/Graphics/RenderTextureImplFBO.hpp

@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTextureImpl.hpp>
+
 #include <SFML/Window/GlResource.hpp>
 
 #include <memory>

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>
 
 

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>

src/SFML/Graphics/Text.cpp

@@ -31,9 +31,10 @@
 #include <SFML/Graphics/Texture.hpp>
 
 #include <algorithm>
-#include <cmath>
 #include <utility>
 
+#include <cmath>
+
 
 namespace
 {

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

src/SFML/Graphics/Transform.cpp

@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Transform.hpp>
+
 #include <SFML/System/Angle.hpp>
 
 #include <cmath>

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
 {

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>
 

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
 {

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>
 

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
 {

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>

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>

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>

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>

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

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
 {

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

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
 {

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
 {

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>

src/SFML/System/Err.cpp

@@ -27,10 +27,11 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Err.hpp>
 
-#include <cstdio>
 #include <iostream>
 #include <streambuf>
 
+#include <cstdio>
+
 
 namespace
 {

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
 {
 ////////////////////////////////////////////////////////////

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
 {

src/SFML/System/Utils.hpp

@@ -27,11 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <cctype>
 #include <filesystem>
 #include <sstream>
 #include <string>
 
+#include <cctype>
+
 
 namespace sf
 {

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