diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 8a874344e..566c7ab25 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,7 @@
 Changes towards version 0.4:
+- OpenAL header cleanup. Updating OpenAL may be necessary.
+  Windows users should put the OpenAL headers in an AL/ directory
+  now too (should be the default). - SvdB
 - Improvements to the unix build system for cross-compilation - SvdB
 - Do not define ssize_t for MinGW. - SvdB
 - Fallback readdir_r() - SvdB
diff --git a/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h b/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h
index 7514eda24..01a212659 100644
--- a/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h
+++ b/sc2/src/sc2code/libs/sound/openal/audiodrv_openal.h
@@ -24,31 +24,15 @@
 #include "libs/sound/sound.h"
 #include "options.h"
 
-#if defined(WIN32)
-#	include <al.h>
-#	include <alc.h>
-#	ifdef _MSC_VER
-#		pragma comment (lib, "OpenAL32.lib")
-#	endif
-#elif defined (__APPLE__)
+#if defined (__APPLE__)
 #	include <OpenAL/al.h>
 #	include <OpenAL/alc.h>
 #else
 #	include <AL/al.h>
 #	include <AL/alc.h>
-	/* XXX: In new versions of OpenAL the defines AL_INVALID_ENUM and
-	 *      AL_INVALID_OPERATION are already defined.
-	 *      As you can only get OpenAL from CVS (or a 3rd party package),
-	 *      we can probably remove these defines altogether in the near
-	 *      future.
-	 */
-#	ifndef AL_INVALID_ENUM
-#		define AL_INVALID_ENUM      AL_ILLEGAL_ENUM
+#	ifdef _MSC_VER
+#		pragma comment (lib, "OpenAL32.lib")
 #	endif
-#	ifndef AL_INVALID_OPERATION
-#		define AL_INVALID_OPERATION AL_ILLEGAL_COMMAND
-#	endif
-#	define AL_DATA              0x2005
 #endif
 
 /* This is just a simple endianness setup for decoders */