diff --git a/Makefile.common b/Makefile.common
index 229edcb683..acdda586f8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -102,6 +102,7 @@ OBJ += frontend/frontend.o \
 		gfx/video_driver.o \
 		osk/osk_driver.o \
 		camera/camera_driver.o \
+		location_driver.o \
 		driver.o \
 		settings.o \
 		settings_list.o \
diff --git a/driver.c b/driver.c
index 2e44b3d376..838324d0d3 100644
--- a/driver.c
+++ b/driver.c
@@ -40,85 +40,6 @@
 
 driver_t driver;
 
-static const location_driver_t *location_drivers[] = {
-#ifdef ANDROID
-   &location_android,
-#endif
-#if defined(IOS) || defined(OSX)
-#ifdef HAVE_LOCATION
-   &location_apple,
-#endif
-#endif
-   &location_null,
-   NULL,
-};
-
-/**
- * location_driver_find_handle:
- * @index              : index of driver to get handle to.
- *
- * Returns: handle to location driver at index. Can be NULL
- * if nothing found.
- **/
-static const void *location_driver_find_handle(int index)
-{
-   const void *drv = location_drivers[index];
-   if (!drv)
-      return NULL;
-   return drv;
-}
-
-/**
- * location_driver_find_ident:
- * @index              : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of location driver at index. Can be NULL
- * if nothing found.
- **/
-static const char *location_driver_find_ident(int index)
-{
-   const location_driver_t *drv = location_drivers[index];
-   if (!drv)
-      return NULL;
-   return drv->ident;
-}
-
-/**
- * config_get_location_driver_options:
- *
- * Get an enumerated list of all location driver names,
- * separated by '|'.
- *
- * Returns: string listing of all location driver names,
- * separated by '|'.
- **/
-const char* config_get_location_driver_options(void)
-{
-   union string_list_elem_attr attr;
-   unsigned i;
-   char *options = NULL;
-   int options_len = 0;
-   struct string_list *options_l = string_list_new();
-
-   attr.i = 0;
-
-   for (i = 0; location_driver_find_handle(i); i++)
-   {
-      const char *opt = location_driver_find_ident(i);
-      options_len += strlen(opt) + 1;
-      string_list_append(options_l, opt, attr);
-   }
-
-   options = (char*)calloc(options_len, sizeof(char));
-
-   string_list_join_concat(options, options_len, options_l, "|");
-
-   string_list_free(options_l);
-   options_l = NULL;
-
-   return options;
-}
-
 #ifdef HAVE_MENU
 static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #ifdef IOS
@@ -380,141 +301,6 @@ void find_next_driver(const char *label, char *str, size_t sizeof_str)
       RARCH_WARN("Couldn't find any next driver (current one: \"%s\").\n", str);
 }
 
