--- a/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp	Thu Aug 19 10:44:50 2010 +0300
+++ b/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp	Tue Aug 31 16:04:06 2010 +0300
@@ -18,7 +18,7 @@
 
 #if defined(__S60_)
         // To get the OSEXT_LAYER_SYSTEMINCLUDE-definition
-        #include <platform_paths.hrh>
+        #include <domain/osextensions/platform_paths.hrh>
 #endif
 #include <data_caging_paths.hrh>
 
@@ -35,33 +35,13 @@
 //TARGETPATH      ?target_path
 //DEFFILE         TestPnpUtil.def
 
-#ifdef SBSV2
-USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-	    OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-SOURCEPATH      ../src
-#else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-APP_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
-#endif // SBSV2
-APP_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/internal
+
 
 SOURCE          ../src/TestPnpUtil.cpp
 SOURCE          ../src/TestPnpUtilBlocks.cpp