--- a/build/common/common.mmh	Thu Oct 28 21:02:49 2010 +0100
+++ b/build/common/common.mmh	Tue Nov 02 20:41:36 2010 +0000
@@ -55,6 +55,12 @@
 #ifndef FSHELL_NO_WSERV2_SUPPORT
 #define    FSHELL_WSERV2_SUPPORT
 #endif
+#if !defined(FSHELL_NO_GUI_SUPPORT) && defined(FSHELL_WSERV_SUPPORT)
+#define    FSHELL_GUI_SUPPORT
+#endif
+#if !defined(FSHELL_NO_ICL_SUPPORT)
+#define FSHELL_ICL_SUPPORT
+#endif
 #ifndef FSHELL_NO_RAMDEFRAG_SUPPORT
 #define    FSHELL_RAMDEFRAG_SUPPORT
 #endif
@@ -203,7 +209,7 @@
 // fshell.
 //
 
-#if defined(FSHELL_WSERV_SUPPORT) && defined(FSHELL_CAP_READUSERDATA) // Close enough
+#if defined(FSHELL_WSERV_SUPPORT) && defined(FSHELL_CAP_READUSERDATA) && !defined(FSHELL_CORE_NO_SUPPORT_SWI) // Close enough
 #define FSHELL_CORE_SUPPORT_SWI
 #endif
 
@@ -284,11 +290,22 @@
 #endif
 
 #ifdef FSHELL_WSERV_SUPPORT
-#define FSHELL_CORE_SUPPORT_GRABSCREEN
 #define FSHELL_CORE_SUPPORT_FOCUS
+#define FSHELL_CORE_SUPPORT_WSLOG
+#define FSHELL_CORE_SUPPORT_TFINFO
+#endif
+
+#ifdef FSHELL_GUI_SUPPORT
 #define FSHELL_CORE_SUPPORT_SWITCHVIEW
 #define FSHELL_CORE_SUPPORT_ACTIVEVIEW
-#define FSHELL_CORE_SUPPORT_WSLOG
+#endif
+
+#ifdef FSHELL_ICL_SUPPORT
+#define FSHELL_CORE_SUPPORT_GENBMP
+#endif
+
+#if defined(FSHELL_WSERV_SUPPORT) && defined(FSHELL_ICL_SUPPORT)
+#define FSHELL_CORE_SUPPORT_GRABSCREEN
 #endif
 
 #ifdef FSHELL_AUDIO_SUPPORT
@@ -330,11 +347,6 @@
 #define FSHELL_CORE_SUPPORT_ICC
 #endif
 
-#ifdef FSHELL_WSERV_SUPPORT
-#define FSHELL_CORE_SUPPORT_GENBMP
-#define FSHELL_CORE_SUPPORT_TFINFO
-#endif
-
 #if defined(FSHELL_TELEPHONY_SUPPORT) && defined(FSHELL_CAP_READDEVICEDATA)
 #define FSHELL_CORE_SUPPORT_NITZ
 #endif

--- a/build/sf/fshell_platform.iby	Thu Oct 28 21:02:49 2010 +0100
+++ b/build/sf/fshell_platform.iby	Tue Nov 02 20:41:36 2010 +0000
@@ -25,3 +25,7 @@
 
 #endif // FSHELL_PLATFORM_IBY
 
