diff -r 48b924ae7197 -r 9a3b8b65fc7a windowing/windowserver/group/wserv.iby
--- a/windowing/windowserver/group/wserv.iby	Thu May 06 11:31:11 2010 +0100
+++ b/windowing/windowserver/group/wserv.iby	Thu May 06 14:32:51 2010 +0100
@@ -24,9 +24,13 @@
 file=ABI_DIR\BUILD_DIR\ws32_nga.dll 	System\Libs\Ws32.dll
 file=ABI_DIR\BUILD_DIR\remotegc_nga.dll	System\Libs\remotegc.dll 
 file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll
-#ifndef SYMBIAN_GRAPHICS_USE_OPENWF 
+
+#if defined(SYMBIAN_GRAPHICS_USE_OPENWF) && !defined(SYMBIAN_GRAPHICS_USE_OPENWF_MIGRATION)
+REM Pure OpenWF implementation, so skipping proprietary compositor
+#else
 #include <gce.iby>
 #endif
+
 #include <wserv_std_plugins.iby>
 //wserv calls eglReleaseThread() on exit
 #include <egl.iby>