diff --git a/settings_data.c b/settings_data.c
index 2ce17828f6..5cda3f8644 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -20,7 +20,10 @@
 #include "input/input_common.h"
 #include "config.def.h"
 
-// Input
+#ifdef APPLE
+#include "input/apple_keycode.h"
+#endif
+
 static void get_input_config_prefix(char *buf, size_t sizeof_buf,
       const rarch_setting_t *setting)
 {
diff --git a/settings_data.h b/settings_data.h
index ee328a4389..fb2f1b56ba 100644
--- a/settings_data.h
+++ b/settings_data.h
@@ -23,9 +23,9 @@
 extern "C" {
 #endif
 
-#define SETTINGS_DATA_LIST_SIZE 512
+typedef void (*change_handler_t)(const void *data);
 
-#define BINDFOR(s) (*(&s)->value.keybind)
+#define BINDFOR(s) (*(&(s))->value.keybind)
 
 enum setting_type
 {
@@ -54,8 +54,6 @@ enum setting_flags
    SD_FLAG_HAS_RANGE   = 16
 };
 
-typedef void (*change_handler_t)(const void *data);
-
 typedef struct rarch_setting_t
 {
    enum setting_type type;
@@ -105,8 +103,6 @@ typedef struct rarch_setting_t
    bool enforce_maxrange;
 }  rarch_setting_t;
 
-
-
 void setting_data_reset_setting(const rarch_setting_t* setting);
 void setting_data_reset(const rarch_setting_t* settings);
 
@@ -130,14 +126,9 @@ rarch_setting_t setting_data_bind_setting(const char* name, const char* descript
 
 void setting_data_get_description(const void *data, char *msg, size_t msg_sizeof);
 
-
 // These functions operate only on RetroArch's main settings list
 rarch_setting_t* setting_data_get_list(void);
 
-#ifdef APPLE
-#include "input/apple_keycode.h"
-#endif
-
 #ifdef __cplusplus
 }
 #endif