diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index b65212aa6..9787b80a1 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -43,6 +43,7 @@
 
 #include <driver/record.h>
 #include <driver/abstime.h>
+#include <driver/display.h>
 #include <libdvbsub/dvbsub.h>
 #include <libtuxtxt/teletext.h>
 
diff --git a/src/driver/audiodec/mp3dec.cpp b/src/driver/audiodec/mp3dec.cpp
index 28f2c70a4..3e56a072e 100644
--- a/src/driver/audiodec/mp3dec.cpp
+++ b/src/driver/audiodec/mp3dec.cpp
@@ -895,7 +895,9 @@ q		 * next mad_frame_decode() invocation. (See the comments marked
 		}
 	}
 	audioDecoder->StopClip();
+#ifdef SPECTRUM
 	CVFD::getInstance ()->Unlock ();
+#endif
 	/* Accounting report if no error occured. */
 	if(Status==OK)
 	{
diff --git a/src/driver/display.h b/src/driver/display.h
new file mode 100644
index 000000000..e80049a46
--- /dev/null
+++ b/src/driver/display.h
@@ -0,0 +1,7 @@
+/* helper for different display CVFD implementations */
+#if HAVE_COOL_HARDWARE
+#include <driver/vfd.h>
+#endif
+#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE || HAVE_GENERIC_HARDWARE
+#include <driver/lcdd.h>
+#endif
diff --git a/src/driver/lcdd.h b/src/driver/lcdd.h
index 882e65f95..a2299cd8a 100644
--- a/src/driver/lcdd.h
+++ b/src/driver/lcdd.h
@@ -64,6 +64,7 @@ typedef enum
 	FP_ICON_COL2       = 0x0B000002,
 	FP_ICON_CAM2       = 0x0C000001
 } fp_icon;
+#define CVFD CLCD
 
 #ifdef LCD_UPDATE
 #ifdef HAVE_CONFIG_H
diff --git a/src/driver/record.h b/src/driver/record.h
index 7d0b01854..a401190bc 100644
--- a/src/driver/record.h
+++ b/src/driver/record.h
@@ -38,11 +38,9 @@
 
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>
-#include <driver/vfd.h>
 #endif
 #if HAVE_TRIPLEDRAGON || USE_STB_HAL
 #include <record_td.h>
-#include <driver/lcdd.h>
 #endif
 
 #include <OpenThreads/Mutex>
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 816fbab37..6a20a93a7 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -38,6 +38,7 @@
 #include <system/helpers.h>
 #include <daemonc/remotecontrol.h>
 #include <driver/volume.h>
+#include <driver/display.h>
 #include <gui/audiomute.h>
 #include <zapit/zapit.h>
 
diff --git a/src/global.h b/src/global.h
index 30b9fa73e..af6d5ea91 100644
--- a/src/global.h
+++ b/src/global.h
@@ -38,6 +38,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/radiotext.h>
+#if 0
 #if HAVE_COOL_HARDWARE
 #include <driver/vfd.h>
 #endif
@@ -45,6 +46,7 @@
 #include "driver/lcdd.h"
 #define CVFD CLCD
 #endif
+#endif
 
 #include <system/localize.h>
 #include <system/settings.h>
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index 409ca5187..4a5e979c7 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -32,6 +32,8 @@
 #include <gui/volumebar.h>
 #include <gui/audiomute.h>
 
