4 files changed, 12 insertions, 10 deletions
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 4f8a81dcdb..c6b45d214b 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -42,7 +42,7 @@ struct boot_option {
         uint32_t attr;
         uint16_t path_len;
         uint16_t title[];
-} __attribute__((packed));
+} _packed_;
 
 struct drive_path {
         uint32_t part_nr;
@@ -51,7 +51,7 @@ struct drive_path {
         char signature[16];
         uint8_t mbr_type;
         uint8_t signature_type;
-} __attribute__((packed));
+} _packed_;
 
 struct device_path {
         uint8_t type;
@@ -61,7 +61,7 @@ struct device_path {
                 uint16_t path[0];
                 struct drive_path drive;
         };
-} __attribute__((packed));
+} _packed_;
 
 bool is_efi_boot(void) {
         return access("/sys/firmware/efi", F_OK) >= 0;
@@ -169,7 +169,7 @@ int efi_set_variable(
         struct var {
                 uint32_t attr;
                 char buf[];
-        } __attribute__((packed)) *buf = NULL;
+        } _packed_ *buf = NULL;
         char *p = NULL;
         int fd = -1;
         int r;
@@ -404,7 +404,7 @@ struct guid {
         uint16_t u2;
         uint16_t u3;
         uint8_t u4[8];
-} __attribute__((packed));
+} _packed_;
 
 static void id128_to_efi_guid(sd_id128_t id, void *guid) {
         struct guid *uuid = guid;
diff --git a/src/udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index 13c757bd1c..67b750c4b3 100644
--- a/src/udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-#include "mtd_probe.h"
+
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <mtd/mtd-user.h>
@@ -26,6 +26,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "mtd_probe.h"
+
 int main(int argc, char** argv)
 {
         int mtd_fd;
diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h
index d99be9addc..caea5c2693 100644
--- a/src/udev/mtd_probe/mtd_probe.h
+++ b/src/udev/mtd_probe/mtd_probe.h
@@ -21,6 +21,8 @@
 
 #include <mtd/mtd-user.h>
 
+#include "macro.h"
+
 /* Full oob structure as written on the flash */
 struct sm_oob {
         uint32_t reserved;
@@ -30,8 +32,7 @@ struct sm_oob {
         uint8_t ecc2[3];
         uint8_t lba_copy2[2];
         uint8_t ecc1[3];
-} __attribute__((packed));
-
+} _packed_;
 
 /* one sector is always 512 bytes, but it can consist of two nand pages */
 #define SM_SECTOR_SIZE                512
@@ -47,5 +48,4 @@ struct sm_oob {
 #define SM_SMALL_PAGE                 256
 #define SM_SMALL_OOB_SIZE        8
 
-
 void probe_smart_media(int mtd_fd, mtd_info_t *info);
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index ab0d96e377..264ff5d6f7 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -162,7 +162,7 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
                 u_int8_t        bInterfaceSubClass;
                 u_int8_t        bInterfaceProtocol;
                 u_int8_t        iInterface;
-        } __attribute__((packed));
+        } _packed_;
 
         if (asprintf(&filename, "%s/descriptors", udev_device_get_syspath(dev)) < 0)
                 return log_oom();