diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 014dd4e9d9..621f387dc6 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <dlfcn.h>
 #include "input_autodetect.h"
-#include "../../../frontend/frontend_android.h"
+#include "../../../frontend/platform/platform_android.h"
 #include "../../../input/input_common.h"
 #include "../../../performance.h"
 #include "../../../general.h"
diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index 1515950343..beb480c1f3 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../../frontend/frontend_android.h"
+#include "../../../frontend/platform/platform_android.h"
 #include "jni_macros.h"
 #include "input_autodetect.h"
 
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 722b18d144..832c92226c 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/resource.h>
 
-#include "../frontend_android.h"
+#include "platform_android.h"
 #include "../../android/native/jni/jni_macros.h"
 
 #include "../../conf/config_file.h"
diff --git a/frontend/frontend_android.h b/frontend/platform/platform_android.h
similarity index 97%
rename from frontend/frontend_android.h
rename to frontend/platform/platform_android.h
index 480e62f5cc..f9d2a12448 100644
--- a/frontend/frontend_android.h
+++ b/frontend/platform/platform_android.h
@@ -15,8 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _FRONTEND_ANDROID_H
-#define _FRONTEND_ANDROID_H
+#ifndef _PLATFORM_ANDROID_H
+#define _PLATFORM_ANDROID_H
 
 #include <poll.h>
 #include <sched.h>
@@ -25,7 +25,7 @@
 #include <android/native_activity.h>
 #include <android/window.h>
 
-#include "../thread.h"
+#include "../../thread.h"
 
 struct android_app
 {
@@ -151,4 +151,4 @@ extern void engine_handle_cmd(void);
 
 extern struct android_app *g_android;
 
-#endif /* _FRONTEND_ANDROID_H */
+#endif /* _PLATFORM_ANDROID_H */
diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index 336cf63fcc..c9da01e4b4 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -21,7 +21,7 @@
 
 #include <EGL/egl.h>
 
-#include "../../frontend/frontend_android.h"
+#include "../../frontend/platform/platform_android.h"
 #include "../image.h"
 
 #include "../fonts/gl_font.h"
diff --git a/gfx/gl.c b/gfx/gl.c
index 77c4661333..7c2e1ee945 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -51,10 +51,6 @@
 
 #include "shader_common.h"
 
-#ifdef ANDROID
-#include "../frontend/frontend_android.h"
-#endif
-
 // Used for the last pass when rendering to the back buffer.
 static const GLfloat vertexes_flipped[] = {
    0, 1,