--- a/bug235.pkgdef.xml	Fri Sep 03 12:59:30 2010 +0300
+++ b/bug235.pkgdef.xml	Tue Sep 21 19:06:30 2010 +0100
@@ -91,6 +91,11 @@
 <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="os/deviceplatformrelease/foundation_system/system_model/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
 </component>
 </collection>
+<collection name="windowing" long-name="Windowing">
+<component name="windowserver" long-name="Window Server">
+<unit bldFile="windowing/windowserver/group" mrp=""/>
+</component>
+</collection>
 </block>
 </layer>
 </systemModel>

--- a/windowing/windowserver/group/openwfc/WServ_nga.MMP	Fri Sep 03 12:59:30 2010 +0300
+++ b/windowing/windowserver/group/openwfc/WServ_nga.MMP	Tue Sep 21 19:06:30 2010 +0100
@@ -22,6 +22,8 @@
 TARGET            wserv_nga.exe
 TARGETTYPE        exe
 
+OS_LAYER_SYSTEMINCLUDE
+
 EPOCSTACKSIZE	  0x4000
 // 6Mb max heap for Winscw builds (default 1Mb used for target builds)
 

--- a/windowing/windowserver/minigui/group/bld.inf	Fri Sep 03 12:59:30 2010 +0300
+++ b/windowing/windowserver/minigui/group/bld.inf	Tue Sep 21 19:06:30 2010 +0100
@@ -22,4 +22,5 @@
 wsini_minigui.ini				z:/
 minigui-stripped.oby            /epoc32/rom/include/minigui-stripped.oby
 minigui_syborg.oby              /epoc32/rom/include/minigui_syborg.oby
+minigui_simulator.oby			 /epoc32/rom/include/minigui_simulator.oby
 wsini_minigui-stripped.ini		z:/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/windowing/windowserver/minigui/group/minigui_simulator.oby	Tue Sep 21 19:06:30 2010 +0100
@@ -0,0 +1,112 @@
+/*
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+* iwanj@users.sourceforge.net - modified to make it work for Symbian^3.
+* MattD <mattd@symbian.org> - renamed file and target to minigui-stripped so we can have both present and build seperate roms. 
+*
+* Description:
+* This OBY File is used to build miniGUI ROM Images for the configuration
+* which uses the IP Free graphics stack; a hybrid of platsim derived drivers
+* the QEMU baseport, and native PC host drivers.
+*/
+ 
+#ifndef __MINIGUI_SIMULATOR_OBY__
+#define __MINIGUI_SIMULATOR_OBY__
+ 
+define OBEYFILE minigui_simulator
+define ROMDATE	##TODAY##
+ 
+#define _ARMV5
+#define SYMBIAN_BASE_USE_GCE
+#define SYMBIAN_EXCLUDE_SCDV
+#define USE_CUSTOM_MMC_PARTITION
+
+// Kernel
+//
+#include <header.iby>
+#include <base.iby>
+ 
+// NGA stack
+//
+#define SYMBIAN_GRAPHICS_USE_GCE
+#define SYMBIAN_GRAPHICS_USE_OPENWF
+#define OPENWFCLIB_DRV <openwfc_ref.iby>
+#define EGL_DRV <guestegl.iby>
+#include <guestopenvg.iby>
+#include <guestopengles11.iby>
+#include <guestvideodriver.iby>
+#include <vghwutils.iby>
+ 
+#include <gdi.iby>
+#include <bitgdi.iby>
+#include <fntstore.iby>
+#include <fbserv.iby>
+#include <iculayoutengine.iby>
+#include <freetype.iby>
+#include <directgdi.iby>
+#include <wserv.iby>
+#include <wslog.iby>
+#include <econs_wserv.iby>
+#include <surfaceupdate.iby>
+#include <surfacemanager.iby>
+file=\epoc32\release\ARMV5\urel\_generic_scdv.dll	sys\bin\scdv.dll
+ 
+data=DATAZ_\wsini_minigui.ini	\system\data\wsini.ini
+ 
+// miniGUI shell
+//
+#include <eshell.iby>
+ 
+// And the hell breaks loose :)
+// Let's just add bare minimum items enough to get graphics stack up and running
+// wserv wants ecom
+// libwfc wants openenv
+// freetype wants stdlib
+// openenv backend wants esock etc etc
+//
+#include <bafl.iby>
+#include <ecom.iby>
+#include <store.iby>
+#include <stdlib.iby>
+#include <openenv.iby>
+ 
+#include <c32.iby>
+#include <ecuart.iby>
+#include <irda.iby>
+#include <bluetooth.iby>
+#include <inetprotutil.iby>
+#include <network.iby>	
+#include <dial.iby>
+#include <crypto.iby>
+#include <certman.iby>
+#include <logeng.iby>
+#include <filetokens.iby>
+#include <asnpkcs.iby>
+#include <emime.iby>
+#include <scs.iby>
+#include <cflog.iby>
+
+file=\epoc32\release\ARMV5\urel\abclient.dll 				sys\bin\abclient.dll
+file=\epoc32\release\ARMV5\urel\Http.dll 					sys\bin\http.dll
+file=\epoc32\release\ARMV5\urel\Httputils.dll 				sys\bin\httputils.dll
+file=\epoc32\release\ARMV5\urel\securitymanager.dll 		sys\bin\securitymanager.dll
+file=\epoc32\release\ARMV5\urel\ocspsupportclient.dll 		sys\bin\ocspsupportclient.dll
+file=\epoc32\release\ARMV5\urel\siscontroller.dll 			sys\bin\siscontroller.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportclient.dll	sys\bin\devinfosupportclient.dll 
+file=\epoc32\release\ARMV5\urel\uissclient.dll 				sys\bin\uissclient.dll
+file=\epoc32\release\ARMV5\urel\devinfosupportcommon.dll 	sys\bin\devinfosupportcommon.dll
+file=\epoc32\release\ARMV5\urel\ipcstream.dll 				sys\bin\ipcstream.dll
+
+// cenrep file for timezone server database
+data=\epoc32\data\z\private\10202be9\1020383e.txt		private\10202be9\1020383e.txt
+
+#endif /* __MINIGUI_SIMULATOR_OBY__ */

--- a/windowing/windowserver/nga/SERVER/openwfc/screen.cpp	Fri Sep 03 12:59:30 2010 +0300
+++ b/windowing/windowserver/nga/SERVER/openwfc/screen.cpp	Tue Sep 21 19:06:30 2010 +0100
@@ -16,6 +16,7 @@
 #include "screen.h"
 
 #include <hal.h>
+#include <hal_data.h>
 #include <graphics/wsscreendevice.h>
 #include <graphics/wsscene.h>
 #include <graphics/wselement.h>