+// Workaround for QEMU bug
+#if defined(FSHELL_ROMBUILD) && defined(FSHELL_BTRACE_SUPPORT) && defined(__BASE_SYBORG_IBY__)
+#define BTRACE_INCLUDED
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/sf/minigui/bld.inf	Tue Nov 02 20:41:36 2010 +0000
@@ -0,0 +1,22 @@
+// bld.inf
+// 
+// Copyright (c) 2010 Accenture. All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the "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:
+// Accenture - Initial contribution
+//
+
+// The macroing here is a little messy to get things included in the right order...
+#define FSHELL_PLATFORM_SHARED_MMH
+#include "platform.mmh"
+#undef FSHELL_PLATFORM_SHARED_MMH
+#include "../platform_shared.mmh"
+#include "../bld_shared.inf"
+
+PRJ_EXPORTS
+.\platform.mmh       \epoc32\include\fshell\platform.mmh
+FSHELL_ROM_INCLUDE2(platform.mmh, fshell\platform.mmh)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/sf/minigui/platform.mmh	Tue Nov 02 20:41:36 2010 +0000
@@ -0,0 +1,36 @@
+// platform.mmh
+// 
+// Copyright (c) 2010 Accenture. All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the "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:
+// Accenture - Initial contribution
+//
+#ifndef FSHELL_PLATFORM_MMH
+#define FSHELL_PLATFORM_MMH
+
+#define FSHELL_PLATFORM_FOUNDATION 3
+
+#ifndef FSHELL_PLATFORM_SHARED_MMH
+#include <fshell/platform_shared.mmh>
+#endif
+
+#define FSHELL_CORE_NO_SUPPORT_SWI
+
+#define FSHELL_NO_COMMS_SUPPORT
+#define FSHELL_NO_TELEPHONY_SUPPORT
+#define FSHELL_NO_APPARC_SUPPORT
+#define FSHELL_NO_EZLIB_SUPPORT
+#define FSHELL_NO_GUI_SUPPORT // FSHELL_WSERV_SUPPORT will be defined
+#define FSHELL_NO_AUDIO_SUPPORT
+#define FSHELL_NO_LBS_SUPPORT
+#define FSHELL_NO_SQL_SUPPORT
+#define FSHELL_NO_PIPS_SUPPORT
+#define FSHELL_NO_SPCRE_SUPPORT
+#define FSHELL_NO_CRYPTO_SUPPORT
+#define FSHELL_NO_ICL_SUPPORT
+
+#endif

--- a/commands/focus/focus.cpp	Thu Oct 28 21:02:49 2010 +0100
+++ b/commands/focus/focus.cpp	Tue Nov 02 20:41:36 2010 +0000
@@ -11,7 +11,10 @@
 //
 
 #include <w32std.h>
+#include <fshell/common.mmh>
+#ifdef FSHELL_APPARC_SUPPORT
 #include <apgwgnam.h>
+#endif
 #include <fshell/ioutils.h>
 
 const TInt KPriorityNeverAtFront = -999;
