diff options
| -rw-r--r-- | ShellPkg/Application/Shell/ConsoleLogger.c | 1 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ConsoleLogger.h | 14 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ConsoleWrappers.c | 4 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/Shell.h | 3 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ShellEnvVar.c | 13 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ShellParametersProtocol.c | 3 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ShellParametersProtocol.h | 20 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ShellProtocol.c | 1 | ||||
| -rw-r--r-- | ShellPkg/Application/Shell/ShellProtocol.h | 35 |
9 files changed, 7 insertions, 87 deletions
diff --git a/ShellPkg/Application/Shell/ConsoleLogger.c b/ShellPkg/Application/Shell/ConsoleLogger.c index 314fbbcb5a..9fd971a655 100644 --- 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.
**/
-#include "ConsoleLogger.h"
#include "Shell.h"
STATIC CONST CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
diff --git a/ShellPkg/Application/Shell/ConsoleLogger.h b/ShellPkg/Application/Shell/ConsoleLogger.h index c470cdb7ab..b076f77473 100644 --- 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 561a666473..d85d1acf4d 100644 --- a/ShellPkg/Application/Shell/ConsoleWrappers.c +++ b/ShellPkg/Application/Shell/ConsoleWrappers.c @@ -12,10 +12,6 @@ **/
-#include <Uefi.h>
-#include <ShellBase.h>
-
-#include "ConsoleWrappers.h"
#include "Shell.h"
typedef struct {
diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index cf12e78a5d..da98fc1a56 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -19,6 +19,7 @@ #include <ShellBase.h>
#include <Guid/ShellVariableGuid.h>
+#include <Guid/ShellAliasGuid.h>
#include <Protocol/LoadedImage.h>
#include <Protocol/SimpleTextOut.h>
@@ -45,6 +46,7 @@ #include <Library/PrintLib.h>
#include <Library/HandleParsingLib.h>
#include <Library/PathLib.h>
+#include <Library/FileHandleLib.h>
#include "ShellParametersProtocol.h"
#include "ShellProtocol.h"
@@ -52,6 +54,7 @@ #include "ConsoleLogger.h"
#include "ShellManParser.h"
#include "ConsoleWrappers.h"
+#include "FileHandleWrappers.h"
typedef struct {
LIST_ENTRY Link; ///< Standard linked list handler.
diff --git a/ShellPkg/Application/Shell/ShellEnvVar.c b/ShellPkg/Application/Shell/ShellEnvVar.c index 6634c6951a..f40a867cc7 100644 --- a/ShellPkg/Application/Shell/ShellEnvVar.c +++ b/ShellPkg/Application/Shell/ShellEnvVar.c @@ -12,18 +12,7 @@ **/
-#include <Uefi.h>
-#include <ShellBase.h>
-
-#include <Guid/ShellVariableGuid.h>
-
-#include <Library/BaseLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
-
-#include "ShellEnvVar.h"
+#include "Shell.h"
/**
Reports whether an environment variable is Volatile or Non-Volatile.
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.c b/ShellPkg/Application/Shell/ShellParametersProtocol.c index 9ce7e92605..a01a5c6a71 100644 --- a/ShellPkg/Application/Shell/ShellParametersProtocol.c +++ b/ShellPkg/Application/Shell/ShellParametersProtocol.c @@ -13,8 +13,7 @@ **/
-#include "ShellParametersProtocol.h"
-#include "ConsoleWrappers.h"
+#include "Shell.h"
/**
return the next parameter from a command line string;
diff --git a/ShellPkg/Application/Shell/ShellParametersProtocol.h b/ShellPkg/Application/Shell/ShellParametersProtocol.h index 1853f8c0f4..e2d28816d2 100644 --- a/ShellPkg/Application/Shell/ShellParametersProtocol.h +++ b/ShellPkg/Application/Shell/ShellParametersProtocol.h @@ -16,26 +16,6 @@ #ifndef _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_
#define _SHELL_PARAMETERS_PROTOCOL_PROVIDER_HEADER_
-#include <Uefi.h>
-
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/LoadedImage.h>
-#include <Protocol/SimpleTextOut.h>
-#include <Protocol/SimpleTextIn.h>
-
-#include <Guid/ShellVariableGuid.h>
-
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiLib.h>
-#include <Library/DebugLib.h>
-#include <Library/ShellLib.h>
-#include <Library/FileHandleLib.h>
-
-#include "ShellEnvVar.h"
-#include "FileHandleWrappers.h"
#include "Shell.h"
/**
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index 79ac79290d..68d4fb4d92 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -14,7 +14,6 @@ **/
#include "Shell.h"
-#include <Library/FileHandleLib.h>
/**
Close an open file handle.
diff --git a/ShellPkg/Application/Shell/ShellProtocol.h b/ShellPkg/Application/Shell/ShellProtocol.h index a63ae8fc83..456aa2aff3 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.h +++ b/ShellPkg/Application/Shell/ShellProtocol.h @@ -16,40 +16,7 @@ #ifndef _SHELL_PROTOCOL_HEADER_
#define _SHELL_PROTOCOL_HEADER_
-#include <Uefi.h>
-#include <ShellBase.h>
-
-#include <Guid/ShellVariableGuid.h>
-#include <Guid/ShellMapGuid.h>
-#include <Guid/ShellAliasGuid.h>
-
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/DevicePathToText.h>
-#include <Protocol/ComponentName2.h>
-#include <Protocol/LoadedImage.h>
-#include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/SimpleTextInEx.h>
-
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/BaseLib.h>
-#include <Library/ShellCommandLib.h>
-#include <Library/PrintLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/DebugLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiLib.h>
-#include <Library/SortLib.h>
-#include <Library/PcdLib.h>
-#include <Library/ShellLib.h>
-
-#include "FileHandleWrappers.h"
-#include "ShellEnvVar.h"
-#include "ShellManParser.h"
+#include "Shell.h"
typedef struct {
LIST_ENTRY Link;
|