diff --git a/apple/common/GameController/GameController.h b/apple/common/GameController/GameController.h
index 30735c35b9..5ccfb52800 100644
--- a/apple/common/GameController/GameController.h
+++ b/apple/common/GameController/GameController.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <Availability.h>
+#include <AvailabilityMacros.h>
 
 #ifdef __cplusplus
 #define GAMECONTROLLER_EXTERN		extern "C" __attribute__((visibility ("default")))
@@ -32,4 +32,4 @@
 #import "GCExtendedGamepad.h"
 #import "GCExtendedGamepadSnapshot.h"
 
-#import "GCController.h"
\ No newline at end of file
+#import "GCController.h"
diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m
index f91cd7ddf6..ef899319b6 100644
--- a/apple/common/apple_gamecontroller.m
+++ b/apple/common/apple_gamecontroller.m
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <Availability.h>
+#include <AvailabilityMacros.h>
 #include "RetroArch_Apple.h"
 #import "GameController/GameController.h"
 #include "apple_gamecontroller.h"
diff --git a/libretro-common/include/compat/apple_compat.h b/libretro-common/include/compat/apple_compat.h
index 60461a4719..8d86ac004f 100644
--- a/libretro-common/include/compat/apple_compat.h
+++ b/libretro-common/include/compat/apple_compat.h
@@ -20,9 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef IOS
-#import <Availability.h>
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
 
+#ifdef IOS
 #ifndef __IPHONE_5_0
 #warning "This project uses features only available in iOS SDK 5.0 and later."
 #endif
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 4969b87183..83bb700b76 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1257,6 +1257,8 @@ static void xmb_frame(void)
 
    if (!menu)
       return;
+    
+   (void)font_driver;
 
    xmb = (xmb_handle_t*)menu->userdata;