Back out all of yesterdays include file changes.

29 files changed, 20 insertions, 92 deletions

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 4d03df2..dad3916 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -50,7 +50,7 @@
  *
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	From: inet.h,v 8.6 1996/08/08 06:54:29 vixie Exp
- *	$Id: inet.h,v 1.7 1997/02/23 09:17:19 peter Exp $
+ *	$Id: inet.h,v 1.8 1997/05/07 02:26:47 eivind Exp $
  */
 
 #ifndef _ARPA_INET_H_
@@ -61,7 +61,7 @@
 #include <sys/types.h>
 #include <sys/cdefs.h>
 
-#include <netinet/in.h>
+struct in_addr;
 
 __BEGIN_DECLS
 int		 ascii2addr __P((int, const char *, void *));
diff --git a/include/fts.h b/include/fts.h
index b4837cf..4fa4a3a 100644
--- a/include/fts.h
+++ b/include/fts.h
@@ -36,9 +36,6 @@
 #ifndef	_FTS_H_
 #define	_FTS_H_
 
-#include <sys/types.h>
-#include <nlist.h>
-
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
 	struct _ftsent *fts_child;	/* linked list of children */
diff --git a/include/grp.h b/include/grp.h
index 1c06ece..9e5654a 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -41,8 +41,6 @@
 #ifndef _GRP_H_
 #define	_GRP_H_
 
-#include <sys/types.h>
-
 #ifndef _POSIX_SOURCE
 #define	_PATH_GROUP		"/etc/group"
 #endif
diff --git a/include/link.h b/include/link.h
index e6aa65c..937fffe 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.11 1997/02/23 09:17:13 peter Exp $
+ *	$Id: link.h,v 1.12 1997/05/07 02:26:34 eivind Exp $
  */
 
 /*
@@ -41,9 +41,6 @@
 #ifndef _LINK_H_
 #define _LINK_H_
 
-#include <sys/types.h>
-#include <nlist.h>
-
 /*
  * A `Shared Object Descriptor' describes a shared object that is needed
  * to complete the link edit process of the object containing it.
diff --git a/include/login_cap.h b/include/login_cap.h
index 439ad83..4e59750 100644
--- a/include/login_cap.h
+++ b/include/login_cap.h
@@ -21,14 +21,12 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- *	$Id: login_cap.h,v 1.7 1997/03/14 17:53:35 peter Exp $
+ *	$Id: login_cap.h,v 1.8 1997/05/07 02:26:35 eivind Exp $
  */
 
 #ifndef _LOGIN_CAP_H_
 #define _LOGIN_CAP_H_
 
-#include <sys/types.h>
-
 #define LOGIN_DEFCLASS		"default"
 #define LOGIN_DEFSTYLE		"passwd"
 #define LOGIN_DEFSERVICE	"login"
diff --git a/include/mpool.h b/include/mpool.h
index b678e2b..9e3ebeb 100644
--- a/include/mpool.h
+++ b/include/mpool.h
@@ -36,9 +36,7 @@
 #ifndef _MPOOL_H_
 #define _MPOOL_H_
 
-#include <sys/types.h>
 #include <sys/queue.h>
-#include <db.h>
 
 /*
  * The memory pool scheme is a simple one.  Each in-memory page is referenced
diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 7b31c9e..72eddcd 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -41,8 +41,6 @@
 #ifndef _PROTOCOLS_DUMPRESTORE_H_
 #define _PROTOCOLS_DUMPRESTORE_H_
 
-#include <sys/types.h>
-#include <ufs/ufs/dinode.h>
 /*
  * TP_BSIZE is the size of file blocks on the dump tapes.
  * Note that TP_BSIZE must be a multiple of DEV_BSIZE.
diff --git a/include/protocols/routed.h b/include/protocols/routed.h
index e776f21..07f8349 100644
--- a/include/protocols/routed.h
+++ b/include/protocols/routed.h
@@ -40,10 +40,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ident "$Revision: 1.8 $"
-
-#include <sys/types.h>
-#include <sys/socket.h> 
+#ident "$Revision: 1.9 $"
 
 /*
  * Routing Information Protocol
diff --git a/include/protocols/talkd.h b/include/protocols/talkd.h
index 1d60441..34b5da2 100644
--- a/include/protocols/talkd.h
+++ b/include/protocols/talkd.h
@@ -36,9 +36,6 @@
 #ifndef _PROTOCOLS_TALKD_H_
 #define	_PROTOCOLS_TALKD_H_
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 /*
  * This describes the protocol used by the talk server and clients.
  *
diff --git a/include/protocols/timed.h b/include/protocols/timed.h
index c4df1b9..6c6a05e 100644
--- a/include/protocols/timed.h
+++ b/include/protocols/timed.h
@@ -36,10 +36,6 @@
 #ifndef	_PROTOCOLS_TIMED_H_
 #define	_PROTOCOLS_TIMED_H_
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/param.h>
-
 /*
  * Time Synchronization Protocol
  */
