More header massaging... works great on Windows. ;-)
authorSam Lantinga <slouken@libsdl.org>
Fri, 10 Feb 2006 06:48:43 +0000
changeset 1358c71e05b4dc2e
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
     1.1 --- a/include/SDL.h	Fri Feb 10 03:21:39 2006 +0000
     1.2 +++ b/include/SDL.h	Fri Feb 10 06:48:43 2006 +0000
     1.3 @@ -26,16 +26,18 @@
     1.4  #define _SDL_H
     1.5  
     1.6  #include "SDL_stdinc.h"
     1.7 -#include "SDL_error.h"
     1.8 -#include "SDL_rwops.h"
     1.9 -#include "SDL_timer.h"
    1.10  #include "SDL_audio.h"
    1.11  #include "SDL_cdrom.h"
    1.12 -#include "SDL_joystick.h"
    1.13 +#include "SDL_cpuinfo.h"
    1.14 +#include "SDL_endian.h"
    1.15 +#include "SDL_error.h"
    1.16  #include "SDL_events.h"
    1.17 +#include "SDL_loadso.h"
    1.18 +#include "SDL_mutex.h"
    1.19 +#include "SDL_rwops.h"
    1.20 +#include "SDL_thread.h"
    1.21 +#include "SDL_timer.h"
    1.22  #include "SDL_video.h"
    1.23 -#include "SDL_loadso.h"
    1.24 -#include "SDL_byteorder.h"
    1.25  #include "SDL_version.h"
    1.26  
    1.27  #include "begin_code.h"
     2.1 --- a/include/SDL_active.h	Fri Feb 10 03:21:39 2006 +0000
     2.2 +++ b/include/SDL_active.h	Fri Feb 10 06:48:43 2006 +0000
     2.3 @@ -26,6 +26,7 @@
     2.4  #define _SDL_active_h
     2.5  
     2.6  #include "SDL_stdinc.h"
     2.7 +#include "SDL_error.h"
     2.8  
     2.9  #include "begin_code.h"
    2.10  /* Set up for C function definitions, even when using C++ */
     3.1 --- a/include/SDL_audio.h	Fri Feb 10 03:21:39 2006 +0000
     3.2 +++ b/include/SDL_audio.h	Fri Feb 10 06:48:43 2006 +0000
     3.3 @@ -27,8 +27,10 @@
     3.4  
     3.5  #include "SDL_stdinc.h"
     3.6  #include "SDL_error.h"
     3.7 +#include "SDL_endian.h"
     3.8 +#include "SDL_mutex.h"
     3.9 +#include "SDL_thread.h"
    3.10  #include "SDL_rwops.h"
    3.11 -#include "SDL_endian.h"
    3.12  
    3.13  #include "begin_code.h"
    3.14  /* Set up for C function definitions, even when using C++ */
     4.1 --- a/include/SDL_cdrom.h	Fri Feb 10 03:21:39 2006 +0000
     4.2 +++ b/include/SDL_cdrom.h	Fri Feb 10 06:48:43 2006 +0000
     4.3 @@ -26,6 +26,7 @@
     4.4  #define _SDL_cdrom_h
     4.5  
     4.6  #include "SDL_stdinc.h"
     4.7 +#include "SDL_error.h"
     4.8  
     4.9  #include "begin_code.h"
    4.10  /* Set up for C function definitions, even when using C++ */
     5.1 --- a/include/SDL_config.h	Fri Feb 10 03:21:39 2006 +0000
     5.2 +++ b/include/SDL_config.h	Fri Feb 10 06:48:43 2006 +0000
     5.3 @@ -1,4 +1,3 @@
     5.4 -/* include/SDL_config.h.  Generated by configure.  */
     5.5  /*
     5.6      SDL - Simple DirectMedia Layer
     5.7      Copyright (C) 1997-2006 Sam Lantinga
     5.8 @@ -24,111 +23,17 @@
     5.9  #ifndef _SDL_config_h
    5.10  #define _SDL_config_h
    5.11  
    5.12 -/* This is a set of defines to configure the SDL features */
    5.13 +/* This is the minimal configuration that can be used to build SDL */
    5.14  
    5.15 -/* C language features */
    5.16 -/* #undef const */
    5.17 -/* #undef inline */
    5.18 -/* #undef volatile */
    5.19 +#include <stdarg.h>
    5.20  
    5.21 -/* C datatypes */
    5.22 -/* #undef size_t */
    5.23 -/* #undef int8_t */
    5.24 -/* #undef uint8_t */
    5.25 -/* #undef int16_t */
    5.26 -/* #undef uint16_t */
    5.27 -/* #undef int32_t */
    5.28 -/* #undef uint32_t */
    5.29 -#define SDL_HAS_64BIT_TYPE 1
    5.30 -/* #undef int64_t */
    5.31 -/* #undef uint64_t */
    5.32 -/* #undef uintptr_t */
    5.33 -
    5.34 -/* Endianness */
    5.35 -#define SDL_BYTEORDER 1234
    5.36 -
    5.37 -/* Comment this if you want to build without any C library requirements */
    5.38 -#define HAVE_LIBC 1
    5.39 -#ifdef HAVE_LIBC
    5.40 -
    5.41 -/* Useful headers */
    5.42 -#define HAVE_SYS_TYPES_H 1
    5.43 -#define HAVE_STDIO_H 1
    5.44 -#define STDC_HEADERS 1
    5.45 -#define HAVE_STDLIB_H 1
    5.46 -#define HAVE_STDARG_H 1
    5.47 -#define HAVE_MALLOC_H 1
    5.48 -#define HAVE_MEMORY_H 1
    5.49 -#define HAVE_STRING_H 1
    5.50 -#define HAVE_STRINGS_H 1
    5.51 -#define HAVE_INTTYPES_H 1
    5.52 -#define HAVE_STDINT_H 1
    5.53 -#define HAVE_CTYPE_H 1
    5.54 -#define HAVE_SIGNAL_H 1
    5.55 -
    5.56 -/* C library functions */
    5.57 -#define HAVE_MALLOC 1
    5.58 -#define HAVE_CALLOC 1
    5.59 -#define HAVE_REALLOC 1
    5.60 -#define HAVE_FREE 1
    5.61 -#define HAVE_ALLOCA 1
    5.62 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
    5.63 -#define HAVE_GETENV 1
    5.64 -#define HAVE_PUTENV 1
    5.65 -#define HAVE_UNSETENV 1
    5.66 -#endif
    5.67 -#define HAVE_QSORT 1
    5.68 -#define HAVE_ABS 1
    5.69 -#define HAVE_BCOPY 1
    5.70 -#define HAVE_MEMSET 1
    5.71 -#define HAVE_MEMCPY 1
    5.72 -#define HAVE_MEMMOVE 1
    5.73 -#define HAVE_MEMCMP 1
    5.74 -#define HAVE_STRLEN 1
    5.75 -#define HAVE_STRCPY 1
    5.76 -#define HAVE_STRNCPY 1
    5.77 -#define HAVE_STRCAT 1
    5.78 -#define HAVE_STRNCAT 1
    5.79 -#define HAVE_STRDUP 1
    5.80 -/* #undef HAVE__STRREV */
    5.81 -/* #undef HAVE__STRUPR */
    5.82 -/* #undef HAVE__STRLWR */
    5.83 -/* #undef HAVE_INDEX */
    5.84 -/* #undef HAVE_RINDEX */
    5.85 -#define HAVE_STRCHR 1
    5.86 -#define HAVE_STRRCHR 1
    5.87 -#define HAVE_STRSTR 1
    5.88 -/* #undef HAVE_ITOA */
    5.89 -/* #undef HAVE__LTOA */
    5.90 -/* #undef HAVE__UITOA */
    5.91 -/* #undef HAVE__ULTOA */
    5.92 -#define HAVE_STRTOL 1
    5.93 -/* #undef HAVE__I64TOA */
    5.94 -/* #undef HAVE__UI64TOA */
    5.95 -#define HAVE_STRTOLL 1
    5.96 -#define HAVE_STRTOD 1
    5.97 -#define HAVE_ATOI 1
    5.98 -#define HAVE_ATOF 1
    5.99 -#define HAVE_STRCMP 1
   5.100 -#define HAVE_STRNCMP 1
   5.101 -/* #undef HAVE_STRICMP */
   5.102 -#define HAVE_STRCASECMP 1
   5.103 -#define HAVE_SSCANF 1
   5.104 -#define HAVE_SNPRINTF 1
   5.105 -/* #undef HAVE_VSNPRINTF */
   5.106 -
   5.107 -#endif /* HAVE_LIBC */
   5.108 -
   5.109 -
   5.110 -/* Allow disabling of core subsystems */
   5.111 -/* #undef DISABLE_AUDIO */
   5.112 -/* #undef DISABLE_VIDEO */
   5.113 -/* #undef DISABLE_EVENTS */
   5.114 -/* #undef DISABLE_JOYSTICK */
   5.115 -/* #undef DISABLE_CDROM */
   5.116 -/* #undef DISABLE_THREADS */
   5.117 -/* #undef DISABLE_TIMERS */
   5.118 -/* #undef DISABLE_FILE */
   5.119 -/* #undef DISABLE_CPUINFO */
   5.120 +typedef signed char int8_t;
   5.121 +typedef unsigned char uint8_t;
   5.122 +typedef signed short int16_t;
   5.123 +typedef unsigned short uint16_t;
   5.124 +typedef signed int int32_t;
   5.125 +typedef unsigned int uint32_t;
   5.126 +typedef unsigned int size_t;
   5.127 +typedef unsigned long uintptr_t;
   5.128  
   5.129  #endif /* _SDL_config_h */
     6.1 --- a/include/SDL_events.h	Fri Feb 10 03:21:39 2006 +0000
     6.2 +++ b/include/SDL_events.h	Fri Feb 10 06:48:43 2006 +0000
     6.3 @@ -26,6 +26,7 @@
     6.4  #define _SDL_events_h
     6.5  
     6.6  #include "SDL_stdinc.h"
     6.7 +#include "SDL_error.h"
     6.8  #include "SDL_active.h"
     6.9  #include "SDL_keyboard.h"
    6.10  #include "SDL_mouse.h"
     7.1 --- a/include/SDL_joystick.h	Fri Feb 10 03:21:39 2006 +0000
     7.2 +++ b/include/SDL_joystick.h	Fri Feb 10 06:48:43 2006 +0000
     7.3 @@ -26,6 +26,7 @@
     7.4  #define _SDL_joystick_h
     7.5  
     7.6  #include "SDL_stdinc.h"
     7.7 +#include "SDL_error.h"
     7.8  
     7.9  #include "begin_code.h"
    7.10  /* Set up for C function definitions, even when using C++ */
     8.1 --- a/include/SDL_keyboard.h	Fri Feb 10 03:21:39 2006 +0000
     8.2 +++ b/include/SDL_keyboard.h	Fri Feb 10 06:48:43 2006 +0000
     8.3 @@ -26,6 +26,7 @@
     8.4  #define _SDL_keyboard_h
     8.5  
     8.6  #include "SDL_stdinc.h"
     8.7 +#include "SDL_error.h"
     8.8  #include "SDL_keysym.h"
     8.9  
    8.10  #include "begin_code.h"
     9.1 --- a/include/SDL_loadso.h	Fri Feb 10 03:21:39 2006 +0000
     9.2 +++ b/include/SDL_loadso.h	Fri Feb 10 06:48:43 2006 +0000
     9.3 @@ -42,6 +42,7 @@
     9.4  #define _SDL_loadso_h
     9.5  
     9.6  #include "SDL_stdinc.h"
     9.7 +#include "SDL_error.h"
     9.8  
     9.9  #include "begin_code.h"
    9.10  /* Set up for C function definitions, even when using C++ */
    10.1 --- a/include/SDL_mouse.h	Fri Feb 10 03:21:39 2006 +0000
    10.2 +++ b/include/SDL_mouse.h	Fri Feb 10 06:48:43 2006 +0000
    10.3 @@ -26,6 +26,7 @@
    10.4  #define _SDL_mouse_h
    10.5  
    10.6  #include "SDL_stdinc.h"
    10.7 +#include "SDL_error.h"
    10.8  #include "SDL_video.h"
    10.9  
   10.10  #include "begin_code.h"
    11.1 --- a/include/SDL_mutex.h	Fri Feb 10 03:21:39 2006 +0000
    11.2 +++ b/include/SDL_mutex.h	Fri Feb 10 06:48:43 2006 +0000
    11.3 @@ -29,6 +29,7 @@
    11.4  */
    11.5  
    11.6  #include "SDL_stdinc.h"
    11.7 +#include "SDL_error.h"
    11.8  
    11.9  #include "begin_code.h"
   11.10  /* Set up for C function definitions, even when using C++ */
    12.1 --- a/include/SDL_quit.h	Fri Feb 10 03:21:39 2006 +0000
    12.2 +++ b/include/SDL_quit.h	Fri Feb 10 06:48:43 2006 +0000
    12.3 @@ -26,6 +26,7 @@
    12.4  #define _SDL_quit_h
    12.5  
    12.6  #include "SDL_stdinc.h"
    12.7 +#include "SDL_error.h"
    12.8  
    12.9  /* 
   12.10    An SDL_QUITEVENT is generated when the user tries to close the application
    13.1 --- a/include/SDL_rwops.h	Fri Feb 10 03:21:39 2006 +0000
    13.2 +++ b/include/SDL_rwops.h	Fri Feb 10 06:48:43 2006 +0000
    13.3 @@ -28,6 +28,7 @@
    13.4  #define _SDL_RWops_h
    13.5  
    13.6  #include "SDL_stdinc.h"
    13.7 +#include "SDL_error.h"
    13.8  
    13.9  #include "begin_code.h"
   13.10  /* Set up for C function definitions, even when using C++ */
    14.1 --- a/include/SDL_stdlib.h	Fri Feb 10 03:21:39 2006 +0000
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,23 +0,0 @@
    14.4 -/*
    14.5 -    SDL - Simple DirectMedia Layer
    14.6 -    Copyright (C) 1997-2006 Sam Lantinga
    14.7 -
    14.8 -    This library is free software; you can redistribute it and/or
    14.9 -    modify it under the terms of the GNU Lesser General Public
   14.10 -    License as published by the Free Software Foundation; either
   14.11 -    version 2.1 of the License, or (at your option) any later version.
   14.12 -
   14.13 -    This library is distributed in the hope that it will be useful,
   14.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   14.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   14.16 -    Lesser General Public License for more details.
   14.17 -
   14.18 -    You should have received a copy of the GNU Lesser General Public
   14.19 -    License along with this library; if not, write to the Free Software
   14.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   14.21 -
   14.22 -    Sam Lantinga
   14.23 -    slouken@libsdl.org
   14.24 -*/
   14.25 -
   14.26 -#include "SDL_stdinc.h"
    15.1 --- a/include/SDL_string.h	Fri Feb 10 03:21:39 2006 +0000
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,23 +0,0 @@
    15.4 -/*
    15.5 -    SDL - Simple DirectMedia Layer
    15.6 -    Copyright (C) 1997-2006 Sam Lantinga
    15.7 -
    15.8 -    This library is free software; you can redistribute it and/or
    15.9 -    modify it under the terms of the GNU Lesser General Public
   15.10 -    License as published by the Free Software Foundation; either
   15.11 -    version 2.1 of the License, or (at your option) any later version.
   15.12 -
   15.13 -    This library is distributed in the hope that it will be useful,
   15.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
   15.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   15.16 -    Lesser General Public License for more details.
   15.17 -
   15.18 -    You should have received a copy of the GNU Lesser General Public
   15.19 -    License along with this library; if not, write to the Free Software
   15.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   15.21 -
   15.22 -    Sam Lantinga
   15.23 -    slouken@libsdl.org
   15.24 -*/
   15.25 -
   15.26 -#include "SDL_stdinc.h"
    16.1 --- a/include/SDL_syswm.h	Fri Feb 10 03:21:39 2006 +0000
    16.2 +++ b/include/SDL_syswm.h	Fri Feb 10 06:48:43 2006 +0000
    16.3 @@ -26,6 +26,7 @@
    16.4  #define _SDL_syswm_h
    16.5  
    16.6  #include "SDL_stdinc.h"
    16.7 +#include "SDL_error.h"
    16.8  #include "SDL_version.h"
    16.9  
   16.10  #include "begin_code.h"
    17.1 --- a/include/SDL_thread.h	Fri Feb 10 03:21:39 2006 +0000
    17.2 +++ b/include/SDL_thread.h	Fri Feb 10 06:48:43 2006 +0000
    17.3 @@ -29,6 +29,7 @@
    17.4  */
    17.5  
    17.6  #include "SDL_stdinc.h"
    17.7 +#include "SDL_error.h"
    17.8  
    17.9  /* Thread synchronization primitives */
   17.10  #include "SDL_mutex.h"
    18.1 --- a/include/SDL_timer.h	Fri Feb 10 03:21:39 2006 +0000
    18.2 +++ b/include/SDL_timer.h	Fri Feb 10 06:48:43 2006 +0000
    18.3 @@ -26,6 +26,7 @@
    18.4  /* Header for the SDL time management routines */
    18.5  
    18.6  #include "SDL_stdinc.h"
    18.7 +#include "SDL_error.h"
    18.8  
    18.9  #include "begin_code.h"
   18.10  /* Set up for C function definitions, even when using C++ */
    19.1 --- a/include/SDL_video.h	Fri Feb 10 03:21:39 2006 +0000
    19.2 +++ b/include/SDL_video.h	Fri Feb 10 06:48:43 2006 +0000
    19.3 @@ -26,7 +26,7 @@
    19.4  #define _SDL_video_h
    19.5  
    19.6  #include "SDL_stdinc.h"
    19.7 -#include "SDL_mutex.h"
    19.8 +#include "SDL_error.h"
    19.9  #include "SDL_rwops.h"
   19.10  
   19.11  #include "begin_code.h"
    20.1 --- a/src/SDL.c	Fri Feb 10 03:21:39 2006 +0000
    20.2 +++ b/src/SDL.c	Fri Feb 10 06:48:43 2006 +0000
    20.3 @@ -27,8 +27,6 @@
    20.4  #endif
    20.5  
    20.6  #include "SDL.h"
    20.7 -#include "SDL_stdlib.h"
    20.8 -#include "SDL_endian.h"
    20.9  #include "SDL_fatal.h"
   20.10  #ifndef DISABLE_VIDEO
   20.11  #include "SDL_leaks.h"
    21.1 --- a/src/SDL_error.c	Fri Feb 10 03:21:39 2006 +0000
    21.2 +++ b/src/SDL_error.c	Fri Feb 10 06:48:43 2006 +0000
    21.3 @@ -22,9 +22,6 @@
    21.4  
    21.5  /* Simple error handling in SDL */
    21.6  
    21.7 -#include "SDL_stdlib.h"
    21.8 -#include "SDL_string.h"
    21.9 -#include "SDL_types.h"
   21.10  #include "SDL_error.h"
   21.11  #include "SDL_error_c.h"
   21.12  #ifndef DISABLE_THREADS
    22.1 --- a/src/audio/SDL_audio.c	Fri Feb 10 03:21:39 2006 +0000
    22.2 +++ b/src/audio/SDL_audio.c	Fri Feb 10 06:48:43 2006 +0000
    22.3 @@ -23,10 +23,6 @@
    22.4  /* Allow access to a raw mixing buffer */
    22.5  
    22.6  #include "SDL.h"
    22.7 -#include "SDL_audio.h"
    22.8 -#include "SDL_timer.h"
    22.9 -#include "SDL_error.h"
   22.10 -#include "SDL_string.h"
   22.11  #include "SDL_audio_c.h"
   22.12  #include "SDL_audiomem.h"
   22.13  #include "SDL_sysaudio.h"
    23.1 --- a/src/audio/SDL_audiocvt.c	Fri Feb 10 03:21:39 2006 +0000
    23.2 +++ b/src/audio/SDL_audiocvt.c	Fri Feb 10 06:48:43 2006 +0000
    23.3 @@ -22,7 +22,6 @@
    23.4  
    23.5  /* Functions for audio drivers to perform runtime conversion of audio format */
    23.6  
    23.7 -#include "SDL_error.h"
    23.8  #include "SDL_audio.h"
    23.9  
   23.10  
    24.1 --- a/src/audio/SDL_audiodev.c	Fri Feb 10 03:21:39 2006 +0000
    24.2 +++ b/src/audio/SDL_audiodev.c	Fri Feb 10 06:48:43 2006 +0000
    24.3 @@ -28,8 +28,7 @@
    24.4  #include <sys/types.h>
    24.5  #include <sys/stat.h>
    24.6  
    24.7 -#include "SDL_stdlib.h"
    24.8 -#include "SDL_string.h"
    24.9 +#include "SDL_stdinc.h"
   24.10  #include "SDL_audiodev_c.h"
   24.11  
   24.12  #ifndef _PATH_DEV_DSP
   24.13 @@ -103,8 +102,7 @@
   24.14  #include <sys/types.h>
   24.15  #include <sys/stat.h>
   24.16  
   24.17 -#include "SDL_stdlib.h"
   24.18 -#include "SDL_string.h"
   24.19 +#include "SDL_stdinc.h"
   24.20  #include "SDL_audiodev_c.h"
   24.21  
   24.22  #ifndef _PATH_DEV_DSP
    25.1 --- a/src/audio/SDL_audiomem.c	Fri Feb 10 03:21:39 2006 +0000
    25.2 +++ b/src/audio/SDL_audiomem.c	Fri Feb 10 06:48:43 2006 +0000
    25.3 @@ -31,7 +31,7 @@
    25.4  #include <stddef.h>
    25.5  #endif
    25.6  
    25.7 -#include "SDL_stdlib.h"
    25.8 +#include "SDL_stdinc.h"
    25.9  #include "SDL_audiomem.h"
   25.10  
   25.11  /* Allocate memory that will be shared between threads (freed on exit) */
    26.1 --- a/src/audio/SDL_mixer.c	Fri Feb 10 03:21:39 2006 +0000
    26.2 +++ b/src/audio/SDL_mixer.c	Fri Feb 10 06:48:43 2006 +0000
    26.3 @@ -22,12 +22,10 @@
    26.4  
    26.5  /* This provides the default mixing callback for the SDL audio routines */
    26.6  
    26.7 +#include "SDL_cpuinfo.h"
    26.8 +#include "SDL_timer.h"
    26.9  #include "SDL_audio.h"
   26.10 -#include "SDL_mutex.h"
   26.11 -#include "SDL_timer.h"
   26.12 -#include "SDL_cpuinfo.h"
   26.13  #include "SDL_sysaudio.h"
   26.14 -#include "SDL_cpuinfo.h"
   26.15  #include "SDL_mixer_MMX.h"
   26.16  #include "SDL_mixer_MMX_VC.h"
   26.17  #include "SDL_mixer_m68k.h"
    27.1 --- a/src/audio/SDL_wave.c	Fri Feb 10 03:21:39 2006 +0000
    27.2 +++ b/src/audio/SDL_wave.c	Fri Feb 10 06:48:43 2006 +0000
    27.3 @@ -24,12 +24,8 @@
    27.4  
    27.5  /* Microsoft WAVE file loading routines */
    27.6  
    27.7 -#include "SDL_stdlib.h"
    27.8 -#include "SDL_string.h"
    27.9 -#include "SDL_error.h"
   27.10  #include "SDL_audio.h"
   27.11  #include "SDL_wave.h"
   27.12 -#include "SDL_endian.h"
   27.13  
   27.14  
   27.15  static int ReadChunk(SDL_RWops *src, Chunk *chunk);
    28.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Fri Feb 10 03:21:39 2006 +0000
    28.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Fri Feb 10 06:48:43 2006 +0000
    28.3 @@ -27,10 +27,7 @@
    28.4  #include <sys/types.h>
    28.5  #include <signal.h>	/* For kill() */
    28.6  
    28.7 -#include "SDL_stdlib.h"
    28.8 -#include "SDL_string.h"
    28.9  #include "SDL_audio.h"
   28.10 -#include "SDL_error.h"
   28.11  #include "SDL_audiomem.h"
   28.12  #include "SDL_audio_c.h"
   28.13  #include "SDL_timer.h"
    29.1 --- a/src/audio/amigaos/SDL_ahiaudio.c	Fri Feb 10 03:21:39 2006 +0000
    29.2 +++ b/src/audio/amigaos/SDL_ahiaudio.c	Fri Feb 10 06:48:43 2006 +0000
    29.3 @@ -22,9 +22,6 @@
    29.4  
    29.5  /* Allow access to a raw mixing buffer (for AmigaOS) */
    29.6  
    29.7 -#include "SDL_stdlib.h"
    29.8 -#include "SDL_string.h"
    29.9 -#include "SDL_endian.h"
   29.10  #include "SDL_audio.h"
   29.11  #include "SDL_audiomem.h"
   29.12  #include "SDL_audio_c.h"
    30.1 --- a/src/audio/arts/SDL_artsaudio.c	Fri Feb 10 03:21:39 2006 +0000
    30.2 +++ b/src/audio/arts/SDL_artsaudio.c	Fri Feb 10 06:48:43 2006 +0000
    30.3 @@ -22,13 +22,10 @@
    30.4  
    30.5  /* Allow access to a raw mixing buffer */
    30.6  
    30.7 -#include "SDL_stdlib.h"
    30.8 -#include "SDL_string.h"
    30.9 +#include "SDL_timer.h"
   30.10  #include "SDL_audio.h"
   30.11 -#include "SDL_error.h"
   30.12  #include "SDL_audiomem.h"
   30.13  #include "SDL_audio_c.h"
   30.14 -#include "SDL_timer.h"
   30.15  #include "SDL_audiodev_c.h"
   30.16  #include "SDL_artsaudio.h"
   30.17  
    31.1 --- a/src/audio/baudio/SDL_beaudio.cc	Fri Feb 10 03:21:39 2006 +0000
    31.2 +++ b/src/audio/baudio/SDL_beaudio.cc	Fri Feb 10 06:48:43 2006 +0000
    31.3 @@ -28,8 +28,6 @@
    31.4  
    31.5  extern "C" {
    31.6  
    31.7 -#include "SDL_stdlib.h"
    31.8 -#include "SDL_string.h"
    31.9  #include "SDL_audio.h"
   31.10  #include "SDL_audio_c.h"
   31.11  #include "SDL_sysaudio.h"
    32.1 --- a/src/audio/dart/SDL_dart.c	Fri Feb 10 03:21:39 2006 +0000
    32.2 +++ b/src/audio/dart/SDL_dart.c	Fri Feb 10 06:48:43 2006 +0000
    32.3 @@ -22,10 +22,6 @@
    32.4  
    32.5  /* Allow access to a raw mixing buffer */
    32.6  
    32.7 -#include "SDL_stdlib.h"
    32.8 -#include "SDL_string.h"
    32.9 -#include "SDL_types.h"
   32.10 -#include "SDL_error.h"
   32.11  #include "SDL_timer.h"
   32.12  #include "SDL_audio.h"
   32.13  #include "SDL_audio_c.h"
    33.1 --- a/src/audio/dc/SDL_dcaudio.c	Fri Feb 10 03:21:39 2006 +0000
    33.2 +++ b/src/audio/dc/SDL_dcaudio.c	Fri Feb 10 06:48:43 2006 +0000
    33.3 @@ -30,13 +30,10 @@
    33.4  #include <fcntl.h>
    33.5  
    33.6  
    33.7 -#include "SDL_stdlib.h"
    33.8 -#include "SDL_string.h"
    33.9 +#include "SDL_timer.h"
   33.10  #include "SDL_audio.h"
   33.11 -#include "SDL_error.h"
   33.12  #include "SDL_audiomem.h"
   33.13  #include "SDL_audio_c.h"
   33.14 -#include "SDL_timer.h"
   33.15  #include "SDL_audiodev_c.h"
   33.16  #include "SDL_dcaudio.h"
   33.17  
    34.1 --- a/src/audio/disk/SDL_diskaudio.c	Fri Feb 10 03:21:39 2006 +0000
    34.2 +++ b/src/audio/disk/SDL_diskaudio.c	Fri Feb 10 06:48:43 2006 +0000
    34.3 @@ -35,13 +35,10 @@
    34.4  #include <fcntl.h>
    34.5  
    34.6  
    34.7 -#include "SDL_stdlib.h"
    34.8 -#include "SDL_string.h"
    34.9 +#include "SDL_timer.h"
   34.10  #include "SDL_audio.h"
   34.11 -#include "SDL_error.h"
   34.12  #include "SDL_audiomem.h"
   34.13  #include "SDL_audio_c.h"
   34.14 -#include "SDL_timer.h"
   34.15  #include "SDL_audiodev_c.h"
   34.16  #include "SDL_diskaudio.h"
   34.17  
    35.1 --- a/src/audio/dma/SDL_dmaaudio.c	Fri Feb 10 03:21:39 2006 +0000
    35.2 +++ b/src/audio/dma/SDL_dmaaudio.c	Fri Feb 10 06:48:43 2006 +0000
    35.3 @@ -45,13 +45,10 @@
    35.4  #define MAP_FAILED	((Uint8 *)-1)
    35.5  #endif
    35.6  
    35.7 -#include "SDL_stdlib.h"
    35.8 -#include "SDL_string.h"
    35.9 +#include "SDL_timer.h"
   35.10  #include "SDL_audio.h"
   35.11 -#include "SDL_error.h"
   35.12  #include "SDL_audiomem.h"
   35.13  #include "SDL_audio_c.h"
   35.14 -#include "SDL_timer.h"
   35.15  #include "SDL_audiodev_c.h"
   35.16  #include "SDL_dmaaudio.h"
   35.17  
    36.1 --- a/src/audio/dmedia/SDL_irixaudio.c	Fri Feb 10 03:21:39 2006 +0000
    36.2 +++ b/src/audio/dmedia/SDL_irixaudio.c	Fri Feb 10 06:48:43 2006 +0000
    36.3 @@ -23,9 +23,6 @@
    36.4  /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
    36.5  /* patch for IRIX 5 by Georg Schwarz 18/07/2004 */
    36.6  
    36.7 -#include "SDL_stdlib.h"
    36.8 -#include "SDL_string.h"
    36.9 -#include "SDL_endian.h"
   36.10  #include "SDL_timer.h"
   36.11  #include "SDL_audio.h"
   36.12  #include "SDL_audiomem.h"
    37.1 --- a/src/audio/dsp/SDL_dspaudio.c	Fri Feb 10 03:21:39 2006 +0000
    37.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Fri Feb 10 06:48:43 2006 +0000
    37.3 @@ -42,13 +42,10 @@
    37.4  #include <sys/soundcard.h>
    37.5  #endif
    37.6  
    37.7 -#include "SDL_stdlib.h"
    37.8 -#include "SDL_string.h"
    37.9 +#include "SDL_timer.h"
   37.10  #include "SDL_audio.h"
   37.11 -#include "SDL_error.h"
   37.12  #include "SDL_audiomem.h"
   37.13  #include "SDL_audio_c.h"
   37.14 -#include "SDL_timer.h"
   37.15  #include "SDL_audiodev_c.h"
   37.16  #include "SDL_dspaudio.h"
   37.17  
    38.1 --- a/src/audio/esd/SDL_esdaudio.c	Fri Feb 10 03:21:39 2006 +0000
    38.2 +++ b/src/audio/esd/SDL_esdaudio.c	Fri Feb 10 06:48:43 2006 +0000
    38.3 @@ -28,13 +28,10 @@
    38.4  
    38.5  #include <esd.h>
    38.6  
    38.7 -#include "SDL_stdlib.h"
    38.8 -#include "SDL_string.h"
    38.9 +#include "SDL_timer.h"
   38.10  #include "SDL_audio.h"
   38.11 -#include "SDL_error.h"
   38.12  #include "SDL_audiomem.h"
   38.13  #include "SDL_audio_c.h"
   38.14 -#include "SDL_timer.h"
   38.15  #include "SDL_audiodev_c.h"
   38.16  #include "SDL_esdaudio.h"
   38.17  
    39.1 --- a/src/audio/macosx/SDL_coreaudio.c	Fri Feb 10 03:21:39 2006 +0000
    39.2 +++ b/src/audio/macosx/SDL_coreaudio.c	Fri Feb 10 06:48:43 2006 +0000
    39.3 @@ -22,9 +22,6 @@
    39.4  
    39.5  #include <AudioUnit/AudioUnit.h>
    39.6  
    39.7 -#include "SDL_stdlib.h"
    39.8 -#include "SDL_string.h"
    39.9 -#include "SDL_endian.h"
   39.10  #include "SDL_audio.h"
   39.11  #include "SDL_audio_c.h"
   39.12  #include "SDL_audiomem.h"
    40.1 --- a/src/audio/macrom/SDL_romaudio.c	Fri Feb 10 03:21:39 2006 +0000
    40.2 +++ b/src/audio/macrom/SDL_romaudio.c	Fri Feb 10 06:48:43 2006 +0000
    40.3 @@ -39,9 +39,6 @@
    40.4  #endif
    40.5  #endif
    40.6  
    40.7 -#include "SDL_stdlib.h"
    40.8 -#include "SDL_string.h"
    40.9 -#include "SDL_endian.h"
   40.10  #include "SDL_audio.h"
   40.11  #include "SDL_audio_c.h"
   40.12  #include "SDL_audiomem.h"
    41.1 --- a/src/audio/mint/SDL_mintaudio.c	Fri Feb 10 03:21:39 2006 +0000
    41.2 +++ b/src/audio/mint/SDL_mintaudio.c	Fri Feb 10 06:48:43 2006 +0000
    41.3 @@ -32,10 +32,7 @@
    41.4  #include <mint/falcon.h>
    41.5  #include <mint/mintbind.h>
    41.6  
    41.7 -#include "SDL_types.h"
    41.8  #include "SDL_audio.h"
    41.9 -#include "SDL_string.h"
   41.10 -
   41.11  #include "SDL_mintaudio.h"
   41.12  #include "SDL_mintaudio_stfa.h"
   41.13  
    42.1 --- a/src/audio/mint/SDL_mintaudio_dma8.c	Fri Feb 10 03:21:39 2006 +0000
    42.2 +++ b/src/audio/mint/SDL_mintaudio_dma8.c	Fri Feb 10 06:48:43 2006 +0000
    42.3 @@ -32,9 +32,6 @@
    42.4  #include <mint/falcon.h>
    42.5  #include <mint/cookie.h>
    42.6  
    42.7 -#include "SDL_stdlib.h"
    42.8 -#include "SDL_string.h"
    42.9 -#include "SDL_endian.h"
   42.10  #include "SDL_audio.h"
   42.11  #include "SDL_audio_c.h"
   42.12  #include "SDL_audiomem.h"
    43.1 --- a/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Feb 10 03:21:39 2006 +0000
    43.2 +++ b/src/audio/mint/SDL_mintaudio_gsxb.c	Fri Feb 10 06:48:43 2006 +0000
    43.3 @@ -32,9 +32,6 @@
    43.4  #include <mint/falcon.h>
    43.5  #include <mint/cookie.h>
    43.6  
    43.7 -#include "SDL_stdlib.h"
    43.8 -#include "SDL_string.h"
    43.9 -#include "SDL_endian.h"
   43.10  #include "SDL_audio.h"
   43.11  #include "SDL_audio_c.h"
   43.12  #include "SDL_audiomem.h"
    44.1 --- a/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Feb 10 03:21:39 2006 +0000
    44.2 +++ b/src/audio/mint/SDL_mintaudio_mcsn.c	Fri Feb 10 06:48:43 2006 +0000
    44.3 @@ -34,9 +34,6 @@
    44.4  #include <mint/falcon.h>
    44.5  #include <mint/cookie.h>
    44.6  
    44.7 -#include "SDL_stdlib.h"
    44.8 -#include "SDL_string.h"
    44.9 -#include "SDL_endian.h"
   44.10  #include "SDL_audio.h"
   44.11  #include "SDL_audio_c.h"
   44.12  #include "SDL_audiomem.h"
    45.1 --- a/src/audio/mint/SDL_mintaudio_stfa.c	Fri Feb 10 03:21:39 2006 +0000
    45.2 +++ b/src/audio/mint/SDL_mintaudio_stfa.c	Fri Feb 10 06:48:43 2006 +0000
    45.3 @@ -32,9 +32,6 @@
    45.4  #include <mint/falcon.h>
    45.5  #include <mint/cookie.h>
    45.6  
    45.7 -#include "SDL_stdlib.h"
    45.8 -#include "SDL_string.h"
    45.9 -#include "SDL_endian.h"
   45.10  #include "SDL_audio.h"
   45.11  #include "SDL_audio_c.h"
   45.12  #include "SDL_audiomem.h"
    46.1 --- a/src/audio/mint/SDL_mintaudio_xbios.c	Fri Feb 10 03:21:39 2006 +0000
    46.2 +++ b/src/audio/mint/SDL_mintaudio_xbios.c	Fri Feb 10 06:48:43 2006 +0000
    46.3 @@ -35,9 +35,6 @@
    46.4  #include <mint/falcon.h>
    46.5  #include <mint/cookie.h>
    46.6  
    46.7 -#include "SDL_stdlib.h"
    46.8 -#include "SDL_string.h"
    46.9 -#include "SDL_endian.h"
   46.10  #include "SDL_audio.h"
   46.11  #include "SDL_audio_c.h"
   46.12  #include "SDL_audiomem.h"
    47.1 --- a/src/audio/mme/SDL_mmeaudio.c	Fri Feb 10 03:21:39 2006 +0000
    47.2 +++ b/src/audio/mme/SDL_mmeaudio.c	Fri Feb 10 06:48:43 2006 +0000
    47.3 @@ -23,11 +23,8 @@
    47.4  /* Tru64 UNIX MME support */
    47.5  #include <mme_api.h>
    47.6  
    47.7 -#include "SDL_stdlib.h"
    47.8 -#include "SDL_string.h"
    47.9 +#include "SDL_timer.h"
   47.10  #include "SDL_audio.h"
   47.11 -#include "SDL_mutex.h"
   47.12 -#include "SDL_timer.h"
   47.13  #include "SDL_audio_c.h"
   47.14  
   47.15  #include "SDL_mmeaudio.h"
    48.1 --- a/src/audio/nas/SDL_nasaudio.c	Fri Feb 10 03:21:39 2006 +0000
    48.2 +++ b/src/audio/nas/SDL_nasaudio.c	Fri Feb 10 06:48:43 2006 +0000
    48.3 @@ -29,13 +29,10 @@
    48.4  #include <signal.h>
    48.5  #include <unistd.h>
    48.6  
    48.7 -#include "SDL_stdlib.h"
    48.8 -#include "SDL_string.h"
    48.9 +#include "SDL_timer.h"
   48.10  #include "SDL_audio.h"
   48.11 -#include "SDL_error.h"
   48.12  #include "SDL_audiomem.h"
   48.13  #include "SDL_audio_c.h"
   48.14 -#include "SDL_timer.h"
   48.15  #include "SDL_audiodev_c.h"
   48.16  #include "SDL_nasaudio.h"
   48.17  
    49.1 --- a/src/audio/nto/SDL_nto_audio.c	Fri Feb 10 03:21:39 2006 +0000
    49.2 +++ b/src/audio/nto/SDL_nto_audio.c	Fri Feb 10 06:48:43 2006 +0000
    49.3 @@ -31,13 +31,10 @@
    49.4  #include <sys/neutrino.h>
    49.5  #include <sys/asoundlib.h>
    49.6  
    49.7 -#include "SDL_stdlib.h"
    49.8 -#include "SDL_string.h"
    49.9 +#include "SDL_timer.h"
   49.10  #include "SDL_audio.h"
   49.11 -#include "SDL_error.h"
   49.12  #include "SDL_audiomem.h"
   49.13  #include "SDL_audio_c.h"
   49.14 -#include "SDL_timer.h"
   49.15  #include "SDL_nto_audio.h"
   49.16  
   49.17  /* The tag name used by NTO audio */
    50.1 --- a/src/audio/openbsd/SDL_openbsdaudio.c	Fri Feb 10 03:21:39 2006 +0000
    50.2 +++ b/src/audio/openbsd/SDL_openbsdaudio.c	Fri Feb 10 06:48:43 2006 +0000
    50.3 @@ -34,13 +34,10 @@
    50.4  #include <sys/types.h>
    50.5  #include <sys/audioio.h>
    50.6  
    50.7 -#include "SDL_stdlib.h"
    50.8 -#include "SDL_string.h"
    50.9 +#include "SDL_timer.h"
   50.10  #include "SDL_audio.h"
   50.11 -#include "SDL_error.h"
   50.12  #include "SDL_audiomem.h"
   50.13  #include "SDL_audio_c.h"
   50.14 -#include "SDL_timer.h"
   50.15  #include "SDL_audiodev_c.h"
   50.16  #include "SDL_openbsdaudio.h"
   50.17  
    51.1 --- a/src/audio/paudio/SDL_paudio.c	Fri Feb 10 03:21:39 2006 +0000
    51.2 +++ b/src/audio/paudio/SDL_paudio.c	Fri Feb 10 06:48:43 2006 +0000
    51.3 @@ -31,13 +31,10 @@
    51.4  #include <sys/ioctl.h>
    51.5  #include <sys/stat.h>
    51.6  
    51.7 -#include "SDL_stdlib.h"
    51.8 -#include "SDL_string.h"
    51.9 +#include "SDL_timer.h"
   51.10  #include "SDL_audio.h"
   51.11 -#include "SDL_error.h"
   51.12  #include "SDL_audiomem.h"
   51.13  #include "SDL_audio_c.h"
   51.14 -#include "SDL_timer.h"
   51.15  #include "SDL_audiodev_c.h"
   51.16  #include "SDL_paudio.h"
   51.17  
    52.1 --- a/src/audio/sun/SDL_sunaudio.c	Fri Feb 10 03:21:39 2006 +0000
    52.2 +++ b/src/audio/sun/SDL_sunaudio.c	Fri Feb 10 06:48:43 2006 +0000
    52.3 @@ -36,15 +36,12 @@
    52.4  #endif
    52.5  #include <unistd.h>
    52.6  
    52.7 -#include "SDL_stdlib.h"
    52.8 -#include "SDL_string.h"
    52.9 -#include "SDL_endian.h"
   52.10 +#include "SDL_timer.h"
   52.11  #include "SDL_audio.h"
   52.12  #include "SDL_audiomem.h"
   52.13  #include "SDL_audiodev_c.h"
   52.14  #include "SDL_sunaudio.h"
   52.15  #include "SDL_audio_c.h"
   52.16 -#include "SDL_timer.h"
   52.17  
   52.18  /* Open the audio device for playback, and don't block if busy */
   52.19  #define OPEN_FLAGS	(O_WRONLY|O_NONBLOCK)
    53.1 --- a/src/audio/ums/SDL_umsaudio.c	Fri Feb 10 03:21:39 2006 +0000
    53.2 +++ b/src/audio/ums/SDL_umsaudio.c	Fri Feb 10 06:48:43 2006 +0000
    53.3 @@ -33,10 +33,7 @@
    53.4  #include <sys/stat.h>
    53.5  #include <sys/mman.h>
    53.6  
    53.7 -#include "SDL_stdlib.h"
    53.8 -#include "SDL_string.h"
    53.9  #include "SDL_audio.h"
   53.10 -#include "SDL_error.h"
   53.11  #include "SDL_audio_c.h"
   53.12  #include "SDL_audiodev_c.h"
   53.13  #include "SDL_umsaudio.h"
    54.1 --- a/src/audio/windib/SDL_dibaudio.c	Fri Feb 10 03:21:39 2006 +0000
    54.2 +++ b/src/audio/windib/SDL_dibaudio.c	Fri Feb 10 06:48:43 2006 +0000
    54.3 @@ -25,11 +25,8 @@
    54.4  #include "SDL_windows.h"
    54.5  #include <mmsystem.h>
    54.6  
    54.7 -#include "SDL_stdlib.h"
    54.8 -#include "SDL_string.h"
    54.9 +#include "SDL_timer.h"
   54.10  #include "SDL_audio.h"
   54.11 -#include "SDL_mutex.h"
   54.12 -#include "SDL_timer.h"
   54.13  #include "SDL_audio_c.h"
   54.14  #include "SDL_dibaudio.h"
   54.15  #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
    55.1 --- a/src/audio/windx5/SDL_dx5audio.c	Fri Feb 10 03:21:39 2006 +0000
    55.2 +++ b/src/audio/windx5/SDL_dx5audio.c	Fri Feb 10 06:48:43 2006 +0000
    55.3 @@ -22,10 +22,6 @@
    55.4  
    55.5  /* Allow access to a raw mixing buffer */
    55.6  
    55.7 -#include "SDL_stdlib.h"
    55.8 -#include "SDL_string.h"
    55.9 -#include "SDL_types.h"
   55.10 -#include "SDL_error.h"
   55.11  #include "SDL_timer.h"
   55.12  #include "SDL_audio.h"
   55.13  #include "SDL_audio_c.h"
    56.1 --- a/src/cdrom/SDL_cdrom.c	Fri Feb 10 03:21:39 2006 +0000
    56.2 +++ b/src/cdrom/SDL_cdrom.c	Fri Feb 10 06:48:43 2006 +0000
    56.3 @@ -22,9 +22,6 @@
    56.4  
    56.5  /* This is the CD-audio control API for Simple DirectMedia Layer */
    56.6  
    56.7 -#include "SDL_stdlib.h"
    56.8 -#include "SDL_string.h"
    56.9 -#include "SDL_error.h"
   56.10  #include "SDL_cdrom.h"
   56.11  #include "SDL_syscdrom.h"
   56.12  
    57.1 --- a/src/cdrom/aix/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    57.2 +++ b/src/cdrom/aix/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    57.3 @@ -40,9 +40,6 @@
    57.4  #include <fstab.h>
    57.5  #include <sys/scdisk.h>
    57.6  
    57.7 -#include "SDL_stdlib.h"
    57.8 -#include "SDL_string.h"
    57.9 -#include "SDL_error.h"
   57.10  #include "SDL_cdrom.h"
   57.11  #include "SDL_syscdrom.h"
   57.12  
    58.1 --- a/src/cdrom/beos/SDL_syscdrom.cc	Fri Feb 10 03:21:39 2006 +0000
    58.2 +++ b/src/cdrom/beos/SDL_syscdrom.cc	Fri Feb 10 06:48:43 2006 +0000
    58.3 @@ -33,9 +33,6 @@
    58.4  #include <Entry.h>
    58.5  #include <Path.h>
    58.6  
    58.7 -#include "SDL_stdlib.h"
    58.8 -#include "SDL_string.h"
    58.9 -#include "SDL_error.h"
   58.10  #include "SDL_cdrom.h"
   58.11  extern "C" {
   58.12  #include "SDL_syscdrom.h"
    59.1 --- a/src/cdrom/bsdi/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    59.2 +++ b/src/cdrom/bsdi/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    59.3 @@ -37,9 +37,6 @@
    59.4  #include </sys/dev/scsi/scsi.h>
    59.5  #include </sys/dev/scsi/scsi_ioctl.h>
    59.6  
    59.7 -#include "SDL_stdlib.h"
    59.8 -#include "SDL_string.h"
    59.9 -#include "SDL_error.h"
   59.10  #include "SDL_cdrom.h"
   59.11  #include "SDL_syscdrom.h"
   59.12  
    60.1 --- a/src/cdrom/dc/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    60.2 +++ b/src/cdrom/dc/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    60.3 @@ -25,7 +25,6 @@
    60.4  #include <dc/cdrom.h>
    60.5  #include <dc/spu.h>
    60.6  
    60.7 -#include "SDL_error.h"
    60.8  #include "SDL_cdrom.h"
    60.9  #include "SDL_syscdrom.h"
   60.10  
    61.1 --- a/src/cdrom/freebsd/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    61.2 +++ b/src/cdrom/freebsd/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    61.3 @@ -29,9 +29,6 @@
    61.4  #include <unistd.h>
    61.5  #include <sys/cdio.h>
    61.6  
    61.7 -#include "SDL_stdlib.h"
    61.8 -#include "SDL_string.h"
    61.9 -#include "SDL_error.h"
   61.10  #include "SDL_cdrom.h"
   61.11  #include "SDL_syscdrom.h"
   61.12  
    62.1 --- a/src/cdrom/linux/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    62.2 +++ b/src/cdrom/linux/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    62.3 @@ -81,9 +81,6 @@
    62.4  #endif
    62.5  #endif /* USE_MNTENT */
    62.6  
    62.7 -#include "SDL_stdlib.h"
    62.8 -#include "SDL_string.h"
    62.9 -#include "SDL_error.h"
   62.10  #include "SDL_cdrom.h"
   62.11  #include "SDL_syscdrom.h"
   62.12  
    63.1 --- a/src/cdrom/macosx/SDLOSXCAGuard.c	Fri Feb 10 03:21:39 2006 +0000
    63.2 +++ b/src/cdrom/macosx/SDLOSXCAGuard.c	Fri Feb 10 06:48:43 2006 +0000
    63.3 @@ -73,8 +73,7 @@
    63.4  #include <stdlib.h>
    63.5  #include <string.h>
    63.6  */
    63.7 -#include "SDL_stdlib.h"
    63.8 -#include "SDL_string.h"
    63.9 +#include "SDL_stdinc.h"
   63.10  
   63.11  //#define NDEBUG 1
   63.12  /*
    64.1 --- a/src/cdrom/mint/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    64.2 +++ b/src/cdrom/mint/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    64.3 @@ -31,9 +31,7 @@
    64.4  #include <cdromio.h>
    64.5  #include <metados.h>
    64.6  
    64.7 -#include "SDL_error.h"
    64.8  #include "SDL_cdrom.h"
    64.9 -#include "SDL_string.h"
   64.10  #include "SDL_syscdrom.h"
   64.11  
   64.12  /* Some ioctl() errno values which occur when the tray is empty */
    65.1 --- a/src/cdrom/openbsd/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    65.2 +++ b/src/cdrom/openbsd/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    65.3 @@ -31,9 +31,6 @@
    65.4  #include <sys/ioctl.h>
    65.5  #include <sys/cdio.h>
    65.6  
    65.7 -#include "SDL_stdlib.h"
    65.8 -#include "SDL_string.h"
    65.9 -#include "SDL_error.h"
   65.10  #include "SDL_cdrom.h"
   65.11  #include "SDL_syscdrom.h"
   65.12  
    66.1 --- a/src/cdrom/os2/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    66.2 +++ b/src/cdrom/os2/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    66.3 @@ -26,9 +26,6 @@
    66.4  #include <os2.h>
    66.5  #include <os2me.h>
    66.6  
    66.7 -#include "SDL_stdlib.h"
    66.8 -#include "SDL_string.h"
    66.9 -#include "SDL_error.h"
   66.10  #include "SDL_cdrom.h"
   66.11  #include "SDL_syscdrom.h"
   66.12  
    67.1 --- a/src/cdrom/osf/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    67.2 +++ b/src/cdrom/osf/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    67.3 @@ -32,9 +32,6 @@
    67.4  #include <io/cam/rzdisk.h>
    67.5  #include <io/common/devgetinfo.h>
    67.6  
    67.7 -#include "SDL_stdlib.h"
    67.8 -#include "SDL_string.h"
    67.9 -#include "SDL_error.h"
   67.10  #include "SDL_cdrom.h"
   67.11  #include "SDL_syscdrom.h"
   67.12  
    68.1 --- a/src/cdrom/qnx/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    68.2 +++ b/src/cdrom/qnx/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    68.3 @@ -31,11 +31,8 @@
    68.4  #include <sys/cdrom.h>
    68.5  #include <sys/dcmd_cam.h>
    68.6  
    68.7 -#include "SDL_stdlib.h"
    68.8 -#include "SDL_string.h"
    68.9 -#include "SDL_error.h"
   68.10 +#include "SDL_timer.h"
   68.11  #include "SDL_cdrom.h"
   68.12 -#include "SDL_timer.h"
   68.13  #include "SDL_syscdrom.h"
   68.14  
   68.15  /* The maximum number of CD-ROM drives we'll detect */
    69.1 --- a/src/cdrom/win32/SDL_syscdrom.c	Fri Feb 10 03:21:39 2006 +0000
    69.2 +++ b/src/cdrom/win32/SDL_syscdrom.c	Fri Feb 10 06:48:43 2006 +0000
    69.3 @@ -25,9 +25,6 @@
    69.4  #include "SDL_windows.h"
    69.5  #include <mmsystem.h>
    69.6  
    69.7 -#include "SDL_stdlib.h"
    69.8 -#include "SDL_string.h"
    69.9 -#include "SDL_error.h"
   69.10  #include "SDL_cdrom.h"
   69.11  #include "SDL_syscdrom.h"
   69.12  
    70.1 --- a/src/events/SDL_active.c	Fri Feb 10 03:21:39 2006 +0000
    70.2 +++ b/src/events/SDL_active.c	Fri Feb 10 06:48:43 2006 +0000
    70.3 @@ -23,7 +23,6 @@
    70.4  /* Application focus/iconification handling code for SDL */
    70.5  
    70.6  #include "SDL_events.h"
    70.7 -#include "SDL_string.h"
    70.8  #include "SDL_events_c.h"
    70.9  
   70.10  
    71.1 --- a/src/events/SDL_events.c	Fri Feb 10 03:21:39 2006 +0000
    71.2 +++ b/src/events/SDL_events.c	Fri Feb 10 06:48:43 2006 +0000
    71.3 @@ -23,10 +23,6 @@
    71.4  /* General event handling code for SDL */
    71.5  
    71.6  #include "SDL.h"
    71.7 -#include "SDL_thread.h"
    71.8 -#include "SDL_mutex.h"
    71.9 -#include "SDL_events.h"
   71.10 -#include "SDL_string.h"
   71.11  #include "SDL_events_c.h"
   71.12  #include "SDL_timer_c.h"
   71.13  #ifndef DISABLE_JOYSTICK
    72.1 --- a/src/events/SDL_keyboard.c	Fri Feb 10 03:21:39 2006 +0000
    72.2 +++ b/src/events/SDL_keyboard.c	Fri Feb 10 06:48:43 2006 +0000
    72.3 @@ -22,10 +22,8 @@
    72.4  
    72.5  /* General keyboard handling code for SDL */
    72.6  
    72.7 -#include "SDL_error.h"
    72.8 +#include "SDL_timer.h"
    72.9  #include "SDL_events.h"
   72.10 -#include "SDL_timer.h"
   72.11 -#include "SDL_string.h"
   72.12  #include "SDL_events_c.h"
   72.13  #include "SDL_sysevents.h"
   72.14  
    73.1 --- a/src/events/SDL_mouse.c	Fri Feb 10 03:21:39 2006 +0000
    73.2 +++ b/src/events/SDL_mouse.c	Fri Feb 10 06:48:43 2006 +0000
    73.3 @@ -23,7 +23,6 @@
    73.4  /* General mouse handling code for SDL */
    73.5  
    73.6  #include "SDL_events.h"
    73.7 -#include "SDL_string.h"
    73.8  #include "SDL_events_c.h"
    73.9  #include "SDL_cursor_c.h"
   73.10  #include "SDL_sysvideo.h"
    74.1 --- a/src/file/SDL_rwops.c	Fri Feb 10 03:21:39 2006 +0000
    74.2 +++ b/src/file/SDL_rwops.c	Fri Feb 10 06:48:43 2006 +0000
    74.3 @@ -24,7 +24,6 @@
    74.4     data sources.  It can easily be extended to files, memory, etc.
    74.5  */
    74.6  
    74.7 -#include "SDL_error.h"
    74.8  #include "SDL_endian.h"
    74.9  #include "SDL_rwops.h"
   74.10  
    75.1 --- a/src/joystick/SDL_joystick.c	Fri Feb 10 03:21:39 2006 +0000
    75.2 +++ b/src/joystick/SDL_joystick.c	Fri Feb 10 06:48:43 2006 +0000
    75.3 @@ -22,9 +22,6 @@
    75.4  
    75.5  /* This is the joystick API for Simple DirectMedia Layer */
    75.6  
    75.7 -#include "SDL_stdlib.h"
    75.8 -#include "SDL_string.h"
    75.9 -#include "SDL_error.h"
   75.10  #include "SDL_events.h"
   75.11  #ifndef DISABLE_EVENTS
   75.12  #include "SDL_events_c.h"
    76.1 --- a/src/joystick/amigaos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    76.2 +++ b/src/joystick/amigaos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    76.3 @@ -38,8 +38,6 @@
    76.4  extern struct ExecBase *SysBase;
    76.5  extern struct GfxBase *GfxBase;
    76.6  
    76.7 -#include "SDL_stdlib.h"
    76.8 -#include "SDL_error.h"
    76.9  #include "SDL_joystick.h"
   76.10  #include "SDL_sysjoystick.h"
   76.11  #include "SDL_joystick_c.h"
    77.1 --- a/src/joystick/beos/SDL_bejoystick.cc	Fri Feb 10 03:21:39 2006 +0000
    77.2 +++ b/src/joystick/beos/SDL_bejoystick.cc	Fri Feb 10 06:48:43 2006 +0000
    77.3 @@ -27,9 +27,6 @@
    77.4  
    77.5  extern "C" {
    77.6  
    77.7 -#include "SDL_stdlib.h"
    77.8 -#include "SDL_string.h"
    77.9 -#include "SDL_error.h"
   77.10  #include "SDL_joystick.h"
   77.11  #include "SDL_sysjoystick.h"
   77.12  #include "SDL_joystick_c.h"
    78.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    78.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    78.3 @@ -56,9 +56,6 @@
    78.4  #include <machine/joystick.h>
    78.5  #endif
    78.6  
    78.7 -#include "SDL_stdlib.h"
    78.8 -#include "SDL_string.h"
    78.9 -#include "SDL_error.h"
   78.10  #include "SDL_joystick.h"
   78.11  #include "SDL_sysjoystick.h"
   78.12  #include "SDL_joystick_c.h"
    79.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    79.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    79.3 @@ -41,7 +41,6 @@
    79.4  #include <CoreFoundation/CoreFoundation.h>
    79.5  #include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
    79.6  
    79.7 -#include "SDL_error.h"
    79.8  #include "SDL_joystick.h"
    79.9  #include "SDL_sysjoystick.h"
   79.10  #include "SDL_joystick_c.h"
    80.1 --- a/src/joystick/dc/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    80.2 +++ b/src/joystick/dc/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    80.3 @@ -22,9 +22,6 @@
    80.4  
    80.5  /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
    80.6  
    80.7 -#include "SDL_stdlib.h"
    80.8 -#include "SDL_string.h"
    80.9 -#include "SDL_error.h"
   80.10  #include "SDL_joystick.h"
   80.11  #include "SDL_sysjoystick.h"
   80.12  #include "SDL_joystick_c.h"
    81.1 --- a/src/joystick/dummy/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    81.2 +++ b/src/joystick/dummy/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    81.3 @@ -22,9 +22,6 @@
    81.4  
    81.5  /* This is the system specific header for the SDL joystick API */
    81.6  
    81.7 -#include <stdio.h>		/* For the definition of NULL */
    81.8 -
    81.9 -#include "SDL_error.h"
   81.10  #include "SDL_joystick.h"
   81.11  #include "SDL_sysjoystick.h"
   81.12  #include "SDL_joystick_c.h"
    82.1 --- a/src/joystick/linux/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    82.2 +++ b/src/joystick/linux/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    82.3 @@ -35,9 +35,6 @@
    82.4  #include <linux/input.h>
    82.5  #endif
    82.6  
    82.7 -#include "SDL_stdlib.h"
    82.8 -#include "SDL_string.h"
    82.9 -#include "SDL_error.h"
   82.10  #include "SDL_joystick.h"
   82.11  #include "SDL_sysjoystick.h"
   82.12  #include "SDL_joystick_c.h"
    83.1 --- a/src/joystick/macos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    83.2 +++ b/src/joystick/macos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    83.3 @@ -26,11 +26,8 @@
    83.4      The code that follows is meant for SDL.  Use at your own risk.
    83.5  */
    83.6  
    83.7 -#include <string.h>
    83.8 -
    83.9  #include <InputSprocket.h>
   83.10  
   83.11 -#include "SDL_error.h"
   83.12  #include "SDL_joystick.h"
   83.13  #include "SDL_sysjoystick.h"
   83.14  #include "SDL_joystick_c.h"
    84.1 --- a/src/joystick/mint/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    84.2 +++ b/src/joystick/mint/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    84.3 @@ -29,11 +29,6 @@
    84.4  #include <mint/cookie.h>
    84.5  #include <mint/osbind.h>
    84.6  
    84.7 -#include "SDL_stdlib.h"
    84.8 -#include "SDL_string.h"
    84.9 -#include "SDL_types.h"
   84.10 -#include "SDL_error.h"
   84.11 -#include "SDL_joystick.h"
   84.12  #include "SDL_events.h"
   84.13  #include "SDL_sysjoystick.h"
   84.14  #include "SDL_joystick_c.h"
    85.1 --- a/src/joystick/os2/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    85.2 +++ b/src/joystick/os2/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    85.3 @@ -30,9 +30,6 @@
    85.4  #include <os2.h>
    85.5  #include "joyos2.h"
    85.6  
    85.7 -#include "SDL_stdlib.h"
    85.8 -#include "SDL_string.h"
    85.9 -#include "SDL_error.h"
   85.10  #include "SDL_joystick.h"
   85.11  #include "SDL_sysjoystick.h"
   85.12  #include "SDL_joystick_c.h"
    86.1 --- a/src/joystick/riscos/SDL_sysjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    86.2 +++ b/src/joystick/riscos/SDL_sysjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    86.3 @@ -29,9 +29,6 @@
    86.4  
    86.5  /* This is the system specific header for the SDL joystick API */
    86.6  
    86.7 -#include "SDL_stdlib.h"
    86.8 -#include "SDL_string.h"
    86.9 -#include "SDL_error.h"
   86.10  #include "SDL_joystick.h"
   86.11  #include "SDL_sysjoystick.h"
   86.12  #include "SDL_joystick_c.h"
    87.1 --- a/src/joystick/win32/SDL_mmjoystick.c	Fri Feb 10 03:21:39 2006 +0000
    87.2 +++ b/src/joystick/win32/SDL_mmjoystick.c	Fri Feb 10 06:48:43 2006 +0000
    87.3 @@ -22,18 +22,15 @@
    87.4  
    87.5  /* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
    87.6  
    87.7 -#include "SDL_stdlib.h"
    87.8 -#include "SDL_string.h"
    87.9 -#include "SDL_error.h"
   87.10 +#include "SDL_windows.h"
   87.11 +#include <mmsystem.h>
   87.12 +#include <regstr.h>
   87.13 +
   87.14  #include "SDL_events.h"
   87.15  #include "SDL_joystick.h"
   87.16  #include "SDL_sysjoystick.h"
   87.17  #include "SDL_joystick_c.h"
   87.18  
   87.19 -#include "SDL_windows.h"
   87.20 -#include <mmsystem.h>
   87.21 -#include <regstr.h>
   87.22 -
   87.23  #define MAX_JOYSTICKS	16
   87.24  #define MAX_AXES	6	/* each joystick can have up to 6 axes */
   87.25  #define MAX_BUTTONS	32	/* and 32 buttons                      */
    88.1 --- a/src/loadso/beos/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    88.2 +++ b/src/loadso/beos/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    88.3 @@ -34,8 +34,6 @@
    88.4  #include <stdio.h>
    88.5  #include <be/kernel/image.h>
    88.6  
    88.7 -#include "SDL_types.h"
    88.8 -#include "SDL_error.h"
    88.9  #include "SDL_loadso.h"
   88.10  
   88.11  void *SDL_LoadObject(const char *sofile)
    89.1 --- a/src/loadso/dlopen/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    89.2 +++ b/src/loadso/dlopen/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    89.3 @@ -34,8 +34,6 @@
    89.4  #include <stdio.h>
    89.5  #include <dlfcn.h>
    89.6  
    89.7 -#include "SDL_types.h"
    89.8 -#include "SDL_error.h"
    89.9  #include "SDL_loadso.h"
   89.10  
   89.11  void *SDL_LoadObject(const char *sofile)
    90.1 --- a/src/loadso/dummy/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    90.2 +++ b/src/loadso/dummy/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    90.3 @@ -27,8 +27,6 @@
    90.4  #error Do not compile directly...compile src/SDL_loadso.c instead!
    90.5  #endif
    90.6  
    90.7 -#include "SDL_types.h"
    90.8 -#include "SDL_error.h"
    90.9  #include "SDL_loadso.h"
   90.10  
   90.11  void *SDL_LoadObject(const char *sofile)
    91.1 --- a/src/loadso/macos/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    91.2 +++ b/src/loadso/macos/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    91.3 @@ -38,8 +38,6 @@
    91.4  #include <CodeFragments.h>
    91.5  #include <Errors.h>
    91.6  
    91.7 -#include "SDL_types.h"
    91.8 -#include "SDL_error.h"
    91.9  #include "SDL_loadso.h"
   91.10  
   91.11  void *SDL_LoadObject(const char *sofile)
    92.1 --- a/src/loadso/macosx/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    92.2 +++ b/src/loadso/macosx/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    92.3 @@ -70,8 +70,7 @@
    92.4  #include <mach-o/nlist.h>
    92.5  #include <mach-o/getsect.h>
    92.6  
    92.7 -#include "SDL_stdlib.h"
    92.8 -#include "SDL_string.h"
    92.9 +#include "SDL_stdinc.h"
   92.10  
   92.11  /* Just playing to see if it would compile with the freebsd headers, it does,
   92.12   * but because of the different values for RTLD_LOCAL etc, it would break binary
   92.13 @@ -1382,8 +1381,6 @@
   92.14  #error Do not use USE_DLOPEN on Mac OS X.
   92.15  #endif
   92.16  
   92.17 -#include "SDL_types.h"
   92.18 -#include "SDL_error.h"
   92.19  #include "SDL_loadso.h"
   92.20  
   92.21  void *SDL_LoadObject(const char *sofile)
    93.1 --- a/src/loadso/mint/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    93.2 +++ b/src/loadso/mint/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    93.3 @@ -36,8 +36,6 @@
    93.4  #include <gem.h>
    93.5  #include <ldg.h>
    93.6  
    93.7 -#include "SDL_types.h"
    93.8 -#include "SDL_error.h"
    93.9  #include "SDL_loadso.h"
   93.10  
   93.11  void *SDL_LoadObject(const char *sofile)
    94.1 --- a/src/loadso/os2/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    94.2 +++ b/src/loadso/os2/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    94.3 @@ -36,8 +36,6 @@
    94.4  #define INCL_DOSMODULEMGR
    94.5  #include <os2.h>
    94.6  
    94.7 -#include "SDL_types.h"
    94.8 -#include "SDL_error.h"
    94.9  #include "SDL_loadso.h"
   94.10  
   94.11  void *SDL_LoadObject(const char *sofile)
    95.1 --- a/src/loadso/windows/SDL_loadso.c	Fri Feb 10 03:21:39 2006 +0000
    95.2 +++ b/src/loadso/windows/SDL_loadso.c	Fri Feb 10 06:48:43 2006 +0000
    95.3 @@ -33,8 +33,6 @@
    95.4  
    95.5  #include "SDL_windows.h"
    95.6  
    95.7 -#include "SDL_types.h"
    95.8 -#include "SDL_error.h"
    95.9  #include "SDL_loadso.h"
   95.10  
   95.11  void *SDL_LoadObject(const char *sofile)
    96.1 --- a/src/main/beos/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
    96.2 +++ b/src/main/beos/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
    96.3 @@ -4,14 +4,12 @@
    96.4  	../../../../include/SDL.h \
    96.5  	../../../../include/SDL_active.h \
    96.6  	../../../../include/SDL_audio.h \
    96.7 -	../../../../include/SDL_byteorder.h \
    96.8  	../../../../include/SDL_cdrom.h \
    96.9  	../../../../include/SDL_copying.h \
   96.10  	../../../../include/SDL_cpuinfo.h \
   96.11  	../../../../include/SDL_endian.h \
   96.12  	../../../../include/SDL_error.h \
   96.13  	../../../../include/SDL_events.h \
   96.14 -	../../../../include/SDL_getenv.h \
   96.15  	../../../../include/SDL_joystick.h \
   96.16  	../../../../include/SDL_keyboard.h \
   96.17  	../../../../include/SDL_keysym.h \
   96.18 @@ -23,7 +21,6 @@
   96.19  	../../../../include/SDL_syswm.h \
   96.20  	../../../../include/SDL_thread.h \
   96.21  	../../../../include/SDL_timer.h \
   96.22 -	../../../../include/SDL_types.h \
   96.23  	../../../../include/SDL_version.h \
   96.24  	../../../../include/SDL_video.h
   96.25  
    97.1 --- a/src/main/macos/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
    97.2 +++ b/src/main/macos/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
    97.3 @@ -4,14 +4,12 @@
    97.4  	../../../../include/SDL.h \
    97.5  	../../../../include/SDL_active.h \
    97.6  	../../../../include/SDL_audio.h \
    97.7 -	../../../../include/SDL_byteorder.h \
    97.8  	../../../../include/SDL_cdrom.h \
    97.9  	../../../../include/SDL_copying.h \
   97.10  	../../../../include/SDL_cpuinfo.h \
   97.11  	../../../../include/SDL_endian.h \
   97.12  	../../../../include/SDL_error.h \
   97.13  	../../../../include/SDL_events.h \
   97.14 -	../../../../include/SDL_getenv.h \
   97.15  	../../../../include/SDL_joystick.h \
   97.16  	../../../../include/SDL_keyboard.h \
   97.17  	../../../../include/SDL_keysym.h \
   97.18 @@ -23,7 +21,6 @@
   97.19  	../../../../include/SDL_syswm.h \
   97.20  	../../../../include/SDL_thread.h \
   97.21  	../../../../include/SDL_timer.h \
   97.22 -	../../../../include/SDL_types.h \
   97.23  	../../../../include/SDL_version.h \
   97.24  	../../../../include/SDL_video.h
   97.25  
    98.1 --- a/src/main/macosx/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
    98.2 +++ b/src/main/macosx/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
    98.3 @@ -4,14 +4,12 @@
    98.4  	../../../../include/SDL.h \
    98.5  	../../../../include/SDL_active.h \
    98.6  	../../../../include/SDL_audio.h \
    98.7 -	../../../../include/SDL_byteorder.h \
    98.8  	../../../../include/SDL_cdrom.h \
    98.9  	../../../../include/SDL_copying.h \
   98.10  	../../../../include/SDL_cpuinfo.h \
   98.11  	../../../../include/SDL_endian.h \
   98.12  	../../../../include/SDL_error.h \
   98.13  	../../../../include/SDL_events.h \
   98.14 -	../../../../include/SDL_getenv.h \
   98.15  	../../../../include/SDL_joystick.h \
   98.16  	../../../../include/SDL_keyboard.h \
   98.17  	../../../../include/SDL_keysym.h \
   98.18 @@ -23,7 +21,6 @@
   98.19  	../../../../include/SDL_syswm.h \
   98.20  	../../../../include/SDL_thread.h \
   98.21  	../../../../include/SDL_timer.h \
   98.22 -	../../../../include/SDL_types.h \
   98.23  	../../../../include/SDL_version.h \
   98.24  	../../../../include/SDL_video.h
   98.25  
    99.1 --- a/src/main/win32/SDL_win32_main.c	Fri Feb 10 03:21:39 2006 +0000
    99.2 +++ b/src/main/win32/SDL_win32_main.c	Fri Feb 10 06:48:43 2006 +0000
    99.3 @@ -9,9 +9,6 @@
    99.4  
    99.5  #include "SDL_windows.h"
    99.6  
    99.7 -#include "SDL_stdlib.h"
    99.8 -#include "SDL_string.h"
    99.9 -
   99.10  #ifdef _WIN32_WCE
   99.11  # define DIR_SEPERATOR TEXT("\\")
   99.12  # undef _getcwd
   100.1 --- a/src/main/win32/exports/Makefile	Fri Feb 10 03:21:39 2006 +0000
   100.2 +++ b/src/main/win32/exports/Makefile	Fri Feb 10 06:48:43 2006 +0000
   100.3 @@ -4,14 +4,12 @@
   100.4  	../../../../include/SDL.h \
   100.5  	../../../../include/SDL_active.h \
   100.6  	../../../../include/SDL_audio.h \
   100.7 -	../../../../include/SDL_byteorder.h \
   100.8  	../../../../include/SDL_cdrom.h \
   100.9  	../../../../include/SDL_copying.h \
  100.10  	../../../../include/SDL_cpuinfo.h \
  100.11  	../../../../include/SDL_endian.h \
  100.12  	../../../../include/SDL_error.h \
  100.13  	../../../../include/SDL_events.h \
  100.14 -	../../../../include/SDL_getenv.h \
  100.15  	../../../../include/SDL_joystick.h \
  100.16  	../../../../include/SDL_keyboard.h \
  100.17  	../../../../include/SDL_keysym.h \
  100.18 @@ -23,7 +21,6 @@
  100.19  	../../../../include/SDL_syswm.h \
  100.20  	../../../../include/SDL_thread.h \
  100.21  	../../../../include/SDL_timer.h \
  100.22 -	../../../../include/SDL_types.h \
  100.23  	../../../../include/SDL_version.h \
  100.24  	../../../../include/SDL_video.h
  100.25  
   101.1 --- a/src/stdlib/SDL_getenv.c	Fri Feb 10 03:21:39 2006 +0000
   101.2 +++ b/src/stdlib/SDL_getenv.c	Fri Feb 10 06:48:43 2006 +0000
   101.3 @@ -27,7 +27,6 @@
   101.4  #if defined(WIN32) && !defined(_WIN32_WCE)
   101.5  
   101.6  #include "SDL_windows.h"
   101.7 -#include "SDL_string.h"
   101.8  
   101.9  /* Note this isn't thread-safe! */
  101.10  
   102.1 --- a/src/stdlib/SDL_string.c	Fri Feb 10 03:21:39 2006 +0000
   102.2 +++ b/src/stdlib/SDL_string.c	Fri Feb 10 06:48:43 2006 +0000
   102.3 @@ -353,7 +353,7 @@
   102.4  {
   102.5      char *bufp = string;
   102.6      while ( *bufp ) {
   102.7 -        *bufp = toupper(*bufp);
   102.8 +        *bufp = SDL_toupper(*bufp);
   102.9  	++bufp;
  102.10      }
  102.11      return string;
  102.12 @@ -365,7 +365,7 @@
  102.13  {
  102.14      char *bufp = string;
  102.15      while ( *bufp ) {
  102.16 -        *bufp = tolower(*bufp);
  102.17 +        *bufp = SDL_tolower(*bufp);
  102.18  	++bufp;
  102.19      }
  102.20      return string;
  102.21 @@ -609,8 +609,8 @@
  102.22      char a = 0;
  102.23      char b = 0;
  102.24      while (*str1 && *str2) {
  102.25 -        a = tolower(*str1);
  102.26 -        b = tolower(*str2);
  102.27 +        a = SDL_tolower(*str1);
  102.28 +        b = SDL_tolower(*str2);
  102.29          if ( a != b )
  102.30              break;
  102.31          ++str1;
  102.32 @@ -713,7 +713,7 @@
  102.33                                  ++index;
  102.34                              }
  102.35                              if ( text[index] == '0' ) {
  102.36 -                                if ( tolower(text[index+1]) == 'x' ) {
  102.37 +                                if ( SDL_tolower(text[index+1]) == 'x' ) {
  102.38                                      radix = 16;
  102.39                                  } else {
  102.40                                      radix = 8;
   103.1 --- a/src/thread/SDL_thread.c	Fri Feb 10 03:21:39 2006 +0000
   103.2 +++ b/src/thread/SDL_thread.c	Fri Feb 10 06:48:43 2006 +0000
   103.3 @@ -22,9 +22,6 @@
   103.4  
   103.5  /* System independent thread management routines for SDL */
   103.6  
   103.7 -#include "SDL_stdlib.h"
   103.8 -#include "SDL_string.h"
   103.9 -#include "SDL_error.h"
  103.10  #include "SDL_mutex.h"
  103.11  #include "SDL_thread.h"
  103.12  #include "SDL_thread_c.h"
   104.1 --- a/src/thread/amigaos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   104.2 +++ b/src/thread/amigaos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   104.3 @@ -22,7 +22,6 @@
   104.4  
   104.5  /* An implementation of semaphores using mutexes and condition variables */
   104.6  
   104.7 -#include "SDL_error.h"
   104.8  #include "SDL_thread.h"
   104.9  #include "SDL_systhread_c.h"
  104.10  
   105.1 --- a/src/thread/amigaos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   105.2 +++ b/src/thread/amigaos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   105.3 @@ -22,7 +22,6 @@
   105.4  
   105.5  /* BeOS thread management routines for SDL */
   105.6  
   105.7 -#include "SDL_error.h"
   105.8  #include "SDL_mutex.h"
   105.9  #include "SDL_thread.h"
  105.10  #include "SDL_thread_c.h"
   106.1 --- a/src/thread/amigaos/SDL_thread.c	Fri Feb 10 03:21:39 2006 +0000
   106.2 +++ b/src/thread/amigaos/SDL_thread.c	Fri Feb 10 06:48:43 2006 +0000
   106.3 @@ -22,9 +22,6 @@
   106.4  
   106.5  /* System independent thread management routines for SDL */
   106.6  
   106.7 -#include "SDL_stdlib.h"
   106.8 -#include "SDL_string.h"
   106.9 -#include "SDL_error.h"
  106.10  #include "SDL_mutex.h"
  106.11  #include "SDL_thread.h"
  106.12  #include "SDL_thread_c.h"
   107.1 --- a/src/thread/beos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   107.2 +++ b/src/thread/beos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   107.3 @@ -24,7 +24,6 @@
   107.4  
   107.5  #include <be/kernel/OS.h>
   107.6  
   107.7 -#include "SDL_error.h"
   107.8  #include "SDL_thread.h"
   107.9  
  107.10  
   108.1 --- a/src/thread/beos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   108.2 +++ b/src/thread/beos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   108.3 @@ -26,7 +26,6 @@
   108.4  #include <signal.h>
   108.5  #include <be/kernel/OS.h>
   108.6  
   108.7 -#include "SDL_error.h"
   108.8  #include "SDL_mutex.h"
   108.9  #include "SDL_thread.h"
  108.10  #include "SDL_thread_c.h"
   109.1 --- a/src/thread/bsdi/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   109.2 +++ b/src/thread/bsdi/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   109.3 @@ -20,8 +20,6 @@
   109.4      slouken@libsdl.org
   109.5  */
   109.6  
   109.7 -#include "SDL_stdlib.h"
   109.8 -#include "SDL_error.h"
   109.9  #include "SDL_thread.h"
  109.10  #include "SDL_timer.h"
  109.11  
   110.1 --- a/src/thread/dc/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   110.2 +++ b/src/thread/dc/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   110.3 @@ -26,8 +26,6 @@
   110.4     implementation, written by Christopher Tate and Owen Smith.  Thanks!
   110.5   */
   110.6  
   110.7 -#include "SDL_stdlib.h"
   110.8 -#include "SDL_error.h"
   110.9  #include "SDL_thread.h"
  110.10  
  110.11  struct SDL_cond
   111.1 --- a/src/thread/dc/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   111.2 +++ b/src/thread/dc/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   111.3 @@ -22,8 +22,6 @@
   111.4  
   111.5  /* An implementation of mutexes using semaphores */
   111.6  
   111.7 -#include "SDL_stdlib.h"
   111.8 -#include "SDL_error.h"
   111.9  #include "SDL_thread.h"
  111.10  #include "SDL_systhread_c.h"
  111.11  
   112.1 --- a/src/thread/dc/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   112.2 +++ b/src/thread/dc/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   112.3 @@ -22,7 +22,6 @@
   112.4  
   112.5  /* An implementation of semaphores using mutexes and condition variables */
   112.6  
   112.7 -#include "SDL_error.h"
   112.8  #include "SDL_timer.h"
   112.9  #include "SDL_thread.h"
  112.10  #include "SDL_systhread_c.h"
   113.1 --- a/src/thread/dc/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   113.2 +++ b/src/thread/dc/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   113.3 @@ -22,7 +22,6 @@
   113.4  
   113.5  /* Thread management routines for SDL */
   113.6  
   113.7 -#include "SDL_error.h"
   113.8  #include "SDL_thread.h"
   113.9  #include "SDL_systhread.h"
  113.10  
   114.1 --- a/src/thread/generic/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   114.2 +++ b/src/thread/generic/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   114.3 @@ -26,8 +26,6 @@
   114.4     implementation, written by Christopher Tate and Owen Smith.  Thanks!
   114.5   */
   114.6  
   114.7 -#include "SDL_stdlib.h"
   114.8 -#include "SDL_error.h"
   114.9  #include "SDL_thread.h"
  114.10  
  114.11  struct SDL_cond
   115.1 --- a/src/thread/generic/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   115.2 +++ b/src/thread/generic/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   115.3 @@ -22,8 +22,6 @@
   115.4  
   115.5  /* An implementation of mutexes using semaphores */
   115.6  
   115.7 -#include "SDL_stdlib.h"
   115.8 -#include "SDL_error.h"
   115.9  #include "SDL_thread.h"
  115.10  #include "SDL_systhread_c.h"
  115.11  
   116.1 --- a/src/thread/generic/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   116.2 +++ b/src/thread/generic/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   116.3 @@ -22,8 +22,6 @@
   116.4  
   116.5  /* An implementation of semaphores using mutexes and condition variables */
   116.6  
   116.7 -#include "SDL_stdlib.h"
   116.8 -#include "SDL_error.h"
   116.9  #include "SDL_timer.h"
  116.10  #include "SDL_thread.h"
  116.11  #include "SDL_systhread_c.h"
   117.1 --- a/src/thread/generic/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   117.2 +++ b/src/thread/generic/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   117.3 @@ -22,7 +22,6 @@
   117.4  
   117.5  /* Thread management routines for SDL */
   117.6  
   117.7 -#include "SDL_error.h"
   117.8  #include "SDL_thread.h"
   117.9  #include "SDL_systhread.h"
  117.10  
   118.1 --- a/src/thread/irix/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   118.2 +++ b/src/thread/irix/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   118.3 @@ -28,7 +28,6 @@
   118.4  #include <sys/wait.h>
   118.5  #include <sys/prctl.h>
   118.6  
   118.7 -#include "SDL_error.h"
   118.8  #include "SDL_thread.h"
   118.9  #include "SDL_systhread.h"
  118.10  
   119.1 --- a/src/thread/linux/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   119.2 +++ b/src/thread/linux/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   119.3 @@ -42,8 +42,6 @@
   119.4  #include <errno.h>
   119.5  #include <pthread.h>
   119.6  
   119.7 -#include "SDL_stdlib.h"
   119.8 -#include "SDL_error.h"
   119.9  #include "SDL_thread.h"
  119.10  #include "SDL_sysmutex_c.h"
  119.11  
   120.1 --- a/src/thread/linux/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   120.2 +++ b/src/thread/linux/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   120.3 @@ -39,8 +39,6 @@
   120.4  
   120.5  #include <pthread.h>
   120.6  
   120.7 -#include "SDL_stdlib.h"
   120.8 -#include "SDL_error.h"
   120.9  #include "SDL_thread.h"
  120.10  
  120.11  
   121.1 --- a/src/thread/linux/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   121.2 +++ b/src/thread/linux/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   121.3 @@ -20,8 +20,6 @@
   121.4      slouken@libsdl.org
   121.5  */
   121.6  
   121.7 -#include "SDL_stdlib.h"
   121.8 -#include "SDL_error.h"
   121.9  #include "SDL_thread.h"
  121.10  #include "SDL_timer.h"
  121.11  
   122.1 --- a/src/thread/linux/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   122.2 +++ b/src/thread/linux/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   122.3 @@ -22,8 +22,6 @@
   122.4  
   122.5  /* Linux thread management routines for SDL */
   122.6  
   122.7 -#include "SDL_stdlib.h"
   122.8 -#include "SDL_error.h"
   122.9  #include "SDL_thread.h"
  122.10  #include "SDL_systhread.h"
  122.11  
   123.1 --- a/src/thread/os2/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   123.2 +++ b/src/thread/os2/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   123.3 @@ -26,8 +26,6 @@
   123.4     implementation, written by Christopher Tate and Owen Smith.  Thanks!
   123.5   */
   123.6  
   123.7 -#include "SDL_stdlib.h"
   123.8 -#include "SDL_error.h"
   123.9  #include "SDL_thread.h"
  123.10  
  123.11  struct SDL_cond
   124.1 --- a/src/thread/os2/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   124.2 +++ b/src/thread/os2/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   124.3 @@ -26,8 +26,6 @@
   124.4  #define INCL_DOSSEMAPHORES
   124.5  #include <os2.h>
   124.6  
   124.7 -#include "SDL_stdlib.h"
   124.8 -#include "SDL_error.h"
   124.9  #include "SDL_mutex.h"
  124.10  
  124.11  
   125.1 --- a/src/thread/os2/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   125.2 +++ b/src/thread/os2/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   125.3 @@ -27,8 +27,6 @@
   125.4  #define INCL_DOSSEMAPHORES
   125.5  #include <os2.h>
   125.6  
   125.7 -#include "SDL_stdlib.h"
   125.8 -#include "SDL_error.h"
   125.9  #include "SDL_thread.h"
  125.10  #include "SDL_timer.h"
  125.11  
   126.1 --- a/src/thread/os2/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   126.2 +++ b/src/thread/os2/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   126.3 @@ -27,8 +27,6 @@
   126.4  #define INCL_DOSPROCESS
   126.5  #include <os2.h>
   126.6  
   126.7 -#include "SDL_stdlib.h"
   126.8 -#include "SDL_error.h"
   126.9  #include "SDL_thread.h"
  126.10  #include "SDL_systhread.h"
  126.11  
   127.1 --- a/src/thread/pth/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   127.2 +++ b/src/thread/pth/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   127.3 @@ -6,8 +6,6 @@
   127.4  
   127.5  #include <pth.h>
   127.6  
   127.7 -#include "SDL_stdlib.h"
   127.8 -#include "SDL_error.h"
   127.9  #include "SDL_thread.h"
  127.10  #include "SDL_syscond_c.h"
  127.11  #include "SDL_sysmutex_c.h"
   128.1 --- a/src/thread/pth/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   128.2 +++ b/src/thread/pth/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   128.3 @@ -6,8 +6,6 @@
   128.4  
   128.5  #include <pth.h>
   128.6  
   128.7 -#include "SDL_stdlib.h"
   128.8 -#include "SDL_error.h"
   128.9  #include "SDL_mutex.h"
  128.10  #include "SDL_sysmutex_c.h"
  128.11  
   129.1 --- a/src/thread/pth/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   129.2 +++ b/src/thread/pth/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   129.3 @@ -26,7 +26,6 @@
   129.4   *	Patrice Mandin
   129.5   */
   129.6  
   129.7 -#include "SDL_error.h"
   129.8  #include "SDL_thread.h"
   129.9  #include "SDL_systhread.h"
  129.10  
   130.1 --- a/src/thread/riscos/SDL_syscond.c	Fri Feb 10 03:21:39 2006 +0000
   130.2 +++ b/src/thread/riscos/SDL_syscond.c	Fri Feb 10 06:48:43 2006 +0000
   130.3 @@ -29,8 +29,6 @@
   130.4  #include <unistd.h>
   130.5  #include <pthread.h>
   130.6  
   130.7 -#include "SDL_stdlib.h"
   130.8 -#include "SDL_error.h"
   130.9  #include "SDL_thread.h"
  130.10  #include "SDL_sysmutex_c.h"
  130.11  
   131.1 --- a/src/thread/riscos/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   131.2 +++ b/src/thread/riscos/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   131.3 @@ -28,8 +28,6 @@
   131.4  
   131.5  #include <pthread.h>
   131.6  
   131.7 -#include "SDL_stdlib.h"
   131.8 -#include "SDL_error.h"
   131.9  #include "SDL_thread.h"
  131.10  
  131.11  struct SDL_mutex {
   132.1 --- a/src/thread/riscos/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   132.2 +++ b/src/thread/riscos/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   132.3 @@ -23,8 +23,6 @@
   132.4  /* RISC OS semiphores based on linux code */
   132.5  
   132.6  
   132.7 -#include "SDL_stdlib.h"
   132.8 -#include "SDL_error.h"
   132.9  #include "SDL_timer.h"
  132.10  #include "SDL_thread.h"
  132.11  #include "SDL_systhread_c.h"
   133.1 --- a/src/thread/riscos/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   133.2 +++ b/src/thread/riscos/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   133.3 @@ -22,7 +22,6 @@
   133.4  
   133.5  /* RISC OS version based on pthreads linux source */
   133.6  
   133.7 -#include "SDL_error.h"
   133.8  #include "SDL_thread.h"
   133.9  #include "SDL_systhread.h"
  133.10  
   134.1 --- a/src/thread/win32/SDL_sysmutex.c	Fri Feb 10 03:21:39 2006 +0000
   134.2 +++ b/src/thread/win32/SDL_sysmutex.c	Fri Feb 10 06:48:43 2006 +0000
   134.3 @@ -24,8 +24,6 @@
   134.4  
   134.5  #include "SDL_windows.h"
   134.6  
   134.7 -#include "SDL_stdlib.h"
   134.8 -#include "SDL_error.h"
   134.9  #include "SDL_mutex.h"
  134.10  
  134.11  
   135.1 --- a/src/thread/win32/SDL_syssem.c	Fri Feb 10 03:21:39 2006 +0000
   135.2 +++ b/src/thread/win32/SDL_syssem.c	Fri Feb 10 06:48:43 2006 +0000
   135.3 @@ -24,8 +24,6 @@
   135.4  
   135.5  #include "SDL_windows.h"
   135.6  
   135.7 -#include "SDL_stdlib.h"
   135.8 -#include "SDL_error.h"
   135.9  #include "SDL_thread.h"
  135.10  #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
  135.11  #include "win_ce_semaphore.h"
   136.1 --- a/src/thread/win32/SDL_systhread.c	Fri Feb 10 03:21:39 2006 +0000
   136.2 +++ b/src/thread/win32/SDL_systhread.c	Fri Feb 10 06:48:43 2006 +0000
   136.3 @@ -24,8 +24,6 @@
   136.4  
   136.5  #include "SDL_windows.h"
   136.6  
   136.7 -#include "SDL_stdlib.h"
   136.8 -#include "SDL_error.h"
   136.9  #include "SDL_thread.h"
  136.10  #include "SDL_systhread.h"
  136.11  
   137.1 --- a/src/timer/SDL_timer.c	Fri Feb 10 03:21:39 2006 +0000
   137.2 +++ b/src/timer/SDL_timer.c	Fri Feb 10 06:48:43 2006 +0000
   137.3 @@ -20,8 +20,6 @@
   137.4      slouken@libsdl.org
   137.5  */
   137.6  
   137.7 -#include "SDL_stdlib.h"
   137.8 -#include "SDL_error.h"
   137.9  #include "SDL_timer.h"
  137.10  #include "SDL_timer_c.h"
  137.11  #include "SDL_mutex.h"
   138.1 --- a/src/timer/amigaos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   138.2 +++ b/src/timer/amigaos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   138.3 @@ -48,7 +48,6 @@
   138.4  extern struct ExecBase *SysBase;
   138.5  static struct GfxBase *GfxBase;
   138.6  
   138.7 -#include "SDL_error.h"
   138.8  #include "SDL_timer.h"
   138.9  #include "SDL_timer_c.h"
  138.10  
   139.1 --- a/src/timer/beos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   139.2 +++ b/src/timer/beos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   139.3 @@ -24,7 +24,6 @@
   139.4  
   139.5  #include "SDL_thread.h"
   139.6  #include "SDL_timer.h"
   139.7 -#include "SDL_error.h"
   139.8  #include "SDL_timer_c.h"
   139.9  
  139.10  static bigtime_t start;
   140.1 --- a/src/timer/dc/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   140.2 +++ b/src/timer/dc/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   140.3 @@ -24,7 +24,6 @@
   140.4  
   140.5  #include "SDL_thread.h"
   140.6  #include "SDL_timer.h"
   140.7 -#include "SDL_error.h"
   140.8  #include "SDL_timer_c.h"
   140.9  
  140.10  static unsigned start;
   141.1 --- a/src/timer/linux/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   141.2 +++ b/src/timer/linux/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   141.3 @@ -45,7 +45,6 @@
   141.4  /*#define USE_CLOCK_GETTIME*/
   141.5  #endif
   141.6  
   141.7 -#include "SDL_error.h"
   141.8  #include "SDL_timer.h"
   141.9  #include "SDL_timer_c.h"
  141.10  
   142.1 --- a/src/timer/mint/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   142.2 +++ b/src/timer/mint/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   142.3 @@ -39,7 +39,6 @@
   142.4  #include <mint/osbind.h>
   142.5  #include <mint/mintbind.h>
   142.6  
   142.7 -#include "SDL_error.h"
   142.8  #include "SDL_timer.h"
   142.9  #include "SDL_timer_c.h"
  142.10  #include "SDL_thread.h"
   143.1 --- a/src/timer/os2/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   143.2 +++ b/src/timer/os2/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   143.3 @@ -32,7 +32,6 @@
   143.4  #include "SDL_thread.h"
   143.5  #include "SDL_timer.h"
   143.6  #include "SDL_timer_c.h"
   143.7 -#include "SDL_error.h"
   143.8  
   143.9  
  143.10  #define TIME_WRAP_VALUE (~(DWORD)0)
   144.1 --- a/src/timer/riscos/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   144.2 +++ b/src/timer/riscos/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   144.3 @@ -27,7 +27,6 @@
   144.4  #include <string.h>
   144.5  #include <errno.h>
   144.6  
   144.7 -#include "SDL_error.h"
   144.8  #include "SDL_timer.h"
   144.9  #include "SDL_timer_c.h"
  144.10  
   145.1 --- a/src/timer/win32/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   145.2 +++ b/src/timer/win32/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   145.3 @@ -25,7 +25,6 @@
   145.4  
   145.5  #include "SDL_timer.h"
   145.6  #include "SDL_timer_c.h"
   145.7 -#include "SDL_error.h"
   145.8  
   145.9  #ifdef _WIN32_WCE
  145.10    #error This is WinCE. Please use src/timer/wince/SDL_systimer.c instead.
   146.1 --- a/src/timer/wince/SDL_systimer.c	Fri Feb 10 03:21:39 2006 +0000
   146.2 +++ b/src/timer/wince/SDL_systimer.c	Fri Feb 10 06:48:43 2006 +0000
   146.3 @@ -25,7 +25,6 @@
   146.4  
   146.5  #include "SDL_timer.h"
   146.6  #include "SDL_timer_c.h"
   146.7 -#include "SDL_error.h"
   146.8  
   146.9  static Uint64 start_date;
  146.10  static Uint64 start_ticks;
   147.1 --- a/src/video/SDL_RLEaccel.c	Fri Feb 10 03:21:39 2006 +0000
   147.2 +++ b/src/video/SDL_RLEaccel.c	Fri Feb 10 06:48:43 2006 +0000
   147.3 @@ -85,11 +85,7 @@
   147.4   *   beginning of an opaque line.
   147.5   */
   147.6  
   147.7 -#include "SDL_types.h"
   147.8 -#include "SDL_stdlib.h"
   147.9 -#include "SDL_string.h"
  147.10  #include "SDL_video.h"
  147.11 -#include "SDL_error.h"
  147.12  #include "SDL_sysvideo.h"
  147.13  #include "SDL_blit.h"
  147.14  #include "SDL_RLEaccel_c.h"
   148.1 --- a/src/video/SDL_blit.c	Fri Feb 10 03:21:39 2006 +0000
   148.2 +++ b/src/video/SDL_blit.c	Fri Feb 10 06:48:43 2006 +0000
   148.3 @@ -20,9 +20,7 @@
   148.4      slouken@libsdl.org
   148.5  */
   148.6  
   148.7 -#include "SDL_error.h"
   148.8  #include "SDL_video.h"
   148.9 -#include "SDL_string.h"
  148.10  #include "SDL_sysvideo.h"
  148.11  #include "SDL_blit.h"
  148.12  #include "SDL_RLEaccel_c.h"
   149.1 --- a/src/video/SDL_blit_0.c	Fri Feb 10 03:21:39 2006 +0000
   149.2 +++ b/src/video/SDL_blit_0.c	Fri Feb 10 06:48:43 2006 +0000
   149.3 @@ -20,9 +20,7 @@
   149.4      slouken@libsdl.org
   149.5  */
   149.6  
   149.7 -#include "SDL_types.h"
   149.8  #include "SDL_video.h"
   149.9 -#include "SDL_string.h"
  149.10  #include "SDL_blit.h"
  149.11  
  149.12  /* Functions to blit from bitmaps to other surfaces */
   150.1 --- a/src/video/SDL_blit_1.c	Fri Feb 10 03:21:39 2006 +0000
   150.2 +++ b/src/video/SDL_blit_1.c	Fri Feb 10 06:48:43 2006 +0000
   150.3 @@ -20,7 +20,6 @@
   150.4      slouken@libsdl.org
   150.5  */
   150.6  
   150.7 -#include "SDL_types.h"
   150.8  #include "SDL_video.h"
   150.9  #include "SDL_blit.h"
  150.10  #include "SDL_sysvideo.h"
   151.1 --- a/src/video/SDL_blit_A.c	Fri Feb 10 03:21:39 2006 +0000
   151.2 +++ b/src/video/SDL_blit_A.c	Fri Feb 10 06:48:43 2006 +0000
   151.3 @@ -20,7 +20,6 @@
   151.4      slouken@libsdl.org
   151.5  */
   151.6  
   151.7 -#include "SDL_types.h"
   151.8  #include "SDL_video.h"
   151.9  #include "SDL_blit.h"
  151.10  
   152.1 --- a/src/video/SDL_blit_N.c	Fri Feb 10 03:21:39 2006 +0000
   152.2 +++ b/src/video/SDL_blit_N.c	Fri Feb 10 06:48:43 2006 +0000
   152.3 @@ -20,12 +20,10 @@
   152.4      slouken@libsdl.org
   152.5  */
   152.6  
   152.7 -#include "SDL_types.h"
   152.8 -#include "SDL_string.h"
   152.9  #include "SDL_video.h"
  152.10 +#include "SDL_endian.h"
  152.11 +#include "SDL_cpuinfo.h"
  152.12  #include "SDL_blit.h"
  152.13 -#include "SDL_byteorder.h"
  152.14 -#include "SDL_cpuinfo.h"
  152.15  
  152.16  /* Functions to blit from N-bit surfaces to other surfaces */
  152.17  
   153.1 --- a/src/video/SDL_bmp.c	Fri Feb 10 03:21:39 2006 +0000
   153.2 +++ b/src/video/SDL_bmp.c	Fri Feb 10 06:48:43 2006 +0000
   153.3 @@ -34,10 +34,8 @@
   153.4     This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp.
   153.5  */
   153.6  
   153.7 -#include "SDL_error.h"
   153.8  #include "SDL_video.h"
   153.9  #include "SDL_endian.h"
  153.10 -#include "SDL_string.h"
  153.11  
  153.12  /* Compression encodings for BMP files */
  153.13  #ifndef BI_RGB
   154.1 --- a/src/video/SDL_cursor.c	Fri Feb 10 03:21:39 2006 +0000
   154.2 +++ b/src/video/SDL_cursor.c	Fri Feb 10 06:48:43 2006 +0000
   154.3 @@ -22,10 +22,7 @@
   154.4  
   154.5  /* General cursor handling code for SDL */
   154.6  
   154.7 -#include "SDL_stdlib.h"
   154.8 -#include "SDL_string.h"
   154.9  #include "SDL_mutex.h"
  154.10 -#include "SDL_error.h"
  154.11  #include "SDL_video.h"
  154.12  #include "SDL_mouse.h"
  154.13  #include "SDL_blit.h"
   155.1 --- a/src/video/SDL_gamma.c	Fri Feb 10 03:21:39 2006 +0000
   155.2 +++ b/src/video/SDL_gamma.c	Fri Feb 10 06:48:43 2006 +0000
   155.3 @@ -36,9 +36,6 @@
   155.4  #define log(x)		__ieee754_log(x)
   155.5  #endif
   155.6  
   155.7 -#include "SDL_stdlib.h"
   155.8 -#include "SDL_string.h"
   155.9 -#include "SDL_error.h"
  155.10  #include "SDL_sysvideo.h"
  155.11  
  155.12  
   156.1 --- a/src/video/SDL_pixels.c	Fri Feb 10 03:21:39 2006 +0000
   156.2 +++ b/src/video/SDL_pixels.c	Fri Feb 10 06:48:43 2006 +0000
   156.3 @@ -22,9 +22,6 @@
   156.4  
   156.5  /* General (mostly internal) pixel/color manipulation routines for SDL */
   156.6  
   156.7 -#include "SDL_stdlib.h"
   156.8 -#include "SDL_string.h"
   156.9 -#include "SDL_error.h"
  156.10  #include "SDL_endian.h"
  156.11  #include "SDL_video.h"
  156.12  #include "SDL_sysvideo.h"
   157.1 --- a/src/video/SDL_stretch.c	Fri Feb 10 03:21:39 2006 +0000
   157.2 +++ b/src/video/SDL_stretch.c	Fri Feb 10 06:48:43 2006 +0000
   157.3 @@ -26,7 +26,6 @@
   157.4     April 27, 2000 - Sam Lantinga
   157.5  */
   157.6  
   157.7 -#include "SDL_error.h"
   157.8  #include "SDL_video.h"
   157.9  #include "SDL_blit.h"
  157.10  
   158.1 --- a/src/video/SDL_surface.c	Fri Feb 10 03:21:39 2006 +0000
   158.2 +++ b/src/video/SDL_surface.c	Fri Feb 10 06:48:43 2006 +0000
   158.3 @@ -20,9 +20,6 @@
   158.4      slouken@libsdl.org
   158.5  */
   158.6  
   158.7 -#include "SDL_stdlib.h"
   158.8 -#include "SDL_string.h"
   158.9 -#include "SDL_error.h"
  158.10  #include "SDL_video.h"
  158.11  #include "SDL_sysvideo.h"
  158.12  #include "SDL_cursor_c.h"
   159.1 --- a/src/video/SDL_video.c	Fri Feb 10 03:21:39 2006 +0000
   159.2 +++ b/src/video/SDL_video.c	Fri Feb 10 06:48:43 2006 +0000
   159.3 @@ -23,12 +23,6 @@
   159.4  /* The high-level video driver subsystem */
   159.5  
   159.6  #include "SDL.h"
   159.7 -#include "SDL_stdlib.h"
   159.8 -#include "SDL_string.h"
   159.9 -#include "SDL_error.h"
  159.10 -#include "SDL_video.h"
  159.11 -#include "SDL_events.h"
  159.12 -#include "SDL_mutex.h"
  159.13  #include "SDL_sysvideo.h"
  159.14  #include "SDL_sysevents.h"
  159.15  #include "SDL_blit.h"
   160.1 --- a/src/video/SDL_yuv.c	Fri Feb 10 03:21:39 2006 +0000
   160.2 +++ b/src/video/SDL_yuv.c	Fri Feb 10 06:48:43 2006 +0000
   160.3 @@ -22,10 +22,7 @@
   160.4  
   160.5  /* This is the implementation of the YUV video surface support */
   160.6  
   160.7 -#include "SDL_stdlib.h"
   160.8 -#include "SDL_string.h"
   160.9  #include "SDL_video.h"
  160.10 -#include "SDL_error.h"
  160.11  #include "SDL_sysvideo.h"
  160.12  #include "SDL_yuvfuncs.h"
  160.13  #include "SDL_yuv_sw_c.h"
   161.1 --- a/src/video/SDL_yuv_mmx.c	Fri Feb 10 03:21:39 2006 +0000
   161.2 +++ b/src/video/SDL_yuv_mmx.c	Fri Feb 10 06:48:43 2006 +0000
   161.3 @@ -20,11 +20,10 @@
   161.4      slouken@libsdl.org
   161.5  */
   161.6  
   161.7 +#include "SDL_stdinc.h"
   161.8  
   161.9  #if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
  161.10  
  161.11 -#include "SDL_types.h"
  161.12 -
  161.13  #define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used))
  161.14   
  161.15  static unsigned int  ASM_ARRAY(MMX_0080w)    = {0x00800080, 0x00800080};
   162.1 --- a/src/video/SDL_yuv_sw.c	Fri Feb 10 03:21:39 2006 +0000
   162.2 +++ b/src/video/SDL_yuv_sw.c	Fri Feb 10 06:48:43 2006 +0000
   162.3 @@ -82,9 +82,6 @@
   162.4   * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   162.5   */
   162.6  
   162.7 -#include "SDL_stdlib.h"
   162.8 -#include "SDL_string.h"
   162.9 -#include "SDL_error.h"
  162.10  #include "SDL_video.h"
  162.11  #include "SDL_cpuinfo.h"
  162.12  #include "SDL_stretch_c.h"
   163.1 --- a/src/video/aalib/SDL_aamouse.c	Fri Feb 10 03:21:39 2006 +0000
   163.2 +++ b/src/video/aalib/SDL_aamouse.c	Fri Feb 10 06:48:43 2006 +0000
   163.3 @@ -22,7 +22,6 @@
   163.4  
   163.5  #include <stdio.h>
   163.6  
   163.7 -#include "SDL_error.h"
   163.8  #include "SDL_mouse.h"
   163.9  #include "SDL_events_c.h"
  163.10  
   164.1 --- a/src/video/aalib/SDL_aavideo.c	Fri Feb 10 03:21:39 2006 +0000
   164.2 +++ b/src/video/aalib/SDL_aavideo.c	Fri Feb 10 06:48:43 2006 +0000
   164.3 @@ -27,10 +27,6 @@
   164.4  #include <sys/stat.h>
   164.5  
   164.6  
   164.7 -#include "SDL.h"
   164.8 -#include "SDL_stdlib.h"
   164.9 -#include "SDL_string.h"
  164.10 -#include "SDL_error.h"
  164.11  #include "SDL_video.h"
  164.12  #include "SDL_mouse.h"
  164.13  #include "SDL_sysvideo.h"
   165.1 --- a/src/video/ataricommon/SDL_ataric2p_s.h	Fri Feb 10 03:21:39 2006 +0000
   165.2 +++ b/src/video/ataricommon/SDL_ataric2p_s.h	Fri Feb 10 06:48:43 2006 +0000
   165.3 @@ -23,7 +23,7 @@
   165.4  #ifndef _ATARI_C2P_h
   165.5  #define _ATARI_C2P_h
   165.6  
   165.7 -#include "SDL_types.h"
   165.8 +#include "SDL_stdinc.h"
   165.9  
  165.10  /*--- Functions pointers ---*/
  165.11  
   166.1 --- a/src/video/ataricommon/SDL_atarievents.c	Fri Feb 10 03:21:39 2006 +0000
   166.2 +++ b/src/video/ataricommon/SDL_atarievents.c	Fri Feb 10 06:48:43 2006 +0000
   166.3 @@ -30,9 +30,6 @@
   166.4  
   166.5  #include <mint/cookie.h>
   166.6  
   166.7 -#include "SDL.h"
   166.8 -#include "SDL_stdlib.h"
   166.9 -#include "SDL_string.h"
  166.10  #include "SDL_sysevents.h"
  166.11  #include "SDL_events_c.h"
  166.12  
   167.1 --- a/src/video/ataricommon/SDL_atarigl.c	Fri Feb 10 03:21:39 2006 +0000
   167.2 +++ b/src/video/ataricommon/SDL_atarigl.c	Fri Feb 10 06:48:43 2006 +0000
   167.3 @@ -30,11 +30,8 @@
   167.4  
   167.5  #include <mint/osbind.h>
   167.6  
   167.7 -#include "SDL_stdlib.h"
   167.8 -#include "SDL_string.h"
   167.9 +#include "SDL_endian.h"
  167.10  #include "SDL_video.h"
  167.11 -#include "SDL_error.h"
  167.12 -#include "SDL_endian.h"
  167.13  #include "SDL_atarigl_c.h"
  167.14  #ifdef ENABLE_OSMESA_SHARED
  167.15  #include "SDL_loadso.h"
   168.1 --- a/src/video/ataricommon/SDL_atarimxalloc.c	Fri Feb 10 03:21:39 2006 +0000
   168.2 +++ b/src/video/ataricommon/SDL_atarimxalloc.c	Fri Feb 10 06:48:43 2006 +0000
   168.3 @@ -28,7 +28,7 @@
   168.4  
   168.5  #include <mint/osbind.h>
   168.6  
   168.7 -#include "SDL_types.h"
   168.8 +#include "SDL_stdinc.h"
   168.9  
  168.10  /*--- Variables ---*/
  168.11  
   169.1 --- a/src/video/ataricommon/SDL_biosevents.c	Fri Feb 10 03:21:39 2006 +0000
   169.2 +++ b/src/video/ataricommon/SDL_biosevents.c	Fri Feb 10 06:48:43 2006 +0000
   169.3 @@ -30,8 +30,6 @@
   169.4  #include <mint/osbind.h>
   169.5  #include <mint/cookie.h>
   169.6  
   169.7 -#include "SDL.h"
   169.8 -#include "SDL_string.h"
   169.9  #include "SDL_sysevents.h"
  169.10  #include "SDL_events_c.h"
  169.11  
   170.1 --- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Feb 10 03:21:39 2006 +0000
   170.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c	Fri Feb 10 06:48:43 2006 +0000
   170.3 @@ -30,8 +30,6 @@
   170.4  #include <mint/osbind.h>
   170.5  #include <mint/cookie.h>
   170.6  
   170.7 -#include "SDL.h"
   170.8 -#include "SDL_string.h"
   170.9  #include "SDL_sysevents.h"
  170.10  #include "SDL_events_c.h"
  170.11  
   171.1 --- a/src/video/ataricommon/SDL_ikbdevents.c	Fri Feb 10 03:21:39 2006 +0000
   171.2 +++ b/src/video/ataricommon/SDL_ikbdevents.c	Fri Feb 10 06:48:43 2006 +0000
   171.3 @@ -29,8 +29,6 @@
   171.4  /* Mint includes */
   171.5  #include <mint/osbind.h>
   171.6  
   171.7 -#include "SDL.h"
   171.8 -#include "SDL_string.h"
   171.9  #include "SDL_sysevents.h"
  171.10  #include "SDL_events_c.h"
  171.11  
   172.1 --- a/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Fri Feb 10 03:21:39 2006 +0000
   172.2 +++ b/src/video/ataricommon/SDL_ikbdinterrupt_s.h	Fri Feb 10 06:48:43 2006 +0000
   172.3 @@ -31,7 +31,7 @@
   172.4  
   172.5  #include <mint/osbind.h>
   172.6  
   172.7 -#include "SDL_types.h"
   172.8 +#include "SDL_stdinc.h"
   172.9  
  172.10  /* Const */
  172.11  
   173.1 --- a/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Fri Feb 10 03:21:39 2006 +0000
   173.2 +++ b/src/video/ataricommon/SDL_xbiosinterrupt_s.h	Fri Feb 10 06:48:43 2006 +0000
   173.3 @@ -31,7 +31,7 @@
   173.4  
   173.5  #include <mint/osbind.h>
   173.6  
   173.7 -#include "SDL_types.h"
   173.8 +#include "SDL_stdinc.h"
   173.9  
  173.10  /* Variables */
  173.11  
   174.1 --- a/src/video/bwindow/SDL_sysmouse.cc	Fri Feb 10 03:21:39 2006 +0000
   174.2 +++ b/src/video/bwindow/SDL_sysmouse.cc	Fri Feb 10 06:48:43 2006 +0000
   174.3 @@ -23,9 +23,6 @@
   174.4  #include <AppKit.h>
   174.5  #include <GameKit.h>
   174.6  
   174.7 -#include "SDL_stdlib.h"
   174.8 -#include "SDL_string.h"
   174.9 -#include "SDL_error.h"
  174.10  #include "SDL_BWin.h"
  174.11  
  174.12  extern "C" {
   175.1 --- a/src/video/bwindow/SDL_sysvideo.cc	Fri Feb 10 03:21:39 2006 +0000
   175.2 +++ b/src/video/bwindow/SDL_sysvideo.cc	Fri Feb 10 06:48:43 2006 +0000
   175.3 @@ -24,9 +24,6 @@
   175.4  
   175.5  #include <unistd.h>
   175.6  
   175.7 -#include "SDL.h"
   175.8 -#include "SDL_stdlib.h"
   175.9 -#include "SDL_string.h"
  175.10  #include "SDL_BeApp.h"
  175.11  #include "SDL_BWin.h"
  175.12  #include "SDL_timer.h"
   176.1 --- a/src/video/bwindow/SDL_sysyuv.cc	Fri Feb 10 03:21:39 2006 +0000
   176.2 +++ b/src/video/bwindow/SDL_sysyuv.cc	Fri Feb 10 06:48:43 2006 +0000
   176.3 @@ -22,8 +22,6 @@
   176.4  
   176.5  /* This is the BeOS version of SDL YUV video overlays */
   176.6  
   176.7 -#include "SDL_stdlib.h"
   176.8 -#include "SDL_error.h"
   176.9  #include "SDL_video.h"
  176.10  #include "SDL_sysyuv.h"
  176.11  #include "SDL_yuvfuncs.h"
   177.1 --- a/src/video/cybergfx/SDL_amigamouse.c	Fri Feb 10 03:21:39 2006 +0000
   177.2 +++ b/src/video/cybergfx/SDL_amigamouse.c	Fri Feb 10 06:48:43 2006 +0000
   177.3 @@ -20,7 +20,6 @@
   177.4      slouken@libsdl.org
   177.5  */
   177.6  
   177.7 -#include "SDL_error.h"
   177.8  #include "SDL_mouse.h"
   177.9  #include "SDL_events_c.h"
  177.10  #include "SDL_cursor_c.h"
   178.1 --- a/src/video/cybergfx/SDL_cgxaccel.c	Fri Feb 10 03:21:39 2006 +0000
   178.2 +++ b/src/video/cybergfx/SDL_cgxaccel.c	Fri Feb 10 06:48:43 2006 +0000
   178.3 @@ -20,11 +20,10 @@
   178.4      slouken@libsdl.org
   178.5  */
   178.6  
   178.7 -#include "SDL_error.h"
   178.8  #include "SDL_endian.h"
   178.9 +#include "SDL_video.h"
  178.10  #include "SDL_sysvideo.h"
  178.11  #include "SDL_blit.h"
  178.12 -#include "SDL_video.h"
  178.13  #include "SDL_cgxvideo.h"
  178.14  
  178.15  static int CGX_HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
   179.1 --- a/src/video/cybergfx/SDL_cgxgl.c	Fri Feb 10 03:21:39 2006 +0000
   179.2 +++ b/src/video/cybergfx/SDL_cgxgl.c	Fri Feb 10 06:48:43 2006 +0000
   179.3 @@ -22,7 +22,6 @@
   179.4  
   179.5  /* StormMesa implementation of SDL OpenGL support */
   179.6  
   179.7 -#include "SDL_error.h"
   179.8  #include "SDL_cgxgl_c.h"
   179.9  #include "SDL_cgxvideo.h"
  179.10  
   180.1 --- a/src/video/cybergfx/SDL_cgximage.c	Fri Feb 10 03:21:39 2006 +0000
   180.2 +++ b/src/video/cybergfx/SDL_cgximage.c	Fri Feb 10 06:48:43 2006 +0000
   180.3 @@ -20,9 +20,6 @@
   180.4      slouken@libsdl.org
   180.5  */
   180.6  
   180.7 -#include "SDL_stdlib.h"
   180.8 -#include "SDL_string.h"
   180.9 -#include "SDL_error.h"
  180.10  #include "SDL_endian.h"
  180.11  #include "SDL_cgximage_c.h"
  180.12  
   181.1 --- a/src/video/cybergfx/SDL_cgxmodes.c	Fri Feb 10 03:21:39 2006 +0000
   181.2 +++ b/src/video/cybergfx/SDL_cgxmodes.c	Fri Feb 10 06:48:43 2006 +0000
   181.3 @@ -23,7 +23,6 @@
   181.4  /* Utilities for getting and setting the X display mode */
   181.5  
   181.6  #include "SDL_timer.h"
   181.7 -#include "SDL_error.h"
   181.8  #include "SDL_events.h"
   181.9  #include "SDL_events_c.h"
  181.10  #include "SDL_cgxvideo.h"
   182.1 --- a/src/video/cybergfx/SDL_cgxvideo.c	Fri Feb 10 03:21:39 2006 +0000
   182.2 +++ b/src/video/cybergfx/SDL_cgxvideo.c	Fri Feb 10 06:48:43 2006 +0000
   182.3 @@ -25,13 +25,11 @@
   182.4   * gabriele.greco@aruba.it
   182.5   */
   182.6  
   182.7 -#include "SDL.h"
   182.8 -#include "SDL_error.h"
   182.9 +#include "SDL_endian.h"
  182.10  #include "SDL_timer.h"
  182.11  #include "SDL_thread.h"
  182.12  #include "SDL_video.h"
  182.13  #include "SDL_mouse.h"
  182.14 -#include "SDL_endian.h"
  182.15  #include "SDL_sysvideo.h"
  182.16  #include "SDL_pixels_c.h"
  182.17  #include "SDL_events_c.h"
   183.1 --- a/src/video/cybergfx/SDL_cgxvideo.h	Fri Feb 10 03:21:39 2006 +0000
   183.2 +++ b/src/video/cybergfx/SDL_cgxvideo.h	Fri Feb 10 06:48:43 2006 +0000
   183.3 @@ -43,8 +43,6 @@
   183.4  #include <inline/console.h>
   183.5  #endif
   183.6  
   183.7 -#include "SDL_stdlib.h"
   183.8 -#include "SDL_string.h"
   183.9  #include "SDL_mouse.h"
  183.10  #include "SDL_sysvideo.h"
  183.11  #include "mydebug.h"
   184.1 --- a/src/video/cybergfx/SDL_cgxwm.c	Fri Feb 10 03:21:39 2006 +0000
   184.2 +++ b/src/video/cybergfx/SDL_cgxwm.c	Fri Feb 10 06:48:43 2006 +0000
   184.3 @@ -21,7 +21,6 @@
   184.4  */
   184.5  
   184.6  #include "SDL_version.h"
   184.7 -#include "SDL_error.h"
   184.8  #include "SDL_timer.h"
   184.9  #include "SDL_video.h"
  184.10  #include "SDL_syswm.h"
   185.1 --- a/src/video/cybergfx/SDL_cgxyuv.c	Fri Feb 10 03:21:39 2006 +0000
   185.2 +++ b/src/video/cybergfx/SDL_cgxyuv.c	Fri Feb 10 06:48:43 2006 +0000
   185.3 @@ -30,9 +30,6 @@
   185.4  #include <X11/extensions/XShm.h>
   185.5  #include <X11/extensions/Xvlib.h>
   185.6  
   185.7 -#include "SDL_stdlib.h"
   185.8 -#include "SDL_string.h"
   185.9 -#include "SDL_error.h"
  185.10  #include "SDL_video.h"
  185.11  #include "SDL_x11yuv_c.h"
  185.12  #include "SDL_yuvfuncs.h"
   186.1 --- a/src/video/dc/SDL_dcmouse.c	Fri Feb 10 03:21:39 2006 +0000
   186.2 +++ b/src/video/dc/SDL_dcmouse.c	Fri Feb 10 06:48:43 2006 +0000
   186.3 @@ -22,7 +22,6 @@
   186.4  
   186.5  #include <stdio.h>
   186.6  
   186.7 -#include "SDL_error.h"
   186.8  #include "SDL_mouse.h"
   186.9  #include "SDL_events_c.h"
  186.10  
   187.1 --- a/src/video/dc/SDL_dcvideo.c	Fri Feb 10 03:21:39 2006 +0000
   187.2 +++ b/src/video/dc/SDL_dcvideo.c	Fri Feb 10 06:48:43 2006 +0000
   187.3 @@ -20,10 +20,6 @@
   187.4      slouken@libsdl.org
   187.5  */
   187.6  
   187.7 -#include "SDL.h"
   187.8 -#include "SDL_stdlib.h"
   187.9 -#include "SDL_string.h"
  187.10 -#include "SDL_error.h"
  187.11  #include "SDL_video.h"
  187.12  #include "SDL_mouse.h"
  187.13  #include "SDL_sysvideo.h"
   188.1 --- a/src/video/dga/SDL_dgamouse.c	Fri Feb 10 03:21:39 2006 +0000
   188.2 +++ b/src/video/dga/SDL_dgamouse.c	Fri Feb 10 06:48:43 2006 +0000
   188.3 @@ -22,7 +22,6 @@
   188.4  
   188.5  #include <stdio.h>
   188.6  
   188.7 -#include "SDL_error.h"
   188.8  #include "SDL_mouse.h"
   188.9  #include "SDL_events_c.h"
  188.10  #include "SDL_dgavideo.h"
   189.1 --- a/src/video/dga/SDL_dgavideo.c	Fri Feb 10 03:21:39 2006 +0000
   189.2 +++ b/src/video/dga/SDL_dgavideo.c	Fri Feb 10 06:48:43 2006 +0000
   189.3 @@ -28,10 +28,6 @@
   189.4  #include <X11/Xlib.h>
   189.5  #include <Xext/extensions/xf86dga.h>
   189.6  
   189.7 -#include "SDL.h"
   189.8 -#include "SDL_stdlib.h"
   189.9 -#include "SDL_string.h"
  189.10 -#include "SDL_error.h"
  189.11  #include "SDL_video.h"
  189.12  #include "SDL_mouse.h"
  189.13  #include "SDL_sysvideo.h"
   190.1 --- a/src/video/directfb/SDL_DirectFB_video.c	Fri Feb 10 03:21:39 2006 +0000
   190.2 +++ b/src/video/directfb/SDL_DirectFB_video.c	Fri Feb 10 06:48:43 2006 +0000
   190.3 @@ -34,10 +34,6 @@
   190.4  #include <directfb.h>
   190.5  #include <directfb_version.h>
   190.6  
   190.7 -#include "SDL.h"
   190.8 -#include "SDL_stdlib.h"
   190.9 -#include "SDL_string.h"
  190.10 -#include "SDL_error.h"
  190.11  #include "SDL_video.h"
  190.12  #include "SDL_mouse.h"
  190.13  #include "SDL_sysvideo.h"
   191.1 --- a/src/video/directfb/SDL_DirectFB_yuv.c	Fri Feb 10 03:21:39 2006 +0000
   191.2 +++ b/src/video/directfb/SDL_DirectFB_yuv.c	Fri Feb 10 06:48:43 2006 +0000
   191.3 @@ -22,8 +22,6 @@
   191.4  
   191.5  /* This is the DirectFB implementation of YUV video overlays */
   191.6  
   191.7 -#include "SDL_stdlib.h"
   191.8 -#include "SDL_error.h"
   191.9  #include "SDL_video.h"
  191.10  #include "SDL_DirectFB_yuv.h"
  191.11  #include "SDL_yuvfuncs.h"
   192.1 --- a/src/video/dummy/SDL_nullmouse.c	Fri Feb 10 03:21:39 2006 +0000
   192.2 +++ b/src/video/dummy/SDL_nullmouse.c	Fri Feb 10 06:48:43 2006 +0000
   192.3 @@ -20,9 +20,6 @@
   192.4      slouken@libsdl.org
   192.5  */
   192.6  
   192.7 -#include <stdio.h>
   192.8 -
   192.9 -#include "SDL_error.h"
  192.10  #include "SDL_mouse.h"
  192.11  #include "SDL_events_c.h"
  192.12  
   193.1 --- a/src/video/dummy/SDL_nullvideo.c	Fri Feb 10 03:21:39 2006 +0000
   193.2 +++ b/src/video/dummy/SDL_nullvideo.c	Fri Feb 10 06:48:43 2006 +0000
   193.3 @@ -35,10 +35,6 @@
   193.4   *  SDL video driver.  Renamed to "DUMMY" by Sam Lantinga.
   193.5   */
   193.6  
   193.7 -#include "SDL.h"
   193.8 -#include "SDL_stdlib.h"
   193.9 -#include "SDL_string.h"
  193.10 -#include "SDL_error.h"
  193.11  #include "SDL_video.h"
  193.12  #include "SDL_mouse.h"
  193.13  #include "SDL_sysvideo.h"
   194.1 --- a/src/video/epoc/SDL_epocvideo.cpp	Fri Feb 10 03:21:39 2006 +0000
   194.2 +++ b/src/video/epoc/SDL_epocvideo.cpp	Fri Feb 10 06:48:43 2006 +0000
   194.3 @@ -30,9 +30,6 @@
   194.4  
   194.5  
   194.6  extern "C" {
   194.7 -#include "SDL_stdlib.h"
   194.8 -#include "SDL_string.h"
   194.9 -#include "SDL_error.h"
  194.10  #include "SDL_timer.h"
  194.11  #include "SDL_video.h"
  194.12  #undef NULL
   195.1 --- a/src/video/fbcon/SDL_fb3dfx.c	Fri Feb 10 03:21:39 2006 +0000
   195.2 +++ b/src/video/fbcon/SDL_fb3dfx.c	Fri Feb 10 06:48:43 2006 +0000
   195.3 @@ -20,7 +20,6 @@
   195.4      slouken@libsdl.org
   195.5  */
   195.6  
   195.7 -#include "SDL_types.h"
   195.8  #include "SDL_video.h"
   195.9  #include "SDL_blit.h"
  195.10  #include "SDL_fb3dfx.h"
   196.1 --- a/src/video/fbcon/SDL_fbelo.c	Fri Feb 10 03:21:39 2006 +0000
   196.2 +++ b/src/video/fbcon/SDL_fbelo.c	Fri Feb 10 06:48:43 2006 +0000
   196.3 @@ -24,8 +24,7 @@
   196.4  #include <sys/time.h>
   196.5  #include <ctype.h>
   196.6  
   196.7 -#include "SDL_stdlib.h"
   196.8 -#include "SDL_string.h"
   196.9 +#include "SDL_stdinc.h"
  196.10  #include "SDL_fbvideo.h"
  196.11  #include "SDL_fbelo.h"
  196.12  
   197.1 --- a/src/video/fbcon/SDL_fbevents.c	Fri Feb 10 03:21:39 2006 +0000
   197.2 +++ b/src/video/fbcon/SDL_fbevents.c	Fri Feb 10 06:48:43 2006 +0000
   197.3 @@ -39,9 +39,6 @@
   197.4  #include <linux/kd.h>
   197.5  #include <linux/keyboard.h>
   197.6  
   197.7 -#include "SDL.h"
   197.8 -#include "SDL_stdlib.h"
   197.9 -#include "SDL_string.h"
  197.10  #include "SDL_mutex.h"
  197.11  #include "SDL_sysevents.h"
  197.12  #include "SDL_sysvideo.h"
   198.1 --- a/src/video/fbcon/SDL_fbmatrox.c	Fri Feb 10 03:21:39 2006 +0000
   198.2 +++ b/src/video/fbcon/SDL_fbmatrox.c	Fri Feb 10 06:48:43 2006 +0000
   198.3 @@ -20,7 +20,6 @@
   198.4      slouken@libsdl.org
   198.5  */
   198.6  
   198.7 -#include "SDL_types.h"
   198.8  #include "SDL_video.h"
   198.9  #include "SDL_blit.h"
  198.10  #include "SDL_fbmatrox.h"
   199.1 --- a/src/video/fbcon/SDL_fbmouse.c	Fri Feb 10 03:21:39 2006 +0000
   199.2 +++ b/src/video/fbcon/SDL_fbmouse.c	Fri Feb 10 06:48:43 2006 +0000
   199.3 @@ -20,9 +20,6 @@
   199.4      slouken@libsdl.org
   199.5  */
   199.6  
   199.7 -#include <stdio.h>
   199.8 -
   199.9 -#include "SDL_error.h"
  199.10  #include "SDL_mouse.h"
  199.11  #include "SDL_events_c.h"
  199.12  #include "SDL_fbvideo.h"
   200.1 --- a/src/video/fbcon/SDL_fbriva.c	Fri Feb 10 03:21:39 2006 +0000
   200.2 +++ b/src/video/fbcon/SDL_fbriva.c	Fri Feb 10 06:48:43 2006 +0000
   200.3 @@ -20,7 +20,6 @@
   200.4      slouken@libsdl.org
   200.5  */
   200.6  
   200.7 -#include "SDL_types.h"
   200.8  #include "SDL_video.h"
   200.9  #include "SDL_blit.h"
  200.10  #include "SDL_fbriva.h"
   201.1 --- a/src/video/fbcon/SDL_fbvideo.c	Fri Feb 10 03:21:39 2006 +0000
   201.2 +++ b/src/video/fbcon/SDL_fbvideo.c	Fri Feb 10 06:48:43 2006 +0000
   201.3 @@ -31,10 +31,6 @@
   201.4  #include <asm/page.h>		/* For definition of PAGE_SIZE */
   201.5  #include <sys/io.h>		/* For ioperm() */
   201.6  
   201.7 -#include "SDL.h"
   201.8 -#include "SDL_stdlib.h"
   201.9 -#include "SDL_string.h"
  201.10 -#include "SDL_error.h"
  201.11  #include "SDL_video.h"
  201.12  #include "SDL_mouse.h"
  201.13  #include "SDL_sysvideo.h"
   202.1 --- a/src/video/gapi/SDL_gapivideo.c	Fri Feb 10 03:21:39 2006 +0000
   202.2 +++ b/src/video/gapi/SDL_gapivideo.c	Fri Feb 10 06:48:43 2006 +0000
   202.3 @@ -32,9 +32,6 @@
   202.4  // TODO: windib on SH3 PPC2000 landscape test
   202.5  // TODO: optimize 8bpp landscape mode
   202.6  
   202.7 -#include "SDL.h"
   202.8 -#include "SDL_stdlib.h"
   202.9 -#include "SDL_error.h"
  202.10  #include "SDL_video.h"
  202.11  #include "SDL_mouse.h"
  202.12  #include "SDL_sysvideo.h"
   203.1 --- a/src/video/gem/SDL_gemevents.c	Fri Feb 10 03:21:39 2006 +0000
   203.2 +++ b/src/video/gem/SDL_gemevents.c	Fri Feb 10 06:48:43 2006 +0000
   203.3 @@ -31,8 +31,6 @@
   203.4  
   203.5  #include <gem.h>
   203.6  
   203.7 -#include "SDL.h"
   203.8 -#include "SDL_string.h"
   203.9  #include "SDL_sysevents.h"
  203.10  #include "SDL_events_c.h"
  203.11  #include "SDL_gemvideo.h"
   204.1 --- a/src/video/gem/SDL_gemmouse.c	Fri Feb 10 03:21:39 2006 +0000
   204.2 +++ b/src/video/gem/SDL_gemmouse.c	Fri Feb 10 06:48:43 2006 +0000
   204.3 @@ -28,8 +28,6 @@
   204.4  
   204.5  #include <gem.h>
   204.6  
   204.7 -#include "SDL_stdlib.h"
   204.8 -#include "SDL_error.h"
   204.9  #include "SDL_mouse.h"
  204.10  #include "SDL_events_c.h"
  204.11  #include "SDL_cursor_c.h"
   205.1 --- a/src/video/gem/SDL_gemvideo.c	Fri Feb 10 03:21:39 2006 +0000
   205.2 +++ b/src/video/gem/SDL_gemvideo.c	Fri Feb 10 06:48:43 2006 +0000
   205.3 @@ -34,13 +34,9 @@
   205.4  #include <mint/osbind.h>
   205.5  #include <mint/cookie.h>
   205.6  
   205.7 -#include "SDL.h"
   205.8 -#include "SDL_stdlib.h"
   205.9 -#include "SDL_string.h"
  205.10 -#include "SDL_error.h"
  205.11 +#include "SDL_endian.h"
  205.12  #include "SDL_video.h"
  205.13  #include "SDL_mouse.h"
  205.14 -#include "SDL_endian.h"
  205.15  #include "SDL_sysvideo.h"
  205.16  #include "SDL_pixels_c.h"
  205.17  #include "SDL_events_c.h"
   206.1 --- a/src/video/ggi/SDL_ggimouse.c	Fri Feb 10 03:21:39 2006 +0000
   206.2 +++ b/src/video/ggi/SDL_ggimouse.c	Fri Feb 10 06:48:43 2006 +0000
   206.3 @@ -20,9 +20,6 @@
   206.4      slouken@libsdl.org
   206.5  */
   206.6  
   206.7 -#include <stdio.h>
   206.8 -
   206.9 -#include "SDL_error.h"
  206.10  #include "SDL_mouse.h"
  206.11  #include "SDL_events_c.h"
  206.12  #include "SDL_ggimouse_c.h"
   207.1 --- a/src/video/ggi/SDL_ggivideo.c	Fri Feb 10 03:21:39 2006 +0000
   207.2 +++ b/src/video/ggi/SDL_ggivideo.c	Fri Feb 10 06:48:43 2006 +0000
   207.3 @@ -30,10 +30,6 @@
   207.4  #include <ggi/ggi.h>
   207.5  #include <ggi/gii.h>
   207.6  
   207.7 -#include "SDL.h"
   207.8 -#include "SDL_stdlib.h"
   207.9 -#include "SDL_string.h"
  207.10 -#include "SDL_error.h"
  207.11  #include "SDL_video.h"
  207.12  #include "SDL_mouse.h"
  207.13  #include "SDL_sysvideo.h"
   208.1 --- a/src/video/ipod/SDL_ipodvideo.c	Fri Feb 10 03:21:39 2006 +0000
   208.2 +++ b/src/video/ipod/SDL_ipodvideo.c	Fri Feb 10 06:48:43 2006 +0000
   208.3 @@ -12,10 +12,6 @@
   208.4  #include <linux/keyboard.h>
   208.5  #include <linux/fb.h>
   208.6  
   208.7 -#include "SDL.h"
   208.8 -#include "SDL_stdlib.h"
   208.9 -#include "SDL_string.h"
  208.10 -#include "SDL_error.h"
  208.11  #include "SDL_video.h"
  208.12  #include "SDL_mouse.h"
  208.13  #include "SDL_sysvideo.h"
   209.1 --- a/src/video/maccommon/SDL_macevents.c	Fri Feb 10 03:21:39 2006 +0000
   209.2 +++ b/src/video/maccommon/SDL_macevents.c	Fri Feb 10 06:48:43 2006 +0000
   209.3 @@ -36,7 +36,6 @@
   209.4  
   209.5  #include "SDL_events.h"
   209.6  #include "SDL_video.h"
   209.7 -#include "SDL_error.h"
   209.8  #include "SDL_syswm.h"
   209.9  #include "SDL_events_c.h"
  209.10  #include "SDL_cursor_c.h"
   210.1 --- a/src/video/maccommon/SDL_macgl.c	Fri Feb 10 03:21:39 2006 +0000
   210.2 +++ b/src/video/maccommon/SDL_macgl.c	Fri Feb 10 06:48:43 2006 +0000
   210.3 @@ -22,7 +22,6 @@
   210.4  
   210.5  /* AGL implementation of SDL OpenGL support */
   210.6  
   210.7 -#include "SDL_error.h"
   210.8  #include "SDL_lowvideo.h"
   210.9  #include "SDL_macgl_c.h"
  210.10  #include "SDL_loadso.h"
   211.1 --- a/src/video/maccommon/SDL_macmouse.c	Fri Feb 10 03:21:39 2006 +0000
   211.2 +++ b/src/video/maccommon/SDL_macmouse.c	Fri Feb 10 06:48:43 2006 +0000
   211.3 @@ -33,9 +33,6 @@
   211.4  #include <CursorDevices.h>
   211.5  #endif
   211.6  
   211.7 -#include "SDL_stdlib.h"
   211.8 -#include "SDL_string.h"
   211.9 -#include "SDL_error.h"
  211.10  #include "SDL_mouse.h"
  211.11  #include "SDL_macmouse_c.h"
  211.12  
   212.1 --- a/src/video/maccommon/SDL_macwm.c	Fri Feb 10 03:21:39 2006 +0000
   212.2 +++ b/src/video/maccommon/SDL_macwm.c	Fri Feb 10 06:48:43 2006 +0000
   212.3 @@ -29,7 +29,7 @@
   212.4  #include <Strings.h>
   212.5  #endif
   212.6  
   212.7 -#include "SDL_string.h"
   212.8 +#include "SDL_stdinc.h"
   212.9  #include "SDL_macwm_c.h"
  212.10  
  212.11  void Mac_SetCaption(_THIS, const char *title, const char *icon)
   213.1 --- a/src/video/macdsp/SDL_dspvideo.c	Fri Feb 10 03:21:39 2006 +0000
   213.2 +++ b/src/video/macdsp/SDL_dspvideo.c	Fri Feb 10 06:48:43 2006 +0000
   213.3 @@ -137,11 +137,8 @@
   213.4  #include <DrawSprocket.h>
   213.5  #endif
   213.6  
   213.7 -#include "SDL_stdlib.h"
   213.8 -#include "SDL_string.h"
   213.9  #include "SDL_video.h"
  213.10  #include "SDL_blit.h"
  213.11 -#include "SDL_error.h"
  213.12  #include "SDL_syswm.h"
  213.13  #include "SDL_sysvideo.h"
  213.14  #include "SDL_pixels_c.h"
   214.1 --- a/src/video/macrom/SDL_romvideo.c	Fri Feb 10 03:21:39 2006 +0000
   214.2 +++ b/src/video/macrom/SDL_romvideo.c	Fri Feb 10 06:48:43 2006 +0000
   214.3 @@ -41,10 +41,7 @@
   214.4  #include <QDOffscreen.h>
   214.5  #endif
   214.6  
   214.7 -#include "SDL_stdlib.h"
   214.8 -#include "SDL_string.h"
   214.9  #include "SDL_video.h"
  214.10 -#include "SDL_error.h"
  214.11  #include "SDL_syswm.h"
  214.12  #include "SDL_sysvideo.h"
  214.13  #include "SDL_romvideo.h"
   215.1 --- a/src/video/nanox/SDL_nximage.c	Fri Feb 10 03:21:39 2006 +0000
   215.2 +++ b/src/video/nanox/SDL_nximage.c	Fri Feb 10 06:48:43 2006 +0000
   215.3 @@ -25,10 +25,6 @@
   215.4      clare@setabox.com
   215.5  */
   215.6  
   215.7 -#include "SDL_stdlib.h"
   215.8 -#include "SDL_string.h"
   215.9 -#include "SDL_error.h"
  215.10 -
  215.11  #include "SDL_nximage_c.h"
  215.12  
  215.13  void NX_NormalUpdate (_THIS, int numrects, SDL_Rect * rects)
   216.1 --- a/src/video/nanox/SDL_nxmodes.c	Fri Feb 10 03:21:39 2006 +0000
   216.2 +++ b/src/video/nanox/SDL_nxmodes.c	Fri Feb 10 06:48:43 2006 +0000
   216.3 @@ -24,8 +24,7 @@
   216.4      clare@setabox.com
   216.5  */
   216.6  
   216.7 -#include "SDL_stdlib.h"
   216.8 -#include "SDL_string.h"
   216.9 +#include "SDL_stdinc.h"
  216.10  #include "SDL_nxmodes_c.h"
  216.11  
  216.12  SDL_Rect ** NX_ListModes (_THIS, SDL_PixelFormat * format, Uint32 flags)
   217.1 --- a/src/video/nanox/SDL_nxmouse.c	Fri Feb 10 03:21:39 2006 +0000
   217.2 +++ b/src/video/nanox/SDL_nxmouse.c	Fri Feb 10 06:48:43 2006 +0000
   217.3 @@ -24,8 +24,6 @@
   217.4      clare@setabox.com
   217.5  */
   217.6  
   217.7 -#include "SDL_stdlib.h"
   217.8 -#include "SDL_error.h"
   217.9  #include "SDL_events_c.h"
  217.10  
  217.11  #include "SDL_nxmouse_c.h"
   218.1 --- a/src/video/nanox/SDL_nxvideo.c	Fri Feb 10 03:21:39 2006 +0000
   218.2 +++ b/src/video/nanox/SDL_nxvideo.c	Fri Feb 10 06:48:43 2006 +0000
   218.3 @@ -25,12 +25,10 @@
   218.4      clare@setabox.com
   218.5  */
   218.6  
   218.7 -#include "SDL_stdlib.h"
   218.8 -#include "SDL_string.h"
   218.9 +#include "SDL_thread.h"
  218.10  #include "SDL_video.h"
  218.11  #include "SDL_pixels_c.h"
  218.12  #include "SDL_events_c.h"
  218.13 -#include "SDL_thread.h"
  218.14  
  218.15  #define MWINCLUDECOLORS
  218.16  #include "SDL_nxvideo.h"
   219.1 --- a/src/video/nanox/SDL_nxwm.c	Fri Feb 10 03:21:39 2006 +0000
   219.2 +++ b/src/video/nanox/SDL_nxwm.c	Fri Feb 10 06:48:43 2006 +0000
   219.3 @@ -25,7 +25,6 @@
   219.4  */
   219.5  
   219.6  #include "SDL_syswm.h"
   219.7 -#include "SDL_error.h"
   219.8  #include "SDL_events_c.h"
   219.9  
  219.10  #include "SDL_nxwm_c.h"
   220.1 --- a/src/video/os2fslib/SDL_os2fslib.c	Fri Feb 10 03:21:39 2006 +0000
   220.2 +++ b/src/video/os2fslib/SDL_os2fslib.c	Fri Feb 10 06:48:43 2006 +0000
   220.3 @@ -23,10 +23,6 @@
   220.4  #include <process.h>
   220.5  #include <time.h>
   220.6  
   220.7 -#include "SDL.h"
   220.8 -#include "SDL_stdlib.h"
   220.9 -#include "SDL_string.h"
  220.10 -#include "SDL_error.h"
  220.11  #include "SDL_video.h"
  220.12  #include "SDL_mouse.h"
  220.13  #include "SDL_sysvideo.h"
   221.1 --- a/src/video/photon/SDL_ph_image.c	Fri Feb 10 03:21:39 2006 +0000
   221.2 +++ b/src/video/photon/SDL_ph_image.c	Fri Feb 10 06:48:43 2006 +0000
   221.3 @@ -23,10 +23,6 @@
   221.4  #include <Ph.h>
   221.5  #include <photon/Pg.h>
   221.6  
   221.7 -#include "SDL.h"
   221.8 -#include "SDL_stdlib.h"
   221.9 -#include "SDL_string.h"
  221.10 -#include "SDL_error.h"
  221.11  #include "SDL_endian.h"
  221.12  #include "SDL_video.h"
  221.13  #include "SDL_pixels_c.h"
   222.1 --- a/src/video/photon/SDL_ph_modes.c	Fri Feb 10 03:21:39 2006 +0000
   222.2 +++ b/src/video/photon/SDL_ph_modes.c	Fri Feb 10 06:48:43 2006 +0000
   222.3 @@ -20,7 +20,6 @@
   222.4      slouken@libsdl.org
   222.5  */
   222.6  
   222.7 -#include "SDL_error.h"
   222.8  #include "SDL_ph_modes_c.h"
   222.9  
  222.10  static PgVideoModeInfo_t mode_info;
   223.1 --- a/src/video/photon/SDL_ph_mouse.c	Fri Feb 10 03:21:39 2006 +0000
   223.2 +++ b/src/video/photon/SDL_ph_mouse.c	Fri Feb 10 06:48:43 2006 +0000
   223.3 @@ -20,9 +20,6 @@
   223.4      slouken@libsdl.org
   223.5  */
   223.6  
   223.7 -#include "SDL_stdlib.h"
   223.8 -#include "SDL_string.h"
   223.9 -#include "SDL_error.h"
  223.10  #include "SDL_mouse.h"
  223.11  #include "SDL_events_c.h"
  223.12  #include "SDL_cursor_c.h"
   224.1 --- a/src/video/photon/SDL_ph_video.c	Fri Feb 10 03:21:39 2006 +0000
   224.2 +++ b/src/video/photon/SDL_ph_video.c	Fri Feb 10 06:48:43 2006 +0000
   224.3 @@ -23,15 +23,11 @@
   224.4  #include <unistd.h>
   224.5  #include <sys/ioctl.h>
   224.6  
   224.7 -#include "SDL.h"
   224.8 -#include "SDL_stdlib.h"
   224.9 -#include "SDL_string.h"
  224.10 -#include "SDL_error.h"
  224.11 +#include "SDL_endian.h"
  224.12  #include "SDL_timer.h"
  224.13  #include "SDL_thread.h"
  224.14  #include "SDL_video.h"
  224.15  #include "SDL_mouse.h"
  224.16 -#include "SDL_endian.h"
  224.17  #include "SDL_sysvideo.h"
  224.18  #include "SDL_pixels_c.h"
  224.19  #include "SDL_events_c.h"
   225.1 --- a/src/video/photon/SDL_ph_wm.c	Fri Feb 10 03:21:39 2006 +0000
   225.2 +++ b/src/video/photon/SDL_ph_wm.c	Fri Feb 10 06:48:43 2006 +0000
   225.3 @@ -28,8 +28,6 @@
   225.4  #include <photon/wmapi.h>
   225.5  
   225.6  #include "SDL_version.h"
   225.7 -#include "SDL_string.h"
   225.8 -#include "SDL_error.h"
   225.9  #include "SDL_timer.h"
  225.10  #include "SDL_video.h"
  225.11  #include "SDL_syswm.h"
   226.1 --- a/src/video/photon/SDL_phyuv.c	Fri Feb 10 03:21:39 2006 +0000
   226.2 +++ b/src/video/photon/SDL_phyuv.c	Fri Feb 10 06:48:43 2006 +0000
   226.3 @@ -27,9 +27,6 @@
   226.4  #include <Ph.h>
   226.5  #include <Pt.h>
   226.6  
   226.7 -#include "SDL_stdlib.h"
   226.8 -#include "SDL_string.h"
   226.9 -#include "SDL_error.h"
  226.10  #include "SDL_video.h"
  226.11  #include "SDL_phyuv_c.h"
  226.12  #include "SDL_yuvfuncs.h"
   227.1 --- a/src/video/picogui/SDL_pgvideo.c	Fri Feb 10 03:21:39 2006 +0000
   227.2 +++ b/src/video/picogui/SDL_pgvideo.c	Fri Feb 10 06:48:43 2006 +0000
   227.3 @@ -23,10 +23,6 @@
   227.4      micahjd@users.sourceforge.net
   227.5  */
   227.6  
   227.7 -#include "SDL.h"
   227.8 -#include "SDL_stdlib.h"
   227.9 -#include "SDL_string.h"
  227.10 -#include "SDL_error.h"
  227.11  #include "SDL_video.h"
  227.12  #include "SDL_mouse.h"
  227.13  #include "SDL_sysvideo.h"
   228.1 --- a/src/video/ps2gs/SDL_gsevents.c	Fri Feb 10 03:21:39 2006 +0000
   228.2 +++ b/src/video/ps2gs/SDL_gsevents.c	Fri Feb 10 06:48:43 2006 +0000
   228.3 @@ -38,8 +38,6 @@
   228.4  #include <linux/kd.h>
   228.5  #include <linux/keyboard.h>
   228.6  
   228.7 -#include "SDL.h"
   228.8 -#include "SDL_string.h"
   228.9  #include "SDL_mutex.h"
  228.10  #include "SDL_sysevents.h"
  228.11  #include "SDL_sysvideo.h"
   229.1 --- a/src/video/ps2gs/SDL_gsmouse.c	Fri Feb 10 03:21:39 2006 +0000
   229.2 +++ b/src/video/ps2gs/SDL_gsmouse.c	Fri Feb 10 06:48:43 2006 +0000
   229.3 @@ -22,7 +22,6 @@
   229.4  
   229.5  #include <sys/ioctl.h>
   229.6  
   229.7 -#include "SDL_error.h"
   229.8  #include "SDL_mouse.h"
   229.9  #include "SDL_events_c.h"
  229.10  #include "SDL_cursor_c.h"
   230.1 --- a/src/video/ps2gs/SDL_gsvideo.c	Fri Feb 10 03:21:39 2006 +0000
   230.2 +++ b/src/video/ps2gs/SDL_gsvideo.c	Fri Feb 10 06:48:43 2006 +0000
   230.3 @@ -28,10 +28,6 @@
   230.4  #include <sys/ioctl.h>
   230.5  #include <sys/mman.h>
   230.6  
   230.7 -#include "SDL.h"
   230.8 -#include "SDL_stdlib.h"
   230.9 -#include "SDL_string.h"
  230.10 -#include "SDL_error.h"
  230.11  #include "SDL_video.h"
  230.12  #include "SDL_mouse.h"
  230.13  #include "SDL_sysvideo.h"
   231.1 --- a/src/video/ps2gs/SDL_gsyuv.c	Fri Feb 10 03:21:39 2006 +0000
   231.2 +++ b/src/video/ps2gs/SDL_gsyuv.c	Fri Feb 10 06:48:43 2006 +0000
   231.3 @@ -28,9 +28,6 @@
   231.4  #include <sys/mman.h>
   231.5  #include <asm/page.h>		/* For definition of PAGE_SIZE */
   231.6  
   231.7 -#include "SDL_stdlib.h"
   231.8 -#include "SDL_string.h"
   231.9 -#include "SDL_error.h"
  231.10  #include "SDL_video.h"
  231.11  #include "SDL_gsyuv_c.h"
  231.12  #include "SDL_yuvfuncs.h"
   232.1 --- a/src/video/qtopia/SDL_sysvideo.cc	Fri Feb 10 03:21:39 2006 +0000
   232.2 +++ b/src/video/qtopia/SDL_sysvideo.cc	Fri Feb 10 06:48:43 2006 +0000
   232.3 @@ -27,9 +27,6 @@
   232.4  #include <qapplication.h>
   232.5  #include <qpe/qpeapplication.h>
   232.6  
   232.7 -#include "SDL.h"
   232.8 -#include "SDL_stdlib.h"
   232.9 -#include "SDL_string.h"
  232.10  #include "SDL_timer.h"
  232.11  
  232.12  #include "SDL_QWin.h"
   233.1 --- a/src/video/quartz/SDL_QuartzEvents.m	Fri Feb 10 03:21:39 2006 +0000
   233.2 +++ b/src/video/quartz/SDL_QuartzEvents.m	Fri Feb 10 06:48:43 2006 +0000
   233.3 @@ -20,7 +20,6 @@
   233.4      slouken@libsdl.org
   233.5  */
   233.6  
   233.7 -#include "SDL_stdlib.h"
   233.8  #include "SDL_QuartzVideo.h"
   233.9  
  233.10  #include <IOKit/IOMessage.h> // For wake from sleep detection
   234.1 --- a/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Feb 10 03:21:39 2006 +0000
   234.2 +++ b/src/video/riscos/SDL_riscosFullScreenVideo.c	Fri Feb 10 06:48:43 2006 +0000
   234.3 @@ -27,10 +27,6 @@
   234.4       Implements RISC OS full screen display.
   234.5  */
   234.6  
   234.7 -#include "SDL.h"
   234.8 -#include "SDL_stdlib.h"
   234.9 -#include "SDL_string.h"
  234.10 -#include "SDL_error.h"
  234.11  #include "SDL_video.h"
  234.12  #include "SDL_mouse.h"
  234.13  #include "SDL_sysvideo.h"
   235.1 --- a/src/video/riscos/SDL_riscosmouse.c	Fri Feb 10 03:21:39 2006 +0000
   235.2 +++ b/src/video/riscos/SDL_riscosmouse.c	Fri Feb 10 06:48:43 2006 +0000
   235.3 @@ -27,8 +27,6 @@
   235.4       Implements mouse cursor shape definitions and positioning
   235.5  */
   235.6  
   235.7 -#include "SDL_stdlib.h"
   235.8 -#include "SDL_error.h"
   235.9  #include "SDL_mouse.h"
  235.10  #include "SDL_events_c.h"
  235.11  
   236.1 --- a/src/video/riscos/SDL_riscossprite.c	Fri Feb 10 03:21:39 2006 +0000
   236.2 +++ b/src/video/riscos/SDL_riscossprite.c	Fri Feb 10 06:48:43 2006 +0000
   236.3 @@ -30,7 +30,7 @@
   236.4  #include "kernel.h"
   236.5  #include "swis.h"
   236.6  
   236.7 -#include "SDL_stdlib.h"
   236.8 +#include "SDL_stdinc.h"
   236.9  #include "SDL_riscosvideo.h"
  236.10  
  236.11  extern void WIMP_ReadModeInfo(_THIS);
   237.1 --- a/src/video/riscos/SDL_riscostask.c	Fri Feb 10 03:21:39 2006 +0000
   237.2 +++ b/src/video/riscos/SDL_riscostask.c	Fri Feb 10 06:48:43 2006 +0000
   237.3 @@ -34,8 +34,7 @@
   237.4  #include "kernel.h"
   237.5  #include "swis.h"
   237.6  
   237.7 -#include "SDL_stdlib.h"
   237.8 -#include "SDL_string.h"
   237.9 +#include "SDL_stdinc.h"
  237.10  #include "SDL_riscostask.h"
  237.11  
  237.12  #ifndef DISABLE_THREADS
   238.1 --- a/src/video/riscos/SDL_riscosvideo.c	Fri Feb 10 03:21:39 2006 +0000
   238.2 +++ b/src/video/riscos/SDL_riscosvideo.c	Fri Feb 10 06:48:43 2006 +0000
   238.3 @@ -29,13 +29,9 @@
   238.4  	 into other source files.
   238.5  */
   238.6  
   238.7 -#include "SDL.h"
   238.8 -#include "SDL_stdlib.h"
   238.9 -#include "SDL_string.h"
  238.10 -#include "SDL_syswm.h"
  238.11 -#include "SDL_error.h"
  238.12  #include "SDL_video.h"
  238.13  #include "SDL_mouse.h"
  238.14 +#include "SDL_syswm.h"
  238.15  #include "SDL_sysvideo.h"
  238.16  #include "SDL_pixels_c.h"
  238.17  #include "SDL_events_c.h"
   239.1 --- a/src/video/riscos/SDL_wimpvideo.c	Fri Feb 10 03:21:39 2006 +0000
   239.2 +++ b/src/video/riscos/SDL_wimpvideo.c	Fri Feb 10 06:48:43 2006 +0000
   239.3 @@ -27,10 +27,6 @@
   239.4       Implements RISC OS Wimp display.
   239.5  */
   239.6  
   239.7 -#include "SDL.h"
   239.8 -#include "SDL_stdlib.h"
   239.9 -#include "SDL_string.h"
  239.10 -#include "SDL_error.h"
  239.11  #include "SDL_video.h"
  239.12  #include "SDL_mouse.h"
  239.13  #include "SDL_sysvideo.h"
   240.1 --- a/src/video/svga/SDL_svgaevents.c	Fri Feb 10 03:21:39 2006 +0000
   240.2 +++ b/src/video/svga/SDL_svgaevents.c	Fri Feb 10 06:48:43 2006 +0000
   240.3 @@ -34,9 +34,6 @@
   240.4  #error You must choose your operating system here
   240.5  #endif
   240.6  
   240.7 -#include "SDL.h"
   240.8 -#include "SDL_stdlib.h"
   240.9 -#include "SDL_string.h"
  240.10  #include "SDL_sysevents.h"
  240.11  #include "SDL_events_c.h"
  240.12  #include "SDL_svgavideo.h"
   241.1 --- a/src/video/svga/SDL_svgamouse.c	Fri Feb 10 03:21:39 2006 +0000
   241.2 +++ b/src/video/svga/SDL_svgamouse.c	Fri Feb 10 06:48:43 2006 +0000
   241.3 @@ -20,9 +20,6 @@
   241.4      slouken@libsdl.org
   241.5  */
   241.6  
   241.7 -#include <stdio.h>
   241.8 -
   241.9 -#include "SDL_error.h"
  241.10  #include "SDL_mouse.h"
  241.11  #include "SDL_events_c.h"
  241.12  #include "SDL_svgavideo.h"
   242.1 --- a/src/video/svga/SDL_svgavideo.c	Fri Feb 10 03:21:39 2006 +0000
   242.2 +++ b/src/video/svga/SDL_svgavideo.c	Fri Feb 10 06:48:43 2006 +0000
   242.3 @@ -40,10 +40,6 @@
   242.4  #include <vgamouse.h>
   242.5  #include <vgakeyboard.h>
   242.6  
   242.7 -#include "SDL.h"
   242.8 -#include "SDL_stdlib.h"
   242.9 -#include "SDL_string.h"
  242.10 -#include "SDL_error.h"
  242.11  #include "SDL_video.h"
  242.12  #include "SDL_mouse.h"
  242.13  #include "SDL_sysvideo.h"
   243.1 --- a/src/video/vgl/SDL_vglmouse.c	Fri Feb 10 03:21:39 2006 +0000
   243.2 +++ b/src/video/vgl/SDL_vglmouse.c	Fri Feb 10 06:48:43 2006 +0000
   243.3 @@ -20,9 +20,6 @@
   243.4      slouken@libsdl.org
   243.5  */
   243.6  
   243.7 -#include <stdio.h>
   243.8 -
   243.9 -#include "SDL_error.h"
  243.10  #include "SDL_mouse.h"
  243.11  #include "SDL_events_c.h"
  243.12  #include "SDL_vglvideo.h"
   244.1 --- a/src/video/vgl/SDL_vglvideo.c	Fri Feb 10 03:21:39 2006 +0000
   244.2 +++ b/src/video/vgl/SDL_vglvideo.c	Fri Feb 10 06:48:43 2006 +0000
   244.3 @@ -33,10 +33,6 @@
   244.4  #include <sys/kbio.h>
   244.5  #include <vgl.h>
   244.6  
   244.7 -#include "SDL.h"
   244.8 -#include "SDL_stdlib.h"
   244.9 -#include "SDL_string.h"
  244.10 -#include "SDL_error.h"
  244.11  #include "SDL_video.h"
  244.12  #include "SDL_mouse.h"
  244.13  #include "SDL_sysvideo.h"
   245.1 --- a/src/video/wincommon/SDL_sysevents.c	Fri Feb 10 03:21:39 2006 +0000
   245.2 +++ b/src/video/wincommon/SDL_sysevents.c	Fri Feb 10 06:48:43 2006 +0000
   245.3 @@ -22,13 +22,9 @@
   245.4  
   245.5  #include "SDL_windows.h"
   245.6  
   245.7 -#include "SDL_stdlib.h"
   245.8 -#include "SDL_string.h"
   245.9  #include "SDL_events.h"
  245.10  #include "SDL_video.h"
  245.11 -#include "SDL_error.h"
  245.12  #include "SDL_syswm.h"
  245.13 -#include "SDL_getenv.h"
  245.14  #include "SDL_sysevents.h"
  245.15  #include "SDL_events_c.h"
  245.16  #include "SDL_sysvideo.h"
   246.1 --- a/src/video/wincommon/SDL_sysmouse.c	Fri Feb 10 03:21:39 2006 +0000
   246.2 +++ b/src/video/wincommon/SDL_sysmouse.c	Fri Feb 10 06:48:43 2006 +0000
   246.3 @@ -22,9 +22,6 @@
   246.4  
   246.5  #include "SDL_windows.h"
   246.6  
   246.7 -#include "SDL_stdlib.h"
   246.8 -#include "SDL_string.h"
   246.9 -#include "SDL_error.h"
  246.10  #include "SDL_mouse.h"
  246.11  #include "SDL_sysmouse_c.h"
  246.12  #include "SDL_events_c.h"
   247.1 --- a/src/video/wincommon/SDL_syswm.c	Fri Feb 10 03:21:39 2006 +0000
   247.2 +++ b/src/video/wincommon/SDL_syswm.c	Fri Feb 10 06:48:43 2006 +0000
   247.3 @@ -23,9 +23,6 @@
   247.4  #include "SDL_windows.h"
   247.5  
   247.6  #include "SDL_version.h"
   247.7 -#include "SDL_stdlib.h"
   247.8 -#include "SDL_string.h"
   247.9 -#include "SDL_error.h"
  247.10  #include "SDL_video.h"
  247.11  #include "SDL_syswm.h"
  247.12  #include "SDL_syswm_c.h"
   248.1 --- a/src/video/wincommon/SDL_wingl.c	Fri Feb 10 03:21:39 2006 +0000
   248.2 +++ b/src/video/wincommon/SDL_wingl.c	Fri Feb 10 06:48:43 2006 +0000
   248.3 @@ -22,12 +22,9 @@
   248.4  
   248.5  /* WGL implementation of SDL OpenGL support */
   248.6  
   248.7 -#include "SDL_stdlib.h"
   248.8 -#include "SDL_string.h"
   248.9  #ifdef HAVE_OPENGL
  248.10  #include "SDL_opengl.h"
  248.11  #endif
  248.12 -#include "SDL_error.h"
  248.13  #include "SDL_lowvideo.h"
  248.14  #include "SDL_wingl_c.h"
  248.15  
   249.1 --- a/src/video/windib/SDL_dibevents.c	Fri Feb 10 03:21:39 2006 +0000
   249.2 +++ b/src/video/windib/SDL_dibevents.c	Fri Feb 10 06:48:43 2006 +0000
   249.3 @@ -22,10 +22,8 @@
   249.4  
   249.5  #include "SDL_windows.h"
   249.6  
   249.7 -#include "SDL_stdlib.h"
   249.8 -#include "SDL_string.h"
   249.9 +#include "SDL_main.h"
  249.10  #include "SDL_events.h"
  249.11 -#include "SDL_error.h"
  249.12  #include "SDL_syswm.h"
  249.13  #include "SDL_sysevents.h"
  249.14  #include "SDL_events_c.h"
   250.1 --- a/src/video/windib/SDL_dibvideo.c	Fri Feb 10 03:21:39 2006 +0000
   250.2 +++ b/src/video/windib/SDL_dibvideo.c	Fri Feb 10 06:48:43 2006 +0000
   250.3 @@ -34,10 +34,6 @@
   250.4  #define CDS_FULLSCREEN	4
   250.5  #endif
   250.6  
   250.7 -#include "SDL.h"
   250.8 -#include "SDL_stdlib.h"
   250.9 -#include "SDL_string.h"
  250.10 -#include "SDL_mutex.h"
  250.11  #include "SDL_syswm.h"
  250.12  #include "SDL_sysvideo.h"
  250.13  #include "SDL_sysevents.h"
   251.1 --- a/src/video/windx5/SDL_dx5events.c	Fri Feb 10 03:21:39 2006 +0000
   251.2 +++ b/src/video/windx5/SDL_dx5events.c	Fri Feb 10 06:48:43 2006 +0000
   251.3 @@ -24,11 +24,9 @@
   251.4  
   251.5  #include "directx.h"
   251.6  
   251.7 -#include "SDL_stdlib.h"
   251.8 -#include "SDL_string.h"
   251.9 +#include "SDL_main.h"
  251.10  #include "SDL_events.h"
  251.11  #include "SDL_video.h"
  251.12 -#include "SDL_error.h"
  251.13  #include "SDL_syswm.h"
  251.14  #include "SDL_sysevents.h"
  251.15  #include "SDL_events_c.h"
   252.1 --- a/src/video/windx5/SDL_dx5video.c	Fri Feb 10 03:21:39 2006 +0000
   252.2 +++ b/src/video/windx5/SDL_dx5video.c	Fri Feb 10 06:48:43 2006 +0000
   252.3 @@ -20,7 +20,6 @@
   252.4      slouken@libsdl.org
   252.5  */
   252.6  
   252.7 -#include "SDL_windows.h"
   252.8  #include "directx.h"
   252.9  
  252.10  /* Not yet in the mingw32 cross-compile headers */
  252.11 @@ -28,9 +27,6 @@
  252.12  #define CDS_FULLSCREEN	4
  252.13  #endif
  252.14  
  252.15 -#include "SDL_stdlib.h"
  252.16 -#include "SDL_string.h"
  252.17 -#include "SDL_error.h"
  252.18  #include "SDL_timer.h"
  252.19  #include "SDL_events.h"
  252.20  #include "SDL_syswm.h"
   253.1 --- a/src/video/windx5/SDL_dx5yuv.c	Fri Feb 10 03:21:39 2006 +0000
   253.2 +++ b/src/video/windx5/SDL_dx5yuv.c	Fri Feb 10 06:48:43 2006 +0000
   253.3 @@ -22,9 +22,6 @@
   253.4  
   253.5  /* This is the DirectDraw implementation of YUV video overlays */
   253.6  
   253.7 -#include "SDL_stdlib.h"
   253.8 -#include "SDL_string.h"
   253.9 -#include "SDL_error.h"
  253.10  #include "SDL_video.h"
  253.11  #include "SDL_dx5yuv_c.h"
  253.12  #include "SDL_yuvfuncs.h"
   254.1 --- a/src/video/wscons/SDL_wsconsmouse.c	Fri Feb 10 03:21:39 2006 +0000
   254.2 +++ b/src/video/wscons/SDL_wsconsmouse.c	Fri Feb 10 06:48:43 2006 +0000
   254.3 @@ -20,9 +20,6 @@
   254.4      slouken@libsdl.org
   254.5  */
   254.6  
   254.7 -#include <stdio.h>
   254.8 -
   254.9 -#include "SDL_error.h"
  254.10  #include "SDL_mouse.h"
  254.11  #include "SDL_events_c.h"
  254.12  
   255.1 --- a/src/video/wscons/SDL_wsconsvideo.c	Fri Feb 10 03:21:39 2006 +0000
   255.2 +++ b/src/video/wscons/SDL_wsconsvideo.c	Fri Feb 10 06:48:43 2006 +0000
   255.3 @@ -28,10 +28,6 @@
   255.4  #include <unistd.h>
   255.5  #include <errno.h>
   255.6  
   255.7 -#include "SDL.h"
   255.8 -#include "SDL_stdlib.h"
   255.9 -#include "SDL_string.h"
  255.10 -#include "SDL_error.h"
  255.11  #include "SDL_video.h"
  255.12  #include "SDL_mouse.h"
  255.13  #include "SDL_sysvideo.h"
   256.1 --- a/src/video/x11/SDL_x11dga.c	Fri Feb 10 03:21:39 2006 +0000
   256.2 +++ b/src/video/x11/SDL_x11dga.c	Fri Feb 10 06:48:43 2006 +0000
   256.3 @@ -25,8 +25,6 @@
   256.4     There will be a completely separate DGA driver that is fullscreen-only.
   256.5  */
   256.6  
   256.7 -#include "SDL_stdlib.h"
   256.8 -#include "SDL_string.h"
   256.9  #include "SDL_video.h"
  256.10  #include "SDL_cursor_c.h"
  256.11  #include "SDL_x11dga_c.h"
   257.1 --- a/src/video/x11/SDL_x11events.c	Fri Feb 10 03:21:39 2006 +0000
   257.2 +++ b/src/video/x11/SDL_x11events.c	Fri Feb 10 06:48:43 2006 +0000
   257.3 @@ -33,8 +33,6 @@
   257.4  #include <sys/time.h>
   257.5  #include <unistd.h>
   257.6  
   257.7 -#include "SDL.h"
   257.8 -#include "SDL_string.h"
   257.9  #include "SDL_syswm.h"
  257.10  #include "SDL_sysevents.h"
  257.11  #include "SDL_sysvideo.h"
   258.1 --- a/src/video/x11/SDL_x11gl.c	Fri Feb 10 03:21:39 2006 +0000
   258.2 +++ b/src/video/x11/SDL_x11gl.c	Fri Feb 10 06:48:43 2006 +0000
   258.3 @@ -20,9 +20,6 @@
   258.4      slouken@libsdl.org
   258.5  */
   258.6  
   258.7 -#include "SDL_stdlib.h"
   258.8 -#include "SDL_string.h"
   258.9 -#include "SDL_error.h"
  258.10  #include "SDL_x11video.h"
  258.11  #include "SDL_events_c.h"
  258.12  #include "SDL_x11dga_c.h"
   259.1 --- a/src/video/x11/SDL_x11image.c	Fri Feb 10 03:21:39 2006 +0000
   259.2 +++ b/src/video/x11/SDL_x11image.c	Fri Feb 10 06:48:43 2006 +0000
   259.3 @@ -23,9 +23,6 @@
   259.4  #include <stdio.h>
   259.5  #include <unistd.h>
   259.6  
   259.7 -#include "SDL_stdlib.h"
   259.8 -#include "SDL_string.h"
   259.9 -#include "SDL_error.h"
  259.10  #include "SDL_endian.h"
  259.11  #include "SDL_events_c.h"
  259.12  #include "SDL_x11image_c.h"
   260.1 --- a/src/video/x11/SDL_x11modes.c	Fri Feb 10 03:21:39 2006 +0000
   260.2 +++ b/src/video/x11/SDL_x11modes.c	Fri Feb 10 06:48:43 2006 +0000
   260.3 @@ -24,10 +24,7 @@
   260.4  
   260.5  #include <stdio.h>
   260.6  
   260.7 -#include "SDL_stdlib.h"
   260.8 -#include "SDL_string.h"
   260.9  #include "SDL_timer.h"
  260.10 -#include "SDL_error.h"
  260.11  #include "SDL_events.h"
  260.12  #include "SDL_events_c.h"
  260.13  #include "SDL_x11video.h"
   261.1 --- a/src/video/x11/SDL_x11mouse.c	Fri Feb 10 03:21:39 2006 +0000
   261.2 +++ b/src/video/x11/SDL_x11mouse.c	Fri Feb 10 06:48:43 2006 +0000
   261.3 @@ -23,9 +23,6 @@
   261.4  #include <X11/Xlib.h>
   261.5  #include <X11/Xutil.h>
   261.6  
   261.7 -#include "SDL_stdlib.h"
   261.8 -#include "SDL_string.h"
   261.9 -#include "SDL_error.h"
  261.10  #include "SDL_mouse.h"
  261.11  #include "SDL_events_c.h"
  261.12  #include "SDL_cursor_c.h"
   262.1 --- a/src/video/x11/SDL_x11video.c	Fri Feb 10 03:21:39 2006 +0000
   262.2 +++ b/src/video/x11/SDL_x11video.c	Fri Feb 10 06:48:43 2006 +0000
   262.3 @@ -34,15 +34,11 @@
   262.4  #include <sys/fcntl.h>
   262.5  #endif
   262.6  
   262.7 -#include "SDL.h"
   262.8 -#include "SDL_stdlib.h"
   262.9 -#include "SDL_string.h"
  262.10 -#include "SDL_error.h"
  262.11 +#include "SDL_endian.h"
  262.12  #include "SDL_timer.h"
  262.13  #include "SDL_thread.h"
  262.14  #include "SDL_video.h"
  262.15  #include "SDL_mouse.h"
  262.16 -#include "SDL_endian.h"
  262.17  #include "SDL_sysvideo.h"
  262.18  #include "SDL_pixels_c.h"
  262.19  #include "SDL_events_c.h"
   263.1 --- a/src/video/x11/SDL_x11wm.c	Fri Feb 10 03:21:39 2006 +0000
   263.2 +++ b/src/video/x11/SDL_x11wm.c	Fri Feb 10 06:48:43 2006 +0000
   263.3 @@ -24,9 +24,6 @@
   263.4  #include <X11/Xutil.h>
   263.5  
   263.6  #include "SDL_version.h"
   263.7 -#include "SDL_stdlib.h"
   263.8 -#include "SDL_string.h"
   263.9 -#include "SDL_error.h"
  263.10  #include "SDL_timer.h"
  263.11  #include "SDL_video.h"
  263.12  #include "SDL_syswm.h"
   264.1 --- a/src/video/x11/SDL_x11yuv.c	Fri Feb 10 03:21:39 2006 +0000
   264.2 +++ b/src/video/x11/SDL_x11yuv.c	Fri Feb 10 06:48:43 2006 +0000
   264.3 @@ -32,9 +32,6 @@
   264.4  #endif
   264.5  #include <Xext/extensions/Xvlib.h>
   264.6  
   264.7 -#include "SDL_stdlib.h"
   264.8 -#include "SDL_string.h"
   264.9 -#include "SDL_error.h"
  264.10  #include "SDL_video.h"
  264.11  #include "SDL_x11yuv_c.h"
  264.12  #include "SDL_yuvfuncs.h"
   265.1 --- a/src/video/xbios/SDL_xbios.c	Fri Feb 10 03:21:39 2006 +0000
   265.2 +++ b/src/video/xbios/SDL_xbios.c	Fri Feb 10 06:48:43 2006 +0000
   265.3 @@ -34,10 +34,6 @@
   265.4  #include <mint/osbind.h>
   265.5  #include <mint/falcon.h>
   265.6  
   265.7 -#include "SDL.h"
   265.8 -#include "SDL_stdlib.h"
   265.9 -#include "SDL_string.h"
  265.10 -#include "SDL_error.h"
  265.11  #include "SDL_video.h"
  265.12  #include "SDL_mouse.h"
  265.13  #include "SDL_sysvideo.h"
   266.1 --- a/src/video/xbios/SDL_xbios.h	Fri Feb 10 03:21:39 2006 +0000
   266.2 +++ b/src/video/xbios/SDL_xbios.h	Fri Feb 10 06:48:43 2006 +0000
   266.3 @@ -23,7 +23,7 @@
   266.4  #ifndef _SDL_xbios_h
   266.5  #define _SDL_xbios_h
   266.6  
   266.7 -#include "SDL_types.h"
   266.8 +#include "SDL_stdinc.h"
   266.9  #include "SDL_sysvideo.h"
  266.10  
  266.11  /* Hidden "this" pointer for the video functions */
   267.1 --- a/src/video/xbios/SDL_xbios_centscreen.c	Fri Feb 10 03:21:39 2006 +0000
   267.2 +++ b/src/video/xbios/SDL_xbios_centscreen.c	Fri Feb 10 06:48:43 2006 +0000
   267.3 @@ -28,8 +28,6 @@
   267.4  
   267.5  #include <mint/falcon.h>
   267.6  
   267.7 -#include "SDL_stdlib.h"
   267.8 -#include "SDL_string.h"
   267.9  #include "SDL_xbios.h"
  267.10  #include "SDL_xbios_centscreen.h"
  267.11  
   268.1 --- a/src/video/xbios/SDL_xbios_sb3.c	Fri Feb 10 03:21:39 2006 +0000
   268.2 +++ b/src/video/xbios/SDL_xbios_sb3.c	Fri Feb 10 06:48:43 2006 +0000
   268.3 @@ -28,7 +28,7 @@
   268.4  
   268.5  /*--- Includes ---*/
   268.6  
   268.7 -#include "SDL_stdlib.h"
   268.8 +#include "SDL_stdinc.h"
   268.9  #include "SDL_xbios.h"
  268.10  #include "SDL_xbios_sb3.h"
  268.11