diff -r dcf0eedfc1a3 -r d189ee25cf9d ipsservices/ipssosaoplugin/src/IpsSosAOSmtpSendWatcher.cpp
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpSendWatcher.cpp	Thu Aug 19 09:38:05 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpSendWatcher.cpp	Tue Aug 31 15:04:17 2010 +0300
@@ -16,14 +16,7 @@
 *
 */
 
-//#include <e32math.h>
-#include "emailtrace.h"
-#include <msvapi.h>
-
-#include "IpsSosAOSmtpSendWatcher.h"
-#include "IpsSosAOSmtpAgent.h"
-
-#include "ipsplgcommon.h"
+#include "ipssosaopluginheaders.h"
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------