diff --git a/src/global.h b/src/global.h
index f8d075781..1211e1f40 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,5 +1,3 @@
-#ifndef __neutrino_global_h__
-#define __neutrino_global_h__
 /*
 	Neutrino-GUI  -   DBoxII-Project
 
@@ -19,84 +17,94 @@
 	GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __neutrino_global_h__
+#define __neutrino_global_h__
+
 #include <system/settings.h>
 
 #ifndef NEUTRINO_CPP
-  #define NEUTRINO_CPP extern
+#define NEUTRINO_CPP extern
 #endif
 
-#define IMAGE_VERSION_FILE             "/.version"
+#define IMAGE_VERSION_FILE "/.version"
 
-#define NEUTRINO_SETTINGS_FILE		CONFIGDIR "/neutrino.conf"
-#define NEUTRINO_SCAN_SETTINGS_FILE	CONFIGDIR "/scan.conf"
-#define NEUTRINO_PARENTALLOCKED_FILE	DATADIR   "/neutrino/.plocked"
+#define NEUTRINO_SETTINGS_FILE CONFIGDIR "/neutrino.conf"
+#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
+#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked"
 
 // control scripts
-#define NEUTRINO_RECORDING_TIMER_SCRIPT	"recording.timer"
-#define NEUTRINO_RECORDING_START_SCRIPT	"recording.start"
-#define NEUTRINO_RECORDING_ENDED_SCRIPT	"recording.end"
-#define NEUTRINO_ENTER_STANDBY_SCRIPT	"standby.on"
-#define NEUTRINO_LEAVE_STANDBY_SCRIPT	"standby.off"
-#define NEUTRINO_ENTER_INACTIVITY_SCRIPT	"inactivity.on"
-#define NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT	"deepstandby.on"
-#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT	"deepstandby.off"
-#define NEUTRINO_APP_START_SCRIPT	"neutrino.start"
+#define NEUTRINO_RECORDING_TIMER_SCRIPT "recording.timer"
+#define NEUTRINO_RECORDING_START_SCRIPT "recording.start"
+#define NEUTRINO_RECORDING_ENDED_SCRIPT "recording.end"
+#define NEUTRINO_ENTER_STANDBY_SCRIPT "standby.on"
+#define NEUTRINO_LEAVE_STANDBY_SCRIPT "standby.off"
+#define NEUTRINO_ENTER_INACTIVITY_SCRIPT "inactivity.on"
+#define NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT "deepstandby.on"
+#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT "deepstandby.off"
+#define NEUTRINO_APP_START_SCRIPT "neutrino.start"
 
 // control scripts w/o counterparts in /var
-#define NEUTRINO_ENTER_FLASH_SCRIPT	CONTROLDIR "/flash.start"
-#define NEUTRINO_CONF_MIGRATION_SCRIPT	CONTROLDIR "/migration.sh"
+#define NEUTRINO_ENTER_FLASH_SCRIPT CONTROLDIR "/flash.start"
+#define NEUTRINO_CONF_MIGRATION_SCRIPT CONTROLDIR "/migration.sh"
 
-#define COVERDIR_TMP	"/tmp/.cover"
-#define LOGODIR_TMP	"/tmp/.logo"
+#define COVERDIR_TMP "/tmp/.cover"
+#define LOGODIR_TMP "/tmp/.logo"
 
-NEUTRINO_CPP  SNeutrinoSettings	g_settings;
-NEUTRINO_CPP  SglobalInfo	g_info;
+NEUTRINO_CPP SNeutrinoSettings g_settings;
+NEUTRINO_CPP SglobalInfo g_info;
+
+class FBFontRenderClass;
+NEUTRINO_CPP FBFontRenderClass *g_fontRenderer;
+NEUTRINO_CPP FBFontRenderClass *g_fixedFontRenderer;
+NEUTRINO_CPP FBFontRenderClass *g_dynFontRenderer;
+NEUTRINO_CPP FBFontRenderClass *g_shellFontRenderer;
+
+class Font;
+NEUTRINO_CPP Font *g_Font[SNeutrinoSettings::FONT_TYPE_COUNT];
+NEUTRINO_CPP Font *g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_COUNT];
+NEUTRINO_CPP Font *g_SignalFont;
+NEUTRINO_CPP Font *g_ShellFont;
 
 #ifdef HAVE_CONTROLD
 class CControldClient;
-NEUTRINO_CPP  CControldClient	*g_Controld;
+NEUTRINO_CPP CControldClient *g_Controld;
 #endif
+
 class CZapitClient;
-NEUTRINO_CPP  CZapitClient	*g_Zapit;
+NEUTRINO_CPP CZapitClient *g_Zapit;
+
 class CSectionsdClient;
-NEUTRINO_CPP  CSectionsdClient	*g_Sectionsd;
+NEUTRINO_CPP CSectionsdClient *g_Sectionsd;
+
 class CTimerdClient;
-NEUTRINO_CPP  CTimerdClient	*g_Timerd;
-
-class FBFontRenderClass;
-NEUTRINO_CPP  FBFontRenderClass	*g_fontRenderer;
-NEUTRINO_CPP  FBFontRenderClass	*g_fixedFontRenderer;
-NEUTRINO_CPP  FBFontRenderClass	*g_dynFontRenderer;
-NEUTRINO_CPP  FBFontRenderClass	*g_shellFontRenderer;
-
-class Font;
-NEUTRINO_CPP  Font * g_Font[SNeutrinoSettings::FONT_TYPE_COUNT];
-NEUTRINO_CPP  Font * g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_COUNT];
-NEUTRINO_CPP  Font * g_SignalFont;
-NEUTRINO_CPP  Font * g_ShellFont;
+NEUTRINO_CPP CTimerdClient *g_Timerd;
 
 class CRCInput;
-NEUTRINO_CPP  CRCInput		*g_RCInput;
+NEUTRINO_CPP CRCInput *g_RCInput;
 
 class CEpgData;
-NEUTRINO_CPP  CEpgData		*g_EpgData;
+NEUTRINO_CPP CEpgData *g_EpgData;
+
 class CInfoViewer;
-NEUTRINO_CPP  CInfoViewer	*g_InfoViewer;
+NEUTRINO_CPP CInfoViewer *g_InfoViewer;
+
 class CEventList;
-NEUTRINO_CPP  CEventList	*g_EventList;
+NEUTRINO_CPP CEventList *g_EventList;
 
 class CLocaleManager;
-NEUTRINO_CPP CLocaleManager	*g_Locale;
+NEUTRINO_CPP CLocaleManager *g_Locale;
+
 class CVideoSettings;
-NEUTRINO_CPP CVideoSettings	*g_videoSettings;
+NEUTRINO_CPP CVideoSettings *g_videoSettings;
+
 class CRadioText;
-NEUTRINO_CPP CRadioText		*g_Radiotext;
+NEUTRINO_CPP CRadioText *g_Radiotext;
+
 class CRadioTextGUI;
-NEUTRINO_CPP CRadioTextGUI	*g_RadiotextWin;
+NEUTRINO_CPP CRadioTextGUI *g_RadiotextWin;
 
 #ifndef DISABLE_GUI_MOUNT
 #define ENABLE_GUI_MOUNT