--- src/dhcp6c.c.orig	2008-07-29 17:20:01.000000000 -0700
+++ src/dhcp6c.c	2008-08-02 10:31:37.000000000 -0700
@@ -74,6 +74,10 @@
 # include <netinet6/in6_var.h>
 #endif
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 #include <linux/netlink.h>
 #include <netlink/socket.h>
 #include <netlink/route/rtnl.h>
--- src/dhcp6s.c.orig	2008-07-29 17:20:01.000000000 -0700
+++ src/dhcp6s.c	2008-08-02 10:31:47.000000000 -0700
@@ -62,6 +62,10 @@
 # include <linux/sockios.h>
 #endif
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 #include "dhcp6.h"
 #include "cfg.h"
 #include "common.h"
--- src/Makefile.orig	2008-08-02 10:29:37.000000000 -0700
+++ src/Makefile	2008-08-02 10:30:04.000000000 -0700
@@ -276,20 +276,20 @@
 
 dhcp6clientinclude_HEADERS = client6_parse.h
 lib_LTLIBRARIES = libdhcp6client.la
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6s_CFLAGS = -fPIE
 dhcp6s_LDFLAGS = $(BINLDFLAGS)
 dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
                  server6_token.l $(COMMONSRCS)
 
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
 dhcp6r_LDFLAGS = $(BINLDFLAGS)
 dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
 dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
 dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
                  client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
 
-libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)
+libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
 libdhcp6client_la_LDFLAGS = -version-info \
                                 $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
                             -release $(LT_RELEASE) \
--- src/relay6_socket.c.orig	2008-07-29 17:20:01.000000000 -0700
+++ src/relay6_socket.c	2008-08-02 10:32:33.000000000 -0700
@@ -42,6 +42,10 @@
 #include "relay6_parser.h"
 #include "relay6_database.h"
 
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
 #ifndef IPV6_2292PKTINFO
 #define IPV6_2292PKTINFO IPV6_PKTINFO
 #endif