More header massaging... works great on Windows. ;-)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401362

include/SDL.h

@@ -26,16 +26,18 @@
 #define _SDL_H
 
 #include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-#include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_cdrom.h"
-#include "SDL_joystick.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_endian.h"
+#include "SDL_error.h"
 #include "SDL_events.h"
-#include "SDL_video.h"
 #include "SDL_loadso.h"
-#include "SDL_byteorder.h"
+#include "SDL_mutex.h"
+#include "SDL_rwops.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_video.h"
 #include "SDL_version.h"
 
 #include "begin_code.h"

include/SDL_active.h

@@ -26,6 +26,7 @@
 #define _SDL_active_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_audio.h

@@ -27,8 +27,10 @@
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
-#include "SDL_rwops.h"
 #include "SDL_endian.h"
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
+#include "SDL_rwops.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_cdrom.h

@@ -26,6 +26,7 @@
 #define _SDL_cdrom_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_config.h

-/* include/SDL_config.h.  Generated by configure.  */
 /*
     SDL - Simple DirectMedia Layer
     Copyright (C) 1997-2006 Sam Lantinga
@@ -24,111 +23,17 @@
 #ifndef _SDL_config_h
 #define _SDL_config_h
 
-/* This is a set of defines to configure the SDL features */
+/* This is the minimal configuration that can be used to build SDL */
 
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
+#include <stdarg.h>
 
-/* C datatypes */
-/* #undef size_t */
-/* #undef int8_t */
-/* #undef uint8_t */
-/* #undef int16_t */
-/* #undef uint16_t */
-/* #undef int32_t */
-/* #undef uint32_t */
-#define SDL_HAS_64BIT_TYPE 1
-/* #undef int64_t */
-/* #undef uint64_t */
-/* #undef uintptr_t */
-
-/* Endianness */
-#define SDL_BYTEORDER 1234
-
-/* Comment this if you want to build without any C library requirements */
-#define HAVE_LIBC 1
-#ifdef HAVE_LIBC
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_SIGNAL_H 1
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#endif
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRCPY 1
-#define HAVE_STRNCPY 1
-#define HAVE_STRCAT 1
-#define HAVE_STRNCAT 1
-#define HAVE_STRDUP 1
-/* #undef HAVE__STRREV */
-/* #undef HAVE__STRUPR */
-/* #undef HAVE__STRLWR */
-/* #undef HAVE_INDEX */
-/* #undef HAVE_RINDEX */
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_ITOA */
-/* #undef HAVE__LTOA */
-/* #undef HAVE__UITOA */
-/* #undef HAVE__ULTOA */
-#define HAVE_STRTOL 1
-/* #undef HAVE__I64TOA */
-/* #undef HAVE__UI64TOA */
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/* #undef HAVE_STRICMP */
-#define HAVE_STRCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-/* #undef HAVE_VSNPRINTF */
-
-#endif /* HAVE_LIBC */
-
-
-/* Allow disabling of core subsystems */
-/* #undef DISABLE_AUDIO */
-/* #undef DISABLE_VIDEO */
-/* #undef DISABLE_EVENTS */
-/* #undef DISABLE_JOYSTICK */
-/* #undef DISABLE_CDROM */
-/* #undef DISABLE_THREADS */
-/* #undef DISABLE_TIMERS */
-/* #undef DISABLE_FILE */
-/* #undef DISABLE_CPUINFO */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef unsigned int size_t;
+typedef unsigned long uintptr_t;
 
 #endif /* _SDL_config_h */

include/SDL_events.h

@@ -26,6 +26,7 @@
 #define _SDL_events_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_active.h"
 #include "SDL_keyboard.h"
 #include "SDL_mouse.h"

include/SDL_joystick.h

@@ -26,6 +26,7 @@
 #define _SDL_joystick_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_keyboard.h

@@ -26,6 +26,7 @@
 #define _SDL_keyboard_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_keysym.h"
 
 #include "begin_code.h"

include/SDL_loadso.h

@@ -42,6 +42,7 @@
 #define _SDL_loadso_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_mouse.h

