diff --git a/src/SFML/Audio/CMakeLists.txt b/src/SFML/Audio/CMakeLists.txt
index 38999ed0..de0bf701 100644
--- a/src/SFML/Audio/CMakeLists.txt
+++ b/src/SFML/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
 )
diff --git a/src/SFML/Audio/Music.cpp b/src/SFML/Audio/Music.cpp
index f743d7f0..b3d89e64 100644
--- a/src/SFML/Audio/Music.cpp
+++ b/src/SFML/Audio/Music.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Music.h>
-#include <SFML/Audio/MusicStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/MusicStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/MusicStruct.h b/src/SFML/Audio/MusicStruct.hpp
similarity index 92%
rename from src/SFML/Audio/MusicStruct.h
rename to src/SFML/Audio/MusicStruct.hpp
index 6c97cd44..65b20792 100644
--- a/src/SFML/Audio/MusicStruct.h
+++ b/src/SFML/Audio/MusicStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_MUSICSTRUCT_H
-#define SFML_MUSICSTRUCT_H
+#ifndef SFML_MUSICSTRUCT_HPP
+#define SFML_MUSICSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Music.hpp>
-#include <SFML/CallbackStream.h>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -42,4 +42,4 @@ struct sfMusic
 };
 
 
-#endif // SFML_MUSICSTRUCT_H
+#endif // SFML_MUSICSTRUCT_HPP
diff --git a/src/SFML/Audio/Sound.cpp b/src/SFML/Audio/Sound.cpp
index d29be758..fad4315a 100644
--- a/src/SFML/Audio/Sound.cpp
+++ b/src/SFML/Audio/Sound.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Sound.h>
-#include <SFML/Audio/SoundStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp
index d01a2522..38f8c250 100644
--- a/src/SFML/Audio/SoundBuffer.cpp
+++ b/src/SFML/Audio/SoundBuffer.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBuffer.h>
-#include <SFML/Audio/SoundBufferStruct.h>
-#include <SFML/CallbackStream.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
+#include <SFML/CallbackStream.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/SoundBufferRecorder.cpp b/src/SFML/Audio/SoundBufferRecorder.cpp
index 17f6b1a3..1e04fa80 100644
--- a/src/SFML/Audio/SoundBufferRecorder.cpp
+++ b/src/SFML/Audio/SoundBufferRecorder.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.h>
-#include <SFML/Audio/SoundBufferRecorderStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundBufferRecorderStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/SoundBufferRecorderStruct.h b/src/SFML/Audio/SoundBufferRecorderStruct.hpp
similarity index 90%
rename from src/SFML/Audio/SoundBufferRecorderStruct.h
rename to src/SFML/Audio/SoundBufferRecorderStruct.hpp
index a131325e..50a66a10 100644
--- a/src/SFML/Audio/SoundBufferRecorderStruct.h
+++ b/src/SFML/Audio/SoundBufferRecorderStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDBUFFERRECORDERSTRUCT_H
-#define SFML_SOUNDBUFFERRECORDERSTRUCT_H
+#ifndef SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
+#define SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundBufferRecorder.hpp>
-#include <SFML/Audio/SoundBufferStruct.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -43,4 +43,4 @@ struct sfSoundBufferRecorder
 };
 
 
-#endif // SFML_SOUNDBUFFERRECORDERSTRUCT_H
+#endif // SFML_SOUNDBUFFERRECORDERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundBufferStruct.h b/src/SFML/Audio/SoundBufferStruct.hpp
similarity index 93%
rename from src/SFML/Audio/SoundBufferStruct.h
rename to src/SFML/Audio/SoundBufferStruct.hpp
index 5195124d..edfea8a2 100644
--- a/src/SFML/Audio/SoundBufferStruct.h
+++ b/src/SFML/Audio/SoundBufferStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDBUFFERSTRUCT_H
-#define SFML_SOUNDBUFFERSTRUCT_H
+#ifndef SFML_SOUNDBUFFERSTRUCT_HPP
+#define SFML_SOUNDBUFFERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfSoundBuffer
 };
 
 
-#endif // SFML_SOUNDBUFFERSTRUCT_H
+#endif // SFML_SOUNDBUFFERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp
index ff173f67..24121c47 100644
--- a/src/SFML/Audio/SoundRecorder.cpp
+++ b/src/SFML/Audio/SoundRecorder.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundRecorder.h>
-#include <SFML/Audio/SoundRecorderStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundRecorderStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/SoundRecorderStruct.h b/src/SFML/Audio/SoundRecorderStruct.hpp
similarity index 96%
rename from src/SFML/Audio/SoundRecorderStruct.h
rename to src/SFML/Audio/SoundRecorderStruct.hpp
index bee17859..a837b7f1 100644
--- a/src/SFML/Audio/SoundRecorderStruct.h
+++ b/src/SFML/Audio/SoundRecorderStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDRECORDERSTRUCT_H
-#define SFML_SOUNDRECORDERSTRUCT_H
+#ifndef SFML_SOUNDRECORDERSTRUCT_HPP
+#define SFML_SOUNDRECORDERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -105,4 +105,4 @@ struct sfSoundRecorder
 };
 
 
-#endif // SFML_SOUNDRECORDERSTRUCT_H
+#endif // SFML_SOUNDRECORDERSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundStream.cpp b/src/SFML/Audio/SoundStream.cpp
index bbc9fdfa..2b9b9842 100644
--- a/src/SFML/Audio/SoundStream.cpp
+++ b/src/SFML/Audio/SoundStream.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/SoundStream.h>
-#include <SFML/Audio/SoundStreamStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Audio/SoundStreamStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Audio/SoundStreamStruct.h b/src/SFML/Audio/SoundStreamStruct.hpp
similarity index 96%
rename from src/SFML/Audio/SoundStreamStruct.h
rename to src/SFML/Audio/SoundStreamStruct.hpp
index 956ab929..052ac525 100644
--- a/src/SFML/Audio/SoundStreamStruct.h
+++ b/src/SFML/Audio/SoundStreamStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDSTREAMSTRUCT_H
-#define SFML_SOUNDSTREAMSTRUCT_H
+#ifndef SFML_SOUNDSTREAMSTRUCT_HPP
+#define SFML_SOUNDSTREAMSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -97,4 +97,4 @@ struct sfSoundStream
 };
 
 
-#endif // SFML_SOUNDSTREAMSTRUCT_H
+#endif // SFML_SOUNDSTREAMSTRUCT_HPP
diff --git a/src/SFML/Audio/SoundStruct.h b/src/SFML/Audio/SoundStruct.hpp
similarity index 91%
rename from src/SFML/Audio/SoundStruct.h
rename to src/SFML/Audio/SoundStruct.hpp
index aabbec7b..fd35d45b 100644
--- a/src/SFML/Audio/SoundStruct.h
+++ b/src/SFML/Audio/SoundStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOUNDSTRUCT_H
-#define SFML_SOUNDSTRUCT_H
+#ifndef SFML_SOUNDSTRUCT_HPP
+#define SFML_SOUNDSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Audio/Sound.hpp>
-#include <SFML/Audio/SoundBufferStruct.h>
+#include <SFML/Audio/SoundBufferStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -42,4 +42,4 @@ struct sfSound
 };
 
 
