diff -r 15bc1d5d6267 -r ae34e1715e21 ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp
--- a/ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp	Fri Jul 23 19:09:50 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOSettingsHandler.cpp	Thu Aug 05 21:09:09 2010 +0300
@@ -15,15 +15,8 @@
 *     
 *
 */
-#include "IpsSosAOSettingsHandler.h"
-#include "IpsSosAoExtendedSettingsManager.h"
-#include "nmipssettingitems.h"
-#include "ipssettingkeys.h"
-#include <SendUiConsts.h>
-#include <msvapi.h>
-#include <cemailaccounts.h>
-#include <smtpset.h>
-#include <nmcommon.h>
+
+#include "ipssosaopluginheaders.h"
 
 const TInt KAOMinutesInHour = 60;