Use .hpp as file extension for C++ headers

src/CSFML/Audio/CMakeLists.txt

@@ -8,23 +8,23 @@ set(SRC
     ${SRCROOT}/Listener.cpp
     ${INCROOT}/Listener.h
     ${SRCROOT}/Music.cpp
-    ${SRCROOT}/MusicStruct.h
+    ${SRCROOT}/MusicStruct.hpp
     ${INCROOT}/Music.h
     ${SRCROOT}/Sound.cpp
-    ${SRCROOT}/SoundStruct.h
+    ${SRCROOT}/SoundStruct.hpp
     ${INCROOT}/Sound.h
     ${SRCROOT}/SoundBuffer.cpp
-    ${SRCROOT}/SoundBufferStruct.h
+    ${SRCROOT}/SoundBufferStruct.hpp
     ${INCROOT}/SoundBuffer.h
     ${SRCROOT}/SoundBufferRecorder.cpp
-    ${SRCROOT}/SoundBufferRecorderStruct.h
+    ${SRCROOT}/SoundBufferRecorderStruct.hpp
     ${INCROOT}/SoundBufferRecorder.h
     ${SRCROOT}/SoundRecorder.cpp
-    ${SRCROOT}/SoundRecorderStruct.h
+    ${SRCROOT}/SoundRecorderStruct.hpp
     ${INCROOT}/SoundRecorder.h
     ${INCROOT}/SoundStatus.h
     ${SRCROOT}/SoundStream.cpp
-    ${SRCROOT}/SoundStreamStruct.h
+    ${SRCROOT}/SoundStreamStruct.hpp
     ${INCROOT}/SoundStream.h
     ${INCROOT}/Types.h
 )

src/CSFML/Audio/Music.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Music.h>
-#include <CSFML/Audio/MusicStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/MusicStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/MusicStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Music.hpp>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/Sound.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/Sound.h>
-#include <CSFML/Audio/SoundStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/SoundStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundBuffer.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/SoundBuffer.h>
-#include <CSFML/Audio/SoundBufferStruct.h>
-#include <CSFML/CallbackStream.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/SoundBufferStruct.hpp>
+#include <CSFML/CallbackStream.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundBufferRecorder.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/SoundBufferRecorder.h>
-#include <CSFML/Audio/SoundBufferRecorderStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/SoundBufferRecorderStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundBufferRecorderStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.hpp>
-#include <CSFML/Audio/SoundBufferStruct.h>
+#include <CSFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundRecorder.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/SoundRecorder.h>
-#include <CSFML/Audio/SoundRecorderStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/SoundRecorderStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundStream.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Audio/SoundStream.h>
-#include <CSFML/Audio/SoundStreamStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Audio/SoundStreamStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Audio/SoundStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Sound.hpp>
-#include <CSFML/Audio/SoundBufferStruct.h>
+#include <CSFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/CMakeLists.txt

