includes: include all gnu-efi includes at one place.

Signed-off-by: Peter Jones <[email protected]>

Author: vathpela

include/errors.h

@@ -3,8 +3,6 @@
 #ifndef SHIM_ERRORS_H
 #define SHIM_ERRORS_H
 
-#include <efierr.h>
-
 #ifndef EFI_INCOMPATIBLE_VERSION
 #define EFI_INCOMPATIBLE_VERSION	EFIERR(25)
 #endif

include/guid.h

@@ -3,8 +3,6 @@
 #ifndef SHIM_GUID_H
 #define SHIM_GUID_H
 
-#include <efi.h>
-
 extern EFI_GUID BDS_GUID;
 extern EFI_GUID GV_GUID;
 extern EFI_GUID SIG_DB;

include/ip4config2.h

@@ -9,8 +9,6 @@
 #ifndef SHIM_IP4CONFIG2_H
 #define SHIM_IP4CONFIG2_H
 
-#include <efiip.h>
-
 typedef struct _EFI_IP4_CONFIG2_PROTOCOL EFI_IP4_CONFIG2_PROTOCOL;
 
 

include/ip6config.h

@@ -8,8 +8,6 @@
 #ifndef SHIM_IP6CONFIG_H
 #define SHIM_IP6CONFIG_H
 
-#include <efiip.h>
-
 typedef struct _EFI_IP6_CONFIG_PROTOCOL EFI_IP6_CONFIG_PROTOCOL;
 
 ///

include/tpm.h

@@ -3,8 +3,6 @@
 #ifndef SHIM_TPM_H
 #define SHIM_TPM_H
 
-#include <efilib.h>
-
 #define TPM_ALG_SHA 0x00000004
 
 EFI_STATUS tpm_log_event(EFI_PHYSICAL_ADDRESS buf, UINTN size, UINT8 pcr,

shim.h

@@ -29,6 +29,8 @@
 #include <efi.h>
 #include <efilib.h>
 #undef uefi_call_wrapper
+#include <efierr.h>
+#include <efiip.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -146,7 +148,6 @@
 #include "include/tpm.h"
 #include "include/ucs2.h"
 #include "include/variables.h"
-#include "include/sbat.h"
 
 #include "version.h"
 

version.c.in

@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
+#include <efi.h>
+
 #include "version.h"
 
 CHAR8 shim_version[] __attribute__((section (".data.ident"))) =

version.h

@@ -3,8 +3,6 @@
 #ifndef _SHIM_VERSION_H
 #define _SHIM_VERSION_H 1
 
-#include <efi.h>
-
 extern CHAR8 shim_version[];
 
 #endif /* SHIM_VERSION_H */