@@ -113,15 +116,19 @@
 void CCmdFocus::PrintDetailsL()
 	{
 	TInt focusedWgId = iWsSession.GetFocusWindowGroup();
-	CApaWindowGroupName* wgn = CApaWindowGroupName::NewLC(iWsSession, focusedWgId);
+#ifdef FSHELL_APPARC_SUPPORT
 	_LIT(KUnknown, "Un-named");
-	TPtrC caption(wgn->Caption());
-	if (caption.Length() == 0)
+	TPtrC caption(KUnknown);
+	CApaWindowGroupName* wgn = CApaWindowGroupName::NewLC(iWsSession, focusedWgId);
+	if (caption.Length())
 		{
-		caption.Set(KUnknown);
+		caption.Set(wgn->Caption());
 		}
 	Printf(_L("Focused window group: %S\r\n"), &caption);
 	CleanupStack::PopAndDestroy(wgn);
+#else
+	Printf(_L("Focused window group id: %d\r\n"), focusedWgId);
+#endif
 
 	if (iVerbose)
 		{

--- a/commands/focus/focus.mmp	Thu Oct 28 21:02:49 2010 +0100
+++ b/commands/focus/focus.mmp	Tue Nov 02 20:41:36 2010 +0000
@@ -25,5 +25,6 @@
 library         euser.lib
 library         iocli.lib
 library         ws32.lib
+#ifdef FSHELL_APPARC_SUPPORT
 library         apgrfx.lib
-
+#endif

--- a/commands/screenmode/screenmode.cpp	Thu Oct 28 21:02:49 2010 +0100
+++ b/commands/screenmode/screenmode.cpp	Tue Nov 02 20:41:36 2010 +0000
@@ -12,7 +12,8 @@
 
 #include <fshell/common.mmh>
 
-#if defined (FSHELL_PLATFORM_S60) && FSHELL_PLATFORM_S60 >= 5
+#if defined(FSHELL_GUI_SUPPORT) && defined (FSHELL_PLATFORM_S60) && FSHELL_PLATFORM_S60 >= 5
+#define AKNCAP_SUPPORT
 #include <AknCapServerClient.h>	//for screen orientation change
 #endif
 
@@ -209,7 +210,7 @@
 //
 void CCmdScreenMode::DoRotateL()
 	{
-#if defined (FSHELL_PLATFORM_S60) && FSHELL_PLATFORM_S60 >= 5
+#ifdef AKNCAP_SUPPORT
 	TInt err;
 	RAknUiServer akSrv;
 	err = akSrv.Connect();

--- a/core/group/fshell_core.iby	Thu Oct 28 21:02:49 2010 +0100
+++ b/core/group/fshell_core.iby	Tue Nov 02 20:41:36 2010 +0000
@@ -84,7 +84,7 @@
 FSHELL_DATA_FILE(ZSYSTEM\console\scripts\autostart.script, system\console\scripts\autostart.script)
 #if defined(FSHELL_CORE_SUPPORT_SHEBANG)
 patchdata sbrec.dll@KAutoStartFshell 1
-#elif !defined(FSHELL_WSERV_SUPPORT)
+#elif !defined(FSHELL_GUI_SUPPORT)
 // Do it the eshell way
 FSHELL_DATA_FILE(DATAZ_\fshell_autoexec.bat, autoexec.bat)
 #else

--- a/documentation/common_mmh.pod	Thu Oct 28 21:02:49 2010 +0100
+++ b/documentation/common_mmh.pod	Tue Nov 02 20:41:36 2010 +0000
@@ -102,10 +102,18 @@
 
 Graphical windowserver (either version) is present (as opposed to text windowserver).
 
+=item FSHELL_[NO_]GUI_SUPPORT
+
+Gui libraries are available (as opposed to textshell or minigui environment). Assumed unless FSHELL_NO_GUI_SUPPORT or FSHELL_NO_WSERV_SUPPORT is defined.
+
 =item FSHELL_[NO_]WSERV2_SUPPORT
 
 Windowserver v2 is being used. Very few things need to know what windowserver version is in use, but occasionally it is needed.
 
+=item FSHELL_[NO_]ICL_SUPPORT
+
+The image conversion libraries (ICL) are available.
+
 =item FSHELL_[NO_]RAMDEFRAG_SUPPORT
 
 RAM defrag (in form of TRamDefragRequest API) is supported.

--- a/libraries/qr3/group/qr3.mmp	Thu Oct 28 21:02:49 2010 +0100
+++ b/libraries/qr3/group/qr3.mmp	Tue Nov 02 20:41:36 2010 +0000
@@ -38,7 +38,7 @@
 SOURCE			featreglistboxdata.cpp
 SOURCE			hallistboxdata.cpp
 SOURCE			sandbox.cpp
-#ifdef FSHELL_WSERV_SUPPORT
+#if defined(FSHELL_WSERV_SUPPORT) && defined(FSHELL_APPARC_SUPPORT) // Technically could work without apparc support but looks a bit too much effort to split it out
 SOURCE			wglistboxdata.cpp
 #endif
 SOURCE			msgqlistboxdata.cpp mutexlistboxdata.cpp

--- a/libraries/qr3/src/KernLbxModel.cpp	Thu Oct 28 21:02:49 2010 +0100
+++ b/libraries/qr3/src/KernLbxModel.cpp	Tue Nov 02 20:41:36 2010 +0000
@@ -186,7 +186,7 @@
 		data = new(ELeave) CHalListBoxData(this);
 		break;
 	case EListWindowGroups:
-#ifdef FSHELL_WSERV_SUPPORT
+#if defined(FSHELL_WSERV_SUPPORT) && defined(FSHELL_APPARC_SUPPORT)
 		data = new(ELeave) CWindowGroupListBoxData(this);
 #else
 		data = NULL; // Compiler shutter upper

--- a/plugins/consoles/guicons/group/guicons.iby	Thu Oct 28 21:02:49 2010 +0100
+++ b/plugins/consoles/guicons/group/guicons.iby	Tue Nov 02 20:41:36 2010 +0000
@@ -13,7 +13,7 @@
 #ifndef __GUICONS_IBY__
 #define __GUICONS_IBY__
 
-#ifdef FSHELL_WSERV_SUPPORT
+#ifdef FSHELL_GUI_SUPPORT
 
 FSHELL_EXECUTABLE_FILE(guicons.dll)