@@ -8,65 +8,65 @@ set(SRC
     ${SRCROOT}/BlendMode.cpp
     ${INCROOT}/BlendMode.h
     ${SRCROOT}/CircleShape.cpp
-    ${SRCROOT}/CircleShapeStruct.h
+    ${SRCROOT}/CircleShapeStruct.hpp
     ${INCROOT}/CircleShape.h
     ${SRCROOT}/Color.cpp
     ${INCROOT}/Color.h
     ${SRCROOT}/ConvertRenderStates.hpp
     ${SRCROOT}/ConvertTransform.hpp
     ${SRCROOT}/ConvexShape.cpp
-    ${SRCROOT}/ConvexShapeStruct.h
+    ${SRCROOT}/ConvexShapeStruct.hpp
     ${INCROOT}/ConvexShape.h
     ${SRCROOT}/Font.cpp
-    ${SRCROOT}/FontStruct.h
+    ${SRCROOT}/FontStruct.hpp
     ${INCROOT}/Font.h
     ${INCROOT}/FontInfo.h
     ${INCROOT}/Glyph.h
     ${SRCROOT}/Image.cpp
-    ${SRCROOT}/ImageStruct.h
+    ${SRCROOT}/ImageStruct.hpp
     ${INCROOT}/Image.h
     ${SRCROOT}/Rect.cpp
     ${INCROOT}/Rect.h
     ${SRCROOT}/RectangleShape.cpp
-    ${SRCROOT}/RectangleShapeStruct.h
+    ${SRCROOT}/RectangleShapeStruct.hpp
     ${INCROOT}/RectangleShape.h
     ${SRCROOT}/RenderStates.cpp
     ${SRCROOT}/RenderTexture.cpp
-    ${SRCROOT}/RenderTextureStruct.h
+    ${SRCROOT}/RenderTextureStruct.hpp
     ${INCROOT}/RenderTexture.h
     ${SRCROOT}/RenderWindow.cpp
-    ${SRCROOT}/RenderWindowStruct.h
+    ${SRCROOT}/RenderWindowStruct.hpp
     ${INCROOT}/RenderWindow.h
     ${SRCROOT}/Shader.cpp
-    ${SRCROOT}/ShaderStruct.h
+    ${SRCROOT}/ShaderStruct.hpp
     ${INCROOT}/Shader.h
     ${SRCROOT}/Shape.cpp
-    ${SRCROOT}/ShapeStruct.h
+    ${SRCROOT}/ShapeStruct.hpp
     ${INCROOT}/Shape.h
     ${SRCROOT}/Sprite.cpp
-    ${SRCROOT}/SpriteStruct.h
+    ${SRCROOT}/SpriteStruct.hpp
     ${INCROOT}/Sprite.h
     ${SRCROOT}/Text.cpp
-    ${SRCROOT}/TextStruct.h
+    ${SRCROOT}/TextStruct.hpp
     ${INCROOT}/Text.h
     ${SRCROOT}/Texture.cpp
-    ${SRCROOT}/TextureStruct.h
+    ${SRCROOT}/TextureStruct.hpp
     ${INCROOT}/Texture.h
     ${SRCROOT}/Transform.cpp
     ${INCROOT}/Transform.h
     ${SRCROOT}/Transformable.cpp
-    ${SRCROOT}/TransformableStruct.h
+    ${SRCROOT}/TransformableStruct.hpp
     ${INCROOT}/Transformable.h
     ${INCROOT}/Types.h
     ${INCROOT}/Vertex.h
     ${SRCROOT}/VertexArray.cpp
-    ${SRCROOT}/VertexArrayStruct.h
+    ${SRCROOT}/VertexArrayStruct.hpp
     ${INCROOT}/VertexArray.h
     ${INCROOT}/VertexBuffer.h
     ${SRCROOT}/VertexBuffer.cpp
-    ${SRCROOT}/VertexBufferStruct.h
+    ${SRCROOT}/VertexBufferStruct.hpp
     ${SRCROOT}/View.cpp
-    ${SRCROOT}/ViewStruct.h
+    ${SRCROOT}/ViewStruct.hpp
     ${INCROOT}/View.h
 )
 

src/CSFML/Graphics/CircleShape.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/CircleShape.h>
-#include <CSFML/Graphics/CircleShapeStruct.h>
+#include <CSFML/Graphics/CircleShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/CircleShapeStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/Transform.h>
 
 

src/CSFML/Graphics/Color.cpp

@@ -26,7 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Color.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <algorithm>
 
 

src/CSFML/Graphics/ConvertRenderStates.hpp

@@ -30,8 +30,8 @@
 #include <CSFML/Graphics/RenderStates.h>
 #include <SFML/Graphics/RenderStates.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
-#include <CSFML/Graphics/ShaderStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
+#include <CSFML/Graphics/ShaderStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/ConvexShape.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/ConvexShape.h>
-#include <CSFML/Graphics/ConvexShapeStruct.h>
+#include <CSFML/Graphics/ConvexShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/ConvexShapeStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/ConvexShape.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/Transform.h>
 
 

src/CSFML/Graphics/Font.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Font.h>
-#include <CSFML/Graphics/FontStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/Graphics/FontStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/FontStruct.hpp

@@ -28,8 +28,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Font.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
+#include <CSFML/CallbackStream.hpp>
 #include <map>
 
 

