diff --git a/src/audio/mint/SDL_mintaudio.c b/src/audio/mint/SDL_mintaudio.c
index 76cae3573..2c9adfceb 100644
--- a/src/audio/mint/SDL_mintaudio.c
+++ b/src/audio/mint/SDL_mintaudio.c
@@ -26,7 +26,6 @@
 	Patrice Mandin
 */
 
-#include <string.h>
 #include <unistd.h>
 
 #include <mint/osbind.h>
@@ -35,6 +34,7 @@
 
 #include "SDL_types.h"
 #include "SDL_audio.h"
+#include "SDL_string.h"
 
 #include "SDL_mintaudio.h"
 #include "SDL_mintaudio_stfa.h"
diff --git a/src/cdrom/mint/SDL_syscdrom.c b/src/cdrom/mint/SDL_syscdrom.c
index 78138eaa1..56cdfb592 100644
--- a/src/cdrom/mint/SDL_syscdrom.c
+++ b/src/cdrom/mint/SDL_syscdrom.c
@@ -33,6 +33,7 @@
 
 #include "SDL_error.h"
 #include "SDL_cdrom.h"
+#include "SDL_string.h"
 #include "SDL_syscdrom.h"
 
 /* Some ioctl() errno values which occur when the tray is empty */
diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c
index dcf854ca2..14c7066f3 100644
--- a/src/joystick/mint/SDL_sysjoystick.c
+++ b/src/joystick/mint/SDL_sysjoystick.c
@@ -34,6 +34,7 @@
 #include "SDL_types.h"
 #include "SDL_error.h"
 #include "SDL_joystick.h"
+#include "SDL_events.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"
 
diff --git a/src/video/ataricommon/SDL_biosevents.c b/src/video/ataricommon/SDL_biosevents.c
index 7557dcee8..613280b77 100644
--- a/src/video/ataricommon/SDL_biosevents.c
+++ b/src/video/ataricommon/SDL_biosevents.c
@@ -26,13 +26,12 @@
  *	Patrice Mandin
  */
 
-#include <string.h>
-
 /* Mint includes */
 #include <mint/osbind.h>
 #include <mint/cookie.h>
 
 #include "SDL.h"
+#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
diff --git a/src/video/ataricommon/SDL_gemdosevents.c b/src/video/ataricommon/SDL_gemdosevents.c
index 85d47ca59..5ac2f1eeb 100644
--- a/src/video/ataricommon/SDL_gemdosevents.c
+++ b/src/video/ataricommon/SDL_gemdosevents.c
@@ -26,13 +26,12 @@
  *	Patrice Mandin
  */
 
-#include <string.h>
-
 /* Mint includes */
 #include <mint/osbind.h>
 #include <mint/cookie.h>
 
 #include "SDL.h"
+#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
diff --git a/src/video/ataricommon/SDL_ikbdevents.c b/src/video/ataricommon/SDL_ikbdevents.c
index 78f50428d..d95847cd4 100644
--- a/src/video/ataricommon/SDL_ikbdevents.c
+++ b/src/video/ataricommon/SDL_ikbdevents.c
@@ -26,12 +26,11 @@
  *	Patrice Mandin
  */
 
-#include <string.h>
-
 /* Mint includes */
 #include <mint/osbind.h>
 
 #include "SDL.h"
+#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c
index 168c3e267..0936274bf 100644
--- a/src/video/gem/SDL_gemevents.c
+++ b/src/video/gem/SDL_gemevents.c
@@ -29,11 +29,10 @@
  * Olivier Landemarre, Johan Klockars, Xavier Joubert, Claude Attard
  */
 
-#include <string.h>
-
 #include <gem.h>
 
 #include "SDL.h"
+#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 #include "SDL_gemvideo.h"
diff --git a/src/video/xbios/SDL_xbios.c b/src/video/xbios/SDL_xbios.c
index 796e4ac3d..c00d06979 100644
--- a/src/video/xbios/SDL_xbios.c
+++ b/src/video/xbios/SDL_xbios.c
@@ -672,7 +672,7 @@ static SDL_Surface *XBIOS_SetVideoMode(_THIS, SDL_Surface *current,
 			if (XBIOS_centscreen) {
 				SDL_XBIOS_CentscreenSetmode(this, width, height, new_depth);
 			} else {
-				Vsetmode(new_video_mode->number);
+				VsetMode(new_video_mode->number);
 			}
 #endif
 			/* Set hardware palette to black in True Colour */
@@ -884,7 +884,7 @@ static void XBIOS_VideoQuit(_THIS)
 			if (XBIOS_centscreen) {
 				SDL_XBIOS_CentscreenRestore(this, XBIOS_oldvmode);
 			} else {
-				Vsetmode(XBIOS_oldvmode);
+				VsetMode(XBIOS_oldvmode);
 			}
 			if (XBIOS_oldnumcol) {
 				VsetRGB(0, XBIOS_oldnumcol, XBIOS_oldpalette);