diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index aa98e6c4c..a961282bc 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -53,7 +53,6 @@
 #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 9984e143e..c10d2e924 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -51,7 +51,6 @@
 
 
 #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 c05a44822..73322e913 100644
--- a/src/global.h
+++ b/src/global.h
@@ -6,6 +6,14 @@
 	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
@@ -23,8 +31,30 @@
 	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
@@ -50,39 +80,26 @@ 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 a7eca53df..6864276e2 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -46,10 +46,8 @@
 #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>
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 2988692e2..3ee640c51 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -31,7 +31,6 @@
 #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 1a9142f8d..747633e61 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -27,7 +27,6 @@
 
 #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 59d175789..8ac359e87 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -31,7 +31,6 @@
 #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 a2a1eb94a..f0f91474c 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -62,7 +62,6 @@
 #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/movieplayer.cpp b/src/gui/movieplayer.cpp
index ed8c8aeab..4e3d16160 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -32,16 +32,12 @@
 #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 0a7b8a0e4..9760ea225 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -54,7 +54,6 @@
 #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 4109a3d9b..b1662e478 100644
--- a/src/gui/screensetup.cpp
+++ b/src/gui/screensetup.cpp
@@ -36,7 +36,6 @@
 #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 936355f3c..02c847b78 100644
--- a/src/gui/sleeptimer.cpp
+++ b/src/gui/sleeptimer.cpp
@@ -27,7 +27,6 @@
 #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 676cfd182..827781abf 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -46,7 +46,6 @@
 #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 ab5dbd095..0aeeaed11 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -48,7 +48,6 @@
 
 #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 e7859b8d8..123066d18 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -48,8 +48,6 @@
 #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"
@@ -64,7 +62,6 @@
 
 #include <gui/widget/icons.h>
 
-#include <driver/radiotext.h>
 #include <driver/record.h>
 #include <driver/screen_max.h>
 
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 7fd10575a..559ea61fa 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -58,7 +58,6 @@
 #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 327efc425..72c476b93 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -76,7 +76,6 @@
 #endif
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
-#include "gui/videosettings.h"
 #include "driver/record.h"
 
 
diff --git a/src/system/fsmounter.cpp b/src/system/fsmounter.cpp
index d8d384220..a6bfb93b3 100644
--- a/src/system/fsmounter.cpp
+++ b/src/system/fsmounter.cpp
@@ -36,7 +36,6 @@
 
 #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 c23cd0a08..20bd5fba7 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,6 +30,7 @@
 
 #include <global.h>
 
+
 CHTTPTool::CHTTPTool()
 {
 	statusViewer = NULL;
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index b01c3226e..b2ca12c00 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -53,7 +53,6 @@
 #include <neutrino.h>
 #include <gui/widget/stringinput.h>
 #include <gui/infoclock.h>
-#include <gui/infoviewer.h>
 #include <driver/volume.h>
 #include <system/helpers.h>
 // obsolete #include <gui/streaminfo.h>