Changes: - fixes conflicts with EFI headers mentioned in issue #22433 Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>