ensure that include order of headers does not matter

8 files changed, 15 insertions, 1 deletions

diff --git a/src/grp-boot/systemd-boot/console.h b/src/grp-boot/systemd-boot/console.h
index 3fe0ce5ec4..887995a9cc 100644
--- a/src/grp-boot/systemd-boot/console.h
+++ b/src/grp-boot/systemd-boot/console.h
@@ -16,6 +16,8 @@
 #ifndef __SDBOOT_CONSOLE_H
 #define __SDBOOT_CONSOLE_H
 
+#include <efi.h>
+
 #define EFI_SHIFT_STATE_VALID           0x80000000
 #define EFI_RIGHT_CONTROL_PRESSED       0x00000004
 #define EFI_LEFT_CONTROL_PRESSED        0x00000008
diff --git a/src/grp-boot/systemd-boot/disk.h b/src/grp-boot/systemd-boot/disk.h
index af91a9c674..5804b8881a 100644
--- a/src/grp-boot/systemd-boot/disk.h
+++ b/src/grp-boot/systemd-boot/disk.h
@@ -15,5 +15,7 @@
 #ifndef __SDBOOT_DISK_H
 #define __SDBOOT_DISK_H
 
+#include <efi.h>
+
 EFI_STATUS disk_get_part_uuid(EFI_HANDLE *handle, CHAR16 uuid[37]);
 #endif
diff --git a/src/grp-boot/systemd-boot/graphics.h b/src/grp-boot/systemd-boot/graphics.h
index cf48e647e7..d8e5adfcd8 100644
--- a/src/grp-boot/systemd-boot/graphics.h
+++ b/src/grp-boot/systemd-boot/graphics.h
@@ -18,5 +18,7 @@
 #ifndef __SDBOOT_GRAPHICS_H
 #define __SDBOOT_GRAPHICS_H
 
+#include <efi.h>
+
 EFI_STATUS graphics_mode(BOOLEAN on);
 #endif
diff --git a/src/grp-boot/systemd-boot/linux.h b/src/grp-boot/systemd-boot/linux.h
index d9e6ed7955..b87a7f0d38 100644
--- a/src/grp-boot/systemd-boot/linux.h
+++ b/src/grp-boot/systemd-boot/linux.h
@@ -15,6 +15,8 @@
 #ifndef __SDBOOT_kernel_H
 #define __SDBOOT_kernel_H
 
+#include <efi.h>
+
 EFI_STATUS linux_exec(EFI_HANDLE *image,
                       CHAR8 *cmdline, UINTN cmdline_size,
                       UINTN linux_addr,
diff --git a/src/grp-boot/systemd-boot/measure.h b/src/grp-boot/systemd-boot/measure.h
index a2cfe817d0..ddd686a8fd 100644
--- a/src/grp-boot/systemd-boot/measure.h
+++ b/src/grp-boot/systemd-boot/measure.h
@@ -13,6 +13,8 @@
 #ifndef __SDBOOT_MEASURE_H
 #define __SDBOOT_MEASURE_H
 
+#include <efi.h>
+
 #ifndef SD_TPM_PCR
 #define SD_TPM_PCR 8
 #endif
diff --git a/src/grp-boot/systemd-boot/pefile.h b/src/grp-boot/systemd-boot/pefile.h
index 2e445ede17..bc2d73fea9 100644
--- a/src/grp-boot/systemd-boot/pefile.h
+++ b/src/grp-boot/systemd-boot/pefile.h
@@ -15,6 +15,8 @@
 #ifndef __SDBOOT_PEFILE_H
 #define __SDBOOT_PEFILE_H
 
+#include <efi.h>
+
 EFI_STATUS pefile_locate_sections(EFI_FILE *dir, CHAR16 *path,
                                   CHAR8 **sections, UINTN *addrs, UINTN *offsets, UINTN *sizes);
 #endif
diff --git a/src/grp-boot/systemd-boot/splash.h b/src/grp-boot/systemd-boot/splash.h
index 09b543fb47..362ff22643 100644
--- a/src/grp-boot/systemd-boot/splash.h
+++ b/src/grp-boot/systemd-boot/splash.h
@@ -16,5 +16,7 @@
 #ifndef __SDBOOT_SPLASH_H
 #define __SDBOOT_SPLASH_H
 
+#include <efi.h>
+
 EFI_STATUS graphics_splash(UINT8 *content, UINTN len, const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background);
 #endif
diff --git a/src/grp-boot/systemd-boot/util.h b/src/grp-boot/systemd-boot/util.h
index e673cdf9a0..e2da8b3fee 100644
--- a/src/grp-boot/systemd-boot/util.h
+++ b/src/grp-boot/systemd-boot/util.h
@@ -22,7 +22,7 @@
 #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
 static inline const CHAR16 *yes_no(BOOLEAN b) {
-        return b ? L"yes" : L"no";
+        return b ? (CHAR16*)L"yes" : (CHAR16*)L"no";
 }
 
 EFI_STATUS parse_boolean(CHAR8 *v, BOOLEAN *b);