diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 979693a250..09f2c563de 100755
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1333,7 +1333,6 @@ DEV_PATH_CONSIST_MAPPING_TABLE  DevPathConsistMappingTable[] = {
   @retval FALSE   The node is not Hi.
 **/
 BOOLEAN
-EFIAPI
 IsHIDevicePathNode (
   IN EFI_DEVICE_PATH_PROTOCOL *DevicePathNode
   )
@@ -1370,7 +1369,6 @@ IsHIDevicePathNode (
   @return   the device path portion that is Hi.
 **/
 EFI_DEVICE_PATH_PROTOCOL *
-EFIAPI
 GetHIDevicePath (
   IN EFI_DEVICE_PATH_PROTOCOL        *DevicePath
   )
@@ -1425,7 +1423,6 @@ GetHIDevicePath (
   @return EFI_SUCCESS         Always returns success.
 **/
 EFI_STATUS
-EFIAPI
 GetDeviceConsistMappingInfo (
   IN DEVICE_CONSIST_MAPPING_INFO    *MappingItem,
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index b65676b5a6..139176816a 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -128,7 +128,6 @@ ShellCommandLibConstructor (
   @param[in] List     The list to free.
 **/
 VOID
-EFIAPI
 FreeFileHandleList (
   IN BUFFER_LIST *List
   )
@@ -244,7 +243,6 @@ ShellCommandLibDestructor (
   @retval NULL          no dynamic command protocol instance found for name
 **/
 CONST EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL *
-EFIAPI
 ShellCommandFindDynamicCommand (
   IN CONST CHAR16 *CommandString
   )
@@ -293,7 +291,6 @@ ShellCommandFindDynamicCommand (
   @param[in] CommandString        The command string to check for on the list.
 **/
 BOOLEAN
-EFIAPI
 ShellCommandDynamicCommandExists (
   IN CONST CHAR16 *CommandString
   )
@@ -307,7 +304,6 @@ ShellCommandDynamicCommandExists (
   @param[in] CommandString        The command string to check for on the list.
 **/
 BOOLEAN
-EFIAPI
 ShellCommandIsCommandOnInternalList(
   IN CONST  CHAR16 *CommandString
   )
@@ -365,7 +361,6 @@ ShellCommandIsCommandOnList(
   @return       String of help text. Caller required to free.
 **/
 CHAR16*
-EFIAPI
 ShellCommandGetDynamicCommandHelp(
   IN CONST  CHAR16                      *CommandString
   )
@@ -392,7 +387,6 @@ ShellCommandGetDynamicCommandHelp(
   @return       String of help text. Caller reuiqred to free.
 **/
 CHAR16*
-EFIAPI
 ShellCommandGetInternalCommandHelp(
   IN CONST  CHAR16                      *CommandString
   )