4 files changed, 8 insertions, 5 deletions
diff --git a/src/mtd_probe/Makefile.am b/src/mtd_probe/Makefile.am
index bf081d68ba..2181733d23 100644
--- a/src/mtd_probe/Makefile.am
+++ b/src/mtd_probe/Makefile.am
@@ -1,5 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+AM_CPPFLAGS = \
+        -I $(top_srcdir)/src/shared
+
 udevlibexec_PROGRAMS = \
 	mtd_probe
 
diff --git a/src/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
index 0fbf3ab832..c90283ead3 100644
--- a/src/mtd_probe/mtd_probe.c
+++ b/src/mtd_probe/mtd_probe.c
@@ -21,7 +21,6 @@
 #define _GNU_SOURCE 1
 #endif
 
-#include "mtd_probe.h"
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <mtd/mtd-user.h>
@@ -30,6 +29,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include "mtd_probe.h"
 
 int main(int argc, char** argv)
 {
diff --git a/src/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
index 2a37ede578..e048a01229 100644
--- a/src/mtd_probe/mtd_probe.h
+++ b/src/mtd_probe/mtd_probe.h
@@ -19,6 +19,8 @@
 
 #include <mtd/mtd-user.h>
 
+#include "macro.h"
+
 /* Full oob structure as written on the flash */
 struct sm_oob {
         uint32_t reserved;
@@ -28,8 +30,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
@@ -45,5 +46,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();