--- 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