libnm-core: include ETH_ALEN/INFINIBAND_ALEN defines in nm-utils.h

Include <linux/if_ether.h> and <linux/if_infiniband.h> from
nm-utils.h, to get ETH_ALEN and INFINIBAND_ALEN, and remove those
includes (as well as <net/ethernet.h> and <netinet/ether.h>, and
various headers that had been included to get the ARPHRD_* constants)
from other files where they're not needed now.

63 files changed, 9 insertions, 81 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 0a1277a097..c548038b79 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <netinet/ether.h>
 #include <readline/readline.h>
 
 #include <glib.h>
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index a66e6f7194..e3c66d05e7 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#include <linux/if_ether.h>
-#include <linux/if_infiniband.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 33a3232986..2e3e6cd1f7 100644
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -19,10 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
-#include <linux/if_ether.h>
-#include <linux/if_infiniband.h>
-#include <linux/if_arp.h>
-
+#include "nm-utils.h"
 #include "nmt-newt.h"
 
 G_BEGIN_DECLS
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 0b9196c440..430c1d8c76 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
-#include <linux/if_ether.h>
 
 #include "nm-setting-bridge.h"
 #include "nm-param-spec-specialized.h"
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index 42c1545a34..57708460ba 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
-#include <linux/if_infiniband.h>
 #include <glib/gi18n.h>
 
 #include "nm-setting-infiniband.h"
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index e8cbaa4e3c..ea960c0953 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -21,7 +21,6 @@
  */
 
 #include <string.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index 6dd9c2ede7..1d079f24e2 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index b965d36f13..a100208739 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 3dea14f648..48be2f585e 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <uuid/uuid.h>
 #include <gmodule.h>
 
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index ea007cb0d1..dcc4aea282 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -27,6 +27,10 @@
 
 #include <glib.h>
 
+/* For ETH_ALEN and INFINIBAND_ALEN */
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index f281815818..30bd5629d7 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -22,8 +22,6 @@
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 
 #include <nm-utils.h>
 
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 0e29bee29e..3bad4dee1c 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 27d122baf3..73aedcff4e 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 6cd58b6b23..545e2da06d 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index edda2e95ad..988811076e 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index d2e2d0e1c6..4dfdcd840b 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 93b3298eb4..1b2720b0b8 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -20,8 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <linux/if_infiniband.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 760117e104..1ce91ba41b 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 00a40aa951..992d1188ad 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 81c9a3279d..2cb3b5f84d 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index eb5d87fd68..95e17e35ba 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 8797b9e892..bb5043fa65 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <net/ethernet.h>
 
 #include "nm-connection.h"
 #include "nm-platform.h"
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index 89018da7ea..6fc51e61c4 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -44,6 +44,7 @@
 
 #include "ppp-manager/nm-ppp-manager.h"
 #include "nm-setting-adsl.h"
+#include "nm-utils.h"
 
 #include "nm-device-adsl-glue.h"
 
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 7273ae8d67..7cb2910d1f 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -23,8 +23,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include "nm-dbus-interface.h"
 #include "nm-setting-bluetooth.h"
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index 17cbb8a4ba..114e852bf8 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -22,8 +22,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index b94bc5a2ce..f5d1fa082a 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <netinet/ether.h>
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 0b4366b1c8..179abd5ed5 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -23,7 +23,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <netinet/ether.h>
 #include <stdlib.h>
 
 #include "gsystem-local-alloc.h"
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 79871cfa49..e9d9d2002e 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -30,9 +30,7 @@
 #include <linux/version.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/if.h>
 #include <errno.h>
-#include <netinet/ether.h>
 
 #include <gudev/gudev.h>
 
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 385d608b7e..416ef0f820 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -24,7 +24,6 @@
 #include <glib/gi18n.h>
 
 #include <linux/if_infiniband.h>
-#include <netinet/ether.h>
 
 #include "nm-device-infiniband.h"
 #include "nm-logging.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index e9022b0e20..0932953969 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -24,8 +24,6 @@
 #include <glib/gi18n.h>
 
 #include <sys/socket.h>