-static void find_location_driver(void)
-{
-   int i = find_driver_index("location_driver", g_settings.location.driver);
-   if (i >= 0)
-      driver.location = location_driver_find_handle(i);
-   else
-   {
-      unsigned d;
-      RARCH_ERR("Couldn't find any location driver named \"%s\"\n",
-            g_settings.location.driver);
-      RARCH_LOG_OUTPUT("Available location drivers are:\n");
-      for (d = 0; location_driver_find_handle(d); d++)
-         RARCH_LOG_OUTPUT("\t%s\n", location_driver_find_ident(d));
-       
-      RARCH_WARN("Going to default to first location driver...\n");
-       
-      driver.location = location_driver_find_handle(0);
-
-      if (!driver.location)
-         rarch_fail(1, "find_location_driver()");
-   }
-}
-
-/**
- * driver_location_start:
- *
- * Starts location driver interface..
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_location_start(void)
-{
-   if (driver.location && driver.location_data && driver.location->start)
-   {
-      if (g_settings.location.allow)
-         return driver.location->start(driver.location_data);
-
-      msg_queue_push(g_extern.msg_queue, "Location is explicitly disabled.\n", 1, 180);
-   }
-   return false;
-}
-
-/**
- * driver_location_stop:
- *
- * Stops location driver interface..
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_location_stop(void)
-{
-   if (driver.location && driver.location->stop && driver.location_data)
-      driver.location->stop(driver.location_data);
-}
-
-/**
- * driver_location_set_interval:
- * @interval_msecs     : Interval time in milliseconds.
- * @interval_distance  : Distance at which to update.
- *
- * Sets interval update time for location driver interface.
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- **/
-void driver_location_set_interval(unsigned interval_msecs,
-      unsigned interval_distance)
-{
-   if (driver.location && driver.location->set_interval
-         && driver.location_data)
-      driver.location->set_interval(driver.location_data,
-            interval_msecs, interval_distance);
-}
-
-/**
- * driver_location_get_position:
- * @lat                : Latitude of current position.
- * @lon                : Longitude of current position.
- * @horiz_accuracy     : Horizontal accuracy.
- * @vert_accuracy      : Vertical accuracy.
- *
- * Gets current positioning information from 
- * location driver interface.
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: bool (1) if successful, otherwise false (0).
- **/
-bool driver_location_get_position(double *lat, double *lon,
-      double *horiz_accuracy, double *vert_accuracy)
-{
-   if (driver.location && driver.location->get_position
-         && driver.location_data)
-      return driver.location->get_position(driver.location_data,
-            lat, lon, horiz_accuracy, vert_accuracy);
-
-   *lat = 0.0;
-   *lon = 0.0;
-   *horiz_accuracy = 0.0;
-   *vert_accuracy = 0.0;
-   return false;
-}
-
-static void init_location(void)
-{
-   /* Resource leaks will follow if location interface is initialized twice. */
-   if (driver.location_data)
-      return;
-
-   find_location_driver();
-
-   driver.location_data = driver.location->init();
-
-   if (!driver.location_data)
-   {
-      RARCH_ERR("Failed to initialize location driver. Will continue without location.\n");
-      driver.location_active = false;
-   }
-
-   if (g_extern.system.location_callback.initialized)
-      g_extern.system.location_callback.initialized();
-}
-
-static void uninit_location(void)
-{
-   if (driver.location_data && driver.location)
-   {
-      if (g_extern.system.location_callback.deinitialized)
-         g_extern.system.location_callback.deinitialized();
-
-      if (driver.location->free)
-         driver.location->free(driver.location_data);
-   }
-   driver.location_data = NULL;
-}
-
 #ifdef HAVE_MENU
 static void find_menu_driver(void)
 {
diff --git a/driver.h b/driver.h
index 43f45fdd66..9e70c4349b 100644
--- a/driver.h
+++ b/driver.h
@@ -33,6 +33,7 @@
 #include "menu/menu_driver.h"
 #include "osk/osk_driver.h"
 #include "camera/camera_driver.h"
+#include "location_driver.h"
 #include "audio/resamplers/resampler.h"
 #include "record/ffemu.h"
 
@@ -162,22 +163,6 @@ enum analog_dpad_mode
    ANALOG_DPAD_LAST
 };
 