src/CSFML/Graphics/Image.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Image.h>
-#include <CSFML/Graphics/ImageStruct.h>
-#include <CSFML/System/BufferStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/Graphics/ImageStruct.hpp>
+#include <CSFML/System/BufferStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/Rect.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Rect.h>
 #include <SFML/Graphics/Rect.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/RectangleShape.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/RectangleShape.h>
-#include <CSFML/Graphics/RectangleShapeStruct.h>
+#include <CSFML/Graphics/RectangleShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/RectangleShapeStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RectangleShape.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/Transform.h>
 
 

src/CSFML/Graphics/RenderTexture.cpp

@@ -26,18 +26,18 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/RenderTexture.h>
-#include <CSFML/Graphics/RenderTextureStruct.h>
-#include <CSFML/Graphics/SpriteStruct.h>
-#include <CSFML/Graphics/TextStruct.h>
-#include <CSFML/Graphics/ShapeStruct.h>
-#include <CSFML/Graphics/CircleShapeStruct.h>
-#include <CSFML/Graphics/ConvexShapeStruct.h>
-#include <CSFML/Graphics/RectangleShapeStruct.h>
-#include <CSFML/Graphics/VertexArrayStruct.h>
-#include <CSFML/Graphics/VertexBufferStruct.h>
+#include <CSFML/Graphics/RenderTextureStruct.hpp>
+#include <CSFML/Graphics/SpriteStruct.hpp>
+#include <CSFML/Graphics/TextStruct.hpp>
+#include <CSFML/Graphics/ShapeStruct.hpp>
+#include <CSFML/Graphics/CircleShapeStruct.hpp>
+#include <CSFML/Graphics/ConvexShapeStruct.hpp>
+#include <CSFML/Graphics/RectangleShapeStruct.hpp>
+#include <CSFML/Graphics/VertexArrayStruct.hpp>
+#include <CSFML/Graphics/VertexBufferStruct.hpp>
 #include <CSFML/Graphics/ConvertRenderStates.hpp>
-#include <CSFML/Internal.h>
-#include <CSFML/Window/ContextSettingsInternal.h>
+#include <CSFML/Internal.hpp>
+#include <CSFML/Window/ContextSettingsInternal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/RenderTextureStruct.hpp

@@ -28,8 +28,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTexture.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
-#include <CSFML/Graphics/ViewStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
+#include <CSFML/Graphics/ViewStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/RenderWindow.cpp

@@ -25,22 +25,22 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <CSFML/ConvertEvent.h>
-#include <CSFML/Graphics/CircleShapeStruct.h>
+#include <CSFML/ConvertEvent.hpp>
+#include <CSFML/Graphics/CircleShapeStruct.hpp>
 #include <CSFML/Graphics/ConvertRenderStates.hpp>
-#include <CSFML/Graphics/ConvexShapeStruct.h>
-#include <CSFML/Graphics/ImageStruct.h>
-#include <CSFML/Graphics/RectangleShapeStruct.h>
+#include <CSFML/Graphics/ConvexShapeStruct.hpp>
+#include <CSFML/Graphics/ImageStruct.hpp>
+#include <CSFML/Graphics/RectangleShapeStruct.hpp>
 #include <CSFML/Graphics/RenderWindow.h>
-#include <CSFML/Graphics/RenderWindowStruct.h>
-#include <CSFML/Graphics/ShapeStruct.h>
-#include <CSFML/Graphics/SpriteStruct.h>
-#include <CSFML/Graphics/TextStruct.h>
-#include <CSFML/Graphics/VertexArrayStruct.h>
-#include <CSFML/Graphics/VertexBufferStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/Window/ContextSettingsInternal.h>
-#include <CSFML/Window/CursorStruct.h>
+#include <CSFML/Graphics/RenderWindowStruct.hpp>
+#include <CSFML/Graphics/ShapeStruct.hpp>
+#include <CSFML/Graphics/SpriteStruct.hpp>
+#include <CSFML/Graphics/TextStruct.hpp>
+#include <CSFML/Graphics/VertexArrayStruct.hpp>
+#include <CSFML/Graphics/VertexBufferStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/Window/ContextSettingsInternal.hpp>
+#include <CSFML/Window/CursorStruct.hpp>
 #include <SFML/Window/Touch.hpp>
 
 

