diff -r f83bd4ae1fe3 -r 10eaf342f539 emailservices/nmclientapi/src/nmapidatapluginfactory.cpp
--- a/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapidatapluginfactory.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -15,25 +15,9 @@
  *
  */
 
-#include "emailtrace.h"
-
-#include "nmdataplugininterface.h"
-#include "nmapidatapluginfactory.h"
+#include "nmapiheaders.h"
 
-// Qt
-#include <QPluginLoader>
-#include <QDir>
-#include <QApplication>
-#include <QLocale>
-#include <QObject>
 
-// nmailbase
-#include "nmcommon.h"
-#include "nmmailbox.h"
-#include "nmmessageenvelope.h"
-#include "nmmessage.h"
-#include "nmmessagepart.h"
-#include "nmfolder.h"
 
 /*!
  \class NmApiDataPluginFactory