@@ -26,6 +26,7 @@
 #define _SDL_mouse_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_video.h"
 
 #include "begin_code.h"

include/SDL_mutex.h

@@ -29,6 +29,7 @@
 */
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_quit.h

@@ -26,6 +26,7 @@
 #define _SDL_quit_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 /* 
   An SDL_QUITEVENT is generated when the user tries to close the application

include/SDL_rwops.h

@@ -28,6 +28,7 @@
 #define _SDL_RWops_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_stdlib.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#include "SDL_stdinc.h"

include/SDL_string.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#include "SDL_stdinc.h"

include/SDL_syswm.h

@@ -26,6 +26,7 @@
 #define _SDL_syswm_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_version.h"
 
 #include "begin_code.h"

include/SDL_thread.h

@@ -29,6 +29,7 @@
 */
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 /* Thread synchronization primitives */
 #include "SDL_mutex.h"

include/SDL_timer.h

@@ -26,6 +26,7 @@
 /* Header for the SDL time management routines */
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */

include/SDL_video.h

@@ -26,7 +26,7 @@
 #define _SDL_video_h
 
 #include "SDL_stdinc.h"
-#include "SDL_mutex.h"
+#include "SDL_error.h"
 #include "SDL_rwops.h"
 
 #include "begin_code.h"

src/SDL.c

@@ -27,8 +27,6 @@
 #endif
 
 #include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_endian.h"
 #include "SDL_fatal.h"
 #ifndef DISABLE_VIDEO
 #include "SDL_leaks.h"

src/SDL_error.c

@@ -22,9 +22,6 @@
 
 /* Simple error handling in SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_types.h"
 #include "SDL_error.h"
 #include "SDL_error_c.h"
 #ifndef DISABLE_THREADS

src/audio/SDL_audio.c

@@ -23,10 +23,6 @@
 /* Allow access to a raw mixing buffer */
 
 #include "SDL.h"
-#include "SDL_audio.h"
-#include "SDL_timer.h"
-#include "SDL_error.h"
-#include "SDL_string.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"
 #include "SDL_sysaudio.h"

src/audio/SDL_audiocvt.c

@@ -22,7 +22,6 @@
 
 /* Functions for audio drivers to perform runtime conversion of audio format */
 
-#include "SDL_error.h"
 #include "SDL_audio.h"
 
 

src/audio/SDL_audiodev.c

@@ -28,8 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_audiodev_c.h"
 
 #ifndef _PATH_DEV_DSP
@@ -103,8 +102,7 @@ int SDL_OpenAudioPath(char *path, int maxlen, int flags, int classic)
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_audiodev_c.h"
 
 #ifndef _PATH_DEV_DSP

src/audio/SDL_audiomem.c

@@ -31,7 +31,7 @@
 #include <stddef.h>
 #endif
 
-#include "SDL_stdlib.h"
+#include "SDL_stdinc.h"
 #include "SDL_audiomem.h"
 
 /* Allocate memory that will be shared between threads (freed on exit) */

src/audio/SDL_mixer.c

@@ -22,12 +22,10 @@
 
 /* This provides the default mixing callback for the SDL audio routines */
 
-#include "SDL_audio.h"
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
 #include "SDL_cpuinfo.h"
+#include "SDL_timer.h"
+#include "SDL_audio.h"
 #include "SDL_sysaudio.h"
-#include "SDL_cpuinfo.h"
 #include "SDL_mixer_MMX.h"
 #include "SDL_mixer_MMX_VC.h"
 #include "SDL_mixer_m68k.h"

src/audio/SDL_wave.c

@@ -24,12 +24,8 @@
 
 /* Microsoft WAVE file loading routines */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_audio.h"
 #include "SDL_wave.h"
-#include "SDL_endian.h"
 
 
 static int ReadChunk(SDL_RWops *src, Chunk *chunk);

src/audio/alsa/SDL_alsa_audio.c

@@ -27,10 +27,7 @@
 #include <sys/types.h>
 #include <signal.h>	/* For kill() */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
 #include "SDL_timer.h"

