diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index 60305f07f9c..e1a7dd1f32e 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2025,7 +2025,7 @@ static const UINT8 xbootldr_guid[16] = {
         0xff, 0xc2, 0x13, 0xbc, 0xe6, 0x59, 0x62, 0x42, 0xa3, 0x52, 0xb2, 0x75, 0xfd, 0x6f, 0x71, 0x72
 };
 
-EFI_DEVICE_PATH *path_parent(EFI_DEVICE_PATH *path, EFI_DEVICE_PATH *node) {
+static EFI_DEVICE_PATH *path_parent(EFI_DEVICE_PATH *path, EFI_DEVICE_PATH *node) {
         EFI_DEVICE_PATH *parent;
         UINTN len;
 
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/random-seed.c b/src/boot/efi/random-seed.c
index eda9260ae09..895c85445ef 100644
--- a/src/boot/efi/random-seed.c
+++ b/src/boot/efi/random-seed.c
@@ -142,7 +142,7 @@ static EFI_STATUS mangle_random_seed(
         return EFI_SUCCESS;
 }
 
-EFI_STATUS acquire_system_token(VOID **ret, UINTN *ret_size) {
+static EFI_STATUS acquire_system_token(VOID **ret, UINTN *ret_size) {
         _cleanup_freepool_ CHAR8 *data = NULL;
         EFI_STATUS err;
         UINTN size;
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.c b/src/boot/efi/splash.c
index e166fec57af..552c45cff49 100644
--- a/src/boot/efi/splash.c
+++ b/src/boot/efi/splash.c
@@ -37,7 +37,7 @@ struct bmp_map {
         UINT8 reserved;
 } __attribute__((packed));
 
-EFI_STATUS bmp_parse_header(UINT8 *bmp, UINTN size, struct bmp_dib **ret_dib,
+static EFI_STATUS bmp_parse_header(UINT8 *bmp, UINTN size, struct bmp_dib **ret_dib,
                             struct bmp_map **ret_map, UINT8 **pixmap) {
         struct bmp_file *file;
         struct bmp_dib *dib;
@@ -147,7 +147,7 @@ static VOID pixel_blend(UINT32 *dst, const UINT32 source) {
         *dst = (rb | g);
 }
 
-EFI_STATUS bmp_to_blt(EFI_GRAPHICS_OUTPUT_BLT_PIXEL *buf,
+static EFI_STATUS bmp_to_blt(EFI_GRAPHICS_OUTPUT_BLT_PIXEL *buf,
                       struct bmp_dib *dib, struct bmp_map *map,
                       UINT8 *pixmap) {
         UINT8 *in;
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);