diff --git a/src/osdep/gui/CreateFilesysHardfile.cpp b/src/osdep/gui/CreateFilesysHardfile.cpp
index 5fd4869fd..d862b272e 100644
--- a/src/osdep/gui/CreateFilesysHardfile.cpp
+++ b/src/osdep/gui/CreateFilesysHardfile.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <guisan/sdl.hpp>
@@ -13,7 +12,6 @@
 #include "options.h"
 #include "filesys.h"
 #include "gui_handling.h"
-#include "inputdevice.h"
 #include "amiberry_gfx.h"
 #include "amiberry_input.h"
 
diff --git a/src/osdep/gui/EditFilesysHardfile.cpp b/src/osdep/gui/EditFilesysHardfile.cpp
index e6f6ab0fc..92b70c7e1 100644
--- a/src/osdep/gui/EditFilesysHardfile.cpp
+++ b/src/osdep/gui/EditFilesysHardfile.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
@@ -15,8 +14,6 @@
 #include "autoconf.h"
 #include "filesys.h"
 #include "gui_handling.h"
-
-#include "inputdevice.h"
 #include "amiberry_gfx.h"
 #include "amiberry_input.h"
 
diff --git a/src/osdep/gui/EditFilesysVirtual.cpp b/src/osdep/gui/EditFilesysVirtual.cpp
index 41177d847..7301892de 100644
--- a/src/osdep/gui/EditFilesysVirtual.cpp
+++ b/src/osdep/gui/EditFilesysVirtual.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
@@ -15,7 +14,6 @@
 #include "autoconf.h"
 #include "gui_handling.h"
 
-#include "inputdevice.h"
 #include "amiberry_gfx.h"
 #include "amiberry_input.h"
 
diff --git a/src/osdep/gui/Navigation.cpp b/src/osdep/gui/Navigation.cpp
index ab17d5593..8a13a7f59 100644
--- a/src/osdep/gui/Navigation.cpp
+++ b/src/osdep/gui/Navigation.cpp
@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 #include <guisan.hpp>
 #include <guisan/sdl.hpp>
 #include <guisan/sdl/sdltruetypefont.hpp>
diff --git a/src/osdep/gui/PanelCPU.cpp b/src/osdep/gui/PanelCPU.cpp
index 260afdab3..9794de33a 100644
--- a/src/osdep/gui/PanelCPU.cpp
+++ b/src/osdep/gui/PanelCPU.cpp
@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 #include <guisan.hpp>
 #include <SDL_ttf.h>
 #include <guisan/sdl.hpp>
diff --git a/src/osdep/gui/PanelChipset.cpp b/src/osdep/gui/PanelChipset.cpp
index c4c6b49b4..dbabe244a 100644
--- a/src/osdep/gui/PanelChipset.cpp
+++ b/src/osdep/gui/PanelChipset.cpp
@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 #include <guisan.hpp>
 #include <SDL_ttf.h>
 #include <guisan/sdl.hpp>
diff --git a/src/osdep/gui/PanelConfig.cpp b/src/osdep/gui/PanelConfig.cpp
index 4cada4162..8bd09669e 100644
--- a/src/osdep/gui/PanelConfig.cpp
+++ b/src/osdep/gui/PanelConfig.cpp
@@ -1,6 +1,5 @@
 #include <string.h>
 #include <stdio.h>
-#include <stdbool.h>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelDisplay.cpp b/src/osdep/gui/PanelDisplay.cpp
index acdcf467f..eb0142fa4 100644
--- a/src/osdep/gui/PanelDisplay.cpp
+++ b/src/osdep/gui/PanelDisplay.cpp
@@ -1,5 +1,5 @@
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelFloppy.cpp b/src/osdep/gui/PanelFloppy.cpp
index 39a22cb89..dc01ec8e2 100644
--- a/src/osdep/gui/PanelFloppy.cpp
+++ b/src/osdep/gui/PanelFloppy.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelPrio.cpp b/src/osdep/gui/PanelPrio.cpp
index 9c219df58..4aac070d9 100644
--- a/src/osdep/gui/PanelPrio.cpp
+++ b/src/osdep/gui/PanelPrio.cpp
@@ -1,5 +1,3 @@
-#include <cstring>
-
 #include <guisan.hpp>
 #include <guisan/sdl.hpp>
 #include "SelectorEntry.hpp"
