diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index 6a71fc41e..4c4f42ebe 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -52,6 +52,7 @@
 
 
 #include <driver/record.h>
+#include <driver/radiotext.h>
 #include <driver/streamts.h>
 #include <zapit/capmt.h>
 #include <zapit/channel.h>
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 21f763be8..0e8c55825 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -34,6 +34,7 @@
 #include <audio_cs.h>
 #include <system/settings.h>
 #include <daemonc/remotecontrol.h>
+#include <driver/display.h>
 #include <driver/volume.h>
 #include <gui/audiomute.h>
 #include <gui/mediaplayer.h>
diff --git a/src/global.h b/src/global.h
index 73322e913..c05a44822 100644
--- a/src/global.h
+++ b/src/global.h
@@ -6,14 +6,6 @@
 	Copyright (C) 2001 Steffen Hehn 'McClean'
 	Homepage: http://dbox.cyberphoria.org/
 
-	Kommentar:
-
-	Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
-	Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
-	auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
-	Steuerung getrennt. Diese wird dann von Daemons uebernommen.
-
-
 	License: GPL
 
 	This program is free software; you can redistribute it and/or modify
@@ -31,30 +23,8 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
-#include <sectionsdclient/sectionsdclient.h>
-#include <timerdclient/timerdclient.h>
-
-#include <driver/fontrenderer.h>
-#include <driver/rcinput.h>
-#include <driver/radiotext.h>
-#if HAVE_COOL_HARDWARE
-#include <driver/vfd.h>
-#endif
-#if HAVE_TRIPLEDRAGON
-#include <driver/lcdd.h>
-#define CVFD CLCD
-#endif
-
-#include <system/localize.h>
 #include <system/settings.h>
 
-#include <gui/epgview.h>
-#include <gui/infoviewer.h>
-#include <gui/eventlist.h>
-#include <gui/videosettings.h>
-
-
 #ifndef NEUTRINO_CPP
   #define NEUTRINO_CPP extern
 #endif
@@ -80,26 +50,39 @@ NEUTRINO_CPP  SNeutrinoSettings	g_settings;
 NEUTRINO_CPP  SglobalInfo	g_info;
 
 #ifdef HAVE_CONTROLD
+class CControldClient;
 NEUTRINO_CPP  CControldClient	*g_Controld;
 #endif
+class CZapitClient;
 NEUTRINO_CPP  CZapitClient	*g_Zapit;
+class CSectionsdClient;
 NEUTRINO_CPP  CSectionsdClient	*g_Sectionsd;
+class CTimerdClient;
 NEUTRINO_CPP  CTimerdClient	*g_Timerd;
 
+class FBFontRenderClass;
 NEUTRINO_CPP  FBFontRenderClass	*g_fontRenderer;
 NEUTRINO_CPP  FBFontRenderClass	*g_dynFontRenderer;
 
+class Font;
 NEUTRINO_CPP  Font * g_Font[SNeutrinoSettings::FONT_TYPE_COUNT];
 NEUTRINO_CPP  Font * g_SignalFont;
 
+class CRCInput;
 NEUTRINO_CPP  CRCInput		*g_RCInput;
 
+class CEpgData;
 NEUTRINO_CPP  CEpgData		*g_EpgData;
+class CInfoViewer;
 NEUTRINO_CPP  CInfoViewer	*g_InfoViewer;
+class CNeutrinoEventList;
 NEUTRINO_CPP  CNeutrinoEventList		*g_EventList;
 
+class CLocaleManager;
 NEUTRINO_CPP CLocaleManager	*g_Locale;
+class CVideoSettings;
 NEUTRINO_CPP CVideoSettings	*g_videoSettings;
+class CRadioText;
 NEUTRINO_CPP CRadioText		*g_Radiotext;
 
 #ifndef DISABLE_GUI_MOUNT
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index 954c4d714..a89fd8149 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -30,6 +30,7 @@
 #endif
 #include <global.h>
 #include <neutrino.h>
