diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c
index 2f07f3715..ae4757df6 100644
--- a/src/nm-device-802-3-ethernet.c
+++ b/src/nm-device-802-3-ethernet.c
@@ -328,9 +328,7 @@ out:
 /**************************************/
 /*    MII capability detection        */
 /**************************************/
-#define _LINUX_IF_H
 #include <linux/mii.h>
-#undef _LINUX_IF_H
 
 static int
 mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location)
diff --git a/src/nm-device-802-3-ethernet.h b/src/nm-device-802-3-ethernet.h
index 3360d23e9..62d96c4b5 100644
--- a/src/nm-device-802-3-ethernet.h
+++ b/src/nm-device-802-3-ethernet.h
@@ -29,12 +29,6 @@
 
 #include "nm-device.h"
 
-/* define the kernel types until mii.h and ethtool.h are fixed */
-#define u64	__u64
-#define u32	__u32
-#define u16	__u16
-#define u8	__u8
-
 G_BEGIN_DECLS
 
 #define NM_TYPE_DEVICE_802_3_ETHERNET			(nm_device_802_3_ethernet_get_type ())
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index c019d0c2d..d581e8488 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <net/if.h>
+#include <linux/if.h>
 #include <linux/unistd.h>
 #include <unistd.h>