From f6d5a968384d2cf9caa9aff38f177b3565e08d66 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 5 Feb 2017 13:37:53 +0100
Subject: [PATCH] replace fontrenderer.h include with forward declaration

in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/2303d94300444c74a3789cab19660aa30edff71c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
---
 src/driver/fb_window.h                   | 5 ++---
 src/driver/radiotext.h                   | 2 --
 src/gui/bookmarkmanager.cpp              | 2 +-
 src/gui/channellist.cpp                  | 1 +
 src/gui/components/cc_frm_button.cpp     | 1 +
 src/gui/components/cc_frm_clock.cpp      | 1 +
 src/gui/components/cc_frm_ext_text.cpp   | 1 +
 src/gui/components/cc_frm_footer.cpp     | 1 +
 src/gui/components/cc_frm_header.cpp     | 1 +
 src/gui/components/cc_frm_signalbars.cpp | 1 +
 src/gui/components/cc_item_text.cpp      | 1 +
 src/gui/components/cc_types.h            | 2 +-
 src/gui/dboxinfo.h                       | 2 +-
 src/gui/epgplus.cpp                      | 1 +
 src/gui/epgview.cpp                      | 1 +
 src/gui/epgview.h                        | 1 -
 src/gui/eventlist.cpp                    | 1 +
 src/gui/eventlist.h                      | 1 -
 src/gui/filebrowser.cpp                  | 1 +
 src/gui/filebrowser.h                    | 2 +-
 src/gui/imageinfo.cpp                    | 1 +
 src/gui/infoviewer.cpp                   | 1 +
 src/gui/infoviewer.h                     | 1 -
 src/gui/infoviewer_bb.cpp                | 1 +
 src/gui/infoviewer_bb.h                  | 1 -
 src/gui/lua/luainstance.cpp              | 1 +
 src/gui/lua/luainstance_helpers.h        | 2 ++
 src/gui/motorcontrol.cpp                 | 1 +
 src/gui/moviebrowser/mb.cpp              | 1 +
 src/gui/movieplayer.cpp                  | 1 +
 src/gui/scan.cpp                         | 1 +
 src/gui/scan_setup.cpp                   | 1 +
 src/gui/test_menu.cpp                    | 1 +
 src/gui/volumebar.cpp                    | 1 +
 src/gui/widget/buttons.cpp               | 4 ++--
 src/gui/widget/buttons.h                 | 1 -
 src/gui/widget/helpbox.cpp               | 1 +
 src/gui/widget/hintbox.cpp               | 1 +
 src/gui/widget/keychooser.cpp            | 1 +
 src/gui/widget/keychooser.h              | 1 -
 src/gui/widget/listbox.cpp               | 1 +
 src/gui/widget/listframe.cpp             | 1 +
 src/gui/widget/progresswindow.cpp        | 1 +
 src/gui/widget/shellwindow.cpp           | 1 +
 src/gui/widget/textbox.cpp               | 1 +
 src/gui/widget/textbox.h                 | 3 ++-
 46 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/driver/fb_window.h b/src/driver/fb_window.h
index 7f7c00ec9..f0a991669 100644
--- a/src/driver/fb_window.h
+++ b/src/driver/fb_window.h
@@ -21,8 +21,7 @@
 
 #ifndef __fb_window_h__
 #define __fb_window_h__
-
-#include <driver/fontrenderer.h>
+#include <inttypes.h>
 
 class CFrameBuffer;
 class CFBWindow
@@ -47,7 +46,7 @@ class CFBWindow
 	void paintVLineRel(int _x, int _y, int _dy, const color_t _col);
 	void paintHLineRel(int _x, int _dx, int _y, const color_t _col);
 	bool paintIcon(const char * const _filename, const int _x, const int _y, const int _h = 0, const color_t _offset = 1);
-	void RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight = 0, const unsigned int _flags = Font::IS_UTF8);
+	void RenderString(const font_t _font, const int _x, const int _y, const int _width, const char * const _text, const color_t _color, const int _boxheight = 0, const unsigned int _flags = 1 /*Font::IS_UTF8*/);
 
 	fb_pixel_t* saveScreen(const int _x, const int _y, const int _dx, const int _dy);
 	void restoreScreen(const int _x, const int _y, const int _dx, const int _dy, fb_pixel_t* buf, bool delBuf);
