diff -r dcf0eedfc1a3 -r d189ee25cf9d ipsservices/ipssosaoplugin/src/IpsSosAOBaseAgent.cpp
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOBaseAgent.cpp	Thu Aug 19 09:38:05 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOBaseAgent.cpp	Tue Aug 31 15:04:17 2010 +0300
@@ -16,14 +16,7 @@
 *
 */
 
-#include "emailtrace.h"
-#include <e32property.h>
-
-#include "ipsplgsosbaseplugin.hrh"
-
-#include "IpsSosAOBaseAgent.h"
-#include "IpsSosAOImapAgent.h"
-#include "IpsSosAOPopAgent.h"
+#include "ipssosaopluginheaders.h"
 
 _LIT( KIpsAOPlgPanicLit, "IpsAOPlg");
 // ----------------------------------------------------------------------------