diff --git a/configure.in b/configure.in
index 17b80a24..464ebcbe 100644
--- a/configure.in
+++ b/configure.in
@@ -2178,7 +2178,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         fi
         # Set up files for the audio library
         if test x$enable_audio = xyes; then
-            AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
+            AC_DEFINE(SDL_AUDIO_DRIVER_WINWAVEOUT)
             SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
             if test x$have_dsound = xyes; then
                 AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
index ed1128cc..79864853 100644
--- a/include/SDL_config.h.in
+++ b/include/SDL_config.h.in
@@ -174,7 +174,7 @@
 #undef SDL_AUDIO_DRIVER_QNXNTO
 #undef SDL_AUDIO_DRIVER_SNDMGR
 #undef SDL_AUDIO_DRIVER_SUNAUDIO
-#undef SDL_AUDIO_DRIVER_WAVEOUT
+#undef SDL_AUDIO_DRIVER_WINWAVEOUT
 
 /* Enable various cdrom drivers */
 #undef SDL_CDROM_AIX
diff --git a/include/SDL_config_win32.h b/include/SDL_config_win32.h
index e00c2334..c82dc5f5 100644
--- a/include/SDL_config_win32.h
+++ b/include/SDL_config_win32.h
@@ -118,7 +118,7 @@ typedef unsigned int uintptr_t;
 #ifndef _WIN32_WCE
 #define SDL_AUDIO_DRIVER_DSOUND	1
 #endif
-#define SDL_AUDIO_DRIVER_WAVEOUT	1
+#define SDL_AUDIO_DRIVER_WINWAVEOUT	1
 #define SDL_AUDIO_DRIVER_DISK	1
 #define SDL_AUDIO_DRIVER_DUMMY	1
 
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 6f7fe6fd..301040d5 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -54,7 +54,7 @@ extern AudioBootStrap ARTS_bootstrap;
 extern AudioBootStrap ESD_bootstrap;
 extern AudioBootStrap NAS_bootstrap;
 extern AudioBootStrap DSOUND_bootstrap;
-extern AudioBootStrap WAVEOUT_bootstrap;
+extern AudioBootStrap WINWAVEOUT_bootstrap;
 extern AudioBootStrap PAUDIO_bootstrap;
 extern AudioBootStrap BEOSAUDIO_bootstrap;
 extern AudioBootStrap COREAUDIO_bootstrap;
@@ -104,8 +104,8 @@ static AudioBootStrap *bootstrap[] = {
 #if SDL_AUDIO_DRIVER_DSOUND
     &DSOUND_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_WAVEOUT
-    &WAVEOUT_bootstrap,
+#if SDL_AUDIO_DRIVER_WINWAVEOUT
+    &WINWAVEOUT_bootstrap,
 #endif
 #if SDL_AUDIO_DRIVER_PAUDIO
     &PAUDIO_bootstrap,