diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -100,12 +100,6 @@
     <unit bldFile="web_plat/xml_parser_api/group"/>
    </component>
   </collection>
-  <collection id="web_info" name="Web Info" level="specific">
-   <component id="web_build" filter="s60" name="Web Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
   <collection id="browserutilities" name="Browser Utilities" level="utils">
    <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
     <unit bldFile="browserutilities/browserdialogsprovider/group"/>
@@ -138,8 +132,7 @@
     <meta rel="config">
      <defined condition="BRDO_MULTIPART_PARSER_FF"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-    <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+    <unit bldFile="browserutilities/multipartparser/group"/>
    </component>
    <component id="schemehandler" filter="s60" name="Scheme Handler">
     <unit bldFile="browserutilities/schemehandler/group"/>
@@ -150,10 +143,6 @@
    <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
     <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
    </component>
-   <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="browserutilities/group"/>
-   </component>
   </collection>
   <collection id="webengine" name="Web Engine" level="server">
    <component id="osswebengine" filter="s60" name="OSS Web Engine">
@@ -237,36 +226,30 @@
    <meta rel="config">
     <defined condition="RD_BROWSER_WIDGETS"/>
     <defined condition="__WEB_WIDGETS"/>
-   </meta>
-   <!-- the following units can be uncommented when configuration is put in place -->
+    </meta>
    <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+    <unit bldFile="widgets/widgetrecognizer/group"/>
    </component>
    <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+    <unit bldFile="widgets/widgetinstaller/group"/>
    </component>
    <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+    <unit bldFile="widgets/widgetlauncher/group"/>
    </component>
    <component id="widgetapp" filter="s60" name="Widget UI">
-    <!--<unit bldFile="widgets/widgetapp/group"/>-->
+    <unit bldFile="widgets/widgetapp/group"/>
    </component>
    <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
     <meta rel="config">
      <defined condition="RD_WIDGET_PREINSTALLER"/>
     </meta>
-    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+    <unit bldFile="widgets/widgetpreinstaller/group"/>
    </component>
    <component id="widgetstartup" filter="s60" name="Widget Startup">
     <meta rel="config">
      <defined condition="RD_WIDGET_PREINSTALLER"/>
     </meta>
-    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-   </component>
-   <component id="widgets_build" filter="s60" name="Widgets Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-    <unit bldFile="widgets/group"/>
+    <unit bldFile="widgets/widgetstartup/group"/>
    </component>
   </collection>
  </package>