--- a/emailservices/nmclientapi/src/nmapipopimapsettingsmanager.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapipopimapsettingsmanager.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -15,13 +15,9 @@
 *
 */
 
-#include "nmapipopimapsettingsmanager.h"
+#include "nmapiheaders.h"
 
-#include <imapset.h>
-#include <pop3set.h>
-#include <iapprefs.h>
-#include <cemailaccounts.h>
-#include <xqconversions.h>
+
 
 
 static const int DefaultPopPort = 110;