From f0e9631687e2cb78e9d9d572a7771d3c1796fec3 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 5 Dec 2012 23:20:06 +0000
Subject: [PATCH] Remove excessive sys/cdefs.h inclusion ok guenther millert
 kettenis

---
 src/include/arpa/inet.h     | 3 +--
 src/include/arpa/nameser.h  | 3 +--
 src/include/bm.h            | 4 +---
 src/include/db.h            | 3 +--
 src/include/errno.h         | 3 +--
 src/include/fts.h           | 4 +---
 src/include/glob.h          | 3 +--
 src/include/grp.h           | 3 +--
 src/include/kvm.h           | 3 +--
 src/include/langinfo.h      | 3 +--
 src/include/math.h          | 3 +--
 src/include/md4.h           | 4 +---
 src/include/md5.h           | 4 +---
 src/include/pwd.h           | 3 +--
 src/include/regex.h         | 3 +--
 src/include/resolv.h        | 3 +--
 src/include/rmd160.h        | 4 +---
 src/include/sgtty.h         | 3 +--
 src/include/sha1.h          | 4 +---
 src/include/sha2.h          | 4 +---
 src/include/signal.h        | 3 +--
 src/include/spawn.h         | 3 +--
 src/include/unistd.h        | 3 +--
 src/lib/libc/stdlib/cfree.c | 3 +--
 src/lib/libutil/fparseln.c  | 4 +---
 src/lib/libutil/opendisk.c  | 3 +--
 src/lib/libutil/pty.c       | 3 +--
 src/lib/libutil/util.h      | 3 +--
 28 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/src/include/arpa/inet.h b/src/include/arpa/inet.h
index 31b68cce..d653736d 100644
--- a/src/include/arpa/inet.h
+++ b/src/include/arpa/inet.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.h,v 1.14 2012/09/15 00:47:08 guenther Exp $	*/
+/*	$OpenBSD: inet.h,v 1.15 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1993
@@ -61,7 +61,6 @@
 
 /* External definitions for functions in inet(3) */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/endian.h>
 
diff --git a/src/include/arpa/nameser.h b/src/include/arpa/nameser.h
index 4f47f727..7893f335 100644
--- a/src/include/arpa/nameser.h
+++ b/src/include/arpa/nameser.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nameser.h,v 1.11 2005/12/20 02:06:56 millert Exp $	*/
+/*	$OpenBSD: nameser.h,v 1.12 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1989, 1993
@@ -81,7 +81,6 @@
 #ifndef _NAMESER_H_
 #define _NAMESER_H_
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 /*
diff --git a/src/include/bm.h b/src/include/bm.h
index a9d6f212..1cec4d50 100644
--- a/src/include/bm.h
+++ b/src/include/bm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bm.h,v 1.8 2004/01/22 21:48:02 espie Exp $	*/
+/*	$OpenBSD: bm.h,v 1.9 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $	*/
 
 /*-
@@ -47,8 +47,6 @@ typedef struct {
 	size_t	 	md2;		/* mini delta */
 } bm_pat;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 bm_pat		*bm_comp(unsigned char const *, size_t, unsigned char const *);
 unsigned char	*bm_exec(bm_pat *, unsigned char *, size_t)
diff --git a/src/include/db.h b/src/include/db.h
index 404dcf8c..332452e5 100644
--- a/src/include/db.h
+++ b/src/include/db.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db.h,v 1.8 2004/01/22 21:48:02 espie Exp $	*/
+/*	$OpenBSD: db.h,v 1.9 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: db.h,v 1.13 1994/10/26 00:55:48 cgd Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #define	_DB_H_
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
 #include <limits.h>
 
diff --git a/src/include/errno.h b/src/include/errno.h
index 7675a45e..b1ca3427 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errno.h,v 1.1 2005/12/28 16:33:56 millert Exp $	*/
+/*	$OpenBSD: errno.h,v 1.2 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -39,7 +39,6 @@
 #ifndef	_ERRNO_H_
 #define	_ERRNO_H_
 
-#include <sys/cdefs.h>
 #include <sys/errno.h>
 
 __BEGIN_DECLS
diff --git a/src/include/fts.h b/src/include/fts.h
index 537e24b6..eaf6be07 100644
--- a/src/include/fts.h
+++ b/src/include/fts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.h,v 1.13 2010/09/24 13:56:32 millert Exp $	*/
+/*	$OpenBSD: fts.h,v 1.14 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $	*/
 
 /*
@@ -113,8 +113,6 @@ typedef struct _ftsent {
 	char fts_name[1];		/* file name */
 } FTSENT;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
