diff --git a/driver.h b/driver.h
index 7e0f16215e..60f9762dbe 100644
--- a/driver.h
+++ b/driver.h
@@ -82,26 +82,17 @@ enum // RetroArch specific bind IDs.
    RARCH_STATE_SLOT_PLUS,
    RARCH_STATE_SLOT_MINUS,
    RARCH_REWIND,
-#ifdef HAVE_BSV_MOVIE
    RARCH_MOVIE_RECORD_TOGGLE,
-#endif
    RARCH_PAUSE_TOGGLE,
    RARCH_FRAMEADVANCE,
    RARCH_RESET,
    RARCH_SHADER_NEXT,
    RARCH_SHADER_PREV,
-#ifdef HAVE_XML
    RARCH_CHEAT_INDEX_PLUS,
    RARCH_CHEAT_INDEX_MINUS,
    RARCH_CHEAT_TOGGLE,
-#ifdef HAVE_CONSOLE
-   RARCH_CHEAT_INPUT,
-#endif
-#endif
    RARCH_SCREENSHOT,
-#ifdef HAVE_DYLIB
    RARCH_DSP_CONFIG,
-#endif
    RARCH_MUTE,
    RARCH_NETPLAY_FLIP,
    RARCH_SLOWMOTION,
@@ -109,7 +100,9 @@ enum // RetroArch specific bind IDs.
    RARCH_VOLUME_UP,
    RARCH_VOLUME_DOWN,
    RARCH_OVERLAY_NEXT,
+
 #ifdef RARCH_CONSOLE
+   RARCH_CHEAT_INPUT,
    RARCH_SRAM_WRITE_PROTECT,
 #endif
 #ifdef HAVE_RMENU