diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
index bcd14c8541..5a3b7e5913 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c
@@ -24,7 +24,6 @@
   @return any return code from GetNextVariableName except EFI_NOT_FOUND
 **/
 SHELL_STATUS
-EFIAPI
 PrintAllShellAlias(
   VOID
   )
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
index 619cdd38a7..5940a1e67e 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c
@@ -37,7 +37,6 @@
    @retval EFI_SUCCESS        the operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 LexicalInsertIntoList(
   IN OUT   CHAR16 **DestList, 
   IN OUT   UINTN  *DestSize,
@@ -116,7 +115,6 @@ LexicalInsertIntoList(
    @retval EFI_SUCCESS        the operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 CopyListOfCommandNames(
   IN OUT   CHAR16       **DestList, 
   IN OUT   UINTN        *DestSize,
@@ -147,7 +145,6 @@ CopyListOfCommandNames(
 **/
 STATIC
 EFI_STATUS
-EFIAPI
 CopyListOfCommandNamesWithDynamic(
   IN OUT  CHAR16** DestList, 
   IN OUT  UINTN    *DestSize
@@ -205,7 +202,6 @@ CopyListOfCommandNamesWithDynamic(
   @retval EFI_DEVICE_ERROR        The help data format was incorrect.
 **/
 EFI_STATUS
-EFIAPI
 PrintDynamicCommandHelp(
   IN CONST CHAR16  *CommandToGetHelpOn,
   IN CONST CHAR16  *SectionToGetHelpOn,
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
index 88c5d750e0..639346fb31 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Touch.c
@@ -26,7 +26,6 @@
   @retval EFI_SUCCESS       The operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 TouchFileByHandle (
   IN EFI_HANDLE Handle
   )
@@ -65,7 +64,6 @@ TouchFileByHandle (
   @retval EFI_SUCCESS           The operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 DoTouchByHandle (
   IN CONST CHAR16       *Name,
   IN       CHAR16       *FS,
diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
index ccd1199bd1..50d18e45aa 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Type.c
@@ -30,7 +30,6 @@
   @retval EFI_SUCCESS           The operation was successful.
 **/
 EFI_STATUS
-EFIAPI
 TypeFileByHandle (
   IN SHELL_FILE_HANDLE Handle,
   IN BOOLEAN Ascii,