diff --git a/src/include/glob.h b/src/include/glob.h
index 106110cf..92d06e60 100644
--- a/src/include/glob.h
+++ b/src/include/glob.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.h,v 1.12 2012/10/01 00:21:19 guenther Exp $	*/
+/*	$OpenBSD: glob.h,v 1.13 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/
 
 /*
@@ -38,7 +38,6 @@
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 
 struct stat;
diff --git a/src/include/grp.h b/src/include/grp.h
index 655e89e7..46f139d5 100644
--- a/src/include/grp.h
+++ b/src/include/grp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grp.h,v 1.10 2012/10/01 00:21:19 guenther Exp $	*/
+/*	$OpenBSD: grp.h,v 1.11 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: grp.h,v 1.7 1995/04/29 05:30:40 cgd Exp $	*/
 
 /*-
@@ -40,7 +40,6 @@
 #ifndef _GRP_H_
 #define	_GRP_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #if __BSD_VISIBLE
diff --git a/src/include/kvm.h b/src/include/kvm.h
index a1836452..ea7e2cd6 100644
--- a/src/include/kvm.h
+++ b/src/include/kvm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.h,v 1.16 2012/01/07 05:38:12 guenther Exp $	*/
+/*	$OpenBSD: kvm.h,v 1.17 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $	*/
 
 /*-
@@ -46,7 +46,6 @@
 #define KVM_NO_FILES	0x80000000
 
 #include <nlist.h>
-#include <sys/cdefs.h>
 #include <stdio.h>
 
 __BEGIN_DECLS
diff --git a/src/include/langinfo.h b/src/include/langinfo.h
index d2081477..62443094 100644
--- a/src/include/langinfo.h
+++ b/src/include/langinfo.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: langinfo.h,v 1.6 2011/07/07 14:25:15 sobrado Exp $	*/
+/*	$OpenBSD: langinfo.h,v 1.7 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: langinfo.h,v 1.3 1995/04/28 23:30:54 jtc Exp $	*/
 
 /*
@@ -9,7 +9,6 @@
 #ifndef _LANGINFO_H_
 #define _LANGINFO_H_
 
-#include <sys/cdefs.h>
 #include <nl_types.h>
 
 #define D_T_FMT		0	/* String for formatting date and time */
diff --git a/src/include/math.h b/src/include/math.h
index 952166ad..cad79114 100644
--- a/src/include/math.h
+++ b/src/include/math.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: math.h,v 1.30 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: math.h,v 1.31 2012/12/05 23:19:57 deraadt Exp $	*/
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -18,7 +18,6 @@
 #define _MATH_H_
 
 #include <sys/_types.h>
-#include <sys/cdefs.h>
 #include <sys/limits.h>
 
 __BEGIN_DECLS
diff --git a/src/include/md4.h b/src/include/md4.h
index 3459de3d..46a421b0 100644
--- a/src/include/md4.h
+++ b/src/include/md4.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md4.h,v 1.15 2004/06/22 01:57:30 jfb Exp $	*/
+/*	$OpenBSD: md4.h,v 1.16 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * This code implements the MD4 message-digest algorithm.
@@ -26,8 +26,6 @@ typedef struct MD4Context {
 	u_int8_t buffer[MD4_BLOCK_LENGTH];	/* input buffer */
 } MD4_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 MD4Init(MD4_CTX *);
 void	 MD4Update(MD4_CTX *, const u_int8_t *, size_t)
