diff --git a/examples/ftp/Ftp.cpp b/examples/ftp/Ftp.cpp
index 418280a58..0de98478f 100644
--- a/examples/ftp/Ftp.cpp
+++ b/examples/ftp/Ftp.cpp
@@ -3,7 +3,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network.hpp>
 
-#include <fstream>
 #include <iostream>
 #include <optional>
 
diff --git a/examples/island/Island.cpp b/examples/island/Island.cpp
index e88dcdb61..fe83f99d5 100644
--- a/examples/island/Island.cpp
+++ b/examples/island/Island.cpp
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/examples/opengl/OpenGL.cpp b/examples/opengl/OpenGL.cpp
index d98b80200..477e58cf3 100644
--- a/examples/opengl/OpenGL.cpp
+++ b/examples/opengl/OpenGL.cpp
@@ -4,6 +4,7 @@
 #include <SFML/Graphics.hpp>
 
 #include <array>
+#include <filesystem>
 #include <iostream>
 
 #include <cstdlib>
diff --git a/examples/shader/Shader.cpp b/examples/shader/Shader.cpp
index 106cfb5bc..eb8142349 100644
--- a/examples/shader/Shader.cpp
+++ b/examples/shader/Shader.cpp
@@ -3,9 +3,17 @@
 ////////////////////////////////////////////////////////////
 #include "Effect.hpp"
 
-#include <array>
-#include <random>
+#include <SFML/Graphics.hpp>
 