-#endif // SFML_SOUNDSTRUCT_H
+#endif // SFML_SOUNDSTRUCT_HPP
diff --git a/src/SFML/CallbackStream.h b/src/SFML/CallbackStream.hpp
similarity index 97%
rename from src/SFML/CallbackStream.h
rename to src/SFML/CallbackStream.hpp
index 6e3f210e..984bfce4 100644
--- a/src/SFML/CallbackStream.h
+++ b/src/SFML/CallbackStream.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CALLBACKSTREAM_H
-#define SFML_CALLBACKSTREAM_H
+#ifndef SFML_CALLBACKSTREAM_HPP
+#define SFML_CALLBACKSTREAM_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -117,4 +117,4 @@ class CallbackStream : public sf::InputStream
 };
 
 
-#endif // SFML_CALLBACKSTREAM_H
+#endif // SFML_CALLBACKSTREAM_HPP
diff --git a/src/SFML/ConvertEvent.h b/src/SFML/ConvertEvent.hpp
similarity index 98%
rename from src/SFML/ConvertEvent.h
rename to src/SFML/ConvertEvent.hpp
index 3f010b1f..6e1327e1 100644
--- a/src/SFML/ConvertEvent.h
+++ b/src/SFML/ConvertEvent.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONVERTEVENT_H
-#define SFML_CONVERTEVENT_H
+#ifndef SFML_CONVERTEVENT_HPP
+#define SFML_CONVERTEVENT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -124,4 +124,4 @@ inline void convertEvent(const sf::Event& sfmlEvent, sfEvent* event)
     }
 }
 
-#endif // SFML_CONVERTEVENT_H
+#endif // SFML_CONVERTEVENT_HPP
diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt
index c358fd86..16f8cb49 100644
--- a/src/SFML/Graphics/CMakeLists.txt
+++ b/src/SFML/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
 )
 
diff --git a/src/SFML/Graphics/CircleShape.cpp b/src/SFML/Graphics/CircleShape.cpp
index a053e0ec..cf88f0a5 100644
--- a/src/SFML/Graphics/CircleShape.cpp
+++ b/src/SFML/Graphics/CircleShape.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.h>
-#include <SFML/Graphics/CircleShapeStruct.h>
+#include <SFML/Graphics/CircleShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/CircleShapeStruct.h b/src/SFML/Graphics/CircleShapeStruct.hpp
similarity index 91%
rename from src/SFML/Graphics/CircleShapeStruct.h
rename to src/SFML/Graphics/CircleShapeStruct.hpp
index 587ca890..befc44ed 100644
--- a/src/SFML/Graphics/CircleShapeStruct.h
+++ b/src/SFML/Graphics/CircleShapeStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CIRCLESHAPESTRUCT_H
-#define SFML_CIRCLESHAPESTRUCT_H
+#ifndef SFML_CIRCLESHAPESTRUCT_HPP
+#define SFML_CIRCLESHAPESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/CircleShape.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -45,4 +45,4 @@ struct sfCircleShape
 };
 
 
-#endif // SFML_CIRCLESHAPESTRUCT_H
+#endif // SFML_CIRCLESHAPESTRUCT_HPP
diff --git a/src/SFML/Graphics/Color.cpp b/src/SFML/Graphics/Color.cpp
index 01f8d7b1..65f90574 100644
--- a/src/SFML/Graphics/Color.cpp
+++ b/src/SFML/Graphics/Color.cpp
@@ -26,7 +26,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Color.h>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <algorithm>
 
 
diff --git a/src/SFML/Graphics/ConvertRenderStates.hpp b/src/SFML/Graphics/ConvertRenderStates.hpp
index 56747f65..58d6a432 100644
--- a/src/SFML/Graphics/ConvertRenderStates.hpp
+++ b/src/SFML/Graphics/ConvertRenderStates.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONVERTRENDERSTATES_H
-#define SFML_CONVERTRENDERSTATES_H
+#ifndef SFML_CONVERTRENDERSTATES_HPP
+#define SFML_CONVERTRENDERSTATES_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -31,8 +31,8 @@
 #include <SFML/Graphics/RenderStates.h>
 #include <SFML/Graphics/RenderStates.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Graphics/TextureStruct.h>
-#include <SFML/Graphics/ShaderStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
+#include <SFML/Graphics/ShaderStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -59,4 +59,4 @@ inline sf::RenderStates convertRenderStates(const sfRenderStates* states)
 }
 
 
-#endif // SFML_CONVERTRENDERSTATES_H
+#endif // SFML_CONVERTRENDERSTATES_HPP
diff --git a/src/SFML/Graphics/ConvertTransform.hpp b/src/SFML/Graphics/ConvertTransform.hpp
index fe6c4e2b..171c1928 100644
--- a/src/SFML/Graphics/ConvertTransform.hpp
+++ b/src/SFML/Graphics/ConvertTransform.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONVERTTRANSFORM_H
-#define SFML_CONVERTTRANSFORM_H
+#ifndef SFML_CONVERTTRANSFORM_HPP
+#define SFML_CONVERTTRANSFORM_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -55,4 +55,4 @@ inline sf::Transform convertTransform(const sfTransform& transform)
 }
 
 
-#endif // SFML_CONVERTTRANSFORM_H
+#endif // SFML_CONVERTTRANSFORM_HPP
diff --git a/src/SFML/Graphics/ConvexShape.cpp b/src/SFML/Graphics/ConvexShape.cpp
index 3e0edb3a..68938f36 100644
--- a/src/SFML/Graphics/ConvexShape.cpp
+++ b/src/SFML/Graphics/ConvexShape.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/ConvexShape.h>
-#include <SFML/Graphics/ConvexShapeStruct.h>
+#include <SFML/Graphics/ConvexShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/ConvexShapeStruct.h b/src/SFML/Graphics/ConvexShapeStruct.hpp
similarity index 91%
rename from src/SFML/Graphics/ConvexShapeStruct.h
rename to src/SFML/Graphics/ConvexShapeStruct.hpp
index 585a2f55..ece8c4ba 100644
--- a/src/SFML/Graphics/ConvexShapeStruct.h
+++ b/src/SFML/Graphics/ConvexShapeStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONVEXSHAPESTRUCT_H
-#define SFML_CONVEXSHAPESTRUCT_H
+#ifndef SFML_CONVEXSHAPESTRUCT_HPP
+#define SFML_CONVEXSHAPESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/ConvexShape.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -45,4 +45,4 @@ struct sfConvexShape
 };
 
 
-#endif // SFML_CONVEXSHAPESTRUCT_H
+#endif // SFML_CONVEXSHAPESTRUCT_HPP
diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
index 082a1689..03dd4ae1 100644
--- a/src/SFML/Graphics/Font.cpp
+++ b/src/SFML/Graphics/Font.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Font.h>
-#include <SFML/Graphics/FontStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/CallbackStream.h>
+#include <SFML/Graphics/FontStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/FontStruct.h b/src/SFML/Graphics/FontStruct.hpp
similarity index 90%
rename from src/SFML/Graphics/FontStruct.h
rename to src/SFML/Graphics/FontStruct.hpp
index 1689756e..54c4acf1 100644
--- a/src/SFML/Graphics/FontStruct.h
+++ b/src/SFML/Graphics/FontStruct.hpp
@@ -22,15 +22,15 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_FONTSTRUCT_H
-#define SFML_FONTSTRUCT_H
+#ifndef SFML_FONTSTRUCT_HPP
+#define SFML_FONTSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Font.hpp>
-#include <SFML/Graphics/TextureStruct.h>
-#include <SFML/CallbackStream.h>
+#include <SFML/Graphics/TextureStruct.hpp>
+#include <SFML/CallbackStream.hpp>
 #include <map>
 
 
@@ -45,4 +45,4 @@ struct sfFont
 };
 
 
