More header massaging... works great on Windows. ;-)
authorSam Lantinga <slouken@libsdl.org>
Fri, 10 Feb 2006 06:48:43 +0000
changeset 1358 c71e05b4dc2e
parent 1357 e18467d67cfd
child 1359 1e4ba2e063b4
More header massaging... works great on Windows. ;-)
include/SDL.h
include/SDL_active.h
include/SDL_audio.h
include/SDL_cdrom.h
include/SDL_config.h
include/SDL_events.h
include/SDL_joystick.h
include/SDL_keyboard.h
include/SDL_loadso.h
include/SDL_mouse.h
include/SDL_mutex.h
include/SDL_quit.h
include/SDL_rwops.h
include/SDL_stdlib.h
include/SDL_string.h
include/SDL_syswm.h
include/SDL_thread.h
include/SDL_timer.h
include/SDL_video.h
src/SDL.c
src/SDL_error.c
src/audio/SDL_audio.c
src/audio/SDL_audiocvt.c
src/audio/SDL_audiodev.c
src/audio/SDL_audiomem.c
src/audio/SDL_mixer.c
src/audio/SDL_wave.c
src/audio/alsa/SDL_alsa_audio.c
src/audio/amigaos/SDL_ahiaudio.c
src/audio/arts/SDL_artsaudio.c
src/audio/baudio/SDL_beaudio.cc
src/audio/dart/SDL_dart.c
src/audio/dc/SDL_dcaudio.c
src/audio/disk/SDL_diskaudio.c
src/audio/dma/SDL_dmaaudio.c
src/audio/dmedia/SDL_irixaudio.c
src/audio/dsp/SDL_dspaudio.c
src/audio/esd/SDL_esdaudio.c
src/audio/macosx/SDL_coreaudio.c
src/audio/macrom/SDL_romaudio.c
src/audio/mint/SDL_mintaudio.c
src/audio/mint/SDL_mintaudio_dma8.c
src/audio/mint/SDL_mintaudio_gsxb.c
src/audio/mint/SDL_mintaudio_mcsn.c
src/audio/mint/SDL_mintaudio_stfa.c
src/audio/mint/SDL_mintaudio_xbios.c
src/audio/mme/SDL_mmeaudio.c
src/audio/nas/SDL_nasaudio.c
src/audio/nto/SDL_nto_audio.c
src/audio/openbsd/SDL_openbsdaudio.c
src/audio/paudio/SDL_paudio.c
src/audio/sun/SDL_sunaudio.c
src/audio/ums/SDL_umsaudio.c
src/audio/windib/SDL_dibaudio.c
src/audio/windx5/SDL_dx5audio.c
src/cdrom/SDL_cdrom.c
src/cdrom/aix/SDL_syscdrom.c
src/cdrom/beos/SDL_syscdrom.cc
src/cdrom/bsdi/SDL_syscdrom.c
src/cdrom/dc/SDL_syscdrom.c
src/cdrom/freebsd/SDL_syscdrom.c
src/cdrom/linux/SDL_syscdrom.c
src/cdrom/macosx/SDLOSXCAGuard.c
src/cdrom/mint/SDL_syscdrom.c
src/cdrom/openbsd/SDL_syscdrom.c
src/cdrom/os2/SDL_syscdrom.c
src/cdrom/osf/SDL_syscdrom.c
src/cdrom/qnx/SDL_syscdrom.c
src/cdrom/win32/SDL_syscdrom.c
src/events/SDL_active.c
src/events/SDL_events.c
src/events/SDL_keyboard.c
src/events/SDL_mouse.c
src/file/SDL_rwops.c
src/joystick/SDL_joystick.c
src/joystick/amigaos/SDL_sysjoystick.c
src/joystick/beos/SDL_bejoystick.cc
src/joystick/bsd/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick.c
src/joystick/dc/SDL_sysjoystick.c
src/joystick/dummy/SDL_sysjoystick.c
src/joystick/linux/SDL_sysjoystick.c
src/joystick/macos/SDL_sysjoystick.c
src/joystick/mint/SDL_sysjoystick.c
src/joystick/os2/SDL_sysjoystick.c
src/joystick/riscos/SDL_sysjoystick.c
src/joystick/win32/SDL_mmjoystick.c
src/loadso/beos/SDL_loadso.c
src/loadso/dlopen/SDL_loadso.c
src/loadso/dummy/SDL_loadso.c
src/loadso/macos/SDL_loadso.c
src/loadso/macosx/SDL_loadso.c
src/loadso/mint/SDL_loadso.c
src/loadso/os2/SDL_loadso.c
src/loadso/windows/SDL_loadso.c
src/main/beos/exports/Makefile
src/main/macos/exports/Makefile
src/main/macosx/exports/Makefile
src/main/win32/SDL_win32_main.c
src/main/win32/exports/Makefile
src/stdlib/SDL_getenv.c
src/stdlib/SDL_string.c
src/thread/SDL_thread.c
src/thread/amigaos/SDL_syssem.c
src/thread/amigaos/SDL_systhread.c
src/thread/amigaos/SDL_thread.c
src/thread/beos/SDL_syssem.c
src/thread/beos/SDL_systhread.c
src/thread/bsdi/SDL_syssem.c
src/thread/dc/SDL_syscond.c
src/thread/dc/SDL_sysmutex.c
src/thread/dc/SDL_syssem.c
src/thread/dc/SDL_systhread.c
src/thread/generic/SDL_syscond.c
src/thread/generic/SDL_sysmutex.c
src/thread/generic/SDL_syssem.c
src/thread/generic/SDL_systhread.c
src/thread/irix/SDL_systhread.c
src/thread/linux/SDL_syscond.c
src/thread/linux/SDL_sysmutex.c
src/thread/linux/SDL_syssem.c
src/thread/linux/SDL_systhread.c
src/thread/os2/SDL_syscond.c
src/thread/os2/SDL_sysmutex.c
src/thread/os2/SDL_syssem.c
src/thread/os2/SDL_systhread.c
src/thread/pth/SDL_syscond.c
src/thread/pth/SDL_sysmutex.c
src/thread/pth/SDL_systhread.c
src/thread/riscos/SDL_syscond.c
src/thread/riscos/SDL_sysmutex.c
src/thread/riscos/SDL_syssem.c
src/thread/riscos/SDL_systhread.c
src/thread/win32/SDL_sysmutex.c
src/thread/win32/SDL_syssem.c
src/thread/win32/SDL_systhread.c
src/timer/SDL_timer.c
src/timer/amigaos/SDL_systimer.c
src/timer/beos/SDL_systimer.c
src/timer/dc/SDL_systimer.c
src/timer/linux/SDL_systimer.c
src/timer/mint/SDL_systimer.c
src/timer/os2/SDL_systimer.c
src/timer/riscos/SDL_systimer.c
src/timer/win32/SDL_systimer.c
src/timer/wince/SDL_systimer.c
src/video/SDL_RLEaccel.c
src/video/SDL_blit.c
src/video/SDL_blit_0.c
src/video/SDL_blit_1.c
src/video/SDL_blit_A.c
src/video/SDL_blit_N.c
src/video/SDL_bmp.c
src/video/SDL_cursor.c
src/video/SDL_gamma.c
src/video/SDL_pixels.c
src/video/SDL_stretch.c
src/video/SDL_surface.c
src/video/SDL_video.c
src/video/SDL_yuv.c
src/video/SDL_yuv_mmx.c
src/video/SDL_yuv_sw.c
src/video/aalib/SDL_aamouse.c
src/video/aalib/SDL_aavideo.c
src/video/ataricommon/SDL_ataric2p_s.h
src/video/ataricommon/SDL_atarievents.c
src/video/ataricommon/SDL_atarigl.c
src/video/ataricommon/SDL_atarimxalloc.c
src/video/ataricommon/SDL_biosevents.c
src/video/ataricommon/SDL_gemdosevents.c
src/video/ataricommon/SDL_ikbdevents.c
src/video/ataricommon/SDL_ikbdinterrupt_s.h
src/video/ataricommon/SDL_xbiosinterrupt_s.h
src/video/bwindow/SDL_sysmouse.cc
src/video/bwindow/SDL_sysvideo.cc
src/video/bwindow/SDL_sysyuv.cc
src/video/cybergfx/SDL_amigamouse.c
src/video/cybergfx/SDL_cgxaccel.c
src/video/cybergfx/SDL_cgxgl.c
src/video/cybergfx/SDL_cgximage.c
src/video/cybergfx/SDL_cgxmodes.c
src/video/cybergfx/SDL_cgxvideo.c
src/video/cybergfx/SDL_cgxvideo.h
src/video/cybergfx/SDL_cgxwm.c
src/video/cybergfx/SDL_cgxyuv.c
src/video/dc/SDL_dcmouse.c
src/video/dc/SDL_dcvideo.c
src/video/dga/SDL_dgamouse.c
src/video/dga/SDL_dgavideo.c
src/video/directfb/SDL_DirectFB_video.c
src/video/directfb/SDL_DirectFB_yuv.c
src/video/dummy/SDL_nullmouse.c
src/video/dummy/SDL_nullvideo.c
src/video/epoc/SDL_epocvideo.cpp
src/video/fbcon/SDL_fb3dfx.c
src/video/fbcon/SDL_fbelo.c
src/video/fbcon/SDL_fbevents.c
src/video/fbcon/SDL_fbmatrox.c
src/video/fbcon/SDL_fbmouse.c
src/video/fbcon/SDL_fbriva.c
src/video/fbcon/SDL_fbvideo.c
src/video/gapi/SDL_gapivideo.c
src/video/gem/SDL_gemevents.c
src/video/gem/SDL_gemmouse.c
src/video/gem/SDL_gemvideo.c
src/video/ggi/SDL_ggimouse.c
src/video/ggi/SDL_ggivideo.c
src/video/ipod/SDL_ipodvideo.c
src/video/maccommon/SDL_macevents.c
src/video/maccommon/SDL_macgl.c
src/video/maccommon/SDL_macmouse.c
src/video/maccommon/SDL_macwm.c
src/video/macdsp/SDL_dspvideo.c
src/video/macrom/SDL_romvideo.c
src/video/nanox/SDL_nximage.c
src/video/nanox/SDL_nxmodes.c
src/video/nanox/SDL_nxmouse.c
src/video/nanox/SDL_nxvideo.c
src/video/nanox/SDL_nxwm.c
src/video/os2fslib/SDL_os2fslib.c
src/video/photon/SDL_ph_image.c
src/video/photon/SDL_ph_modes.c
src/video/photon/SDL_ph_mouse.c
src/video/photon/SDL_ph_video.c
src/video/photon/SDL_ph_wm.c
src/video/photon/SDL_phyuv.c
src/video/picogui/SDL_pgvideo.c
src/video/ps2gs/SDL_gsevents.c
src/video/ps2gs/SDL_gsmouse.c
src/video/ps2gs/SDL_gsvideo.c
src/video/ps2gs/SDL_gsyuv.c
src/video/qtopia/SDL_sysvideo.cc
src/video/quartz/SDL_QuartzEvents.m
src/video/riscos/SDL_riscosFullScreenVideo.c
src/video/riscos/SDL_riscosmouse.c
src/video/riscos/SDL_riscossprite.c
src/video/riscos/SDL_riscostask.c
src/video/riscos/SDL_riscosvideo.c
src/video/riscos/SDL_wimpvideo.c
src/video/svga/SDL_svgaevents.c
src/video/svga/SDL_svgamouse.c
src/video/svga/SDL_svgavideo.c
src/video/vgl/SDL_vglmouse.c
src/video/vgl/SDL_vglvideo.c
src/video/wincommon/SDL_sysevents.c
src/video/wincommon/SDL_sysmouse.c
src/video/wincommon/SDL_syswm.c
src/video/wincommon/SDL_wingl.c
src/video/windib/SDL_dibevents.c
src/video/windib/SDL_dibvideo.c
src/video/windx5/SDL_dx5events.c
src/video/windx5/SDL_dx5video.c
src/video/windx5/SDL_dx5yuv.c
src/video/wscons/SDL_wsconsmouse.c
src/video/wscons/SDL_wsconsvideo.c
src/video/x11/SDL_x11dga.c
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11gl.c
src/video/x11/SDL_x11image.c
src/video/x11/SDL_x11modes.c
src/video/x11/SDL_x11mouse.c
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11wm.c
src/video/x11/SDL_x11yuv.c
src/video/xbios/SDL_xbios.c
src/video/xbios/SDL_xbios.h
src/video/xbios/SDL_xbios_centscreen.c
src/video/xbios/SDL_xbios_sb3.c
--- a/include/SDL.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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_loadso.h"
+#include "SDL_mutex.h"
+#include "SDL_rwops.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
 #include "SDL_video.h"