+#include <array>
+#include <optional>
+#include <random>
+#include <string>
+#include <vector>
+
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
 
 namespace
 {
diff --git a/examples/sockets/TCP.cpp b/examples/sockets/TCP.cpp
index 4409d287c..de1adb4af 100644
--- a/examples/sockets/TCP.cpp
+++ b/examples/sockets/TCP.cpp
@@ -5,6 +5,9 @@
 
 #include <iomanip>
 #include <iostream>
+#include <optional>
+
+#include <cstddef>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/examples/sockets/UDP.cpp b/examples/sockets/UDP.cpp
index 18bf01be0..d328ee02f 100644
--- a/examples/sockets/UDP.cpp
+++ b/examples/sockets/UDP.cpp
@@ -7,6 +7,8 @@
 #include <iostream>
 #include <optional>
 
+#include <cstddef>
+
 
 ////////////////////////////////////////////////////////////
 /// Launch a server, wait for a message, send an answer.
diff --git a/examples/stencil/Stencil.cpp b/examples/stencil/Stencil.cpp
index d9e8cdfc7..beacde517 100644
--- a/examples/stencil/Stencil.cpp
+++ b/examples/stencil/Stencil.cpp
@@ -3,6 +3,9 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics.hpp>
 
+#include <cstdlib>
+
+
 ////////////////////////////////////////////////////////////
 /// Entry point of application
 ///
diff --git a/examples/tennis/Tennis.cpp b/examples/tennis/Tennis.cpp
index 7c8d2dc2a..cf7b6e6b7 100644
--- a/examples/tennis/Tennis.cpp
+++ b/examples/tennis/Tennis.cpp
@@ -5,7 +5,12 @@
 
 #include <SFML/Audio.hpp>
 
+#include <filesystem>
 #include <random>
+#include <string>
+
+#include <cmath>
+#include <cstdlib>
 
 #ifdef SFML_SYSTEM_IOS
 #include <SFML/Main.hpp>
diff --git a/examples/voip/Client.cpp b/examples/voip/Client.cpp
index 2c26c503d..cd906b00b 100644
--- a/examples/voip/Client.cpp
+++ b/examples/voip/Client.cpp
@@ -6,6 +6,10 @@
 #include <SFML/Network.hpp>
 
 #include <iostream>
+#include <optional>
+
+#include <cstddef>
+#include <cstdint>
 
 
 const std::uint8_t clientAudioData   = 1;
diff --git a/examples/voip/Server.cpp b/examples/voip/Server.cpp
index 7c66f525a..c3f497aa8 100644
--- a/examples/voip/Server.cpp
+++ b/examples/voip/Server.cpp
@@ -6,9 +6,11 @@
 #include <SFML/Network.hpp>
 
 #include <iostream>
-#include <iterator>
 #include <mutex>
+#include <optional>
+#include <vector>
 
+#include <cstdint>
 #include <cstring>
 
 
diff --git a/examples/vulkan/Vulkan.cpp b/examples/vulkan/Vulkan.cpp
index 8ab407036..77c266f9a 100644
--- a/examples/vulkan/Vulkan.cpp
+++ b/examples/vulkan/Vulkan.cpp
@@ -13,9 +13,11 @@
 #include <array>
 #include <iostream>
 #include <limits>
+#include <string_view>
 #include <vector>
 
 #include <cmath>
+#include <cstdint>
 #include <cstring>
 
 
diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
index b294aa286..b75fe9cd1 100644
--- a/include/SFML/Audio/Music.hpp
+++ b/include/SFML/Audio/Music.hpp
@@ -33,8 +33,10 @@
 #include <SFML/Audio/SoundStream.hpp>
 
 #include <filesystem>
+#include <mutex>
 #include <vector>
 
+#include <cstddef>
 #include <cstdint>
 
 
diff --git a/include/SFML/Audio/OutputSoundFile.hpp b/include/SFML/Audio/OutputSoundFile.hpp
index 045003dce..ba49ef847 100644
--- a/include/SFML/Audio/OutputSoundFile.hpp
+++ b/include/SFML/Audio/OutputSoundFile.hpp
@@ -34,6 +34,8 @@
 #include <filesystem>
 #include <memory>
 
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp
index 0a0be9c4e..89e1eb3fa 100644
--- a/include/SFML/Audio/SoundBuffer.hpp
+++ b/include/SFML/Audio/SoundBuffer.hpp
@@ -37,6 +37,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include <cstddef>
 #include <cstdint>
 
 
diff --git a/include/SFML/Audio/SoundBufferRecorder.hpp b/include/SFML/Audio/SoundBufferRecorder.hpp
index 90c3986b9..1706bdf64 100644
--- a/include/SFML/Audio/SoundBufferRecorder.hpp
+++ b/include/SFML/Audio/SoundBufferRecorder.hpp
@@ -34,6 +34,9 @@
 
 #include <vector>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/include/SFML/Audio/SoundFileFactory.inl b/include/SFML/Audio/SoundFileFactory.inl
index 569466d63..f7bc29efa 100644
--- a/include/SFML/Audio/SoundFileFactory.inl
+++ b/include/SFML/Audio/SoundFileFactory.inl
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileFactory.hpp> // NOLINT(misc-header-include-cycle)
 
-#include <algorithm>
+#include <memory>
 
 
 namespace sf
diff --git a/include/SFML/Graphics/CircleShape.hpp b/include/SFML/Graphics/CircleShape.hpp
index 3bd3ff4e9..13e7c5988 100644
--- a/include/SFML/Graphics/CircleShape.hpp
+++ b/include/SFML/Graphics/CircleShape.hpp
@@ -31,6 +31,10 @@
 
 #include <SFML/Graphics/Shape.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/ConvexShape.hpp b/include/SFML/Graphics/ConvexShape.hpp
index 04c475f38..8e4b3c85b 100644
--- a/include/SFML/Graphics/ConvexShape.hpp
+++ b/include/SFML/Graphics/ConvexShape.hpp
@@ -33,6 +33,8 @@
 
 #include <vector>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/Font.hpp b/include/SFML/Graphics/Font.hpp
index 0d0ffd745..4c83cd829 100644
--- a/include/SFML/Graphics/Font.hpp
+++ b/include/SFML/Graphics/Font.hpp
@@ -33,11 +33,17 @@
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
+#include <cstddef>
+#include <cstdint>
+
 
 #ifdef SFML_SYSTEM_ANDROID
 namespace sf::priv
diff --git a/include/SFML/Graphics/Glsl.hpp b/include/SFML/Graphics/Glsl.hpp
index ea8753176..30110d763 100644
--- a/include/SFML/Graphics/Glsl.hpp
+++ b/include/SFML/Graphics/Glsl.hpp
@@ -27,9 +27,6 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#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/Glsl.inl b/include/SFML/Graphics/Glsl.inl
index 8fac15c20..282631aac 100644
--- a/include/SFML/Graphics/Glsl.inl
+++ b/include/SFML/Graphics/Glsl.inl
@@ -25,8 +25,18 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Graphics/Export.hpp>
+
 #include <SFML/Graphics/Glsl.hpp> // NOLINT(misc-header-include-cycle)
 
+#include <cstddef>
+
+
+namespace sf
+{
+class Color;
+class Transform;
+} // namespace sf
 
 namespace sf::priv
 {
diff --git a/include/SFML/Graphics/Image.hpp b/include/SFML/Graphics/Image.hpp
index 7bc0ea2c6..ab10a22ca 100644
--- a/include/SFML/Graphics/Image.hpp
+++ b/include/SFML/Graphics/Image.hpp
@@ -32,11 +32,16 @@
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Rect.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <filesystem>
 #include <optional>
 #include <string_view>
 #include <vector>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/RectangleShape.hpp b/include/SFML/Graphics/RectangleShape.hpp
index 8dcca879d..700d4ce03 100644
--- a/include/SFML/Graphics/RectangleShape.hpp
+++ b/include/SFML/Graphics/RectangleShape.hpp
@@ -31,6 +31,10 @@
 
 #include <SFML/Graphics/Shape.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/RenderTarget.hpp b/include/SFML/Graphics/RenderTarget.hpp
index e2c3382a1..3c04c8d1f 100644
--- a/include/SFML/Graphics/RenderTarget.hpp
+++ b/include/SFML/Graphics/RenderTarget.hpp
@@ -39,16 +39,21 @@
 #include <SFML/Graphics/Vertex.hpp>
 #include <SFML/Graphics/View.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <array>
 
 #include <cstddef>
+#include <cstdint>
 
 
 namespace sf
 {
 class Drawable;
-class VertexBuffer;
+class Shader;
+class Texture;
 class Transform;
+class VertexBuffer;
 
 ////////////////////////////////////////////////////////////
 /// \brief Base class for all render targets (window, texture, ...)
diff --git a/include/SFML/Graphics/RenderTexture.hpp b/include/SFML/Graphics/RenderTexture.hpp
index 025974c2f..95fdb9bea 100644
--- a/include/SFML/Graphics/RenderTexture.hpp
+++ b/include/SFML/Graphics/RenderTexture.hpp
@@ -34,6 +34,8 @@
 
 #include <SFML/Window/ContextSettings.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
 
diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
index b3cd866c5..28e9bf3bd 100644
--- a/include/SFML/Graphics/RenderWindow.hpp
+++ b/include/SFML/Graphics/RenderWindow.hpp
@@ -31,12 +31,21 @@
 
 #include <SFML/Graphics/RenderTarget.hpp>
 
+#include <SFML/Window/ContextSettings.hpp>
+#include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/Window.hpp>
+#include <SFML/Window/WindowEnums.hpp>
+#include <SFML/Window/WindowHandle.hpp>
+
+#include <SFML/System/Vector2.hpp>
+
+#include <cstdint>
 
 
 namespace sf
 {
 class Image;
+class String;
 
 ////////////////////////////////////////////////////////////
 /// \brief Window that can serve as a target for 2D drawing
diff --git a/include/SFML/Graphics/Shader.hpp b/include/SFML/Graphics/Shader.hpp
index 88c5e6d6c..166786bca 100644
--- a/include/SFML/Graphics/Shader.hpp
+++ b/include/SFML/Graphics/Shader.hpp
@@ -33,20 +33,17 @@
 
 #include <SFML/Window/GlResource.hpp>
 
-#include <SFML/System/Vector2.hpp>
-#include <SFML/System/Vector3.hpp>
-
 #include <filesystem>
 #include <string>
 #include <unordered_map>
 
+#include <cstddef>
+
 
 namespace sf
 {
-class Color;
 class InputStream;
 class Texture;
-class Transform;
 
 ////////////////////////////////////////////////////////////
 /// \brief Shader class (vertex, geometry and fragment)
diff --git a/include/SFML/Graphics/Shape.hpp b/include/SFML/Graphics/Shape.hpp
index 853866f58..f514ea0a6 100644
--- a/include/SFML/Graphics/Shape.hpp
+++ b/include/SFML/Graphics/Shape.hpp
@@ -29,16 +29,23 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Export.hpp>
 
+#include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Drawable.hpp>
+#include <SFML/Graphics/PrimitiveType.hpp>
+#include <SFML/Graphics/Rect.hpp>
+#include <SFML/Graphics/RenderStates.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
 
 #include <SFML/System/Vector2.hpp>
 
+#include <cstddef>
+
 
 namespace sf
 {
 class Texture;
+class RenderTarget;
 
 ////////////////////////////////////////////////////////////
 /// \brief Base class for textured shapes with outline
diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp
index 0c02d9c37..d09cd277d 100644
--- a/include/SFML/Graphics/Sprite.hpp
+++ b/include/SFML/Graphics/Sprite.hpp
@@ -31,9 +31,12 @@
 
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/Rect.hpp>
+#include <SFML/Graphics/RenderStates.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/Vertex.hpp>
 
+#include <array>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/Text.hpp b/include/SFML/Graphics/Text.hpp
index 120771b82..f4a10a295 100644
--- a/include/SFML/Graphics/Text.hpp
+++ b/include/SFML/Graphics/Text.hpp
@@ -29,18 +29,25 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Export.hpp>
 
+#include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Drawable.hpp>
+#include <SFML/Graphics/PrimitiveType.hpp>
 #include <SFML/Graphics/Rect.hpp>
+#include <SFML/Graphics/RenderStates.hpp>
 #include <SFML/Graphics/Transformable.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
 
 #include <SFML/System/String.hpp>
 #include <SFML/System/Vector2.hpp>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {
 class Font;
+class RenderTarget;
 
 ////////////////////////////////////////////////////////////
 /// \brief Graphical text that can be drawn to a render target
diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp
index 9b8bd8d0f..5f1c84527 100644
--- a/include/SFML/Graphics/Texture.hpp
+++ b/include/SFML/Graphics/Texture.hpp
@@ -34,15 +34,17 @@
 
 #include <SFML/Window/GlResource.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <filesystem>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {
 class InputStream;
-class RenderTarget;
-class RenderTexture;
-class Text;
 class Window;
 class Image;
 
diff --git a/include/SFML/Graphics/Transform.inl b/include/SFML/Graphics/Transform.inl
index c3cff93d0..945c1d615 100644
--- a/include/SFML/Graphics/Transform.inl
+++ b/include/SFML/Graphics/Transform.inl
@@ -29,6 +29,8 @@
 
 #include <array>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/include/SFML/Graphics/VertexArray.hpp b/include/SFML/Graphics/VertexArray.hpp
index 1c459b8c3..cd2e2a694 100644
--- a/include/SFML/Graphics/VertexArray.hpp
+++ b/include/SFML/Graphics/VertexArray.hpp
@@ -32,13 +32,18 @@
 #include <SFML/Graphics/Drawable.hpp>
 #include <SFML/Graphics/PrimitiveType.hpp>
 #include <SFML/Graphics/Rect.hpp>
+#include <SFML/Graphics/RenderStates.hpp>
 #include <SFML/Graphics/Vertex.hpp>
 
 #include <vector>
 
+#include <cstddef>
+
 
 namespace sf
 {
+class RenderTarget;
+
 ////////////////////////////////////////////////////////////
 /// \brief Define a set of one or more 2D primitives
 ///
diff --git a/include/SFML/Graphics/VertexBuffer.hpp b/include/SFML/Graphics/VertexBuffer.hpp
index e94bd4026..784d0772b 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/Graphics/RenderStates.hpp>
 
 #include <SFML/Window/GlResource.hpp>
 
diff --git a/include/SFML/Network/Http.hpp b/include/SFML/Network/Http.hpp
index 045ff87cf..779f4a186 100644
--- a/include/SFML/Network/Http.hpp
+++ b/include/SFML/Network/Http.hpp
@@ -34,6 +34,7 @@
 
 #include <SFML/System/Time.hpp>
 
+#include <iosfwd>
 #include <map>
 #include <optional>
 #include <string>
diff --git a/include/SFML/Network/IpAddress.hpp b/include/SFML/Network/IpAddress.hpp
index 5abd02d3a..ef9d89961 100644
--- a/include/SFML/Network/IpAddress.hpp
+++ b/include/SFML/Network/IpAddress.hpp
@@ -36,6 +36,8 @@
 #include <string>
 #include <string_view>
 
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/include/SFML/Network/Packet.hpp b/include/SFML/Network/Packet.hpp
index cc2faf248..2c0715f74 100644
--- a/include/SFML/Network/Packet.hpp
+++ b/include/SFML/Network/Packet.hpp
@@ -39,8 +39,6 @@
 namespace sf
 {
 class String;
-class TcpSocket;
-class UdpSocket;
 
 ////////////////////////////////////////////////////////////
 /// \brief Utility class to build blocks of data to transfer
diff --git a/include/SFML/Network/Socket.hpp b/include/SFML/Network/Socket.hpp
index f6f97ac11..d2022eddc 100644
--- a/include/SFML/Network/Socket.hpp
+++ b/include/SFML/Network/Socket.hpp
@@ -34,8 +34,6 @@
 
 namespace sf
 {
-class SocketSelector;
-
 ////////////////////////////////////////////////////////////
 /// \brief Base class for all the socket types
 ///
diff --git a/include/SFML/Network/TcpSocket.hpp b/include/SFML/Network/TcpSocket.hpp
index d13e1dc14..9ed632539 100644
--- a/include/SFML/Network/TcpSocket.hpp
+++ b/include/SFML/Network/TcpSocket.hpp
@@ -37,6 +37,7 @@
 #include <vector>
 
 #include <cstddef>
+#include <cstdint>
 
 
 namespace sf
diff --git a/include/SFML/System/FileInputStream.hpp b/include/SFML/System/FileInputStream.hpp
index 01a3c610e..20899ba97 100644
--- a/include/SFML/System/FileInputStream.hpp
+++ b/include/SFML/System/FileInputStream.hpp
@@ -36,6 +36,7 @@
 #include <filesystem>
 #include <memory>
 
+#include <cstdint>
 #include <cstdio>
 
 #ifdef SFML_SYSTEM_ANDROID
diff --git a/include/SFML/System/MemoryInputStream.hpp b/include/SFML/System/MemoryInputStream.hpp
index ba9bc9e3d..611acf265 100644
--- a/include/SFML/System/MemoryInputStream.hpp
+++ b/include/SFML/System/MemoryInputStream.hpp
@@ -34,7 +34,7 @@
 #include <SFML/System/InputStream.hpp>
 
 #include <cstddef>
-#include <cstdlib>
+#include <cstdint>
 
 
 namespace sf
diff --git a/include/SFML/System/String.hpp b/include/SFML/System/String.hpp
index 9ce333a2b..27480db29 100644
--- a/include/SFML/System/String.hpp
+++ b/include/SFML/System/String.hpp
@@ -34,6 +34,7 @@
 #include <locale>
 #include <string>
 
+#include <cstddef>
 #include <cstdint>
 
 
diff --git a/include/SFML/System/String.inl b/include/SFML/System/String.inl
index c7af24acc..11c350af9 100644
--- a/include/SFML/System/String.inl
+++ b/include/SFML/System/String.inl
@@ -27,6 +27,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/System/String.hpp> // NOLINT(misc-header-include-cycle)
 
+#include <iterator>
+
 
 namespace sf
 {
diff --git a/include/SFML/Window/Vulkan.hpp b/include/SFML/Window/Vulkan.hpp
index 019ab9d8e..410f4aa30 100644
--- a/include/SFML/Window/Vulkan.hpp
+++ b/include/SFML/Window/Vulkan.hpp
@@ -31,8 +31,6 @@
 
 #include <vector>
 
-#include <cstdint>
-
 
 using VkInstance = struct VkInstance_T*;
 
@@ -43,6 +41,9 @@ using VkSurfaceKHR = struct VkSurfaceKHR_T*;
 
 #else
 
+#include <cstdint>
+
+
 using VkSurfaceKHR = std::uint64_t;
 
 #endif
diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp
index e4ec148dd..0037a0e92 100644
--- a/include/SFML/Window/Window.hpp
+++ b/include/SFML/Window/Window.hpp
@@ -30,12 +30,16 @@
 #include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/GlResource.hpp>
 #include <SFML/Window/WindowBase.hpp>
+#include <SFML/Window/WindowEnums.hpp>
+#include <SFML/Window/WindowHandle.hpp>
 
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Time.hpp>
 
 #include <memory>
 
+#include <cstdint>
+
 
 namespace sf
 {
@@ -44,8 +48,6 @@ namespace priv
 class GlContext;
 }
 
-struct Event;
-
 ////////////////////////////////////////////////////////////
 /// \brief Window that serves as a target for OpenGL rendering
 ///
diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp
index 421c697e8..8a4474bb6 100644
--- a/include/SFML/Window/WindowBase.hpp
+++ b/include/SFML/Window/WindowBase.hpp
@@ -38,6 +38,8 @@
 #include <memory>
 #include <optional>
 
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/src/SFML/Audio/InputSoundFile.cpp b/src/SFML/Audio/InputSoundFile.cpp
index 5f621c2fb..e75314b4f 100644
--- a/src/SFML/Audio/InputSoundFile.cpp
+++ b/src/SFML/Audio/InputSoundFile.cpp
@@ -37,6 +37,7 @@
 
 #include <algorithm>
 #include <ostream>
+#include <utility>
 
 
 namespace sf
diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp
index 42cb50376..4934a417d 100644
--- a/src/SFML/Audio/SoundBuffer.cpp
+++ b/src/SFML/Audio/SoundBuffer.cpp
@@ -36,8 +36,8 @@
 #include <SFML/System/Time.hpp>
 
 #include <exception>
-#include <memory>
 #include <ostream>
+#include <utility>
 
 #if defined(__APPLE__)
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/src/SFML/Audio/SoundFileReaderFlac.cpp b/src/SFML/Audio/SoundFileReaderFlac.cpp
index 639e95156..bac8f8b1e 100644
--- a/src/SFML/Audio/SoundFileReaderFlac.cpp
+++ b/src/SFML/Audio/SoundFileReaderFlac.cpp
@@ -30,9 +30,12 @@
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 
+#include <algorithm>
 #include <ostream>
 
 #include <cassert>
+#include <cstddef>
+#include <cstdint>
 
 
 namespace
diff --git a/src/SFML/Audio/SoundFileReaderFlac.hpp b/src/SFML/Audio/SoundFileReaderFlac.hpp
index 64a615369..ba97637c5 100644
--- a/src/SFML/Audio/SoundFileReaderFlac.hpp
+++ b/src/SFML/Audio/SoundFileReaderFlac.hpp
@@ -31,8 +31,16 @@
 
 #include <FLAC/stream_decoder.h>
 #include <memory>
+#include <optional>
 #include <vector>
 
+#include <cstdint>
+
+
+namespace sf
+{
+class InputStream;
+}
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileReaderMp3.hpp b/src/SFML/Audio/SoundFileReaderMp3.hpp
index d80bc4fcf..8a5b16e32 100644
--- a/src/SFML/Audio/SoundFileReaderMp3.hpp
+++ b/src/SFML/Audio/SoundFileReaderMp3.hpp
@@ -48,7 +48,9 @@
 
 #include <SFML/Audio/SoundFileReader.hpp>
 
-#include <vector>
+#include <optional>
+
+#include <cstdint>
 
 
 namespace sf::priv
diff --git a/src/SFML/Audio/SoundFileReaderOgg.cpp b/src/SFML/Audio/SoundFileReaderOgg.cpp
index bbade7293..193c73ef5 100644
--- a/src/SFML/Audio/SoundFileReaderOgg.cpp
+++ b/src/SFML/Audio/SoundFileReaderOgg.cpp
@@ -28,12 +28,12 @@
 #include <SFML/Audio/SoundFileReaderOgg.hpp>
 
 #include <SFML/System/Err.hpp>
-#include <SFML/System/MemoryInputStream.hpp>
+#include <SFML/System/InputStream.hpp>
 
 #include <ostream>
 
 #include <cassert>
-#include <cctype>
+#include <cstdio>
 
 
 namespace
diff --git a/src/SFML/Audio/SoundFileReaderOgg.hpp b/src/SFML/Audio/SoundFileReaderOgg.hpp
index 01f48bd03..cb4c89ecd 100644
--- a/src/SFML/Audio/SoundFileReaderOgg.hpp
+++ b/src/SFML/Audio/SoundFileReaderOgg.hpp
@@ -31,6 +31,15 @@
 
 #include <vorbis/vorbisfile.h>
 
+#include <optional>
+
+#include <cstdint>
+
+
+namespace sf
+{
+class InputStream;
+}
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileReaderWav.cpp b/src/SFML/Audio/SoundFileReaderWav.cpp
index 560febd3f..50f99ceb0 100644
--- a/src/SFML/Audio/SoundFileReaderWav.cpp
+++ b/src/SFML/Audio/SoundFileReaderWav.cpp
@@ -31,11 +31,9 @@
 #include <SFML/System/InputStream.hpp>
 #include <SFML/System/Utils.hpp>
 
-#include <algorithm>
 #include <ostream>
 
 #include <cassert>
-#include <cctype>
 #include <cstddef>
 #include <cstring>
 
diff --git a/src/SFML/Audio/SoundFileReaderWav.hpp b/src/SFML/Audio/SoundFileReaderWav.hpp
index 6cff7ff97..479f350b0 100644
--- a/src/SFML/Audio/SoundFileReaderWav.hpp
+++ b/src/SFML/Audio/SoundFileReaderWav.hpp
@@ -29,6 +29,15 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundFileReader.hpp>
 
+#include <optional>
+
+#include <cstdint>
+
+
+namespace sf
+{
+class InputStream;
+}
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileWriterFlac.cpp b/src/SFML/Audio/SoundFileWriterFlac.cpp
index 9e166cd64..e2ba9e2dc 100644
--- a/src/SFML/Audio/SoundFileWriterFlac.cpp
+++ b/src/SFML/Audio/SoundFileWriterFlac.cpp
@@ -33,9 +33,6 @@
 #include <algorithm>
 #include <ostream>
 
-#include <cassert>
-#include <cctype>
-
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileWriterFlac.hpp b/src/SFML/Audio/SoundFileWriterFlac.hpp
index eaf4efb23..244c10fbb 100644
--- a/src/SFML/Audio/SoundFileWriterFlac.hpp
+++ b/src/SFML/Audio/SoundFileWriterFlac.hpp
@@ -34,6 +34,8 @@
 #include <memory>
 #include <vector>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileWriterOgg.cpp b/src/SFML/Audio/SoundFileWriterOgg.cpp
index 958eb46d6..c3bd39c1d 100644
--- a/src/SFML/Audio/SoundFileWriterOgg.cpp
+++ b/src/SFML/Audio/SoundFileWriterOgg.cpp
@@ -35,7 +35,6 @@
 #include <random>
 
 #include <cassert>
-#include <cctype>
 
 
 namespace sf::priv
diff --git a/src/SFML/Audio/SoundFileWriterOgg.hpp b/src/SFML/Audio/SoundFileWriterOgg.hpp
index 623282200..736717289 100644
--- a/src/SFML/Audio/SoundFileWriterOgg.hpp
+++ b/src/SFML/Audio/SoundFileWriterOgg.hpp
@@ -34,6 +34,8 @@
 #include <filesystem>
 #include <fstream>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Audio/SoundFileWriterWav.hpp b/src/SFML/Audio/SoundFileWriterWav.hpp
index bf5554419..6179dab7d 100644
--- a/src/SFML/Audio/SoundFileWriterWav.hpp
+++ b/src/SFML/Audio/SoundFileWriterWav.hpp
@@ -32,6 +32,8 @@
 #include <filesystem>
 #include <fstream>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Graphics/CircleShape.cpp b/src/SFML/Graphics/CircleShape.cpp
index 76f74ed9d..f2b5901f3 100644
--- a/src/SFML/Graphics/CircleShape.cpp
+++ b/src/SFML/Graphics/CircleShape.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.hpp>
 
-#include <cmath>
+#include <SFML/System/Angle.hpp>
 
 
 namespace sf
diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
index e7fa5abc3..59f8b8fd2 100644
--- a/src/SFML/Graphics/Font.cpp
+++ b/src/SFML/Graphics/Font.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Font.hpp>
-#include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/Image.hpp>
+#include <SFML/Graphics/Texture.hpp>
 #ifdef SFML_SYSTEM_ANDROID
 #include <SFML/System/Android/ResourceStream.hpp>
 #endif
@@ -41,11 +41,11 @@
 #include FT_OUTLINE_H
 #include FT_BITMAP_H
 #include FT_STROKER_H
+
 #include <ostream>
-#include <type_traits>
+#include <utility>
 
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 
 
@@ -759,8 +759,7 @@ bool Font::setCurrentSize(unsigned int characterSize) const
             // fail if the requested size is not available
             if (!FT_IS_SCALABLE(face))
             {
-                err() << "Failed to set bitmap font size to " << characterSize << std::endl;
-                err() << "Available sizes are: ";
+                err() << "Failed to set bitmap font size to " << characterSize << '\n' << "Available sizes are: ";
                 for (int i = 0; i < face->num_fixed_sizes; ++i)
                 {
                     const long size = (face->available_sizes[i].y_ppem + 32) >> 6;
diff --git a/src/SFML/Graphics/Glsl.cpp b/src/SFML/Graphics/Glsl.cpp
index b4b93eace..35669b5d0 100644
--- a/src/SFML/Graphics/Glsl.cpp
+++ b/src/SFML/Graphics/Glsl.cpp
@@ -26,7 +26,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Glsl.hpp>
+#include <SFML/Graphics/Transform.hpp>
 
 #include <algorithm>
 
diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
index 44b09030d..dba24b6ff 100644
--- a/src/SFML/Graphics/Image.cpp
+++ b/src/SFML/Graphics/Image.cpp
@@ -40,8 +40,10 @@
 #include <stb_image_write.h>
 
 #include <algorithm>
+#include <iomanip>
 #include <memory>
 #include <ostream>
+#include <string>
 
 #include <cassert>
 #include <cstring>
diff --git a/src/SFML/Graphics/RectangleShape.cpp b/src/SFML/Graphics/RectangleShape.cpp
index df74200ce..726961f02 100644
--- a/src/SFML/Graphics/RectangleShape.cpp
+++ b/src/SFML/Graphics/RectangleShape.cpp
@@ -27,8 +27,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RectangleShape.hpp>
 
-#include <cmath>
-
 
 namespace sf
 {
diff --git a/src/SFML/Graphics/RenderStates.cpp b/src/SFML/Graphics/RenderStates.cpp
index e1decb9f5..5b00d19a2 100644
--- a/src/SFML/Graphics/RenderStates.cpp
+++ b/src/SFML/Graphics/RenderStates.cpp
@@ -27,8 +27,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderStates.hpp>
 
-#include <cstddef>
-
 
 namespace sf
 {
diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp
index 2fd383ebe..654199711 100644
--- a/src/SFML/Graphics/RenderTarget.cpp
+++ b/src/SFML/Graphics/RenderTarget.cpp
@@ -31,7 +31,6 @@
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Texture.hpp>
-#include <SFML/Graphics/VertexArray.hpp>
 #include <SFML/Graphics/VertexBuffer.hpp>
 
 #include <SFML/Window/Context.hpp>
@@ -39,7 +38,6 @@
 #include <SFML/System/Err.hpp>
 
 #include <algorithm>
-#include <iostream>
 #include <mutex>
 #include <ostream>
 #include <unordered_map>
diff --git a/src/SFML/Graphics/RenderTexture.cpp b/src/SFML/Graphics/RenderTexture.cpp
index 45bff3029..488a957a8 100644
--- a/src/SFML/Graphics/RenderTexture.cpp
+++ b/src/SFML/Graphics/RenderTexture.cpp
@@ -34,6 +34,8 @@
 #include <memory>
 #include <ostream>
 
+#include <cassert>
+
 
 namespace sf
 {
diff --git a/src/SFML/Graphics/RenderTextureImplDefault.hpp b/src/SFML/Graphics/RenderTextureImplDefault.hpp
index d93bf22fa..71af51f3a 100644
--- a/src/SFML/Graphics/RenderTextureImplDefault.hpp
+++ b/src/SFML/Graphics/RenderTextureImplDefault.hpp
@@ -31,13 +31,15 @@
 
 #include <SFML/Window/GlResource.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
 
 namespace sf
 {
 class Context;
-
+struct ContextSettings;
 
 namespace priv
 {
diff --git a/src/SFML/Graphics/RenderTextureImplFBO.cpp b/src/SFML/Graphics/RenderTextureImplFBO.cpp
index 3fa27a610..40608649e 100644
--- a/src/SFML/Graphics/RenderTextureImplFBO.cpp
+++ b/src/SFML/Graphics/RenderTextureImplFBO.cpp
@@ -28,15 +28,14 @@
 #include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/RenderTextureImplFBO.hpp>
-#include <SFML/Graphics/Texture.hpp>
 
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/ContextSettings.hpp>
 
 #include <SFML/System/Err.hpp>
 
-#include <mutex>
 #include <ostream>
+#include <utility>
 
 
 namespace sf::priv
diff --git a/src/SFML/Graphics/RenderTextureImplFBO.hpp b/src/SFML/Graphics/RenderTextureImplFBO.hpp
index ca9466dc6..fd8b65cd1 100644
--- a/src/SFML/Graphics/RenderTextureImplFBO.hpp
+++ b/src/SFML/Graphics/RenderTextureImplFBO.hpp
@@ -31,14 +31,18 @@
 
 #include <SFML/Window/GlResource.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 #include <unordered_map>
 
+#include <cstdint>
+
 
 namespace sf
 {
 class Context;
-
+struct ContextSettings;
 
 namespace priv
 {
diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp
index 6321ea515..f5a0e99b2 100644
--- a/src/SFML/Graphics/RenderWindow.cpp
+++ b/src/SFML/Graphics/RenderWindow.cpp
@@ -30,7 +30,6 @@
 #include <SFML/Graphics/Image.hpp>
 #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 7d57bc3ea..479996fd1 100644
--- a/src/SFML/Graphics/Shader.cpp
+++ b/src/SFML/Graphics/Shader.cpp
@@ -26,18 +26,18 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/GLExtensions.hpp>
 #include <SFML/Graphics/Shader.hpp>
 #include <SFML/Graphics/Texture.hpp>
-#include <SFML/Graphics/Transform.hpp>
 
-#include <SFML/Window/Context.hpp>
+#include <SFML/Window/GlResource.hpp>
 
 #include <SFML/System/Err.hpp>
 #include <SFML/System/InputStream.hpp>
 #include <SFML/System/Utils.hpp>
+#include <SFML/System/Vector2.hpp>
+#include <SFML/System/Vector3.hpp>
 
 #include <fstream>
 #include <iomanip>
@@ -45,6 +45,8 @@
 #include <utility>
 #include <vector>
 
+#include <cstdint>
+
 #ifndef SFML_OPENGL_ES
 
 #if defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_IOS)
diff --git a/src/SFML/Graphics/Shape.cpp b/src/SFML/Graphics/Shape.cpp
index 9e602d48f..578c3c5e9 100644
--- a/src/SFML/Graphics/Shape.cpp
+++ b/src/SFML/Graphics/Shape.cpp
@@ -31,6 +31,9 @@
 
 #include <algorithm>
 
+#include <cassert>
+#include <cstddef>
+
 namespace
 {
 // Compute the normal of a segment
diff --git a/src/SFML/Graphics/Sprite.cpp b/src/SFML/Graphics/Sprite.cpp
index 4854e5895..678fd9659 100644
--- a/src/SFML/Graphics/Sprite.cpp
+++ b/src/SFML/Graphics/Sprite.cpp
@@ -29,7 +29,7 @@
 #include <SFML/Graphics/Sprite.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
-#include <cassert>
+#include <cmath>
 #include <cstdlib>
 
 
diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp
index 7746063a7..c1b264e5c 100644
--- a/src/SFML/Graphics/Text.cpp
+++ b/src/SFML/Graphics/Text.cpp
@@ -34,6 +34,8 @@
 #include <utility>
 
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 
 
 namespace
diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp
index 1edaa9a2a..aafa0d17e 100644
--- a/src/SFML/Graphics/Texture.cpp
+++ b/src/SFML/Graphics/Texture.cpp
@@ -42,7 +42,6 @@
 #include <utility>
 
 #include <cassert>
-#include <climits>
 #include <cstring>
 
 
diff --git a/src/SFML/Graphics/TextureSaver.cpp b/src/SFML/Graphics/TextureSaver.cpp
index c47a18105..513768535 100644
--- a/src/SFML/Graphics/TextureSaver.cpp
+++ b/src/SFML/Graphics/TextureSaver.cpp
@@ -25,10 +25,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Graphics/GLExtensions.hpp>
+#include <SFML/Graphics/GLCheck.hpp>
 #include <SFML/Graphics/TextureSaver.hpp>
 
-
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/TextureSaver.hpp b/src/SFML/Graphics/TextureSaver.hpp
index 21d12c35d..afe3e5777 100644
--- a/src/SFML/Graphics/TextureSaver.hpp
+++ b/src/SFML/Graphics/TextureSaver.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 
 
 namespace sf::priv
diff --git a/src/SFML/Graphics/VertexBuffer.cpp b/src/SFML/Graphics/VertexBuffer.cpp
index e5d58c648..d69a02d15 100644
--- a/src/SFML/Graphics/VertexBuffer.cpp
+++ b/src/SFML/Graphics/VertexBuffer.cpp
@@ -39,6 +39,7 @@
 #include <cstddef>
 #include <cstring>
 
+
 namespace
 {
 // A nested named namespace is used here to allow unity builds of SFML.
diff --git a/src/SFML/Graphics/View.cpp b/src/SFML/Graphics/View.cpp
index e5640fe22..d35c5d67e 100644
--- a/src/SFML/Graphics/View.cpp
+++ b/src/SFML/Graphics/View.cpp
@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/View.hpp>
 
+#include <cassert>
 #include <cmath>
 
 
diff --git a/src/SFML/Network/Ftp.cpp b/src/SFML/Network/Ftp.cpp
index 435ea50e6..70985d623 100644
--- a/src/SFML/Network/Ftp.cpp
+++ b/src/SFML/Network/Ftp.cpp
@@ -30,11 +30,13 @@
 
 #include <SFML/System/Err.hpp>
 
+#include <algorithm>
 #include <fstream>
 #include <ostream>
 #include <sstream>
 #include <utility>
 
+#include <cctype>
 #include <cstddef>
 #include <cstdint>
 
@@ -532,7 +534,7 @@ Ftp::Response Ftp::DataChannel::open(Ftp::TransferMode mode)
             for (unsigned char& datum : data)
             {
                 // Extract the current number
-                while (isdigit(str[index]))
+                while (std::isdigit(str[index]))
                 {
                     datum = static_cast<std::uint8_t>(
                         static_cast<std::uint8_t>(datum * 10) + static_cast<std::uint8_t>(str[index] - '0'));
diff --git a/src/SFML/Network/Http.cpp b/src/SFML/Network/Http.cpp
index 52ccc765a..d1b5d5d3c 100644
--- a/src/SFML/Network/Http.cpp
+++ b/src/SFML/Network/Http.cpp
@@ -30,10 +30,15 @@
 #include <SFML/System/Err.hpp>
 #include <SFML/System/Utils.hpp>
 
+#include <algorithm>
 #include <iterator>
 #include <limits>
 #include <ostream>
 #include <sstream>
+#include <utility>
+
+#include <cctype>
+#include <cstddef>
 
 
 namespace sf
diff --git a/src/SFML/Network/IpAddress.cpp b/src/SFML/Network/IpAddress.cpp
index 41cef987c..2abb4abeb 100644
--- a/src/SFML/Network/IpAddress.cpp
+++ b/src/SFML/Network/IpAddress.cpp
@@ -31,7 +31,6 @@
 
 #include <istream>
 #include <ostream>
-#include <utility>
 
 #include <cstring>
 
diff --git a/src/SFML/Network/SocketImpl.hpp b/src/SFML/Network/SocketImpl.hpp
index 6c9565f9d..1e664e887 100644
--- a/src/SFML/Network/SocketImpl.hpp
+++ b/src/SFML/Network/SocketImpl.hpp
@@ -28,6 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Socket.hpp>
+#include <SFML/Network/SocketHandle.hpp>
 
 #if defined(SFML_SYSTEM_WINDOWS)
 
diff --git a/src/SFML/Network/SocketSelector.cpp b/src/SFML/Network/SocketSelector.cpp
index 04395ba36..69d4d354b 100644
--- a/src/SFML/Network/SocketSelector.cpp
+++ b/src/SFML/Network/SocketSelector.cpp
@@ -31,7 +31,6 @@
 
 #include <SFML/System/Err.hpp>
 
-#include <algorithm>
 #include <memory>
 #include <ostream>
 #include <utility>
@@ -120,7 +119,8 @@ void SocketSelector::add(Socket& socket)
         }
 
         // SocketHandle is an int in POSIX
-        m_impl->maxSocket = std::max(m_impl->maxSocket, handle);
+        if (m_impl->maxSocket < handle)
+            m_impl->maxSocket = handle;
 
 #endif
 
diff --git a/src/SFML/Network/Unix/SocketImpl.cpp b/src/SFML/Network/Unix/SocketImpl.cpp
index 6d6a2c2e0..59e3d6b5c 100644
--- a/src/SFML/Network/Unix/SocketImpl.cpp
+++ b/src/SFML/Network/Unix/SocketImpl.cpp
@@ -33,7 +33,6 @@
 #include <ostream>
 
 #include <cerrno>
-#include <cstring>
 
 
 namespace sf::priv
diff --git a/src/SFML/System/String.cpp b/src/SFML/System/String.cpp
index 959f354cd..99b381fce 100644
--- a/src/SFML/System/String.cpp
+++ b/src/SFML/System/String.cpp
@@ -33,6 +33,7 @@
 
 #include <cassert>
 #include <cstring>
+#include <cwchar>
 
 
 namespace sf
diff --git a/src/SFML/System/Utils.hpp b/src/SFML/System/Utils.hpp
index 8170a03bb..877867eaa 100644
--- a/src/SFML/System/Utils.hpp
+++ b/src/SFML/System/Utils.hpp
@@ -32,6 +32,8 @@
 #include <filesystem>
 #include <string>
 
+#include <cstddef>
+
 
 namespace sf
 {
diff --git a/src/SFML/Window/Context.cpp b/src/SFML/Window/Context.cpp
index e93ee7a93..e92b52d26 100644
--- a/src/SFML/Window/Context.cpp
+++ b/src/SFML/Window/Context.cpp
@@ -31,6 +31,7 @@
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
+#include <utility>
 
 
 namespace
diff --git a/src/SFML/Window/GlContext.cpp b/src/SFML/Window/GlContext.cpp
index 6ab974b75..dd920b60e 100644
--- a/src/SFML/Window/GlContext.cpp
+++ b/src/SFML/Window/GlContext.cpp
@@ -26,6 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Context.hpp>
+#include <SFML/Window/ContextSettings.hpp>
 #include <SFML/Window/GlContext.hpp>
 
 #include <SFML/System/Err.hpp>
diff --git a/src/SFML/Window/GlContext.hpp b/src/SFML/Window/GlContext.hpp
index 3c0531363..1fae56989 100644
--- a/src/SFML/Window/GlContext.hpp
+++ b/src/SFML/Window/GlContext.hpp
@@ -31,7 +31,8 @@
 
 #include <SFML/Window/Context.hpp>
 #include <SFML/Window/ContextSettings.hpp>
-#include <SFML/Window/GlResource.hpp>
+
+#include <SFML/System/Vector2.hpp>
 
 #include <memory>
 
diff --git a/src/SFML/Window/InputImpl.hpp b/src/SFML/Window/InputImpl.hpp
index e32978190..d50a4cbb8 100644
--- a/src/SFML/Window/InputImpl.hpp
+++ b/src/SFML/Window/InputImpl.hpp
@@ -32,6 +32,12 @@
 #include <SFML/Window/Keyboard.hpp>
 #include <SFML/Window/Mouse.hpp>
 
+
+namespace sf
+{
+class WindowBase;
+}
+
 namespace sf::priv::InputImpl
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Unix/VulkanImplX11.cpp b/src/SFML/Window/Unix/VulkanImplX11.cpp
index 4203435e3..fd67e2d66 100644
--- a/src/SFML/Window/Unix/VulkanImplX11.cpp
+++ b/src/SFML/Window/Unix/VulkanImplX11.cpp
@@ -29,8 +29,11 @@
 #include <SFML/Window/Unix/VulkanImplX11.hpp>
 
 #include <dlfcn.h>
-#include <map>
-#include <string>
+#include <string_view>
+#include <vector>
+
+#include <cstdint>
+
 #define VK_USE_PLATFORM_XLIB_KHR
 #define VK_NO_PROTOTYPES
 #include <vulkan.h>
diff --git a/src/SFML/Window/VideoModeImpl.hpp b/src/SFML/Window/VideoModeImpl.hpp
index 1c5e0842d..161126fb8 100644
--- a/src/SFML/Window/VideoModeImpl.hpp
+++ b/src/SFML/Window/VideoModeImpl.hpp
@@ -29,6 +29,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/VideoMode.hpp>
 
+#include <vector>
+
 
 namespace sf::priv
 {
diff --git a/src/SFML/Window/Win32/CursorImpl.hpp b/src/SFML/Window/Win32/CursorImpl.hpp
index 1d29018f7..eeaa52940 100644
--- a/src/SFML/Window/Win32/CursorImpl.hpp
+++ b/src/SFML/Window/Win32/CursorImpl.hpp
@@ -31,6 +31,9 @@
 
 #include <SFML/System/Vector2.hpp>
 
+#include <cstdint>
+
+
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Win32/InputImpl.cpp b/src/SFML/Window/Win32/InputImpl.cpp
index ce462e089..b01acb864 100644
--- a/src/SFML/Window/Win32/InputImpl.cpp
+++ b/src/SFML/Window/Win32/InputImpl.cpp
@@ -32,6 +32,9 @@
 #include <SFML/System/String.hpp>
 #include <SFML/System/Win32/WindowsHeader.hpp>
 
+#include <optional>
+
+
 namespace
 {
 sf::priv::EnumArray<sf::Keyboard::Key, sf::Keyboard::Scancode, sf::Keyboard::KeyCount> keyToScancodeMapping; ///< Mapping from Key to Scancode
diff --git a/src/SFML/Window/Win32/JoystickImpl.cpp b/src/SFML/Window/Win32/JoystickImpl.cpp
index ef5605a90..1ad975d55 100644
--- a/src/SFML/Window/Win32/JoystickImpl.cpp
+++ b/src/SFML/Window/Win32/JoystickImpl.cpp
@@ -42,7 +42,6 @@
 #include <vector>
 
 #include <cmath>
-#include <cstring>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Win32/VulkanImplWin32.cpp b/src/SFML/Window/Win32/VulkanImplWin32.cpp
index b927462a8..ec16d7dcf 100644
--- a/src/SFML/Window/Win32/VulkanImplWin32.cpp
+++ b/src/SFML/Window/Win32/VulkanImplWin32.cpp
@@ -29,8 +29,10 @@
 
 #include <SFML/System/Win32/WindowsHeader.hpp>
 
-#include <map>
 #include <string_view>
+
+#include <cstdint>
+
 #define VK_USE_PLATFORM_WIN32_KHR
 #define VK_NO_PROTOTYPES
 #include <vulkan.h>
diff --git a/src/SFML/Window/Win32/WglContext.cpp b/src/SFML/Window/Win32/WglContext.cpp
index a4721f328..357a74f7e 100644
--- a/src/SFML/Window/Win32/WglContext.cpp
+++ b/src/SFML/Window/Win32/WglContext.cpp
@@ -25,16 +25,20 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/ContextSettings.hpp>
+#include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/Win32/WglContext.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
 #include <SFML/System/Err.hpp>
+#include <SFML/System/String.hpp>
 
 #include <mutex>
-#include <ostream>
 #include <sstream>
 #include <vector>
 
+#include <cassert>
+
 // We check for this definition in order to avoid multiple definitions of GLAD
 // entities during unity builds of SFML.
 #ifndef SF_GLAD_WGL_IMPLEMENTATION_INCLUDED
diff --git a/src/SFML/Window/Win32/WglContext.hpp b/src/SFML/Window/Win32/WglContext.hpp
index 2990fa202..ed439f1f1 100644
--- a/src/SFML/Window/Win32/WglContext.hpp
+++ b/src/SFML/Window/Win32/WglContext.hpp
@@ -27,13 +27,22 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/Context.hpp>
 #include <SFML/Window/GlContext.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <glad/wgl.h>
 
 
-namespace sf::priv
+namespace sf
 {
+struct ContextSettings;
+
+namespace priv
+{
+class WindowImpl;
+
 ////////////////////////////////////////////////////////////
 /// \brief Windows (WGL) implementation of OpenGL contexts
 ///
@@ -184,4 +193,5 @@ private:
     bool        m_isGeneric{};     //!< Is this context provided by the generic GDI implementation?
 };
 
-} // namespace sf::priv
+} // namespace priv
+} // namespace sf
diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index 383873e55..6a966adc9 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -33,7 +33,6 @@
 #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
 // or mingw-w64 addresses files in a case insensitive manner.
@@ -41,6 +40,9 @@
 #include <ostream>
 #include <vector>
 
+#include <cstddef>
+#include <cstring>
+
 // MinGW lacks the definition of some Win32 constants
 #ifndef XBUTTON1
 #define XBUTTON1 0x0001
diff --git a/src/SFML/Window/Win32/WindowImplWin32.hpp b/src/SFML/Window/Win32/WindowImplWin32.hpp
index c87259d7c..267b35b28 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.hpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.hpp
@@ -27,11 +27,16 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/Event.hpp>
+#include <SFML/Window/Keyboard.hpp>
+#include <SFML/Window/WindowEnums.hpp>
+#include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
+#include <SFML/System/Vector2.hpp>
 #include <SFML/System/Win32/WindowsHeader.hpp>
 
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
index 802437c9e..7591b0608 100644
--- a/src/SFML/Window/Window.cpp
+++ b/src/SFML/Window/Window.cpp
@@ -34,8 +34,6 @@
 
 #include <ostream>
 
-#include <cassert>
-
 
 namespace sf
 {
diff --git a/src/SFML/Window/WindowBase.cpp b/src/SFML/Window/WindowBase.cpp
index 73e1c8406..c7e30cb3d 100644
--- a/src/SFML/Window/WindowBase.cpp
+++ b/src/SFML/Window/WindowBase.cpp
@@ -26,7 +26,13 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/ContextSettings.hpp>
+#include <SFML/Window/Cursor.hpp>
+#include <SFML/Window/Event.hpp>
+#include <SFML/Window/VideoMode.hpp>
+#include <SFML/Window/Vulkan.hpp>
 #include <SFML/Window/WindowBase.hpp>
+#include <SFML/Window/WindowEnums.hpp>
+#include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
 #include <SFML/System/Err.hpp>
@@ -34,6 +40,7 @@
 #include <algorithm>
 #include <limits>
 #include <ostream>
+#include <vector>
 
 #include <cassert>
 
diff --git a/src/SFML/Window/WindowImpl.hpp b/src/SFML/Window/WindowImpl.hpp
index 313e051f8..4e2d3e8e0 100644
--- a/src/SFML/Window/WindowImpl.hpp
+++ b/src/SFML/Window/WindowImpl.hpp
@@ -41,12 +41,16 @@
 #include <SFML/Window/WindowHandle.hpp>
 
 #include <SFML/System/EnumArray.hpp>
+#include <SFML/System/Vector2.hpp>
+#include <SFML/System/Vector3.hpp>
 
 #include <array>
 #include <memory>
 #include <optional>
 #include <queue>
-#include <set>
+
+#include <cstdint>
+
 
 namespace sf
 {
diff --git a/test/Graphics/Drawable.test.cpp b/test/Graphics/Drawable.test.cpp
index 5d25c8959..e1296b746 100644
--- a/test/Graphics/Drawable.test.cpp
+++ b/test/Graphics/Drawable.test.cpp
@@ -4,6 +4,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <type_traits>
 
 class DrawableTest : public sf::Drawable
diff --git a/test/Graphics/Font.test.cpp b/test/Graphics/Font.test.cpp
index ff72f6e85..fbebfdb97 100644
--- a/test/Graphics/Font.test.cpp
+++ b/test/Graphics/Font.test.cpp
@@ -1,4 +1,5 @@
 #include <SFML/Graphics/Font.hpp>
+#include <SFML/Graphics/Texture.hpp>
 
 // Other 1st party headers
 #include <SFML/System/FileInputStream.hpp>
@@ -6,6 +7,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <fstream>
 #include <type_traits>
 
diff --git a/test/Graphics/Render.test.cpp b/test/Graphics/Render.test.cpp
index 68ebcb1fc..eac9860fb 100644
--- a/test/Graphics/Render.test.cpp
+++ b/test/Graphics/Render.test.cpp
@@ -6,6 +6,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 
 TEST_CASE("[Graphics] Render Tests", runDisplayTests())
 {
diff --git a/test/Graphics/RenderWindow.test.cpp b/test/Graphics/RenderWindow.test.cpp
index 641b966ef..f0c8d6861 100644
--- a/test/Graphics/RenderWindow.test.cpp
+++ b/test/Graphics/RenderWindow.test.cpp
@@ -11,6 +11,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <type_traits>
 
 TEST_CASE("[Graphics] sf::RenderWindow", runDisplayTests())
diff --git a/test/Graphics/Shape.test.cpp b/test/Graphics/Shape.test.cpp
index 49a051ef0..bd0abfde3 100644
--- a/test/Graphics/Shape.test.cpp
+++ b/test/Graphics/Shape.test.cpp
@@ -6,6 +6,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <type_traits>
 
 class TriangleShape : public sf::Shape
diff --git a/test/Graphics/Text.test.cpp b/test/Graphics/Text.test.cpp
index f65b328b7..60d1e85d1 100644
--- a/test/Graphics/Text.test.cpp
+++ b/test/Graphics/Text.test.cpp
@@ -6,6 +6,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <type_traits>
 
 TEST_CASE("[Graphics] sf::Text", runDisplayTests())
diff --git a/test/Graphics/Texture.test.cpp b/test/Graphics/Texture.test.cpp
index 6cbfe26d2..043c6f3fc 100644
--- a/test/Graphics/Texture.test.cpp
+++ b/test/Graphics/Texture.test.cpp
@@ -8,6 +8,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <GraphicsUtil.hpp>
+#include <WindowUtil.hpp>
 #include <type_traits>
 
 TEST_CASE("[Graphics] sf::Texture", runDisplayTests())
diff --git a/test/Network/Packet.test.cpp b/test/Network/Packet.test.cpp
index 73009443d..7908bc446 100644
--- a/test/Network/Packet.test.cpp
+++ b/test/Network/Packet.test.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <cstddef>
+#include <cwchar>
 
 #define CHECK_PACKET_STREAM_OPERATORS(expected)              \
     do                                                       \
diff --git a/test/System/FileInputStream.test.cpp b/test/System/FileInputStream.test.cpp
index 934a49364..43eccb28c 100644
--- a/test/System/FileInputStream.test.cpp
+++ b/test/System/FileInputStream.test.cpp
@@ -2,8 +2,10 @@
 
 #include <catch2/catch_test_macros.hpp>
 
+#include <filesystem>
 #include <fstream>
 #include <sstream>
+#include <string>
 #include <string_view>
 #include <type_traits>
 #include <utility>
diff --git a/test/TestUtilities/GraphicsUtil.cpp b/test/TestUtilities/GraphicsUtil.cpp
index b5eaa56be..05ed0688d 100644
--- a/test/TestUtilities/GraphicsUtil.cpp
+++ b/test/TestUtilities/GraphicsUtil.cpp
@@ -6,6 +6,7 @@
 
 #include <GraphicsUtil.hpp>
 #include <SystemUtil.hpp>
+#include <limits>
 #include <ostream>
 
 namespace sf
diff --git a/test/TestUtilities/GraphicsUtil.hpp b/test/TestUtilities/GraphicsUtil.hpp
index 1ce0c2bbc..0ae41b31e 100644
--- a/test/TestUtilities/GraphicsUtil.hpp
+++ b/test/TestUtilities/GraphicsUtil.hpp
@@ -5,9 +5,8 @@
 
 #pragma once
 
-#include <WindowUtil.hpp>
+#include <SystemUtil.hpp>
 #include <iosfwd>
-#include <limits>
 
 namespace sf
 {
diff --git a/test/TestUtilities/SystemUtil.cpp b/test/TestUtilities/SystemUtil.cpp
index e1f879ee1..d17e4f482 100644
--- a/test/TestUtilities/SystemUtil.cpp
+++ b/test/TestUtilities/SystemUtil.cpp
@@ -5,7 +5,6 @@
 #include <SFML/System/Vector3.hpp>
 
 #include <catch2/catch_approx.hpp>
-#include <catch2/catch_test_macros.hpp>
 
 #include <SystemUtil.hpp>
 #include <iomanip>
diff --git a/test/TestUtilities/WindowUtil.cpp b/test/TestUtilities/WindowUtil.cpp
index d3d20bf54..83a7c030c 100644
--- a/test/TestUtilities/WindowUtil.cpp
+++ b/test/TestUtilities/WindowUtil.cpp
@@ -2,6 +2,8 @@
 #include <SFML/Window/VideoMode.hpp>
 
 #include <ostream>
+#include <string>
+
 
 std::string runDisplayTests()
 {