-#endif // SFML_FONTSTRUCT_H
+#endif // SFML_FONTSTRUCT_HPP
diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
index 490f94a7..764e4132 100644
--- a/src/SFML/Graphics/Image.cpp
+++ b/src/SFML/Graphics/Image.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Image.h>
-#include <SFML/Graphics/ImageStruct.h>
-#include <SFML/System/BufferStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/CallbackStream.h>
+#include <SFML/Graphics/ImageStruct.hpp>
+#include <SFML/System/BufferStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/ImageStruct.h b/src/SFML/Graphics/ImageStruct.hpp
similarity index 94%
rename from src/SFML/Graphics/ImageStruct.h
rename to src/SFML/Graphics/ImageStruct.hpp
index a836dbcc..06bd7426 100644
--- a/src/SFML/Graphics/ImageStruct.h
+++ b/src/SFML/Graphics/ImageStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_IMAGESTRUCT_H
-#define SFML_IMAGESTRUCT_H
+#ifndef SFML_IMAGESTRUCT_HPP
+#define SFML_IMAGESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfImage
 };
 
 
-#endif // SFML_IMAGESTRUCT_H
+#endif // SFML_IMAGESTRUCT_HPP
diff --git a/src/SFML/Graphics/Rect.cpp b/src/SFML/Graphics/Rect.cpp
index c9595223..22a05f48 100644
--- a/src/SFML/Graphics/Rect.cpp
+++ b/src/SFML/Graphics/Rect.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Rect.h>
 #include <SFML/Graphics/Rect.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 namespace
diff --git a/src/SFML/Graphics/RectangleShape.cpp b/src/SFML/Graphics/RectangleShape.cpp
index 38d8def2..d4ac3e9e 100644
--- a/src/SFML/Graphics/RectangleShape.cpp
+++ b/src/SFML/Graphics/RectangleShape.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RectangleShape.h>
-#include <SFML/Graphics/RectangleShapeStruct.h>
+#include <SFML/Graphics/RectangleShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/RectangleShapeStruct.h b/src/SFML/Graphics/RectangleShapeStruct.hpp
similarity index 91%
rename from src/SFML/Graphics/RectangleShapeStruct.h
rename to src/SFML/Graphics/RectangleShapeStruct.hpp
index daae8b15..a8161830 100644
--- a/src/SFML/Graphics/RectangleShapeStruct.h
+++ b/src/SFML/Graphics/RectangleShapeStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_RECTANGLESHAPESTRUCT_H
-#define SFML_RECTANGLESHAPESTRUCT_H
+#ifndef SFML_RECTANGLESHAPESTRUCT_HPP
+#define SFML_RECTANGLESHAPESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RectangleShape.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -45,4 +45,4 @@ struct sfRectangleShape
 };
 
 
-#endif // SFML_RECTANGLESHAPESTRUCT_H
+#endif // SFML_RECTANGLESHAPESTRUCT_HPP
diff --git a/src/SFML/Graphics/RenderStates.cpp b/src/SFML/Graphics/RenderStates.cpp
index 78a9b5ed..b1d14e01 100644
--- a/src/SFML/Graphics/RenderStates.cpp
+++ b/src/SFML/Graphics/RenderStates.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include "SFML/Graphics/RenderStates.h"
+#include <SFML/Graphics/RenderStates.h>
 
 
 ////////////////////////////////////////////////////////////
@@ -38,4 +38,3 @@ sfRenderStates sfRenderStates_default() {
     };
     return states;
 }
-
diff --git a/src/SFML/Graphics/RenderTexture.cpp b/src/SFML/Graphics/RenderTexture.cpp
index bdd8ae9f..4405b428 100644
--- a/src/SFML/Graphics/RenderTexture.cpp
+++ b/src/SFML/Graphics/RenderTexture.cpp
@@ -26,18 +26,18 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTexture.h>
-#include <SFML/Graphics/RenderTextureStruct.h>
-#include <SFML/Graphics/SpriteStruct.h>
-#include <SFML/Graphics/TextStruct.h>
-#include <SFML/Graphics/ShapeStruct.h>
-#include <SFML/Graphics/CircleShapeStruct.h>
-#include <SFML/Graphics/ConvexShapeStruct.h>
-#include <SFML/Graphics/RectangleShapeStruct.h>
-#include <SFML/Graphics/VertexArrayStruct.h>
-#include <SFML/Graphics/VertexBufferStruct.h>
+#include <SFML/Graphics/RenderTextureStruct.hpp>
+#include <SFML/Graphics/SpriteStruct.hpp>
+#include <SFML/Graphics/TextStruct.hpp>
+#include <SFML/Graphics/ShapeStruct.hpp>
+#include <SFML/Graphics/CircleShapeStruct.hpp>
+#include <SFML/Graphics/ConvexShapeStruct.hpp>
+#include <SFML/Graphics/RectangleShapeStruct.hpp>
+#include <SFML/Graphics/VertexArrayStruct.hpp>
+#include <SFML/Graphics/VertexBufferStruct.hpp>
 #include <SFML/Graphics/ConvertRenderStates.hpp>
-#include <SFML/Internal.h>
-#include <SFML/Window/ContextSettingsInternal.h>
+#include <SFML/Internal.hpp>
+#include <SFML/Window/ContextSettingsInternal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/RenderTextureStruct.h b/src/SFML/Graphics/RenderTextureStruct.hpp
similarity index 89%
rename from src/SFML/Graphics/RenderTextureStruct.h
rename to src/SFML/Graphics/RenderTextureStruct.hpp
index 46553c2d..39313b71 100644
--- a/src/SFML/Graphics/RenderTextureStruct.h
+++ b/src/SFML/Graphics/RenderTextureStruct.hpp
@@ -22,15 +22,15 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_RENDERTEXTURESTRUCT_H
-#define SFML_RENDERTEXTURESTRUCT_H
+#ifndef SFML_RENDERTEXTURESTRUCT_HPP
+#define SFML_RENDERTEXTURESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderTexture.hpp>
-#include <SFML/Graphics/TextureStruct.h>
-#include <SFML/Graphics/ViewStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
+#include <SFML/Graphics/ViewStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -45,4 +45,4 @@ struct sfRenderTexture
 };
 
 
-#endif // SFML_RENDERTEXTURESTRUCT_H
+#endif // SFML_RENDERTEXTURESTRUCT_HPP
diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp
index 1c1e6aaa..c14b34cd 100644
--- a/src/SFML/Graphics/RenderWindow.cpp
+++ b/src/SFML/Graphics/RenderWindow.cpp
@@ -26,22 +26,22 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderWindow.h>
-#include <SFML/Graphics/RenderWindowStruct.h>
-#include <SFML/Graphics/ImageStruct.h>
-#include <SFML/Graphics/SpriteStruct.h>
-#include <SFML/Graphics/TextStruct.h>
-#include <SFML/Graphics/ShapeStruct.h>
-#include <SFML/Graphics/CircleShapeStruct.h>
-#include <SFML/Graphics/ConvexShapeStruct.h>
-#include <SFML/Graphics/RectangleShapeStruct.h>
-#include <SFML/Graphics/VertexArrayStruct.h>
-#include <SFML/Graphics/VertexBufferStruct.h>
+#include <SFML/Graphics/RenderWindowStruct.hpp>
+#include <SFML/Graphics/ImageStruct.hpp>
+#include <SFML/Graphics/SpriteStruct.hpp>
+#include <SFML/Graphics/TextStruct.hpp>
+#include <SFML/Graphics/ShapeStruct.hpp>
+#include <SFML/Graphics/CircleShapeStruct.hpp>
+#include <SFML/Graphics/ConvexShapeStruct.hpp>
+#include <SFML/Graphics/RectangleShapeStruct.hpp>
+#include <SFML/Graphics/VertexArrayStruct.hpp>
+#include <SFML/Graphics/VertexBufferStruct.hpp>
 #include <SFML/Graphics/ConvertRenderStates.hpp>
 #include <SFML/Window/Touch.hpp>
