diff --git a/configure.ac b/configure.ac
index 6a9e1c290..d836ec2e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,27 +181,15 @@ AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
 
 # lcd
 AC_ARG_ENABLE(lcd,
-	AS_HELP_STRING(--enable-lcd,include lcd support),
-	,[enable_lcd=no])
-AM_CONDITIONAL(ENABLE_LCD,test "$enable_lcd" = "yes")
-
-if test "$enable_lcd" = "yes"; then
-AC_DEFINE(ENABLE_LCD,1,[include lcd support])
-fi
+	AS_HELP_STRING([--enable-lcd], [enable internal lcd support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD, 1, [enable internal lcd support]))
+AM_CONDITIONAL(ENABLE_LCD, test "$enable_lcd" = "yes")
 
 # lcd update
-AM_CONDITIONAL(LCD_UPDATE,test "$enable_lcd_update" = "yes")
-
 if test "$enable_lcd" = "yes"; then
-AC_DEFINE(LCD_UPDATE,1,[include lcd update support])
-fi
-
-# lcdapi
-AM_CONDITIONAL(ENABLE_LCDAPI,test "$enable_lcd" = "yes")
-
-if test "$enable_lcd" = "yes"; then
-AC_DEFINE(ENABLE_LCDAPI,1,[include lcd api support])
+	AC_DEFINE(LCD_UPDATE, 1, [include internal lcd update support])
 fi
+AM_CONDITIONAL(LCD_UPDATE, test "$enable_lcd" = "yes")
 
 AC_ARG_ENABLE(graphlcd,
 	AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),
diff --git a/src/driver/vfd.h b/src/driver/vfd.h
index 2ea9f4422..4f93ce33c 100644
--- a/src/driver/vfd.h
+++ b/src/driver/vfd.h
@@ -38,7 +38,7 @@
 #define __USE_FILE_OFFSET64 1
 #endif
 #include "driver/file.h"
-#endif // LCD_UPDATE
+#endif // VFD_UPDATE
 
 #include <pthread.h>
 #include <string>
@@ -62,7 +62,7 @@ class CVFD
                         MODE_PROGRESSBAR,
                         MODE_PROGRESSBAR2,
                         MODE_INFOBOX
-#endif // LCD_UPDATE
+#endif // VFD_UPDATE
 
 		};
 		enum AUDIOMODES
@@ -163,7 +163,7 @@ class CVFD
 		void wake_up();
 		MODES getMode(void) { return mode; };
 		std::string getServicename(void) { return servicename; }
-#ifdef LCD_UPDATE
+#ifdef VFD_UPDATE
         private:
                 CFileList* m_fileList;
                 int m_fileListPos;
@@ -185,7 +185,7 @@ class CVFD
                 void showInfoBox(const char * const title = NULL,const char * const text = NULL,int autoNewline = -1,int timer = -1);
                 void showProgressBar(int global = -1,const char * const text = NULL,int show_escape = -1,int timer = -1);
                 void showProgressBar2(int local = -1,const char * const text_local = NULL,int global = -1,const char * const text_global = NULL,int show_escape = -1);
-#endif // LCD_UPDATE
+#endif // VFD_UPDATE
 
 };