5 files changed, 11 insertions, 5 deletions

diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c
index 94ae5c996a..1124e43253 100644
--- a/src/lib/libc/net/ethers.c
+++ b/src/lib/libc/net/ethers.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ethers.c,v 1.10 1998/11/18 23:28:54 deraadt Exp $     */
+/*      $OpenBSD: ethers.c,v 1.11 2000/08/22 19:04:41 deraadt Exp $     */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ethers.c,v 1.10 1998/11/18 23:28:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ethers.c,v 1.11 2000/08/22 19:04:41 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -49,6 +49,9 @@ static char rcsid[] = "$OpenBSD: ethers.c,v 1.10 1998/11/18 23:28:54 deraadt Exp
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#ifdef YP
+#include <rpcsvc/ypclnt.h>
+#endif
 
 #ifndef _PATH_ETHERS
 #define _PATH_ETHERS    "/etc/ethers"
diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index a443d8c9f2..fc097360bf 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.25 2000/07/09 04:48:35 itojun Exp $ */
+/*      $OpenBSD: getaddrinfo.c,v 1.26 2000/08/22 19:04:42 deraadt Exp $        */
 /*      $KAME: getaddrinfo.c,v 1.30 2000/07/09 04:37:25 itojun Exp $    */
 
 /*
@@ -103,8 +103,9 @@
 
 #ifdef YP
 #include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
+#include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
+#include "ypinternal.h"
 #endif
 
 #define SUCCESS 0
diff --git a/src/lib/libc/net/if_indextoname.c b/src/lib/libc/net/if_indextoname.c
index 0b71010ace..4b38f851a1 100644
--- a/src/lib/libc/net/if_indextoname.c
+++ b/src/lib/libc/net/if_indextoname.c
@@ -38,6 +38,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <errno.h>
+#include <unistd.h>
 #include <string.h>
 
 static char __name[IFNAMSIZ];
diff --git a/src/lib/libc/net/if_nameindex.c b/src/lib/libc/net/if_nameindex.c
index 8643397db2..9e4a71faa9 100644
--- a/src/lib/libc/net/if_nameindex.c
+++ b/src/lib/libc/net/if_nameindex.c
@@ -38,6 +38,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <errno.h>
+#include <unistd.h>
 #include <string.h>
 
 struct if_nameindex *
@@ -48,7 +49,6 @@ if_nameindex(void)
         struct ifconf ifconf;
         char    lastname[IFNAMSIZ], *c, *inbuf;
         struct if_nameindex *n;
-        struct sockaddr_dl *sd;
         struct sockaddr *sa;
         void   *p;
 
diff --git a/src/lib/libc/net/if_nametoindex.c b/src/lib/libc/net/if_nametoindex.c
index d41f8ecad1..3a83714376 100644
--- a/src/lib/libc/net/if_nametoindex.c
+++ b/src/lib/libc/net/if_nametoindex.c
@@ -38,6 +38,7 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
 
 unsigned int