+#include <driver/display.h>
 #include <gui/infoclock.h>
 #include <gui/volumebar.h>
 #include <gui/audiomute.h>
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 816abbb40..0dd20e7d0 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -42,6 +42,7 @@
 #include <global.h>
 #include <neutrino.h>
 
+#include <driver/display.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/audioplay.h>
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index edb31ac47..ba0c964b9 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -35,6 +35,7 @@
 #include <neutrino.h>
 
 #include <system/settings.h>
+#include <driver/display.h>
 #include <driver/screen_max.h>
 
 #include <gui/components/cc.h>
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 919a91f0e..af668a5b8 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -47,6 +47,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 
+#include <driver/display.h>
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include <driver/rcinput.h>
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 96d45ca07..11f3f1217 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -45,8 +45,12 @@
 #include <driver/abstime.h>
 #include <driver/record.h>
 #include <driver/fade.h>
+#include <driver/radiotext.h>
 
 #include <gui/color.h>
+#include <gui/epgview.h>
+#include <gui/eventlist.h>
+#include <gui/infoviewer.h>
 #include <gui/osd_setup.h>
 #include <gui/components/cc.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 13bb7985a..383f9b828 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -33,6 +33,7 @@
 
 #include <gui/infoviewer.h>
 #include <gui/epgplus.h>
+#include <gui/epgview.h>
 #include <sectionsdclient/sectionsdclient.h>
 #include <timerdclient/timerdclient.h>
 
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 783eabdbc..8ce8c2e62 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <gui/epgview.h>
+#include <gui/eventlist.h>
 
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 1bac43dd7..bfbf8d92c 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -32,7 +32,7 @@
 #include <neutrino.h>
 #include <gui/eventlist.h>
 #include <gui/epgplus.h>
-
+#include <gui/epgview.h>
 #include <gui/timerlist.h>
 #include <gui/user_menue.h>
 
@@ -47,6 +47,7 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/keyboard_input.h>
 
+#include <driver/display.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 4c83619f9..27fa66105 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -39,6 +39,7 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include <driver/display.h>
 #include <driver/screen_max.h>
 
 #include <unistd.h>
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index d6d2df288..6117dd570 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -66,6 +66,7 @@
 #include <daemonc/remotecontrol.h>
 #include <driver/record.h>
 #include <driver/volume.h>
+#include <driver/radiotext.h>
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 18aa19bf2..ef4bee3f2 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -53,6 +53,7 @@
 #include <system/helpers.h>
 #include <system/hddstat.h>
 #include <daemonc/remotecontrol.h>
+#include <driver/radiotext.h>
 #include <driver/volume.h>
 
 #include <zapit/femanager.h>
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index dc94904c2..6777ae24a 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -32,12 +32,16 @@
 #include <neutrino.h>
 
 #include <gui/audiomute.h>
+#include <gui/audio_select.h>
+#include <gui/epgview.h>
+#include <gui/eventlist.h>
 #include <gui/movieplayer.h>
 #include <gui/infoviewer.h>
 #include <gui/timeosd.h>
 #include <gui/widget/helpbox.h>
 #include <gui/infoclock.h>
 #include <gui/plugins.h>
+#include <gui/videosettings.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/abstime.h>
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index c4ec4b7e5..95d2c8494 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -56,6 +56,7 @@
 #include <driver/screen_max.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
+#include <driver/radiotext.h>
 
 #include <zapit/femanager.h>
 #include <system/debug.h>
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index f948f7285..3b98f59ad 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -41,6 +41,7 @@
 
 #include <daemonc/remotecontrol.h>
 
+#include <driver/display.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 
diff --git a/src/gui/rc_lock.cpp b/src/gui/rc_lock.cpp
index f8ee6b28a..48d01bb41 100644
--- a/src/gui/rc_lock.cpp
+++ b/src/gui/rc_lock.cpp
@@ -33,6 +33,7 @@
 
 #include <gui/rc_lock.h>
 
