--- a/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpAgent.cpp	Tue Jul 06 14:04:34 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpAgent.cpp	Wed Aug 18 09:37:47 2010 +0300
@@ -16,18 +16,7 @@
 *
 */
 
-#include "emailtrace.h"
-#include <e32base.h>
-
-//<QMail>
-#include "CFSMailCommon.h"
-//</QMail>
-#include "IpsSosAOSmtpAgent.h"
-#include "ipsplgsmtpoperation.h"
-//<QMail>
-
-//</QMail>
-
+#include "ipssosaopluginheaders.h"
 
 #ifdef _DEBUG
 _LIT( KIpsSosAOSmtpLogicPanicLit, "AOsmtp");