diff --git a/src/driver/stream2file.h b/src/driver/stream2file.h
index 0708a11aa..909fa8600 100644
--- a/src/driver/stream2file.h
+++ b/src/driver/stream2file.h
@@ -30,7 +30,7 @@ enum stream2file_error_msg_t
 	STREAM2FILE_INVALID_PID               = -3,
 	STREAM2FILE_PES_FILTER_FAILURE        = -4,
 	STREAM2FILE_DVR_OPEN_FAILURE          = -5,
-	STREAM2FILE_RECORDING_THREADS_FAILED  = -6,
+	STREAM2FILE_RECORDING_THREADS_FAILED  = -6
 };
 
 enum stream2file_status_t
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index c314340af..67c625673 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -789,7 +789,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 
 		this->paint ();
 
-		unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
 		bool loop = true;
 		while (loop) {
 			g_RCInput->getMsgAbsoluteTimeout (&msg, &data, &timeoutEnd);
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 2cc8c430d..2d8595858 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -95,7 +95,7 @@ int CImageInfo::exec(CMenuTarget* parent, const std::string &)
 	while (1)
 	{
 		neutrino_msg_data_t data;
-		unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd_MS(100);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd_MS(100);
 		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
 
 		if (msg <= CRCInput::RC_MaxRC)
diff --git a/src/gui/pluginlist.h b/src/gui/pluginlist.h
index 0bc4e1465..3f7642d31 100644
--- a/src/gui/pluginlist.h
+++ b/src/gui/pluginlist.h
@@ -47,7 +47,7 @@ class CPluginList : public CMenuTarget
 		enum result_
 		{
 			close  = 0,
-			resume = 1,
+			resume = 1
 		} result;
 
 	private:
@@ -90,7 +90,7 @@ class CPluginList : public CMenuTarget
 		virtual CPluginList::result_ pluginSelected();
 
 	public:
-	
+
 		CPluginList(const neutrino_locale_t Name, const uint32_t listtype);
 		virtual ~CPluginList();
 
@@ -103,7 +103,7 @@ class CPluginChooser : public CPluginList
 	private:
 	char* selected_plugin;
 	protected:
-	
+
 	CPluginList::result_ pluginSelected();
 
 	public:
diff --git a/src/gui/rc_lock.cpp b/src/gui/rc_lock.cpp
index 901de331f..51e12a12d 100644
--- a/src/gui/rc_lock.cpp
+++ b/src/gui/rc_lock.cpp
@@ -49,12 +49,12 @@ int CRCLock::exec(CMenuTarget* parent, const std::string &actionKey)
 		parent->hide();
 
 	bool no_input = (actionKey == NO_USER_INPUT);
-	if (ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG, 
-				 CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel, 
+	if (ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_LOCKMSG,
+				 CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel,
 				 NEUTRINO_ICON_INFO,450,no_input ? 5 : -1,no_input) == CMessageBox::mbrCancel)
 		return menu_return::RETURN_EXIT_ALL;
 
-	// -- Lockup Box	
+	// -- Lockup Box
 	lockBox();
 
 	ShowLocalizedMessage(LOCALE_RCLOCK_TITLE, LOCALE_RCLOCK_UNLOCKMSG, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO,450, no_input ? 5 : -1);
@@ -66,7 +66,7 @@ void CRCLock::lockBox()
 	neutrino_msg_t      msg;
 	neutrino_msg_data_t data;
 
-	unsigned long long timeoutEnd;
+	uint64_t timeoutEnd;
 
 	// -- Loop until release key pressed
 	// -- Key sequence:  <RED> <DBOX> within 5 secs
@@ -92,7 +92,7 @@ void CRCLock::lockBox()
 		// -- so be it...
 
 		if (msg >  CRCInput::RC_MaxRC) {
-			CNeutrinoApp::getInstance()->handleMsg(msg, data); 
+			CNeutrinoApp::getInstance()->handleMsg(msg, data);
 		} else {
 			CVFD::getInstance()->showRCLock();
 			// Since showRCLock blocks 2secs for each key we eat all
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index deaff275d..0a84c6932 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -303,7 +303,7 @@ CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, NEUTRINO_I
 		changeNotify(LOCALE_VIDEOMENU_SCART, NULL);
 		changeNotify(LOCALE_VIDEOMENU_CINCH, NULL);
 	}
-};
+}
 
 void CVideoSettings::nextMode(void)
 {
@@ -427,12 +427,12 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
 	}
 
 	return true;
-};
+}
 
 void CVideoSettings::paint()
 {
 	CMenuWidget::paint();
-};
+}
 
 #ifdef TEST_MENU
 class CTestMenu : public CMenuTarget