diff --git a/src/Makefile.am b/src/Makefile.am
index 126f279a1..616e49b8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,7 +81,7 @@ neutrino_LDADD = \
 	gui/widget/libneutrino_gui_widget2.a \
 	driver/pictureviewer/libneutrino_pictureviewer.a \
 	$(MTDUTILSLIBS) \
-	gui/movieinfo.o \
+	driver/movieinfo.o \
 	gui/moviebrowser/mb.o \
 	gui/libneutrino_gui2.a \
 	gui/components/libneutrino_gui_components.a \
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index b915465ee..e7d4eaf43 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -33,6 +33,7 @@ libneutrino_driver_a_SOURCES = \
 	fontrenderer.cpp \
 	genpsi.cpp \
 	moviecut.cpp \
+	movieinfo.cpp \
 	neutrinofonts.cpp \
 	radiotext.cpp \
 	radiotools.cpp \
diff --git a/src/driver/moviecut.h b/src/driver/moviecut.h
index 4202238af..d4ea6810f 100644
--- a/src/driver/moviecut.h
+++ b/src/driver/moviecut.h
@@ -20,7 +20,7 @@
 #ifndef __MOVIE_CUT__
 #define __MOVIE_CUT__
 
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <gui/components/cc.h>
 
 class CFrameBuffer;
diff --git a/src/gui/movieinfo.cpp b/src/driver/movieinfo.cpp
similarity index 99%
rename from src/gui/movieinfo.cpp
rename to src/driver/movieinfo.cpp
index 269d613f9..0714c0a05 100644
--- a/src/gui/movieinfo.cpp
+++ b/src/driver/movieinfo.cpp
@@ -34,8 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <gui/widget/msgbox.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <system/helpers.h>
 
 #include <neutrino.h>
diff --git a/src/gui/movieinfo.h b/src/driver/movieinfo.h
similarity index 100%
rename from src/gui/movieinfo.h
rename to src/driver/movieinfo.h
diff --git a/src/driver/record.h b/src/driver/record.h
index 59cf668c5..8b3c8df00 100644
--- a/src/driver/record.h
+++ b/src/driver/record.h
@@ -30,7 +30,7 @@
 #include <timerdclient/timerdtypes.h>
 
 #include <neutrinoMessages.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 
 #if HAVE_COOL_HARDWARE
 #include <record_cs.h>
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 86a06903f..47c9b2d96 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -68,7 +68,6 @@ libneutrino_gui_a_SOURCES = \
 	mediaplayer.cpp \
 	mediaplayer_setup.cpp \
 	miscsettings_menu.cpp \
-	movieinfo.cpp \
 	movieplayer.cpp \
 	network_service.cpp \
 	network_setup.cpp \
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index b66360d44..f776f5be7 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -36,7 +36,7 @@
 #include <driver/rcinput.h>
 #include <system/settings.h>
 
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include "widget/menue.h"
 
 #include <vector>
diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h
index 57e1f549c..607528821 100644
--- a/src/gui/moviebrowser/mb.h
+++ b/src/gui/moviebrowser/mb.h
@@ -53,7 +53,7 @@
 
 #include <gui/widget/textbox.h>
 #include <gui/widget/listframe.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <driver/file.h>
 #include <driver/fb_window.h>
 #include <system/ytparser.h>
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 5da4da4d2..1e15997d7 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -38,7 +38,7 @@
 #include <gui/bookmarkmanager.h>
 #include <gui/widget/menue.h>
 #include <gui/moviebrowser/mb.h>
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 #include <gui/widget/hintbox.h>
 #include <gui/timeosd.h>
 #include <driver/record.h>
diff --git a/src/system/ytcache.h b/src/system/ytcache.h
index 1e3fcba3a..45873d38e 100644
--- a/src/system/ytcache.h
+++ b/src/system/ytcache.h
@@ -30,7 +30,7 @@
 #include <OpenThreads/Thread>
 #include <OpenThreads/Condition>
 
-#include <gui/movieinfo.h>
+#include <driver/movieinfo.h>
 
 class cYTCache
 {