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

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

src/audio/SDL_audio.c

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

src/audio/SDL_audiocvt.c

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

src/audio/SDL_audiodev.c

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

src/audio/SDL_audiomem.c

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

src/audio/SDL_mixer.c

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

src/audio/SDL_wave.c

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

src/audio/alsa/SDL_alsa_audio.c

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

src/audio/amigaos/SDL_ahiaudio.c

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

src/audio/arts/SDL_artsaudio.c

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

src/audio/baudio/SDL_beaudio.cc

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

src/audio/dart/SDL_dart.c

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

src/audio/dc/SDL_dcaudio.c

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

src/audio/disk/SDL_diskaudio.c

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

src/audio/dma/SDL_dmaaudio.c

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

src/audio/dmedia/SDL_irixaudio.c

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

src/audio/dsp/SDL_dspaudio.c

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

src/audio/esd/SDL_esdaudio.c

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

src/audio/macosx/SDL_coreaudio.c

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

src/audio/macrom/SDL_romaudio.c

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

src/audio/mint/SDL_mintaudio.c

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

src/audio/mint/SDL_mintaudio_dma8.c

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

src/audio/mint/SDL_mintaudio_gsxb.c

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

src/audio/mint/SDL_mintaudio_mcsn.c

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

src/audio/mint/SDL_mintaudio_stfa.c

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

src/audio/mint/SDL_mintaudio_xbios.c

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

src/audio/mme/SDL_mmeaudio.c

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

src/audio/nas/SDL_nasaudio.c

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

src/audio/nto/SDL_nto_audio.c

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

src/audio/openbsd/SDL_openbsdaudio.c

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

src/audio/paudio/SDL_paudio.c

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

src/audio/sun/SDL_sunaudio.c

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

src/audio/ums/SDL_umsaudio.c

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

src/audio/windib/SDL_dibaudio.c

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

src/audio/windx5/SDL_dx5audio.c

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