diff --git a/driver.c b/driver.c
index e369f06df5..7b39829fe1 100644
--- a/driver.c
+++ b/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"
diff --git a/driver.h b/driver.h
index 3cc54fcd03..8888a55da6 100644
--- a/driver.h
+++ b/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"
diff --git a/dynamic.c b/dynamic.c
index 596b1c9628..b209246c05 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "audio/audio_driver.h"
+#include "location/location_driver.h"
 #include "performance.h"
 
 #include "libretro_private.h"
diff --git a/location/drivers/android.c b/location/drivers/android.c
index 959dd8b160..9d76b60b76 100644
--- a/location/drivers/android.c
+++ b/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
 {
diff --git a/location/drivers/nulllocation.c b/location/drivers/nulllocation.c
index 1507ed3f94..9eb5cef593 100644
--- a/location/drivers/nulllocation.c
+++ b/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)
 {
diff --git a/location/location_driver.c b/location/location_driver.c
index 771f95615a..208c2a9051 100644
--- a/location/location_driver.c
+++ b/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"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 6340d5f129..5c57f886fc 100644
--- a/menu/menu_setting.c
+++ b/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"