--- a/ipsservices/ipssosaoplugin/src/IpsSosAOImapAgent.cpp	Fri Jul 23 19:09:50 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOImapAgent.cpp	Thu Aug 05 21:09:09 2010 +0300
@@ -16,29 +16,7 @@
 *
 */
 
-
-#include "emailtrace.h"
-#include <cemailaccounts.h>
-#include <imapcmds.h>
-#include <miutset.h>
-#include <impcmtm.h>
-#include <msvapi.h>
-#include <AlwaysOnlineManagerCommon.h>
-#include "CFSMailCommon.h"
-
-#include "IpsSosAOImapAgent.h"
-#include "IpsSosAOImapPopLogic.h"
-
-
-//<QMail>
-#include "IpsSosAOSettingsHandler.h"
-
-//<qmail> removed
-//</QMail>
-
-// from ipsplugin
-#include "ipsplgimap4populateop.h"
-#include "ipsplgcommon.h"
+#include "ipssosaopluginheaders.h"
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------