-#include <SFML/Internal.h>
-#include <SFML/Window/ContextSettingsInternal.h>
-#include <SFML/Window/CursorStruct.h>
-#include <SFML/ConvertEvent.h>
+#include <SFML/Internal.hpp>
+#include <SFML/Window/ContextSettingsInternal.hpp>
+#include <SFML/Window/CursorStruct.hpp>
+#include <SFML/ConvertEvent.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/RenderWindowStruct.h b/src/SFML/Graphics/RenderWindowStruct.hpp
similarity index 91%
rename from src/SFML/Graphics/RenderWindowStruct.h
rename to src/SFML/Graphics/RenderWindowStruct.hpp
index 1a98fa3d..99cd5cfd 100644
--- a/src/SFML/Graphics/RenderWindowStruct.h
+++ b/src/SFML/Graphics/RenderWindowStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_RENDERWINDOWSTRUCT_H
-#define SFML_RENDERWINDOWSTRUCT_H
+#ifndef SFML_RENDERWINDOWSTRUCT_HPP
+#define SFML_RENDERWINDOWSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/RenderWindow.hpp>
-#include <SFML/Graphics/ViewStruct.h>
+#include <SFML/Graphics/ViewStruct.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -43,4 +43,4 @@ struct sfRenderWindow
 };
 
 
-#endif // SFML_RENDERWINDOWSTRUCT_H
+#endif // SFML_RENDERWINDOWSTRUCT_HPP
diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp
index d39d7030..41c37973 100644
--- a/src/SFML/Graphics/Shader.cpp
+++ b/src/SFML/Graphics/Shader.cpp
@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Shader.h>
-#include <SFML/Graphics/ShaderStruct.h>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/ShaderStruct.hpp>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
-#include <SFML/CallbackStream.h>
+#include <SFML/Internal.hpp>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/ShaderStruct.h b/src/SFML/Graphics/ShaderStruct.hpp
similarity index 94%
rename from src/SFML/Graphics/ShaderStruct.h
rename to src/SFML/Graphics/ShaderStruct.hpp
index d19c751d..35af7452 100644
--- a/src/SFML/Graphics/ShaderStruct.h
+++ b/src/SFML/Graphics/ShaderStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SHADERSTRUCT_H
-#define SFML_SHADERSTRUCT_H
+#ifndef SFML_SHADERSTRUCT_HPP
+#define SFML_SHADERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfShader
 };
 
 
-#endif // SFML_SHADERSTRUCT_H
+#endif // SFML_SHADERSTRUCT_HPP
diff --git a/src/SFML/Graphics/Shape.cpp b/src/SFML/Graphics/Shape.cpp
index 6923bdbe..4989836e 100644
--- a/src/SFML/Graphics/Shape.cpp
+++ b/src/SFML/Graphics/Shape.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Shape.h>
-#include <SFML/Graphics/ShapeStruct.h>
+#include <SFML/Graphics/ShapeStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/ShapeStruct.h b/src/SFML/Graphics/ShapeStruct.hpp
similarity index 95%
rename from src/SFML/Graphics/ShapeStruct.h
rename to src/SFML/Graphics/ShapeStruct.hpp
index 6d0a194e..051e05b0 100644
--- a/src/SFML/Graphics/ShapeStruct.h
+++ b/src/SFML/Graphics/ShapeStruct.hpp
@@ -22,15 +22,15 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SHAPESTRUCT_H
-#define SFML_SHAPESTRUCT_H
+#ifndef SFML_SHAPESTRUCT_HPP
+#define SFML_SHAPESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Shape.h>
 #include <SFML/Graphics/Shape.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -91,4 +91,4 @@ struct sfShape
 };
 
 
-#endif // SFML_SHAPESTRUCT_H
+#endif // SFML_SHAPESTRUCT_HPP
diff --git a/src/SFML/Graphics/Sprite.cpp b/src/SFML/Graphics/Sprite.cpp
index a23316d8..b9ad3980 100644
--- a/src/SFML/Graphics/Sprite.cpp
+++ b/src/SFML/Graphics/Sprite.cpp
@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Sprite.h>
-#include <SFML/Graphics/SpriteStruct.h>
+#include <SFML/Graphics/SpriteStruct.hpp>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/Image.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/SpriteStruct.h b/src/SFML/Graphics/SpriteStruct.hpp
similarity index 92%
rename from src/SFML/Graphics/SpriteStruct.h
rename to src/SFML/Graphics/SpriteStruct.hpp
index ee4a4752..298bbc25 100644
--- a/src/SFML/Graphics/SpriteStruct.h
+++ b/src/SFML/Graphics/SpriteStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SPRITESTRUCT_H
-#define SFML_SPRITESTRUCT_H
+#ifndef SFML_SPRITESTRUCT_HPP
+#define SFML_SPRITESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Sprite.hpp>
-#include <SFML/Graphics/TextureStruct.h>
+#include <SFML/Graphics/TextureStruct.hpp>
 #include <SFML/Graphics/Transform.h>
 
 
@@ -45,4 +45,4 @@ struct sfSprite
 };
 
 
-#endif // SFML_SPRITESTRUCT_H
+#endif // SFML_SPRITESTRUCT_HPP
diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp
index b588eaf6..1e0dfcba 100644
--- a/src/SFML/Graphics/Text.cpp
+++ b/src/SFML/Graphics/Text.cpp
@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Text.h>
-#include <SFML/Graphics/TextStruct.h>
+#include <SFML/Graphics/TextStruct.hpp>
 #include <SFML/Graphics/Font.h>
 #include <SFML/Graphics/Color.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/TextStruct.h b/src/SFML/Graphics/TextStruct.hpp
similarity index 93%
rename from src/SFML/Graphics/TextStruct.h
rename to src/SFML/Graphics/TextStruct.hpp
index 8c96cced..e51d5a52 100644
--- a/src/SFML/Graphics/TextStruct.h
+++ b/src/SFML/Graphics/TextStruct.hpp
@@ -22,14 +22,14 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_TEXTSTRUCT_H
-#define SFML_TEXTSTRUCT_H
+#ifndef SFML_TEXTSTRUCT_HPP
+#define SFML_TEXTSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Text.hpp>
-#include <SFML/Graphics/FontStruct.h>
+#include <SFML/Graphics/FontStruct.hpp>
 #include <SFML/Graphics/Rect.h>
 #include <SFML/Graphics/Transform.h>
 #include <string>
@@ -48,4 +48,4 @@ struct sfText
 };
 
 
-#endif // SFML_TEXTSTRUCT_H
+#endif // SFML_TEXTSTRUCT_HPP
diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp
index 80649e9f..a2bc31b4 100644
--- a/src/SFML/Graphics/Texture.cpp
+++ b/src/SFML/Graphics/Texture.cpp
@@ -26,12 +26,12 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Texture.h>
-#include <SFML/Graphics/TextureStruct.h>
-#include <SFML/Graphics/ImageStruct.h>
-#include <SFML/Graphics/RenderWindowStruct.h>
-#include <SFML/Window/WindowStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/CallbackStream.h>
+#include <SFML/Graphics/TextureStruct.hpp>
+#include <SFML/Graphics/ImageStruct.hpp>
+#include <SFML/Graphics/RenderWindowStruct.hpp>
+#include <SFML/Window/WindowStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/CallbackStream.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/TextureStruct.h b/src/SFML/Graphics/TextureStruct.hpp
similarity index 95%
rename from src/SFML/Graphics/TextureStruct.h
rename to src/SFML/Graphics/TextureStruct.hpp
index 63795422..88a7608f 100644
--- a/src/SFML/Graphics/TextureStruct.h
+++ b/src/SFML/Graphics/TextureStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_TEXTURESTRUCT_H
-#define SFML_TEXTURESTRUCT_H
+#ifndef SFML_TEXTURESTRUCT_HPP
+#define SFML_TEXTURESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -65,4 +65,4 @@ struct sfTexture
 };
 
 
