--- a/group/bld.inf	Fri Sep 03 15:38:36 2010 +0300
+++ b/group/bld.inf	Tue Sep 21 11:21:11 2010 +0300
@@ -17,11 +17,12 @@
 
 
 
-
+#ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
 
 // For compatibility with S60 3.2 and IAD branch
 #include "upnpplatformvar.hrh"
 
+
 // Export domain and SDK headers
 #include "../dlnasrv_plat/group/bld.inf"
 
@@ -36,7 +37,7 @@
 #include "../upnpsharing/group/bld.inf"
 #include "../upnpmpxplugins/group/bld.inf"
 
-#ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
+
 #include "../upnpharvester/group/bld.inf"
 
 // upnp applications