--- a/emailservices/emailstore/base_plugin/group/BasePlugin.mmp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailstore/base_plugin/group/BasePlugin.mmp	Wed Sep 01 12:28:57 2010 +0100
@@ -19,12 +19,9 @@
 
 #include <platform_paths.hrh>
 
-//<qmail>
-// Removed from 10.1
-//#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
-//</qmail>
+#include "../../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
 #include "../../../../inc/emailtraceconfig.hrh"
-#include "../../inc/EmailStoreUids.hrh"
+#include "../../inc/emailstoreuids.hrh"
 
 TARGET            baseplugin.dll
 TARGETTYPE        dll
@@ -32,10 +29,7 @@
 CAPABILITY        CAP_GENERAL_DLL
 VENDORID          VID_DEFAULT
 
-//<qmail>
-// Removed from 10.1
-//VERSION           KEmailBinaryVersionNumber
-//</qmail>
+VERSION           KEmailBinaryVersionNumber
 KEmailBinaryDemandPaging
 
 
@@ -52,7 +46,6 @@
 USERINCLUDE ../inc
 
 USERINCLUDE ../../../../inc
-SYSTEMINCLUDE /epoc32/include/ecom
 
 APP_LAYER_SYSTEMINCLUDE
 
@@ -68,7 +61,7 @@
 SOURCE basepluginfetch.cpp
 SOURCE baseplugindelayedops.cpp
 SOURCE basepluginresourceloader.cpp
-SOURCE nestedao.cpp
+
 
 // *************************************
 // OTHER STUFF