diff --git a/src/driver/fontrenderer.cpp b/src/driver/fontrenderer.cpp
index 7616538b2..5cc8f2c06 100644
--- a/src/driver/fontrenderer.cpp
+++ b/src/driver/fontrenderer.cpp
@@ -166,7 +166,7 @@ FT_Error FBFontRenderClass::getGlyphBitmap(FTC_ScalerRec *sc, FT_ULong glyph_ind
 	return FTC_SBitCache_LookupScaler(sbitsCache, sc, FT_LOAD_DEFAULT, glyph_index, sbit, NULL);
 }
 
-const char * const FBFontRenderClass::AddFont(const char * const filename, const bool make_italics)
+const char *FBFontRenderClass::AddFont(const char * const filename, const bool make_italics)
 {
 	fflush(stdout);
 	int error;
diff --git a/src/driver/fontrenderer.h b/src/driver/fontrenderer.h
index 17c225f87..c196c0024 100644
--- a/src/driver/fontrenderer.h
+++ b/src/driver/fontrenderer.h
@@ -113,7 +113,7 @@ class FBFontRenderClass
 
     std::string getFamily(const char * const filename) const;
 
-		const char * const AddFont(const char * const filename, const bool make_italics = false);
+		const char * AddFont(const char * const filename, const bool make_italics = false);
 
 		FBFontRenderClass(const int xres = 72, const int yres = 72);
 		~FBFontRenderClass();
diff --git a/src/gui/bookmarkmanager.h b/src/gui/bookmarkmanager.h
index b46a8442d..6f9486ec2 100644
--- a/src/gui/bookmarkmanager.h
+++ b/src/gui/bookmarkmanager.h
@@ -53,9 +53,9 @@ class CBookmark
 	std::string time;
  public:
 	CBookmark(const std::string & name, const std::string & url, const std::string & time);
-	const char * const getName(void) const { return name.c_str(); };
-	const char * const getUrl (void) const { return url .c_str(); };
-	const char * const getTime(void) const { return time.c_str(); };                
+	const char *getName(void) const { return name.c_str(); };
+	const char *getUrl (void) const { return url .c_str(); };
+	const char *getTime(void) const { return time.c_str(); };
 	inline void setName(const std::string & new_name) { name = new_name; };
 	inline void setUrl (const std::string & new_url ) { url  = new_url ; };
 	inline void setTime(const std::string & new_time) { time = new_time; };
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 5539cf6d8..2b56151c3 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -98,7 +98,7 @@ class CChannelList
 		CZapitChannel* operator[]( uint32_t index) { if (chanlist.size() > index) return chanlist[index]; else return NULL;};
 		int getKey(int);
 
-		const char * const   getName                   (void) const { return name.c_str(); };
+		const char         * getName                   (void) const { return name.c_str(); };
 		const std::string &  getActiveChannelName      (void) const; // UTF-8
 		t_satellite_position getActiveSatellitePosition(void) const;
 		int                  getActiveChannelNumber    (void) const;
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index af884c5c6..abc8e0362 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -384,22 +384,22 @@ CFlashVersionInfo::CFlashVersionInfo(const std::string & versionString)
 	time[5] = 0;
 }
 
-const char * const CFlashVersionInfo::getDate(void) const
+const char *CFlashVersionInfo::getDate(void) const
 {
 	return date;
 }
 
-const char * const CFlashVersionInfo::getTime(void) const
+const char *CFlashVersionInfo::getTime(void) const
 {
 	return time;
 }
 
-const char * const CFlashVersionInfo::getReleaseCycle(void) const
+const char *CFlashVersionInfo::getReleaseCycle(void) const
 {
 	return releaseCycle;
 }
 
-const char * const CFlashVersionInfo::getType(void) const
+const char *CFlashVersionInfo::getType(void) const
 {
 	switch (snapshot)
 	{
diff --git a/src/system/flashtool.h b/src/system/flashtool.h
index 04024e948..18eaf4b8d 100644
--- a/src/system/flashtool.h
+++ b/src/system/flashtool.h
@@ -81,10 +81,10 @@ class CFlashVersionInfo
 	
 	CFlashVersionInfo(const std::string & versionString);
 	
-	const char * const getDate(void) const;
-	const char * const getTime(void) const;
-	const char * const getReleaseCycle(void) const;
-	const char * const getType(void) const;
+	const char *getDate(void) const;
+	const char *getTime(void) const;
+	const char *getReleaseCycle(void) const;
+	const char *getType(void) const;
 };
 
 
diff --git a/src/zapit/include/zapit/frontend_c.h b/src/zapit/include/zapit/frontend_c.h
index a1d1e6dcf..cbbf6d44c 100644
--- a/src/zapit/include/zapit/frontend_c.h
+++ b/src/zapit/include/zapit/frontend_c.h
@@ -144,7 +144,7 @@ class CFrontend
 		uint32_t			getUncorrectedBlocks(void) const;
 		void				getDelSys(int f, int m, char * &fec, char * &sys, char * &mod);
 
-		const int32_t 			getCurrentSatellitePosition() { return currentSatellitePosition; }
+		int32_t				getCurrentSatellitePosition() { return currentSatellitePosition; }
 
 		void				setDiseqcRepeats(const uint8_t repeats)	{ diseqcRepeats = repeats; }
 		void				setDiseqcType(const diseqc_t type);
@@ -157,12 +157,12 @@ class CFrontend
 		void 				positionMotor(uint8_t motorPosition);
 		void				sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t command, uint8_t num_parameters, uint8_t parameter1, uint8_t parameter2, int repeat = 0);
 		void 				gotoXX(t_satellite_position pos);
-		const bool 			tuneChannel (CZapitChannel *channel, bool nvod);
-		const bool 			retuneChannel (void);
-		const bool 			retuneTP (bool nowait = true);
+		bool				tuneChannel(CZapitChannel *channel, bool nvod);
+		bool				retuneChannel(void);
+		bool				retuneTP(bool nowait = true);
 
 		fe_code_rate_t 			getCFEC ();
-		const transponder_id_t 		getTsidOnid()    { return currentTransponder.TP_id; }
+		transponder_id_t		getTsidOnid() { return currentTransponder.TP_id; }
 		void 				setTsidOnid(transponder_id_t newid)  { currentTransponder.TP_id = newid; }
 		uint32_t 			getRate ();
                 void Close();
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index 61dc2dec3..108ebad1a 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -957,7 +957,7 @@ void CFrontend::setInput(t_satellite_position satellitePosition, uint32_t freque
 	}
 }
 
-const bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/)
+bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/)
 {
 //printf("tuneChannel: tpid %llx\n", currentTransponder.TP_id);
 	transponder_list_t::iterator transponder = transponders.find(currentTransponder.TP_id);
@@ -966,14 +966,14 @@ const bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/)
 	return tuneFrequency(&transponder->second.feparams, transponder->second.polarization, false);
 }
 
-const bool CFrontend::retuneTP(bool nowait)
+bool CFrontend::retuneTP(bool nowait)
 {
 	/* used in pip only atm */
 	tuneFrequency(&curfe, currentTransponder.polarization, nowait);
 	return 0;
 }
 
-const bool CFrontend::retuneChannel(void)
+bool CFrontend::retuneChannel(void)
 {
 	setFrontend(&currentTransponder.feparams);
 	return 0;