--- a/upnpsettings/group/bld.inf	Wed Apr 14 16:14:39 2010 +0300
+++ b/upnpsettings/group/bld.inf	Tue Aug 31 15:29:11 2010 +0300
@@ -15,28 +15,21 @@
 *
 */
 
-
-
-
-
-
 // For compatibility with S60 3.2 and IAD branch
 #include "../../group/upnpplatformvar.hrh"
 
 PRJ_PLATFORMS
 
 PRJ_EXPORTS
-// ROM build
-../rom/upnpsettings.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettings.iby)
-../rom/upnpsettingsresources.iby      CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettingsresources.iby)
-// LOC files
-UPNP_LOC_EXPORT(upnpsettings.loc)
 
 PRJ_MMPFILES
-// none
+
+// settings engine
+#include "../upnpsettingsengine/group/bld.inf"
 
-    // settings engine
-    #include "../upnpsettingsengine/group/bld.inf"
+// Exports for upnpsettings
+#include "../rom/bld.inf"
+
 #ifdef FF_UPNP_FRAMEWORK_2_0  // UPnP feature flag
     // multiselectionui
     #include "../multiselectionui/group/bld.inf"
@@ -46,8 +39,10 @@
 
     // Sharing ui
     #include "../upnpsharingui/group/bld.inf"
-#endif // FF_UPNP_FRAMEWORK_2_0
+
     // GS plugin
     #include "../upnpgsplugin/group/bld.inf"
 
+#endif // FF_UPNP_FRAMEWORK_2_0
+
 // end of file