--- a/emailservices/nmclientapi/src/nmapiengine.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiengine.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -15,19 +15,8 @@
  *
  */
 
-#include "emailtrace.h"
-
-#include <nmapicommonheader.h>
+#include "nmapiheaders.h"
 
-#include "nmapitypesconverter.h"
-#include "nmdataplugininterface.h"
-#include "nmapidatapluginfactory.h"
-#include "nmapiengine.h"
-
-/*!
-    from nmailbase
-*/
-#include "nmapiprivateheaders.h"
 
 NmApiEngine *NmApiEngine::mInstance = NULL;
 quint32 NmApiEngine::mReferenceCount = 0;