src/CSFML/Graphics/RenderWindowStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderWindow.hpp>
-#include <CSFML/Graphics/ViewStruct.h>
+#include <CSFML/Graphics/ViewStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/Shader.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Shader.h>
-#include <CSFML/Graphics/ShaderStruct.h>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/ShaderStruct.hpp>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/Internal.hpp>
+#include <CSFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/Shape.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Shape.h>
-#include <CSFML/Graphics/ShapeStruct.h>
+#include <CSFML/Graphics/ShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/ShapeStruct.hpp

@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Shape.h>
 #include <SFML/Graphics/Shape.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/Transform.h>
 
 

src/CSFML/Graphics/Sprite.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Sprite.h>
-#include <CSFML/Graphics/SpriteStruct.h>
+#include <CSFML/Graphics/SpriteStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/SpriteStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Sprite.hpp>
-#include <CSFML/Graphics/TextureStruct.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
 #include <CSFML/Graphics/Transform.h>
 
 

src/CSFML/Graphics/Text.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Text.h>
-#include <CSFML/Graphics/TextStruct.h>
+#include <CSFML/Graphics/TextStruct.hpp>
 #include <CSFML/Graphics/Font.h>
 #include <SFML/Graphics/Color.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/TextStruct.hpp

@@ -28,7 +28,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Text.hpp>
-#include <CSFML/Graphics/FontStruct.h>
+#include <CSFML/Graphics/FontStruct.hpp>
 #include <CSFML/Graphics/Rect.h>
 #include <CSFML/Graphics/Transform.h>
 #include <string>

src/CSFML/Graphics/Texture.cpp

@@ -26,12 +26,12 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Texture.h>
-#include <CSFML/Graphics/TextureStruct.h>
-#include <CSFML/Graphics/ImageStruct.h>
-#include <CSFML/Graphics/RenderWindowStruct.h>
-#include <CSFML/Window/WindowStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/CallbackStream.h>
+#include <CSFML/Graphics/TextureStruct.hpp>
+#include <CSFML/Graphics/ImageStruct.hpp>
+#include <CSFML/Graphics/RenderWindowStruct.hpp>
+#include <CSFML/Window/WindowStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/Transform.cpp

@@ -28,7 +28,7 @@
 #include <CSFML/Graphics/Transform.h>
 #include <SFML/Graphics/Transform.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <cstring>
 
 

src/CSFML/Graphics/Transformable.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/Transformable.h>
-#include <CSFML/Graphics/TransformableStruct.h>
+#include <CSFML/Graphics/TransformableStruct.hpp>
 #include <CSFML/Graphics/ConvertTransform.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/VertexArray.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/VertexArray.h>
-#include <CSFML/Graphics/VertexArrayStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Graphics/VertexArrayStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/VertexBuffer.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/VertexBuffer.h>
-#include <CSFML/Graphics/VertexBufferStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Graphics/VertexBufferStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Graphics/View.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Graphics/View.h>
-#include <CSFML/Graphics/ViewStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Graphics/ViewStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/CMakeLists.txt

