diff --git a/configure.ac b/configure.ac
index 3ebe71b4d..762575ba8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,9 @@ HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/inclu
 fi
 fi
 
+# hack, so that framebuffer.h does not need to be included everywhere...
+AC_DEFINE(fb_pixel_t, uint32_t, [hack, so that framebuffer.h does not need to be included everywhere...])
+
 # hack to define a short filename also for out-of-tree build
 if test `dirname $0` = `pwd` || test "$0" = ./configure; then
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
diff --git a/src/driver/colorgradient.h b/src/driver/colorgradient.h
index 6569f64b4..b4e80b029 100644
--- a/src/driver/colorgradient.h
+++ b/src/driver/colorgradient.h
@@ -23,8 +23,9 @@
 #ifndef __CCOLORGRADIENT__
 #define __CCOLORGRADIENT__
 
-#include <driver/framebuffer.h>
+#include <inttypes.h>
 
+class CFrameBuffer;
 class CColorGradient
 {
 	private:
diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp
index a0c2f45f7..a7bd27acf 100644
--- a/src/driver/fade.cpp
+++ b/src/driver/fade.cpp
@@ -26,6 +26,7 @@
 #include <global.h>
 #include <driver/rcinput.h>
 #include <driver/fade.h>
+#include <driver/framebuffer.h>
 #include <unistd.h>
 
 #if HAVE_COOL_HARDWARE
diff --git a/src/driver/fade.h b/src/driver/fade.h
index 83c81ef60..e6bc250bb 100644
--- a/src/driver/fade.h
+++ b/src/driver/fade.h
@@ -22,8 +22,9 @@
 #ifndef __fade_f__
 #define __fade_f__
 
-#include <driver/framebuffer.h>
+#include <inttypes.h>
 
+class CFrameBuffer;
 class COSDFader
 {
 	private:
diff --git a/src/driver/fb_window.h b/src/driver/fb_window.h
index 5d9efc0f7..7f7c00ec9 100644
--- a/src/driver/fb_window.h
+++ b/src/driver/fb_window.h
@@ -23,8 +23,8 @@
 #define __fb_window_h__
 
 #include <driver/fontrenderer.h>
-#include <driver/framebuffer.h>
 
+class CFrameBuffer;
 class CFBWindow
 {
  public:
diff --git a/src/driver/fontrenderer.cpp b/src/driver/fontrenderer.cpp
index a9a547cdb..e974757d3 100644
--- a/src/driver/fontrenderer.cpp
+++ b/src/driver/fontrenderer.cpp
@@ -33,6 +33,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 
 #include <system/debug.h>
diff --git a/src/driver/fontrenderer.h b/src/driver/fontrenderer.h
index 416ca6da1..ed4506e13 100644
--- a/src/driver/fontrenderer.h
+++ b/src/driver/fontrenderer.h
@@ -28,6 +28,7 @@
 
 #include <pthread.h>
 #include <string>
+#include <inttypes.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -36,9 +37,7 @@
 #include FT_CACHE_IMAGE_H
 #include FT_CACHE_SMALL_BITMAPS_H
 
-#include "framebuffer.h"
-
-
+class CFrameBuffer;
 class FBFontRenderClass;
 class Font
 {
diff --git a/src/driver/moviecut.h b/src/driver/moviecut.h
index f95aa58f4..4202238af 100644
--- a/src/driver/moviecut.h
+++ b/src/driver/moviecut.h
@@ -22,8 +22,8 @@
 
 #include <gui/movieinfo.h>
 #include <gui/components/cc.h>
-#include <driver/framebuffer.h>
 
+class CFrameBuffer;
 class CMovieCut
 {
 	private:
diff --git a/src/driver/pictureviewer/bmp.cpp b/src/driver/pictureviewer/bmp.cpp
index 966517f07..cef39838b 100644
--- a/src/driver/pictureviewer/bmp.cpp
+++ b/src/driver/pictureviewer/bmp.cpp
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "pv_config.h"
 #ifdef FBV_SUPPORT_BMP
 #include "pictureviewer.h"
diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp
index be7c0783c..e081aba57 100644
--- a/src/driver/pictureviewer/crw.cpp
+++ b/src/driver/pictureviewer/crw.cpp
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "pv_config.h"
 #include <cstring>
 #include <cstdlib>
diff --git a/src/driver/pictureviewer/gif.cpp b/src/driver/pictureviewer/gif.cpp
index 0e082b902..7502e9430 100644
--- a/src/driver/pictureviewer/gif.cpp
+++ b/src/driver/pictureviewer/gif.cpp
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "pv_config.h"
 
 #include <cstring>
diff --git a/src/driver/pictureviewer/pictureviewer.h b/src/driver/pictureviewer/pictureviewer.h
index 8183f1943..bdddb6f25 100644
--- a/src/driver/pictureviewer/pictureviewer.h
+++ b/src/driver/pictureviewer/pictureviewer.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <stdio.h>    /* printf       */
 #include <sys/time.h> /* gettimeofday */
-#include <driver/framebuffer.h>
+#include <inttypes.h>
 class CPictureViewer
 {
 	struct cformathandler 
@@ -64,7 +64,7 @@ class CPictureViewer
 	void Cleanup();
 	void SetVisible(int startx, int endx, int starty, int endy);
 	static double m_aspect_ratio_correction;
-	bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=CFrameBuffer::TM_EMPTY);
+	bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=0 /*CFrameBuffer::TM_EMPTY*/);
 // 	bool DisplayLogo (uint64_t channel_id, int posx, int posy, int width, int height);
 	bool GetLogoName(const uint64_t& channel_id, const std::string& ChanName, std::string & name, int *width = NULL, int *height = NULL);
 	fb_pixel_t * getImage (const std::string & name, int width, int height);
diff --git a/src/driver/pictureviewer/png.cpp b/src/driver/pictureviewer/png.cpp
index 83b01976b..28cea1670 100644
--- a/src/driver/pictureviewer/png.cpp
+++ b/src/driver/pictureviewer/png.cpp
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "pv_config.h"
 
 #ifdef FBV_SUPPORT_PNG
diff --git a/src/driver/radiotext.h b/src/driver/radiotext.h
index 0a2b64ae9..b822ebd67 100644
--- a/src/driver/radiotext.h
+++ b/src/driver/radiotext.h
@@ -46,7 +46,6 @@
 #ifndef __RADIO_AUDIO_H
 #define __RADIO_AUDIO_H
 
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 
 #if 0
diff --git a/src/driver/volume.h b/src/driver/volume.h
index 430ed7444..c01f9293b 100644
--- a/src/driver/volume.h
+++ b/src/driver/volume.h
@@ -26,9 +26,9 @@
 #ifndef __CVOLUME__
 #define __CVOLUME__
 
-#include <driver/framebuffer.h>
 #include <gui/volumebar.h>
 
+class CFramebuffer;
 class CVolume : public CChangeObserver
 {
 	private:
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index 297f5605a..7905d6e1c 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -34,7 +34,6 @@
 #define __audioplayergui__
 
 
-#include <driver/framebuffer.h>
 #include <driver/audiofile.h>
 #include <gui/filebrowser.h>
 #include <gui/components/cc.h>
@@ -53,6 +52,7 @@ typedef std::set<long> CPosList;
 typedef std::map<unsigned char, CPosList> CTitle2Pos;
 typedef std::pair<unsigned char, CPosList> CTitle2PosItem;
 
+class CFrameBuffer;
 class CAudiofileExt : public CAudiofile
 {
 public:
diff --git a/src/gui/bedit/bouqueteditor_bouquets.h b/src/gui/bedit/bouqueteditor_bouquets.h
index 256bd25bb..0fa55f470 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.h
+++ b/src/gui/bedit/bouqueteditor_bouquets.h
@@ -32,7 +32,6 @@
 #ifndef __bouqueteditor_bouquets__
 #define __bouqueteditor_bouquets__
 
-#include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
 
 #include <zapit/client/zapitclient.h>
@@ -42,6 +41,7 @@
 #include <gui/widget/listhelpers.h>
 #include <string>
 
+class CFrameBuffer;
 /* class for handling when bouquets changed.                  */
 /* This class should be a temporarily work around             */
 /* and should be replaced by standard neutrino event handlers */
diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h
index d13b9aa74..09394fc64 100644
--- a/src/gui/bedit/bouqueteditor_channels.h
+++ b/src/gui/bedit/bouqueteditor_channels.h
@@ -33,7 +33,6 @@
 #ifndef __bouqueteditor_channels__
 #define __bouqueteditor_channels__
 
-#include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/listhelpers.h>
 #include <gui/components/cc.h>
@@ -43,6 +42,7 @@
 #include <zapit/channel.h>
 #include <zapit/bouquets.h>
 
+class CFrameBuffer;
 class CBEChannelWidget : public CMenuTarget, public CListHelpers
 {
 
diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h
index a4d2ccaeb..91ed9fdb3 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.h
+++ b/src/gui/bedit/bouqueteditor_chanselect.h
@@ -32,7 +32,6 @@
 #ifndef __bouqueteditor_chanselect__
 #define __bouqueteditor_chanselect__
 
-#include <driver/framebuffer.h>
 #include <gui/widget/listbox.h>
 #include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
diff --git a/src/gui/bookmarkmanager.h b/src/gui/bookmarkmanager.h
index 9003c71ca..8e996895c 100644
--- a/src/gui/bookmarkmanager.h
+++ b/src/gui/bookmarkmanager.h
@@ -39,12 +39,12 @@
 #include <string>
 #include <vector>
 
-#include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
 
 #define MAXBOOKMARKS 10
 #define BOOKMARKFILE CONFIGDIR "/bookmarks"
 
+class CFramebuffer;
 class CBookmark
 {
  private:
diff --git a/src/gui/bouquetlist.h b/src/gui/bouquetlist.h
index 0682242c2..04043e34e 100644
--- a/src/gui/bouquetlist.h
+++ b/src/gui/bouquetlist.h
@@ -36,12 +36,12 @@
 #include <gui/channellist.h>
 #include <gui/widget/listhelpers.h>
 
-#include <driver/framebuffer.h>
 #include <zapit/bouquets.h>
 
 #include <string>
 #include <vector>
 
+class CFrameBuffer;
 
 typedef enum bouquetSwitchMode
 {
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 2a4058bff..aa9933030 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -33,7 +33,6 @@
 	Boston, MA  02110-1301, USA.
 */
 
-#include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/listhelpers.h>
 #include <gui/components/cc.h>
@@ -65,6 +64,7 @@ enum {
 	CHANLIST_NO_RESTORE = -4
 };
 
+class CFrameBuffer;
 class CBouquet;
 
 class CChannelList : public CListHelpers
diff --git a/src/gui/color.cpp b/src/gui/color.cpp
index cbc0873e0..519674667 100644
--- a/src/gui/color.cpp
+++ b/src/gui/color.cpp
@@ -37,6 +37,8 @@
 #include <stdio.h>
 #include <math.h>
 
+#include <driver/framebuffer.h>
+
 #ifndef FLT_EPSILON
 #define FLT_EPSILON 1E-5
 #endif
diff --git a/src/gui/components/cc_draw.h b/src/gui/components/cc_draw.h
index a7d442e86..a144433ec 100644
--- a/src/gui/components/cc_draw.h
+++ b/src/gui/components/cc_draw.h
@@ -29,6 +29,7 @@
 #include "cc_signals.h"
 #include "cc_timer.h"
 #include <driver/colorgradient.h>
+#include <driver/framebuffer.h>
 #include <driver/fade.h>
 #include <gui/color.h>
 
diff --git a/src/gui/components/cc_types.h b/src/gui/components/cc_types.h
index 12a42cf7c..fd966a2f1 100644
--- a/src/gui/components/cc_types.h
+++ b/src/gui/components/cc_types.h
@@ -26,12 +26,12 @@
 #ifndef __CC_TYPES__
 #define __CC_TYPES__
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <gui/color_custom.h>
 
+struct gradientData_t;
 class CComponentsForm;
 class CComponentsScrollBar;
 
diff --git a/src/gui/dboxinfo.h b/src/gui/dboxinfo.h
index a78878570..958a27eb7 100644
--- a/src/gui/dboxinfo.h
+++ b/src/gui/dboxinfo.h
@@ -34,11 +34,11 @@
 #define __dboxinfo__
 
 #include <gui/widget/menue.h>
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 #include <gui/components/cc.h>
 #include <string>
 
+class CFrameBuffer;
 class CDBoxInfoWidget : public CMenuTarget
 {
 	private:
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index 051efff92..877e80638 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -33,7 +33,6 @@
 #ifndef __epgview__
 #define __epgview__
 
-#include <driver/framebuffer.h>
 #include <driver/rcinput.h>
 #include <driver/fontrenderer.h>
 #include <system/settings.h>
@@ -50,6 +49,7 @@
 
 #define BIG_FONT_FAKTOR 1.5
 
+class CFrameBuffer;
 class CEpgData
 {
 	private:
diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h
index 2c47b63e3..c4de68955 100644
--- a/src/gui/eventlist.h
+++ b/src/gui/eventlist.h
@@ -30,7 +30,6 @@
 #include <timerdclient/timerdtypes.h>
 #include <sectionsdclient/sectionsdclient.h>
 
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <system/settings.h>
@@ -44,7 +43,7 @@
 
 #include <string>
 
-
+class CFramebuffer;
 class CEventList : public CListHelpers
 {
 	// Eventfinder start
diff --git a/src/gui/filebrowser.h b/src/gui/filebrowser.h
index 16e13b916..b6958f3b1 100644
--- a/src/gui/filebrowser.h
+++ b/src/gui/filebrowser.h
@@ -38,7 +38,6 @@
 #endif
 
 #include <driver/file.h>
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 
@@ -58,6 +57,7 @@
 bool chooserDir(std::string &setting_dir, bool test_dir, const char *action_str, bool allow_tmp = false);
 bool chooserDir(char *setting_dir, bool test_dir, const char *action_str, size_t str_leng, bool allow_tmp = false);
 
+class CFrameBuffer;
 /**
  * Converts input of numeric keys to SMS style char input.
  */
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index f0f7cf658..5c32896a1 100644
--- a/src/gui/infoviewer_bb.h
+++ b/src/gui/infoviewer_bb.h
@@ -36,7 +36,6 @@
 #include <sectionsdclient/sectionsdclient.h>
 
 #include <driver/rcinput.h>
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 #include <driver/fade.h>
 #include <system/settings.h>
@@ -44,6 +43,7 @@
 #include <gui/components/cc.h>
 #include <string>
 
+class CFrameBuffer;
 class CInfoViewerBB
 {
 	public:
diff --git a/src/gui/lua/luainstance_helpers.h b/src/gui/lua/luainstance_helpers.h
index fa54bb690..32253228e 100644
--- a/src/gui/lua/luainstance_helpers.h
+++ b/src/gui/lua/luainstance_helpers.h
@@ -21,6 +21,7 @@
 #ifndef _LUAINSTANCEHELPERS_H
 #define _LUAINSTANCEHELPERS_H
 
+#include <map>
 
 //#define LUA_DEBUG printf
 #define LUA_DEBUG(...)
diff --git a/src/gui/motorcontrol.h b/src/gui/motorcontrol.h
index 96fc16fdf..a70f217ed 100644
--- a/src/gui/motorcontrol.h
+++ b/src/gui/motorcontrol.h
@@ -35,7 +35,6 @@
 
 #include <gui/widget/menue.h>
 #include <gui/components/cc.h>
-#include <driver/framebuffer.h>
 #include <string>
 #include <zapit/femanager.h>
 
@@ -44,6 +43,7 @@
 #define STEP_MODE_ON 2 
 #define STEP_MODE_TIMED 3       
 
+class CFrameBuffer;
 class CMotorControl : public CMenuTarget
 {
 	private:
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 3d59912c1..5da4da4d2 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -34,7 +34,6 @@
 
 #include <config.h>
 #include <configfile.h>
-#include <driver/framebuffer.h>
 #include <gui/filebrowser.h>
 #include <gui/bookmarkmanager.h>
 #include <gui/widget/menue.h>
@@ -59,6 +58,7 @@ extern "C" {
 #include <lualib.h>
 }
 
+class CFrameBuffer;
 class CMoviePlayerGui : public CMenuTarget
 {
  public:
diff --git a/src/gui/opkg_manager.h b/src/gui/opkg_manager.h
index a01894c75..b66f5208e 100644
--- a/src/gui/opkg_manager.h
+++ b/src/gui/opkg_manager.h
@@ -33,7 +33,6 @@
 
 #include <gui/widget/menue.h>
 #include <gui/widget/shellwindow.h>
-#include <driver/framebuffer.h>
 #include <configfile.h>
 #include <string>
 #include <vector>
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index a5e0d09a2..18adc6311 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -34,13 +34,12 @@
 #include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 
-#include <driver/framebuffer.h>
-
 #include <system/setting_helpers.h>
 #include <system/settings.h>
 
 #include <string>
 
+class CFrameBuffer;
 class COsdSetup : public CMenuTarget, public CChangeObserver
 {	
 	private:
diff --git a/src/gui/pictureviewer.h b/src/gui/pictureviewer.h
index 6b17ec2dd..6e89ccbcd 100644
--- a/src/gui/pictureviewer.h
+++ b/src/gui/pictureviewer.h
@@ -33,7 +33,6 @@
 #define __pictureviewergui__
 
 
-#include <driver/framebuffer.h>
 #include <driver/pictureviewer/pictureviewer.h>
 #include <gui/widget/menue.h>
 #include <gui/filebrowser.h>
@@ -41,6 +40,7 @@
 
 #include <string>
 
+class CFrameBuffer;
 class CPicture
 {
 public:
diff --git a/src/gui/pictureviewer_setup.h b/src/gui/pictureviewer_setup.h
index 99ae6c06c..f4b6d9505 100644
--- a/src/gui/pictureviewer_setup.h
+++ b/src/gui/pictureviewer_setup.h
@@ -33,9 +33,6 @@
 
 #include <gui/widget/menue.h>
 
-#include <driver/framebuffer.h>
-
-
 #include <string>
 
 class CPictureViewerSetup : public CMenuTarget
diff --git a/src/gui/pipsetup.h b/src/gui/pipsetup.h
index 0111569d8..138924cc1 100644
--- a/src/gui/pipsetup.h
+++ b/src/gui/pipsetup.h
@@ -2,9 +2,9 @@
 #define __PIP_SETUP_H_
 
 #include <gui/widget/menue.h>
-#include <driver/framebuffer.h>
 #include <string>
 
+class CFrameBuffer;
 class CPipSetup : public CMenuTarget
 {
 	private:
diff --git a/src/gui/pluginlist.h b/src/gui/pluginlist.h
index be528d278..37477366f 100644
--- a/src/gui/pluginlist.h
+++ b/src/gui/pluginlist.h
@@ -34,7 +34,6 @@
 
 #include <gui/widget/menue.h>
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 
 #include <string>
diff --git a/src/gui/plugins.h b/src/gui/plugins.h
index 8f3ac8dd6..599e761c6 100644
--- a/src/gui/plugins.h
+++ b/src/gui/plugins.h
@@ -32,7 +32,6 @@
 #ifndef __plugins__
 #define __plugins__
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 
 #include <plugin.h>
@@ -40,6 +39,7 @@
 #include <string>
 #include <vector>
 
+class CFrameBuffer;
 class CPlugins
 {
 
diff --git a/src/gui/scan.h b/src/gui/scan.h
index a9441dcda..bf2457c31 100644
--- a/src/gui/scan.h
+++ b/src/gui/scan.h
@@ -34,11 +34,11 @@
 
 #include <gui/widget/menue.h>
 #include <gui/components/cc.h>
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <string>
 #include <system/settings.h>
 
+class CFrameBuffer;
 class CScanTs : public CMenuTarget
 {
 	private:
diff --git a/src/gui/screensaver.h b/src/gui/screensaver.h
index 6bad49d29..4f47e3a69 100644
--- a/src/gui/screensaver.h
+++ b/src/gui/screensaver.h
@@ -25,11 +25,11 @@
 #ifndef __CSCREENSAVER_H__
 #define __CSCREENSAVER_H__
 
-#include <driver/framebuffer.h>
 #include <vector>
 #include <string>
 #include <gui/components/cc.h>
 
+class CFrameBuffer;
 class CScreenSaver : public sigc::trackable
 {
 	private:
diff --git a/src/gui/screensetup.h b/src/gui/screensetup.h
index 1a3d2f429..db272ce94 100644
--- a/src/gui/screensetup.h
+++ b/src/gui/screensetup.h
@@ -35,11 +35,9 @@
 
 #include <gui/widget/menue.h>
 
-#include <driver/framebuffer.h>
-
 #include <string>
 
-
+class CFrameBuffer;
 class CScreenSetup : public CMenuTarget
 {
  private:
diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h
index ca7019659..20d934604 100644
--- a/src/gui/streaminfo2.h
+++ b/src/gui/streaminfo2.h
@@ -25,12 +25,11 @@
 
 #include <gui/widget/menue.h>
 
-#include <driver/framebuffer.h>
 #include <gui/components/cc.h>
 #include <gui/movieplayer.h>
 #include <zapit/femanager.h>
 
-
+class CFrameBuffer;
 class COSDFader;
 class CStreamInfo2 : public CMenuTarget
 {
diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h
index 32f2500ff..d58b0a8a9 100644
--- a/src/gui/timerlist.h
+++ b/src/gui/timerlist.h
@@ -38,12 +38,10 @@
 #include <gui/widget/menue.h>
 #include <gui/widget/listhelpers.h>
 
-#include <driver/framebuffer.h>
-
 #include <string>
 #include <vector>
 
-
+class CFrameBuffer;
 class CTimerdClient;
 class CTimerList : public CMenuTarget, public CListHelpers
 {
diff --git a/src/gui/update.h b/src/gui/update.h
index 2302ad3e6..94da38ea2 100644
--- a/src/gui/update.h
+++ b/src/gui/update.h
@@ -38,7 +38,6 @@
 
 #include <gui/widget/progresswindow.h>
 
-#include <driver/framebuffer.h>
 #ifdef BOXMODEL_APOLLO
 #include <system/mtdutils/mkfs.jffs2.h>
 #endif
diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h
index 2ab2df4e5..409b785a8 100644
--- a/src/gui/upnpbrowser.h
+++ b/src/gui/upnpbrowser.h
@@ -23,7 +23,6 @@
 #ifndef __upnpplayergui__
 #define __upnpplayergui__
 
-#include <driver/framebuffer.h>
 #include <driver/audiofile.h>
 #include <driver/pictureviewer/pictureviewer.h>
 #include <gui/filebrowser.h>
@@ -58,6 +57,7 @@ struct UPnPEntry
 	int		type;
 };
 
+class CFrameBuffer;
 class CUpnpBrowserGui : public CMenuTarget, public CListHelpers
 {
 	public:
diff --git a/src/gui/videosettings.h b/src/gui/videosettings.h
index 2b07076a6..9c0e7e628 100644
--- a/src/gui/videosettings.h
+++ b/src/gui/videosettings.h
@@ -31,10 +31,9 @@
 #define __video_setup__
 
 #include <gui/widget/menue.h>
-#include <driver/framebuffer.h>
-
 #include <string>
 
+class CFrameBuffer;
 class CVideoSettings : public CMenuWidget, CChangeObserver
 {
 	private:
diff --git a/src/gui/widget/buttons.h b/src/gui/widget/buttons.h
index 2f1e75395..efdff09d6 100644
--- a/src/gui/widget/buttons.h
+++ b/src/gui/widget/buttons.h
@@ -23,7 +23,6 @@
  */
  
 #include <driver/fontrenderer.h>
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <gui/color.h>
 
diff --git a/src/gui/widget/colorchooser.h b/src/gui/widget/colorchooser.h
index 5ecc64ec6..1a0503a6e 100644
--- a/src/gui/widget/colorchooser.h
+++ b/src/gui/widget/colorchooser.h
@@ -33,12 +33,12 @@
 #ifndef __colorchooser__
 #define __colorchooser__
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <gui/widget/menue.h>
 
 #include <string>
 
+class CFrameBuffer;
 class CColorChooser : public CMenuTarget
 {
 	private:
diff --git a/src/gui/widget/keyboard_input.h b/src/gui/widget/keyboard_input.h
index 23a3b3601..31e0b94a2 100644
--- a/src/gui/widget/keyboard_input.h
+++ b/src/gui/widget/keyboard_input.h
@@ -26,7 +26,6 @@
 
 #include "menue.h"
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 
 #include <string>
@@ -41,6 +40,7 @@ struct keyboard_layout
         std::string (*keys)[KEY_ROWS][KEY_COLUMNS];
 };
 
+class CFrameBuffer;
 class CInputString
 {
 	private:
diff --git a/src/gui/widget/keychooser.h b/src/gui/widget/keychooser.h
index d7495dc45..fc881db6c 100644
--- a/src/gui/widget/keychooser.h
+++ b/src/gui/widget/keychooser.h
@@ -35,14 +35,13 @@
 
 #include <string>
 
-#include <driver/framebuffer.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <system/localize.h>
 
 #include "menue.h"
 
-
+class CFrameBuffer;
 class CKeyChooserItem;
 class CKeyChooserItemNoKey;
 class CKeyChooser : public CMenuWidget
diff --git a/src/gui/widget/listbox.h b/src/gui/widget/listbox.h
index 26a27f8e6..1d46a028c 100644
--- a/src/gui/widget/listbox.h
+++ b/src/gui/widget/listbox.h
@@ -28,10 +28,9 @@
 #include "menue.h"
 #include "listhelpers.h"
 
-#include <driver/framebuffer.h>
-
 #include <string>
 
+class CFrameBuffer;
 class CListBox : public CMenuTarget, public CListHelpers
 {
 	protected:
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 5cfa58da2..de5908e7f 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -36,12 +36,10 @@
 #ifndef __MENU__
 #define __MENU__
 
-#include <driver/framebuffer.h>
 #include <driver/rcinput.h>
 #include <system/localize.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
-#include <gui/color.h>
 #include <gui/plugins.h>
 #include <gui/components/cc.h>
 #include <string>
@@ -58,6 +56,8 @@ extern "C" {
 
 typedef int mn_widget_id_t;
 typedef int menu_item_disable_cond_t;
+
+class CFrameBuffer;
 class CMenuWidget;
 struct menu_return
 {
diff --git a/src/gui/widget/mountchooser.h b/src/gui/widget/mountchooser.h
index 98966eb4b..78c0af607 100644
--- a/src/gui/widget/mountchooser.h
+++ b/src/gui/widget/mountchooser.h
@@ -33,7 +33,6 @@
 #ifndef __mountchooser__
 #define __mountchooser__
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <gui/widget/menue.h>
 
diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h
index b01d65c09..f57b13628 100644
--- a/src/gui/widget/stringinput.h
+++ b/src/gui/widget/stringinput.h
@@ -28,11 +28,11 @@
 
 #include "menue.h"
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 
 #include <string>
 
+class CFrameBuffer;
 class CStringInput : public CMenuTarget
 {
 	protected:
diff --git a/src/gui/widget/stringinput_ext.h b/src/gui/widget/stringinput_ext.h
index 78440df27..099583f83 100644
--- a/src/gui/widget/stringinput_ext.h
+++ b/src/gui/widget/stringinput_ext.h
@@ -35,12 +35,12 @@
 
 #include "menue.h"
 
-#include <driver/framebuffer.h>
 #include <system/localize.h>
 
 #include <string>
 #include <vector>
 
+class CFrameBuffer;
 class CExtendedInput_Item;
 class CExtendedInput : public CMenuTarget
 {
diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index 50a93901c..46ae17fa0 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -47,6 +47,7 @@
 #include "debug.h"
 #include <global.h>
 #include <driver/fontrenderer.h>
+#include <driver/framebuffer.h>
 #include <system/helpers.h>
 #include <gui/update_ext.h>
 using namespace std;
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 2d023c124..29e58fdf5 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -18,6 +18,7 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 */
 
+#include <config.h>
 #include <cstring>
 #include <system/httptool.h>