diff --git a/src/include/md5.h b/src/include/md5.h
index 3599640a..2fa7de88 100644
--- a/src/include/md5.h
+++ b/src/include/md5.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.h,v 1.16 2004/06/22 01:57:30 jfb Exp $	*/
+/*	$OpenBSD: md5.h,v 1.17 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -25,8 +25,6 @@ typedef struct MD5Context {
 	u_int8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
 } MD5_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 MD5Init(MD5_CTX *);
 void	 MD5Update(MD5_CTX *, const u_int8_t *, size_t)
diff --git a/src/include/pwd.h b/src/include/pwd.h
index b24e7f5e..bcd4800e 100644
--- a/src/include/pwd.h
+++ b/src/include/pwd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd.h,v 1.20 2008/06/25 14:51:27 millert Exp $	*/
+/*	$OpenBSD: pwd.h,v 1.21 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
 
 /*-
@@ -41,7 +41,6 @@
 #ifndef _PWD_H_
 #define	_PWD_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #if __BSD_VISIBLE
diff --git a/src/include/regex.h b/src/include/regex.h
index aec38e33..e24d9ae3 100644
--- a/src/include/regex.h
+++ b/src/include/regex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regex.h,v 1.6 2003/06/02 19:34:12 millert Exp $	*/
+/*	$OpenBSD: regex.h,v 1.7 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $	*/
 
 /*-
@@ -39,7 +39,6 @@
 #ifndef _REGEX_H_
 #define	_REGEX_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /* types */
diff --git a/src/include/resolv.h b/src/include/resolv.h
index 88fb92f5..3cbfb161 100644
--- a/src/include/resolv.h
+++ b/src/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.18 2012/07/10 11:46:23 guenther Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.19 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -88,7 +88,6 @@
 #ifndef _RESOLV_H_
 #define	_RESOLV_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
diff --git a/src/include/rmd160.h b/src/include/rmd160.h
index 185c5476..5137c59b 100644
--- a/src/include/rmd160.h
+++ b/src/include/rmd160.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmd160.h,v 1.16 2004/06/22 01:57:30 jfb Exp $	*/
+/*	$OpenBSD: rmd160.h,v 1.17 2012/12/05 23:19:57 deraadt Exp $	*/
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -36,8 +36,6 @@ typedef struct RMD160Context {
 	u_int8_t buffer[RMD160_BLOCK_LENGTH];	/* input buffer */
 } RMD160_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 RMD160Init(RMD160_CTX *);
 void	 RMD160Transform(u_int32_t [5], const u_int8_t [RMD160_BLOCK_LENGTH])
