Index: dns.c
--- dns.c.orig	2008-08-19 19:07:33 +0200
+++ dns.c	2008-08-20 09:09:56 +0200
@@ -35,6 +35,11 @@
 
 #define BIND_8_COMPAT
 #include <arpa/nameser.h>
+
+#ifdef NEED_NAMESER8_COMPAT
+#include <arpa/nameser8_compat.h>
+#endif
+
 #include <netdb.h>
 #include <resolv.h>
 #include <unistd.h>
Index: getopt.c
--- getopt.c.orig	2008-08-19 18:55:48 +0200
+++ getopt.c	2008-08-20 09:09:56 +0200
@@ -49,7 +49,6 @@
    program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
 
 
 /* This needs to come after some library #include
@@ -691,7 +690,6 @@
 			   0);
 }
 
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
 
 #ifdef TEST
 
Index: getopt1.c
--- getopt1.c.orig	2008-08-19 18:55:48 +0200
+++ getopt1.c	2008-08-20 09:09:56 +0200
@@ -40,7 +40,6 @@
    program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
 
 
 /* This needs to come after some library #include
@@ -83,7 +82,6 @@
 }
 
 
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
 
 #ifdef TEST