diff --git a/src/audio/amigaos/SDL_ahiaudio.c b/src/audio/amigaos/SDL_ahiaudio.c
index 1db0f8457..f2efe1c2f 100644
--- a/src/audio/amigaos/SDL_ahiaudio.c
+++ b/src/audio/amigaos/SDL_ahiaudio.c
@@ -220,7 +220,7 @@ static void AHI_CloseAudio(_THIS)
 
 static int AHI_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {	
-    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     int valid_datatype = 1;
 
     D(bug("AHI opening...\n"));
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
index a88d09759..fce0ecb32 100644
--- a/src/audio/baudio/SDL_beaudio.cc
+++ b/src/audio/baudio/SDL_beaudio.cc
@@ -154,7 +154,7 @@ int BE_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
     int valid_datatype = 0;
     media_raw_audio_format format;
-    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
 
     /* Parse the audio format and fill the Be raw audio format */
     memset(&format, '\0', sizeof (media_raw_audio_format));
diff --git a/src/audio/dart/SDL_dart.c b/src/audio/dart/SDL_dart.c
index 8cdf68aba..a37a5e222 100644
--- a/src/audio/dart/SDL_dart.c
+++ b/src/audio/dart/SDL_dart.c
@@ -75,7 +75,7 @@ LONG APIENTRY DARTEventFunc(ULONG ulStatus,
 
 int DART_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
-  SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+  Uint16 test_format = SDL_FirstAudioFormat(spec->format);
   int valid_datatype = 0;
   MCI_AMP_OPEN_PARMS AmpOpenParms;
   MCI_GENERIC_PARMS GenericParms;
diff --git a/src/audio/dc/SDL_dcaudio.c b/src/audio/dc/SDL_dcaudio.c
index 7dc8410d0..a28ea5a7f 100644
--- a/src/audio/dc/SDL_dcaudio.c
+++ b/src/audio/dc/SDL_dcaudio.c
@@ -201,7 +201,7 @@ static void DCAUD_CloseAudio(_THIS)
 
 static int DCAUD_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
-    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     int valid_datatype = 0;
     while ((!valid_datatype) && (test_format)) {
         spec->format = test_format;
diff --git a/src/audio/dmedia/SDL_irixaudio.c b/src/audio/dmedia/SDL_irixaudio.c
index 37352ae55..f9bd31047 100644
--- a/src/audio/dmedia/SDL_irixaudio.c
+++ b/src/audio/dmedia/SDL_irixaudio.c
@@ -141,7 +141,7 @@ static void AL_CloseAudio(_THIS)
 
 static int AL_OpenAudio(_THIS, SDL_AudioSpec * spec)
 {
-	SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+	Uint16 test_format = SDL_FirstAudioFormat(spec->format);
 	long width = 0;
 	long fmt = 0;
 	int valid = 0;
diff --git a/src/audio/mint/SDL_mintaudio_gsxb.c b/src/audio/mint/SDL_mintaudio_gsxb.c
index 742ff439e..4bac88d25 100644
--- a/src/audio/mint/SDL_mintaudio_gsxb.c
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c
@@ -201,7 +201,7 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec)
 {
 	long snd_format;
 	int i, resolution, format_signed, format_bigendian;
-    SDL_AudioFormat test_format = SDL_FirstAudioFormat(spec->format);
+    Uint16 test_format = SDL_FirstAudioFormat(spec->format);
     int valid_datatype = 0;
 
 	resolution = spec->format & 0x00ff;
@@ -222,9 +222,9 @@ static int Mint_CheckAudio(_THIS, SDL_AudioSpec *spec)
         /* Check formats available */
         snd_format = Sndstatus(SND_QUERYFORMATS);
         spec->format = test_format;
-        resolution = SDL_AUDIO_BITSIZE(spec->format);
-        format_signed = SDL_AUDIO_ISSIGNED(spec->format);
-        format_bigendian = SDL_AUDIO_ISBIGENDIAN(spec->format);
+        resolution = spec->format & 0xff;
+        format_signed = (spec->format & (1<<15));
+        format_bigendian = (spec->format & (1<<12));
         switch (test_format) {
             case AUDIO_U8:
             case AUDIO_S8: