Updated headers related to EFI.

Signed-off-by: Frediano Ziglio <frediano.ziglio@cloud.com>
---
 xen/arch/x86/include/asm/x86_64/efibind.h | 4 ++--
 xen/include/efi/efiapi.h                  | 4 ++--
 xen/include/efi/eficapsule.h              | 4 ++--
 xen/include/efi/eficon.h                  | 4 ++--
 xen/include/efi/efidef.h                  | 4 ++--
 xen/include/efi/efidevp.h                 | 4 ++--
 xen/include/efi/efierr.h                  | 4 ++--
 xen/include/efi/efipciio.h                | 6 +++---
 xen/include/efi/efiprot.h                 | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/xen/arch/x86/include/asm/x86_64/efibind.h b/xen/arch/x86/include/asm/x86_64/efibind.h
index b29342c61c..a4b8ec52b3 100644
--- a/xen/arch/x86/include/asm/x86_64/efibind.h
+++ b/xen/arch/x86/include/asm/x86_64/efibind.h
@@ -16,8 +16,8 @@ Abstract:
 Revision History
 
 --*/
-#ifndef X86_64_EFI_BIND
-#define X86_64_EFI_BIND
+#ifndef ASM__X86__X86_64__EFIBIND_H
+#define ASM__X86__X86_64__EFIBIND_H
 #ifndef __GNUC__
 #pragma pack()
 #endif
diff --git a/xen/include/efi/efiapi.h b/xen/include/efi/efiapi.h
index a616d1238a..c9e6a531ba 100644
--- a/xen/include/efi/efiapi.h
+++ b/xen/include/efi/efiapi.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_API_H
-#define _EFI_API_H
+#ifndef EFI__EFIAPI_H
+#define EFI__EFIAPI_H
 
 /*++
 
diff --git a/xen/include/efi/eficapsule.h b/xen/include/efi/eficapsule.h
index 481af2816a..5764f36e9f 100644
--- a/xen/include/efi/eficapsule.h
+++ b/xen/include/efi/eficapsule.h
@@ -19,8 +19,8 @@ Abstract:
 
 --*/
 
-#ifndef _EFI_CAPSULE_H
-#define _EFI_CAPSULE_H
+#ifndef EFI__EFICAPSULE_H
+#define EFI__EFICAPSULE_H
 
 
 #define CAPSULE_BLOCK_DESCRIPTOR_SIGNATURE  EFI_SIGNATURE_32 ('C', 'B', 'D', 'S')
diff --git a/xen/include/efi/eficon.h b/xen/include/efi/eficon.h
index 089db9816c..952022b734 100644
--- a/xen/include/efi/eficon.h
+++ b/xen/include/efi/eficon.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_CON_H
-#define _EFI_CON_H
+#ifndef EFI__EFICON_H
+#define EFI__EFICON_H
 
 /*++
 
diff --git a/xen/include/efi/efidef.h b/xen/include/efi/efidef.h
index 86a7e111bf..20cf269e8f 100644
--- a/xen/include/efi/efidef.h
+++ b/xen/include/efi/efidef.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_DEF_H
-#define _EFI_DEF_H
+#ifndef EFI__EFIDEF_H
+#define EFI__EFIDEF_H
 
 /*++
 
diff --git a/xen/include/efi/efidevp.h b/xen/include/efi/efidevp.h
index beb5785a45..fd88b66a56 100644
--- a/xen/include/efi/efidevp.h
+++ b/xen/include/efi/efidevp.h
@@ -1,5 +1,5 @@
-#ifndef _DEVPATH_H
-#define _DEVPATH_H
+#ifndef EFI__EFIDEVP_H
+#define EFI__EFIDEVP_H
 
 /*++
 
diff --git a/xen/include/efi/efierr.h b/xen/include/efi/efierr.h
index cdca210414..1d2ed125d8 100644
--- a/xen/include/efi/efierr.h
+++ b/xen/include/efi/efierr.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_ERR_H
-#define _EFI_ERR_H
+#ifndef EFI__EFIERR_H
+#define EFI__EFIERR_H
 
 /*++
 
diff --git a/xen/include/efi/efipciio.h b/xen/include/efi/efipciio.h
index 0724f957a3..8f8c81d043 100644
--- a/xen/include/efi/efipciio.h
+++ b/xen/include/efi/efipciio.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_PCI_IO_H
-#define _EFI_PCI_IO_H
+#ifndef EFI__EFIPCIIO_H
+#define EFI__EFIPCIIO_H
 
 #define EFI_PCI_IO_PROTOCOL \
     { 0x4cf5b200, 0x68b8, 0x4ca5, {0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x02, 0x9a} }
@@ -216,4 +216,4 @@ typedef struct _EFI_PCI_IO {
   VOID                                   *RomImage;
 } EFI_PCI_IO;
 
-#endif /* _EFI_PCI_IO_H */
+#endif /* EFI__EFIPCIIO_H */
diff --git a/xen/include/efi/efiprot.h b/xen/include/efi/efiprot.h
index 56d7636b2b..8a56b3faa5 100644
--- a/xen/include/efi/efiprot.h
+++ b/xen/include/efi/efiprot.h
@@ -1,5 +1,5 @@
-#ifndef _EFI_PROT_H
-#define _EFI_PROT_H
+#ifndef EFI__EFIPROT_H
+#define EFI__EFIPROT_H
 
 /*++
 
-- 
2.34.1