diff --git a/input/input_driver.c b/input/input_driver.c
index 669b51b5a3..bf3581e6b9 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -1274,7 +1274,7 @@ static void input_overlay_get_eightway_slope_limits(
  *
  * Gets the slope limits defining each eightway type's diagonal zones.
  */
-void input_overlay_set_eightway_diagonal_sensitivity()
+void input_overlay_set_eightway_diagonal_sensitivity(void)
 {
    settings_t           *settings = config_get_ptr();
    input_driver_state_t *input_st = input_state_get_ptr();
diff --git a/input/input_overlay.h b/input/input_overlay.h
index b281c8d447..c6e2fee792 100644
--- a/input/input_overlay.h
+++ b/input/input_overlay.h
@@ -452,7 +452,7 @@ enum overlay_visibility input_overlay_get_visibility(
  *
  * Gets the slope limits defining each eightway type's diagonal zones.
  */
-void input_overlay_set_eightway_diagonal_sensitivity();
+void input_overlay_set_eightway_diagonal_sensitivity(void);
 
 /**
  * input_overlay_free:
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 53f8976a83..0984a0e6cb 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -404,9 +404,13 @@ static int general_push(menu_displaylist_info_t *info,
    char newstring2[PATH_MAX_LENGTH];
    settings_t                  *settings      = config_get_ptr();
    menu_handle_t                  *menu       = menu_state_get_ptr()->driver_data;
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
    bool 
       multimedia_builtin_mediaplayer_enable   = settings->bools.multimedia_builtin_mediaplayer_enable;
+#endif
+#ifdef HAVE_IMAGEVIEWER
    bool multimedia_builtin_imageviewer_enable = settings->bools.multimedia_builtin_imageviewer_enable;
+#endif
 
    if (!menu)
       return -1;