From 47381f8f6403d46cd8a23617fe39b9b431a229c3 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 30 Jan 2021 17:21:48 +0000
Subject: [PATCH] sd-boot: Add missing includes

Let's make all headers self-sufficient by including the necessary
EFI headers in the headers themselves.
---
 src/boot/efi/disk.c     | 1 +
 src/boot/efi/disk.h     | 2 ++
 src/boot/efi/graphics.h | 2 ++
 src/boot/efi/linux.h    | 2 ++
 src/boot/efi/measure.h  | 2 ++
 src/boot/efi/pe.h       | 2 ++
 src/boot/efi/shim.h     | 2 ++
 src/boot/efi/splash.h   | 2 ++
 8 files changed, 15 insertions(+)

diff --git a/src/boot/efi/disk.c b/src/boot/efi/disk.c
index 89508f86dea..cc752956c34 100644
--- a/src/boot/efi/disk.c
+++ b/src/boot/efi/disk.c
@@ -3,6 +3,7 @@
 #include <efi.h>
 #include <efilib.h>
 
+#include "disk.h"
 #include "util.h"
 
 EFI_STATUS disk_get_part_uuid(EFI_HANDLE *handle, CHAR16 uuid[static 37]) {
diff --git a/src/boot/efi/disk.h b/src/boot/efi/disk.h
index 551a9ae6398..8e10bb72799 100644
--- a/src/boot/efi/disk.h
+++ b/src/boot/efi/disk.h
@@ -1,4 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <efi.h>
+
 EFI_STATUS disk_get_part_uuid(EFI_HANDLE *handle, CHAR16 uuid[static 37]);
diff --git a/src/boot/efi/graphics.h b/src/boot/efi/graphics.h
index 116aae28c5f..96f25d809aa 100644
--- a/src/boot/efi/graphics.h
+++ b/src/boot/efi/graphics.h
@@ -5,4 +5,6 @@
  */
 #pragma once
 
+#include <efi.h>
+
 EFI_STATUS graphics_mode(BOOLEAN on);
diff --git a/src/boot/efi/linux.h b/src/boot/efi/linux.h
index b92c27c8b9e..09be2de27b3 100644
--- a/src/boot/efi/linux.h
+++ b/src/boot/efi/linux.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <efi.h>
+
 #define SETUP_MAGIC             0x53726448      /* "HdrS" */
 
 struct setup_header {
diff --git a/src/boot/efi/measure.h b/src/boot/efi/measure.h
index 19e148d9225..e2873adae36 100644
--- a/src/boot/efi/measure.h
+++ b/src/boot/efi/measure.h
@@ -1,4 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <efi.h>
+
 EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description);
diff --git a/src/boot/efi/pe.h b/src/boot/efi/pe.h
index 3e97d43f66d..06a0fcd70c6 100644
--- a/src/boot/efi/pe.h
+++ b/src/boot/efi/pe.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <efi.h>
+
 EFI_STATUS pe_memory_locate_sections(CHAR8 *base,
                                      CHAR8 **sections, UINTN *addrs, UINTN *offsets, UINTN *sizes);
 EFI_STATUS pe_file_locate_sections(EFI_FILE *dir, CHAR16 *path,
diff --git a/src/boot/efi/shim.h b/src/boot/efi/shim.h
index 72ecf2ed979..e24fcdac540 100644
--- a/src/boot/efi/shim.h
+++ b/src/boot/efi/shim.h
@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <efi.h>
+
 BOOLEAN shim_loaded(void);
 
 BOOLEAN secure_boot_enabled(void);
diff --git a/src/boot/efi/splash.h b/src/boot/efi/splash.h
index 0ba45a03707..b9f74ffbf27 100644
--- a/src/boot/efi/splash.h
+++ b/src/boot/efi/splash.h
@@ -1,4 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <efi.h>
+
 EFI_STATUS graphics_splash(UINT8 *content, UINTN len, const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background);
-- 
2.47.3