--- a/upnpframework/rom/upnpframeworkresources.iby	Tue Mar 23 22:18:56 2010 +0200
+++ b/upnpframework/rom/upnpframeworkresources.iby	Thu Apr 15 15:32:09 2010 +0300
@@ -27,13 +27,9 @@
     data=DATAZ_\resource\UPnPAiwEngineResources.RSC \resource\UPnPAiwEngineResources.rsc
     data=DATAZ_\resource\UPnPAiwMenuResources.rsc \resource\UPnPAiwMenuResources.rsc
 
-#endif // FF_UPNP_FRAMEWORK_2_0	
-
     // UpnpCommand
     data=DATAZ_\resource\upnpcommandresources.RSC \resource\upnpcommandresources.rsc
 
-#ifdef FF_UPNP_FRAMEWORK_2_0 // UPnP feature flag
-
     // File transfer engine
     data=DATAZ_\resource\UPnPFileTransferEngineResources.rsc \resource\UPnPFileTransferEngineResources.rsc
 

--- a/upnpsettings/group/bld.inf	Tue Mar 23 22:18:56 2010 +0200
+++ b/upnpsettings/group/bld.inf	Thu Apr 15 15:32:09 2010 +0300
@@ -46,9 +46,10 @@
 
     // Sharing ui
     #include "../upnpsharingui/group/bld.inf"
-    
+
     // GS plugin
     #include "../upnpgsplugin/group/bld.inf"
+
 #endif // FF_UPNP_FRAMEWORK_2_0
 
 // end of file