--- a/contentctrl_plat/ds_contactsdatastoreextension_api/tsrc/group/TestCntDataStoreExtn.mmp	Fri Jun 11 13:29:32 2010 +0300
+++ b/contentctrl_plat/ds_contactsdatastoreextension_api/tsrc/group/TestCntDataStoreExtn.mmp	Wed Jun 23 18:02:53 2010 +0300
@@ -17,10 +17,7 @@
 */
 
 
-#if defined(__S60_)
-        // To get the MW_LAYER_SYSTEMINCLUDE-definition
-        #include <platform_paths.hrh>
-#endif
+#include <platform_paths.hrh>
 
 TARGET          TestCntDataStoreExtn.dll
 TARGETTYPE      dll
@@ -37,12 +34,9 @@
 
 USERINCLUDE     ../inc 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-    APP_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+
+MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY			efsrv.lib 

--- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Fri Jun 11 13:29:32 2010 +0300
+++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro	Wed Jun 23 18:02:53 2010 +0300
@@ -43,14 +43,14 @@
 		-lnsmldebug.dll \
 		
 		
-IfdefBlock = \
+defBlock = \
  "$${LITERAL_HASH}if defined(ARMCC)" \
  "DEFFILE ./def/eabicontactsdatastoreextension" \
  "$${LITERAL_HASH}elif defined(WINSCW)" \
  "DEFFILE ./def/bwinscwcontactsdatastoreextension" \
  "$${LITERAL_HASH}endif"
  
-MMP_RULES += IfdefBlock
+MMP_RULES += defBlock
 
 symbian { 
 	TARGET.UID3 = 0x2002DC83