-#include "SDL_loadso.h"
-#include "SDL_byteorder.h"
 #include "SDL_version.h"
 
 #include "begin_code.h"
--- a/include/SDL_active.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_active.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_audio.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_audio.h	Fri Feb 10 06:48:43 2006 +0000
@@ -27,8 +27,10 @@
 
 #include "SDL_stdinc.h"
 #include "SDL_error.h"
+#include "SDL_endian.h"
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
 #include "SDL_rwops.h"
-#include "SDL_endian.h"
 
 #include "begin_code.h"
 /* Set up for C function definitions, even when using C++ */
--- a/include/SDL_cdrom.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_cdrom.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_config.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_config.h	Fri Feb 10 06:48:43 2006 +0000
@@ -1,4 +1,3 @@
-/* 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 */
-
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
-
-/* 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 */
+/* This is the minimal configuration that can be used to build SDL */
 
-/* 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
+#include <stdarg.h>
 
-/* 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 */
--- a/include/SDL_events.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_events.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/include/SDL_joystick.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_joystick.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_keyboard.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_keyboard.h	Fri Feb 10 06:48:43 2006 +0000
@@ -26,6 +26,7 @@
 #define _SDL_keyboard_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_keysym.h"
 
 #include "begin_code.h"
--- a/include/SDL_loadso.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_loadso.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_mouse.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_mouse.h	Fri Feb 10 06:48:43 2006 +0000
@@ -26,6 +26,7 @@
 #define _SDL_mouse_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_video.h"
 
 #include "begin_code.h"
