--- clients/cli/devices.c  2015-05-05 11:35:17.000000000 +0000
+++ clients/cli/devices.c  2015-05-13 09:44:45.931000000 +0000
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <readline/readline.h>
+#include <net/ethernet.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
--- clients/cli/settings.c 2015-05-05 11:35:17.000000000 +0000
+++ clients/cli/settings.c 2015-05-13 09:44:29.586000000 +0000
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <net/ethernet.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
--- libnm/nm-device-bt.c   2015-03-04 16:45:35.000000000 +0000
+++ libnm/nm-device-bt.c   2015-05-13 09:42:51.825000000 +0000
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
--- libnm/nm-device-ethernet.c     2015-03-04 16:45:35.000000000 +0000
+++ libnm/nm-device-ethernet.c     2015-05-13 09:43:08.769000000 +0000
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
--- libnm/nm-device-wifi.c 2015-03-04 16:45:35.000000000 +0000
+++ libnm/nm-device-wifi.c 2015-05-13 09:43:24.673000000 +0000
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
--- libnm/nm-device-wimax.c        2015-05-05 11:35:17.000000000 +0000
+++ libnm/nm-device-wimax.c        2015-05-13 09:43:35.881000000 +0000
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
--- libnm-core/nm-setting-bridge.c 2015-05-05 11:35:17.000000000 +0000
+++ libnm-core/nm-setting-bridge.c 2015-05-13 09:40:28.049000000 +0000
@@ -25,6 +25,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
+#include <net/ethernet.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-connection-private.h"
--- libnm-core/nm-setting-olpc-mesh.c      2015-03-04 16:45:35.000000000 +0000
+++ libnm-core/nm-setting-olpc-mesh.c      2015-05-13 09:41:26.729000000 +0000
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib/gi18n-lib.h>
 
 #include "nm-setting-olpc-mesh.h"
--- libnm-core/nm-utils.c  2015-05-05 11:35:17.000000000 +0000
+++ libnm-core/nm-utils.c  2015-05-13 09:39:43.402000000 +0000
@@ -23,7 +23,8 @@
 
 #include <string.h>
 #include <stdlib.h>
 #include <netinet/ether.h>
+#include <net/if_arp.h>
 #include <arpa/inet.h>
 #include <uuid/uuid.h>
 #include <libintl.h>
--- src/NetworkManagerUtils.c      2015-05-05 11:35:17.000000000 +0000
+++ src/NetworkManagerUtils.c      2015-05-13 09:36:02.078000000 +0000
@@ -34,6 +34,7 @@
 #include <sys/wait.h>
 #include <linux/if.h>
 #include <linux/if_infiniband.h>
+#include <net/ethernet.h>
 
 #include "NetworkManagerUtils.h"
 #include "nm-platform.h"
--- src/devices/bluetooth/nm-bluez-device.c        2015-05-05 11:35:17.000000000 +0000
+++ /src/devices/bluetooth/nm-bluez-device.c        2015-05-13 09:36:02.078000000 +0000
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <string.h>
+#include <net/ethernet.h>
 
 #include "nm-core-internal.h"
 
--- src/devices/bluetooth/nm-device-bt.c   2015-05-05 11:35:17.000000000 +0000
+++ src/devices/bluetooth/nm-device-bt.c   2015-05-13 09:44:10.995000000 +0000
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <net/ethernet.h>
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
--- src/devices/nm-device-bridge.c 2015-05-05 11:35:17.000000000 +0000
+++ src/devices/nm-device-bridge.c 2015-05-13 09:36:02.079000000 +0000
@@ -24,6 +24,7 @@
 #include <glib/gi18n.h>
 
 #include <stdlib.h>
+#include <net/ethernet.h>
 
 #include "gsystem-local-alloc.h"
 #include "nm-device-bridge.h"
--- src/devices/wifi/nm-wifi-ap.c  2015-05-05 11:35:17.000000000 +0000
+++ src/devices/wifi/nm-wifi-ap.c  2015-05-13 09:36:02.079000000 +0000
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <net/ethernet.h>
 
 #include "nm-wifi-ap.h"
 #include "nm-wifi-ap-utils.h"
--- src/dhcp-manager/nm-dhcp-dhclient-utils.c      2015-05-05 11:35:17.000000000 +0000
+++ src/dhcp-manager/nm-dhcp-dhclient-utils.c      2015-05-13 09:36:02.079000000 +0000
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <arpa/inet.h>
+#include <net/ethernet.h>
 
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
--- src/platform/wifi/wifi-utils.c 2015-05-05 11:35:17.000000000 +0000
+++ src/platform/wifi/wifi-utils.c 2015-05-13 09:36:02.080000000 +0000
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
+#include <net/ethernet.h>
 #include <glib.h>
 
 #include "wifi-utils.h"
--- src/platform/wifi/wifi-utils.h 2015-05-05 11:35:17.000000000 +0000
+++ src/platform/wifi/wifi-utils.h 2015-05-13 09:36:02.080000000 +0000
@@ -22,7 +22,6 @@
 #ifndef __WIFI_UTILS_H__
 #define __WIFI_UTILS_H__
 
-#include <net/ethernet.h>
 #include <glib.h>
 
 #include "nm-dbus-interface.h"
--- src/settings/nm-settings-connection.h  2015-04-17 11:06:20.000000000 +0000
+++ src/settings/nm-settings-connection.h  2015-05-13 09:36:02.080000000 +0000
@@ -22,8 +22,6 @@
 #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
 #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
 
-#include <net/ethernet.h>
-
 #include <nm-connection.h>
 #include "nm-types.h"
 
--- src/settings/plugins/ibft/reader.c     2015-05-05 11:35:17.000000000 +0000
+++ src/settings/plugins/ibft/reader.c     2015-05-13 09:36:02.080000000 +0000
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <net/ethernet.h>
 #include <sys/wait.h>
 #include <sys/inotify.h>
 #include <errno.h>
--- src/settings/plugins/keyfile/reader.c  2015-05-05 11:35:17.000000000 +0000
+++ src/settings/plugins/keyfile/reader.c  2015-05-13 09:36:02.081000000 +0000
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
+#include <net/ethernet.h>
 #include <string.h>
 
 #include "nm-core-internal.h"
--- libnm-core/nm-utils.h.orig        2015-05-13 09:54:12.405000000 +0000
+++ libnm-core/nm-utils.h     2015-05-13 09:54:18.219000000 +0000
@@ -30,7 +30,6 @@
 #include <netinet/in.h>
 
 /* For ETH_ALEN and INFINIBAND_ALEN */
-#include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
 #include "nm-dbus-interface.h"