diff --git a/client/SDL/CMakeLists.txt b/client/SDL/CMakeLists.txt
index 35ff2e41c..26975b947 100644
--- a/client/SDL/CMakeLists.txt
+++ b/client/SDL/CMakeLists.txt
@@ -74,20 +74,20 @@ endif()
 
 set(SRCS
     sdl_utils.cpp
-    sdl_utils.h
+    sdl_utils.hpp
     sdl_kbd.cpp
-    sdl_kbd.h
+    sdl_kbd.hpp
     sdl_touch.cpp
-    sdl_touch.h
+    sdl_touch.hpp
     sdl_pointer.cpp
-    sdl_pointer.h
+    sdl_pointer.hpp
     sdl_disp.cpp
-    sdl_disp.h
+    sdl_disp.hpp
     sdl_monitor.cpp
-    sdl_monitor.h
-    sdl_freerdp.h
+    sdl_monitor.hpp
+    sdl_freerdp.hpp
     sdl_freerdp.cpp
-    sdl_channels.h
+    sdl_channels.hpp
     sdl_channels.cpp)
 
 set(LIBS
diff --git a/client/SDL/sdl_channels.cpp b/client/SDL/sdl_channels.cpp
index c0ab38304..1ed0f16d5 100644
--- a/client/SDL/sdl_channels.cpp
+++ b/client/SDL/sdl_channels.cpp
@@ -25,9 +25,9 @@
 #include <freerdp/client/cliprdr.h>
 #include <freerdp/client/disp.h>
 
-#include "sdl_channels.h"
-#include "sdl_freerdp.h"
-#include "sdl_disp.h"
+#include "sdl_channels.hpp"
+#include "sdl_freerdp.hpp"
+#include "sdl_disp.hpp"
 
 void sdl_OnChannelConnectedEventHandler(void* context, const ChannelConnectedEventArgs* e)
 {
diff --git a/client/SDL/sdl_channels.h b/client/SDL/sdl_channels.hpp
similarity index 100%
rename from client/SDL/sdl_channels.h
rename to client/SDL/sdl_channels.hpp
diff --git a/client/SDL/sdl_disp.cpp b/client/SDL/sdl_disp.cpp
index eae7c3d89..0417dfe9d 100644
--- a/client/SDL/sdl_disp.cpp
+++ b/client/SDL/sdl_disp.cpp
@@ -25,9 +25,9 @@
 
 #include <SDL.h>
 
-#include "sdl_disp.h"
-#include "sdl_kbd.h"
-#include "sdl_utils.h"
+#include "sdl_disp.hpp"
+#include "sdl_kbd.hpp"
+#include "sdl_utils.hpp"
 
 #include <freerdp/log.h>
 #define TAG CLIENT_TAG("sdl.disp")
diff --git a/client/SDL/sdl_disp.h b/client/SDL/sdl_disp.hpp
similarity index 98%
rename from client/SDL/sdl_disp.h
rename to client/SDL/sdl_disp.hpp
index 925e1cb6c..3b6751f9d 100644
--- a/client/SDL/sdl_disp.h
+++ b/client/SDL/sdl_disp.hpp
@@ -21,7 +21,7 @@
 #include <freerdp/types.h>
 #include <freerdp/client/disp.h>
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 BOOL sdl_disp_init(sdlDispContext* xfDisp, DispClientContext* disp);
 BOOL sdl_disp_uninit(sdlDispContext* xfDisp, DispClientContext* disp);
diff --git a/client/SDL/sdl_freerdp.cpp b/client/SDL/sdl_freerdp.cpp
index 73541f211..b077a5923 100644
--- a/client/SDL/sdl_freerdp.cpp
+++ b/client/SDL/sdl_freerdp.cpp
@@ -45,14 +45,14 @@
 #include <SDL.h>
 #include <SDL_video.h>
 
-#include "sdl_channels.h"
-#include "sdl_freerdp.h"
-#include "sdl_utils.h"
-#include "sdl_disp.h"
-#include "sdl_monitor.h"
-#include "sdl_kbd.h"
-#include "sdl_touch.h"
-#include "sdl_pointer.h"
+#include "sdl_channels.hpp"
+#include "sdl_freerdp.hpp"
+#include "sdl_utils.hpp"
+#include "sdl_disp.hpp"
+#include "sdl_monitor.hpp"
+#include "sdl_kbd.hpp"
+#include "sdl_touch.hpp"
+#include "sdl_pointer.hpp"
 
 #define SDL_TAG CLIENT_TAG("SDL")
 
diff --git a/client/SDL/sdl_freerdp.h b/client/SDL/sdl_freerdp.hpp
similarity index 99%
rename from client/SDL/sdl_freerdp.h
rename to client/SDL/sdl_freerdp.hpp
index 1477d85fb..f61b73837 100644
--- a/client/SDL/sdl_freerdp.h
+++ b/client/SDL/sdl_freerdp.hpp
@@ -65,4 +65,3 @@ typedef struct
 
 	wLog* log;
 } sdlContext;
-
diff --git a/client/SDL/sdl_kbd.cpp b/client/SDL/sdl_kbd.cpp
index f8b87d816..1b162733c 100644
--- a/client/SDL/sdl_kbd.cpp
+++ b/client/SDL/sdl_kbd.cpp
@@ -17,10 +17,10 @@
  * limitations under the License.
  */
 
-#include "sdl_kbd.h"
-#include "sdl_disp.h"
-#include "sdl_freerdp.h"
-#include "sdl_utils.h"
+#include "sdl_kbd.hpp"
+#include "sdl_disp.hpp"
+#include "sdl_freerdp.hpp"
+#include "sdl_utils.hpp"
 
 #include <freerdp/scancode.h>
 
diff --git a/client/SDL/sdl_kbd.h b/client/SDL/sdl_kbd.hpp
similarity index 97%
rename from client/SDL/sdl_kbd.h
rename to client/SDL/sdl_kbd.hpp
index 4a44f3387..a1b663876 100644
--- a/client/SDL/sdl_kbd.h
+++ b/client/SDL/sdl_kbd.hpp
@@ -23,7 +23,7 @@
 #include <freerdp/freerdp.h>
 #include <SDL.h>
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 BOOL sdl_sync_kbd_state(rdpContext* context);
 BOOL sdl_keyboard_focus_in(rdpContext* context);
diff --git a/client/SDL/sdl_monitor.cpp b/client/SDL/sdl_monitor.cpp
index 7937c983f..e6068b5b9 100644
--- a/client/SDL/sdl_monitor.cpp
+++ b/client/SDL/sdl_monitor.cpp
@@ -34,7 +34,7 @@
 
 #define TAG CLIENT_TAG("sdl")
 
-#include "sdl_monitor.h"
+#include "sdl_monitor.hpp"
 
 typedef struct
 {
diff --git a/client/SDL/sdl_monitor.h b/client/SDL/sdl_monitor.hpp
similarity index 97%
rename from client/SDL/sdl_monitor.h
rename to client/SDL/sdl_monitor.hpp
index cab8f45c6..dd80f6683 100644
--- a/client/SDL/sdl_monitor.h
+++ b/client/SDL/sdl_monitor.hpp
@@ -22,7 +22,7 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 int sdl_list_monitors(sdlContext* sdl);
 BOOL sdl_detect_monitors(sdlContext* sdl, UINT32* pWidth, UINT32* pHeight);
diff --git a/client/SDL/sdl_pointer.cpp b/client/SDL/sdl_pointer.cpp
index 6d81852a9..688a248ad 100644
--- a/client/SDL/sdl_pointer.cpp
+++ b/client/SDL/sdl_pointer.cpp
@@ -21,10 +21,10 @@
 
 #include <freerdp/gdi/gdi.h>
 
-#include "sdl_pointer.h"
-#include "sdl_freerdp.h"
-#include "sdl_touch.h"
-#include "sdl_utils.h"
+#include "sdl_pointer.hpp"
+#include "sdl_freerdp.hpp"
+#include "sdl_touch.hpp"
+#include "sdl_utils.hpp"
 
 #include <SDL_mouse.h>
 
diff --git a/client/SDL/sdl_pointer.h b/client/SDL/sdl_pointer.hpp
similarity index 96%
rename from client/SDL/sdl_pointer.h
rename to client/SDL/sdl_pointer.hpp
index 9155137d4..8bba69b75 100644
--- a/client/SDL/sdl_pointer.h
+++ b/client/SDL/sdl_pointer.hpp
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <freerdp/graphics.h>
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 BOOL sdl_register_pointer(rdpGraphics* graphics);
 
diff --git a/client/SDL/sdl_touch.cpp b/client/SDL/sdl_touch.cpp
index 2a1301b7d..e3fd35da9 100644
--- a/client/SDL/sdl_touch.cpp
+++ b/client/SDL/sdl_touch.cpp
@@ -19,8 +19,8 @@
 
 #include <freerdp/config.h>
 
-#include "sdl_touch.h"
-#include "sdl_freerdp.h"
+#include "sdl_touch.hpp"
+#include "sdl_freerdp.hpp"
 
 #include <winpr/wtypes.h>
 #include <winpr/assert.h>
diff --git a/client/SDL/sdl_touch.h b/client/SDL/sdl_touch.hpp
similarity index 98%
rename from client/SDL/sdl_touch.h
rename to client/SDL/sdl_touch.hpp
index a8cc5350c..1335525e9 100644
--- a/client/SDL/sdl_touch.h
+++ b/client/SDL/sdl_touch.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 BOOL sdl_scale_coordinates(sdlContext* sdl, Uint32 windowId, INT32* px, INT32* py,
                            BOOL fromLocalToRDP, BOOL applyOffset);
diff --git a/client/SDL/sdl_utils.cpp b/client/SDL/sdl_utils.cpp
index 08888e09e..3b6e3dfc1 100644
--- a/client/SDL/sdl_utils.cpp
+++ b/client/SDL/sdl_utils.cpp
@@ -18,9 +18,9 @@
  */
 
 #include <assert.h>
-#include "sdl_utils.h"
+#include "sdl_utils.hpp"
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 #include <SDL.h>
 
diff --git a/client/SDL/sdl_utils.h b/client/SDL/sdl_utils.hpp
similarity index 98%
rename from client/SDL/sdl_utils.h
rename to client/SDL/sdl_utils.hpp
index e96ae3bd6..f64fce2a3 100644
--- a/client/SDL/sdl_utils.h
+++ b/client/SDL/sdl_utils.hpp
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <SDL.h>
 
-#include "sdl_freerdp.h"
+#include "sdl_freerdp.hpp"
 
 enum
 {