diff -r fcdfafb36fe7 -r aecbbf00d063 classicui_plat/group/bld.inf
--- a/classicui_plat/group/bld.inf	Thu Aug 19 10:11:06 2010 +0300
+++ b/classicui_plat/group/bld.inf	Tue Aug 31 15:28:30 2010 +0300
@@ -18,27 +18,22 @@
 
 
 
-#include "../personalisation_framework_api/group/bld.inf"
 #include "../signal_pane_api/group/bld.inf"
-#include "../japanese_reading_api/group/bld.inf"
+
 #include "../global_popup_priority_controller_api/group/bld.inf"
 #include "../item_finder_api/group/bld.inf"
 #include "../avkon_fonts_api/group/bld.inf"
 #include "../extended_utilities_api/group/bld.inf"
-#include "../personalisation_plugin_api/group/bld.inf"
 #include "../extended_aiw_criteria_api/group/bld.inf"
-#include "../personalisation_application_api/group/bld.inf"
 #include "../volume_popup_api/group/bld.inf"
 #include "../avkon_secondary_display_support_api/group/bld.inf"
 #include "../extended_setting_pages_api/group/bld.inf"
 #include "../extended_lists_api/group/bld.inf"
 #include "../input_block_api/group/bld.inf"
 #include "../avkon_ui_server_api/group/bld.inf"
-#include "../number_grouping_api/group/bld.inf"
 #include "../extended_status_pane_api/group/bld.inf"
 #include "../extended_notifiers_api/group/bld.inf"
 #include "../task_list_api/group/bld.inf"
-#include "../personalisation_slide_show_dialog_api/group/bld.inf"
 #include "../key_event_utilities_api/group/bld.inf"
 #include "../emergency_call_support_api/group/bld.inf"
 #include "../extended_dialogs_api/group/bld.inf"
@@ -55,7 +50,6 @@
 #include "../skinnable_clock_api/group/bld.inf"
 #include "../battery_pane_api/group/bld.inf"
 #include "../fep_document_navigation_api/group/bld.inf"
-#include "../personalisation_localised_texts_api/group/bld.inf"
 #include "../memory_card_ui_api/group/bld.inf"
 #include "../avkon_status_api/group/bld.inf"
 #include "../application_switching_api/group/bld.inf"
@@ -63,10 +57,8 @@
 #include "../avkon_secondary_display_api/group/bld.inf"
 #include "../extended_animation_api/group/bld.inf"
 #include "../extended_notes_api/group/bld.inf"
-#include "../screensaver_animation_plugin_definitions_api/group/bld.inf"
 #include "../text_scroller_api/group/bld.inf"
 #include "../custom_cursors_api/group/bld.inf"
-#include "../screensaver_settings_api/group/bld.inf"
 #include "../global_window_priorities_api/group/bld.inf"
 #include "../extended_indicators_api/group/bld.inf"
 #include "../special_character_table_api/group/bld.inf"
@@ -76,7 +68,6 @@
 #include "../media_shared_document_api/group/bld.inf"
 #include "../extended_queries_api/group/bld.inf"
 #include "../phone_number_text_utilities_api/group/bld.inf"
-#include "../screensaver_runtime_api/group/bld.inf"
 #include "../extended_scroller_api/group/bld.inf"
 #include "../key_rotator_api/group/bld.inf"
 #include "../extended_grids_api/group/bld.inf"
@@ -86,7 +77,6 @@
 #include "../stylus_activated_popup_api/group/bld.inf"
 #include "../indicator_plugin_api/group/bld.inf"
 #include "../layout_configuration_api/group/bld.inf"
-#include "../common_file_dialogs_filter_factory_api/group/bld.inf"
 #include "../avkon_anim_dll_api/group/bld.inf"
 #include "../extended_initialization_api/group/bld.inf"
 #include "../long_tap_animation_api/group/bld.inf"
@@ -99,12 +89,78 @@
 #include "../transition_effect_utilities_api/group/bld.inf"
 #include "../pointer_event_modifier_api/group/bld.inf"
 #include "../avkon_testability_api/group/bld.inf"
