--- a/symbian4/single/sysdefs/auto/system_model.xml	Fri Jun 11 14:38:27 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Fri Jun 11 14:38:37 2010 +0100
@@ -447,174 +447,6 @@
 <component name="ossrv_exceptions_api" long-name="Generic OS Services Exceptions API" filter="s60" class="api">
 <unit bldFile="os/ossrv/ossrv_pub/exceptions/group"/>
 </component>
-<component name="gboxed" long-name="GBoxed API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gboxed/group"/>
-</component>
-<component name="glib_arrays" long-name="Glib Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_arrays/group"/>
-</component>
-<component name="glib_asynchronous_queues" long-name="Glib Asynchronous Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_asynchronous_queues/group"/>
-</component>
-<component name="glib_atomic_operations" long-name="Glib Atomic Operations API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_atomic_operations/group"/>
-</component>
-<component name="glib_automatic_string_completion" long-name="Glib Automatic String Completion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_automatic_string_completion/group"/>
-</component>
-<component name="glib_balanced_binary_trees" long-name="Glib Balanced Binary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_balanced_binary_trees/group"/>
-</component>
-<component name="glib_basic_types" long-name="Glib Basic Types API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_basic_types/group"/>
-</component>
-<component name="glib_caches" long-name="Glib Caches API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_caches/group"/>
-</component>
-<component name="glib_character_set_conversion" long-name="Glib Character Set Conversion API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_character_set_conversion/group"/>
-</component>
-<component name="glib_closures" long-name="Glib Closures API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_closures/group"/>
-</component>
-<component name="glib_commandline_option_parser" long-name="Glib Command Line Option Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_commandline_option_parser/group"/>
-</component>
-<component name="glib_datasets" long-name="Glib Datasets API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_datasets/group"/>
-</component>
-<component name="glib_date_and_time_functions" long-name="Glib Date and Time Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_date_and_time_functions/group"/>
-</component>
-<component name="glib_doubleended_queues" long-name="Glib Double-ended Queues API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doubleended_queues/group"/>
-</component>
-<component name="glib_doublylinked_lists" long-name="Glib Doubly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_doublylinked_lists/group"/>
-</component>
-<component name="glib_dynamic_loading_of_modules" long-name="Glib Dynamic Loading of Modules API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-</component>
-<component name="glib_enums_and_flags" long-name="Glib Enums and Flags API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_enums_and_flags/group"/>
-</component>
-<component name="glib_error_reporting" long-name="Glib Error Reporting API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_error_reporting/group"/>
-</component>
-<component name="glib_file_utilities" long-name="Glib File Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_file_utilities/group"/>
-</component>
-<component name="glib_generic_values" long-name="Glib Generic Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_generic_values/group"/>
-</component>
-<component name="glib_globstyle_pattern_matching" long-name="Glib Glob-Style Pattern Matching API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_globstyle_pattern_matching/group"/>
-</component>
-<component name="glib_hash_tables" long-name="Glib Hash Tables API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hash_tables/group"/>
-</component>
-<component name="glib_hook_functions" long-name="Glib Hook Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_hook_functions/group"/>
-</component>
-<component name="glib_internationalization" long-name="Glib  Internationalization API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_internationalization/group"/>
-</component>
-<component name="glib_io_channels" long-name="Glib I/O Channels API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_io_channels/group"/>
-</component>
-<component name="glib_keyvalue_file_parser" long-name="Glib Key-Value File Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_keyvalue_file_parser/group"/>
-</component>
-<component name="glib_lexical_scanner" long-name="Glib Lexical Scanner API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_lexical_scanner/group"/>
-</component>
-<component name="glib_main_event_loop" long-name="Glib Main Event Loop API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_main_event_loop/group"/>
-</component>
-<component name="glib_memory_allocation" long-name="Glib Memory Allocation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_allocation/group"/>
-</component>
-<component name="glib_memory_slices" long-name="Glib Memory Slices API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_memory_slices/group"/>
-</component>
-<component name="glib_message_logging" long-name="Glib Message Logging API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_message_logging/group"/>
-</component>
-<component name="glib_miscellaneous_utility_functions" long-name="Glib Miscellaneous Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-</component>
-<component name="glib_nary_trees" long-name="Glib N-ary Trees API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_nary_trees/group"/>
-</component>
-<component name="glib_parameters_and_values" long-name="Glib Parameters and Values API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_parameters_and_values/group"/>
-</component>
-<component name="glib_quarks" long-name="Glib Quarks API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_quarks/group"/>
-</component>
-<component name="glib_random_numbers" long-name="Glib Random Numbers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_random_numbers/group"/>
-</component>
-<component name="glib_relations_and_tuples" long-name="Glib Relations and Tuples API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_relations_and_tuples/group"/>
-</component>
-<component name="glib_shellrelated_utilities" long-name="Glib Shell-related Utilities API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_shellrelated_utilities/group"/>
-</component>
-<component name="glib_signals" long-name="Glib Signals API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_signals/group"/>
-</component>
-<component name="glib_simple_xml_subset_parser" long-name="Glib Simple XML Subset Parser API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_simple_xml_subset_parser/group"/>
-</component>
-<component name="glib_singlylinked_lists" long-name="Glib Singly-Linked Lists API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_singlylinked_lists/group"/>
-</component>
-<component name="glib_spawning_processes" long-name="Glib Spawning Processes API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_spawning_processes/group"/>
-</component>
-<component name="glib_standard_macros" long-name="Glib Standard Macros API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_standard_macros/group"/>
-</component>
-<component name="glib_string_utility_functions" long-name="Glib String Utility Functions API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_string_utility_functions/group"/>
-</component>
-<component name="glib_strings" long-name="Glib Strings API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_strings/group"/>
-</component>
-<component name="glib_thread_pools" long-name="Glib Thread Pools API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_thread_pools/group"/>
-</component>
-<component name="glib_threads" long-name="Glib Threads API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_threads/group"/>
-</component>
-<component name="glib_timers" long-name="Glib Timers API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_timers/group"/>
-</component>
-<component name="glib_unicode_manipulation" long-name="Glib Unicode Manipulation API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_unicode_manipulation/group"/>
-</component>
-<component name="glib_value_arrays" long-name="Glib Value Arrays API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_value_arrays/group"/>
-</component>
-<component name="glib_varargs_value_collection" long-name="Glib Varargs Value Collection API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/glib_varargs_value_collection/group"/>
-</component>
-<component name="gobject" long-name="GObject API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gobject/group"/>
-</component>
-<component name="gparamspec" long-name="GParamSpec API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gparamspec/group"/>
-</component>
-<component name="gtype" long-name="GType API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtype/group"/>
-</component>
-<component name="gtypemodule" long-name="GTypeModule API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypemodule/group"/>
-</component>
-<component name="gtypeplugin" long-name="GTypePlugin API" filter="s60" class="api">
-<unit bldFile="os/ossrv/ossrv_pub/gtypeplugin/group"/>
-</component>
 <component name="io_stream_api" long-name="I/O stream API" filter="s60" class="api">
 <unit bldFile="os/ossrv/ossrv_pub/io_stream_api/group"/>
 </component>