-
-typedef struct location_driver
-{
-   void *(*init)(void);
-   void (*free)(void *data);
-
-   bool (*start)(void *data);
-   void (*stop)(void *data);
-
-   bool (*get_position)(void *data, double *lat, double *lon,
-         double *horiz_accuracy, double *vert_accuracy);
-   void (*set_interval)(void *data, unsigned interval_msecs,
-         unsigned interval_distance);
-   const char *ident;
-} location_driver_t;
-
 /* Flags for init_drivers/uninit_drivers */
 enum
 {
@@ -471,52 +456,6 @@ float driver_sensor_get_input(unsigned port, unsigned action);
  **/
 void *driver_video_resolve(const video_driver_t **drv);
 
-/**
- * driver_location_start:
- *
- * Starts location driver interface..
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool driver_location_start(void);
-
-/**
- * driver_location_stop:
- *
- * Stops location driver interface..
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-void driver_location_stop(void);
-
-/**
- * driver_location_get_position:
- * @lat                : Latitude of current position.
- * @lon                : Longitude of current position.
- * @horiz_accuracy     : Horizontal accuracy.
- * @vert_accuracy      : Vertical accuracy.
- *
- * Gets current positioning information from 
- * location driver interface.
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- *
- * Returns: bool (1) if successful, otherwise false (0).
- **/
-bool driver_location_get_position(double *lat, double *lon,
-      double *horiz_accuracy, double *vert_accuracy);
-
-/**
- * driver_location_set_interval:
- * @interval_msecs     : Interval time in milliseconds.
- * @interval_distance  : Distance at which to update.
- *
- * Sets interval update time for location driver interface.
- * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
- **/
-void driver_location_set_interval(unsigned interval_msecs,
-      unsigned interval_distance);
 
 /**
  * driver_update_system_av_info:
@@ -541,17 +480,6 @@ extern driver_t driver;
  **/
 const char* config_get_video_driver_options(void);
 
-/**
- * config_get_location_driver_options:
- *
- * Get an enumerated list of all location driver names,
- * separated by '|'.
- *
- * Returns: string listing of all location driver names,
- * separated by '|'.
- **/
-const char* config_get_location_driver_options(void);
-
 #ifdef HAVE_MENU
 /**
  * config_get_menu_driver_options:
@@ -577,10 +505,6 @@ const char* config_get_menu_driver_options(void);
  **/
 int find_driver_index(const char * label, const char *drv);
   
-extern location_driver_t location_apple;
-extern location_driver_t location_android;
-extern location_driver_t location_null;
-
 extern rarch_joypad_driver_t *joypad_drivers[];
 
 #ifdef __cplusplus
diff --git a/griffin/griffin.c b/griffin/griffin.c
index c068ab5eef..8cbeb0264c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -501,6 +501,7 @@ DRIVERS
 #include "../audio/audio_driver.c"
 #include "../osk/osk_driver.c"
 #include "../camera/camera_driver.c"
+#include "../location_driver.c"
 #include "../driver.c"
 
 /*============================================================
diff --git a/location_driver.c b/location_driver.c
new file mode 100644
index 0000000000..5400f198dc
--- /dev/null
+++ b/location_driver.c
@@ -0,0 +1,235 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  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 <string.h>
+#include <string/string_list.h>
+#include "location_driver.h"
+#include "driver.h"
+#include "general.h"
+
+static const location_driver_t *location_drivers[] = {
+#ifdef ANDROID
+   &location_android,
+#endif
+#if defined(IOS) || defined(OSX)
+#ifdef HAVE_LOCATION
+   &location_apple,
+#endif
+#endif
+   &location_null,
+   NULL,
+};
+
+/**
+ * location_driver_find_handle:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: handle to location driver at index. Can be NULL
+ * if nothing found.
+ **/
+const void *location_driver_find_handle(int index)
+{
+   const void *drv = location_drivers[index];
+   if (!drv)
+      return NULL;
+   return drv;
+}
+
+/**
+ * location_driver_find_ident:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: Human-readable identifier of location driver at index. Can be NULL
+ * if nothing found.
+ **/
+const char *location_driver_find_ident(int index)
+{
+   const location_driver_t *drv = location_drivers[index];
+   if (!drv)
+      return NULL;
+   return drv->ident;
+}
+
+/**
+ * config_get_location_driver_options:
+ *
+ * Get an enumerated list of all location driver names,
+ * separated by '|'.
+ *
+ * Returns: string listing of all location driver names,
+ * separated by '|'.
+ **/
+const char* config_get_location_driver_options(void)
+{
+   union string_list_elem_attr attr;
+   unsigned i;
+   char *options = NULL;
+   int options_len = 0;
+   struct string_list *options_l = string_list_new();
+
+   attr.i = 0;
+
+   for (i = 0; location_driver_find_handle(i); i++)
+   {
+      const char *opt = location_driver_find_ident(i);
+      options_len += strlen(opt) + 1;
+      string_list_append(options_l, opt, attr);
+   }
+
+   options = (char*)calloc(options_len, sizeof(char));
+
+   string_list_join_concat(options, options_len, options_l, "|");
+
+   string_list_free(options_l);
+   options_l = NULL;
+
+   return options;
+}
+
+void find_location_driver(void)
+{
+   int i = find_driver_index("location_driver", g_settings.location.driver);
+   if (i >= 0)
+      driver.location = location_driver_find_handle(i);
+   else
+   {
+      unsigned d;
+      RARCH_ERR("Couldn't find any location driver named \"%s\"\n",
+            g_settings.location.driver);
+      RARCH_LOG_OUTPUT("Available location drivers are:\n");
+      for (d = 0; location_driver_find_handle(d); d++)
+         RARCH_LOG_OUTPUT("\t%s\n", location_driver_find_ident(d));
+       
+      RARCH_WARN("Going to default to first location driver...\n");
+       
+      driver.location = location_driver_find_handle(0);
+
+      if (!driver.location)
+         rarch_fail(1, "find_location_driver()");
+   }
+}
+
+/**
+ * driver_location_start:
+ *
+ * Starts location driver interface..
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: true (1) if successful, otherwise false (0).
+ **/
+bool driver_location_start(void)
+{
+   if (driver.location && driver.location_data && driver.location->start)
+   {
+      if (g_settings.location.allow)
+         return driver.location->start(driver.location_data);
+
+      msg_queue_push(g_extern.msg_queue, "Location is explicitly disabled.\n", 1, 180);
+   }
+   return false;
+}
+
+/**
+ * driver_location_stop:
+ *
+ * Stops location driver interface..
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: true (1) if successful, otherwise false (0).
+ **/
+void driver_location_stop(void)
+{
+   if (driver.location && driver.location->stop && driver.location_data)
+      driver.location->stop(driver.location_data);
+}
+
+/**
+ * driver_location_set_interval:
+ * @interval_msecs     : Interval time in milliseconds.
+ * @interval_distance  : Distance at which to update.
+ *
+ * Sets interval update time for location driver interface.
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ **/
+void driver_location_set_interval(unsigned interval_msecs,
+      unsigned interval_distance)
+{
+   if (driver.location && driver.location->set_interval
+         && driver.location_data)
+      driver.location->set_interval(driver.location_data,
+            interval_msecs, interval_distance);
+}
+
+/**
+ * driver_location_get_position:
+ * @lat                : Latitude of current position.
+ * @lon                : Longitude of current position.
+ * @horiz_accuracy     : Horizontal accuracy.
+ * @vert_accuracy      : Vertical accuracy.
+ *
+ * Gets current positioning information from 
+ * location driver interface.
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: bool (1) if successful, otherwise false (0).
+ **/
+bool driver_location_get_position(double *lat, double *lon,
+      double *horiz_accuracy, double *vert_accuracy)
+{
+   if (driver.location && driver.location->get_position
+         && driver.location_data)
+      return driver.location->get_position(driver.location_data,
+            lat, lon, horiz_accuracy, vert_accuracy);
+
+   *lat = 0.0;
+   *lon = 0.0;
+   *horiz_accuracy = 0.0;
+   *vert_accuracy = 0.0;
+   return false;
+}
+
+void init_location(void)
+{
+   /* Resource leaks will follow if location interface is initialized twice. */
+   if (driver.location_data)
+      return;
+
+   find_location_driver();
+
+   driver.location_data = driver.location->init();
+
+   if (!driver.location_data)
+   {
+      RARCH_ERR("Failed to initialize location driver. Will continue without location.\n");
+      driver.location_active = false;
+   }
+
+   if (g_extern.system.location_callback.initialized)
+      g_extern.system.location_callback.initialized();
+}
+
+void uninit_location(void)
+{
+   if (driver.location_data && driver.location)
+   {
+      if (g_extern.system.location_callback.deinitialized)
+         g_extern.system.location_callback.deinitialized();
+
+      if (driver.location->free)
+         driver.location->free(driver.location_data);
+   }
+   driver.location_data = NULL;
+}
diff --git a/location_driver.h b/location_driver.h
new file mode 100644
index 0000000000..05bb5fed9e
--- /dev/null
+++ b/location_driver.h
@@ -0,0 +1,129 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  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/>.
+ */
+
+#ifndef __LOCATION_DRIVER__H
+#define __LOCATION_DRIVER__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct location_driver
+{
+   void *(*init)(void);
+   void (*free)(void *data);
+
+   bool (*start)(void *data);
+   void (*stop)(void *data);
+
+   bool (*get_position)(void *data, double *lat, double *lon,
+         double *horiz_accuracy, double *vert_accuracy);
+   void (*set_interval)(void *data, unsigned interval_msecs,
+         unsigned interval_distance);
+   const char *ident;
+} location_driver_t;
+
+/**
+ * driver_location_start:
+ *
+ * Starts location driver interface..
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: true (1) if successful, otherwise false (0).
+ **/
+bool driver_location_start(void);
+
+/**
+ * driver_location_stop:
+ *
+ * Stops location driver interface..
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: true (1) if successful, otherwise false (0).
+ **/
+void driver_location_stop(void);
+
+/**
+ * driver_location_get_position:
+ * @lat                : Latitude of current position.
+ * @lon                : Longitude of current position.
+ * @horiz_accuracy     : Horizontal accuracy.
+ * @vert_accuracy      : Vertical accuracy.
+ *
+ * Gets current positioning information from 
+ * location driver interface.
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ *
+ * Returns: bool (1) if successful, otherwise false (0).
+ **/
+bool driver_location_get_position(double *lat, double *lon,
+      double *horiz_accuracy, double *vert_accuracy);
+
+/**
+ * driver_location_set_interval:
+ * @interval_msecs     : Interval time in milliseconds.
+ * @interval_distance  : Distance at which to update.
+ *
+ * Sets interval update time for location driver interface.
+ * Used by RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE.
+ **/
+void driver_location_set_interval(unsigned interval_msecs,
+      unsigned interval_distance);
+
+/**
+ * config_get_location_driver_options:
+ *
+ * Get an enumerated list of all location driver names,
+ * separated by '|'.
+ *
+ * Returns: string listing of all location driver names,
+ * separated by '|'.
+ **/
+const char* config_get_location_driver_options(void);
+
+/**
+ * location_driver_find_handle:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: handle to location driver at index. Can be NULL
+ * if nothing found.
+ **/
+const void *location_driver_find_handle(int index);
+
+/**
+ * location_driver_find_ident:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: Human-readable identifier of location driver at index. Can be NULL
+ * if nothing found.
+ **/
+const char *location_driver_find_ident(int index);
+
+void find_location_driver(void);
+
+void init_location(void);
+
+void uninit_location(void);
+
+extern location_driver_t location_apple;
+extern location_driver_t location_android;
+extern location_driver_t location_null;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif