--- a/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp	Thu Dec 17 08:39:39 2009 +0200
+++ b/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp	Thu Jan 07 12:38:46 2010 +0200
@@ -30,7 +30,7 @@
 #include <aknpasswordsettingpage.h>     // CAknAlphaPasswordSettingPage
 #include <ConnectionUiUtilities.h>      // CConnectionUiUtilities
 #include <featmgr.h>   // FeatureManager
-#include <AspDefines.h> //For enum TRoamingSettings
+#include "AspDefines.h" //For enum TRoamingSettings
 #include <centralrepository.h> //For central Repository
 #include "CPreSyncPlugin.h"
 

--- a/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp	Thu Dec 17 08:39:39 2009 +0200
+++ b/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp	Thu Jan 07 12:38:46 2010 +0200
@@ -1408,7 +1408,7 @@
     keyBuff.AppendNum( EGlobalUUID );
     CCalenInterimUtils2* interimUtils = CCalenInterimUtils2::NewL();
     CleanupStack::PushL( interimUtils );
-    HBufC8* guuid = interimUtils->CalFileGlobalUidL();
+    HBufC8* guuid = interimUtils->GlobalUidL();
     TPtr8 guuidPtr = guuid->Des();
     CleanupStack::PushL( guuid );
     calinfo->SetPropertyL( keyBuff, guuidPtr );

--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Thu Dec 17 08:39:39 2009 +0200
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Thu Jan 07 12:38:46 2010 +0200
@@ -3225,7 +3225,7 @@
     // Global UID MetaDataProperty 
     keyBuff.Zero();
     keyBuff.AppendNum( EGlobalUUID );
-    HBufC8* guuid = iInterimUtils->CalFileGlobalUidL();
+    HBufC8* guuid = iInterimUtils->GlobalUidL();
     TPtr8 guuidPtr = guuid->Des();
     CleanupStack::PushL( guuid );
     calinfo->SetPropertyL( keyBuff, guuidPtr );