src/audio/amigaos/SDL_ahiaudio.c

@@ -22,9 +22,6 @@
 
 /* Allow access to a raw mixing buffer (for AmigaOS) */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"

src/audio/arts/SDL_artsaudio.c

@@ -22,13 +22,10 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_artsaudio.h"
 

src/audio/baudio/SDL_beaudio.cc

@@ -28,8 +28,6 @@
 
 extern "C" {
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_sysaudio.h"

src/audio/dart/SDL_dart.c

@@ -22,10 +22,6 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"

src/audio/dc/SDL_dcaudio.c

@@ -30,13 +30,10 @@
 #include <fcntl.h>
 
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_dcaudio.h"
 

src/audio/disk/SDL_diskaudio.c

@@ -35,13 +35,10 @@
 #include <fcntl.h>
 
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_diskaudio.h"
 

src/audio/dma/SDL_dmaaudio.c

@@ -45,13 +45,10 @@
 #define MAP_FAILED	((Uint8 *)-1)
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_dmaaudio.h"
 

src/audio/dmedia/SDL_irixaudio.c

@@ -23,9 +23,6 @@
 /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
 /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_audiomem.h"

src/audio/dsp/SDL_dspaudio.c

@@ -42,13 +42,10 @@
 #include <sys/soundcard.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_dspaudio.h"
 

src/audio/esd/SDL_esdaudio.c

@@ -28,13 +28,10 @@
 
 #include <esd.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_esdaudio.h"
 

src/audio/macosx/SDL_coreaudio.c

@@ -22,9 +22,6 @@
 
 #include <AudioUnit/AudioUnit.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/macrom/SDL_romaudio.c

@@ -39,9 +39,6 @@
 #endif
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mint/SDL_mintaudio.c

@@ -32,10 +32,7 @@
 #include <mint/falcon.h>
 #include <mint/mintbind.h>
 
-#include "SDL_types.h"
 #include "SDL_audio.h"
-#include "SDL_string.h"
-
 #include "SDL_mintaudio.h"
 #include "SDL_mintaudio_stfa.h"
 

src/audio/mint/SDL_mintaudio_dma8.c

@@ -32,9 +32,6 @@
 #include <mint/falcon.h>
 #include <mint/cookie.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mint/SDL_mintaudio_gsxb.c

@@ -32,9 +32,6 @@
 #include <mint/falcon.h>
 #include <mint/cookie.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mint/SDL_mintaudio_mcsn.c

@@ -34,9 +34,6 @@
 #include <mint/falcon.h>
 #include <mint/cookie.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mint/SDL_mintaudio_stfa.c

@@ -32,9 +32,6 @@
 #include <mint/falcon.h>
 #include <mint/cookie.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mint/SDL_mintaudio_xbios.c

@@ -35,9 +35,6 @@
 #include <mint/falcon.h>
 #include <mint/cookie.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiomem.h"

src/audio/mme/SDL_mmeaudio.c

@@ -23,11 +23,8 @@
 /* Tru64 UNIX MME support */
 #include <mme_api.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_audio.h"
-#include "SDL_mutex.h"
 #include "SDL_timer.h"
+#include "SDL_audio.h"
 #include "SDL_audio_c.h"
 
 #include "SDL_mmeaudio.h"

src/audio/nas/SDL_nasaudio.c

@@ -29,13 +29,10 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_nasaudio.h"
 

src/audio/nto/SDL_nto_audio.c

@@ -31,13 +31,10 @@
 #include <sys/neutrino.h>
 #include <sys/asoundlib.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_nto_audio.h"
 
 /* The tag name used by NTO audio */

src/audio/openbsd/SDL_openbsdaudio.c

@@ -34,13 +34,10 @@
 #include <sys/types.h>
 #include <sys/audioio.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_openbsdaudio.h"
 

src/audio/paudio/SDL_paudio.c

@@ -31,13 +31,10 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audiomem.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_paudio.h"
 

src/audio/sun/SDL_sunaudio.c

@@ -36,15 +36,12 @@
 #endif
 #include <unistd.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_endian.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_audiomem.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_sunaudio.h"
 #include "SDL_audio_c.h"
-#include "SDL_timer.h"
 
 /* Open the audio device for playback, and don't block if busy */
 #define OPEN_FLAGS	(O_WRONLY|O_NONBLOCK)

src/audio/ums/SDL_umsaudio.c

@@ -33,10 +33,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_audio.h"
-#include "SDL_error.h"
 #include "SDL_audio_c.h"
 #include "SDL_audiodev_c.h"
 #include "SDL_umsaudio.h"

src/audio/windib/SDL_dibaudio.c

@@ -25,11 +25,8 @@
 #include "SDL_windows.h"
 #include <mmsystem.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_audio.h"
-#include "SDL_mutex.h"
 #include "SDL_timer.h"
+#include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_dibaudio.h"
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)

