diff -ur grub-2.02.orig/grub-core/fs/btrfs.c grub-2.02/grub-core/fs/btrfs.c
--- grub-2.02.orig/grub-core/fs/btrfs.c	2017-04-24 09:16:00.000000000 +0000
+++ grub-2.02/grub-core/fs/btrfs.c	2018-09-04 11:11:43.199082290 +0000
@@ -175,7 +175,7 @@
 {
   grub_int64_t sec;
   grub_uint32_t nanosec;
-} __attribute__ ((aligned (4)));
+} GRUB_PACKED;
 
 struct grub_btrfs_inode
 {
diff -ur grub-2.02.orig/include/grub/efiemu/runtime.h grub-2.02/include/grub/efiemu/runtime.h
--- grub-2.02.orig/include/grub/efiemu/runtime.h	2015-05-21 15:50:29.000000000 +0000
+++ grub-2.02/include/grub/efiemu/runtime.h	2018-09-04 11:13:30.211081085 +0000
@@ -29,7 +29,7 @@
 
 struct efi_variable
 {
-  grub_efi_guid_t guid;
+  grub_efi_packed_guid_t guid;
   grub_uint32_t namelen;
   grub_uint32_t size;
   grub_efi_uint32_t attributes;
diff -ur grub-2.02.orig/include/grub/gpt_partition.h grub-2.02/include/grub/gpt_partition.h
--- grub-2.02.orig/include/grub/gpt_partition.h	2015-05-21 15:50:29.000000000 +0000
+++ grub-2.02/include/grub/gpt_partition.h	2018-09-04 11:14:00.554080743 +0000
@@ -28,7 +28,7 @@
   grub_uint16_t data2;
   grub_uint16_t data3;
   grub_uint8_t data4[8];
-} __attribute__ ((aligned(8)));
+} GRUB_PACKED;
 typedef struct grub_gpt_part_type grub_gpt_part_type_t;
 
 #define GRUB_GPT_PARTITION_TYPE_EMPTY \