+#include <driver/display.h>
+
 CAudioMute::CAudioMute()
 {
 	mute_ax		= 0;
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 1d7496f10..64c30672c 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -46,6 +46,7 @@
 #include <driver/rcinput.h>
 #include <driver/audioplay.h>
 #include <driver/audiometadata.h>
+#include <driver/display.h>
 
 #include <daemonc/remotecontrol.h>
 
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index c4672497a..c7e41c2d2 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -36,6 +36,7 @@
 
 #include <system/settings.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index c487e5be0..a727b0ba6 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -49,6 +49,7 @@
 #include <driver/screen_max.h>
 #include <driver/rcinput.h>
 #include <driver/fade.h>
+#include <driver/display.h>
 #include <daemonc/remotecontrol.h>
 #include <system/settings.h>
 
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 67cce50d2..3ed1ff4ff 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -46,6 +46,7 @@
 #include <driver/abstime.h>
 #include <driver/record.h>
 #include <driver/fade.h>
+#include <driver/display.h>
 
 #include <gui/color.h>
 #include <gui/eventlist.h>
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index dfff70eb4..7bbcd508d 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -46,6 +46,7 @@
 
 #include <driver/screen_max.h>
 #include <driver/fade.h>
+#include <driver/display.h>
 
 #include <zapit/client/zapittools.h>
 #include <zapit/zapit.h>
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index d6a75f73e..c303f2d89 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -39,6 +39,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index ccdb7da34..e3fb93aa9 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -64,6 +64,7 @@
 
 #include <daemonc/remotecontrol.h>
 #include <driver/record.h>
+#include <driver/display.h>
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 24872adf8..221ae07b1 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -63,6 +63,7 @@
 #include <gui/pictureviewer.h>
 #include <gui/customcolor.h>
 #include <driver/record.h>
+#include <driver/display.h>
 #include <system/helpers.h>
 
 extern CPictureViewer * g_PicViewer;
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 9c33bef42..44ea673f4 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -39,6 +39,7 @@
 #include <gui/plugins.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
+#include <driver/display.h>
 #include <system/helpers.h>
 
 #include <unistd.h>
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index 4cefece73..26f37d02d 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -57,6 +57,7 @@
 #include <gui/widget/helpbox.h>
 #include <gui/widget/stringinput.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <system/settings.h>
 
diff --git a/src/gui/rc_lock.cpp b/src/gui/rc_lock.cpp
index 2b7177692..8999cbd17 100644
--- a/src/gui/rc_lock.cpp
+++ b/src/gui/rc_lock.cpp
@@ -30,6 +30,7 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include <driver/display.h>
 
 #include <gui/rc_lock.h>
 
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 3eae23e3f..ccb917346 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -35,6 +35,7 @@
 #include <driver/screen_max.h>
 #include <driver/record.h>
 #include <driver/volume.h>
+#include <driver/display.h>
 
 #include <gui/color.h>
 
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index 3f938dd55..f00e5ad5a 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -40,6 +40,7 @@
 #include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
+#include <driver/display.h>
 #include <system/helpers.h>
 
 #include <sys/vfs.h>
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 9ebfa2af1..3b3de3c68 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -36,6 +36,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 #include <gui/color.h>
 #include <gui/widget/icons.h>
 #include <gui/customcolor.h>
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 70342d084..38208caf5 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -36,6 +36,7 @@
 #include <neutrino.h>
 
 #include <driver/screen_max.h>
+#include <driver/display.h>
 #include <system/debug.h>
 
 #include <cs_api.h>
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index 66c7acc10..4b9a09ecf 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -45,6 +45,7 @@
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 #include <driver/record.h>
+#include <driver/display.h>
 
 #include <gui/channellist.h>
 #include <gui/color.h>
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index c6df7735f..d9672d6cc 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -49,6 +49,7 @@
 #include <driver/audiofile.h>
 #include <driver/audiometadata.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <daemonc/remotecontrol.h>
 
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 30f62d1ab..15f434796 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -44,6 +44,7 @@
 #include <gui/widget/icons.h>
 
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <system/debug.h>
 #include <cs_api.h>
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index d0439b29a..2df27f1dc 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -47,6 +47,7 @@
 #include <gui/widget/messagebox.h>
 
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <daemonc/remotecontrol.h>
 
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index bbe69a1b7..a7f0ee63a 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -39,6 +39,7 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 #include <driver/fade.h>
+#include <driver/display.h>
 
 #include <cctype>
 
diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 77e642aa0..bd60dc22e 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -32,6 +32,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <gui/color.h>
 
diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp
index 04646fb0b..0a3bd9602 100644
--- a/src/gui/widget/stringinput_ext.cpp
+++ b/src/gui/widget/stringinput_ext.cpp
@@ -31,6 +31,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
+#include <driver/display.h>
 
 #include <gui/color.h>
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 652a8d776..5561d3279 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -59,6 +59,7 @@
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/streamts.h>
+#include <driver/display.h>
 
 #include "gui/audiomute.h"
 #include "gui/audioplayer.h"
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 422ee0d11..3563ea8b8 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -75,6 +75,7 @@
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
 #include "driver/record.h"
+#include "driver/display.h"
 
 
 extern CPlugins       * g_PluginList;
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 8c0a033a7..71d38f381 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -54,6 +54,7 @@
 #include <gui/widget/stringinput.h>
 #include <gui/infoclock.h>
 #include <driver/volume.h>
+#include <driver/display.h>
 #include <system/helpers.h>
 // obsolete #include <gui/streaminfo.h>