--- a/ipsservices/ipssosaoplugin/src/IpsSosAOEMNResolver.cpp	Thu Aug 19 09:38:05 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOEMNResolver.cpp	Tue Aug 31 15:04:17 2010 +0300
@@ -16,15 +16,8 @@
 *
 */
 
-
 // INCLUDE FILES
-#include "emailtrace.h"
-#include <e32base.h>
-#include <AlwaysOnlineManagerCommon.h>
-
-#include "IpsSosAOEMNResolver.h"
-#include "IpsSosAOMboxLogic.h"
-#include "IpsSosAOBaseAgent.h"
+#include "ipssosaopluginheaders.h"
 
 // Literals used when trying to match a mailbox 
 // to a received EMN message