diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 076071c065..8897d614ee 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -77,6 +77,7 @@ default_paths_t default_paths;
 
 #endif
 
+
 /*============================================================
 PERFORMANCE
 ============================================================ */
@@ -228,6 +229,8 @@ FONTS
 /*============================================================
 INPUT
 ============================================================ */
+#include "../../input/overlay.c"
+
 #if defined(__CELLOS_LV2__)
 #include "../../ps3/ps3_input.c"
 #elif defined(SN_TARGET_PSP2) || defined(PSP)
diff --git a/driver_funcs.h b/driver_funcs.h
index ce5def2432..79ff263ec7 100644
--- a/driver_funcs.h
+++ b/driver_funcs.h
@@ -167,13 +167,11 @@ static inline bool input_key_pressed_func(int key)
 #define input_poll_func() MAKENAME_INPUT(_input_poll)(driver.input_data)
 #define input_input_state_func(retro_keybinds, port, device, index, id) \
    MAKENAME_INPUT(_input_state)(driver.input_data, retro_keybinds, port, device, index, id)
-#ifdef ANDROID
-#define input_key_pressed_func(key) ((g_extern.lifecycle_state & (1ULL << key)) ? true : false)
-#else
 #define input_key_pressed_func(key) MAKENAME_INPUT(_input_key_pressed)(driver.input_data, key)
-#endif
 #define input_free_func() MAKENAME_INPUT(_input_free_input)(driver.input_data)
 
+#define video_overlay_interface_func(iface) driver.video->overlay_interface(driver.video_data, iface)
+
 #endif
 
 #endif /* _RARCH_DRIVER_FUNCS_H */