diff -r 15bc1d5d6267 -r ae34e1715e21 ipsservices/ipssosaoplugin/src/IpsSosAOPluginEComInterface.cpp
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOPluginEComInterface.cpp	Fri Jul 23 19:09:50 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOPluginEComInterface.cpp	Thu Aug 05 21:09:09 2010 +0300
@@ -16,15 +16,7 @@
 *
 */
 
-#include "emailtrace.h"
-#include <e32base.h>
-
-#include <AlwaysOnlineManagerCommon.h>
-#include <AlwaysOnlineManagerClient.h>
-
-#include "IpsSosAOPluginEComInterface.h"
-#include "IpsSosAOSmtpSendWatcher.h"
-#include "IpsSosAOImapPopLogic.h"
+#include "ipssosaopluginheaders.h"
 
 const TInt KIpsSosAOPluginCommandBufferGra = 1;