diff --git a/Makefile.common b/Makefile.common
index e792ed42bb..d86e149789 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -141,7 +141,7 @@ OBJ += frontend/frontend.o \
 		audio/resamplers/sinc.o \
 		audio/resamplers/nearest.o \
 		audio/resamplers/cc_resampler.o \
-		location/nulllocation.o \
+		location/drivers/nulllocation.o \
 		camera/drivers/nullcamera.o \
 		gfx/drivers/nullgfx.o \
 		audio/drivers/nullaudio.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index ee257c3bfc..72e4305674 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -433,10 +433,10 @@ CAMERA
 LOCATION
 ============================================================ */
 #if defined(ANDROID)
-#include "../location/android.c"
+#include "../location/drivers/android.c"
 #endif
 
-#include "../location/nulllocation.c"
+#include "../location/drivers/nulllocation.c"
 
 /*============================================================
 RSOUND
diff --git a/location/android.c b/location/drivers/android.c
similarity index 99%
rename from location/android.c
rename to location/drivers/android.c
index 031f7a1869..959dd8b160 100644
--- a/location/android.c
+++ b/location/drivers/android.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
+#include "../../driver.h"
 
 typedef struct android_location
 {
diff --git a/location/nulllocation.c b/location/drivers/nulllocation.c
similarity index 98%
rename from location/nulllocation.c
rename to location/drivers/nulllocation.c
index 55ab50cc9f..1507ed3f94 100644
--- a/location/nulllocation.c
+++ b/location/drivers/nulllocation.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
+#include "../../driver.h"
 
 static void *null_location_init(void)
 {