diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c
index 3d0a9aa63f..72613fcf22 100644
--- a/input/drivers_keyboard/keyboard_event_apple.c
+++ b/input/drivers_keyboard/keyboard_event_apple.c
@@ -275,7 +275,9 @@ void cocoa_input_keyboard_event(bool down,
       unsigned code, uint32_t character, uint32_t mod, unsigned device)
 {
    driver_t *driver = driver_get_ptr();
+#if TARGET_OS_IPHONE
    settings_t *settings = config_get_ptr();
+#endif
    cocoa_input_data_t *apple = (cocoa_input_data_t*)driver->input_data;
 
    if (!apple)
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 54cbb475e0..dbc2b5b262 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -50,13 +50,7 @@
 #ifdef __APPLE__
 #include "drivers/apple_keycode.h"
 
-struct apple_key_name_map_entry
-{
-   const char* const keyname;
-   const uint32_t hid_id;
-};
-
-const apple_key_name_map_entry_t apple_key_name_map[] =
+const struct apple_key_name_map_entry apple_key_name_map[] =
 {
    { "left", KEY_Left },
    { "right", KEY_Right },
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index d84dd9c6ba..8aeac14f9b 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -38,9 +38,13 @@ struct input_key_map
 };
 
 #ifdef __APPLE__
-typedef struct apple_key_name_map_entry apple_key_name_map_entry_t;
-
-const apple_key_name_map_entry_t apple_key_name_map[];
+struct apple_key_name_map_entry
+{
+   const char* const keyname;
+   const uint32_t hid_id;
+};
+    
+extern const struct apple_key_name_map_entry apple_key_name_map[];
 #endif
 
 extern const struct input_key_map input_config_key_map[];