3 files changed, 11 insertions, 2 deletions

diff --git a/apps/action.c b/apps/action.c
index 0c55227aac..d2fef6f513 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -434,6 +434,7 @@ static inline void button_flip_horizontally(int context, int *button)
         return;
     }
 
+#if defined(BUTTON_LEFT) && defined(BUTTON_RIGHT)
     newbutton &= ~(BUTTON_LEFT | BUTTON_RIGHT);
     if (has_flag(*button, BUTTON_LEFT))
     {
@@ -444,6 +445,10 @@ static inline void button_flip_horizontally(int context, int *button)
     {
         newbutton |= BUTTON_LEFT;
     }
+#else
+#warning "BUTTON_LEFT / BUTTON_RIGHT not defined!"
+#endif
+
 #ifndef SIMULATOR
 #ifdef HAVE_SCROLLWHEEL
     newbutton &= ~(BUTTON_SCROLL_BACK | BUTTON_SCROLL_FWD);
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 91062f8f11..843df5746e 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -80,7 +80,7 @@ const struct button_mapping pf_context_album_scroll[] =
     {PF_PREV_REPEAT,  BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE},
     {PF_NEXT,         BUTTON_RC_FF,               BUTTON_NONE},
     {PF_NEXT_REPEAT,  BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
-#else
+#elif defined(BUTTON_LEFT) && defined(BUTTON_RIGHT)
     {PF_PREV,         BUTTON_LEFT,                BUTTON_NONE},
     {PF_PREV_REPEAT,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
     {PF_NEXT,         BUTTON_RIGHT,               BUTTON_NONE},
@@ -89,6 +89,8 @@ const struct button_mapping pf_context_album_scroll[] =
     {ACTION_NONE,     BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT},
     {ACTION_NONE,     BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT},
     {ACTION_NONE,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT},
+#else
+#warning "LEFT/RIGHT not defined!"
 #endif
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1)
 };
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 202cdf6570..29269f18fb 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -85,9 +85,11 @@ static void setoptions (void)
 #ifdef HAVE_TOUCHSCREEN
         options.LEFT    = BUTTON_MIDLEFT;
         options.RIGHT   = BUTTON_MIDRIGHT;
-#else
+#elif defined(BUTTON_LEFT) && defined(BUTTON_RIGHT)
         options.LEFT    = BUTTON_LEFT;
         options.RIGHT   = BUTTON_RIGHT;
+#else
+#warning "LEFT/RIGHT not defined!"
 #endif
 
 #if CONFIG_KEYPAD == IRIVER_H100_PAD