--- a/egl/eglrefimpl/group/eglref.mmp	Fri Sep 17 09:40:01 2010 +0100
+++ b/egl/eglrefimpl/group/eglref.mmp	Fri Sep 17 15:45:33 2010 +0100
@@ -51,7 +51,9 @@
 library         libstdcpp.lib      	// standard lib
 library         libc.lib      		// standard lib
 library         libm.lib      		// standard lib
+#ifdef WINSCW
 library         edllstub.lib 
+#endif
 library         sflibopenvgrefimpl.lib        
 
 #ifdef WINS

--- a/egl/eglrefimpl/src/session.cpp	Fri Sep 17 09:40:01 2010 +0100
+++ b/egl/eglrefimpl/src/session.cpp	Fri Sep 17 15:45:33 2010 +0100
@@ -15,8 +15,14 @@
 #include <e32debug.h>
 #include "eglprivate.h"
 
+/*
+ * For the moment, we are not actually using the major and minor number
+ * programatically.  Enable this code once its actually used.
+ */
+#if EGL_MAJOR_MINOR_NUMBER_USED
 const TInt KEglMajorVersion = 1;
 const TInt KEglMinorVersion = 4;
+#endif
 
 #define KEglClientApis  ""
 #define KEglVendor      "Nokia"