Index: Application/Shell/ShellParametersProtocol.c
===================================================================
--- Application/Shell/ShellParametersProtocol.c	(revision 15924)
+++ Application/Shell/ShellParametersProtocol.c	(working copy)
@@ -609,7 +609,6 @@
 
   @return  Status code from ShellInfoObject.NewEfiShellProtocol->WriteFile.
 **/
-STATIC
 EFI_STATUS
 WriteFileTag (
   IN SHELL_FILE_HANDLE FileHandle
Index: Application/Shell/ShellProtocol.c
===================================================================
--- Application/Shell/ShellProtocol.c	(revision 15924)
+++ Application/Shell/ShellProtocol.c	(working copy)
@@ -3187,7 +3187,7 @@
   
   @return        The null-terminated string converted into all lowercase.  
 **/
-STATIC CHAR16 *
+CHAR16 *
 ToLower (
   CHAR16 *Str
   )
Index: Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
--- Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(revision 15924)
+++ Library/UefiHandleParsingLib/UefiHandleParsingLib.c	(working copy)
@@ -847,7 +847,6 @@
 @retval EFI_OUT_OF_RESOURCES  A memory allocation failed
 @retval EFI_INVALID_PARAMETER Guid NameId was invalid
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 InsertNewGuidNameMapping(
Index: Library/UefiShellLevel3CommandsLib/Help.c
===================================================================
--- Library/UefiShellLevel3CommandsLib/Help.c	(revision 15924)
+++ Library/UefiShellLevel3CommandsLib/Help.c	(working copy)
@@ -27,7 +27,6 @@
   @retval EFI_SUCCESS             The help was displayed
   @retval FI_NOT_FOUND            The command name could not be found
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 PrintDynamicCommandHelp(