src/audio/windx5/SDL_dx5audio.c

@@ -22,10 +22,6 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"

src/cdrom/SDL_cdrom.c

@@ -22,9 +22,6 @@
 
 /* This is the CD-audio control API for Simple DirectMedia Layer */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/aix/SDL_syscdrom.c

@@ -40,9 +40,6 @@
 #include <fstab.h>
 #include <sys/scdisk.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/beos/SDL_syscdrom.cc

@@ -33,9 +33,6 @@
 #include <Entry.h>
 #include <Path.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 extern "C" {
 #include "SDL_syscdrom.h"

src/cdrom/bsdi/SDL_syscdrom.c

@@ -37,9 +37,6 @@
 #include </sys/dev/scsi/scsi.h>
 #include </sys/dev/scsi/scsi_ioctl.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/dc/SDL_syscdrom.c

@@ -25,7 +25,6 @@
 #include <dc/cdrom.h>
 #include <dc/spu.h>
 
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/freebsd/SDL_syscdrom.c

@@ -29,9 +29,6 @@
 #include <unistd.h>
 #include <sys/cdio.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/linux/SDL_syscdrom.c

@@ -81,9 +81,6 @@
 #endif
 #endif /* USE_MNTENT */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/macosx/SDLOSXCAGuard.c

@@ -73,8 +73,7 @@
 #include <stdlib.h>
 #include <string.h>
 */
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 
 //#define NDEBUG 1
 /*

src/cdrom/mint/SDL_syscdrom.c

@@ -31,9 +31,7 @@
 #include <cdromio.h>
 #include <metados.h>
 
-#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 */

src/cdrom/openbsd/SDL_syscdrom.c

@@ -31,9 +31,6 @@
 #include <sys/ioctl.h>
 #include <sys/cdio.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/os2/SDL_syscdrom.c

@@ -26,9 +26,6 @@
 #include <os2.h>
 #include <os2me.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/osf/SDL_syscdrom.c

@@ -32,9 +32,6 @@
 #include <io/cam/rzdisk.h>
 #include <io/common/devgetinfo.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/cdrom/qnx/SDL_syscdrom.c

@@ -31,11 +31,8 @@
 #include <sys/cdrom.h>
 #include <sys/dcmd_cam.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
-#include "SDL_cdrom.h"
 #include "SDL_timer.h"
+#include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 
 /* The maximum number of CD-ROM drives we'll detect */

src/cdrom/win32/SDL_syscdrom.c

@@ -25,9 +25,6 @@
 #include "SDL_windows.h"
 #include <mmsystem.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 

src/events/SDL_active.c

@@ -23,7 +23,6 @@
 /* Application focus/iconification handling code for SDL */
 
 #include "SDL_events.h"
-#include "SDL_string.h"
 #include "SDL_events_c.h"
 
 

src/events/SDL_events.c

@@ -23,10 +23,6 @@
 /* General event handling code for SDL */
 
 #include "SDL.h"
-#include "SDL_thread.h"
-#include "SDL_mutex.h"
-#include "SDL_events.h"
-#include "SDL_string.h"
 #include "SDL_events_c.h"
 #include "SDL_timer_c.h"
 #ifndef DISABLE_JOYSTICK