diff --git a/src/driver/radiotext.h b/src/driver/radiotext.h
index b822ebd67..d5758e48d 100644
--- a/src/driver/radiotext.h
+++ b/src/driver/radiotext.h
@@ -46,8 +46,6 @@
 #ifndef __RADIO_AUDIO_H
 #define __RADIO_AUDIO_H
 
-#include <driver/fontrenderer.h>
-
 #if 0
 #include <vdr/player.h>
 #include <vdr/device.h>
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index 8d7f21453..f88736107 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -37,7 +37,7 @@
 #include <system/settings.h>
 #include <driver/display.h>
 #include <driver/screen_max.h>
-
+#include <driver/fontrenderer.h>
 #include <gui/components/cc.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/hintbox.h>
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index efa09a771..3ae141a60 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -47,6 +47,7 @@
 #include <driver/fade.h>
 #include <driver/display.h>
 #include <driver/radiotext.h>
+#include <driver/fontrenderer.h>
 
 #include <gui/color.h>
 #include <gui/color_custom.h>
diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index 3ec7ce20b..b7bba8f93 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -32,6 +32,7 @@
 #include <gui/color_custom.h>
 #include <system/debug.h>
 #include "cc_frm_button.h"
+#include <driver/fontrenderer.h>
 
 using namespace std;
 
diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp
index fcce3647e..adf696566 100644
--- a/src/gui/components/cc_frm_clock.cpp
+++ b/src/gui/components/cc_frm_clock.cpp
@@ -36,6 +36,7 @@
 #include <ctype.h>
 #include <system/helpers.h>
 #include <system/debug.h>
+#include <driver/fontrenderer.h>
 
 using namespace std;
 
diff --git a/src/gui/components/cc_frm_ext_text.cpp b/src/gui/components/cc_frm_ext_text.cpp
index 420ea2775..fc584486e 100644
--- a/src/gui/components/cc_frm_ext_text.cpp
+++ b/src/gui/components/cc_frm_ext_text.cpp
@@ -28,6 +28,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include "cc_frm_ext_text.h"
+#include <driver/fontrenderer.h>
 
 #include <sigc++/bind.h>
 
diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp
index 6653d6616..2b1c568ff 100644
--- a/src/gui/components/cc_frm_footer.cpp
+++ b/src/gui/components/cc_frm_footer.cpp
@@ -29,6 +29,7 @@
 #include <gui/color_custom.h>
 #include "cc_frm_footer.h"
 #include <system/debug.h>
+#include <driver/fontrenderer.h>
 
 using namespace std;
 
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 8a56e24ad..d07f5523e 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -30,6 +30,7 @@
 #include <neutrino.h>
 #include "cc_frm_header.h"
 #include <system/debug.h>
+#include <driver/fontrenderer.h>
 
 #include <sigc++/bind.h>
 
diff --git a/src/gui/components/cc_frm_signalbars.cpp b/src/gui/components/cc_frm_signalbars.cpp
index 28728c6bf..e120ed758 100644
--- a/src/gui/components/cc_frm_signalbars.cpp
+++ b/src/gui/components/cc_frm_signalbars.cpp
@@ -30,6 +30,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include "cc_frm_signalbars.h"
+#include <driver/fontrenderer.h>
 #include <sstream>
 
 #define SB_MIN_HEIGHT 12
diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp
index 67ee50401..d0346dc7e 100644
--- a/src/gui/components/cc_item_text.cpp
+++ b/src/gui/components/cc_item_text.cpp
@@ -31,6 +31,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include "cc_item_text.h"
+#include <driver/fontrenderer.h>
 #include <sstream>
 #include <fstream>
 #include <errno.h>
diff --git a/src/gui/components/cc_types.h b/src/gui/components/cc_types.h
index fd966a2f1..c76520bb8 100644
--- a/src/gui/components/cc_types.h
+++ b/src/gui/components/cc_types.h
@@ -27,11 +27,11 @@
 #define __CC_TYPES__
 
 #include <system/localize.h>
