Index: trunk/i386/libsaio/efi.h
===================================================================
--- trunk/i386/libsaio/efi.h	(revision 2635)
+++ trunk/i386/libsaio/efi.h	(revision 2636)
@@ -145,6 +145,15 @@
 #define EFI_GLOBAL_VARIABLE_GUID \
     {0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }
 
+#define SMBIOS_TABLE_GUID \
+    {0xEB9D2D31, 0x2D88, 0x11D3, {0x9A, 0x16, 0x0, 0x90, 0x27, 0x3F, 0xC1, 0x4D} }
+
+#define ACPI_TABLE_GUID \
+    {0xEB9D2D30, 0x2D88, 0x11D3, {0x9A, 0x16, 0x0, 0x90, 0x27, 0x3F, 0xC1, 0x4D} }
+
+#define ACPI_20_TABLE_GUID \
+    {0x8868E871, 0xE4f1, 0x11D3, {0xBC, 0x22, 0x0, 0x80, 0xC7, 0x3C, 0x88, 0x81} }
+
 typedef union {
   EFI_GUID  Guid;
   EFI_UINT8 Raw[16];
Index: trunk/i386/libsaio/smbios.h
===================================================================
--- trunk/i386/libsaio/smbios.h	(revision 2635)
+++ trunk/i386/libsaio/smbios.h	(revision 2636)
@@ -849,10 +849,6 @@
 
 //----------------------------------------------------------------------------------------------------------
 
-/* From Foundation/Efi/Guid/Smbios/SmBios.h */
-/* Modified to wrap Data4 array init with {} */
-#define EFI_SMBIOS_TABLE_GUID {0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}
-
 #define SMBIOS_ORIGINAL		0
 #define SMBIOS_PATCHED		1
 
Index: trunk/i386/libsaio/fake_efi.c
===================================================================
--- trunk/i386/libsaio/fake_efi.c	(revision 2635)
+++ trunk/i386/libsaio/fake_efi.c	(revision 2636)
@@ -421,7 +421,7 @@
  */
 
 /* From Foundation/Efi/Guid/Smbios/SmBios.c */
-EFI_GUID const	gEfiSmbiosTableGuid = EFI_SMBIOS_TABLE_GUID;
+EFI_GUID const	gEfiSmbiosTableGuid = SMBIOS_TABLE_GUID;
 
 #define SMBIOS_RANGE_START		0x000F0000
 #define SMBIOS_RANGE_END		0x000FFFFF
@@ -429,20 +429,10 @@
 /* '_SM_' in little endian: */
 #define SMBIOS_ANCHOR_UINT32_LE 0x5f4d535f
 
-#define EFI_ACPI_TABLE_GUID \
-{ \
-	0xeb9d2d30, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
-}
+EFI_GUID gEfiAcpiTableGuid = ACPI_TABLE_GUID;
+EFI_GUID gEfiAcpi20TableGuid = ACPI_20_TABLE_GUID;
 
-#define EFI_ACPI_20_TABLE_GUID \
-{ \
-	0x8868e871, 0xe4f1, 0x11d3, { 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \
-}
 
-EFI_GUID gEfiAcpiTableGuid = EFI_ACPI_TABLE_GUID;
-EFI_GUID gEfiAcpi20TableGuid = EFI_ACPI_20_TABLE_GUID;
-
-
 /*==========================================================================
  * Fake EFI implementation
  */