diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp
index 1abad278a..a303038bc 100644
--- a/src/gui/components/cc_item_picture.cpp
+++ b/src/gui/components/cc_item_picture.cpp
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <system/debug.h>
 #include <system/helpers.h>
+#include <driver/pictureviewer/pictureviewer.h>
 
 extern CPictureViewer * g_PicViewer;
 
diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h
index 435065fc9..0781b446e 100644
--- a/src/gui/components/cc_item_picture.h
+++ b/src/gui/components/cc_item_picture.h
@@ -34,7 +34,6 @@
 #include "cc_base.h"
 #include "cc_item.h"
 #include <string>
-#include <driver/pictureviewer/pictureviewer.h>
 
 #define NO_SCALE false
 #define SCALE true
diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h
index 176c34f7f..9dee3dbee 100644
--- a/src/gui/moviebrowser/mb.h
+++ b/src/gui/moviebrowser/mb.h
@@ -56,7 +56,6 @@
 #include <gui/movieinfo.h>
 #include <driver/file.h>
 #include <driver/fb_window.h>
-#include <driver/pictureviewer/pictureviewer.h>
 #include <system/ytparser.h>
 
 #define MAX_NUMBER_OF_BOOKMARK_ITEMS MI_MOVIE_BOOK_USER_MAX // we just use the same size as used in Movie info (MAX_NUMBER_OF_BOOKMARK_ITEMS is used for the number of menu items)
diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp
index 7c3b50b5a..d4558edd7 100644
--- a/src/gui/screensaver.cpp
+++ b/src/gui/screensaver.cpp
@@ -43,6 +43,7 @@
 #include <gui/color_custom.h>
 #include <gui/infoclock.h>
 #include <zapit/zapit.h>
+#include <driver/pictureviewer/pictureviewer.h>
 
 #include <video.h>
 extern cVideo * videoDecoder;
@@ -315,4 +316,4 @@ bool CScreenSaver::IsRun()
 	if(thrScreenSaver)
 		return true;
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/gui/screensaver.h b/src/gui/screensaver.h
index 4f47e3a69..0a9605561 100644
--- a/src/gui/screensaver.h
+++ b/src/gui/screensaver.h
@@ -30,6 +30,7 @@
 #include <gui/components/cc.h>
 
 class CFrameBuffer;
+class CPictureViewer;
 class CScreenSaver : public sigc::trackable
 {
 	private:
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index 92b90d749..dfa79f6c9 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -40,6 +40,7 @@
 #include <driver/audiometadata.h>
 #include <driver/screen_max.h>
 #include <driver/display.h>
+#include <driver/pictureviewer/pictureviewer.h>
 
 #include <gui/audiomute.h>
 #include <gui/color.h>
diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h
index 409b785a8..105ec5fa1 100644
--- a/src/gui/upnpbrowser.h
+++ b/src/gui/upnpbrowser.h
@@ -24,7 +24,6 @@
 #define __upnpplayergui__
 
 #include <driver/audiofile.h>
-#include <driver/pictureviewer/pictureviewer.h>
 #include <gui/filebrowser.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/listhelpers.h>