ShellPkg: Clean up header file usage.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13939 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c
index 314fbbcb5a9c06f7332794ebcdc1699bd4437c3b..9fd971a655fab89c05e81191f44b9672ed19fd2f 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleLogger.c
+++ b/ShellPkg/Application/Shell/ConsoleLogger.c
@@ -11,7 +11,6 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 **/\r
 \r
-#include "ConsoleLogger.h"\r
 #include "Shell.h"\r
 \r
 STATIC CONST CHAR16                     mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r

diff --git a/ShellPkg/Application/Shell/ConsoleLogger.h b/ShellPkg/Application/Shell/ConsoleLogger.h
index c470cdb7abfd249bed85081033deb98e038c3cd9..b076f77473721525a8aaaa7a657e2da0b128b943 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleLogger.h
+++ b/ShellPkg/Application/Shell/ConsoleLogger.h
@@ -14,19 +14,7 @@
 #ifndef _CONSOLE_LOGGER_HEADER_
 #define _CONSOLE_LOGGER_HEADER_
 
-#include <Uefi.h>
-
-#include <Protocol/SimpleTextOut.h>
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
-
-#include <Library/DebugLib.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/HiiLib.h>
-#include <Library/ShellLib.h>
+#include "Shell.h"
 
 #define CONSOLE_LOGGER_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('c', 'o', 'P', 'D')
 

diff --git a/ShellPkg/Application/Shell/ConsoleWrappers.c b/ShellPkg/Application/Shell/ConsoleWrappers.c
index 561a666473dbcd8cf80dc93b9db0f64a4198febf..d85d1acf4d713e937d897ea53cc5bc0f33e14f9c 100644 (file)
--- a/ShellPkg/Application/Shell/ConsoleWrappers.c
+++ b/ShellPkg/Application/Shell/ConsoleWrappers.c
@@ -12,10 +12,6 @@
 \r
 **/\r
 \r
-#include <Uefi.h>\r
-#include <ShellBase.h>\r
-\r
-#include "ConsoleWrappers.h"\r
 #include "Shell.h"\r
 \r
 typedef struct {\r

diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h
index cf12e78a5d20a7c97de258f34d19fa4ab23551a3..da98fc1a56d0e4efb48c93235f4c163165efb876 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.h
+++ b/ShellPkg/Application/Shell/Shell.h
@@ -19,6 +19,7 @@
 #include <ShellBase.h>\r
 \r
 #include <Guid/ShellVariableGuid.h>\r
+#include <Guid/ShellAliasGuid.h>\r
 \r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/SimpleTextOut.h>\r
@@ -45,6 +46,7 @@
 #include <Library/PrintLib.h>\r
 #include <Library/HandleParsingLib.h>\r
 #include <Library/PathLib.h>\r
+#include <Library/FileHandleLib.h>\r
 \r
 #include "ShellParametersProtocol.h"\r
 #include "ShellProtocol.h"\r
@@ -52,6 +54,7 @@
 #include "ConsoleLogger.h"\r
 #include "ShellManParser.h"\r
 #include "ConsoleWrappers.h"\r
+#include "FileHandleWrappers.h"\r
 \r
 typedef struct {\r
   LIST_ENTRY        Link;           ///< Standard linked list handler.\r

diff --git a/ShellPkg/Application/Shell/ShellEnvVar.c b/ShellPkg/Application/Shell/ShellEnvVar.c
index 6634c6951a165e3b29dd21b3895f88473c4a6931..f40a867cc7ae564a6f4e607e36e4ed56205fab5f 100644 (file)
--- a/ShellPkg/Application/Shell/ShellEnvVar.c
+++ b/ShellPkg/Application/Shell/ShellEnvVar.c
@@ -12,18 +12,7 @@
 \r
 **/\r
 \r
-#include <Uefi.h>\r
-#include <ShellBase.h>\r
-\r
-#include <Guid/ShellVariableGuid.h>\r
-\r
-#include <Library/BaseLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-#include "ShellEnvVar.h"\r
+#include "Shell.h"\r
 \r
 /**\r
   Reports whether an environment variable is Volatile or Non-Volatile.\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c
index 9ce7e92605fbf7f469271212269bd16f86629fae..a01a5c6a71581bfecf88f834b13d16b63caf9d8a 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.c
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c
@@ -13,8 +13,7 @@
 \r
 **/\r
 \r
-#include "ShellParametersProtocol.h"\r
-#include "ConsoleWrappers.h"\r
+#include "Shell.h"\r
 \r
 /**\r
   return the next parameter from a command line string;\r

diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h
index 1853f8c0f4b6335fced87b3e113b83dcd24229b8..e2d28816d2c7c738330c0374c818c99113537145 100644 (file)
--- a/ShellPkg/Application/Shell/ShellParametersProtocol.h
+++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h
@@ -16,26 +16,6 @@
 #ifndef _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_\r
 #define _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_\r
 \r
-#include <Uefi.h>\r
-\r
-#include <Protocol/SimpleFileSystem.h>\r
-#include <Protocol/EfiShellParameters.h>\r
-#include <Protocol/LoadedImage.h>\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Protocol/SimpleTextIn.h>\r
-\r
-#include <Guid/ShellVariableGuid.h>\r
-\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/ShellLib.h>\r
-#include <Library/FileHandleLib.h>\r
-\r
-#include "ShellEnvVar.h"\r
-#include "FileHandleWrappers.h"\r
 #include "Shell.h"\r
 \r
 /**\r

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 79ac79290dceb9f49760ebc1188ff6af543aa974..68d4fb4d923623f0df6370f43355ad07f2ca0407 100644 (file)
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -14,7 +14,6 @@
 **/\r
 \r
 #include "Shell.h"\r
-#include <Library/FileHandleLib.h>\r
 \r
 /**\r
   Close an open file handle.\r

diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h
index a63ae8fc83c29eb072e858c85ce581925382e0c0..456aa2aff3f1f0f334dc09ffc3470bc53577466f 100644 (file)
--- a/ShellPkg/Application/Shell/ShellProtocol.h
+++ b/ShellPkg/Application/Shell/ShellProtocol.h
@@ -16,40 +16,7 @@
 #ifndef _SHELL_PROTOCOL_HEADER_\r
 #define _SHELL_PROTOCOL_HEADER_\r
 \r
-#include <Uefi.h>\r
-#include <ShellBase.h>\r
-\r
-#include <Guid/ShellVariableGuid.h>\r
-#include <Guid/ShellMapGuid.h>\r
-#include <Guid/ShellAliasGuid.h>\r
-\r
-#include <Protocol/EfiShell.h>\r
-#include <Protocol/EfiShellParameters.h>\r
-#include <Protocol/SimpleFileSystem.h>\r
-#include <Protocol/DevicePathToText.h>\r
-#include <Protocol/ComponentName2.h>\r
-#include <Protocol/LoadedImage.h>\r
-#include <Protocol/UnicodeCollation.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/SimpleTextInEx.h>\r
-\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/ShellCommandLib.h>\r
-#include <Library/PrintLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/SortLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/ShellLib.h>\r
-\r
-#include "FileHandleWrappers.h"\r
-#include "ShellEnvVar.h"\r
-#include "ShellManParser.h"\r
+#include "Shell.h"\r
 \r
 typedef struct {\r
   LIST_ENTRY                Link;\r