diff --git a/AiwVariant.h b/AiwVariant.h
index 47ad4ed..4255de3 100644
--- a/AiwVariant.h
+++ b/AiwVariant.h
@@ -111,7 +111,7 @@ class TAiwVariant
         *
         * @param aValue The source object.
         */
-        IMPORT_C TAiwVariant& TAiwVariant::operator=(const TAiwVariant& aValue);
+        IMPORT_C TAiwVariant& operator=(const TAiwVariant& aValue);
 
         // This class does not need a destructor because memory allocation
         // policy for variant class has been implemented by TAiwGenericParam
diff --git a/AknBidiTextUtils.h b/AknBidiTextUtils.h
index 3eae0fb..f6d5de1 100644
--- a/AknBidiTextUtils.h
+++ b/AknBidiTextUtils.h
@@ -424,7 +424,7 @@ class AknBidiTextUtils
     * @param aOrder Whether the text provided is in visual or logical order
     * @return       width of the text in pixels.
     */
-    IMPORT_C static TInt AknBidiTextUtils::MeasureTextBoundsWidth(
+    IMPORT_C static TInt MeasureTextBoundsWidth(
         const CFont& aFont,
         const TDesC& aText,
         CFont::TMeasureTextInput::TFlags aOrder);
diff --git a/Aknvolumecontrol.h b/Aknvolumecontrol.h
index 8010a82..9eacdc7 100644
--- a/Aknvolumecontrol.h
+++ b/Aknvolumecontrol.h
@@ -271,7 +271,7 @@ class CAknVolumeControl : public CAknControl, public MAknNaviDecoratorObserver
         *
         * @return Colume value scaled to range of [0-10].
         */
-        TInt CAknVolumeControl::ScaledValue() const;
+        TInt ScaledValue() const;
         
 
     private:        
diff --git a/SenSoapMessage.h b/SenSoapMessage.h
index 6bf572d..1981659 100644
--- a/SenSoapMessage.h
+++ b/SenSoapMessage.h
@@ -92,7 +92,7 @@ class CSenSoapMessage : public CSenSoapEnvelope
         /**
          *    C++ default constructor.
          */
-        IMPORT_C CSenSoapMessage::CSenSoapMessage();
+        IMPORT_C CSenSoapMessage();
 
         // New functions
         
diff --git a/SenSoapMessage2.h b/SenSoapMessage2.h
index 207a197..b4a01b6 100644
--- a/SenSoapMessage2.h
+++ b/SenSoapMessage2.h
@@ -153,7 +153,7 @@ class CSenSoapMessage2 : public CSenSoapEnvelope2
         /**
          *  C++ default constructor.
          */
-        IMPORT_C CSenSoapMessage2::CSenSoapMessage2();
+        IMPORT_C CSenSoapMessage2();
 
         // New functions
 
diff --git a/SenXmlServiceDescription.h b/SenXmlServiceDescription.h
index 67c1f85..f574e7d 100644
--- a/SenXmlServiceDescription.h
+++ b/SenXmlServiceDescription.h
@@ -518,7 +518,7 @@ class CSenXmlServiceDescription : public CSenDomFragment,
         *         of retry attempts (each showing a dialog) is service invocation
         *         framework spesific; typically 3 retries are permitted.     
         */
-        IMPORT_C void CSenXmlServiceDescription::SetPromptUserInfoL( TBool aPromptUserInfoMode );
+        IMPORT_C void SetPromptUserInfoL( TBool aPromptUserInfoMode );
 
         /**
         * Getter for current userinfo mode (KSenAttrPromptUserInfo attribute).
diff --git a/attrlut.h b/attrlut.h
index 8d61953..b195ab7 100644
--- a/attrlut.h
+++ b/attrlut.h
@@ -36,7 +36,7 @@ public:
 	//##ModelId=3B666BC701E3
 	IMPORT_C ~CAttributeLookupTable();
 	//##ModelId=3B666BC701DC
-	IMPORT_C static CAttributeLookupTable* CAttributeLookupTable::NewL();
+	IMPORT_C static CAttributeLookupTable* NewL();
 	//##ModelId=3B666BC701DA
 	IMPORT_C const HBufC* Des2IDL( const TDesC& ); // map descriptor to ID
 	//##ModelId=3B666BC701D3
diff --git a/cmdefconnvalues.h b/cmdefconnvalues.h
index 505af13..0938662 100644
--- a/cmdefconnvalues.h
+++ b/cmdefconnvalues.h
@@ -49,7 +49,7 @@ struct TCmDefConnValue
     // TCmDefConnValue::operator==
     // -----------------------------------------------------------------------------
     //
-    inline TBool TCmDefConnValue::operator==( TCmDefConnValue& aDCSettingSelection ) const
+    inline TBool operator==( TCmDefConnValue& aDCSettingSelection ) const
         {
         return ( (iType == aDCSettingSelection.iType) && ( iId == aDCSettingSelection.iId ) );
         };
@@ -58,7 +58,7 @@ struct TCmDefConnValue
     // TCmDefConnValue::operator!=
     // -----------------------------------------------------------------------------
     //
-    inline TBool TCmDefConnValue::operator!=( TCmDefConnValue& aDCSettingSelection ) const
+    inline TBool operator!=( TCmDefConnValue& aDCSettingSelection ) const
         {
         return (!( (iType == aDCSettingSelection.iType) && ( iId == aDCSettingSelection.iId ) ));
         };     
diff --git a/cntdb.h b/cntdb.h
index 58fb900..9569a1a 100644
--- a/cntdb.h
+++ b/cntdb.h
@@ -979,8 +979,8 @@ public:
 	static void CleanupLastLockedContact(TAny *aDatabase);
 
 private:
-	CContactConverter& CContactDatabase::ConverterL(const TUid& aFormat);
-	CContactConverter& CContactDatabase::ConverterL(const TUid& aFormat, const TInt64 aContactFieldFilter, MConverterCallBack* aCallback, const TVCardVersion aVersion,const TBool aExportTel);
+	CContactConverter& ConverterL(const TUid& aFormat);
+	CContactConverter& ConverterL(const TUid& aFormat, const TInt64 aContactFieldFilter, MConverterCallBack* aCallback, const TVCardVersion aVersion,const TBool aExportTel);
 	static void CleanupDatabaseRollback(TAny *aDatabase);
 
 	CContactIdArray* SortLC(const CArrayFix<TSortPref>* aSortOrder, const CContactIdArray* aIdArray);
diff --git a/eikmenup.h b/eikmenup.h
index 4df5121..1aa00a1 100644
--- a/eikmenup.h
+++ b/eikmenup.h
@@ -239,7 +239,7 @@ inline void CEikMenuPaneItem::CreateExtendedDataBlock()
 
 inline TBool CEikMenuPaneItem::IsScaleableText(const TDesC& aText) const
     {
-    return (aText.Locate(TChar(KScaleableTextSeparator)) == KErrNotFound ? EFalse : ETrue);
+    return aText.Locate(TChar(KScaleableTextSeparator)) != KErrNotFound;
     }
 
 
diff --git a/gcce/gcce.h b/gcce/gcce.h
index ffde03a..d3d1ee6 100644
--- a/gcce/gcce.h
+++ b/gcce/gcce.h
@@ -93,7 +93,11 @@ typedef unsigned long long Uint64;
         extern "C" {
 #endif  /* __cplusplus */
 
+#if __GNUC__ < 4
 typedef struct __va_list { void *__ap; } va_list;
+#else
+typedef __builtin_va_list va_list;
+#endif
 
 
 #ifdef __cplusplus
@@ -103,9 +107,15 @@ typedef struct __va_list { void *__ap; } va_list;
     using ::std::va_list;
 #endif
 
+#if __GNUC__ < 4
 #define va_start(ap, parmN) __builtin_va_start(ap.__ap, parmN)
 #define va_arg(ap, type) __builtin_va_arg(ap.__ap, type)
 #define va_end(ap) __builtin_va_end(ap.__ap)
+#else
+#define va_start(v,l)   __builtin_va_start(v,l)
+#define va_arg(v,l)     __builtin_va_arg(v,l)
+#define va_end(v)       __builtin_va_end(v)
+#endif
 
 
 #define VA_LIST va_list
diff --git a/http/rhttpsession.h b/http/rhttpsession.h
index cda0dcc..e82dec8 100644
--- a/http/rhttpsession.h
+++ b/http/rhttpsession.h
@@ -214,7 +214,7 @@ is actually to do anything.
 		Calling code can safely cast to CWTLSCertificate if using  "WSP/WSP".
 		NULL returned if certificate information not found.
 	*/
-	IMPORT_C const CCertificate* RHTTPSession::ServerCert();
+	IMPORT_C const CCertificate* ServerCert();
 
 	/** Connect this WSP session. This function does nothing when called for text-mode.
 	*/
diff --git a/icl/imageprocessor.h b/icl/imageprocessor.h
index 0f8bd5b..baec2d9 100644
--- a/icl/imageprocessor.h
+++ b/icl/imageprocessor.h
@@ -131,7 +131,7 @@ public:
 	IMPORT_C static TInt ReductionFactor(const TSize& aOriginalSize,const TSize& aReducedSize);
 	IMPORT_C static CImageProcessor* NewImageProcessorL(const CFbsBitmap& aBitmap,const TSize& aImageSize,TDisplayMode aImageDisplayMode, TBool aDisableErrorDiffusion);
 	IMPORT_C static CImageProcessor* NewImageProcessorL(const CFbsBitmap& aBitmap,TInt aReductionFactor,TDisplayMode aImageDisplayMode, TBool aDisableErrorDiffusion);
-	IMPORT_C static CImageProcessorExtension* ImageProcessorUtility::NewImageProcessorExtensionL(const CFbsBitmap& aBitmap,TInt aReductionFactor,TDisplayMode aImageDisplayMode, TBool aDisableErrorDiffusion);
+	IMPORT_C static CImageProcessorExtension* NewImageProcessorExtensionL(const CFbsBitmap& aBitmap,TInt aReductionFactor,TDisplayMode aImageDisplayMode, TBool aDisableErrorDiffusion);
 	
 private:
 	TBool static UseErrorDiffuser(const TDisplayMode& aBitmapDisplayMode, const TDisplayMode& aImageDisplayMode);
diff --git a/irs.h b/irs.h
index 484c205..c8f35fd 100644
--- a/irs.h
+++ b/irs.h
@@ -72,7 +72,7 @@ private:
 	 * @param aEntry Context on which to operate.
 	 */
 
-	CIrSrvMtm::CIrSrvMtm(CRegisteredMtmDll& aRegisteredMtmDll, CMsvServerEntry* aEntry);
+	CIrSrvMtm(CRegisteredMtmDll& aRegisteredMtmDll, CMsvServerEntry* aEntry);
 	
 	/**
 	 * Creates a server send operation to perform the send
diff --git a/miutmsg.h b/miutmsg.h
index 7113cfb..4ad702f 100644
--- a/miutmsg.h
+++ b/miutmsg.h
@@ -880,7 +880,7 @@ class CImHtmlConverter : public CBase
 */
 	{
 public:
-	static CImHtmlConverter* CImHtmlConverter::NewL(CMsvEntry& aMsvEntry, 
+	static CImHtmlConverter* NewL(CMsvEntry& aMsvEntry, 
 								   CParaFormatLayer& aParaLayer, CCharFormatLayer& aCharLayer);
 	~CImHtmlConverter();
 	void PrepareToStoreHTMLEntryTextL(TMsvId& aHtmlId, const TMsvId aTextId);
diff --git a/obexbase.h b/obexbase.h
index 26796e7..698f854 100644
--- a/obexbase.h
+++ b/obexbase.h
@@ -202,7 +202,7 @@ protected:
 	void ForcedTransportDown();
 	void ControlledTransportDown();
 	void RemoteInfoCleanup();
-	void CObex::CancelObexConnection();
+	void CancelObexConnection();
 protected:
 	TConnectState iConnectState;
 	CObexTransportControllerBase* iTransportController;
diff --git a/vstaticutils.h b/vstaticutils.h
index 0d4e519..57510cb 100644
--- a/vstaticutils.h
+++ b/vstaticutils.h
@@ -55,7 +55,7 @@ public:
 
 private:
 	static void AddEscapedString(TBool aIsShiftJis,TDes& aDestination,const TDesC& aTextToEscape);
-	static const TDesC &VersitUtils::EscapeChar(TBool aIsShiftJis);
+	static const TDesC &EscapeChar(TBool aIsShiftJis);
 	};
 
 inline TBool VersitUtils::IsWhiteSpace(TUint aChar)
diff --git a/x509certchain.h b/x509certchain.h
index 43be04d..46015c4 100644
--- a/x509certchain.h
+++ b/x509certchain.h
@@ -70,7 +70,7 @@ public:
 	* 
 	* @param aBinaryData	The encoded binary representation.
 	* @return				The certificate objects. */
-	IMPORT_C CArrayPtrFlat<CX509Certificate>* CX509CertChain::DecodeCertsL(const TDesC8& aBinaryData);
+	IMPORT_C CArrayPtrFlat<CX509Certificate>* DecodeCertsL(const TDesC8& aBinaryData);
 	
 	/** Destructor.
 	* 
diff --git a/zipfilememberinputstream.h b/zipfilememberinputstream.h
index 3ecd0a8..200b9be 100644
--- a/zipfilememberinputstream.h
+++ b/zipfilememberinputstream.h
@@ -67,7 +67,7 @@ private:
 	RZipFileMemberReaderStream(CZipFile&, TUint32, TUint32, TUint32, TUint32);
 	
 	static RZipFileMemberReaderStream* NewL(CZipFile&, TUint32, TUint32, TUint32, TUint32);
-	void RZipFileMemberReaderStream::ConstructL();
+	void ConstructL();
 	
 	virtual TInt Read(void);
 	virtual TInt Read(TByte*, TUint32, TUint32*);
