--- a/symbian3/os/ossrv/package_definition_3.0.xml	Thu Mar 25 17:16:26 2010 +0000
+++ b/symbian3/os/ossrv/package_definition_3.0.xml	Mon Mar 29 15:57:24 2010 +0100
@@ -380,24 +380,19 @@
     </collection>
     <collection id="glib" name="GLib" level="utilities">
       <component id="glibbackend" filter="s60" name="GLib Backend">
-        <unit bldFile="glib/build/symbian/glibbackend/group"/>
-        <!-- Move to here: <unit bldFile="glib/glibbackend/group"/> -->
+        <unit bldFile="glib/glibbackend/group"/>
       </component>
       <component id="libglib" filter="s60" name="GLib Library">
-        <unit bldFile="glib/build/symbian/glib/group"/>
-        <!-- Move to here: <unit bldFile="glib/libglib/group"/> -->
+        <unit bldFile="glib/libglib/group"/>
       </component>
       <component id="libgthread" filter="s60" name="Libg Thread">
-        <unit bldFile="glib/build/symbian/gthread/group"/>
-        <!-- Move to here:     <unit bldFile="glib/libgthread/group"/> -->
+        <unit bldFile="glib/libgthread/group"/>
       </component>
       <component id="libgmodule" filter="s60" name="Libg Module">
-        <unit bldFile="glib/build/symbian/gmodule/group"/>
-        <!-- Move to here:         <unit bldFile="glib/libgmodule/group"/> -->
+        <unit bldFile="glib/libgmodule/group"/>
       </component>
       <component id="libgobject" filter="s60" name="Libg Object">
-        <unit bldFile="glib/build/symbian/gobject/group"/>
-        <!-- Move to here:         <unit bldFile="glib/libgobject/group"/> -->
+        <unit bldFile="glib/libgobject/group"/>
       </component>
     </collection>
     <collection id="stdcpp" name="C++ Standard Library" level="translation">
@@ -470,9 +465,6 @@
       <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
         <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
       </component>
-	  <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
-        <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-      </component>
     </collection>
     <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
       <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">