-#include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <gui/color_custom.h>
 
 struct gradientData_t;
+class Font;
 class CComponentsForm;
 class CComponentsScrollBar;
 
diff --git a/src/gui/dboxinfo.h b/src/gui/dboxinfo.h
index 958a27eb7..f3a04a31a 100644
--- a/src/gui/dboxinfo.h
+++ b/src/gui/dboxinfo.h
@@ -34,10 +34,10 @@
 #define __dboxinfo__
 
 #include <gui/widget/menue.h>
-#include <driver/fontrenderer.h>
 #include <gui/components/cc.h>
 #include <string>
 
+class Font;
 class CFrameBuffer;
 class CDBoxInfoWidget : public CMenuTarget
 {
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 9b2f2026b..a5e075a91 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -51,6 +51,7 @@
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
+#include <driver/fontrenderer.h>
 #include <zapit/satconfig.h>
 #include <zapit/getservices.h>
 #include <eitd/sectionsd.h>
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 02bbb504b..a75a29a26 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -52,6 +52,7 @@
 #include <gui/pictureviewer.h>
 #include <gui/tmdb.h>
 #include <driver/record.h>
+#include <driver/fontrenderer.h>
 
 #include <zapit/bouquets.h>
 #include <zapit/getservices.h>
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index 877e80638..a4116343e 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -34,7 +34,6 @@
 #define __epgview__
 
 #include <driver/rcinput.h>
-#include <driver/fontrenderer.h>
 #include <system/settings.h>
 
 #include <gui/color.h>
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 76c771559..315acf576 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -53,6 +53,7 @@
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 #include <driver/record.h>
+#include <driver/fontrenderer.h>
 
 #include <system/helpers.h>
 #include <zapit/client/zapittools.h>
diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h
index c4de68955..bbbbb4828 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/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <system/settings.h>
 #include <gui/components/cc.h>
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 5187baf14..7ecdcf00e 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -41,6 +41,7 @@
 #include <neutrino.h>
 #include <driver/display.h>
 #include <driver/screen_max.h>
+#include <driver/fontrenderer.h>
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/src/gui/filebrowser.h b/src/gui/filebrowser.h
index b6958f3b1..cb437c7da 100644
--- a/src/gui/filebrowser.h
+++ b/src/gui/filebrowser.h
@@ -38,7 +38,6 @@
 #endif
 
 #include <driver/file.h>
-#include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 
 #include <gui/color.h>
@@ -57,6 +56,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 Font;
 class CFrameBuffer;
 /**
  * Converts input of numeric keys to SMS style char input.
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 017205bc7..99a3cace5 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -33,6 +33,7 @@
 #include <neutrino.h>
 
 #include <driver/rcinput.h>
+#include <driver/fontrenderer.h>
 
 #include <sys/utsname.h>
 #include <string>
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index da61e5cea..c32a4e9e2 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -68,6 +68,7 @@
 #include <driver/display.h>
 #include <driver/volume.h>
 #include <driver/radiotext.h>
+#include <driver/fontrenderer.h>
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h
index 44465c389..69d1ce595 100644
--- a/src/gui/infoviewer.h
+++ b/src/gui/infoviewer.h
@@ -36,7 +36,6 @@
 #include <sectionsdclient/sectionsdclient.h>
 
 #include <driver/rcinput.h>
-#include <driver/fontrenderer.h>
 #include <system/settings.h>
 #include <string>
 #include <zapit/channel.h>
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 1545c2baf..6cdd0d85b 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -55,6 +55,7 @@
 #include <daemonc/remotecontrol.h>
 #include <driver/radiotext.h>
 #include <driver/volume.h>
+#include <driver/fontrenderer.h>
 
 #include <zapit/femanager.h>
 #include <zapit/zapit.h>
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index 5c32896a1..e664e516d 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/fontrenderer.h>
 #include <driver/fade.h>
 #include <system/settings.h>
 #include "widget/menue.h"
diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index ea7eb8bb3..e3ac5aa40 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -34,6 +34,7 @@
 #include <gui/movieplayer.h>
 #include <driver/neutrinofonts.h>
 #include <driver/pictureviewer/pictureviewer.h>
+#include <driver/fontrenderer.h>
 #include <neutrino.h>
 #include <video_cs.h>
 
diff --git a/src/gui/lua/luainstance_helpers.h b/src/gui/lua/luainstance_helpers.h
index 32253228e..98a1ebbef 100644
--- a/src/gui/lua/luainstance_helpers.h
+++ b/src/gui/lua/luainstance_helpers.h
@@ -46,6 +46,8 @@
 #define lua_unboxpointer(L, i) \
 	(*(void **)(lua_touserdata(L, i)))
 
+class Font;
+
 typedef std::pair<lua_Integer, Font*> fontmap_pair_t;
 typedef std::map<lua_Integer, Font*> fontmap_t;
 typedef fontmap_t::iterator fontmap_iterator_t;
diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index ed159f368..67adbf805 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -42,6 +42,7 @@
 #include <system/settings.h>
 #include <driver/screen_max.h>
 #include <driver/neutrinofonts.h>
+#include <driver/fontrenderer.h>
 #include <zapit/satconfig.h>
 #include <zapit/zapit.h>
 #include <zapit/scannit.h>
diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index b0b669518..9e08c01c5 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -74,6 +74,7 @@
 #include <system/ytcache.h>
 #include <zapit/debug.h>
 #include <driver/moviecut.h>
+#include <driver/fontrenderer.h>
 
 #include <timerdclient/timerdclient.h>
 #include <system/hddstat.h>
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index dfb1b2d02..f57e84352 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -53,6 +53,7 @@
 #include <driver/abstime.h>
 #include <driver/record.h>
 #include <driver/volume.h>
+#include <driver/fontrenderer.h>
 #include <eitd/edvbstring.h>
 #include <system/helpers.h>
 
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index e22733be7..6f894ffe3 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -39,6 +39,7 @@
 #include <driver/record.h>
 #include <driver/volume.h>
 #include <driver/display.h>
+#include <driver/fontrenderer.h>
 
 #include <gui/color.h>
 
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 17017c48f..8970ea014 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -50,6 +50,7 @@
 
 #include <driver/screen_max.h>
 #include <driver/framebuffer.h>
+#include <driver/fontrenderer.h>
 #include <driver/record.h>
 #include <system/debug.h>
 #include <system/helpers.h>
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 44c9b3722..7e0098b96 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -36,6 +36,7 @@
 #include <neutrino.h>
 #include <neutrino_menue.h>
 #include <driver/display.h>
+#include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <system/debug.h>
 #include <gui/color_custom.h>
diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp
index be6e5a3cb..9f9921ad6 100644
--- a/src/gui/volumebar.cpp
+++ b/src/gui/volumebar.cpp
@@ -35,6 +35,7 @@
 #include <gui/infoclock.h>
 #include <gui/timeosd.h>
 #include <driver/neutrinofonts.h>
+#include <driver/fontrenderer.h>
 #include <system/debug.h>
 
 extern CTimeOSD *FileTimeOSD;
diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp
index a5536f234..e0095b45e 100644
--- a/src/gui/widget/buttons.cpp
+++ b/src/gui/widget/buttons.cpp
@@ -29,8 +29,8 @@
 
 #include <gui/widget/buttons.h>
 #include <system/settings.h>
-// #include <driver/stacktrace.h>
-
+//#include <driver/stacktrace.h>
+#include <driver/fontrenderer.h>
 
 
 /* paintButtons usage,
diff --git a/src/gui/widget/buttons.h b/src/gui/widget/buttons.h
index efdff09d6..6cbfeaced 100644
--- a/src/gui/widget/buttons.h
+++ b/src/gui/widget/buttons.h
@@ -22,7 +22,6 @@
  *
  */
  
-#include <driver/fontrenderer.h>
 #include <system/localize.h>
 #include <gui/color.h>
 
diff --git a/src/gui/widget/helpbox.cpp b/src/gui/widget/helpbox.cpp
index 4169b5d13..09c014261 100644
--- a/src/gui/widget/helpbox.cpp
+++ b/src/gui/widget/helpbox.cpp
@@ -29,6 +29,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <gui/widget/helpbox.h>
+#include <driver/fontrenderer.h>
 
 using namespace std;
 
diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index 8e513756a..9e367f4d2 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -34,6 +34,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include "hintbox.h"
+#include <driver/fontrenderer.h>
 #include <system/debug.h>
 
 #define MSG_FONT g_Font[SNeutrinoSettings::FONT_TYPE_MESSAGE_TEXT]
diff --git a/src/gui/widget/keychooser.cpp b/src/gui/widget/keychooser.cpp
index bdc701db8..4daf7bce0 100644
--- a/src/gui/widget/keychooser.cpp
+++ b/src/gui/widget/keychooser.cpp
@@ -40,6 +40,7 @@
 
 #include <gui/color.h>
 #include <driver/screen_max.h>
+#include <driver/fontrenderer.h>
 
 
 class CKeyValue : public CMenuSeparator
diff --git a/src/gui/widget/keychooser.h b/src/gui/widget/keychooser.h
index fc881db6c..8c89140c7 100644
--- a/src/gui/widget/keychooser.h
+++ b/src/gui/widget/keychooser.h
@@ -35,7 +35,6 @@
 
 #include <string>
 
-#include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <system/localize.h>
 
diff --git a/src/gui/widget/listbox.cpp b/src/gui/widget/listbox.cpp
index 5139865b3..6443e028f 100644
--- a/src/gui/widget/listbox.cpp
+++ b/src/gui/widget/listbox.cpp
@@ -32,6 +32,7 @@
 #include <neutrino.h>
 
 #include <gui/widget/icons.h>
+#include <driver/fontrenderer.h>
 
 CListBox::CListBox(const char * const Caption)
 {
diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp
index 4b9495fba..66f14dc6b 100644
--- a/src/gui/widget/listframe.cpp
+++ b/src/gui/widget/listframe.cpp
@@ -54,6 +54,7 @@
 #include <stdlib.h>
 #include "listframe.h"
 #include <gui/widget/icons.h>
+#include <driver/fontrenderer.h>
 
 #define	SCROLL_FRAME_WIDTH 10
 
diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp
index c7decf8fa..f7c84e024 100644
--- a/src/gui/widget/progresswindow.cpp
+++ b/src/gui/widget/progresswindow.cpp
@@ -30,6 +30,7 @@
 #include <global.h>
 #include <neutrino.h>
 
+#include <driver/fontrenderer.h>
 #include <driver/display.h>
 
 CProgressWindow::CProgressWindow(CComponentsForm *parent) 
diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp
index 931390243..0404dc45c 100644
--- a/src/gui/widget/shellwindow.cpp
+++ b/src/gui/widget/shellwindow.cpp
@@ -37,6 +37,7 @@
 #include <sys/wait.h>
 #include <driver/abstime.h>
 #include <driver/framebuffer.h>
+#include <driver/fontrenderer.h>
 #include <gui/widget/textbox.h>
 #include <stdio.h>
 #include <poll.h>
diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 54968c03c..002a4add9 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -61,6 +61,7 @@
 #include <system/debug.h>
 #include "textbox.h"
 #include <gui/widget/icons.h>
+#include <driver/fontrenderer.h>
 #ifdef VISUAL_DEBUG
 #include <gui/color_custom.h>
 #endif
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index afb4e3912..e52dcfb48 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -65,6 +65,7 @@
 #define TRACE  printf
 #define TRACE_1 printf
 
+class Font;
 class CBox
 {
 	public:
@@ -190,7 +191,7 @@ class CTextBox : public sigc::trackable
 		void    setTextBorderWidth(int Hborder, int Vborder);
 		void	setTextFont(Font* font_text);
 		void	setTextMode(const int text_mode){m_nMode = text_mode;};
-		void	setTextRenderModeFullBG(bool mode){ m_renderMode = (mode) ? Font::FULLBG : 0; };
+		void	setTextRenderModeFullBG(bool mode){ m_renderMode = (mode) ? 2 /*Font::FULLBG*/ : 0; };
 		void	setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;};
 		void	setWindowPos(const CBox* position){m_cFrame = *position;};
 		void 	setWindowMaxDimensions(const int width, const int height);