--- a/egl/sfopenvg/riMiniEGL.cpp	Wed May 19 14:34:22 2010 +0100
+++ b/egl/sfopenvg/riMiniEGL.cpp	Mon Jun 07 09:25:55 2010 +0100
@@ -36,7 +36,7 @@
  * \todo	OSDeinitMutex should be called in case getEGL fails.
  *//*-------------------------------------------------------------------*/
 
-#include "riMiniEGL.h"
+//#include "riMiniEGL.h"
 #include "eglprivate.h"
 #include "riMath.h"
 #include <e32debug.h>
@@ -443,7 +443,6 @@
 		}
 	}
 	*/
-	RDebug::Printf("I am in releaseEGL ");
 	CEglThreadSession* es = reinterpret_cast<CEglThreadSession*>(Dll::Tls());
 	if (es)
 		{

--- a/graphicsdeviceinterface/directgdiadaptation/group/directgdiadapter_vg.mmp	Wed May 19 14:34:22 2010 +0100
+++ b/graphicsdeviceinterface/directgdiadaptation/group/directgdiadapter_vg.mmp	Mon Jun 07 09:25:55 2010 +0100
@@ -56,10 +56,8 @@
 LIBRARY			euser.lib
 LIBRARY			estor.lib
 LIBRARY			gdi.lib
-//LIBRARY			libOpenVG.lib
-//LIBRARY			libOpenVGU.lib
-LIBRARY         libopenvg_sw.lib 
-LIBRARY         libopenvgu_sw.lib 
+LIBRARY			libOpenVG.lib
+LIBRARY			libOpenVGU.lib
 LIBRARY			libEGL.lib
 LIBRARY			fbscli.lib