--- a/build/common/common.mmh	Wed Jul 28 16:41:19 2010 +0100
+++ b/build/common/common.mmh	Wed Jul 28 18:30:18 2010 +0100
@@ -156,9 +156,6 @@
 // extrabtrace
 //
 
-#ifdef FSHELL_CAP_ALL
-#define FSHELL_EXTRABTRACE_SUPPORT
-#endif
 
 #if !defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_BTRACE_SUPPORT)
 // FSHELL_TRACE_SUPPORT tells you that the BTraceX() functions are available, either via atrace or btrace,
@@ -166,6 +163,10 @@
 #define FSHELL_TRACE_SUPPORT
 #endif
 
+#if defined(FSHELL_TRACE_SUPPORT) && defined(FSHELL_CAP_ALL)
+#define FSHELL_EXTRABTRACE_SUPPORT
+#endif
+
 // The FSHELL_TRACE_xyz macros must appear before any other systeminclude/#include/library statements in your MMP.
 #ifndef FSHELL_TRACE_LIBRARY
 #define FSHELL_D32BTRACE_HEADER <d32btrace.h>

--- a/build/s60/platform_generic.mmh	Wed Jul 28 16:41:19 2010 +0100
+++ b/build/s60/platform_generic.mmh	Wed Jul 28 18:30:18 2010 +0100
@@ -31,6 +31,4 @@
 #define SYMBIAN_JAVA_NOT_INCLUDED
 #endif
 
-#define FSHELL_TESTEXECUTE_SUPPORT
-
 #endif // FSHELL_PLATFORM_GENERIC_MMH

--- a/build/s60/tb92/platform.mmh	Wed Jul 28 16:41:19 2010 +0100
+++ b/build/s60/tb92/platform.mmh	Wed Jul 28 18:30:18 2010 +0100
@@ -28,4 +28,6 @@
 #define FSHELL_ARM11XX_SUPPORT
 #define FSHELL_DYNAMICSTARTUP_SUPPORT
 
+#define FSHELL_TESTEXECUTE_SUPPORT
+
 #endif // FSHELL_PLATFORM_MMH

--- a/commands/group/bld.inf	Wed Jul 28 16:41:19 2010 +0100
+++ b/commands/group/bld.inf	Wed Jul 28 18:30:18 2010 +0100
@@ -448,7 +448,7 @@
 
 #ifdef FSHELL_TESTEXECUTE_SUPPORT
 PRJ_EXPORTS
-..\testexecute\testexecute.mmp
+..\testexecute\testexecute.cif           z:\resource\cif\fshell\testexecute.cif
 PRJ_MMPFILES
-..\testexecute\testexecute.cif           z:\resource\cif\fshell\testexecute.cif
+..\testexecute\testexecute.mmp
 #endif

--- a/documentation/pod-list.txt	Wed Jul 28 16:41:19 2010 +0100
+++ b/documentation/pod-list.txt	Wed Jul 28 18:30:18 2010 +0100
@@ -1,4 +1,5 @@
-#include <fshell/common.mmh>
+//TODO the cpp -I option isn't working so includes are out for the moment... We no longer actually use common.mmh anyway
+//#include <fshell/common.mmh>
 
 doc-root    \epoc32\documentation
 temp-root   \epoc32\build\documentation

--- a/libraries/btrace_parser/group/bld.inf	Wed Jul 28 16:41:19 2010 +0100
+++ b/libraries/btrace_parser/group/bld.inf	Wed Jul 28 18:30:18 2010 +0100
@@ -17,6 +17,8 @@
 
 FSHELL_ROM_INCLUDE(btrace_parser.iby)
 
+#ifdef FSHELL_TRACE_SUPPORT
+
 ..\inc\btrace_parser.h          fshell/btrace_parser.h
 ..\inc\btrace_parser_defs.h     fshell/btrace_parser_defs.h
 
@@ -24,3 +26,4 @@
 
 ..\src\btrace_parser.mmp
 
+#endif

--- a/libraries/btrace_parser/group/btrace_parser.iby	Wed Jul 28 16:41:19 2010 +0100
+++ b/libraries/btrace_parser/group/btrace_parser.iby	Wed Jul 28 18:30:18 2010 +0100
@@ -12,6 +12,8 @@
 #ifndef BTRACE_PARSER_IBY
 #define BTRACE_PARSER_IBY
 
+#ifdef FSHELL_TRACE_SUPPORT
 FSHELL_EXECUTABLE_FILE(btrace_parser.dll)
+#endif
 
 #endif // BTRACE_PARSER_IBY

--- a/libraries/extrabtrace/group/bld.inf	Wed Jul 28 16:41:19 2010 +0100
+++ b/libraries/extrabtrace/group/bld.inf	Wed Jul 28 18:30:18 2010 +0100
@@ -17,6 +17,8 @@
 
 FSHELL_ROM_INCLUDE(extrabtrace.iby)
 
+#ifdef FSHELL_EXTRABTRACE_SUPPORT
+
 ..\inc\extrabtrace.h					\epoc32\include\fshell\extrabtrace.h
 ..\inc\extrabtracek.h					\epoc32\include\fshell\extrabtracek.h
 
@@ -24,3 +26,5 @@
 
 extrabtrace.mmp
 extrabtracek.mmp
+
+#endif

--- a/libraries/extrabtrace/group/extrabtrace.iby	Wed Jul 28 16:41:19 2010 +0100
+++ b/libraries/extrabtrace/group/extrabtrace.iby	Wed Jul 28 18:30:18 2010 +0100
@@ -14,7 +14,11 @@
 
 #include <fsh_config.iby>
 
+#ifdef FSHELL_TRACE_SUPPORT
+
 FSHELL_EXECUTABLE_FILE(extrabtrace.dll)
 FSHELL_KERNEL_EXTENSION(extrabtracek.ldd)
 
+#endif
+
 #endif // EXTRABTRACE_IBY

--- a/libraries/spcre/libpcre/group/libpcre.mmp	Wed Jul 28 16:41:19 2010 +0100
+++ b/libraries/spcre/libpcre/group/libpcre.mmp	Wed Jul 28 18:30:18 2010 +0100
@@ -67,4 +67,4 @@
 // Warning:  #546-D: transfer of control bypasses initialization of:
 // Warning:  #1134-D: literal treated as "long long"
 // Warning: C2874W: othercase may be used before being set
-option ARMCC --diag-supress 1134,2874,546
+option ARMCC --diag_suppress 1134,2874,546

--- a/tools/fsh-builddocs	Wed Jul 28 16:41:19 2010 +0100
+++ b/tools/fsh-builddocs	Wed Jul 28 18:30:18 2010 +0100
@@ -104,7 +104,7 @@
   my $spec;
 
   my $currentDir;
-  my $currentFile;
+  my $currentFile = $podListFileName;
   my $currentLine = 0;
   while (my $line = <CPP>) {
     ++$currentLine;