--- a/CompilerCompatibility/app/musicplayer/package_definition.xml	Wed Dec 01 15:34:13 2010 +0000
+++ b/CompilerCompatibility/app/musicplayer/package_definition.xml	Mon Dec 06 15:34:02 2010 +0000
@@ -99,9 +99,8 @@
 <component name="mpxmusicplayer_app" filter="s60" long-name="MPX Application">
 <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
 </component>
-<component name="mpxmusicplayer_build" filter="s60" long-name="MPX Music Player Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
+<component name="mpxmusicplayer_exports" filter="s60" long-name="MPX Music Player Exports">
+<unit bldFile="/sf/app/musicplayer/mpxmusicplayer/exports"/>
 </component>
 </collection>
 <collection name="musichomescreen_multiview" long-name="Music Home Screen Multiview" level="hs">
@@ -133,17 +132,11 @@
 <component name="viewplugins" filter="s60" long-name="MPX View Plugins" plugin="Y">
 <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
 </component>
-<component name="mpxplugins_build" filter="s60" long-name="MPX Plugins Build">
-<!--  can the exports be distributed to the above components?  -->
-<unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
+<component name="mpxplugins_exports" filter="s60" long-name="MPX Plugins Exports">
+<unit bldFile="/sf/app/musicplayer/mpxplugins/exports"/>
 </component>
 </collection>
-<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
-<component name="musicplayer_build" filter="s60" long-name="Music Player Build">
-<!-- should explicitly #inlcude musicplayerbldvariant.hrh in each component  -->
-<unit bldFile="/sf/app/musicplayer/group"/>
-</component>
-</collection>
+<collection name="musicplayer_info" long-name="Music Player Apps Info" level="app"/>
 </block>
   </layer>
  </systemModel>