diff -ur a/src/efi.c b/src/efi.c --- a/src/efi.c 2022-04-28 19:57:19.197635727 +0000 +++ b/src/efi.c 2022-04-28 19:57:53.558571268 +0000 @@ -25,8 +25,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <efiboot.h> -#include <efivar.h> +#include <efivar/efiboot.h> +#include <efivar/efivar.h> #include <errno.h> #include <stdint.h> #include <sys/stat.h> diff -ur a/src/efibootdump.c b/src/efibootdump.c --- a/src/efibootdump.c 2022-04-28 19:57:19.197635727 +0000 +++ b/src/efibootdump.c 2022-04-28 19:57:45.128341742 +0000 @@ -11,8 +11,8 @@ #include "fix_coverity.h" #include <ctype.h> -#include <efiboot.h> -#include <efivar.h> +#include <efivar/efiboot.h> +#include <efivar/efivar.h> #include <err.h> #include <inttypes.h> #include <libintl.h> diff -ur a/src/efibootmgr.c b/src/efibootmgr.c --- a/src/efibootmgr.c 2022-04-28 19:57:19.197635727 +0000 +++ b/src/efibootmgr.c 2022-04-28 19:57:35.418077359 +0000 @@ -47,8 +47,8 @@ #include <dirent.h> #include <unistd.h> #include <getopt.h> -#include <efivar.h> -#include <efiboot.h> +#include <efivar/efivar.h> +#include <efivar/efiboot.h> #include <inttypes.h> #include "list.h" diff -ur a/src/eficonman.c b/src/eficonman.c --- a/src/eficonman.c 2022-04-28 19:57:19.197635727 +0000 +++ b/src/eficonman.c 2022-04-28 19:58:41.789884456 +0000 @@ -10,7 +10,7 @@ #include "fix_coverity.h" -#include <efivar.h> +#include <efivar/efivar.h> #include <err.h> #include <inttypes.h> #include <libintl.h> diff -ur a/src/include/efi.h b/src/include/efi.h --- a/src/include/efi.h 2022-04-28 19:57:19.197635727 +0000 +++ b/src/include/efi.h 2022-04-28 19:58:57.110301583 +0000 @@ -29,7 +29,7 @@ #include <stdint.h> #include <dirent.h> -#include <efivar.h> +#include <efivar/efivar.h> /******************************************************* * Boot Option Attributes