@@ -6,29 +6,29 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/CSFML/Network)
 set(SRC
     ${INCROOT}/Export.h
     ${SRCROOT}/Ftp.cpp
-    ${SRCROOT}/FtpStruct.h
+    ${SRCROOT}/FtpStruct.hpp
     ${INCROOT}/Ftp.h
     ${SRCROOT}/Http.cpp
-    ${SRCROOT}/HttpStruct.h
+    ${SRCROOT}/HttpStruct.hpp
     ${INCROOT}/Http.h
     ${SRCROOT}/IpAddress.cpp
     ${INCROOT}/IpAddress.h
     ${SRCROOT}/Packet.cpp
-    ${SRCROOT}/PacketStruct.h
+    ${SRCROOT}/PacketStruct.hpp
     ${INCROOT}/Packet.h
     ${SRCROOT}/SocketSelector.cpp
-    ${SRCROOT}/SocketSelectorStruct.h
+    ${SRCROOT}/SocketSelectorStruct.hpp
     ${INCROOT}/SocketSelector.h
     ${INCROOT}/SocketStatus.h
     ${SRCROOT}/TcpListener.cpp
-    ${SRCROOT}/TcpListenerStruct.h
+    ${SRCROOT}/TcpListenerStruct.hpp
     ${INCROOT}/TcpListener.h
     ${SRCROOT}/TcpSocket.cpp
-    ${SRCROOT}/TcpSocketStruct.h
+    ${SRCROOT}/TcpSocketStruct.hpp
     ${INCROOT}/TcpSocket.h
     ${INCROOT}/Types.h
     ${SRCROOT}/UdpSocket.cpp
-    ${SRCROOT}/UdpSocketStruct.h
+    ${SRCROOT}/UdpSocketStruct.hpp
     ${INCROOT}/UdpSocket.h
 )
 

src/CSFML/Network/Ftp.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/Ftp.h>
-#include <CSFML/Network/FtpStruct.h>
+#include <CSFML/Network/FtpStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
 #include <SFML/System/String.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <string.h>
 #include <CSFML/Char32.hpp>
 

src/CSFML/Network/Http.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/Http.h>
-#include <CSFML/Network/HttpStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Network/HttpStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/Packet.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/Packet.h>
-#include <CSFML/Network/PacketStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Network/PacketStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/SocketSelector.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/SocketSelector.h>
-#include <CSFML/Network/SocketSelectorStruct.h>
-#include <CSFML/Network/TcpListenerStruct.h>
-#include <CSFML/Network/TcpSocketStruct.h>
-#include <CSFML/Network/UdpSocketStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Network/SocketSelectorStruct.hpp>
+#include <CSFML/Network/TcpListenerStruct.hpp>
+#include <CSFML/Network/TcpSocketStruct.hpp>
+#include <CSFML/Network/UdpSocketStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/TcpListener.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/TcpListener.h>
-#include <CSFML/Network/TcpListenerStruct.h>
-#include <CSFML/Network/TcpSocketStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Network/TcpListenerStruct.hpp>
+#include <CSFML/Network/TcpSocketStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/TcpSocket.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/TcpSocket.h>
-#include <CSFML/Network/TcpSocketStruct.h>
-#include <CSFML/Network/PacketStruct.h>
+#include <CSFML/Network/TcpSocketStruct.hpp>
+#include <CSFML/Network/PacketStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <string.h>
 
 

src/CSFML/Network/UdpSocket.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Network/UdpSocket.h>
-#include <CSFML/Network/UdpSocketStruct.h>
-#include <CSFML/Network/PacketStruct.h>
+#include <CSFML/Network/UdpSocketStruct.hpp>
+#include <CSFML/Network/PacketStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <string.h>
 
 

src/CSFML/System/Buffer.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/System/Buffer.h>
-#include <CSFML/System/BufferStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/System/BufferStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/System/CMakeLists.txt

