--- a/symbian3/split/sysdefs/system_model_os.xml	Fri Dec 18 11:02:33 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Tue Dec 22 16:31:19 2009 +0000
@@ -1508,7 +1508,8 @@
 </collection>
 <collection name="KhronosReferenceImplementation" long-name="Khronos Reference Implementation" level="device-interface" >
 <component name="sfopenvg" long-name="sfopenvg" purpose="optional" origin-model="foundation">
-<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group" />
+<!-- MattD - Moved KhronosRI into S60 model, as it depends on stdlib which isn't here in the GT part of the build -->
+<!--<unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group" /> -->
 </component>
 </collection>
 <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">

--- a/symbian3/split/sysdefs/system_model_s60.xml	Fri Dec 18 11:02:33 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_s60.xml	Tue Dec 22 16:31:19 2009 +0000
@@ -155,7 +155,7 @@
 <module name="sf_openvg11">
 			<component name="sf_openvg11">
 				<unit unitID="symbian.openvg11" name="sf_openvg11" bldFile="\sf\os\graphics\openvg\openvginterface\group\openvg11" mrp="" filter="sf_build"/>
-				<unit unitID="symbian.openvg11_tigerapp" name="sf_openvg11_tigerapp" bldFile="\sf\os\graphics\openvg\openvgrefimplementation\sfopenvg\test\group" mrp="" filter="sf_build"/>
+				<unit unitID="symbian.openvg11_KhronosRI" name="sf_openvg11_KhronosRI" bldFile="\sf\os\graphics\openvg\openvgrefimplementation\sfopenvg\group" mrp="" filter="sf_build"/>
 			</component>
 		</module></layer>
 	<layer name="bldfirst_mw_layer">