diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index e07f96f26c..d52f653dd9 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -233,16 +233,6 @@ static void gfx_ctx_update_window_title(bool reset)
    (void)reset;
 }
 
-void gfx_ctx_set_window(JNIEnv *jenv,jobject obj, jobject surface)
-{
-   window = ANativeWindow_fromSurface(jenv, surface);
-}
-
-void gfx_ctx_free_window(JNIEnv *jenv,jobject obj, jobject surface)
-{
-   ANativeWindow_release(window);
-}
-
 static void gfx_ctx_get_video_size(unsigned *width, unsigned *height)
 {
    (void)width;
@@ -329,10 +319,6 @@ const gfx_ctx_driver_t gfx_ctx_android = {
    NULL,
    gfx_ctx_update_window_title,
    gfx_ctx_check_window,
-#ifdef ANDROID
-   gfx_ctx_set_window,
-   gfx_ctx_free_window,
-#endif
    gfx_ctx_set_resize,
    gfx_ctx_has_focus,
    gfx_ctx_swap_buffers,
diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h
index 1315b9364e..2cc0b8690a 100644
--- a/gfx/gfx_context.h
+++ b/gfx/gfx_context.h
@@ -23,12 +23,6 @@
 #include "../config.h"
 #endif
 
-#ifdef ANDROID
-#include <jni.h>
-#include <android/native_window.h> /* Requires NDK r5 or newer */
-#include <android/native_window_jni.h> /* Requires NDK r5 or newer */
-#endif
-
 enum gfx_ctx_api
 {
    GFX_CTX_OPENGL_API,
@@ -69,10 +63,6 @@ typedef struct gfx_ctx_driver
    // Queries for resize and quit events.
    // Also processes events.
    void (*check_window)(bool*, bool*, unsigned*, unsigned*, unsigned);
-#ifdef ANDROID
-   void (*gfx_ctx_set_window)(JNIEnv *jenv, jobject obj, jobject surface);
-   void (*gfx_ctx_free_window)(JNIEnv *jenv, jobject obj, jobject surface);
-#endif
 
    // Acknowledge a resize event. This is needed for some APIs. Most backends will ignore this.
    void (*set_resize)(unsigned, unsigned);