diff --git a/Makefile.common b/Makefile.common
index 5ea90b5cfa..a958d2accf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -336,6 +336,7 @@ endif
 ifeq ($(HAVE_MENU_COMMON), 1)
    OBJ += menu/menu_input.o \
 			 menu/menu.o \
+			 menu/menu_entry.o \
 			 menu/menu_common_list.o \
 			 menu/menu_navigation.o  \
 			 menu/menu_setting.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index e23cff65dd..cc6e7ca404 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -712,6 +712,7 @@ MENU
 #ifdef HAVE_MENU
 #include "../menu/menu_input.c"
 #include "../menu/menu.c"
+#include "../menu/menu_entry.c"
 #include "../menu/menu_common_list.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_list.c"
diff --git a/ui/drivers/cocoa/cocoatouch_support.c b/menu/menu_entry.c
similarity index 88%
rename from ui/drivers/cocoa/cocoatouch_support.c
rename to menu/menu_entry.c
index 29ab833962..7a54922b5b 100644
--- a/ui/drivers/cocoa/cocoatouch_support.c
+++ b/menu/menu_entry.c
@@ -1,5 +1,38 @@
-// JM: The idea of this file is that these will be moved down into
-// ../../../menu/something
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2015 - Jay McCarthy
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "menu.h"
+#include "menu_navigation.h"
+#include "menu_setting.h"
+#include "menu_input.h"
+#include "../settings.h"
+
+enum menu_entry_type
+{
+   MENU_ENTRY_ACTION = 0,
+   MENU_ENTRY_BOOL,
+   MENU_ENTRY_INT,
+   MENU_ENTRY_UINT,
+   MENU_ENTRY_FLOAT,
+   MENU_ENTRY_PATH,
+   MENU_ENTRY_DIR,
+   MENU_ENTRY_STRING,
+   MENU_ENTRY_HEX,
+   MENU_ENTRY_BIND,
+   MENU_ENTRY_ENUM,
+};
 
 void get_core_title(char *title_msg, size_t title_msg_len)
 {
@@ -21,21 +54,6 @@ void get_core_title(char *title_msg, size_t title_msg_len)
          core_name, core_version);
 }
 
-enum menu_entry_type
-{
-   MENU_ENTRY_ACTION = 0,
-   MENU_ENTRY_BOOL,
-   MENU_ENTRY_INT,
-   MENU_ENTRY_UINT,
-   MENU_ENTRY_FLOAT,
-   MENU_ENTRY_PATH,
-   MENU_ENTRY_DIR,
-   MENU_ENTRY_STRING,
-   MENU_ENTRY_HEX,
-   MENU_ENTRY_BIND,
-   MENU_ENTRY_ENUM,
-};
-
 rarch_setting_t *get_menu_entry_setting(uint32_t i)
 {
    menu_handle_t *menu       = menu_driver_get_ptr();
@@ -52,9 +70,8 @@ rarch_setting_t *get_menu_entry_setting(uint32_t i)
    menu_list_get_at_offset(menu_list->selection_buf, i, &path,
          &entry_label, &type);
 
-   setting = setting_find_setting
-      (menu->list_settings,
-       menu_list->selection_buf->list[i].label);
+   setting = menu_setting_find(
+         menu_list->selection_buf->list[i].label);
 
    return setting;
 }