diff --git a/src/include/sgtty.h b/src/include/sgtty.h
index 5b4c8110..09f626f0 100644
--- a/src/include/sgtty.h
+++ b/src/include/sgtty.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgtty.h,v 1.4 2003/06/02 19:34:12 millert Exp $	*/
+/*	$OpenBSD: sgtty.h,v 1.5 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: sgtty.h,v 1.4 1995/06/05 19:40:33 pk Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #define	USE_OLD_TTY
 #endif
 #include <sys/ioctl.h>
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 int gtty(int, struct sgttyb *);
diff --git a/src/include/sha1.h b/src/include/sha1.h
index 9834cf87..f596be65 100644
--- a/src/include/sha1.h
+++ b/src/include/sha1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sha1.h,v 1.23 2004/06/22 01:57:30 jfb Exp $	*/
+/*	$OpenBSD: sha1.h,v 1.24 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * SHA-1 in C
@@ -19,8 +19,6 @@ typedef struct {
     u_int8_t buffer[SHA1_BLOCK_LENGTH];
 } SHA1_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void SHA1Init(SHA1_CTX *);
 void SHA1Pad(SHA1_CTX *);
diff --git a/src/include/sha2.h b/src/include/sha2.h
index b072f7c5..d85aabc7 100644
--- a/src/include/sha2.h
+++ b/src/include/sha2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sha2.h,v 1.7 2008/09/06 12:00:19 djm Exp $	*/
+/*	$OpenBSD: sha2.h,v 1.8 2012/12/05 23:19:57 deraadt Exp $	*/
 
 /*
  * FILE:	sha2.h
@@ -60,8 +60,6 @@ typedef struct _SHA2_CTX {
 	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
 } SHA2_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void SHA256Init(SHA2_CTX *);
 void SHA256Transform(u_int32_t state[8], const u_int8_t [SHA256_BLOCK_LENGTH]);
diff --git a/src/include/signal.h b/src/include/signal.h
index 6ca1e85c..a29ea54f 100644
--- a/src/include/signal.h
+++ b/src/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.19 2012/06/10 21:31:03 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.20 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
 #ifndef _USER_SIGNAL_H
 #define _USER_SIGNAL_H
 
-#include <sys/cdefs.h>
 #include <sys/signal.h>
 
 #if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE
diff --git a/src/include/spawn.h b/src/include/spawn.h
index 00ba8ffd..eed2564d 100644
--- a/src/include/spawn.h
+++ b/src/include/spawn.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spawn.h,v 1.1 2012/03/21 23:20:35 matthew Exp $	*/
+/*	$OpenBSD: spawn.h,v 1.2 2012/12/05 23:19:57 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
@@ -30,7 +30,6 @@
 #ifndef _SPAWN_H_
 #define _SPAWN_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/signal.h>
 
diff --git a/src/include/unistd.h b/src/include/unistd.h
index c4a2fa92..6609fbcf 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.73 2012/06/21 00:56:59 guenther Exp $ */
+/*	$OpenBSD: unistd.h,v 1.74 2012/12/05 23:19:57 deraadt Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
 #ifndef _UNISTD_H_
 #define	_UNISTD_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/unistd.h>
 
diff --git a/src/lib/libc/stdlib/cfree.c b/src/lib/libc/stdlib/cfree.c
index 373c7ff7..acf6d1c8 100644
--- a/src/lib/libc/stdlib/cfree.c
+++ b/src/lib/libc/stdlib/cfree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfree.c,v 1.5 2005/08/08 08:05:36 espie Exp $	*/
+/*	$OpenBSD: cfree.c,v 1.6 2012/12/05 23:20:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -25,7 +25,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <stdlib.h>
 
 #ifdef __indr_reference
diff --git a/src/lib/libutil/fparseln.c b/src/lib/libutil/fparseln.c
index a8c57e80..b386e306 100644
--- a/src/lib/libutil/fparseln.c
+++ b/src/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fparseln.c,v 1.6 2005/08/02 21:46:23 espie Exp $	*/
+/*	$OpenBSD: fparseln.c,v 1.7 2012/12/05 23:20:06 deraadt Exp $	*/
 /*	$NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $	*/
 
 /*
@@ -30,8 +30,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/lib/libutil/opendisk.c b/src/lib/libutil/opendisk.c
index 62178b42..3840f705 100644
--- a/src/lib/libutil/opendisk.c
+++ b/src/lib/libutil/opendisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opendisk.c,v 1.5 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: opendisk.c,v 1.6 2012/12/05 23:20:06 deraadt Exp $	*/
 /*	$NetBSD: opendisk.c,v 1.4 1997/09/30 17:13:50 phil Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <errno.h>
diff --git a/src/lib/libutil/pty.c b/src/lib/libutil/pty.c
index 86fddb1f..2fb20880 100644
--- a/src/lib/libutil/pty.c
+++ b/src/lib/libutil/pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pty.c,v 1.17 2012/07/09 14:26:40 nicm Exp $	*/
+/*	$OpenBSD: pty.c,v 1.18 2012/12/05 23:20:06 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/src/lib/libutil/util.h b/src/lib/libutil/util.h
index 6fe0b016..92e3c45e 100644
--- a/src/lib/libutil/util.h
+++ b/src/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.32 2012/09/09 18:08:21 matthew Exp $	*/
+/*	$OpenBSD: util.h,v 1.33 2012/12/05 23:20:06 deraadt Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -34,7 +34,6 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*