diff --git a/driver.h b/driver.h
index c1ec1cec89..b6f07a5708 100644
--- a/driver.h
+++ b/driver.h
@@ -907,21 +907,6 @@ extern menu_ctx_driver_backend_t menu_ctx_backend_lakka;
 
 extern rarch_joypad_driver_t *joypad_drivers[];
 
-#ifdef HAVE_OVERLAY
-#define check_overlay_func(input, old_input) rarch_check_overlay(BIT64_GET(input, RARCH_OVERLAY_NEXT), BIT64_GET(old_input, RARCH_OVERLAY_NEXT))
-#endif
-
-#define check_oneshot_func(trigger_input) (check_is_oneshot(BIT64_GET(trigger_input, RARCH_FRAMEADVANCE), BIT64_GET(trigger_input, RARCH_REWIND)))
-#define check_slowmotion_func(input) check_slowmotion(BIT64_GET(input, RARCH_SLOWMOTION))
-#define check_shader_dir_func(trigger_input) check_shader_dir(BIT64_GET(trigger_input, RARCH_SHADER_NEXT), BIT64_GET(trigger_input, RARCH_SHADER_PREV))
-#define check_enter_menu_func(input) BIT64_GET(input, RARCH_MENU_TOGGLE)
-#define check_mute_func(input, old_input) check_mute(BIT64_GET(input, RARCH_MUTE), BIT64_GET(old_input, RARCH_MUTE))
-#define check_fast_forward_button_func(input, old_input, trigger_input) check_fast_forward_button(BIT64_GET(trigger_input, RARCH_FAST_FORWARD_KEY), BIT64_GET(input, RARCH_FAST_FORWARD_HOLD_KEY), BIT64_GET(old_input, RARCH_FAST_FORWARD_HOLD_KEY))
-#define check_rewind_func(input) check_rewind(BIT64_GET(input, RARCH_REWIND))
-#define check_stateslots_func(trigger_input) check_stateslots(BIT64_GET(trigger_input, RARCH_STATE_SLOT_PLUS), BIT64_GET(trigger_input, RARCH_STATE_SLOT_MINUS))
-#define check_pause_func(input) check_pause(BIT64_GET(input, RARCH_PAUSE_TOGGLE), BIT64_GET(input, RARCH_FRAMEADVANCE))
-#define check_quit_key_func(input) BIT64_GET(input, RARCH_QUIT_KEY)
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/runloop.c b/runloop.c
index 45de1d9f3a..3cc7f3fb6b 100644
--- a/runloop.c
+++ b/runloop.c
@@ -32,6 +32,17 @@
 #include "netplay.h"
 #endif
 
+/* Convenience macros. */
+#define check_oneshot_func(trigger_input) (check_is_oneshot(BIT64_GET(trigger_input, RARCH_FRAMEADVANCE), BIT64_GET(trigger_input, RARCH_REWIND)))
+#define check_slowmotion_func(input)      (check_slowmotion(BIT64_GET(input, RARCH_SLOWMOTION)))
+#define check_quit_key_func(input)        (BIT64_GET(input, RARCH_QUIT_KEY))
+#define check_pause_func(input)           (check_pause(BIT64_GET(input, RARCH_PAUSE_TOGGLE), BIT64_GET(input, RARCH_FRAMEADVANCE)))
+#define check_stateslots_func(trigger_input) (check_stateslots(BIT64_GET(trigger_input, RARCH_STATE_SLOT_PLUS), BIT64_GET(trigger_input, RARCH_STATE_SLOT_MINUS)))
+#define check_rewind_func(input)          (check_rewind(BIT64_GET(input, RARCH_REWIND)))
+#define check_fast_forward_button_func(input, old_input, trigger_input) (check_fast_forward_button(BIT64_GET(trigger_input, RARCH_FAST_FORWARD_KEY), BIT64_GET(input, RARCH_FAST_FORWARD_HOLD_KEY), BIT64_GET(old_input, RARCH_FAST_FORWARD_HOLD_KEY)))
+#define check_enter_menu_func(input)      (BIT64_GET(input, RARCH_MENU_TOGGLE))
+#define check_shader_dir_func(trigger_input) (check_shader_dir(BIT64_GET(trigger_input, RARCH_SHADER_NEXT), BIT64_GET(trigger_input, RARCH_SHADER_PREV)))
+
 /**
  * set_volume:
  * @gain      : amount of gain to be applied to current volume level.