4 files changed, 11 insertions, 9 deletions

diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 775db0587e..d21f21af15 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -39,7 +39,7 @@ bmp_smooth_scale.c
 #endif
 pluginlib_actions.c
 helper.c
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
 touchscreen.c
 #endif
 md5.c
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 996e2178b4..a6bf28302f 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -67,7 +67,7 @@ const struct button_mapping remote_directions[] =
 
 const struct button_mapping generic_directions[] =
 {
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
     { PLA_UP,                BUTTON_TOPMIDDLE,                  BUTTON_NONE},
     { PLA_DOWN,              BUTTON_BOTTOMMIDDLE,               BUTTON_NONE},
     { PLA_LEFT,              BUTTON_MIDLEFT,                    BUTTON_NONE},
@@ -162,7 +162,7 @@ const struct button_mapping generic_directions[] =
 
 const struct button_mapping generic_left_right_fire[] =
 {
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
     { PLA_LEFT,              BUTTON_MIDLEFT,                BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_MIDLEFT|BUTTON_REPEAT,  BUTTON_NONE},
     { PLA_RIGHT,             BUTTON_MIDRIGHT,               BUTTON_NONE},
@@ -266,7 +266,7 @@ const struct button_mapping generic_left_right_fire[] =
 /* these were taken from the bubbles plugin, so may need tweaking */
 const struct button_mapping generic_actions[] = 
 {
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
     {PLA_QUIT,          BUTTON_BOTTOMRIGHT,                 BUTTON_NONE},
     {PLA_START,         BUTTON_CENTER,                      BUTTON_NONE},
     {PLA_MENU,          BUTTON_TOPLEFT,                     BUTTON_NONE},
@@ -399,7 +399,7 @@ const struct button_mapping generic_actions[] =
 
 const struct button_mapping generic_increase_decrease[] =
 {
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
     {PLA_INC,             BUTTON_TOPMIDDLE,                  BUTTON_NONE},
     {PLA_DEC,             BUTTON_BOTTOMMIDDLE,               BUTTON_NONE},
     {PLA_INC_REPEAT,      BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE},
diff --git a/apps/plugins/lib/touchscreen.c b/apps/plugins/lib/touchscreen.c
index cda2f46f1e..5b7517349a 100644
--- a/apps/plugins/lib/touchscreen.c
+++ b/apps/plugins/lib/touchscreen.c
@@ -21,7 +21,7 @@
 
 #include "plugin.h"
 
-#ifdef HAVE_TOUCHPAD
+#ifdef HAVE_TOUCHSCREEN
 
 #include "touchscreen.h"
 
@@ -132,4 +132,4 @@ struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_bu
     return ret;
 }
 
-#endif /* HAVE_TOUCHPAD */
+#endif /* HAVE_TOUCHSCREEN */
diff --git a/apps/plugins/lib/touchscreen.h b/apps/plugins/lib/touchscreen.h
index 7050db669b..cd5251e46f 100644
--- a/apps/plugins/lib/touchscreen.h
+++ b/apps/plugins/lib/touchscreen.h
@@ -22,7 +22,9 @@
 #ifndef _PLUGIN_LIB_TOUCHSCREEN_H_
 #define _PLUGIN_LIB_TOUCHSCREEN_H_
 
-#ifdef HAVE_TOUCHPAD
+#include "plugin.h"
+
+#ifdef HAVE_TOUCHSCREEN
 
 struct ts_mapping
 {
@@ -88,5 +90,5 @@ struct ts_raster_button_result
 
 struct ts_raster_button_result touchscreen_raster_map_button(struct ts_raster_button_mapping *map, int x, int y, int button);
 
-#endif /* HAVE_TOUCHPAD */
+#endif /* HAVE_TOUCHSCREEN */
 #endif /* _PLUGIN_LIB_TOUCHSCREEN_H_ */