Removed uses of stdlib.h and string.h

6 files changed, 12 insertions, 20 deletions

diff --git a/src/video/riscos/SDL_riscosFullScreenVideo.c b/src/video/riscos/SDL_riscosFullScreenVideo.c
index 81cc302583..d52e3ffc29 100644
--- a/src/video/riscos/SDL_riscosFullScreenVideo.c
+++ b/src/video/riscos/SDL_riscosFullScreenVideo.c
@@ -27,11 +27,9 @@
      Implements RISC OS full screen display.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "SDL.h"
+#include "SDL_stdlib.h"
+#include "SDL_string.h"
 #include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
@@ -357,7 +355,7 @@ void FULLSCREEN_BuildModeList(_THIS)
 	/* Sort the mode lists */
 	for ( j=0; j<NUM_MODELISTS; ++j ) {
 		if ( SDL_nummodes[j] > 0 ) {
-			qsort(SDL_modelist[j], SDL_nummodes[j], sizeof *SDL_modelist[j], cmpmodes);
+			SDL_qsort(SDL_modelist[j], SDL_nummodes[j], sizeof *SDL_modelist[j], cmpmodes);
 		}
 	}
 }
diff --git a/src/video/riscos/SDL_riscosmouse.c b/src/video/riscos/SDL_riscosmouse.c
index 67549aa343..76599f4557 100644
--- a/src/video/riscos/SDL_riscosmouse.c
+++ b/src/video/riscos/SDL_riscosmouse.c
@@ -27,9 +27,7 @@
      Implements mouse cursor shape definitions and positioning
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-
+#include "SDL_stdlib.h"
 #include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
diff --git a/src/video/riscos/SDL_riscossprite.c b/src/video/riscos/SDL_riscossprite.c
index 8a41830f15..e63a353ceb 100644
--- a/src/video/riscos/SDL_riscossprite.c
+++ b/src/video/riscos/SDL_riscossprite.c
@@ -27,9 +27,10 @@
      Implements Sprite plotting code for wimp display.window
 */
 
-#include <stdlib.h>
 #include "kernel.h"
 #include "swis.h"
+
+#include "SDL_stdlib.h"
 #include "SDL_riscosvideo.h"
 
 extern void WIMP_ReadModeInfo(_THIS);
diff --git a/src/video/riscos/SDL_riscostask.c b/src/video/riscos/SDL_riscostask.c
index 20026a4fa0..5c99691ad2 100644
--- a/src/video/riscos/SDL_riscostask.c
+++ b/src/video/riscos/SDL_riscostask.c
@@ -31,12 +31,11 @@
 	  Restoring desktop after switching to full screen
 */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "kernel.h"
 #include "swis.h"
 
+#include "SDL_stdlib.h"
+#include "SDL_string.h"
 #include "SDL_riscostask.h"
 
 #ifndef DISABLE_THREADS
diff --git a/src/video/riscos/SDL_riscosvideo.c b/src/video/riscos/SDL_riscosvideo.c
index 6b4c537427..d07d8a9392 100644
--- a/src/video/riscos/SDL_riscosvideo.c
+++ b/src/video/riscos/SDL_riscosvideo.c
@@ -29,11 +29,9 @@
 	 into other source files.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "SDL.h"
+#include "SDL_stdlib.h"
+#include "SDL_string.h"
 #include "SDL_syswm.h"
 #include "SDL_error.h"
 #include "SDL_video.h"
diff --git a/src/video/riscos/SDL_wimpvideo.c b/src/video/riscos/SDL_wimpvideo.c
index 144ad58139..99bf497692 100644
--- a/src/video/riscos/SDL_wimpvideo.c
+++ b/src/video/riscos/SDL_wimpvideo.c
@@ -27,11 +27,9 @@
      Implements RISC OS Wimp display.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "SDL.h"
+#include "SDL_stdlib.h"
+#include "SDL_string.h"
 #include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"