diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -246,9 +246,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-          </component>
           <component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
@@ -257,9 +254,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-          </component>
           <component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
           </component>
@@ -291,9 +285,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-          </component>
           <component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_scroller_api/group"/>
           </component>
@@ -473,9 +464,8 @@
             <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+          <component name="screen_saver_api" long-name="Screen Saver API" filter="s60,test,api_test" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
           </component>
           <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>