--- a/emailservices/nmclientapi/src/nmapimessagemanager_p.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapimessagemanager_p.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -14,14 +14,9 @@
  * Description:
  *     Email message related operations
  */
+ 
+#include "nmapiheaders.h"
 
-#include <nmapimessagemanager.h>
-#include <nmapidatapluginfactory.h>
-#include <nmdataplugininterface.h>
-#include <nmapifolder.h>
-#include <nmcommon.h>
-#include "nmapimessagemanager_p.h"
-#include "emailtrace.h"
 
 namespace EmailClientApi
 {