+#include <driver/display.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp
index 73006cc00..447f1102e 100644
--- a/src/gui/screensetup.cpp
+++ b/src/gui/screensetup.cpp
@@ -36,6 +36,7 @@
 #include <gui/screensetup.h>
 
 #include <gui/color.h>
+#include <gui/infoviewer.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index 948593dd0..e185f470c 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -40,6 +40,7 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/keyboard_input.h>
 
+#include <driver/display.h>
 #include <driver/screen_max.h>
 #include <system/helpers.h>
 
diff --git a/src/gui/sleeptimer.cpp b/src/gui/sleeptimer.cpp
index 2f2b2e446..28000e59e 100644
--- a/src/gui/sleeptimer.cpp
+++ b/src/gui/sleeptimer.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <gui/sleeptimer.h>
+#include <gui/infoviewer.h>
 
 #include <system/helpers.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index 56d544b0a..e902a1a5c 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -46,6 +46,7 @@
 #include "osd_setup.h"
 #include "osdlang_setup.h"
 #include "scan_setup.h"
+#include "videosettings.h"
 #include <zapit/zapit.h>
 #include <system/helpers.h>
 
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 42979adae..490c41e42 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -33,6 +33,7 @@
 #include <global.h>
 #include <neutrino.h>
 
+#include <driver/display.h>
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index dc6279fef..139098fbd 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -50,7 +50,7 @@
 
 #include <gui/channellist.h>
 #include <gui/color.h>
-
+#include <gui/epgview.h>
 #include <gui/eventlist.h>
 #include <gui/filebrowser.h>
 #include <gui/infoviewer.h>
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 326a0c2a6..f4cf13729 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -43,6 +43,7 @@
 
 #include <gui/widget/icons.h>
 
+#include <driver/display.h>
 #include <driver/screen_max.h>
 
 #include <system/debug.h>
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 5ddcfeaec..829c7fb5e 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -45,6 +45,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/osd_setup.h>
 
+#include <driver/display.h>
 #include <driver/screen_max.h>
 
 #include <daemonc/remotecontrol.h>
diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp
index 7ae089877..20171253f 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/display.h>
 
 CProgressWindow::CProgressWindow(CComponentsForm *parent) 
 : CComponentsWindow(0, 0, 700, 200, string(), NEUTRINO_ICON_INFO, NULL, parent)
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index c8ab772b6..fac8c24bb 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -60,6 +60,7 @@
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/streamts.h>
+#include <driver/radiotext.h>
 #include <driver/scanepg.h>
 
 #include "gui/audiomute.h"
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index ad36eb999..b2a7d1e48 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -77,6 +77,7 @@
 #endif
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
+#include "gui/videosettings.h"
 #include "driver/record.h"
 
 
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index e845dd7e0..9b21a3ba8 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -42,6 +42,7 @@
 
 #include <global.h>
 #include <neutrino.h>
+#include <driver/display.h>
 
 CFlashTool::CFlashTool()
 {
diff --git a/src/system/fsmounter.cpp b/src/system/fsmounter.cpp
index de138a85f..5e5463bfa 100644
--- a/src/system/fsmounter.cpp
+++ b/src/system/fsmounter.cpp
@@ -37,6 +37,7 @@
 #include <system/fsmounter.h>
 #include <system/helpers.h>
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <limits>
 
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 1d5170d2d..948895181 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -18,7 +18,7 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 */
 
-
+#include <cstring>
 #include <system/httptool.h>
 
 #include <curl/curl.h>
@@ -30,7 +30,6 @@
 
 #include <global.h>
 
-
 CHTTPTool::CHTTPTool()
 {
 	statusViewer = NULL;
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 86564ec02..9bf728e1f 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -53,6 +53,8 @@
 #include <neutrino.h>
 #include <gui/widget/stringinput.h>
 #include <gui/infoclock.h>
+#include <gui/infoviewer.h>
+#include <driver/display.h>
 #include <driver/volume.h>
 #include <system/helpers.h>
 // obsolete #include <gui/streaminfo.h>