@@ -9,10 +9,10 @@ set(SRC
     ${SRCROOT}/Alloc.cpp
     ${INCROOT}/Alloc.h
     ${SRCROOT}/Buffer.cpp
-    ${SRCROOT}/BufferStruct.h
+    ${SRCROOT}/BufferStruct.hpp
     ${INCROOT}/Buffer.h
     ${SRCROOT}/Clock.cpp
-    ${SRCROOT}/ClockStruct.h
+    ${SRCROOT}/ClockStruct.hpp
     ${INCROOT}/Clock.h
     ${INCROOT}/InputStream.h
     ${SRCROOT}/Sleep.cpp

src/CSFML/System/Clock.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/System/Clock.h>
-#include <CSFML/System/ClockStruct.h>
+#include <CSFML/System/ClockStruct.hpp>
 #include <SFML/System/Time.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/System/Sleep.cpp

@@ -28,7 +28,7 @@
 #include <CSFML/System/Sleep.h>
 #include <SFML/System/Sleep.hpp>
 #include <SFML/System/Time.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/CMakeLists.txt

@@ -9,10 +9,10 @@ set(SRC
     ${SRCROOT}/Clipboard.cpp
     ${INCROOT}/Cursor.h
     ${SRCROOT}/Cursor.cpp
-    ${SRCROOT}/CursorStruct.h
+    ${SRCROOT}/CursorStruct.hpp
     ${SRCROOT}/Context.cpp
-    ${SRCROOT}/ContextSettingsInternal.h
-    ${SRCROOT}/ContextStruct.h
+    ${SRCROOT}/ContextSettingsInternal.hpp
+    ${SRCROOT}/ContextStruct.hpp
     ${INCROOT}/Context.h
     ${INCROOT}/Event.h
     ${SRCROOT}/Joystick.cpp
@@ -33,8 +33,8 @@ set(SRC
     ${INCROOT}/Vulkan.h
     ${SRCROOT}/Window.cpp
     ${SRCROOT}/WindowBase.cpp
-    ${SRCROOT}/WindowStruct.h
-    ${SRCROOT}/WindowBaseStruct.h
+    ${SRCROOT}/WindowStruct.hpp
+    ${SRCROOT}/WindowBaseStruct.hpp
     ${INCROOT}/Window.h
     ${INCROOT}/WindowBase.h
     ${INCROOT}/WindowHandle.h

src/CSFML/Window/Clipboard.cpp

@@ -28,7 +28,7 @@
 #include <SFML/System/String.hpp>
 #include <CSFML/Window/Clipboard.h>
 #include <SFML/Window/Clipboard.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <string>
 
 

src/CSFML/Window/Context.cpp

@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Context.h>
-#include <CSFML/Window/ContextStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/Window/ContextSettingsInternal.h>
+#include <CSFML/Window/ContextStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/Window/ContextSettingsInternal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Cursor.cpp

@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Cursor.h>
-#include <CSFML/Window/CursorStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Window/CursorStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Joystick.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Joystick.h>
 #include <SFML/Window/Joystick.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Keyboard.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Keyboard.h>
 #include <SFML/Window/Keyboard.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 #include <SFML/System/String.hpp>
 
 #include <string.h>

src/CSFML/Window/Mouse.cpp

@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Mouse.h>
-#include <CSFML/Window/WindowBaseStruct.h>
-#include <CSFML/Window/WindowStruct.h>
+#include <CSFML/Window/WindowBaseStruct.hpp>
+#include <CSFML/Window/WindowStruct.hpp>
 #include <SFML/Window/Mouse.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Sensor.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Sensor.h>
 #include <SFML/Window/Sensor.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Touch.cpp

@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Touch.h>
 #include <SFML/Window/Touch.hpp>
-#include <CSFML/Window/WindowBaseStruct.h>
-#include <CSFML/Window/WindowStruct.h>
-#include <CSFML/Internal.h>
+#include <CSFML/Window/WindowBaseStruct.hpp>
+#include <CSFML/Window/WindowStruct.hpp>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/VideoMode.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/VideoMode.h>
 #include <SFML/Window/VideoMode.hpp>
-#include <CSFML/Internal.h>
+#include <CSFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/Window.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/Window.h>
-#include <CSFML/Window/WindowStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/Window/ContextSettingsInternal.h>
-#include <CSFML/Window/CursorStruct.h>
-#include <CSFML/ConvertEvent.h>
+#include <CSFML/Window/WindowStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/Window/ContextSettingsInternal.hpp>
+#include <CSFML/Window/CursorStruct.hpp>
+#include <CSFML/ConvertEvent.hpp>
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Window/WindowBase.cpp

@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <CSFML/Window/WindowBase.h>
-#include <CSFML/Window/WindowBaseStruct.h>
-#include <CSFML/Internal.h>
-#include <CSFML/Window/CursorStruct.h>
+#include <CSFML/Window/WindowBaseStruct.hpp>
+#include <CSFML/Internal.hpp>
+#include <CSFML/Window/CursorStruct.hpp>
 #include <SFML/Window/VideoMode.hpp>
-#include <CSFML/ConvertEvent.h>
+#include <CSFML/ConvertEvent.hpp>
 
 
 ////////////////////////////////////////////////////////////