diff --git a/src/osdep/gui/PanelQuickstart.cpp b/src/osdep/gui/PanelQuickstart.cpp
index 50eafcc14..e3a1c93be 100644
--- a/src/osdep/gui/PanelQuickstart.cpp
+++ b/src/osdep/gui/PanelQuickstart.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelRAM.cpp b/src/osdep/gui/PanelRAM.cpp
index 6a801150b..11c8f2580 100644
--- a/src/osdep/gui/PanelRAM.cpp
+++ b/src/osdep/gui/PanelRAM.cpp
@@ -6,7 +6,6 @@
 #include "sysdeps.h"
 #include "options.h"
 #include "memory.h"
-#include "gfxboard.h"
 #include "gui_handling.h"
 #include "target.h"
 
diff --git a/src/osdep/gui/PanelROM.cpp b/src/osdep/gui/PanelROM.cpp
index 1d5ab23bd..0d1f4a0a3 100644
--- a/src/osdep/gui/PanelROM.cpp
+++ b/src/osdep/gui/PanelROM.cpp
@@ -1,4 +1,4 @@
-#include <string.h>
+#include <cstring>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelRTG.cpp b/src/osdep/gui/PanelRTG.cpp
index 48d926d29..883692e06 100644
--- a/src/osdep/gui/PanelRTG.cpp
+++ b/src/osdep/gui/PanelRTG.cpp
@@ -1,5 +1,5 @@
 #include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/PanelSavestate.cpp b/src/osdep/gui/PanelSavestate.cpp
index 1e8003f1b..1c961dbfe 100644
--- a/src/osdep/gui/PanelSavestate.cpp
+++ b/src/osdep/gui/PanelSavestate.cpp
@@ -1,6 +1,5 @@
-#include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
@@ -10,7 +9,6 @@
 #include "SelectorEntry.hpp"
 
 #include "sysdeps.h"
-#include "xwin.h"
 #include "gui.h"
 #include "savestate.h"
 #include "gui_handling.h"
diff --git a/src/osdep/gui/SelectFile.cpp b/src/osdep/gui/SelectFile.cpp
index 0dc0d499b..39aea3ef1 100644
--- a/src/osdep/gui/SelectFile.cpp
+++ b/src/osdep/gui/SelectFile.cpp
@@ -1,9 +1,8 @@
-#include <stdbool.h>
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/types.h>
 #include <dirent.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/SelectFolder.cpp b/src/osdep/gui/SelectFolder.cpp
index 0fe807f8f..8fa28576c 100644
--- a/src/osdep/gui/SelectFolder.cpp
+++ b/src/osdep/gui/SelectFolder.cpp
@@ -1,9 +1,8 @@
-#include <stdbool.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
diff --git a/src/osdep/gui/SelectorEntry.cpp b/src/osdep/gui/SelectorEntry.cpp
index b4e86f76d..d19e97cea 100644
--- a/src/osdep/gui/SelectorEntry.cpp
+++ b/src/osdep/gui/SelectorEntry.cpp
@@ -1,5 +1,3 @@
-#include <stdbool.h>
-
 #include "SelectorEntry.hpp"
 #include "guisan/widgets/container.hpp"
 #include "guisan/widgets/icon.hpp"
diff --git a/src/osdep/gui/ShowHelp.cpp b/src/osdep/gui/ShowHelp.cpp
index 45590cfc6..da804ccb0 100644
--- a/src/osdep/gui/ShowHelp.cpp
+++ b/src/osdep/gui/ShowHelp.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>
@@ -13,7 +12,6 @@
 #include "gui_handling.h"
 
 #include "options.h"
-#include "inputdevice.h"
 #include "amiberry_gfx.h"
 #include "amiberry_input.h"
 
diff --git a/src/osdep/gui/ShowMessage.cpp b/src/osdep/gui/ShowMessage.cpp
index 38136eceb..cb6e26517 100644
--- a/src/osdep/gui/ShowMessage.cpp
+++ b/src/osdep/gui/ShowMessage.cpp
@@ -1,6 +1,5 @@
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include <guisan.hpp>
 #include <SDL_ttf.h>