--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOBaseAgent.h	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOBaseAgent.h	Wed Sep 01 12:28:57 2010 +0100
@@ -17,11 +17,14 @@
 */
 
 
-#ifndef IPSSOSAOBASEAGENT_H
-#define IPSSOSAOBASEAGENT_H
+#ifndef IPSSOSAOBASEAGENT_H_
+#define IPSSOSAOBASEAGENT_H_
 
 #include <e32base.h> 
 #include <msvapi.h>
+#include <SendUiConsts.h>
+
+#include "ipsplgcommon.h"
 
 class CIpsSetDataApi;
 class CIpsSosAOImapSyncOp;
@@ -55,9 +58,7 @@
 *
 * @lib ipssosaoplugin.lib
 */
-//<Qmail>
-NONSHARABLE_CLASS (CIpsSosAOBaseAgent) : public CActive
-//</Qmail>
+class CIpsSosAOBaseAgent : public CActive
     {
     
 public: // enums
@@ -234,4 +235,4 @@
     
     };
 
-#endif /*IPSSOSAOBASEAGENT_H*/
+#endif /*IPSSOSAOBASEAGENT_H_*/