Move header include for location/location_driver.h out of

driver.h

driver.c

@@ -23,6 +23,7 @@
 #include "verbosity.h"
 #include "audio/audio_driver.h"
 #include "audio/audio_resampler_driver.h"
+#include "location/location_driver.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"

driver.h

@@ -28,7 +28,6 @@
 #include "libretro_private.h"
 
 #include "camera/camera_driver.h"
-#include "location/location_driver.h"
 #include "record/record_driver.h"
 
 #include "libretro_version_1.h"

dynamic.c

@@ -28,6 +28,7 @@
 #endif
 
 #include "audio/audio_driver.h"
+#include "location/location_driver.h"
 #include "performance.h"
 
 #include "libretro_private.h"

location/drivers/android.c

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
+#include "../location_driver.h"
 
 typedef struct android_location
 {

location/drivers/nulllocation.c

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
+#include "../location_driver.h"
 
 static void *null_location_init(void)
 {

location/location_driver.c

@@ -16,6 +16,8 @@
 
 #include <string.h>
 
+#include "location_driver.h"
+
 #include "../general.h"
 #include "../string_list_special.h"
 #include "../verbosity.h"

menu/menu_setting.c

@@ -38,6 +38,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../dynamic.h"
+#include "../location/location_driver.h"
 #include "../audio/audio_driver.h"
 #include "../audio/audio_resampler_driver.h"
 #include "../input/input_config.h"