-#endif // SFML_TEXTURESTRUCT_H
+#endif // SFML_TEXTURESTRUCT_HPP
diff --git a/src/SFML/Graphics/Transform.cpp b/src/SFML/Graphics/Transform.cpp
index c4b45ae5..34432346 100644
--- a/src/SFML/Graphics/Transform.cpp
+++ b/src/SFML/Graphics/Transform.cpp
@@ -28,7 +28,7 @@
 #include <SFML/Graphics/Transform.h>
 #include <SFML/Graphics/Transform.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <cstring>
 
 
diff --git a/src/SFML/Graphics/Transformable.cpp b/src/SFML/Graphics/Transformable.cpp
index cfa25254..9aa84b0c 100644
--- a/src/SFML/Graphics/Transformable.cpp
+++ b/src/SFML/Graphics/Transformable.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Transformable.h>
-#include <SFML/Graphics/TransformableStruct.h>
+#include <SFML/Graphics/TransformableStruct.hpp>
 #include <SFML/Graphics/ConvertTransform.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/TransformableStruct.h b/src/SFML/Graphics/TransformableStruct.hpp
similarity index 93%
rename from src/SFML/Graphics/TransformableStruct.h
rename to src/SFML/Graphics/TransformableStruct.hpp
index 93300e6b..453fa89a 100644
--- a/src/SFML/Graphics/TransformableStruct.h
+++ b/src/SFML/Graphics/TransformableStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_TRANSFORMABLESTRUCT_H
-#define SFML_TRANSFORMABLESTRUCT_H
+#ifndef SFML_TRANSFORMABLESTRUCT_HPP
+#define SFML_TRANSFORMABLESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -43,4 +43,4 @@ struct sfTransformable
 };
 
 
-#endif // SFML_TRANSFORMABLESTRUCT_H
+#endif // SFML_TRANSFORMABLESTRUCT_HPP
diff --git a/src/SFML/Graphics/VertexArray.cpp b/src/SFML/Graphics/VertexArray.cpp
index 2969178f..7dac397f 100644
--- a/src/SFML/Graphics/VertexArray.cpp
+++ b/src/SFML/Graphics/VertexArray.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/VertexArray.h>
-#include <SFML/Graphics/VertexArrayStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Graphics/VertexArrayStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/VertexArrayStruct.h b/src/SFML/Graphics/VertexArrayStruct.hpp
similarity index 93%
rename from src/SFML/Graphics/VertexArrayStruct.h
rename to src/SFML/Graphics/VertexArrayStruct.hpp
index d8152ce6..b8ba3def 100644
--- a/src/SFML/Graphics/VertexArrayStruct.h
+++ b/src/SFML/Graphics/VertexArrayStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_VERTEXARRAYSTRUCT_H
-#define SFML_VERTEXARRAYSTRUCT_H
+#ifndef SFML_VERTEXARRAYSTRUCT_HPP
+#define SFML_VERTEXARRAYSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfVertexArray
 };
 
 
-#endif // SFML_VERTEXARRAYSTRUCT_H
+#endif // SFML_VERTEXARRAYSTRUCT_HPP
diff --git a/src/SFML/Graphics/VertexBuffer.cpp b/src/SFML/Graphics/VertexBuffer.cpp
index 05e98f27..08c8c19a 100644
--- a/src/SFML/Graphics/VertexBuffer.cpp
+++ b/src/SFML/Graphics/VertexBuffer.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/VertexBuffer.h>
-#include <SFML/Graphics/VertexBufferStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Graphics/VertexBufferStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/VertexBufferStruct.h b/src/SFML/Graphics/VertexBufferStruct.hpp
similarity index 93%
rename from src/SFML/Graphics/VertexBufferStruct.h
rename to src/SFML/Graphics/VertexBufferStruct.hpp
index e35b8aec..436a35f5 100644
--- a/src/SFML/Graphics/VertexBufferStruct.h
+++ b/src/SFML/Graphics/VertexBufferStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_VERTEXBUFFERSTRUCT_H
-#define SFML_VERTEXBUFFERSTRUCT_H
+#ifndef SFML_VERTEXBUFFERSTRUCT_HPP
+#define SFML_VERTEXBUFFERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfVertexBuffer
 };
 
 
-#endif // SFML_VERTEXBUFFERSTRUCT_H
+#endif // SFML_VERTEXBUFFERSTRUCT_HPP
diff --git a/src/SFML/Graphics/View.cpp b/src/SFML/Graphics/View.cpp
index 5f68dae4..d8c304a0 100644
--- a/src/SFML/Graphics/View.cpp
+++ b/src/SFML/Graphics/View.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/View.h>
-#include <SFML/Graphics/ViewStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Graphics/ViewStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/ViewStruct.h b/src/SFML/Graphics/ViewStruct.hpp
similarity index 94%
rename from src/SFML/Graphics/ViewStruct.h
rename to src/SFML/Graphics/ViewStruct.hpp
index b2e4a6b2..36c80249 100644
--- a/src/SFML/Graphics/ViewStruct.h
+++ b/src/SFML/Graphics/ViewStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_VIEWSTRUCT_H
-#define SFML_VIEWSTRUCT_H
+#ifndef SFML_VIEWSTRUCT_HPP
+#define SFML_VIEWSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfView
 };
 
 
-#endif // SFML_VIEWSTRUCT_H
+#endif // SFML_VIEWSTRUCT_HPP
diff --git a/src/SFML/Internal.h b/src/SFML/Internal.hpp
similarity index 97%
rename from src/SFML/Internal.h
rename to src/SFML/Internal.hpp
index f26ac716..748fe1fb 100644
--- a/src/SFML/Internal.h
+++ b/src/SFML/Internal.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_INTERNAL_H
-#define SFML_INTERNAL_H
+#ifndef SFML_INTERNAL_HPP
+#define SFML_INTERNAL_HPP
 
 ////////////////////////////////////////////////////////////
 // Define macros to check the validity of CSFML objects in debug run
@@ -131,4 +131,4 @@
 
 #endif
 
-#endif // SFML_INTERNAL_H
+#endif // SFML_INTERNAL_HPP
diff --git a/src/SFML/Network/CMakeLists.txt b/src/SFML/Network/CMakeLists.txt
index cd907880..ed36ef19 100644
--- a/src/SFML/Network/CMakeLists.txt
+++ b/src/SFML/Network/CMakeLists.txt
@@ -6,29 +6,29 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/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
 )
 