diff --git a/include/pthread_np.h b/include/pthread_np.h
index 874c7fd..e4b5be1 100644
--- a/include/pthread_np.h
+++ b/include/pthread_np.h
@@ -33,8 +33,6 @@
 #ifndef _PTHREAD_NP_H_
 #define _PTHREAD_NP_H_
 
-#include <pthread.h>
-
 /*
  * Non-POSIX thread function prototype definitions:
  */
diff --git a/include/regex.h b/include/regex.h
index efba01e..1611d4b 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -41,7 +41,6 @@
 #define	_REGEX_H_
 
 #include <sys/cdefs.h>
-#include <sys/types.h>
 
 /* types */
 typedef off_t regoff_t;
diff --git a/include/resolv.h b/include/resolv.h
index 45fcb9b..33551a0 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -53,7 +53,7 @@
  *
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp
- *	$Id: resolv.h,v 1.10 1997/02/23 09:17:15 peter Exp $
+ *	$Id: resolv.h,v 1.11 1997/05/07 02:26:36 eivind Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -62,8 +62,6 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <stdio.h>
 
 /*
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 0abf438..30359e2 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	$Id: auth.h,v 1.9 1997/05/07 00:58:23 bde Exp $
+ *	$Id: auth.h,v 1.10 1997/05/07 02:27:00 eivind Exp $
  */
 
 /*
@@ -44,8 +44,6 @@
 #ifndef _RPC_AUTH_H
 #define _RPC_AUTH_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
 
 #define MAX_AUTH_BYTES	400
 #define MAXNETNAMELEN	255	/* maximum length of network user's name */
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index 4d71ea4..81f155c 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: auth_unix.h,v 1.6 1997/02/23 09:17:21 peter Exp $
+ *	$Id: auth_unix.h,v 1.7 1997/05/07 02:27:02 eivind Exp $
  */
 
 /*
@@ -47,9 +47,6 @@
 #ifndef _RPC_AUTH_UNIX_H
 #define _RPC_AUTH_UNIX_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
 
 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 24066f9d..6bddcb7 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)clnt.h 1.31 88/02/08 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
+ *	$Id: clnt.h,v 1.8 1997/05/07 02:27:04 eivind Exp $
  */
 
 /*
@@ -40,9 +40,6 @@
 #ifndef _RPC_CLNT_H_
 #define _RPC_CLNT_H_
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
 
 /*
  * Rpc calls return an enum clnt_stat.  This should be looked at more,
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 3f5dc2d..1d814ae 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_clnt.h,v 1.7 1997/02/23 09:17:22 peter Exp $
+ *	$Id: pmap_clnt.h,v 1.8 1997/05/07 02:27:05 eivind Exp $
  */
 
 /*
@@ -63,9 +63,6 @@
 #ifndef _RPC_PMAPCLNT_H
 #define _RPC_PMAPCLNT_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <netinet/in.h>
 
 __BEGIN_DECLS
 extern bool_t		pmap_set	__P((u_long, u_long, int, int));
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 4c42593..8cf7989 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_prot.h,v 1.6 1997/02/23 09:17:23 peter Exp $
+ *	$Id: pmap_prot.h,v 1.7 1997/05/07 02:27:07 eivind Exp $
  */
 
 /*
@@ -71,8 +71,6 @@
 #ifndef _RPC_PMAPPROT_H
 #define _RPC_PMAPPROT_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
 
 #define PMAPPORT		((u_short)111)
 #define PMAPPROG		((u_long)100000)
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 94472ad..336d1de 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: pmap_rmt.h,v 1.6 1997/02/23 09:17:23 peter Exp $
+ *	$Id: pmap_rmt.h,v 1.7 1997/05/07 02:27:08 eivind Exp $
  */
 
 /*
@@ -41,8 +41,6 @@
 #ifndef _RPC_PMAPRMT_H
 #define _RPC_PMAPRMT_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
 
 struct rmtcallargs {
 	u_long prog, vers, proc, arglen;
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index bc5637d..7b8c205 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: rpc_msg.h,v 1.8 1997/02/23 09:17:24 peter Exp $
+ *	$Id: rpc_msg.h,v 1.9 1997/05/07 02:27:09 eivind Exp $
  */
 
 /*
@@ -40,9 +40,6 @@
 
 #ifndef _RPC_RPCMSG_H
 #define _RPC_RPCMSG_H
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
 
 #define RPC_MSG_VERSION		((u_long) 2)
 #define RPC_SERVICE_PORT	((u_short) 2048)
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index c058bad..3a5ad3b 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: svc.h,v 1.9 1997/02/23 09:17:24 peter Exp $
+ *	$Id: svc.h,v 1.10 1997/05/07 02:27:10 eivind Exp $
  */
 
 /*
@@ -40,11 +40,6 @@
 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/rpc_msg.h>
-#include <netinet/in.h>
 
 /*
  * This interface must manage two items concerning remote procedure calling:
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index e7b8325..5e5fe2c 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	from: @(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- *	$Id: svc_auth.h,v 1.6 1997/02/23 09:17:25 peter Exp $
+ *	$Id: svc_auth.h,v 1.7 1997/05/07 02:27:10 eivind Exp $
  */
 
 /*
@@ -39,10 +39,6 @@
 
 #ifndef _RPC_SVCAUTH_H
 #define _RPC_SVCAUTH_H
-#include <sys/cdefs.h>
-#include <rpc/auth.h>
-#include <rpc/svc.h>
-#include <rpc/rpc_msg.h>
 
 /*
  * Server side authenticator
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 8d82ccd..8ea909b 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- *	$Id: xdr.h,v 1.7 1997/02/23 09:17:25 peter Exp $
+ *	$Id: xdr.h,v 1.8 1997/05/07 02:27:11 eivind Exp $
  */
 
 /*
@@ -40,7 +40,6 @@
 #ifndef _RPC_XDR_H
 #define _RPC_XDR_H
 #include <sys/cdefs.h>
-#include <rpc/types.h>
 
 /*
  * XDR provides a conventional way for converting between C data
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 3ef7046..a518e64 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,14 +26,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: yp_prot.h,v 1.6 1997/02/23 09:17:33 peter Exp $
+ *	$Id: yp_prot.h,v 1.7 1997/05/07 02:27:17 eivind Exp $
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
 #define _RPCSVC_YP_PROT_H_
 
-#include <rpc/rpc.h>
-
 /*
  * YPSERV PROTOCOL:
  *
diff --git a/include/utime.h b/include/utime.h
index a1e77fc..1ea12d0 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -36,8 +36,6 @@
 #ifndef	_UTIME_H_
 #define	_UTIME_H_
 
-#include <sys/types.h>
-
 struct utimbuf {
 	time_t actime;		/* Access time */
 	time_t modtime;		/* Modification time */