-#include "../ganes_api/group/bld.inf"
+
 #include "../ode_api/group/bld.inf"
 #include "../physics_api/group/bld.inf"
 #include "../touch_pane_api/group/bld.inf"
 #include "../touch_pane_observer_api/group/bld.inf"
 #include "../alternate_fs_api/group/bld.inf"
 #include "../discreet_popup_api/group/bld.inf"
-#include "../touch_gesture_framework_api/group/bld.inf"
+
 #include "../extended_options_menu_api/group/bld.inf"
+#include "../findutil_api/group/bld.inf"
+#include "../directory_localizer_api/group/bld.inf"
+
+#include "../input_frame_api/group/bld.inf"
+#include "../window_server_event_observer_api/group/bld.inf"
+#include "../application_framework_api/group/bld.inf"
+#include "../scroller_api/group/bld.inf"
+#include "../ui_framework_utilities_api/group/bld.inf"
+#include "../ui_framework_definitions_api/group/bld.inf"
+#include "../buttons_api/group/bld.inf"
+#include "../queries_api/group/bld.inf"
+#include "../aiw_generic_parameter_api/group/bld.inf"
+#include "../editors_api/group/bld.inf"
+#include "../dialog_shutter_api/group/bld.inf"
+#include "../fonts_api/group/bld.inf"
+#include "../screen_clearer_api/group/bld.inf"
+#include "../notifiers_api/group/bld.inf"
+#include "../notes_api/group/bld.inf"
+#include "../status_pane_api/group/bld.inf"
+#include "../base_controls_api/group/bld.inf"
+#include "../grids_api/group/bld.inf"
+#include "../context_pane_api/group/bld.inf"
+#include "../lists_api/group/bld.inf"
+#include "../popups_api/group/bld.inf"
+#include "../misc_controls_api/group/bld.inf"
+#include "../keylock_api/group/bld.inf"
+#include "../options_menu_api/group/bld.inf"
+#include "../hierarchical_lists_api/group/bld.inf"
+#include "../navigation_pane_api/group/bld.inf"
+#include "../tabs_api/group/bld.inf"
+#include "../title_pane_touch_observer_api/group/bld.inf"
+#include "../choice_list_api/group/bld.inf"
+#include "../info_popup_note_api/group/bld.inf"
+#include "../setting_pages_api/group/bld.inf"
+#include "../screen_mode_api/group/bld.inf"
+#include "../indicators_api/group/bld.inf"
+#include "../error_ui_api/group/bld.inf"
+#include "../animation_api/group/bld.inf"
+#include "../searchfield_api/group/bld.inf"
+#include "../labels_api/group/bld.inf"
+#include "../hotkeys_api/group/bld.inf"
+#include "../initialization_api/group/bld.inf"
+#include "../volume_control_api/group/bld.inf"
+#include "../title_pane_api/group/bld.inf"
+#include "../sounds_api/group/bld.inf"
+#include "../aiw_service_handler_api/group/bld.inf"
+#include "../aiw_criteria_api/group/bld.inf"
+#include "../touch_ui_utilities_api/group/bld.inf"
+#include "../generic_button_api/group/bld.inf"
+#include "../form_api/group/bld.inf"
+#include "../uikon_core_controls/group/bld.inf"
+#include "../calendar_api/group/bld.inf"
+#include "../toolbar_api/group/bld.inf"
+#include "../server_application_api/group/bld.inf"
+#include "../slider_api/group/bld.inf"
+#include "../private_ui_framework_api/group/bld.inf"
+#include "../dialogs_api/group/bld.inf"
+#include "../document_handler_api/group/bld.inf"
+#include "../images_api/group/bld.inf"
+#include "../stylus_popup_menu_api/group/bld.inf"
+#include "../information_preview_popup_api/group/bld.inf"
+#include "../intermediate_state_api/group/bld.inf"
+#include "../help_launcher_api/group/bld.inf"
+#include "../common_file_dialogs_api/group/bld.inf"
+#include "../common_file_dialogs_filter_factory_api/group/bld.inf"
+