diff --git a/src/SFML/Network/Ftp.cpp b/src/SFML/Network/Ftp.cpp
index 008f8a77..f3a886b5 100644
--- a/src/SFML/Network/Ftp.cpp
+++ b/src/SFML/Network/Ftp.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Ftp.h>
-#include <SFML/Network/FtpStruct.h>
+#include <SFML/Network/FtpStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Network/FtpStruct.h b/src/SFML/Network/FtpStruct.hpp
similarity index 97%
rename from src/SFML/Network/FtpStruct.h
rename to src/SFML/Network/FtpStruct.hpp
index 091aba75..a0a7bea6 100644
--- a/src/SFML/Network/FtpStruct.h
+++ b/src/SFML/Network/FtpStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_FTPSTRUCT_H
-#define SFML_FTPSTRUCT_H
+#ifndef SFML_FTPSTRUCT_HPP
+#define SFML_FTPSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -90,4 +90,4 @@ struct sfFtpListingResponse
 };
 
 
-#endif // SFML_FTPSTRUCT_H
+#endif // SFML_FTPSTRUCT_HPP
diff --git a/src/SFML/Network/Http.cpp b/src/SFML/Network/Http.cpp
index bdca2871..a4a8bc5f 100644
--- a/src/SFML/Network/Http.cpp
+++ b/src/SFML/Network/Http.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Http.h>
-#include <SFML/Network/HttpStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Network/HttpStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Network/HttpStruct.h b/src/SFML/Network/HttpStruct.hpp
similarity index 95%
rename from src/SFML/Network/HttpStruct.h
rename to src/SFML/Network/HttpStruct.hpp
index d4964d16..c6920677 100644
--- a/src/SFML/Network/HttpStruct.h
+++ b/src/SFML/Network/HttpStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_HTTPSTRUCT_H
-#define SFML_HTTPSTRUCT_H
+#ifndef SFML_HTTPSTRUCT_HPP
+#define SFML_HTTPSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -58,4 +58,4 @@ struct sfHttpResponse
 };
 
 
-#endif // SFML_HTTPSTRUCT_H
+#endif // SFML_HTTPSTRUCT_HPP
diff --git a/src/SFML/Network/Packet.cpp b/src/SFML/Network/Packet.cpp
index cd8de463..88553673 100644
--- a/src/SFML/Network/Packet.cpp
+++ b/src/SFML/Network/Packet.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Packet.h>
-#include <SFML/Network/PacketStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Network/PacketStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Network/PacketStruct.h b/src/SFML/Network/PacketStruct.hpp
similarity index 94%
rename from src/SFML/Network/PacketStruct.h
rename to src/SFML/Network/PacketStruct.hpp
index 598eebb2..22cc9f50 100644
--- a/src/SFML/Network/PacketStruct.h
+++ b/src/SFML/Network/PacketStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_PACKETSTRUCT_H
-#define SFML_PACKETSTRUCT_H
+#ifndef SFML_PACKETSTRUCT_HPP
+#define SFML_PACKETSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfPacket
 };
 
 
-#endif // SFML_PACKETSTRUCT_H
+#endif // SFML_PACKETSTRUCT_HPP
diff --git a/src/SFML/Network/SocketSelector.cpp b/src/SFML/Network/SocketSelector.cpp
index 86170cab..b8a02584 100644
--- a/src/SFML/Network/SocketSelector.cpp
+++ b/src/SFML/Network/SocketSelector.cpp
@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/SocketSelector.h>
-#include <SFML/Network/SocketSelectorStruct.h>
-#include <SFML/Network/TcpListenerStruct.h>
-#include <SFML/Network/TcpSocketStruct.h>
-#include <SFML/Network/UdpSocketStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Network/SocketSelectorStruct.hpp>
+#include <SFML/Network/TcpListenerStruct.hpp>
+#include <SFML/Network/TcpSocketStruct.hpp>
+#include <SFML/Network/UdpSocketStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Network/SocketSelectorStruct.h b/src/SFML/Network/SocketSelectorStruct.hpp
similarity index 92%
rename from src/SFML/Network/SocketSelectorStruct.h
rename to src/SFML/Network/SocketSelectorStruct.hpp
index c4e8eb02..71718663 100644
--- a/src/SFML/Network/SocketSelectorStruct.h
+++ b/src/SFML/Network/SocketSelectorStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_SOCKETSELECTORSTRUCT_H
-#define SFML_SOCKETSELECTORSTRUCT_H
+#ifndef SFML_SOCKETSELECTORSTRUCT_HPP
+#define SFML_SOCKETSELECTORSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfSocketSelector
 };
 
 
-#endif // SFML_SOCKETSELECTORSTRUCT_H
+#endif // SFML_SOCKETSELECTORSTRUCT_HPP
diff --git a/src/SFML/Network/TcpListener.cpp b/src/SFML/Network/TcpListener.cpp
index 1a630b22..3b97333b 100644
--- a/src/SFML/Network/TcpListener.cpp
+++ b/src/SFML/Network/TcpListener.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/TcpListener.h>
-#include <SFML/Network/TcpListenerStruct.h>
-#include <SFML/Network/TcpSocketStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Network/TcpListenerStruct.hpp>
+#include <SFML/Network/TcpSocketStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Network/TcpListenerStruct.h b/src/SFML/Network/TcpListenerStruct.hpp
similarity index 93%
rename from src/SFML/Network/TcpListenerStruct.h
rename to src/SFML/Network/TcpListenerStruct.hpp
index 1209fb00..d8c85052 100644
--- a/src/SFML/Network/TcpListenerStruct.h
+++ b/src/SFML/Network/TcpListenerStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_TCPLISTENERSTRUCT_H
-#define SFML_TCPLISTENERSTRUCT_H
+#ifndef SFML_TCPLISTENERSTRUCT_HPP
+#define SFML_TCPLISTENERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfTcpListener
 };
 
 
-#endif // SFML_TCPLISTENERSTRUCT_H
+#endif // SFML_TCPLISTENERSTRUCT_HPP
diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp
index 2582f66c..0ac67e86 100644
--- a/src/SFML/Network/TcpSocket.cpp
+++ b/src/SFML/Network/TcpSocket.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/TcpSocket.h>
-#include <SFML/Network/TcpSocketStruct.h>
-#include <SFML/Network/PacketStruct.h>
+#include <SFML/Network/TcpSocketStruct.hpp>
+#include <SFML/Network/PacketStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <string.h>
 
 
diff --git a/src/SFML/Network/TcpSocketStruct.h b/src/SFML/Network/TcpSocketStruct.hpp
similarity index 93%
rename from src/SFML/Network/TcpSocketStruct.h
rename to src/SFML/Network/TcpSocketStruct.hpp
index ad065c9f..39ac5569 100644
--- a/src/SFML/Network/TcpSocketStruct.h
+++ b/src/SFML/Network/TcpSocketStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_TCPSOCKETSTRUCT_H
-#define SFML_TCPSOCKETSTRUCT_H
+#ifndef SFML_TCPSOCKETSTRUCT_HPP
+#define SFML_TCPSOCKETSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfTcpSocket
 };
 
 
-#endif // SFML_TCPSOCKETSTRUCT_H
+#endif // SFML_TCPSOCKETSTRUCT_HPP
diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp
index 3b4e96cd..60a8ccfb 100644
--- a/src/SFML/Network/UdpSocket.cpp
+++ b/src/SFML/Network/UdpSocket.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/UdpSocket.h>
-#include <SFML/Network/UdpSocketStruct.h>
-#include <SFML/Network/PacketStruct.h>
+#include <SFML/Network/UdpSocketStruct.hpp>
+#include <SFML/Network/PacketStruct.hpp>
 #include <SFML/Network/IpAddress.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <string.h>
 
 
diff --git a/src/SFML/Network/UdpSocketStruct.h b/src/SFML/Network/UdpSocketStruct.hpp
similarity index 93%
rename from src/SFML/Network/UdpSocketStruct.h
rename to src/SFML/Network/UdpSocketStruct.hpp
index 72e6b148..347ad402 100644
--- a/src/SFML/Network/UdpSocketStruct.h
+++ b/src/SFML/Network/UdpSocketStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_UDPSOCKETSTRUCT_H
-#define SFML_UDPSOCKETSTRUCT_H
+#ifndef SFML_UDPSOCKETSTRUCT_HPP
+#define SFML_UDPSOCKETSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfUdpSocket
 };
 
 
-#endif // SFML_UDPSOCKETSTRUCT_H
+#endif // SFML_UDPSOCKETSTRUCT_HPP
diff --git a/src/SFML/System/Buffer.cpp b/src/SFML/System/Buffer.cpp
index 1ba71b4c..b7725525 100644
--- a/src/SFML/System/Buffer.cpp
+++ b/src/SFML/System/Buffer.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Buffer.h>
-#include <SFML/System/BufferStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/System/BufferStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/BufferStruct.h b/src/SFML/System/BufferStruct.hpp
similarity index 94%
rename from src/SFML/System/BufferStruct.h
rename to src/SFML/System/BufferStruct.hpp
index ffa814f5..79ad95b5 100644
--- a/src/SFML/System/BufferStruct.h
+++ b/src/SFML/System/BufferStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_BUFFERSTRUCT_H
-#define SFML_BUFFERSTRUCT_H
+#ifndef SFML_BUFFERSTRUCT_HPP
+#define SFML_BUFFERSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -41,4 +41,4 @@ struct sfBuffer
 };
 
 
-#endif // SFML_BUFFERSTRUCT_H
+#endif // SFML_BUFFERSTRUCT_HPP
diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt
index 2ea169cd..0a34e1ae 100644
--- a/src/SFML/System/CMakeLists.txt
+++ b/src/SFML/System/CMakeLists.txt
@@ -7,19 +7,19 @@ set(SRC
     ${PROJECT_SOURCE_DIR}/include/SFML/GPUPreference.h
     ${INCROOT}/Export.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}/Mutex.cpp
-    ${SRCROOT}/MutexStruct.h
+    ${SRCROOT}/MutexStruct.hpp
     ${INCROOT}/Mutex.h
     ${SRCROOT}/Sleep.cpp
     ${INCROOT}/Sleep.h
     ${SRCROOT}/Thread.cpp
-    ${SRCROOT}/ThreadStruct.h
+    ${SRCROOT}/ThreadStruct.hpp
     ${INCROOT}/Thread.h
     ${SRCROOT}/Time.cpp
     ${INCROOT}/Time.h
diff --git a/src/SFML/System/Clock.cpp b/src/SFML/System/Clock.cpp
index 6ea265ab..9433ce5f 100644
--- a/src/SFML/System/Clock.cpp
+++ b/src/SFML/System/Clock.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Clock.h>
-#include <SFML/System/ClockStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/System/ClockStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/ClockStruct.h b/src/SFML/System/ClockStruct.hpp
similarity index 94%
rename from src/SFML/System/ClockStruct.h
rename to src/SFML/System/ClockStruct.hpp
index cdd392f9..caae431b 100644
--- a/src/SFML/System/ClockStruct.h
+++ b/src/SFML/System/ClockStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CLOCKSTRUCT_H
-#define SFML_CLOCKSTRUCT_H
+#ifndef SFML_CLOCKSTRUCT_HPP
+#define SFML_CLOCKSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfClock
 };
 
 
-#endif // SFML_CLOCKSTRUCT_H
+#endif // SFML_CLOCKSTRUCT_HPP
diff --git a/src/SFML/System/Mutex.cpp b/src/SFML/System/Mutex.cpp
index cf83711c..55c0824d 100644
--- a/src/SFML/System/Mutex.cpp
+++ b/src/SFML/System/Mutex.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Mutex.h>
-#include <SFML/System/MutexStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/System/MutexStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/MutexStruct.h b/src/SFML/System/MutexStruct.hpp
similarity index 94%
rename from src/SFML/System/MutexStruct.h
rename to src/SFML/System/MutexStruct.hpp
index f87b7c7b..93cc1568 100644
--- a/src/SFML/System/MutexStruct.h
+++ b/src/SFML/System/MutexStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_MUTEXSTRUCT_H
-#define SFML_MUTEXSTRUCT_H
+#ifndef SFML_MUTEXSTRUCT_HPP
+#define SFML_MUTEXSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfMutex
 };
 
 
-#endif // SFML_MUTEXSTRUCT_H
+#endif // SFML_MUTEXSTRUCT_HPP
diff --git a/src/SFML/System/Sleep.cpp b/src/SFML/System/Sleep.cpp
index 10cf4f07..5b6a95fb 100644
--- a/src/SFML/System/Sleep.cpp
+++ b/src/SFML/System/Sleep.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Sleep.h>
 #include <SFML/System/Sleep.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/Thread.cpp b/src/SFML/System/Thread.cpp
index b49f56ad..73e457d9 100644
--- a/src/SFML/System/Thread.cpp
+++ b/src/SFML/System/Thread.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/System/Thread.h>
-#include <SFML/System/ThreadStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/System/ThreadStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/System/ThreadStruct.h b/src/SFML/System/ThreadStruct.hpp
similarity index 94%
rename from src/SFML/System/ThreadStruct.h
rename to src/SFML/System/ThreadStruct.hpp
index b0248d10..3163332a 100644
--- a/src/SFML/System/ThreadStruct.h
+++ b/src/SFML/System/ThreadStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_THREADSTRUCT_H
-#define SFML_THREADSTRUCT_H
+#ifndef SFML_THREADSTRUCT_HPP
+#define SFML_THREADSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -45,4 +45,4 @@ struct sfThread
 };
 
 
-#endif // SFML_THREADSTRUCT_H
+#endif // SFML_THREADSTRUCT_HPP
diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt
index a9a5a888..9c3f3fef 100644
--- a/src/SFML/Window/CMakeLists.txt
+++ b/src/SFML/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
diff --git a/src/SFML/Window/Clipboard.cpp b/src/SFML/Window/Clipboard.cpp
index b8a79166..9419311b 100644
--- a/src/SFML/Window/Clipboard.cpp
+++ b/src/SFML/Window/Clipboard.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Clipboard.h>
 #include <SFML/Window/Clipboard.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 namespace
diff --git a/src/SFML/Window/Context.cpp b/src/SFML/Window/Context.cpp
index 5abc8919..c41bd99a 100644
--- a/src/SFML/Window/Context.cpp
+++ b/src/SFML/Window/Context.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Context.h>
-#include <SFML/Window/ContextStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/Window/ContextSettingsInternal.h>
+#include <SFML/Window/ContextStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/Window/ContextSettingsInternal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/ContextSettingsInternal.h b/src/SFML/Window/ContextSettingsInternal.hpp
similarity index 96%
rename from src/SFML/Window/ContextSettingsInternal.h
rename to src/SFML/Window/ContextSettingsInternal.hpp
index 84a41d6b..cec83d37 100644
--- a/src/SFML/Window/ContextSettingsInternal.h
+++ b/src/SFML/Window/ContextSettingsInternal.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONTEXTSETTINGSINTERNAL_H
-#define SFML_CONTEXTSETTINGSINTERNAL_H
+#ifndef SFML_CONTEXTSETTINGSINTERNAL_HPP
+#define SFML_CONTEXTSETTINGSINTERNAL_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -72,4 +72,4 @@ namespace priv
     }
 }
 