--- a/include/SDL_mutex.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_mutex.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_quit.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_quit.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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
--- a/include/SDL_rwops.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_rwops.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_stdlib.h	Fri Feb 10 03:21:39 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-    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"
--- a/include/SDL_string.h	Fri Feb 10 03:21:39 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-    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"
--- a/include/SDL_syswm.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_syswm.h	Fri Feb 10 06:48:43 2006 +0000
@@ -26,6 +26,7 @@
 #define _SDL_syswm_h
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_version.h"
 
 #include "begin_code.h"
--- a/include/SDL_thread.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_thread.h	Fri Feb 10 06:48:43 2006 +0000
@@ -29,6 +29,7 @@
 */
 
 #include "SDL_stdinc.h"
+#include "SDL_error.h"
 
 /* Thread synchronization primitives */
 #include "SDL_mutex.h"
--- a/include/SDL_timer.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_timer.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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++ */
--- a/include/SDL_video.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/include/SDL_video.h	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/SDL.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/SDL.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/SDL_error.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/SDL_error.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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
--- a/src/audio/SDL_audio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_audio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/SDL_audiocvt.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_audiocvt.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* Functions for audio drivers to perform runtime conversion of audio format */
 
-#include "SDL_error.h"
 #include "SDL_audio.h"
 
 
--- a/src/audio/SDL_audiodev.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_audiodev.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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 @@
 #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
--- a/src/audio/SDL_audiomem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_audiomem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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) */
--- a/src/audio/SDL_mixer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_mixer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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_cpuinfo.h"
 #include "SDL_timer.h"
-#include "SDL_cpuinfo.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"
--- a/src/audio/SDL_wave.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/SDL_wave.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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);
--- a/src/audio/alsa/SDL_alsa_audio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/alsa/SDL_alsa_audio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/amigaos/SDL_ahiaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/amigaos/SDL_ahiaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/arts/SDL_artsaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/arts/SDL_artsaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/baudio/SDL_beaudio.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/baudio/SDL_beaudio.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/dart/SDL_dart.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/dart/SDL_dart.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/dc/SDL_dcaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/dc/SDL_dcaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/disk/SDL_diskaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/disk/SDL_diskaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/dma/SDL_dmaaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/dma/SDL_dmaaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/dmedia/SDL_irixaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/dmedia/SDL_irixaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/dsp/SDL_dspaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/dsp/SDL_dspaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/esd/SDL_esdaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/esd/SDL_esdaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/macosx/SDL_coreaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/macosx/SDL_coreaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/macrom/SDL_romaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/macrom/SDL_romaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mint/SDL_mintaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/mint/SDL_mintaudio_dma8.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_dma8.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mint/SDL_mintaudio_stfa.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_stfa.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mint/SDL_mintaudio_xbios.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mint/SDL_mintaudio_xbios.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/mme/SDL_mmeaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/mme/SDL_mmeaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,11 +23,8 @@
 /* Tru64 UNIX MME support */
 #include <mme_api.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
 #include "SDL_audio_c.h"
 
 #include "SDL_mmeaudio.h"
--- a/src/audio/nas/SDL_nasaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/nas/SDL_nasaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/nto/SDL_nto_audio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/nto/SDL_nto_audio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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 */
--- a/src/audio/openbsd/SDL_openbsdaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/openbsd/SDL_openbsdaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/paudio/SDL_paudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/paudio/SDL_paudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/audio/sun/SDL_sunaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/sun/SDL_sunaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/audio/ums/SDL_umsaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/ums/SDL_umsaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/audio/windib/SDL_dibaudio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/windib/SDL_dibaudio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,11 +25,8 @@
 #include "SDL_windows.h"
 #include <mmsystem.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
 #include "SDL_audio_c.h"
 #include "SDL_dibaudio.h"
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
--- a/src/audio/windx5/SDL_dx5audio.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/audio/windx5/SDL_dx5audio.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/cdrom/SDL_cdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/SDL_cdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/aix/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/aix/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/beos/SDL_syscdrom.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/beos/SDL_syscdrom.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/cdrom/bsdi/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/bsdi/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/dc/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/dc/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,7 +25,6 @@
 #include <dc/cdrom.h>
 #include <dc/spu.h>
 
-#include "SDL_error.h"
 #include "SDL_cdrom.h"
 #include "SDL_syscdrom.h"
 
--- a/src/cdrom/freebsd/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/freebsd/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/linux/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/linux/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/macosx/SDLOSXCAGuard.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/macosx/SDLOSXCAGuard.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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
 /*
--- a/src/cdrom/mint/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/mint/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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 */
--- a/src/cdrom/openbsd/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/openbsd/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/os2/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/os2/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/osf/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/osf/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/cdrom/qnx/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/qnx/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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_timer.h"
 #include "SDL_cdrom.h"
-#include "SDL_timer.h"
 #include "SDL_syscdrom.h"
 
 /* The maximum number of CD-ROM drives we'll detect */
--- a/src/cdrom/win32/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/cdrom/win32/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/events/SDL_active.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/events/SDL_active.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,7 +23,6 @@
 /* Application focus/iconification handling code for SDL */
 
 #include "SDL_events.h"
-#include "SDL_string.h"
 #include "SDL_events_c.h"
 
 
--- a/src/events/SDL_events.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/events/SDL_events.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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
--- a/src/events/SDL_keyboard.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/events/SDL_keyboard.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,10 +22,8 @@
 
 /* General keyboard handling code for SDL */
 
-#include "SDL_error.h"
+#include "SDL_timer.h"
 #include "SDL_events.h"
-#include "SDL_timer.h"
-#include "SDL_string.h"
 #include "SDL_events_c.h"
 #include "SDL_sysevents.h"
 
--- a/src/events/SDL_mouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/events/SDL_mouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/file/SDL_rwops.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/file/SDL_rwops.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
 
--- a/src/joystick/SDL_joystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/SDL_joystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/amigaos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/amigaos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/beos/SDL_bejoystick.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/beos/SDL_bejoystick.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/bsd/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/bsd/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/darwin/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/dc/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/dc/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/dummy/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/dummy/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/linux/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/linux/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/macos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/macos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/mint/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/mint/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/os2/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/os2/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/riscos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/riscos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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"
--- a/src/joystick/win32/SDL_mmjoystick.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/joystick/win32/SDL_mmjoystick.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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                      */
--- a/src/loadso/beos/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/beos/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/dlopen/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/dlopen/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/dummy/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/dummy/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/macos/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/macos/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/macosx/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/macosx/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -70,8 +70,7 @@
 #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 @@
 #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)
