diff --git a/src/music/cocoa_m.cpp b/src/music/cocoa_m.cpp
index a201984..925dc21 100644
--- a/src/music/cocoa_m.cpp
+++ b/src/music/cocoa_m.cpp
@@ -30,6 +30,10 @@
 
 #include "../safeguards.h"
 
+#if !defined(HAVE_OSX_1011_SDK)
+#define kMusicSequenceFile_AnyType 0
+#endif
+
 static FMusicDriver_Cocoa iFMusicDriver_Cocoa;
 
 
@@ -68,7 +72,7 @@ static void DoSetVolume()
 			 * risk compilation errors. The header AudioComponent.h
 			 * was introduced in 10.6 so use it to decide which
 			 * type definition to use. */
-#ifdef __AUDIOCOMPONENT_H__
+#if defined(__AUDIOCOMPONENT_H__) || defined(HAVE_OSX_107_SDK)
 			AudioComponentDescription desc;
 #else
 			ComponentDescription desc;
@@ -159,7 +163,7 @@ void MusicDriver_Cocoa::PlaySong(const char *filename)
 
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 	if (MacOSVersionIsAtLeast(10, 5, 0)) {
-		if (MusicSequenceFileLoad(_sequence, url, 0, 0) != noErr) {
+		if (MusicSequenceFileLoad(_sequence, url, kMusicSequenceFile_AnyType, 0) != noErr) {
 			DEBUG(driver, 0, "cocoa_m: Failed to load MIDI file");
 			CFRelease(url);
 			return;
diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h
index 35b3f43..99246ef 100644
--- a/src/os/macosx/osx_stdafx.h
+++ b/src/os/macosx/osx_stdafx.h
@@ -12,6 +12,16 @@
 #ifndef MACOS_STDAFX_H
 #define MACOS_STDAFX_H
 
+#include <AvailabilityMacros.h>
+
+/* We assume if these macros are defined, the SDK is also at least this version or later. */
+#ifdef MAC_OS_X_VERSION_10_7
+#define HAVE_OSX_107_SDK
+#endif
+
+#ifdef MAC_OS_X_VERSION_10_11
+#define HAVE_OSX_1011_SDK
+#endif
 
 /* It would seem that to ensure backward compability we have to ensure that we have defined MAC_OS_X_VERSION_10_x everywhere */
 #ifndef MAC_OS_X_VERSION_10_3
@@ -42,7 +52,6 @@
 #define MAC_OS_X_VERSION_10_9 1090
 #endif
 
-
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
@@ -57,8 +66,6 @@
 #	error "Compiling 64 bits without _SQ64 set! (or vice versa)"
 #endif
 
-#include <AvailabilityMacros.h>
-
 /* Name conflict */
 #define Rect        OTTDRect
 #define Point       OTTDPoint