-#endif // SFML_CONTEXTSETTINGSINTERNAL_H
+#endif // SFML_CONTEXTSETTINGSINTERNAL_HPP
diff --git a/src/SFML/Window/ContextStruct.h b/src/SFML/Window/ContextStruct.hpp
similarity index 93%
rename from src/SFML/Window/ContextStruct.h
rename to src/SFML/Window/ContextStruct.hpp
index 6afa4eef..9f0e11e7 100644
--- a/src/SFML/Window/ContextStruct.h
+++ b/src/SFML/Window/ContextStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CONTEXTSTRUCT_H
-#define SFML_CONTEXTSTRUCT_H
+#ifndef SFML_CONTEXTSTRUCT_HPP
+#define SFML_CONTEXTSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfContext
 };
 
 
-#endif // SFML_CONTEXTSTRUCT_H
+#endif // SFML_CONTEXTSTRUCT_HPP
diff --git a/src/SFML/Window/Cursor.cpp b/src/SFML/Window/Cursor.cpp
index c46bedd8..0a79fa07 100644
--- a/src/SFML/Window/Cursor.cpp
+++ b/src/SFML/Window/Cursor.cpp
@@ -26,8 +26,8 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Cursor.h>
-#include <SFML/Window/CursorStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Window/CursorStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -65,4 +65,3 @@ void sfCursor_destroy(sfCursor* cursor)
 {
     delete cursor;
 }
-
diff --git a/src/SFML/Window/CursorStruct.h b/src/SFML/Window/CursorStruct.hpp
similarity index 94%
rename from src/SFML/Window/CursorStruct.h
rename to src/SFML/Window/CursorStruct.hpp
index b2e8e9b8..dcce476a 100644
--- a/src/SFML/Window/CursorStruct.h
+++ b/src/SFML/Window/CursorStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_CURSORSTRUCT_H
-#define SFML_CURSORSTRUCT_H
+#ifndef SFML_CURSORSTRUCT_HPP
+#define SFML_CURSORSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfCursor
 };
 
 
-#endif // SFML_CURSORSTRUCT_H
+#endif // SFML_CURSORSTRUCT_HPP
diff --git a/src/SFML/Window/Joystick.cpp b/src/SFML/Window/Joystick.cpp
index e5926f22..89a79ec2 100644
--- a/src/SFML/Window/Joystick.cpp
+++ b/src/SFML/Window/Joystick.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Joystick.h>
 #include <SFML/Window/Joystick.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Keyboard.cpp b/src/SFML/Window/Keyboard.cpp
index edcaa8bb..2de8e82b 100644
--- a/src/SFML/Window/Keyboard.cpp
+++ b/src/SFML/Window/Keyboard.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Keyboard.h>
 #include <SFML/Window/Keyboard.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 #include <SFML/System/String.hpp>
 
 #include <string.h>
diff --git a/src/SFML/Window/Mouse.cpp b/src/SFML/Window/Mouse.cpp
index 71977bed..82871967 100644
--- a/src/SFML/Window/Mouse.cpp
+++ b/src/SFML/Window/Mouse.cpp
@@ -26,9 +26,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Mouse.h>
-#include <SFML/Window/WindowStruct.h>
+#include <SFML/Window/WindowStruct.hpp>
 #include <SFML/Window/Mouse.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Sensor.cpp b/src/SFML/Window/Sensor.cpp
index 11654f63..1850816a 100644
--- a/src/SFML/Window/Sensor.cpp
+++ b/src/SFML/Window/Sensor.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Sensor.h>
 #include <SFML/Window/Sensor.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Touch.cpp b/src/SFML/Window/Touch.cpp
index f58accf7..5cc9e9c6 100644
--- a/src/SFML/Window/Touch.cpp
+++ b/src/SFML/Window/Touch.cpp
@@ -27,8 +27,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Touch.h>
 #include <SFML/Window/Touch.hpp>
-#include <SFML/Window/WindowStruct.h>
-#include <SFML/Internal.h>
+#include <SFML/Window/WindowStruct.hpp>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
@@ -50,4 +50,3 @@ sfVector2i sfTouch_getPosition(unsigned int finger, const sfWindow* relativeTo)
     sfVector2i position = {sfmlPosition.x, sfmlPosition.y};
     return position;
 }
-
diff --git a/src/SFML/Window/VideoMode.cpp b/src/SFML/Window/VideoMode.cpp
index 9373bab3..d99af92c 100644
--- a/src/SFML/Window/VideoMode.cpp
+++ b/src/SFML/Window/VideoMode.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/VideoMode.h>
 #include <SFML/Window/VideoMode.hpp>
-#include <SFML/Internal.h>
+#include <SFML/Internal.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
index 9390c0b8..040693d5 100644
--- a/src/SFML/Window/Window.cpp
+++ b/src/SFML/Window/Window.cpp
@@ -26,11 +26,11 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Window.h>
-#include <SFML/Window/WindowStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/Window/ContextSettingsInternal.h>
-#include <SFML/Window/CursorStruct.h>
-#include <SFML/ConvertEvent.h>
+#include <SFML/Window/WindowStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/Window/ContextSettingsInternal.hpp>
+#include <SFML/Window/CursorStruct.hpp>
+#include <SFML/ConvertEvent.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/WindowBase.cpp b/src/SFML/Window/WindowBase.cpp
index 88830562..69f8e6dc 100644
--- a/src/SFML/Window/WindowBase.cpp
+++ b/src/SFML/Window/WindowBase.cpp
@@ -26,10 +26,10 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/WindowBase.h>
-#include <SFML/Window/WindowBaseStruct.h>
-#include <SFML/Internal.h>
-#include <SFML/Window/CursorStruct.h>
-#include <SFML/ConvertEvent.h>
+#include <SFML/Window/WindowBaseStruct.hpp>
+#include <SFML/Internal.hpp>
+#include <SFML/Window/CursorStruct.hpp>
+#include <SFML/ConvertEvent.hpp>
 
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/WindowBaseStruct.h b/src/SFML/Window/WindowBaseStruct.hpp
similarity index 93%
rename from src/SFML/Window/WindowBaseStruct.h
rename to src/SFML/Window/WindowBaseStruct.hpp
index 92ebce03..49ac5be2 100644
--- a/src/SFML/Window/WindowBaseStruct.h
+++ b/src/SFML/Window/WindowBaseStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_WINDOWBASESTRUCT_H
-#define SFML_WINDOWBASESTRUCT_H
+#ifndef SFML_WINDOWBASESTRUCT_HPP
+#define SFML_WINDOWBASESTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfWindowBase
 };
 
 
-#endif // SFML_WINDOWBASESTRUCT_H
+#endif // SFML_WINDOWBASESTRUCT_HPP
diff --git a/src/SFML/Window/WindowStruct.h b/src/SFML/Window/WindowStruct.hpp
similarity index 94%
rename from src/SFML/Window/WindowStruct.h
rename to src/SFML/Window/WindowStruct.hpp
index 88ed4096..4932a3b2 100644
--- a/src/SFML/Window/WindowStruct.h
+++ b/src/SFML/Window/WindowStruct.hpp
@@ -22,8 +22,8 @@
 //
 ////////////////////////////////////////////////////////////
 
-#ifndef SFML_WINDOWSTRUCT_H
-#define SFML_WINDOWSTRUCT_H
+#ifndef SFML_WINDOWSTRUCT_HPP
+#define SFML_WINDOWSTRUCT_HPP
 
 ////////////////////////////////////////////////////////////
 // Headers
@@ -40,4 +40,4 @@ struct sfWindow
 };
 
 
-#endif // SFML_WINDOWSTRUCT_H
+#endif // SFML_WINDOWSTRUCT_HPP