diff --git a/ui/drivers/cocoa/cocoa_defines.h b/ui/drivers/cocoa/cocoa_defines.h
index d636271708..f2f6fd887e 100644
--- a/ui/drivers/cocoa/cocoa_defines.h
+++ b/ui/drivers/cocoa/cocoa_defines.h
@@ -23,10 +23,6 @@
 #define MAC_OS_X_VERSION_10_12 101200
 #endif
 
-#ifndef NSEventModifierFlags
-#define NSEventModifierFlags NSUInteger
-#endif
-
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
 #define NSEventModifierFlagCommand NSCommandKeyMask
 #define NSEventModifierFlagControl NSControlKeyMask
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 1e3433abd6..16bdff8cbe 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -78,7 +78,7 @@ static char **waiting_argv;
             uint32_t mod              = 0;
             const char *inputTextUTF8 = ch.UTF8String;
             uint32_t character        = inputTextUTF8[0];
-            NSEventModifierFlags mods = event.modifierFlags;
+            NSUInteger mods           = event.modifierFlags;
             uint16_t keycode          = event.keyCode;
 
                if (mods & NSEventModifierFlagCapsLock)
@@ -108,8 +108,8 @@ static char **waiting_argv;
         case NSFlagsChanged:
 #endif
          {
-            static NSEventModifierFlags old_flags = 0;
-            NSEventModifierFlags new_flags        = event.modifierFlags;
+            static NSUInteger old_flags           = 0;
+            NSUInteger new_flags                  = event.modifierFlags;
             bool down                             = (new_flags & old_flags) == old_flags;
             uint16_t keycode                      = event.keyCode;
 
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 744e4a4b50..51ea74d875 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -190,18 +190,19 @@ enum
         NSString       *ch = (NSString*)event._privateInput;
         uint32_t character = 0;
         uint32_t mod       = 0;
+        NSUInteger mods    = event._modifierFlags;
 
-        if (event._modifierFlags & NSAlphaShiftKeyMask)
+        if (mods & NSAlphaShiftKeyMask)
            mod |= RETROKMOD_CAPSLOCK;
-        if (event._modifierFlags & NSShiftKeyMask)
+        if (mods & NSShiftKeyMask)
            mod |= RETROKMOD_SHIFT;
-        if (event._modifierFlags & NSControlKeyMask)
+        if (mods & NSControlKeyMask)
            mod |= RETROKMOD_CTRL;
-        if (event._modifierFlags & NSAlternateKeyMask)
+        if (mods & NSAlternateKeyMask)
            mod |= RETROKMOD_ALT;
-        if (event._modifierFlags & NSCommandKeyMask)
+        if (mods & NSCommandKeyMask)
            mod |= RETROKMOD_META;
-        if (event._modifierFlags & NSNumericPadKeyMask)
+        if (mods & NSNumericPadKeyMask)
            mod |= RETROKMOD_NUMLOCK;
 
         if (ch && ch.length != 0)
@@ -246,18 +247,19 @@ enum
       NSString       *ch = (NSString*)event._privateInput;
       uint32_t character = 0;
       uint32_t mod       = 0;
+      NSUInteger mods    = event._modifierFlags;
 
-      if (event._modifierFlags & NSAlphaShiftKeyMask)
+      if (mods & NSAlphaShiftKeyMask)
          mod |= RETROKMOD_CAPSLOCK;
-      if (event._modifierFlags & NSShiftKeyMask)
+      if (mods & NSShiftKeyMask)
          mod |= RETROKMOD_SHIFT;
-      if (event._modifierFlags & NSControlKeyMask)
+      if (mods & NSControlKeyMask)
          mod |= RETROKMOD_CTRL;
-      if (event._modifierFlags & NSAlternateKeyMask)
+      if (mods & NSAlternateKeyMask)
          mod |= RETROKMOD_ALT;
-      if (event._modifierFlags & NSCommandKeyMask)
+      if (mods & NSCommandKeyMask)
          mod |= RETROKMOD_META;
-      if (event._modifierFlags & NSNumericPadKeyMask)
+      if (mods & NSNumericPadKeyMask)
          mod |= RETROKMOD_NUMLOCK;
 
       if (ch && ch.length != 0)