--- a/simpleengine/engine/inc/simplepublisher.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/engine/inc/simplepublisher.h	Wed Aug 18 10:10:28 2010 +0300
@@ -226,7 +226,7 @@
      * Zero length is ignored.
      * @return operation id
      */        
-    TInt CSimplePublisher::DoStartPublishL( MSimpleDocument& aDocument,
+    TInt DoStartPublishL( MSimpleDocument& aDocument,
         TBool aRefresh, const TDesC8& aETag );
 
 

--- a/simpleengine/presencesettingsapi/group/presencesettingsapi.mmp	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/presencesettingsapi/group/presencesettingsapi.mmp	Wed Aug 18 10:10:28 2010 +0300
@@ -43,7 +43,7 @@
 LIBRARY                         centralrepository.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwinscw/ 

--- a/simpleengine/siputils/inc/simplesettings.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/siputils/inc/simplesettings.h	Wed Aug 18 10:10:28 2010 +0300
@@ -120,7 +120,7 @@
      * @param aId key id
      * @return value of the key      
      */
-    TInt TSimpleSettings::GetCenRepIntValueL( 
+    TInt GetCenRepIntValueL( 
         CRepository* aRepository,
         TUint32 aId );
                 

--- a/simpleengine/xdmrlspres/eabi/rlspresxdmU.DEF	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/xdmrlspres/eabi/rlspresxdmU.DEF	Wed Aug 18 10:10:28 2010 +0300
@@ -98,14 +98,14 @@
 	_ZN7CRLSXDM18UpdateDisplayNameLERK7TDesC16S2_S2_ @ 97 NONAME
 	_ZN7CRLSXDM19DeleteAllEmptyListsEP23MRLSPresXDMAsyncHandler @ 98 NONAME
 	_ZN7CRLSXDM19SwitchToServiceURILERK7TDesC16 @ 99 NONAME
-	_ZN7CRLSXDM20UpdateAllFromServerLEP23MRLSPresXDMAsyncHandler @ 100 NONAME
-	_ZN7CRLSXDM26DeleteAllEmptyServiceUrisLEv @ 101 NONAME
-	_ZN7CRLSXDM4NewLEi @ 102 NONAME
-	_ZN7CRLSXDM5NewLCEi @ 103 NONAME
-	_ZN7CRLSXDM9DeleteAllEv @ 104 NONAME
-	_ZTI12CPresenceXDM @ 105 NONAME ; #<TI>#
-	_ZTI7CRLSXDM @ 106 NONAME ; #<TI>#
-	_ZTV12CPresenceXDM @ 107 NONAME ; #<VT>#
-	_ZTV7CRLSXDM @ 108 NONAME ; #<VT>#
-	_ZN7CRLSXDM20NegotiatedServiceUriEv @ 109 NONAME
+	_ZN7CRLSXDM20NegotiatedServiceUriEv @ 100 NONAME
+	_ZN7CRLSXDM20UpdateAllFromServerLEP23MRLSPresXDMAsyncHandler @ 101 NONAME
+	_ZN7CRLSXDM26DeleteAllEmptyServiceUrisLEv @ 102 NONAME
+	_ZN7CRLSXDM4NewLEi @ 103 NONAME
+	_ZN7CRLSXDM5NewLCEi @ 104 NONAME
+	_ZN7CRLSXDM9DeleteAllEv @ 105 NONAME
+	_ZTI12CPresenceXDM @ 106 NONAME
+	_ZTI7CRLSXDM @ 107 NONAME
+	_ZTV12CPresenceXDM @ 108 NONAME
+	_ZTV7CRLSXDM @ 109 NONAME
 

--- a/simpleengine/xdmrlspres/group/rlspresxdm.mmp	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/xdmrlspres/group/rlspresxdm.mmp	Wed Aug 18 10:10:28 2010 +0300
@@ -53,7 +53,7 @@
 LIBRARY                         charconv.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwinscw/ 

--- a/simpleengine/xmlutils/inc/simpleelement.h	Tue Jul 06 14:42:48 2010 +0300
+++ b/simpleengine/xmlutils/inc/simpleelement.h	Wed Aug 18 10:10:28 2010 +0300
@@ -276,7 +276,7 @@
     void ConstructL( const TDesC8& aNsUri,
         const TDesC8& aLocalName );
 
-    void CSimpleElement::ConstructL(
+    void ConstructL(
         CSenElement* aElem,
         TBool aOwn );