--- a/creator/inc/creator_calendar.h	Fri Mar 19 09:29:26 2010 +0200
+++ b/creator/inc/creator_calendar.h	Fri Apr 16 14:59:17 2010 +0300
@@ -37,7 +37,7 @@
 #include <calcategory.h>
 #include <caluser.h>
 #include <calrrule.h>
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
 #include <MVPbkSingleContactOperationObserver.h>
 #include <MVPbkContactStoreListObserver.h>
 #include <MVPbkContactFindObserver.h>
@@ -48,7 +48,7 @@
 class CCalenderInterimParameters;
 class CAsyncWaiter;
 
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
 class CCreatorInterimCalendar : public CCreatorCalendarBase, public MCalProgressCallBack, 
 public MVPbkSingleContactOperationObserver, public MVPbkContactStoreListObserver, public MVPbkContactFindObserver
 #else
@@ -85,7 +85,7 @@
     void DeleteAllCreatedByCreatorL();
     
 public:
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
     // From MVPbkSingleContactOperationObserver:
     virtual void VPbkSingleContactOperationComplete(
             MVPbkContactOperationBase& aOperation,
@@ -123,7 +123,7 @@
     HBufC* iTmpEmail;
     RArray<TUint32> iEntryIds; // TCalLocalUid ( == TUint32 ) CCalEntry::LocalUidL
     
-#if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
+#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4)
     CVPbkContactManager* iContactManager;
     MVPbkContactLinkArray* iExistingContacts;
     MVPbkStoreContact* iTempContact;