-#include <linux/if.h>
-#include <netinet/ether.h>
 
 #include "nm-device-vlan.h"
 #include "nm-manager.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 2a098a29a9..65228c663f 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -35,7 +35,6 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
-#include <linux/if.h>
 #include <netlink/route/addr.h>
 
 #include "gsystem-local-alloc.h"
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index f833d1c952..40e3a47873 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <netinet/ether.h>
 #include <teamdctl.h>
 #include <stdlib.h>
 
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 5ac1d32e5c..47f15e7271 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -30,13 +30,10 @@
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
-#include <linux/if.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 5095134727..2c8ad10f83 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -24,7 +24,6 @@
 #include <dbus/dbus.h>
 #include <netinet/in.h>
 #include <string.h>
-#include <net/ethernet.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <signal.h>
@@ -32,7 +31,6 @@
 #include <linux/sockios.h>
 #include <linux/ethtool.h>
 #include <sys/ioctl.h>
-#include <netinet/ether.h>
 #include <errno.h>
 
 #include "nm-glib-compat.h"
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h
index f0a1beacde..117d5e7e15 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/devices/wifi/nm-device-wifi.h
@@ -24,7 +24,6 @@
 
 #include <glib-object.h>
 #include <dbus/dbus.h>
-#include <net/ethernet.h>
 
 #include "nm-device.h"
 #include "nm-wifi-ap.h"
diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c
index ea457dff03..a390e2d523 100644
--- a/src/devices/wifi/nm-wifi-ap-utils.c
+++ b/src/devices/wifi/nm-wifi-ap-utils.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #include "nm-wifi-ap-utils.h"
+#include "nm-utils.h"
 
 static gboolean
 verify_no_wep (NMSettingWirelessSecurity *s_wsec, const char *tag, GError **error)
diff --git a/src/devices/wifi/nm-wifi-ap-utils.h b/src/devices/wifi/nm-wifi-ap-utils.h
index e2df039da3..cdb8db7d9c 100644
--- a/src/devices/wifi/nm-wifi-ap-utils.h
+++ b/src/devices/wifi/nm-wifi-ap-utils.h
@@ -21,7 +21,6 @@
 #ifndef NM_WIFI_AP_UTILS_H
 #define NM_WIFI_AP_UTILS_H
 
-#include <net/ethernet.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index c669afefa6..9743286a57 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <netinet/ether.h>
 
 #include "nm-wifi-ap.h"
 #include "nm-wifi-ap-utils.h"
diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c
index 36d58f2a8a..81bf581f5c 100644
--- a/src/devices/wifi/tests/test-wifi-ap-utils.c
+++ b/src/devices/wifi/tests/test-wifi-ap-utils.c
@@ -28,6 +28,7 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
+#include "nm-utils.h"
 
 #define DEBUG 1
 
diff --git a/src/devices/wimax/iwmxsdk.c b/src/devices/wimax/iwmxsdk.c
index 4cd411d946..e6b54d8bea 100644
--- a/src/devices/wimax/iwmxsdk.c
+++ b/src/devices/wimax/iwmxsdk.c
@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <linux/if.h>
 
 #include <glib.h>
 
diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c
index 72eaed4c67..1297fb4961 100644
--- a/src/devices/wimax/nm-device-wimax.c
+++ b/src/devices/wimax/nm-device-wimax.c
@@ -23,10 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include <net/ethernet.h>
 #include <sys/socket.h>
-#include <linux/if.h>
-#include <netinet/ether.h>
 
 #include <WiMaxAPI.h>
 #include <WiMaxAPIEx.h>
diff --git a/src/devices/wimax/nm-device-wimax.h b/src/devices/wimax/nm-device-wimax.h
index 8b252ee161..0606a1999e 100644
--- a/src/devices/wimax/nm-device-wimax.h
+++ b/src/devices/wimax/nm-device-wimax.h
@@ -22,7 +22,6 @@
 #ifndef NM_DEVICE_WIMAX_H
 #define NM_DEVICE_WIMAX_H
 