--- a/src/loadso/mint/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/mint/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/os2/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/os2/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/loadso/windows/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/loadso/windows/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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)
--- a/src/main/beos/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/main/beos/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
@@ -4,14 +4,12 @@
 	../../../../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 @@
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 
--- a/src/main/macos/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/main/macos/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
@@ -4,14 +4,12 @@
 	../../../../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 @@
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 
--- a/src/main/macosx/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/main/macosx/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
@@ -4,14 +4,12 @@
 	../../../../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 @@
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 
--- a/src/main/win32/SDL_win32_main.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/main/win32/SDL_win32_main.c	Fri Feb 10 06:48:43 2006 +0000
@@ -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
--- a/src/main/win32/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/main/win32/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
@@ -4,14 +4,12 @@
 	../../../../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 @@
 	../../../../include/SDL_syswm.h \
 	../../../../include/SDL_thread.h \
 	../../../../include/SDL_timer.h \
-	../../../../include/SDL_types.h \
 	../../../../include/SDL_version.h \
 	../../../../include/SDL_video.h
 
--- a/src/stdlib/SDL_getenv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/stdlib/SDL_getenv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,7 +27,6 @@
 #if defined(WIN32) && !defined(_WIN32_WCE)
 
 #include "SDL_windows.h"
-#include "SDL_string.h"
 
 /* Note this isn't thread-safe! */
 
