diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index 19f47826f..9c83a041e 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -54,6 +54,7 @@
 #include <driver/shutdown_count.h>
 #include <neutrino.h>
 #include <timerd/timermanager.h>
+#include <timerdclient/timerdclient.h>
 #include <cs_api.h>
 
 //#define RCDEBUG
diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index a3619f934..964a5b52b 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -51,6 +51,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/global.h b/src/global.h
index af240b305..0d9eabc78 100644
--- a/src/global.h
+++ b/src/global.h
@@ -31,32 +31,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 0
-#if HAVE_COOL_HARDWARE
-#include <driver/vfd.h>
-#endif
-#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE || HAVE_GENERIC_HARDWARE
-#include "driver/lcdd.h"
-#define CVFD CLCD
-#endif
-#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
@@ -82,26 +58,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/channellist.cpp b/src/gui/channellist.cpp
index 53e7ae49c..edd9c4369 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -47,8 +47,10 @@
 #include <driver/record.h>
 #include <driver/fade.h>
 #include <driver/display.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>
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 7b6c19265..cb04aca6d 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -31,6 +31,7 @@
 #include <neutrino.h>
 
 #include <gui/epgplus.h>
+#include <gui/epgview.h>
 #include <sectionsdclient/sectionsdclient.h>
 
 #include <gui/widget/icons.h>
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 27c3f1285..9c4b4b71f 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 41c2fa8eb..7e2f17031 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -31,6 +31,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>
 
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 89434d8a8..bbab9d187 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -66,6 +66,7 @@
 #include <driver/record.h>
 #include <driver/display.h>
 #include <driver/volume.h>
+#include <driver/radiotext.h>
 
 #include <zapit/satconfig.h>
 #include <zapit/femanager.h>
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 968216551..7108dbff9 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -33,12 +33,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/display.h>
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 855b711d4..f59e21fc6 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -54,6 +54,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/screensetup.cpp b/src/gui/screensetup.cpp
index b1662e478..4109a3d9b 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/sleeptimer.cpp b/src/gui/sleeptimer.cpp
index 02c847b78..936355f3c 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 <gui/widget/stringinput.h>
 
diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index f5bdc2f43..c7f4f74dc 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/timerlist.cpp b/src/gui/timerlist.cpp
index 217bff08a..9139a1f64 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -49,6 +49,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/user_menue.cpp b/src/gui/user_menue.cpp
index 248d39931..8940eb557 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -48,6 +48,8 @@
 #include "audio_select.h"
 #include "streaminfo2.h"
 #include "epgplus.h"
+#include "epgview.h"
+#include "eventlist.h"
 #include "movieplayer.h"
 #include "timerlist.h"
 #include "plugins.h"
@@ -62,6 +64,7 @@
 
 #include <gui/widget/icons.h>
 
+#include <driver/radiotext.h>
 #include <driver/record.h>
 #include <driver/screen_max.h>
 
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 241736656..3c39e2283 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -45,6 +45,7 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
+#include <gui/osd_setup.h>
 
 #include <driver/screen_max.h>
 #include <driver/display.h>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 40eb34b1b..ca650bb53 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -61,6 +61,7 @@
 #include <driver/volume.h>
 #include <driver/streamts.h>
 #include <driver/display.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 3563ea8b8..5a3055537 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -74,6 +74,7 @@
 #include "gui/test_menu.h"
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
+#include "gui/videosettings.h"
 #include "driver/record.h"
 #include "driver/display.h"
 
diff --git a/src/system/fsmounter.cpp b/src/system/fsmounter.cpp
index a6bfb93b3..d8d384220 100644
--- a/src/system/fsmounter.cpp
+++ b/src/system/fsmounter.cpp
@@ -36,6 +36,7 @@
 
 #include <system/fsmounter.h>
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <limits>
 
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 20bd5fba7..c23cd0a08 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 a13a2218f..302b3fd54 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -53,6 +53,7 @@
 #include <neutrino.h>
 #include <gui/widget/stringinput.h>
 #include <gui/infoclock.h>
+#include <gui/infoviewer.h>
 #include <driver/volume.h>
 #include <driver/display.h>
 #include <system/helpers.h>