-#include <net/ethernet.h>
 #include "nm-device.h"
 #include "nm-wimax-nsp.h"
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 1354717a80..fc0db16c02 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <netinet/ether.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index efddc7d3f8..8ad32d499f 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 #include "nm-glib-compat.h"
 #include <netinet/in.h>
-#include <net/ethernet.h>
 #include <linux/if.h>
 #include <linux/if_addr.h>
 
diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index 38341fe8fb..90c764f2af 100644
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <linux/types.h>
 #include <sys/socket.h>
-#include <linux/if.h>
 #include <linux/wireless.h>
 
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 4af3f5a350..55f9b41769 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -32,7 +32,6 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <asm/types.h>
-#include <linux/if.h>
 #include <sys/stat.h>
 
 #include <linux/ppp_defs.h>
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index d9644006cf..10bd10aa89 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <netinet/ether.h>
 
 #include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/settings/plugins/example/plugin.c b/src/settings/plugins/example/plugin.c
index 7cf22d16ea..23ce44c665 100644
--- a/src/settings/plugins/example/plugin.c
+++ b/src/settings/plugins/example/plugin.c
@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <netinet/ether.h>
 #include <string.h>
 
 #include <gmodule.h>
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 5d7d1dbe2c..ee936e5f85 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -19,8 +19,6 @@
  */
 
 #include <string.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <glib/gstdio.h>
 
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 0567ba2406..f4a25effce 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 04ab97dfb3..ee3c432448 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -29,8 +29,6 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 1cbbdbf7f3..8a726a3cea 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -22,8 +22,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
index ba336f4d8b..ab12350837 100644
--- a/src/settings/plugins/ifcfg-rh/writer.c
+++ b/src/settings/plugins/ifcfg-rh/writer.c
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <netinet/ether.h>
 
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 57fba33048..0efdc94cc6 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include <netinet/ether.h>
 #include <errno.h>
 #include <glib/gi18n.h>
 
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index 4671c256ba..7ef7c51b54 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <sys/inotify.h>
 
-#include <net/ethernet.h>
-#include <netinet/ether.h>
 
 #include <gmodule.h>
 #include <glib-object.h>
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 57b65764bc..0be5b50c68 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <netinet/ether.h>
 #include <string.h>
 
 #include <gmodule.h>
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index fb75326dd3..eefa39538f 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -36,8 +36,6 @@
 #include <nm-setting-8021x.h>
 #include <nm-utils.h>
 #include <arpa/inet.h>
-#include <netinet/ether.h>
-#include <linux/if_infiniband.h>
 #include <string.h>
 
 #include "nm-dbus-glib-types.h"
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 4161c3ee44..4a1c9effdf 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -22,11 +22,9 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <linux/if_infiniband.h>
 
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index b023cd1dee..0813290324 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -40,7 +40,6 @@
 #include <nm-utils.h>
 #include <string.h>
 #include <arpa/inet.h>
-#include <netinet/ether.h>
 
 #include "nm-dbus-glib-types.h"
 #include "nm-glib-compat.h"
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 438b436eb1..5eb4b47320 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <netinet/ether.h>
 #include <dbus/dbus-glib.h>
 
 #include "nm-supplicant-config.h"
diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c
index ce884a8dd5..08f8d1221a 100644
--- a/src/supplicant-manager/tests/test-supplicant-config.c
+++ b/src/supplicant-manager/tests/test-supplicant-config.c
@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c
index aeac6137c4..8f9c431cc2 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/tests/config/nm-test-device.c
@@ -21,10 +21,10 @@
 #include "config.h"
 
 #include <string.h>
-#include <netinet/ether.h>
 
 #include "nm-test-device.h"
 #include "nm-device-private.h"
+#include "nm-utils.h"
 
 static GObjectClass *g_object_class;
 
diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index d33434fa96..c91b6be7f6 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -21,7 +21,6 @@
 #include <glib.h>
 #include <string.h>
 #include <errno.h>
-#include <netinet/ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "nm-logging.h"