3 files changed, 17 insertions, 11 deletions

diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index bb431e3e04..a3fd7267f0 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -53,7 +53,8 @@
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "MENU"
 
-#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
+#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD || \
+      CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
 
 #define BATTERY_ON  BUTTON_SELECT
 #define BATTERY_OFF BUTTON_POWER
@@ -85,7 +86,6 @@
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD ||       \
        CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD || \
        CONFIG_KEYPAD == SONY_NWZ_PAD || \
-       CONFIG_KEYPAD == AGPTEK_ROCKER_PAD || \
        CONFIG_KEYPAD == XDUOO_X3_PAD || \
        CONFIG_KEYPAD == IHIFI_770_PAD || \
        CONFIG_KEYPAD == IHIFI_800_PAD || \
@@ -242,7 +242,11 @@
 #define BATTERY_OFF_TXT "Power"
 #define BATTERY_ON_TXT  "Menu - start"
 
-#elif defined(HAVE_TOUCHSCREEN)
+#else
+#error "No keymap defined!"
+#endif
+
+#if defined(HAVE_TOUCHSCREEN)
 
 #ifndef BATTERY_ON
 #define BATTERY_ON       BUTTON_CENTER
@@ -257,8 +261,6 @@
 #define BATTERY_OFF_TXT "TOPLEFT"
 #endif
 
-#else
-#error No keymap defined!
 #endif
 
 /****************************** Plugin Entry Point ****************************/
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index b700051081..a84b687763 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -711,7 +711,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LVL_UP_TEXT "VOL+"
 #define LVL_DOWN_TEXT "VOL-"
 
-#elif defined(HAVE_TOUCHSCREEN)
+#else
+#error "Unsupported keymap!"
+#endif
+
+#if defined(HAVE_TOUCHSCREEN)
 #ifndef PEGBOX_QUIT
 #define PEGBOX_QUIT     BUTTON_TOPLEFT
 #endif
@@ -754,8 +758,6 @@ CONFIG_KEYPAD == MROBE500_PAD
 #ifndef LVL_DOWN_TEXT
 #define LVL_DOWN_TEXT "BOTTOMRIGHT"
 #endif
-#else
-#error Unsupported keymap!
 #endif
 
 /* get several sizes from the bitmaps */
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index f60938e900..55a1dc4bdb 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -351,7 +351,11 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define DOWN     BUTTON_NEXT
 #define PAUSE    BUTTON_PLAY
 
-#elif defined(HAVE_TOUCHSCREEN)
+#else
+#error "No keymap defined!"
+#endif
+
+#if defined(HAVE_TOUCHSCREEN)
 #ifndef QUIT
 #define QUIT  BUTTON_TOPLEFT
 #endif
@@ -370,8 +374,6 @@ CONFIG_KEYPAD == MROBE500_PAD
 #ifndef PAUSE
 #define PAUSE BUTTON_CENTER
 #endif
-#else
-#error No keymap defined!
 #endif
 
 #define MOVE_NO 0               /* player movement */