diff --git a/include/utmp.h b/include/utmp.h
index 573ed68..e823b4c 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,14 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- *	$Id: utmp.h,v 1.5 1997/02/23 09:17:16 peter Exp $
+ *	$Id: utmp.h,v 1.6 1997/05/07 02:26:37 eivind Exp $
  */
 
 #ifndef	_UTMP_H_
 #define	_UTMP_H_
 
-#include <sys/types.h>
-
 #define	_PATH_UTMP	"/var/run/utmp"
 #define	_PATH_WTMP	"/var/log/wtmp"
 #define	_PATH_LASTLOG	"/var/log/lastlog"
diff --git a/lib/libc/gen/fts-compat.h b/lib/libc/gen/fts-compat.h
index b4837cf..4fa4a3a 100644
--- a/lib/libc/gen/fts-compat.h
+++ b/lib/libc/gen/fts-compat.h
@@ -36,9 +36,6 @@
 #ifndef	_FTS_H_
 #define	_FTS_H_
 
-#include <sys/types.h>
-#include <nlist.h>
-
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
 	struct _ftsent *fts_child;	/* linked list of children */
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index e6aa65c..937fffe 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.11 1997/02/23 09:17:13 peter Exp $
+ *	$Id: link.h,v 1.12 1997/05/07 02:26:34 eivind Exp $
  */
 
 /*
@@ -41,9 +41,6 @@
 #ifndef _LINK_H_
 #define _LINK_H_
 
-#include <sys/types.h>
-#include <nlist.h>
-
 /*
  * A `Shared Object Descriptor' describes a shared object that is needed
  * to complete the link edit process of the object containing it.
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index e6aa65c..937fffe 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.11 1997/02/23 09:17:13 peter Exp $
+ *	$Id: link.h,v 1.12 1997/05/07 02:26:34 eivind Exp $
  */
 
 /*
@@ -41,9 +41,6 @@
 #ifndef _LINK_H_
 #define _LINK_H_
 
-#include <sys/types.h>
-#include <nlist.h>
-
 /*
  * A `Shared Object Descriptor' describes a shared object that is needed
  * to complete the link edit process of the object containing it.