diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index 5cde6d6c6c..ef038bac13 100644
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -1,7 +1,7 @@
 #include <isc/net.h>
 #include <lwres/netdb.h>
 #include <stdio.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/param.h>	/* ALIGN */
 
 static struct hostent *he = NULL;
diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index fb511fbac4..d70503dfde 100644
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -198,7 +198,7 @@ getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
 	if ((af == AF_INET6 && IN6_IS_ADDR_V4COMPAT((struct in6_addr *)src)) ||
 	    (af == AF_INET6 && IN6_IS_ADDR_V4MAPPED((struct in6_addr *)src)) ||
 	    (af == AF_INET)) {
-		const char *cp = src;
+		const unsigned char *cp = src;
 
 		if (af == AF_INET6)
 			cp += 12;
diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index 8893d5c3c5..498bb2b523 100644
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -106,11 +106,12 @@
 
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h.in,v 1.9 2000/01/27 12:19:57 marka Exp $
+ *	$Id: netdb.h.in,v 1.10 2000/01/27 13:04:15 marka Exp $
  */
 
-#include <isc/net.h>
 #include <stdio.h>
+#include <isc/net.h>
+#include <isc/lang.h>
 
 #ifndef _PATH_HEQUIV
 #define _PATH_HEQUIV	"/etc/hosts.equiv"
@@ -316,7 +317,10 @@ struct	addrinfo {
 
 extern int h_errno;
 
-__BEGIN_DECLS
+ISC_LANG_BEGINDECLS
+#ifndef __P
+#define __P(x) x
+#endif
 void		endhostent __P((void));
 void		endnetent __P((void));
 void		endprotoent __P((void));
@@ -385,7 +389,7 @@ struct servent	*getservent_r __P((struct servent *, char *, int));
 void		setservent_r __P((int));
 void		endservent_r __P((void));
 #endif
-__END_DECLS
+ISC_LANG_BEGINDECLS
 
 /* This is nec'y to make this include file properly replace the sun version. */
 #ifdef sun