diff --git a/src/SDL_log.c b/src/SDL_log.c
index dd6026c7c4..34c6fe8ae0 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -486,7 +486,8 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
         fclose (pFile);
     }
 #endif
-#if HAVE_STDIO_H
+#if HAVE_STDIO_H && \
+    !(defined(__APPLE__) && (defined(SDL_VIDEO_DRIVER_COCOA) || defined(SDL_VIDEO_DRIVER_UIKIT)))
     fprintf(stderr, "%s: %s\n", SDL_priority_prefixes[priority], message);
 #if __NACL__
     fflush(stderr);
diff --git a/src/joystick/iphoneos/SDL_mfijoystick.m b/src/joystick/iphoneos/SDL_mfijoystick.m
index 6c04e3800e..dbd1d8c09d 100644
--- a/src/joystick/iphoneos/SDL_mfijoystick.m
+++ b/src/joystick/iphoneos/SDL_mfijoystick.m
@@ -632,18 +632,13 @@ SDL_AppleTVRemoteRotationHintChanged(void *udata, const char *name, const char *
 }
 #endif /* TARGET_OS_TV */
 
-#if defined(__MACOSX__)
-static int is_macos11(void)
-{
-    return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_15);
-}
-#endif
-
 static int
 IOS_JoystickInit(void)
 {
 #if defined(__MACOSX__)
-    if (!is_macos11()) {
+    if (@available(macOS 10.16, *)) {
+        /* Continue with initialization on macOS 11+ */
+    } else {
         return 0;
     }
 #endif
@@ -1654,7 +1649,7 @@ IOS_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping *out)
 #if defined(SDL_JOYSTICK_MFI) && defined(__MACOSX__)
 SDL_bool IOS_SupportedHIDDevice(IOHIDDeviceRef device)
 {
-    if (is_macos11()) {
+    if (@available(macOS 10.16, *)) {
         if ([GCController supportsHIDDevice:device]) {
             return SDL_TRUE;
         }