--- a/mm_plat/group/bld.inf	Fri Sep 17 17:01:39 2010 +0100
+++ b/mm_plat/group/bld.inf	Wed Sep 29 13:59:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -17,78 +17,9 @@
 */
 
 
-#include "../aac_decoder_config_api/group/bld.inf"
-#include "../aac_decoder_config_msg_hdlr_api/group/bld.inf"
-#include "../aac_decoder_config_proxy_api/group/bld.inf"
-#include "../added_devsound_control_api/group/bld.inf"
-#include "../added_devsound_control_msg_hdlr_api/group/bld.inf"
-#include "../added_devsound_control_proxy_api/group/bld.inf"
-#include "../audio_effects_msg_hdlr_api/group/bld.inf"
-#include "../audio_effects_proxy_api/group/bld.inf"
-#include "../audio_policy_header_api/group/bld.inf"
-#include "../audio_routing_api/group/bld.inf"
-#include "../audio_routing_msg_hdlr_api/group/bld.inf"
-#include "../audio_routing_proxy_api/group/bld.inf"
-#include "../custom_interface_builder_api/group/bld.inf"
-#include "../custom_interface_message_handler_factory_api/group/bld.inf"
-#include "../custom_interface_proxy_factory_api/group/bld.inf"
-#include "../custom_interface_utility_api/group/bld.inf"
-#include "../devsound_adaptation_api/group/bld.inf"
-#include "../display_posting_api/group/bld.inf"
-#include "../eaac_plus_decoder_interface_api/group/bld.inf"
-#include "../eaac_plus_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../eaac_plus_decoder_interface_proxy_api/group/bld.inf"
-#include "../error_concealment_interface_api/group/bld.inf"
-#include "../error_concealment_interface_msg_hdlr_api/group/bld.inf"
-#include "../error_concealment_interface_proxy_api/group/bld.inf"
-#include "../fm_radio_adaptation_api/group/bld.inf"
-#include "../g711_decoder_interface_api/group/bld.inf"
-#include "../g711_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../g711_decoder_interface_proxy_api/group/bld.inf"
-#include "../g711_encoder_interface_api/group/bld.inf"
-#include "../g711_encoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../g711_encoder_interface_proxy_api/group/bld.inf"
-#include "../g729_decoder_interface_api/group/bld.inf"
-#include "../g729_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../g729_decoder_interface_proxy_api/group/bld.inf"
-#include "../g729_encoder_interface_api/group/bld.inf"
-#include "../g729_encoder_interface_proxy_api/group/bld.inf"
-#include "../g729_encoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../global_audio_settings_api/group/bld.inf"
-#include "../global_audio_settings_definition_api/group/bld.inf"
-#include "../ilbc_decoder_interface_api/group/bld.inf"
-#include "../ilbc_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../ilbc_decoder_interface_proxy_api/group/bld.inf"
-#include "../ilbc_encoder_interface_api/group/bld.inf"
-#include "../ilbc_encoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../ilbc_encoder_interface_proxy_api/group/bld.inf"
 #include "../mdf_plugin_uids/group/bld.inf"
-#include "../multimedia_fourcc_definitions_api/group/bld.inf"
-#include "../nokia_audio_policy_header_api/group/bld.inf"
-#include "../nokia_multimedia_fourcc_definitions_api/group/bld.inf"
-#include "../ra8_decoder_interface_api/group/bld.inf"
-#include "../ra8_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../ra8_decoder_interface_proxy_api/group/bld.inf"
-#include "../rds_adaptation_api/group/bld.inf"
-#include "../restricted_audio_output_api/group/bld.inf"
-#include "../restricted_audio_output_msg_hdlr_api/group/bld.inf"
-#include "../restricted_audio_output_proxy_api/group/bld.inf"
-#include "../sbc_encoder_interface_api/group/bld.inf"
-#include "../sbc_encoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../sbc_encoder_interface_proxy_api/group/bld.inf"
-#include "../secure_output_mdf_custom_interface/group/bld.inf"
-#include "../speech_encoder_config_api/group/bld.inf"
-#include "../speech_encoder_config_msg_hdlr_api/group/bld.inf"
-#include "../speech_encoder_config_proxy_api/group/bld.inf"
-#include "../telephony_audio_routing_client_api/group/bld.inf"
-#include "../telephony_audio_routing_manager_api/group/bld.inf"
 #include "../video_buffer_management_mdf_custom_interface/group/bld.inf"
 #include "../video_decoder_rotation_mdf_custom_interface/group/bld.inf"
 #include "../video_decoder_scaling_mdf_custom_interface/group/bld.inf"
 #include "../video_reclaim_extbuffers_ci/group/bld.inf"
 #include "../video_window_control_custom_interface/group/bld.inf"
-#include "../wma_decoder_interface_api/group/bld.inf"
-#include "../wma_decoder_interface_msg_hdlr_api/group/bld.inf"
-#include "../wma_decoder_interface_proxy_api/group/bld.inf"
-#include "../eaacplusutil_api/group/bld.inf"
-#include "../frametable_api/group/bld.inf"