diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 2341ffe52..cd2101a52 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -8,7 +8,6 @@
 
 #include "nm-device.h"
 
-#include <netinet/in.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <signal.h>
@@ -16,8 +15,10 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <linux/if.h>
 #include <linux/if_addr.h>
-#include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index 5c912b7d2..6da4a7697 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -6,6 +6,7 @@
 #include "nm-default.h"
 
 #include <fcntl.h>
+#include <netinet/if_ether.h>
 #include <linux/if_tun.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 28e6df1c6..505cf82cb 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -12,9 +12,10 @@
 #include <endian.h>
 #include <fcntl.h>
 #include <libudev.h>
+#include <net/ethernet.h>
 #include <linux/fib_rules.h>
 #include <linux/ip.h>
-#include <linux/if_arp.h>
+#include <linux/if.h>
 #include <linux/if_bridge.h>
 #include <linux/if_link.h>
 #include <linux/if_tun.h>
@@ -24,6 +25,7 @@
 #include <linux/tc_act/tc_mirred.h>
 #include <netinet/icmp6.h>
 #include <netinet/in.h>
+#include <net/if_arp.h>
 #include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>