--- arping.c
+++ arping.c
@@ -17,8 +17,10 @@
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <netpacket/packet.h>
+#include <linux/if_ether.h>
 #include <sys/uio.h>
 
 #include <netdb.h>
--- rarpd.c
+++ rarpd.c
@@ -24,10 +24,11 @@
 #include <sys/fcntl.h>
 #include <sys/socket.h>
 #include <sys/signal.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
+#include <net/if.h>
+#include <net/if_arp.h>
 #include <netinet/in.h>
-#include <linux/if_packet.h>
+#include <netpacket/packet.h>
+#include <linux/if_ether.h>
 #include <linux/filter.h>
 
 int do_reload = 1;
@@ -45,6 +46,8 @@
 extern int ether_ntohost(char *name, unsigned char *ea);
 void usage(void) __attribute__((noreturn));
 
+#define ifaddr if_addr
+
 struct iflink
 {
 	struct iflink	*next;