--- a/src/stdlib/SDL_string.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/stdlib/SDL_string.c	Fri Feb 10 06:48:43 2006 +0000
@@ -353,7 +353,7 @@
 {
     char *bufp = string;
     while ( *bufp ) {
-        *bufp = toupper(*bufp);
+        *bufp = SDL_toupper(*bufp);
 	++bufp;
     }
     return string;
@@ -365,7 +365,7 @@
 {
     char *bufp = string;
     while ( *bufp ) {
-        *bufp = tolower(*bufp);
+        *bufp = SDL_tolower(*bufp);
 	++bufp;
     }
     return string;
@@ -609,8 +609,8 @@
     char a = 0;
     char b = 0;
     while (*str1 && *str2) {
-        a = tolower(*str1);
-        b = tolower(*str2);
+        a = SDL_tolower(*str1);
+        b = SDL_tolower(*str2);
         if ( a != b )
             break;
         ++str1;
@@ -713,7 +713,7 @@
                                 ++index;
                             }
                             if ( text[index] == '0' ) {
-                                if ( tolower(text[index+1]) == 'x' ) {
+                                if ( SDL_tolower(text[index+1]) == 'x' ) {
                                     radix = 16;
                                 } else {
                                     radix = 8;
--- a/src/thread/SDL_thread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/SDL_thread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,9 +22,6 @@
 
 /* System independent thread management routines for SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 #include "SDL_thread.h"
 #include "SDL_thread_c.h"
--- a/src/thread/amigaos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/amigaos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* An implementation of semaphores using mutexes and condition variables */
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
 
--- a/src/thread/amigaos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/amigaos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* BeOS thread management routines for SDL */
 
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 #include "SDL_thread.h"
 #include "SDL_thread_c.h"
--- a/src/thread/amigaos/SDL_thread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/amigaos/SDL_thread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,9 +22,6 @@
 
 /* System independent thread management routines for SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 #include "SDL_thread.h"
 #include "SDL_thread_c.h"
--- a/src/thread/beos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/beos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,7 +24,6 @@
 
 #include <be/kernel/OS.h>
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 
--- a/src/thread/beos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/beos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,7 +26,6 @@
 #include <signal.h>
 #include <be/kernel/OS.h>
 
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 #include "SDL_thread.h"
 #include "SDL_thread_c.h"
--- a/src/thread/bsdi/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/bsdi/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,8 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_timer.h"
 
--- a/src/thread/dc/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/dc/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,8 +26,6 @@
    implementation, written by Christopher Tate and Owen Smith.  Thanks!
  */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 struct SDL_cond
--- a/src/thread/dc/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/dc/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* An implementation of mutexes using semaphores */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
 
--- a/src/thread/dc/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/dc/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* An implementation of semaphores using mutexes and condition variables */
 
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
--- a/src/thread/dc/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/dc/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* Thread management routines for SDL */
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/generic/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/generic/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,8 +26,6 @@
    implementation, written by Christopher Tate and Owen Smith.  Thanks!
  */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 struct SDL_cond
--- a/src/thread/generic/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/generic/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* An implementation of mutexes using semaphores */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
 
--- a/src/thread/generic/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/generic/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* An implementation of semaphores using mutexes and condition variables */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
--- a/src/thread/generic/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/generic/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* Thread management routines for SDL */
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/irix/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/irix/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,7 +28,6 @@
 #include <sys/wait.h>
 #include <sys/prctl.h>
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/linux/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/linux/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -42,8 +42,6 @@
 #include <errno.h>
 #include <pthread.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_sysmutex_c.h"
 
--- a/src/thread/linux/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/linux/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -39,8 +39,6 @@
 
 #include <pthread.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 
--- a/src/thread/linux/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/linux/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,8 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_timer.h"
 
--- a/src/thread/linux/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/linux/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* Linux thread management routines for SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/os2/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/os2/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,8 +26,6 @@
    implementation, written by Christopher Tate and Owen Smith.  Thanks!
  */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 struct SDL_cond
--- a/src/thread/os2/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/os2/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,8 +26,6 @@
 #define INCL_DOSSEMAPHORES
 #include <os2.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 
 
--- a/src/thread/os2/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/os2/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,8 +27,6 @@
 #define INCL_DOSSEMAPHORES
 #include <os2.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_timer.h"
 
--- a/src/thread/os2/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/os2/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,8 +27,6 @@
 #define INCL_DOSPROCESS
 #include <os2.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/pth/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/pth/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -6,8 +6,6 @@
 
 #include <pth.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_syscond_c.h"
 #include "SDL_sysmutex_c.h"
--- a/src/thread/pth/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/pth/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -6,8 +6,6 @@
 
 #include <pth.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 #include "SDL_sysmutex_c.h"
 
--- a/src/thread/pth/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/pth/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,7 +26,6 @@
  *	Patrice Mandin
  */
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/riscos/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/riscos/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
@@ -29,8 +29,6 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_sysmutex_c.h"
 
--- a/src/thread/riscos/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/riscos/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,8 +28,6 @@
 
 #include <pthread.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 
 struct SDL_mutex {
--- a/src/thread/riscos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/riscos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,8 +23,6 @@
 /* RISC OS semiphores based on linux code */
 
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_systhread_c.h"
--- a/src/thread/riscos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/riscos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* RISC OS version based on pthreads linux source */
 
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/thread/win32/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/win32/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_mutex.h"
 
 
--- a/src/thread/win32/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/win32/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
 #include "win_ce_semaphore.h"
--- a/src/thread/win32/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/thread/win32/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_thread.h"
 #include "SDL_systhread.h"
 
--- a/src/timer/SDL_timer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/SDL_timer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,8 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
 #include "SDL_mutex.h"
--- a/src/timer/amigaos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/amigaos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -48,7 +48,6 @@
 extern struct ExecBase *SysBase;
 static struct GfxBase *GfxBase;
 
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
 
--- a/src/timer/beos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/beos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,7 +24,6 @@
 
 #include "SDL_thread.h"
 #include "SDL_timer.h"
-#include "SDL_error.h"
 #include "SDL_timer_c.h"
 
 static bigtime_t start;
--- a/src/timer/dc/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/dc/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,7 +24,6 @@
 
 #include "SDL_thread.h"
 #include "SDL_timer.h"
-#include "SDL_error.h"
 #include "SDL_timer_c.h"
 
 static unsigned start;
--- a/src/timer/linux/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/linux/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -45,7 +45,6 @@
 /*#define USE_CLOCK_GETTIME*/
 #endif
 
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
 
--- a/src/timer/mint/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/mint/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -39,7 +39,6 @@
 #include <mint/osbind.h>
 #include <mint/mintbind.h>
 
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
 #include "SDL_thread.h"
--- a/src/timer/os2/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/os2/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -32,7 +32,6 @@
 #include "SDL_thread.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
-#include "SDL_error.h"
 
 
 #define TIME_WRAP_VALUE (~(DWORD)0)
--- a/src/timer/riscos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/riscos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
 
--- a/src/timer/win32/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/win32/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,7 +25,6 @@
 
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
-#include "SDL_error.h"
 
 #ifdef _WIN32_WCE
   #error This is WinCE. Please use src/timer/wince/SDL_systimer.c instead.
--- a/src/timer/wince/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/timer/wince/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,7 +25,6 @@
 
 #include "SDL_timer.h"
 #include "SDL_timer_c.h"
-#include "SDL_error.h"
 
 static Uint64 start_date;
 static Uint64 start_ticks;
--- a/src/video/SDL_RLEaccel.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_RLEaccel.c	Fri Feb 10 06:48:43 2006 +0000
@@ -85,11 +85,7 @@
  *   beginning of an opaque line.
  */
 
-#include "SDL_types.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_sysvideo.h"
 #include "SDL_blit.h"
 #include "SDL_RLEaccel_c.h"
--- a/src/video/SDL_blit.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_blit.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,7 @@
     slouken@libsdl.org
 */
 
-#include "SDL_error.h"
 #include "SDL_video.h"
-#include "SDL_string.h"
 #include "SDL_sysvideo.h"
 #include "SDL_blit.h"
 #include "SDL_RLEaccel_c.h"
--- a/src/video/SDL_blit_0.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_blit_0.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,7 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
-#include "SDL_string.h"
 #include "SDL_blit.h"
 
 /* Functions to blit from bitmaps to other surfaces */
--- a/src/video/SDL_blit_1.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_blit_1.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_sysvideo.h"
--- a/src/video/SDL_blit_A.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_blit_A.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 
--- a/src/video/SDL_blit_N.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_blit_N.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,12 +20,10 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
+#include "SDL_endian.h"
+#include "SDL_cpuinfo.h"
 #include "SDL_blit.h"
-#include "SDL_byteorder.h"
-#include "SDL_cpuinfo.h"
 
 /* Functions to blit from N-bit surfaces to other surfaces */
 
--- a/src/video/SDL_bmp.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_bmp.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,10 +34,8 @@
    This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp.
 */
 
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_endian.h"
-#include "SDL_string.h"
 
 /* Compression encodings for BMP files */
 #ifndef BI_RGB
--- a/src/video/SDL_cursor.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_cursor.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,10 +22,7 @@
 
 /* General cursor handling code for SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_mutex.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_blit.h"
--- a/src/video/SDL_gamma.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_gamma.c	Fri Feb 10 06:48:43 2006 +0000
@@ -36,9 +36,6 @@
 #define log(x)		__ieee754_log(x)
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_sysvideo.h"
 
 
--- a/src/video/SDL_pixels.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_pixels.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,9 +22,6 @@
 
 /* General (mostly internal) pixel/color manipulation routines for SDL */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_video.h"
 #include "SDL_sysvideo.h"
--- a/src/video/SDL_stretch.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_stretch.c	Fri Feb 10 06:48:43 2006 +0000
@@ -26,7 +26,6 @@
    April 27, 2000 - Sam Lantinga
 */
 
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 
--- a/src/video/SDL_surface.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_surface.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_sysvideo.h"
 #include "SDL_cursor_c.h"
--- a/src/video/SDL_video.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_video.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,12 +23,6 @@
 /* The high-level video driver subsystem */
 
 #include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_events.h"
-#include "SDL_mutex.h"
 #include "SDL_sysvideo.h"
 #include "SDL_sysevents.h"
 #include "SDL_blit.h"
--- a/src/video/SDL_yuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_yuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,10 +22,7 @@
 
 /* This is the implementation of the YUV video surface support */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_sysvideo.h"
 #include "SDL_yuvfuncs.h"
 #include "SDL_yuv_sw_c.h"
--- a/src/video/SDL_yuv_mmx.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_yuv_mmx.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,11 +20,10 @@
     slouken@libsdl.org
 */
 
+#include "SDL_stdinc.h"
 
 #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
 
-#include "SDL_types.h"
-
 #define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
  
 static unsigned int  ASM_ARRAY(MMX_0080w)    = {0x00800080, 0x00800080};
--- a/src/video/SDL_yuv_sw.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/SDL_yuv_sw.c	Fri Feb 10 06:48:43 2006 +0000
@@ -82,9 +82,6 @@
  * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_cpuinfo.h"
 #include "SDL_stretch_c.h"
--- a/src/video/aalib/SDL_aamouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/aalib/SDL_aamouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 
--- a/src/video/aalib/SDL_aavideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/aalib/SDL_aavideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,10 +27,6 @@
 #include <sys/stat.h>
 
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/ataricommon/SDL_ataric2p_s.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_ataric2p_s.h	Fri Feb 10 06:48:43 2006 +0000
@@ -23,7 +23,7 @@
 #ifndef _ATARI_C2P_h
 #define _ATARI_C2P_h
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 
 /*--- Functions pointers ---*/
 
--- a/src/video/ataricommon/SDL_atarievents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_atarievents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,9 +30,6 @@
 
 #include <mint/cookie.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
--- a/src/video/ataricommon/SDL_atarigl.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_atarigl.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,11 +30,8 @@
 
 #include <mint/osbind.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_endian.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
 #include "SDL_atarigl_c.h"
 #ifdef ENABLE_OSMESA_SHARED
 #include "SDL_loadso.h"
--- a/src/video/ataricommon/SDL_atarimxalloc.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_atarimxalloc.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,7 +28,7 @@
 
 #include <mint/osbind.h>
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 
 /*--- Variables ---*/
 
--- a/src/video/ataricommon/SDL_biosevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_biosevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,8 +30,6 @@
 #include <mint/osbind.h>
 #include <mint/cookie.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
--- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_gemdosevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,8 +30,6 @@
 #include <mint/osbind.h>
 #include <mint/cookie.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
--- a/src/video/ataricommon/SDL_ikbdevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_ikbdevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -29,8 +29,6 @@
 /* Mint includes */
 #include <mint/osbind.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 
--- a/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Fri Feb 10 06:48:43 2006 +0000
@@ -31,7 +31,7 @@
 
 #include <mint/osbind.h>
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 
 /* Const */
 
--- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Fri Feb 10 06:48:43 2006 +0000
@@ -31,7 +31,7 @@
 
 #include <mint/osbind.h>
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 
 /* Variables */
 
--- a/src/video/bwindow/SDL_sysmouse.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/bwindow/SDL_sysmouse.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -23,9 +23,6 @@
 #include <AppKit.h>
 #include <GameKit.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_BWin.h"
 
 extern "C" {
--- a/src/video/bwindow/SDL_sysvideo.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/bwindow/SDL_sysvideo.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -24,9 +24,6 @@
 
 #include <unistd.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_BeApp.h"
 #include "SDL_BWin.h"
 #include "SDL_timer.h"
--- a/src/video/bwindow/SDL_sysyuv.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/bwindow/SDL_sysyuv.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* This is the BeOS version of SDL YUV video overlays */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_sysyuv.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/cybergfx/SDL_amigamouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_amigamouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/cybergfx/SDL_cgxaccel.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxaccel.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,11 +20,10 @@
     slouken@libsdl.org
 */
 
-#include "SDL_error.h"
 #include "SDL_endian.h"
+#include "SDL_video.h"
 #include "SDL_sysvideo.h"
 #include "SDL_blit.h"
-#include "SDL_video.h"
 #include "SDL_cgxvideo.h"
 
 static int CGX_HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
--- a/src/video/cybergfx/SDL_cgxgl.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxgl.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* StormMesa implementation of SDL OpenGL support */
 
-#include "SDL_error.h"
 #include "SDL_cgxgl_c.h"
 #include "SDL_cgxvideo.h"
 
--- a/src/video/cybergfx/SDL_cgximage.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgximage.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_cgximage_c.h"
 
--- a/src/video/cybergfx/SDL_cgxmodes.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxmodes.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,7 +23,6 @@
 /* Utilities for getting and setting the X display mode */
 
 #include "SDL_timer.h"
-#include "SDL_error.h"
 #include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_cgxvideo.h"
--- a/src/video/cybergfx/SDL_cgxvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,13 +25,11 @@
  * gabriele.greco@aruba.it
  */
 
-#include "SDL.h"
-#include "SDL_error.h"
+#include "SDL_endian.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_endian.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
--- a/src/video/cybergfx/SDL_cgxvideo.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxvideo.h	Fri Feb 10 06:48:43 2006 +0000
@@ -43,8 +43,6 @@
 #include <inline/console.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
 #include "mydebug.h"
--- a/src/video/cybergfx/SDL_cgxwm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxwm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -21,7 +21,6 @@
 */
 
 #include "SDL_version.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_video.h"
 #include "SDL_syswm.h"
--- a/src/video/cybergfx/SDL_cgxyuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxyuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,9 +30,6 @@
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/Xvlib.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_x11yuv_c.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/dc/SDL_dcmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dc/SDL_dcmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 
--- a/src/video/dc/SDL_dcvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dc/SDL_dcvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,10 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/dga/SDL_dgamouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dga/SDL_dgamouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_dgavideo.h"
--- a/src/video/dga/SDL_dgavideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dga/SDL_dgavideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,10 +28,6 @@
 #include <X11/Xlib.h>
 #include <Xext/extensions/xf86dga.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/directfb/SDL_DirectFB_video.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/directfb/SDL_DirectFB_video.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,10 +34,6 @@
 #include <directfb.h>
 #include <directfb_version.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/directfb/SDL_DirectFB_yuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/directfb/SDL_DirectFB_yuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,8 +22,6 @@
 
 /* This is the DirectFB implementation of YUV video overlays */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_DirectFB_yuv.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/dummy/SDL_nullmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dummy/SDL_nullmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 
--- a/src/video/dummy/SDL_nullvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/dummy/SDL_nullvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -35,10 +35,6 @@
  *  SDL video driver.  Renamed to "DUMMY" by Sam Lantinga.
  */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/epoc/SDL_epocvideo.cpp	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/epoc/SDL_epocvideo.cpp	Fri Feb 10 06:48:43 2006 +0000
@@ -30,9 +30,6 @@
 
 
 extern "C" {
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_video.h"
 #undef NULL
--- a/src/video/fbcon/SDL_fb3dfx.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fb3dfx.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_fb3dfx.h"
--- a/src/video/fbcon/SDL_fbelo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbelo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,7 @@
 #include <sys/time.h>
 #include <ctype.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_fbvideo.h"
 #include "SDL_fbelo.h"
 
--- a/src/video/fbcon/SDL_fbevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -39,9 +39,6 @@
 #include <linux/kd.h>
 #include <linux/keyboard.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_mutex.h"
 #include "SDL_sysevents.h"
 #include "SDL_sysvideo.h"
--- a/src/video/fbcon/SDL_fbmatrox.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbmatrox.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_fbmatrox.h"
--- a/src/video/fbcon/SDL_fbmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_fbvideo.h"
--- a/src/video/fbcon/SDL_fbriva.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbriva.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_types.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_fbriva.h"
--- a/src/video/fbcon/SDL_fbvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/fbcon/SDL_fbvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -31,10 +31,6 @@
 #include <asm/page.h>		/* For definition of PAGE_SIZE */
 #include <sys/io.h>		/* For ioperm() */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/gapi/SDL_gapivideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/gapi/SDL_gapivideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -32,9 +32,6 @@
 // TODO: windib on SH3 PPC2000 landscape test
 // TODO: optimize 8bpp landscape mode
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/gem/SDL_gemevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/gem/SDL_gemevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -31,8 +31,6 @@
 
 #include <gem.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 #include "SDL_gemvideo.h"
--- a/src/video/gem/SDL_gemmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/gem/SDL_gemmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,8 +28,6 @@
 
 #include <gem.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/gem/SDL_gemvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/gem/SDL_gemvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,13 +34,9 @@
 #include <mint/osbind.h>
 #include <mint/cookie.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
+#include "SDL_endian.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_endian.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
--- a/src/video/ggi/SDL_ggimouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ggi/SDL_ggimouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_ggimouse_c.h"
--- a/src/video/ggi/SDL_ggivideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ggi/SDL_ggivideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,10 +30,6 @@
 #include <ggi/ggi.h>
 #include <ggi/gii.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/ipod/SDL_ipodvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ipod/SDL_ipodvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -12,10 +12,6 @@
 #include <linux/keyboard.h>
 #include <linux/fb.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/maccommon/SDL_macevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/maccommon/SDL_macevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -36,7 +36,6 @@
 
 #include "SDL_events.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/maccommon/SDL_macgl.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/maccommon/SDL_macgl.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 /* AGL implementation of SDL OpenGL support */
 
-#include "SDL_error.h"
 #include "SDL_lowvideo.h"
 #include "SDL_macgl_c.h"
 #include "SDL_loadso.h"
--- a/src/video/maccommon/SDL_macmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/maccommon/SDL_macmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -33,9 +33,6 @@
 #include <CursorDevices.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_macmouse_c.h"
 
--- a/src/video/maccommon/SDL_macwm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/maccommon/SDL_macwm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -29,7 +29,7 @@
 #include <Strings.h>
 #endif
 
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_macwm_c.h"
 
 void Mac_SetCaption(_THIS, const char *title, const char *icon)
--- a/src/video/macdsp/SDL_dspvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/macdsp/SDL_dspvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -137,11 +137,8 @@
 #include <DrawSprocket.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
--- a/src/video/macrom/SDL_romvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/macrom/SDL_romvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -41,10 +41,7 @@
 #include <QDOffscreen.h>
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_sysvideo.h"
 #include "SDL_romvideo.h"
--- a/src/video/nanox/SDL_nximage.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/nanox/SDL_nximage.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,10 +25,6 @@
     clare@setabox.com
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
-
 #include "SDL_nximage_c.h"
 
 void NX_NormalUpdate (_THIS, int numrects, SDL_Rect * rects)
--- a/src/video/nanox/SDL_nxmodes.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/nanox/SDL_nxmodes.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,7 @@
     clare@setabox.com
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_nxmodes_c.h"
 
 SDL_Rect ** NX_ListModes (_THIS, SDL_PixelFormat * format, Uint32 flags)
--- a/src/video/nanox/SDL_nxmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/nanox/SDL_nxmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,8 +24,6 @@
     clare@setabox.com
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_events_c.h"
 
 #include "SDL_nxmouse_c.h"
--- a/src/video/nanox/SDL_nxvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/nanox/SDL_nxvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,12 +25,10 @@
     clare@setabox.com
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_thread.h"
 #include "SDL_video.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
-#include "SDL_thread.h"
 
 #define MWINCLUDECOLORS
 #include "SDL_nxvideo.h"
--- a/src/video/nanox/SDL_nxwm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/nanox/SDL_nxwm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,7 +25,6 @@
 */
 
 #include "SDL_syswm.h"
-#include "SDL_error.h"
 #include "SDL_events_c.h"
 
 #include "SDL_nxwm_c.h"
--- a/src/video/os2fslib/SDL_os2fslib.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/os2fslib/SDL_os2fslib.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,10 +23,6 @@
 #include <process.h>
 #include <time.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/photon/SDL_ph_image.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_ph_image.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,10 +23,6 @@
 #include <Ph.h>
 #include <photon/Pg.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_video.h"
 #include "SDL_pixels_c.h"
--- a/src/video/photon/SDL_ph_modes.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_ph_modes.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_error.h"
 #include "SDL_ph_modes_c.h"
 
 static PgVideoModeInfo_t mode_info;
--- a/src/video/photon/SDL_ph_mouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_ph_mouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/photon/SDL_ph_video.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_ph_video.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,15 +23,11 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
+#include "SDL_endian.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_endian.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
--- a/src/video/photon/SDL_ph_wm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_ph_wm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,8 +28,6 @@
 #include <photon/wmapi.h>
 
 #include "SDL_version.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_video.h"
 #include "SDL_syswm.h"
--- a/src/video/photon/SDL_phyuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/photon/SDL_phyuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,9 +27,6 @@
 #include <Ph.h>
 #include <Pt.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_phyuv_c.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/picogui/SDL_pgvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/picogui/SDL_pgvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,10 +23,6 @@
     micahjd@users.sourceforge.net
 */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/ps2gs/SDL_gsevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ps2gs/SDL_gsevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -38,8 +38,6 @@
 #include <linux/kd.h>
 #include <linux/keyboard.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_mutex.h"
 #include "SDL_sysevents.h"
 #include "SDL_sysvideo.h"
--- a/src/video/ps2gs/SDL_gsmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ps2gs/SDL_gsmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,7 +22,6 @@
 
 #include <sys/ioctl.h>
 
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/ps2gs/SDL_gsvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ps2gs/SDL_gsvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,10 +28,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/ps2gs/SDL_gsyuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/ps2gs/SDL_gsyuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,9 +28,6 @@
 #include <sys/mman.h>
 #include <asm/page.h>		/* For definition of PAGE_SIZE */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_gsyuv_c.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/qtopia/SDL_sysvideo.cc	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/qtopia/SDL_sysvideo.cc	Fri Feb 10 06:48:43 2006 +0000
@@ -27,9 +27,6 @@
 #include <qapplication.h>
 #include <qpe/qpeapplication.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_timer.h"
 
 #include "SDL_QWin.h"
--- a/src/video/quartz/SDL_QuartzEvents.m	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/quartz/SDL_QuartzEvents.m	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
 #include "SDL_QuartzVideo.h"
 
 #include <IOKit/IOMessage.h> // For wake from sleep detection
--- a/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,10 +27,6 @@
      Implements RISC OS full screen display.
 */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/riscos/SDL_riscosmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_riscosmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,8 +27,6 @@
      Implements mouse cursor shape definitions and positioning
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 
--- a/src/video/riscos/SDL_riscossprite.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_riscossprite.c	Fri Feb 10 06:48:43 2006 +0000
@@ -30,7 +30,7 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "SDL_stdlib.h"
+#include "SDL_stdinc.h"
 #include "SDL_riscosvideo.h"
 
 extern void WIMP_ReadModeInfo(_THIS);
--- a/src/video/riscos/SDL_riscostask.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_riscostask.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,8 +34,7 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_stdinc.h"
 #include "SDL_riscostask.h"
 
 #ifndef DISABLE_THREADS
--- a/src/video/riscos/SDL_riscosvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_riscosvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -29,13 +29,9 @@
 	 into other source files.
 */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_syswm.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
+#include "SDL_syswm.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
--- a/src/video/riscos/SDL_wimpvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/riscos/SDL_wimpvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -27,10 +27,6 @@
      Implements RISC OS Wimp display.
 */
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/svga/SDL_svgaevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/svga/SDL_svgaevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,9 +34,6 @@
 #error You must choose your operating system here
 #endif
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 #include "SDL_svgavideo.h"
--- a/src/video/svga/SDL_svgamouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/svga/SDL_svgamouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_svgavideo.h"
--- a/src/video/svga/SDL_svgavideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/svga/SDL_svgavideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -40,10 +40,6 @@
 #include <vgamouse.h>
 #include <vgakeyboard.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/vgl/SDL_vglmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/vgl/SDL_vglmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_vglvideo.h"
--- a/src/video/vgl/SDL_vglvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/vgl/SDL_vglvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -33,10 +33,6 @@
 #include <sys/kbio.h>
 #include <vgl.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/wincommon/SDL_sysevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wincommon/SDL_sysevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,13 +22,9 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_events.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
-#include "SDL_getenv.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
 #include "SDL_sysvideo.h"
--- a/src/video/wincommon/SDL_sysmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wincommon/SDL_sysmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,9 +22,6 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_sysmouse_c.h"
 #include "SDL_events_c.h"
--- a/src/video/wincommon/SDL_syswm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wincommon/SDL_syswm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,9 +23,6 @@
 #include "SDL_windows.h"
 
 #include "SDL_version.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_syswm.h"
 #include "SDL_syswm_c.h"
--- a/src/video/wincommon/SDL_wingl.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wincommon/SDL_wingl.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,12 +22,9 @@
 
 /* WGL implementation of SDL OpenGL support */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #ifdef HAVE_OPENGL
 #include "SDL_opengl.h"
 #endif
-#include "SDL_error.h"
 #include "SDL_lowvideo.h"
 #include "SDL_wingl_c.h"
 
--- a/src/video/windib/SDL_dibevents.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/windib/SDL_dibevents.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,10 +22,8 @@
 
 #include "SDL_windows.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_main.h"
 #include "SDL_events.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
--- a/src/video/windib/SDL_dibvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/windib/SDL_dibvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,10 +34,6 @@
 #define CDS_FULLSCREEN	4
 #endif
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_mutex.h"
 #include "SDL_syswm.h"
 #include "SDL_sysvideo.h"
 #include "SDL_sysevents.h"
--- a/src/video/windx5/SDL_dx5events.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/windx5/SDL_dx5events.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,11 +24,9 @@
 
 #include "directx.h"
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
+#include "SDL_main.h"
 #include "SDL_events.h"
 #include "SDL_video.h"
-#include "SDL_error.h"
 #include "SDL_syswm.h"
 #include "SDL_sysevents.h"
 #include "SDL_events_c.h"
--- a/src/video/windx5/SDL_dx5video.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/windx5/SDL_dx5video.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,7 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_windows.h"
 #include "directx.h"
 
 /* Not yet in the mingw32 cross-compile headers */
@@ -28,9 +27,6 @@
 #define CDS_FULLSCREEN	4
 #endif
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_events.h"
 #include "SDL_syswm.h"
--- a/src/video/windx5/SDL_dx5yuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/windx5/SDL_dx5yuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -22,9 +22,6 @@
 
 /* This is the DirectDraw implementation of YUV video overlays */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_dx5yuv_c.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/wscons/SDL_wsconsmouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wscons/SDL_wsconsmouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include <stdio.h>
-
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 
--- a/src/video/wscons/SDL_wsconsvideo.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/wscons/SDL_wsconsvideo.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,10 +28,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/x11/SDL_x11dga.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11dga.c	Fri Feb 10 06:48:43 2006 +0000
@@ -25,8 +25,6 @@
    There will be a completely separate DGA driver that is fullscreen-only.
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_video.h"
 #include "SDL_cursor_c.h"
 #include "SDL_x11dga_c.h"
--- a/src/video/x11/SDL_x11events.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11events.c	Fri Feb 10 06:48:43 2006 +0000
@@ -33,8 +33,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "SDL.h"
-#include "SDL_string.h"
 #include "SDL_syswm.h"
 #include "SDL_sysevents.h"
 #include "SDL_sysvideo.h"
--- a/src/video/x11/SDL_x11gl.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11gl.c	Fri Feb 10 06:48:43 2006 +0000
@@ -20,9 +20,6 @@
     slouken@libsdl.org
 */
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_x11video.h"
 #include "SDL_events_c.h"
 #include "SDL_x11dga_c.h"
--- a/src/video/x11/SDL_x11image.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11image.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,9 +23,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_endian.h"
 #include "SDL_events_c.h"
 #include "SDL_x11image_c.h"
--- a/src/video/x11/SDL_x11modes.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11modes.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,10 +24,7 @@
 
 #include <stdio.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_timer.h"
-#include "SDL_error.h"
 #include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_x11video.h"
--- a/src/video/x11/SDL_x11mouse.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11mouse.c	Fri Feb 10 06:48:43 2006 +0000
@@ -23,9 +23,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_mouse.h"
 #include "SDL_events_c.h"
 #include "SDL_cursor_c.h"
--- a/src/video/x11/SDL_x11video.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11video.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,15 +34,11 @@
 #include <sys/fcntl.h>
 #endif
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
+#include "SDL_endian.h"
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
-#include "SDL_endian.h"
 #include "SDL_sysvideo.h"
 #include "SDL_pixels_c.h"
 #include "SDL_events_c.h"
--- a/src/video/x11/SDL_x11wm.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11wm.c	Fri Feb 10 06:48:43 2006 +0000
@@ -24,9 +24,6 @@
 #include <X11/Xutil.h>
 
 #include "SDL_version.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_timer.h"
 #include "SDL_video.h"
 #include "SDL_syswm.h"
--- a/src/video/x11/SDL_x11yuv.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/x11/SDL_x11yuv.c	Fri Feb 10 06:48:43 2006 +0000
@@ -32,9 +32,6 @@
 #endif
 #include <Xext/extensions/Xvlib.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_x11yuv_c.h"
 #include "SDL_yuvfuncs.h"
--- a/src/video/xbios/SDL_xbios.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/xbios/SDL_xbios.c	Fri Feb 10 06:48:43 2006 +0000
@@ -34,10 +34,6 @@
 #include <mint/osbind.h>
 #include <mint/falcon.h>
 
-#include "SDL.h"
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
-#include "SDL_error.h"
 #include "SDL_video.h"
 #include "SDL_mouse.h"
 #include "SDL_sysvideo.h"
--- a/src/video/xbios/SDL_xbios.h	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/xbios/SDL_xbios.h	Fri Feb 10 06:48:43 2006 +0000
@@ -23,7 +23,7 @@
 #ifndef _SDL_xbios_h
 #define _SDL_xbios_h
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
 #include "SDL_sysvideo.h"
 
 /* Hidden "this" pointer for the video functions */
--- a/src/video/xbios/SDL_xbios_centscreen.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/xbios/SDL_xbios_centscreen.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,8 +28,6 @@
 
 #include <mint/falcon.h>
 
-#include "SDL_stdlib.h"
-#include "SDL_string.h"
 #include "SDL_xbios.h"
 #include "SDL_xbios_centscreen.h"
 
--- a/src/video/xbios/SDL_xbios_sb3.c	Fri Feb 10 03:21:39 2006 +0000
+++ b/src/video/xbios/SDL_xbios_sb3.c	Fri Feb 10 06:48:43 2006 +0000
@@ -28,7 +28,7 @@
 
 /*--- Includes ---*/
 
-#include "SDL_stdlib.h"
+#include "SDL_stdinc.h"
 #include "SDL_xbios.h"
 #include "SDL_xbios_sb3.h"