src/events/SDL_keyboard.c

@@ -22,10 +22,8 @@
 
 /* General keyboard handling code for SDL */
 
-#include "SDL_error.h"
-#include "SDL_events.h"
 #include "SDL_timer.h"
-#include "SDL_string.h"
+#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_sysevents.h"
 

src/events/SDL_mouse.c

@@ -23,7 +23,6 @@
 /* General mouse handling code for SDL */
 
 #include "SDL_events.h"
-#include "SDL_string.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
 #include "SDL_sysvideo.h"

src/file/SDL_rwops.c

@@ -24,7 +24,6 @@
    data sources.  It can easily be extended to files, memory, etc.
 */
 
-#include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_rwops.h"
 

src/joystick/SDL_joystick.c

@@ -22,9 +22,6 @@
 
 /* This is the joystick API for Simple DirectMedia Layer */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_events.h"
 #ifndef DISABLE_EVENTS
 #include "SDL_events_c.h"

src/joystick/amigaos/SDL_sysjoystick.c

@@ -38,8 +38,6 @@
 extern struct ExecBase *SysBase;
 extern struct GfxBase *GfxBase;
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/beos/SDL_bejoystick.cc

@@ -27,9 +27,6 @@
 
 extern "C" {
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/bsd/SDL_sysjoystick.c

@@ -56,9 +56,6 @@
 #include <machine/joystick.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/darwin/SDL_sysjoystick.c

@@ -41,7 +41,6 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
 
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/dc/SDL_sysjoystick.c

@@ -22,9 +22,6 @@
 
 /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/dummy/SDL_sysjoystick.c

@@ -22,9 +22,6 @@
 
 /* This is the system specific header for the SDL joystick API */
 
-#include <stdio.h>		/* For the definition of NULL */
-
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/linux/SDL_sysjoystick.c

@@ -35,9 +35,6 @@
 #include <linux/input.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/macos/SDL_sysjoystick.c

@@ -26,11 +26,8 @@
     The code that follows is meant for SDL.  Use at your own risk.
 */
 
-#include <string.h>
-
 #include <InputSprocket.h>
 
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/mint/SDL_sysjoystick.c

@@ -29,11 +29,6 @@
 #include <mint/cookie.h>
 #include <mint/osbind.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#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"

src/joystick/os2/SDL_sysjoystick.c

@@ -30,9 +30,6 @@
 #include <os2.h>
 #include "joyos2.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/riscos/SDL_sysjoystick.c

@@ -29,9 +29,6 @@
 
 /* This is the system specific header for the SDL joystick API */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"

src/joystick/win32/SDL_mmjoystick.c

@@ -22,18 +22,15 @@
 
 /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
+#include "SDL_windows.h"
+#include <mmsystem.h>
+#include <regstr.h>
+
 #include "SDL_events.h"
 #include "SDL_joystick.h"
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"
 
-#include "SDL_windows.h"
-#include <mmsystem.h>
-#include <regstr.h>
-
 #define MAX_JOYSTICKS	16
 #define MAX_AXES	6	/* each joystick can have up to 6 axes */
 #define MAX_BUTTONS	32	/* and 32 buttons                      */

src/loadso/beos/SDL_loadso.c

@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <be/kernel/image.h>
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/dlopen/SDL_loadso.c

@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <dlfcn.h>
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/dummy/SDL_loadso.c

@@ -27,8 +27,6 @@
 #error Do not compile directly...compile src/SDL_loadso.c instead!
 #endif
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/macos/SDL_loadso.c

@@ -38,8 +38,6 @@
 #include <CodeFragments.h>
 #include <Errors.h>
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/macosx/SDL_loadso.c

@@ -70,8 +70,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <mach-o/nlist.h>
 #include <mach-o/getsect.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 
 /* Just playing to see if it would compile with the freebsd headers, it does,
  * but because of the different values for RTLD_LOCAL etc, it would break binary
@@ -1382,8 +1381,6 @@ static dlfunc_t SDL_OSX_dlfunc(void * dl_restrict handle, const char * dl_restri
 #error Do not use USE_DLOPEN on Mac OS X.
 #endif
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/mint/SDL_loadso.c

@@ -36,8 +36,6 @@
 #include <gem.h>
 #include <ldg.h>
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/os2/SDL_loadso.c

@@ -36,8 +36,6 @@
 #define INCL_DOSMODULEMGR
 #include <os2.h>
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/loadso/windows/SDL_loadso.c

@@ -33,8 +33,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_types.h"
-#include "SDL_error.h"
 #include "SDL_loadso.h"
 
 void *SDL_LoadObject(const char *sofile)

src/main/beos/exports/Makefile

@@ -4,14 +4,12 @@ HEADERS = \
 	../../../../include/SDL.h \
 	../../../../include/SDL_active.h \
 	../../../../include/SDL_audio.h \
-	../../../../include/SDL_byteorder.h \
 	../../../../include/SDL_cdrom.h \
 	../../../../include/SDL_copying.h \
 	../../../../include/SDL_cpuinfo.h \
 	../../../../include/SDL_endian.h \
 	../../../../include/SDL_error.h \
 	../../../../include/SDL_events.h \
-	../../../../include/SDL_getenv.h \
 	../../../../include/SDL_joystick.h \
 	../../../../include/SDL_keyboard.h \
 	../../../../include/SDL_keysym.h \
@@ -23,7 +21,6 @@ HEADERS = \
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 

src/main/macos/exports/Makefile

@@ -4,14 +4,12 @@ HEADERS = \
 	../../../../include/SDL.h \
 	../../../../include/SDL_active.h \
 	../../../../include/SDL_audio.h \
-	../../../../include/SDL_byteorder.h \
 	../../../../include/SDL_cdrom.h \
 	../../../../include/SDL_copying.h \
 	../../../../include/SDL_cpuinfo.h \
 	../../../../include/SDL_endian.h \
 	../../../../include/SDL_error.h \
 	../../../../include/SDL_events.h \
-	../../../../include/SDL_getenv.h \
 	../../../../include/SDL_joystick.h \
 	../../../../include/SDL_keyboard.h \
 	../../../../include/SDL_keysym.h \
@@ -23,7 +21,6 @@ HEADERS = \
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 

src/main/macosx/exports/Makefile

@@ -4,14 +4,12 @@ HEADERS = \
 	../../../../include/SDL.h \
 	../../../../include/SDL_active.h \
 	../../../../include/SDL_audio.h \
-	../../../../include/SDL_byteorder.h \
 	../../../../include/SDL_cdrom.h \
 	../../../../include/SDL_copying.h \
 	../../../../include/SDL_cpuinfo.h \
 	../../../../include/SDL_endian.h \
 	../../../../include/SDL_error.h \
 	../../../../include/SDL_events.h \
-	../../../../include/SDL_getenv.h \
 	../../../../include/SDL_joystick.h \
 	../../../../include/SDL_keyboard.h \
 	../../../../include/SDL_keysym.h \
@@ -23,7 +21,6 @@ HEADERS = \
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 

src/main/win32/SDL_win32_main.c

@@ -9,9 +9,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-
 #ifdef _WIN32_WCE
 # define DIR_SEPERATOR TEXT("\\")
 # undef _getcwd

src/main/win32/exports/Makefile

@@ -4,14 +4,12 @@ HEADERS = \
 	../../../../include/SDL.h \
 	../../../../include/SDL_active.h \
 	../../../../include/SDL_audio.h \
-	../../../../include/SDL_byteorder.h \
 	../../../../include/SDL_cdrom.h \
 	../../../../include/SDL_copying.h \
 	../../../../include/SDL_cpuinfo.h \
 	../../../../include/SDL_endian.h \
 	../../../../include/SDL_error.h \
 	../../../../include/SDL_events.h \
-	../../../../include/SDL_getenv.h \
 	../../../../include/SDL_joystick.h \
 	../../../../include/SDL_keyboard.h \
 	../../../../include/SDL_keysym.h \
@@ -23,7 +21,6 @@ HEADERS = \
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h