Header cleanup guided by IWYU

examples/ftp/Ftp.cpp

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

examples/island/Island.cpp

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 

examples/opengl/OpenGL.cpp

@@ -4,6 +4,7 @@
 #include <SFML/Graphics.hpp>
 
 #include <array>
+#include <filesystem>
 #include <iostream>
 
 #include <cstdlib>

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
 {

examples/sockets/TCP.cpp

@@ -5,6 +5,9 @@
 
 #include <iomanip>
 #include <iostream>
+#include <optional>
+
+#include <cstddef>
 
 
 ////////////////////////////////////////////////////////////

examples/sockets/UDP.cpp

@@ -7,6 +7,8 @@
 #include <iostream>
 #include <optional>
 
+#include <cstddef>
+
 
 ////////////////////////////////////////////////////////////
 /// Launch a server, wait for a message, send an answer.

examples/stencil/Stencil.cpp

@@ -3,6 +3,9 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics.hpp>
 
+#include <cstdlib>
+
+
 ////////////////////////////////////////////////////////////
 /// Entry point of application
 ///

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>

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;

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>
 
 

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>
 
 

include/SFML/Audio/Music.hpp

@@ -33,8 +33,10 @@
 #include <SFML/Audio/SoundStream.hpp>
 
 #include <filesystem>
+#include <mutex>
 #include <vector>
 
+#include <cstddef>
 #include <cstdint>
 
 

include/SFML/Audio/OutputSoundFile.hpp

@@ -34,6 +34,8 @@
 #include <filesystem>
 #include <memory>
 
+#include <cstdint>
+
 
 namespace sf
 {

include/SFML/Audio/SoundBuffer.hpp

@@ -37,6 +37,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include <cstddef>
 #include <cstdint>
 
 

include/SFML/Audio/SoundBufferRecorder.hpp

@@ -34,6 +34,9 @@
 
 #include <vector>
 
+#include <cstddef>
+#include <cstdint>
+
 
 namespace sf
 {

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

include/SFML/Graphics/CircleShape.hpp

@@ -31,6 +31,10 @@
 
 #include <SFML/Graphics/Shape.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
+#include <cstddef>
+
 
 namespace sf
 {

include/SFML/Graphics/ConvexShape.hpp

@@ -33,6 +33,8 @@
 
 #include <vector>
 
+#include <cstddef>
+
 
 namespace sf
 {

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

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>
 

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
 {

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
 {

include/SFML/Graphics/RectangleShape.hpp

@@ -31,6 +31,10 @@
 
 #include <SFML/Graphics/Shape.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
+#include <cstddef>
+
 
 namespace sf
 {

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, ...)

include/SFML/Graphics/RenderTexture.hpp

@@ -34,6 +34,8 @@
 
 #include <SFML/Window/ContextSettings.hpp>
 
+#include <SFML/System/Vector2.hpp>
+
 #include <memory>
 
 

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

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)

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

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
 {

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

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;
 

include/SFML/Graphics/Transform.inl

@@ -29,6 +29,8 @@
 
 #include <array>
 
+#include <cstddef>
+
 
 namespace sf
 {

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

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>
 

include/SFML/Network/Http.hpp

@@ -34,6 +34,7 @@
 
 #include <SFML/System/Time.hpp>
 
+#include <iosfwd>
 #include <map>
 #include <optional>
 #include <string>

include/SFML/Network/IpAddress.hpp

@@ -36,6 +36,8 @@
 #include <string>
 #include <string_view>
 
+#include <cstdint>
+
 
 namespace sf
 {

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

include/SFML/Network/Socket.hpp

@@ -34,8 +34,6 @@
 
 namespace sf
 {
-class SocketSelector;
-
 ////////////////////////////////////////////////////////////
 /// \brief Base class for all the socket types
 ///

include/SFML/Network/TcpSocket.hpp

@@ -37,6 +37,7 @@
 #include <vector>
 
 #include <cstddef>
+#include <cstdint>
 
 
 namespace sf

include/SFML/System/FileInputStream.hpp

@@ -36,6 +36,7 @@
 #include <filesystem>
 #include <memory>
 
+#include <cstdint>
 #include <cstdio>
 
 #ifdef SFML_SYSTEM_ANDROID

include/SFML/System/MemoryInputStream.hpp

@@ -34,7 +34,7 @@
 #include <SFML/System/InputStream.hpp>
 
 #include <cstddef>
-#include <cstdlib>
+#include <cstdint>
 
 
 namespace sf

include/SFML/System/String.hpp

@@ -34,6 +34,7 @@
 #include <locale>
 #include <string>
 
+#include <cstddef>
 #include <cstdint>
 
 

include/SFML/System/String.inl

@@ -27,6 +27,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/System/String.hpp> // NOLINT(misc-header-include-cycle)
 
+#include <iterator>
+
 
 namespace sf
 {

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

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

include/SFML/Window/WindowBase.hpp

@@ -38,6 +38,8 @@
 #include <memory>
 #include <optional>
 
+#include <cstdint>
+
 
 namespace sf
 {

src/SFML/Audio/InputSoundFile.cpp

@@ -37,6 +37,7 @@
 
 #include <algorithm>
 #include <ostream>
+#include <utility>
 
 
 namespace sf

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"

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

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
 {

src/SFML/Audio/SoundFileReaderMp3.hpp

@@ -48,7 +48,9 @@
 
 #include <SFML/Audio/SoundFileReader.hpp>
 
-#include <vector>
+#include <optional>
+
+#include <cstdint>
 
 
 namespace sf::priv

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

src/SFML/Audio/SoundFileReaderOgg.hpp

@@ -31,6 +31,15 @@
 
 #include <vorbis/vorbisfile.h>
 
+#include <optional>
+
+#include <cstdint>
+
+
+namespace sf
+{
+class InputStream;
+}
 
 namespace sf::priv
 {

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>
 

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
 {

src/SFML/Audio/SoundFileWriterFlac.cpp

@@ -33,9 +33,6 @@
 #include <algorithm>
 #include <ostream>
 
-#include <cassert>
-#include <cctype>
-
 
 namespace sf::priv
 {

src/SFML/Audio/SoundFileWriterFlac.hpp

@@ -34,6 +34,8 @@
 #include <memory>
 #include <vector>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {

src/SFML/Audio/SoundFileWriterOgg.cpp

@@ -35,7 +35,6 @@
 #include <random>
 
 #include <cassert>
-#include <cctype>
 
 
 namespace sf::priv

src/SFML/Audio/SoundFileWriterOgg.hpp

@@ -34,6 +34,8 @@
 #include <filesystem>
 #include <fstream>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {

src/SFML/Audio/SoundFileWriterWav.hpp

@@ -32,6 +32,8 @@
 #include <filesystem>
 #include <fstream>
 
+#include <cstdint>
+
 
 namespace sf::priv
 {

src/SFML/Graphics/CircleShape.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.hpp>
 
-#include <cmath>
+#include <SFML/System/Angle.hpp>
 
 
 namespace sf

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;

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>
 

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>

src/SFML/Graphics/RectangleShape.cpp

@@ -27,8 +27,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RectangleShape.hpp>
 
-#include <cmath>
-
 
 namespace sf
 {

src/SFML/Graphics/RenderStates.cpp

@@ -27,8 +27,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderStates.hpp>
 
-#include <cstddef>
-
 
 namespace sf
 {

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>

src/SFML/Graphics/RenderTexture.cpp

@@ -34,6 +34,8 @@
 #include <memory>
 #include <ostream>
 
+#include <cassert>
+
 
 namespace sf
 {

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
 {

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

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
 {

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>
 

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)

src/SFML/Graphics/Shape.cpp

@@ -31,6 +31,9 @@
 
 #include <algorithm>
 
+#include <cassert>
+#include <cstddef>
+
 namespace
 {
 // Compute the normal of a segment

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>
 
 

src/SFML/Graphics/Text.cpp

@@ -34,6 +34,8 @@
 #include <utility>
 
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 
 
 namespace

src/SFML/Graphics/Texture.cpp

@@ -42,7 +42,6 @@
 #include <utility>
 
 #include <cassert>
-#include <climits>
 #include <cstring>
 
 

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

src/SFML/Graphics/TextureSaver.hpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/Graphics/GLExtensions.hpp>
 
 
 namespace sf::priv

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.

src/SFML/Graphics/View.cpp

@@ -27,6 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/View.hpp>
 
+#include <cassert>
 #include <cmath>
 
 

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'));

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

src/SFML/Network/IpAddress.cpp

@@ -31,7 +31,6 @@
 
 #include <istream>
 #include <ostream>
-#include <utility>
 
 #include <cstring>
 

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)
 

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
 

src/SFML/Network/Unix/SocketImpl.cpp

@@ -33,7 +33,6 @@
 #include <ostream>
 
 #include <cerrno>
-#include <cstring>
 
 
 namespace sf::priv

src/SFML/System/String.cpp

@@ -33,6 +33,7 @@
 
 #include <cassert>
 #include <cstring>
+#include <cwchar>
 
 
 namespace sf

src/SFML/System/Utils.hpp

@@ -32,6 +32,8 @@
 #include <filesystem>
 #include <string>
 
+#include <cstddef>
+
 
 namespace sf
 {

src/SFML/Window/Context.cpp

@@ -31,6 +31,7 @@
 #include <SFML/System/Err.hpp>
 
 #include <ostream>
+#include <utility>
 
 
 namespace

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>

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>
 

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

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>

src/SFML/Window/VideoModeImpl.hpp

@@ -29,6 +29,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/VideoMode.hpp>
 
+#include <vector>
+
 
 namespace sf::priv
 {

src/SFML/Window/Win32/CursorImpl.hpp

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

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

src/SFML/Window/Win32/JoystickImpl.cpp

@@ -42,7 +42,6 @@
 #include <vector>
 
 #include <cmath>
-#include <cstring>
 
 
 ////////////////////////////////////////////////////////////

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>

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