diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index ac05d73fd..c3def6dcc 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -33,6 +33,7 @@ libneutrino_driver_a_SOURCES = \
 	file.cpp \
 	fontrenderer.cpp \
 	genpsi.cpp \
+	lcd4l.cpp \
 	moviecut.cpp \
 	movieinfo.cpp \
 	neutrinofonts.cpp \
diff --git a/src/gui/lcd4l.cpp b/src/driver/lcd4l.cpp
similarity index 100%
rename from src/gui/lcd4l.cpp
rename to src/driver/lcd4l.cpp
diff --git a/src/gui/lcd4l.h b/src/driver/lcd4l.h
similarity index 100%
rename from src/gui/lcd4l.h
rename to src/driver/lcd4l.h
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 421049a9b..7bfc0c8f2 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -69,7 +69,6 @@ libneutrino_gui_a_SOURCES = \
 	infoviewer.cpp \
 	infoviewer_bb.cpp \
 	keybind_setup.cpp \
-	lcd4l.cpp \
 	lcd4l_setup.cpp \
 	mediaplayer.cpp \
 	mediaplayer_setup.cpp \
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 24f16c931..4ffc6996f 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -57,7 +57,7 @@
 #include <zapit/getservices.h>
 
 //NI lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 
 extern CBouquetManager *g_bouquetManager;
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index b85c0d9e3..665f47ba7 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -87,7 +87,7 @@
 #include <eitd/sectionsd.h>
 
 //NI lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 
 extern CBouquetList * bouquetList;       /* neutrino.cpp */
diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp
index 51927b76a..805cd3d12 100644
--- a/src/gui/lcd4l_setup.cpp
+++ b/src/gui/lcd4l_setup.cpp
@@ -52,7 +52,7 @@
 #include <driver/screen_max.h>
 
 // lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 
 const CMenuOptionChooser::keyval LCD4L_SUPPORT_OPTIONS[] =
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index ddb2da75e..eea668d05 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -47,7 +47,7 @@
 #include <cctype>
 
 //NI lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 
 /* the following generic menu items are integrated into multiple menus at the same time */
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index bf6aae6b0..da2b11539 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -162,7 +162,7 @@ CTimeOSD	*FileTimeOSD;
 CInfoIcons	*InfoIcons;
 
 //NI lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 CLCD4l		*LCD4l;
 
 int allow_flash = 1;
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index e1ad0c827..761b44f20 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -50,7 +50,7 @@
 #endif
 
 //NI lcd4l-support
-#include "gui/lcd4l.h"
+#include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
 
 CFlashTool::CFlashTool()