--- a/./eloop.c	2014-11-15 09:30:34.660000000 +0000
+++ b/./eloop.c	2014-11-15 09:30:40.820000000 +0000
@@ -28,7 +28,6 @@
 /* Needed for ppoll(2) */
 #define _GNU_SOURCE
 
-#include <sys/queue.h>
 #include <sys/time.h>
 
 #include <errno.h>
--- a/./dhcpcd.c	2014-11-15 08:12:19.310000000 +0000
+++ b/./dhcpcd.c	2014-11-15 08:12:29.390000000 +0000
@@ -30,7 +30,6 @@ const char dhcpcd_copyright[] = "Copyrig
 #define _WITH_DPRINTF /* Stop FreeBSD bitching */
 
 #include <sys/file.h>
-#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
--- a/./ipv6nd.h	2014-11-15 09:30:16.200000000 +0000
+++ b/./ipv6nd.h	2014-11-15 09:30:23.130000000 +0000
@@ -28,8 +28,6 @@
 #ifndef IPV6ND_H
 #define IPV6ND_H
 
-#include <sys/queue.h>
-
 #include <time.h>
 
 #include "dhcpcd.h"
--- a/./compat/queue.h	2014-11-15 08:04:57.480000000 +0000
+++ b/./compat/queue.h	2014-11-15 08:05:08.200000000 +0000
@@ -34,7 +34,6 @@
 #ifndef COMPAT_QUEUE_H
 #define COMPAT_QUEUE_H
 
-#include <sys/queue.h>
 /*
  * Tail queue definitions.
  */
--- a/./compat/svis.c	2014-11-15 09:40:15.580000000 +0000
+++ b/./compat/svis.c	2014-11-15 09:42:44.780000000 +0000
@@ -60,6 +60,7 @@
  * Please use the source in NetBSD for a fuller working copy.
  */
 
+#define __NEED_uint8_t
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -71,6 +72,8 @@
 #undef BELL
 #define BELL '\a'
 
+typedef uint8_t u_char;
+
 #define isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
 #define iswhite(c)	(c == ' ' || c == '\t' || c == '\n')
 
--- a/./dhcpcd.h	2014-11-15 08:05:20.060000000 +0000
+++ b/./dhcpcd.h	2014-11-15 08:05:35.850000000 +0000
@@ -28,7 +28,6 @@
 #ifndef DHCPCD_H
 #define DHCPCD_H
 
-#include <sys/queue.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
--- a/./common.c	2014-11-15 08:03:46.050000000 +0000
+++ b/./common.c	2014-11-15 08:04:25.780000000 +0000
@@ -30,10 +30,6 @@
 #  define _GNU_SOURCE
 #endif
 
-#ifndef __sun
-#  include <sys/cdefs.h>
-#endif
-
 #ifdef __APPLE__
 #  include <mach/mach_time.h>
 #  include <mach/kern_return.h>
--- a/./auth.h	2014-11-15 08:05:50.140000000 +0000
+++ b/./auth.h	2014-11-15 08:05:58.200000000 +0000
@@ -28,8 +28,6 @@
 #ifndef AUTH_H
 #define AUTH_H
 
-#include <sys/queue.h>
-
 #define DHCPCD_AUTH_SEND	(1 << 0)
 #define DHCPCD_AUTH_REQUIRE	(1 << 1)
 #define DHCPCD_AUTH_RDM_COUNTER	(1 << 2)
--- a/./ipv6.h	2014-11-15 09:30:00.650000000 +0000
+++ b/./ipv6.h	2014-11-15 09:30:06.870000000 +0000
@@ -28,7 +28,6 @@
 #ifndef IPV6_H
 #define IPV6_H
 
-#include <sys/queue.h>
 #include <sys/uio.h>
 
 #include <netinet/in.h>
--- a/./auth.c	2014-11-15 09:37:57.690000000 +0000
+++ b/./auth.c	2014-11-15 09:38:01.890000000 +0000
@@ -26,7 +26,6 @@
  */
 
 #include <sys/file.h>
-#include <sys/queue.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
--- a/./if-options.c	2014-11-15 09:31:36.130000000 +0000
+++ b/./if-options.c	2014-11-15 09:31:49.790000000 +0000
@@ -29,7 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <arpa/inet.h>
 
--- a/./ipv4.c	2014-11-15 09:32:02.680000000 +0000
+++ b/./ipv4.c	2014-11-15 09:32:12.110000000 +0000
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/types.h>