diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrviewercalplugin/group/esmrviewercalplugin.mmp
--- a/meetingrequest/mrviewercalplugin/group/esmrviewercalplugin.mmp	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrviewercalplugin/group/esmrviewercalplugin.mmp	Wed Mar 31 21:08:33 2010 +0300
@@ -16,9 +16,8 @@
 */
 
 
-#include "../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+#include "../../inc/esmrinternaluid.h"
 #include "../../../inc/emailtraceconfig.hrh"
-#include "../../inc/esmrinternaluid.h"
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 
@@ -30,21 +29,23 @@
 VENDORID    VID_DEFAULT
 DEFFILE     ESMRViewerCalPlugin.def
 
-VERSION     KEmailBinaryVersionNumber
-KEmailBinaryDemandPaging
-
 SOURCEPATH  ../src
 SOURCE      esmrviewermain.cpp
 SOURCE      cesmrviewersimpl.cpp
 
+//</cmail>
 USERINCLUDE    ../inc
 USERINCLUDE    ../../inc
+USERINCLUDE    ../../mrcommon/inc
 USERINCLUDE    ../../../inc
+//</cmail>
 
 APP_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH      ../data
+// <cmail> S60 UID update
 START RESOURCE  2001E27E.rss
+// </cmail> S60 UID update
 TARGET          esmrviewercalplugin.rsc
 END
 
@@ -55,9 +56,11 @@
 LIBRARY eikcore.lib
 LIBRARY esmrgui.lib
 LIBRARY calinterimapi.lib
-LIBRARY cmaillogger.lib
 
-#ifdef TRACE_INTO_FILE
-LIBRARY                 flogger.lib
-#endif // TRACE_INTO_FILE
+#if defined( ENABLE_TRACES ) && defined( TRACE_INTO_FILE )
+LIBRARY flogger.lib
+#endif // ENABLE_TRACES && TRACE_INTO_FILE
+
 // End of file
+
+