7 files changed, 7 insertions, 29 deletions
diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
index e690e2e7f3..f873fdaf6c 100644
--- a/ShellPkg/Application/Shell/Shell.inf
+++ b/ShellPkg/Application/Shell/Shell.inf
@@ -84,7 +84,6 @@
 #  gEfiShellEnvironment2Guid                               # SOMETIMES_PRODUCED
 #  gEfiShellInterfaceGuid                                  # SOMETIMES_PRODUCED
 
-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED
   gEfiSimpleTextInputExProtocolGuid                       # ALWAYS_CONSUMED
   gEfiSimpleTextInProtocolGuid                            # ALWAYS_CONSUMED
   gEfiSimpleTextOutProtocolGuid                           # ALWAYS_CONSUMED
diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
index 778c36e0d5..4839b9fd97 100644
--- a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -36,11 +36,4 @@
 
 [LibraryClasses]
   ShellCEntryLib
-  UefiLib
-
-[Guids]
-
-[Protocols]
-
-
-[Pcd]
+  UefiLib
+\ No newline at end of file
diff --git a/ShellPkg/Application/ShellExecTestApp/SA.inf b/ShellPkg/Application/ShellExecTestApp/SA.inf
index a6291fa3dd..86e3f7b197 100644
--- a/ShellPkg/Application/ShellExecTestApp/SA.inf
+++ b/ShellPkg/Application/ShellExecTestApp/SA.inf
@@ -39,12 +39,3 @@
   UefiApplicationEntryPoint
   UefiLib
 
-[Guids]
-
-[Ppis]
-
-[Protocols]
-
-[FeaturePcd]
-
-[Pcd]
diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
index b88e77deca..ab13244215 100644
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
@@ -39,9 +39,3 @@
   UefiLib
   SortLib
 
-[Guids]
-
-[Protocols]
-
-
-[Pcd]
diff --git a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
index fd6af93ce4..3d2b259819 100644
--- a/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
+++ b/ShellPkg/Library/BaseSortLib/BaseSortLib.inf
@@ -38,8 +38,4 @@
   BaseMemoryLib
   DebugLib
 
-[Protocols]
 
-[Guids]
-
-[Pcd.common]
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 56565ff8da..dab32951d2 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -84,7 +84,6 @@
   gEfiDiskIoProtocolGuid
   gEfiBlockIoProtocolGuid
   gEfiUnicodeCollationProtocolGuid
-  gEfiUnicodeCollation2ProtocolGuid
   gEfiPciRootBridgeIoProtocolGuid
   gEfiPciIoProtocolGuid
   gEfiScsiPassThruProtocolGuid
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index ae600a4743..d4058905ff 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -42,12 +42,18 @@
   DmpStore.c
   Dblk.c
   SmbiosView/EventLogInfo.c
+  SmbiosView/EventLogInfo.h
   SmbiosView/PrintInfo.c
   SmbiosView/QueryTable.c
   SmbiosView/SmbiosView.c
   SmbiosView/Smbios.c
   SmbiosView/SmbiosViewStrings.uni
   SmbiosView/LibSmbiosView.c
+  SmbiosView/PrintInfo.h
+  SmbiosView/LibSmbiosView.h
+  SmbiosView/LibSmbios.h
+  SmbiosView/QueryTable.h
+  SmbiosView/smbiosview.h
   UefiShellDebug1CommandsLib.c
   UefiShellDebug1CommandsLib.h
   UefiShellDebug1CommandsLib.uni