Remove excessive sys/cdefs.h inclusion

ok guenther millert kettenis

459 files changed, 457 insertions, 1132 deletions

diff --git a/games/backgammon/teachgammon/data.c b/games/backgammon/teachgammon/data.c
index 1049f0f109b..d1ac02034f0 100644
--- a/games/backgammon/teachgammon/data.c
+++ b/games/backgammon/teachgammon/data.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: data.c,v 1.6 2009/10/27 23:59:23 deraadt Exp $	*/
+/*	$OpenBSD: data.c,v 1.7 2012/12/05 23:19:48 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include "tutor.h"
 
 int     maxmoves = 23;
diff --git a/games/hunt/hunt/display.c b/games/hunt/hunt/display.c
index 07fcd2d9dc1..d77d0817896 100644
--- a/games/hunt/hunt/display.c
+++ b/games/hunt/hunt/display.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: display.c,v 1.4 2002/02/19 19:39:36 millert Exp $	*/
+/*	$OpenBSD: display.c,v 1.5 2012/12/05 23:19:50 deraadt Exp $	*/
 
 /*
  * Display abstraction.
@@ -9,7 +9,6 @@
 #define USE_CURSES
 #endif
 
-#include <sys/cdefs.h>
 #include "display.h"
 
 #if !defined(USE_CURSES)
diff --git a/games/sail/assorted.c b/games/sail/assorted.c
index 7a22017aedb..1ddbd56d857 100644
--- a/games/sail/assorted.c
+++ b/games/sail/assorted.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: assorted.c,v 1.5 2009/10/27 23:59:27 deraadt Exp $	*/
+/*	$OpenBSD: assorted.c,v 1.6 2012/12/05 23:19:50 deraadt Exp $	*/
 /*	$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $	*/
 
 /*
@@ -31,7 +31,6 @@
  */
 
 #include "extern.h"
-#include <sys/cdefs.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
diff --git a/games/trek/getpar.h b/games/trek/getpar.h
index eccb2ff02b8..632fa81cb57 100644
--- a/games/trek/getpar.h
+++ b/games/trek/getpar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getpar.h,v 1.7 2010/04/30 19:29:01 jsg Exp $	*/
+/*	$OpenBSD: getpar.h,v 1.8 2012/12/05 23:19:50 deraadt Exp $	*/
 /*	$NetBSD: getpar.h,v 1.3 1995/04/22 10:58:59 cgd Exp $	*/
 
 /*
@@ -32,8 +32,6 @@
  *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <sys/cdefs.h>
-
 typedef void (*cmdfun)(int);
 
 struct cvntab		/* used for getcodpar() parameter list */
diff --git a/games/trek/trek.h b/games/trek/trek.h
index 1b5f6fee8d4..42ea02d1775 100644
--- a/games/trek/trek.h
+++ b/games/trek/trek.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trek.h,v 1.11 2010/04/30 19:29:01 jsg Exp $	*/
+/*	$OpenBSD: trek.h,v 1.12 2012/12/05 23:19:51 deraadt Exp $	*/
 /*	$NetBSD: trek.h,v 1.3 1995/04/22 10:59:36 cgd Exp $	*/
 
 /*
@@ -32,8 +32,6 @@
  *	@(#)trek.h	8.1 (Berkeley) 5/31/93
  */
 
-#include <sys/cdefs.h>
-
 /*
 **  Global Declarations
 **
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 31b68cceee6..d653736d2b8 100644
--- a/include/arpa/inet.h
+++ b/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/include/arpa/nameser.h b/include/arpa/nameser.h
index 4f47f727b6c..7893f3354e1 100644
--- a/include/arpa/nameser.h
+++ b/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/include/bm.h b/include/bm.h
index a9d6f2127bd..1cec4d50385 100644
--- a/include/bm.h
+++ b/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/include/db.h b/include/db.h
index 404dcf8cd5c..332452e5b19 100644
--- a/include/db.h
+++ b/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/include/errno.h b/include/errno.h
index 7675a45e45b..b1ca3427ba2 100644
--- a/include/errno.h
+++ b/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/include/fts.h b/include/fts.h
index 537e24b6c29..eaf6be07c6f 100644
--- a/include/fts.h
+++ b/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/include/glob.h b/include/glob.h
index 106110cfabd..92d06e60f3c 100644
--- a/include/glob.h
+++ b/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/include/grp.h b/include/grp.h
index 655e89e79c3..46f139d5a4a 100644
--- a/include/grp.h
+++ b/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/include/kvm.h b/include/kvm.h
index a1836452da2..ea7e2cd657b 100644
--- a/include/kvm.h
+++ b/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/include/langinfo.h b/include/langinfo.h
index d20814770d0..62443094c59 100644
--- a/include/langinfo.h
+++ b/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/include/math.h b/include/math.h
index 952166ad673..cad79114bd4 100644
--- a/include/math.h
+++ b/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/include/md4.h b/include/md4.h
index 3459de3d6b7..46a421b013e 100644
--- a/include/md4.h
+++ b/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/include/md5.h b/include/md5.h
index 3599640aecb..2fa7de88755 100644
--- a/include/md5.h
+++ b/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/include/pwd.h b/include/pwd.h
index b24e7f5e7a2..bcd4800e959 100644
--- a/include/pwd.h
+++ b/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/include/regex.h b/include/regex.h
index aec38e33442..e24d9ae35e9 100644
--- a/include/regex.h
+++ b/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/include/resolv.h b/include/resolv.h
index 88fb92f5d2f..3cbfb161112 100644
--- a/include/resolv.h
+++ b/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/include/rmd160.h b/include/rmd160.h
index 185c54761b1..5137c59b375 100644
--- a/include/rmd160.h
+++ b/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/include/sgtty.h b/include/sgtty.h
index 5b4c811042d..09f626f09c7 100644
--- a/include/sgtty.h
+++ b/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/include/sha1.h b/include/sha1.h
index 9834cf8706a..f596be65ee2 100644
--- a/include/sha1.h
+++ b/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/include/sha2.h b/include/sha2.h
index b072f7c54b2..d85aabc7f55 100644
--- a/include/sha2.h
+++ b/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/include/signal.h b/include/signal.h
index 6ca1e85c808..a29ea54f576 100644
--- a/include/signal.h
+++ b/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/include/spawn.h b/include/spawn.h
index 00ba8ffd335..eed2564d52f 100644
--- a/include/spawn.h
+++ b/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/include/unistd.h b/include/unistd.h
index c4a2fa92775..6609fbcf42b 100644
--- a/include/unistd.h
+++ b/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/lib/csu/arm/crt0.c b/lib/csu/arm/crt0.c
index dec1536a3c6..2fa7262a0e6 100644
--- a/lib/csu/arm/crt0.c
+++ b/lib/csu/arm/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.2 2004/02/01 05:44:37 drahn Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.3 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: crt0.c,v 1.6 2002/01/01 01:31:06 thorpej Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <machine/asm.h>
diff --git a/lib/csu/common_elf/crtend.c b/lib/csu/common_elf/crtend.c
index 6f61be9afa8..287e7bc1045 100644
--- a/lib/csu/common_elf/crtend.c
+++ b/lib/csu/common_elf/crtend.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: crtend.c,v 1.9 2010/05/01 11:32:43 kettenis Exp $	*/
+/*	$OpenBSD: crtend.c,v 1.10 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: crtend.c,v 1.1 1996/09/12 16:59:04 cgd Exp $	*/
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "md_init.h"
 #include "extern.h"
 
diff --git a/lib/csu/common_elf/crtendS.c b/lib/csu/common_elf/crtendS.c
index cb41b9fcb49..6ebfc5b3591 100644
--- a/lib/csu/common_elf/crtendS.c
+++ b/lib/csu/common_elf/crtendS.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: crtendS.c,v 1.7 2010/05/01 11:32:43 kettenis Exp $	*/
+/*	$OpenBSD: crtendS.c,v 1.8 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: crtend.c,v 1.1 1997/04/16 19:38:24 thorpej Exp $	*/
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "md_init.h"
 #include "extern.h"
 
diff --git a/lib/csu/ia64/md_init.h b/lib/csu/ia64/md_init.h
index 0c2cfb2572b..cf4282ccc65 100644
--- a/lib/csu/ia64/md_init.h
+++ b/lib/csu/ia64/md_init.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md_init.h,v 1.1 2011/07/04 05:42:11 pirofti Exp $ */
+/* $OpenBSD: md_init.h,v 1.2 2012/12/05 23:19:57 deraadt Exp $ */
 
 /*
  * Copyright (c) 2011 Paul Irofti <pirofti@openbsd.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <machine/asm.h>
 
 #define MD_SECT_CALL_FUNC(section, func)				\
diff --git a/lib/csu/sh/crt0.c b/lib/csu/sh/crt0.c
index 24599a9e17f..a76598e7ea9 100644
--- a/lib/csu/sh/crt0.c
+++ b/lib/csu/sh/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.4 2012/04/12 11:28:32 jsg Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.5 2012/12/05 23:19:57 deraadt Exp $	*/
 /*	$NetBSD: crt0.c,v 1.10 2004/08/26 21:16:41 thorpej Exp $ */
 
 /*
@@ -36,7 +36,6 @@
  * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <machine/asm.h>
diff --git a/lib/libarch/alpha/bwx.c b/lib/libarch/alpha/bwx.c
index 5fbf1fc80ad..af7bdc8afc2 100644
--- a/lib/libarch/alpha/bwx.c
+++ b/lib/libarch/alpha/bwx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwx.c,v 1.4 2003/10/06 22:29:45 miod Exp $ */
+/* $OpenBSD: bwx.c,v 1.5 2012/12/05 23:19:58 deraadt Exp $ */
 /*-
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #define vm_page_size (sysconf(_SC_PAGESIZE)) /* XXX  */
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/lib/libarch/alpha/io.c b/lib/libarch/alpha/io.c
index c7c7474bec7..8515752a21a 100644
--- a/lib/libarch/alpha/io.c
+++ b/lib/libarch/alpha/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.2 2009/10/01 19:37:16 miod Exp $ */
+/* $OpenBSD: io.c,v 1.3 2012/12/05 23:19:58 deraadt Exp $ */
 /*-
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/lib/libarch/amd64/amd64_get_fsbase.c b/lib/libarch/amd64/amd64_get_fsbase.c
index 4dd736e593e..60d278c4965 100644
--- a/lib/libarch/amd64/amd64_get_fsbase.c
+++ b/lib/libarch/amd64/amd64_get_fsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd64_get_fsbase.c,v 1.1 2011/04/05 21:14:00 guenther Exp $	*/
+/*	$OpenBSD: amd64_get_fsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_get_ioperm.c,v 1.2 1996/02/27 22:57:22 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/amd64/amd64_get_ioperm.c b/lib/libarch/amd64/amd64_get_ioperm.c
index 2a2abe5c5fc..e6da7cb0f92 100644
--- a/lib/libarch/amd64/amd64_get_ioperm.c
+++ b/lib/libarch/amd64/amd64_get_ioperm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd64_get_ioperm.c,v 1.2 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: amd64_get_ioperm.c,v 1.3 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: amd64_get_ioperm.c,v 1.2 1996/02/27 22:57:22 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/amd64/amd64_iopl.c b/lib/libarch/amd64/amd64_iopl.c
index c9bb5134e74..87480596bc9 100644
--- a/lib/libarch/amd64/amd64_iopl.c
+++ b/lib/libarch/amd64/amd64_iopl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd64_iopl.c,v 1.2 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: amd64_iopl.c,v 1.3 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_iopl.c,v 1.2 1996/02/27 22:57:29 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/amd64/amd64_set_fsbase.c b/lib/libarch/amd64/amd64_set_fsbase.c
index 9201e82a5fe..7d4fac8f19a 100644
--- a/lib/libarch/amd64/amd64_set_fsbase.c
+++ b/lib/libarch/amd64/amd64_set_fsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd64_set_fsbase.c,v 1.1 2011/04/05 21:14:00 guenther Exp $	*/
+/*	$OpenBSD: amd64_set_fsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_set_ioperm.c,v 1.2 1996/02/27 22:57:31 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/amd64/amd64_set_ioperm.c b/lib/libarch/amd64/amd64_set_ioperm.c
index e65473372b8..7b356cd7417 100644
--- a/lib/libarch/amd64/amd64_set_ioperm.c
+++ b/lib/libarch/amd64/amd64_set_ioperm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd64_set_ioperm.c,v 1.2 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: amd64_set_ioperm.c,v 1.3 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: amd64_set_ioperm.c,v 1.2 1996/02/27 22:57:31 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/arm/arm_drain_writebuf.c b/lib/libarch/arm/arm_drain_writebuf.c
index 69a11fdb625..991fa0fa36a 100644
--- a/lib/libarch/arm/arm_drain_writebuf.c
+++ b/lib/libarch/arm/arm_drain_writebuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm_drain_writebuf.c,v 1.1 2005/02/03 17:12:41 drahn Exp $	*/
+/*	$OpenBSD: arm_drain_writebuf.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: arm_drain_writebuf.c,v 1.1 2002/03/30 06:24:34 thorpej Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/sysarch.h>
diff --git a/lib/libarch/arm/arm_sync_icache.c b/lib/libarch/arm/arm_sync_icache.c
index 7e8c3c321b9..ee41c36fdd4 100644
--- a/lib/libarch/arm/arm_sync_icache.c
+++ b/lib/libarch/arm/arm_sync_icache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm_sync_icache.c,v 1.1 2005/02/03 17:12:41 drahn Exp $	*/
+/*	$OpenBSD: arm_sync_icache.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: arm_sync_icache.c,v 1.1 2002/03/30 06:24:34 thorpej Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/sysarch.h>
diff --git a/lib/libarch/i386/i386_get_fsbase.c b/lib/libarch/i386/i386_get_fsbase.c
index dde83ea5188..7744e70d9b2 100644
--- a/lib/libarch/i386/i386_get_fsbase.c
+++ b/lib/libarch/i386/i386_get_fsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_get_fsbase.c,v 1.1 2011/03/12 04:12:29 guenther Exp $	*/
+/*	$OpenBSD: i386_get_fsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_get_ioperm.c,v 1.2 1996/02/27 22:57:22 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_get_gsbase.c b/lib/libarch/i386/i386_get_gsbase.c
index 8faf23cb3fe..1c6d98c14c7 100644
--- a/lib/libarch/i386/i386_get_gsbase.c
+++ b/lib/libarch/i386/i386_get_gsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_get_gsbase.c,v 1.1 2011/03/12 04:12:29 guenther Exp $	*/
+/*	$OpenBSD: i386_get_gsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_get_ioperm.c,v 1.2 1996/02/27 22:57:22 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_get_ioperm.c b/lib/libarch/i386/i386_get_ioperm.c
index a2f0143ffc0..6d08a591f89 100644
--- a/lib/libarch/i386/i386_get_ioperm.c
+++ b/lib/libarch/i386/i386_get_ioperm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_get_ioperm.c,v 1.5 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: i386_get_ioperm.c,v 1.6 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_get_ioperm.c,v 1.2 1996/02/27 22:57:22 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_get_ldt.c b/lib/libarch/i386/i386_get_ldt.c
index 56fb1560d01..384a352f431 100644
--- a/lib/libarch/i386/i386_get_ldt.c
+++ b/lib/libarch/i386/i386_get_ldt.c
@@ -27,7 +27,6 @@
  * 
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_iopl.c b/lib/libarch/i386/i386_iopl.c
index dddc9dbb133..46138985a2b 100644
--- a/lib/libarch/i386/i386_iopl.c
+++ b/lib/libarch/i386/i386_iopl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_iopl.c,v 1.5 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: i386_iopl.c,v 1.6 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_iopl.c,v 1.2 1996/02/27 22:57:29 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_set_fsbase.c b/lib/libarch/i386/i386_set_fsbase.c
index 78d38e97e25..06ee72335dc 100644
--- a/lib/libarch/i386/i386_set_fsbase.c
+++ b/lib/libarch/i386/i386_set_fsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_set_fsbase.c,v 1.1 2011/03/12 04:12:29 guenther Exp $	*/
+/*	$OpenBSD: i386_set_fsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_set_ioperm.c,v 1.2 1996/02/27 22:57:31 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_set_gsbase.c b/lib/libarch/i386/i386_set_gsbase.c
index 8cd01000032..283f6aa5e98 100644
--- a/lib/libarch/i386/i386_set_gsbase.c
+++ b/lib/libarch/i386/i386_set_gsbase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_set_gsbase.c,v 1.1 2011/03/12 04:12:29 guenther Exp $	*/
+/*	$OpenBSD: i386_set_gsbase.c,v 1.2 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_set_ioperm.c,v 1.2 1996/02/27 22:57:31 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_set_ioperm.c b/lib/libarch/i386/i386_set_ioperm.c
index 2320bdb5eb9..5eeee8afce9 100644
--- a/lib/libarch/i386/i386_set_ioperm.c
+++ b/lib/libarch/i386/i386_set_ioperm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_set_ioperm.c,v 1.5 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: i386_set_ioperm.c,v 1.6 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_set_ioperm.c,v 1.2 1996/02/27 22:57:31 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_set_ldt.c b/lib/libarch/i386/i386_set_ldt.c
index 11e5f4b0860..cf1c1d09bb4 100644
--- a/lib/libarch/i386/i386_set_ldt.c
+++ b/lib/libarch/i386/i386_set_ldt.c
@@ -27,7 +27,6 @@
  * 
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/segments.h>
diff --git a/lib/libarch/i386/i386_vm86.c b/lib/libarch/i386/i386_vm86.c
index 84c90b5413b..8c01613d134 100644
--- a/lib/libarch/i386/i386_vm86.c
+++ b/lib/libarch/i386/i386_vm86.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_vm86.c,v 1.4 2008/06/26 05:42:04 ray Exp $	*/
+/*	$OpenBSD: i386_vm86.c,v 1.5 2012/12/05 23:19:58 deraadt Exp $	*/
 /*	$NetBSD: i386_vm86.c,v 1.1 1996/02/21 00:21:56 jtk Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/signal.h>
 #include <machine/segments.h>
diff --git a/lib/libc/arch/arm/gen/fabs.c b/lib/libc/arch/arm/gen/fabs.c
index 18c7b45b4c2..41d840b160e 100644
--- a/lib/libc/arch/arm/gen/fabs.c
+++ b/lib/libc/arch/arm/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.7 2011/07/08 22:28:33 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.8 2012/12/05 23:19:58 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/ieee.h>
 
diff --git a/lib/libc/arch/hppa/gen/fabs.c b/lib/libc/arch/hppa/gen/fabs.c
index d234fb01850..1b5c41b5241 100644
--- a/lib/libc/arch/hppa/gen/fabs.c
+++ b/lib/libc/arch/hppa/gen/fabs.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: fabs.c,v 1.7 2011/07/08 22:28:33 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.8 2012/12/05 23:19:58 deraadt Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 double
 fabs(double val)
diff --git a/lib/libc/arch/hppa64/gen/fabs.c b/lib/libc/arch/hppa64/gen/fabs.c
index dbf1d8eea2d..edd0a38a9d5 100644
--- a/lib/libc/arch/hppa64/gen/fabs.c
+++ b/lib/libc/arch/hppa64/gen/fabs.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: fabs.c,v 1.4 2011/08/19 15:44:36 kettenis Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.5 2012/12/05 23:19:58 deraadt Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 double
 fabs(double val)
diff --git a/lib/libc/arch/ia64/SYS.h b/lib/libc/arch/ia64/SYS.h
index 8ee7fb44364..8245c41a78a 100644
--- a/lib/libc/arch/ia64/SYS.h
+++ b/lib/libc/arch/ia64/SYS.h
@@ -27,7 +27,7 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #include <machine/asm.h>
 #include <sys/syscall.h>
diff --git a/lib/libc/arch/ia64/gen/flt_rounds.c b/lib/libc/arch/ia64/gen/flt_rounds.c
index a48a4237603..1197490c1e2 100644
--- a/lib/libc/arch/ia64/gen/flt_rounds.c
+++ b/lib/libc/arch/ia64/gen/flt_rounds.c
@@ -3,7 +3,7 @@
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/ia64/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $"); */
 
 #include <float.h>
diff --git a/lib/libc/arch/ia64/gen/fpgetmask.c b/lib/libc/arch/ia64/gen/fpgetmask.c
index 6bf750cbdf8..4404ce5ed9f 100644
--- a/lib/libc/arch/ia64/gen/fpgetmask.c
+++ b/lib/libc/arch/ia64/gen/fpgetmask.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpgetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $"); */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/ia64/gen/fpsetmask.c b/lib/libc/arch/ia64/gen/fpsetmask.c
index ea87938c1b5..84f5a29575f 100644
--- a/lib/libc/arch/ia64/gen/fpsetmask.c
+++ b/lib/libc/arch/ia64/gen/fpsetmask.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/ia64/gen/fpsetmask.c,v 1.4 2003/10/22 09:00:07 marcel Exp $"); */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/powerpc/gen/fabs.c b/lib/libc/arch/powerpc/gen/fabs.c
index fcd6f671e80..866a766ea64 100644
--- a/lib/libc/arch/powerpc/gen/fabs.c
+++ b/lib/libc/arch/powerpc/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.6 2011/07/08 22:28:33 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.7 2012/12/05 23:19:58 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002 Theo de Raadt
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 double
diff --git a/lib/libc/arch/sh/gen/fabs.c b/lib/libc/arch/sh/gen/fabs.c
index b7396043b43..24740aed2bd 100644
--- a/lib/libc/arch/sh/gen/fabs.c
+++ b/lib/libc/arch/sh/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.9 2011/07/08 22:28:33 martynas Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.10 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
 #if !defined(__SH4__) || defined(__SH4_NOFPU__)
 #include <sys/types.h>
 #include <machine/ieee.h>
diff --git a/lib/libc/arch/sparc64/fpu/fpu_add.c b/lib/libc/arch/sparc64/fpu/fpu_add.c
index 1eeb734594c..dbc820f0240 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_add.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_add.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_add.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_add.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_compare.c b/lib/libc/arch/sparc64/fpu/fpu_compare.c
index 7d2e7c84a94..d6bac29c0d0 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_compare.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_compare.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_compare.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_compare.c,v 1.4 2002/03/22 21:52:58 obrien Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_div.c b/lib/libc/arch/sparc64/fpu/fpu_div.c
index b615e46c21f..46573a9eac2 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_div.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_div.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_div.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_div.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_explode.c b/lib/libc/arch/sparc64/fpu/fpu_explode.c
index 6bda756d32c..5f9062199fe 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_explode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_explode.c,v 1.6 2006/12/23 23:40:49 deraadt Exp $	*/
+/*	$OpenBSD: fpu_explode.c,v 1.7 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.5 2002/05/11 21:20:04 jake Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_implode.c b/lib/libc/arch/sparc64/fpu/fpu_implode.c
index bd01cf2f969..20917b82b66 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_implode.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_implode.c,v 1.2 2007/02/12 19:47:10 jason Exp $	*/
+/*	$OpenBSD: fpu_implode.c,v 1.3 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_implode.c,v 1.5 2002/04/27 21:56:28 jake Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_mul.c b/lib/libc/arch/sparc64/fpu/fpu_mul.c
index 5115c00a288..7dbc24f113e 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_mul.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_mul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_mul.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_mul.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_mul.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_qp.c b/lib/libc/arch/sparc64/fpu/fpu_qp.c
index a59eceeb858..8090a3ec6ff 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_qp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_qp.c,v 1.3 2012/12/03 20:09:40 kettenis Exp $	*/
+/*	$OpenBSD: fpu_qp.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2002 Jake Burkholder.
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.3 2002/09/02 02:30:20 jake Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
index dc89f6ee1d8..bc493af5a87 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_sqrt.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_sqrt.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.3 2002/03/22 21:52:58 obrien Exp $");
 #endif
diff --git a/lib/libc/arch/sparc64/fpu/fpu_subr.c b/lib/libc/arch/sparc64/fpu/fpu_subr.c
index 6dd7a8121d4..a3560336637 100644
--- a/lib/libc/arch/sparc64/fpu/fpu_subr.c
+++ b/lib/libc/arch/sparc64/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_subr.c,v 1.1 2003/07/21 18:41:30 jason Exp $	*/
+/*	$OpenBSD: fpu_subr.c,v 1.2 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@
  *	$NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $
  */
 
-#include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_subr.c,v 1.4 2002/04/27 21:56:28 jake Exp $");
 #endif
diff --git a/lib/libc/arch/vax/gen/fpclassify.c b/lib/libc/arch/vax/gen/fpclassify.c
index c1ee38f3b4f..333324d487d 100644
--- a/lib/libc/arch/vax/gen/fpclassify.c
+++ b/lib/libc/arch/vax/gen/fpclassify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpclassify.c,v 1.4 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: fpclassify.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <machine/vaxfp.h>
 #include <math.h>
 
diff --git a/lib/libc/arch/vax/gen/frexp.c b/lib/libc/arch/vax/gen/frexp.c
index d146e9b294d..e0e3bf0aac7 100644
--- a/lib/libc/arch/vax/gen/frexp.c
+++ b/lib/libc/arch/vax/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.10 2011/07/08 22:28:33 martynas Exp $ */
+/*	$OpenBSD: frexp.c,v 1.11 2012/12/05 23:19:59 deraadt Exp $ */
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <math.h>
 
diff --git a/lib/libc/arch/vax/gen/isfinite.c b/lib/libc/arch/vax/gen/isfinite.c
index 809a768d1c6..005059cface 100644
--- a/lib/libc/arch/vax/gen/isfinite.c
+++ b/lib/libc/arch/vax/gen/isfinite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isfinite.c,v 1.4 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: isfinite.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 /* ARGSUSED */
diff --git a/lib/libc/arch/vax/gen/isinf.c b/lib/libc/arch/vax/gen/isinf.c
index 41c1d87d232..ca17a92cead 100644
--- a/lib/libc/arch/vax/gen/isinf.c
+++ b/lib/libc/arch/vax/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.12 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.13 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -31,7 +31,7 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 /* ARGSUSED */
 int
diff --git a/lib/libc/arch/vax/gen/isnan.c b/lib/libc/arch/vax/gen/isnan.c
index 1e92c33a28e..1c715505a46 100644
--- a/lib/libc/arch/vax/gen/isnan.c
+++ b/lib/libc/arch/vax/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.6 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.7 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,7 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 /* ARGSUSED */
 int
diff --git a/lib/libc/arch/vax/gen/isnormal.c b/lib/libc/arch/vax/gen/isnormal.c
index 1bdafb246af..a8b41cabd6e 100644
--- a/lib/libc/arch/vax/gen/isnormal.c
+++ b/lib/libc/arch/vax/gen/isnormal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnormal.c,v 1.4 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: isnormal.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,7 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <machine/vaxfp.h>
 #include <math.h>
 
diff --git a/lib/libc/arch/vax/gen/signbit.c b/lib/libc/arch/vax/gen/signbit.c
index e5a47f804b6..f80e201359c 100644
--- a/lib/libc/arch/vax/gen/signbit.c
+++ b/lib/libc/arch/vax/gen/signbit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signbit.c,v 1.4 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: signbit.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,7 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <machine/vaxfp.h>
 #include <math.h>
 
diff --git a/lib/libc/citrus/citrus_ctype.c b/lib/libc/citrus/citrus_ctype.c
index 32ee6f5c80c..129e10b37f2 100644
--- a/lib/libc/citrus/citrus_ctype.c
+++ b/lib/libc/citrus/citrus_ctype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: citrus_ctype.c,v 1.2 2010/08/01 02:49:07 chl Exp $ */
+/*	$OpenBSD: citrus_ctype.c,v 1.3 2012/12/05 23:19:59 deraadt Exp $ */
 /*	$NetBSD: citrus_ctype.c,v 1.5 2008/06/14 16:01:07 tnozaki Exp $	*/
 
 /*-
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/lib/libc/citrus/citrus_none.c b/lib/libc/citrus/citrus_none.c
index 9699bf88038..deed3aa8634 100644
--- a/lib/libc/citrus/citrus_none.c
+++ b/lib/libc/citrus/citrus_none.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: citrus_none.c,v 1.3 2012/06/06 16:58:02 matthew Exp $ */
+/*	$OpenBSD: citrus_none.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $ */
 /*	$NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $	*/
 
 /*-
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/lib/libc/citrus/citrus_utf8.c b/lib/libc/citrus/citrus_utf8.c
index 5b37b267e21..a6a2e70527a 100644
--- a/lib/libc/citrus/citrus_utf8.c
+++ b/lib/libc/citrus/citrus_utf8.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: citrus_utf8.c,v 1.5 2012/06/06 16:58:02 matthew Exp $ */
+/*	$OpenBSD: citrus_utf8.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/lib/libc/gen/_sys_errlist.c b/lib/libc/gen/_sys_errlist.c
index 491fd6be9f2..eca96af95f0 100644
--- a/lib/libc/gen/_sys_errlist.c
+++ b/lib/libc/gen/_sys_errlist.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _sys_errlist.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
+/*	$OpenBSD: _sys_errlist.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, December 12, 1994
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_sys_errlist, sys_errlist);
diff --git a/lib/libc/gen/_sys_nerr.c b/lib/libc/gen/_sys_nerr.c
index fac273f8570..a053debdc9b 100644
--- a/lib/libc/gen/_sys_nerr.c
+++ b/lib/libc/gen/_sys_nerr.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _sys_nerr.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
+/*	$OpenBSD: _sys_nerr.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, December 12, 1994
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_sys_nerr, sys_nerr);
diff --git a/lib/libc/gen/_sys_siglist.c b/lib/libc/gen/_sys_siglist.c
index 2005c32908d..877709eb3a2 100644
--- a/lib/libc/gen/_sys_siglist.c
+++ b/lib/libc/gen/_sys_siglist.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _sys_siglist.c,v 1.3 2005/08/08 08:05:33 espie Exp $ */
+/*	$OpenBSD: _sys_siglist.c,v 1.4 2012/12/05 23:19:59 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, December 12, 1994
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_sys_siglist, sys_siglist);
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index ff335938214..e7ec29de4fb 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: err.c,v 1.10 2011/05/30 18:48:33 martynas Exp $ */
+/*	$OpenBSD: err.c,v 1.11 2012/12/05 23:19:59 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdarg.h>
 
diff --git a/lib/libc/gen/errx.c b/lib/libc/gen/errx.c
index 688e2576c67..d213435dbc7 100644
--- a/lib/libc/gen/errx.c
+++ b/lib/libc/gen/errx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errx.c,v 1.9 2011/05/30 18:48:33 martynas Exp $ */
+/*	$OpenBSD: errx.c,v 1.10 2012/12/05 23:19:59 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdarg.h>
 
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index f38b67d64a1..d597531c1ea 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpclassify.c,v 1.5 2011/05/30 17:28:15 martynas Exp $	*/
+/*	$OpenBSD: fpclassify.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 97cc624035a..9fce77b6362 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.7 2011/07/08 22:28:33 martynas Exp $	*/
+/*	$OpenBSD: frexp.c,v 1.8 2012/12/05 23:19:59 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
@@ -31,7 +31,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/isfinite.c b/lib/libc/gen/isfinite.c
index 8ac908f2bc8..9adda1cc981 100644
--- a/lib/libc/gen/isfinite.c
+++ b/lib/libc/gen/isfinite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isfinite.c,v 1.5 2011/05/30 17:28:15 martynas Exp $	*/
+/*	$OpenBSD: isfinite.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index dbcde156dd3..264864cbad3 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.6 2011/07/02 19:27:34 martynas Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.7 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index 378df5bf5b3..e34849ac480 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.5 2011/05/30 17:28:15 martynas Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 
diff --git a/lib/libc/gen/isnormal.c b/lib/libc/gen/isnormal.c
index ecb7972932f..19a43263c79 100644
--- a/lib/libc/gen/isnormal.c
+++ b/lib/libc/gen/isnormal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnormal.c,v 1.5 2011/05/30 17:28:15 martynas Exp $	*/
+/*	$OpenBSD: isnormal.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
index 3192977332c..8fd78555a52 100644
--- a/lib/libc/gen/ldexp.c
+++ b/lib/libc/gen/ldexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldexp.c,v 1.5 2011/07/26 11:43:01 martynas Exp $	*/
+/*	$OpenBSD: ldexp.c,v 1.6 2012/12/05 23:20:00 deraadt Exp $	*/
 /* @(#)s_scalbn.c 5.1 93/09/24 */
 /* @(#)fdlibm.h 5.1 93/09/24 */
 /*
@@ -15,7 +15,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/endian.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
index 45fbb1973de..acfe68c63c5 100644
--- a/lib/libc/gen/posix_spawn.c
+++ b/lib/libc/gen/posix_spawn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: posix_spawn.c,v 1.2 2012/03/22 15:43:08 deraadt Exp $	*/
+/*	$OpenBSD: posix_spawn.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 #include <sys/queue.h>
 
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index c0c049cae66..70002c538b5 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siglist.c,v 1.5 2009/11/27 19:47:45 guenther Exp $ */
+/*	$OpenBSD: siglist.c,v 1.6 2012/12/05 23:20:00 deraadt Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <signal.h>
 
 const char *const _sys_siglist[NSIG] = {
diff --git a/lib/libc/gen/signbit.c b/lib/libc/gen/signbit.c
index 35b6f4c07c0..2dbcd84a2a5 100644
--- a/lib/libc/gen/signbit.c
+++ b/lib/libc/gen/signbit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signbit.c,v 1.4 2011/05/30 17:28:15 martynas Exp $	*/
+/*	$OpenBSD: signbit.c,v 1.5 2012/12/05 23:20:00 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -18,7 +18,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <machine/ieee.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libc/gen/verr.c b/lib/libc/gen/verr.c
index fdf07ed0b58..dcd8edcd06c 100644
--- a/lib/libc/gen/verr.c
+++ b/lib/libc/gen/verr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: verr.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
+/*	$OpenBSD: verr.c,v 1.9 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/verrx.c b/lib/libc/gen/verrx.c
index 9e3cf54e4a7..60da062f5af 100644
--- a/lib/libc/gen/verrx.c
+++ b/lib/libc/gen/verrx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: verrx.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
+/*	$OpenBSD: verrx.c,v 1.9 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/gen/vwarn.c b/lib/libc/gen/vwarn.c
index 41ab3698727..26b60f33641 100644
--- a/lib/libc/gen/vwarn.c
+++ b/lib/libc/gen/vwarn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vwarn.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
+/*	$OpenBSD: vwarn.c,v 1.9 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/vwarnx.c b/lib/libc/gen/vwarnx.c
index 41fda8e901a..e6b1957d4f3 100644
--- a/lib/libc/gen/vwarnx.c
+++ b/lib/libc/gen/vwarnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vwarnx.c,v 1.8 2005/08/08 08:05:34 espie Exp $ */
+/*	$OpenBSD: vwarnx.c,v 1.9 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libc/gen/warn.c b/lib/libc/gen/warn.c
index 4da071155de..c1b47a65f27 100644
--- a/lib/libc/gen/warn.c
+++ b/lib/libc/gen/warn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: warn.c,v 1.9 2011/05/30 18:48:33 martynas Exp $ */
+/*	$OpenBSD: warn.c,v 1.10 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdarg.h>
 
diff --git a/lib/libc/gen/warnx.c b/lib/libc/gen/warnx.c
index 8a94cbd0905..af2ab669cc7 100644
--- a/lib/libc/gen/warnx.c
+++ b/lib/libc/gen/warnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: warnx.c,v 1.8 2011/05/30 18:48:33 martynas Exp $ */
+/*	$OpenBSD: warnx.c,v 1.9 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <err.h>
 #include <stdarg.h>
 
diff --git a/lib/libc/locale/___runetype_mb.c b/lib/libc/locale/___runetype_mb.c
index c2eddf6cbe3..502a04de7fb 100644
--- a/lib/libc/locale/___runetype_mb.c
+++ b/lib/libc/locale/___runetype_mb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ___runetype_mb.c,v 1.1 2005/08/07 10:16:23 espie Exp $ */
+/*	$OpenBSD: ___runetype_mb.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: ___runetype_mb.c,v 1.10 2005/02/10 19:19:57 tnozaki Exp $	*/
 
 /*-
@@ -33,8 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <wctype.h>
 #include "rune.h"
 #include "rune_local.h"
diff --git a/lib/libc/locale/_wctrans.c b/lib/libc/locale/_wctrans.c
index 3960ac216a4..4394587bf68 100644
--- a/lib/libc/locale/_wctrans.c
+++ b/lib/libc/locale/_wctrans.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wctrans.c,v 1.1 2005/08/07 10:16:23 espie Exp $ */
+/*	$OpenBSD: _wctrans.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: _wctrans.c,v 1.6 2005/02/10 19:19:57 tnozaki Exp $	*/
 
 /*-
@@ -59,8 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <wctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index e1c6893bca9..96273401ea2 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btowc.c,v 1.1 2010/07/27 16:59:03 stsp Exp $ */
+/*	$OpenBSD: btowc.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 Tim J. Robbins.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index 1ffb655e1b8..ee4c82df341 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iswctype.c,v 1.2 2011/04/15 16:11:23 stsp Exp $ */
+/*	$OpenBSD: iswctype.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
@@ -35,8 +35,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <wchar.h>
 #include <wctype.h>
 #include <ctype.h>
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
index 56d718e69f4..259e8f582ec 100644
--- a/lib/libc/locale/mblen.c
+++ b/lib/libc/locale/mblen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mblen.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: mblen.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index 97c48d2d6ad..0f05bd0721e 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbrlen.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: mbrlen.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <wchar.h>
 
 size_t
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
index 7ea97e4b614..c17a858278e 100644
--- a/lib/libc/locale/mbstowcs.c
+++ b/lib/libc/locale/mbstowcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbstowcs.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: mbstowcs.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
index e0dcff0b915..920f4bf26ed 100644
--- a/lib/libc/locale/mbtowc.c
+++ b/lib/libc/locale/mbtowc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbtowc.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: mbtowc.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/locale/multibyte_citrus.c b/lib/libc/locale/multibyte_citrus.c
index 7cdf6090485..c5a3ad740f0 100644
--- a/lib/libc/locale/multibyte_citrus.c
+++ b/lib/libc/locale/multibyte_citrus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: multibyte_citrus.c,v 1.3 2012/08/14 08:47:58 chl Exp $ */
+/*	$OpenBSD: multibyte_citrus.c,v 1.4 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $ */
 
 /*-
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
index 1ccd0871a61..8b7a4632531 100644
--- a/lib/libc/locale/rune.c
+++ b/lib/libc/locale/rune.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rune.c,v 1.2 2006/04/02 21:38:57 djm Exp $ */
+/*	$OpenBSD: rune.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: rune.c,v 1.26 2004/05/09 11:26:33 kleink Exp $	*/
 
 /*-
@@ -59,8 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/locale/runeglue.c b/lib/libc/locale/runeglue.c
index 20c5dae88c7..5ce28100952 100644
--- a/lib/libc/locale/runeglue.c
+++ b/lib/libc/locale/runeglue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: runeglue.c,v 1.2 2011/04/03 21:07:34 stsp Exp $ */
+/*	$OpenBSD: runeglue.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: runeglue.c,v 1.10 2003/03/10 21:18:49 tshiozak Exp $	*/
 
 /*-
@@ -34,8 +34,6 @@
  * This is important to keep backward/future compatibility.
  */
 
-#include <sys/cdefs.h>
-
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c
index d78c691ccc3..8027a187f7c 100644
--- a/lib/libc/locale/runetable.c
+++ b/lib/libc/locale/runetable.c
@@ -34,8 +34,6 @@
  * $FreeBSD: src/lib/libc/locale/table.c,v 1.13 2000/02/08 07:43:25 obrien Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <ctype.h>
 #include <locale.h>
diff --git a/lib/libc/locale/runetype.h b/lib/libc/locale/runetype.h
index 8a9a7e5e7cc..c39ec6dce65 100644
--- a/lib/libc/locale/runetype.h
+++ b/lib/libc/locale/runetype.h
@@ -1,7 +1,7 @@
 #ifndef _NB_RUNETYPE_H_
 #define _NB_RUNETYPE_H_
 
-/* $OpenBSD: runetype.h,v 1.6 2011/03/13 11:42:22 stsp Exp $ */
+/* $OpenBSD: runetype.h,v 1.7 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: runetype.h,v 1.18 2003/08/07 16:43:04 agc Exp $	*/
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,6 @@
  *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include "ctype_private.h"
 
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index ff485551849..f4598692d78 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setrunelocale.c,v 1.6 2011/03/15 22:27:48 stsp Exp $ */
+/*	$OpenBSD: setrunelocale.c,v 1.7 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: setrunelocale.c,v 1.14 2003/08/07 16:43:07 agc Exp $	*/
 
 /*-
@@ -88,8 +88,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "rune.h"
 #include <assert.h>
 #include <errno.h>
diff --git a/lib/libc/locale/wcscoll.c b/lib/libc/locale/wcscoll.c
index 6d476690c54..8ec32ceffc0 100644
--- a/lib/libc/locale/wcscoll.c
+++ b/lib/libc/locale/wcscoll.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcscoll.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: wcscoll.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 /*	$NetBSD: wcscoll.c,v 1.1 2003/03/02 22:18:16 tshiozak Exp $	*/
 
 /*-
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <assert.h>
 #include <wchar.h>
 
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
index 024e3afe874..e8054c401b5 100644
--- a/lib/libc/locale/wcstombs.c
+++ b/lib/libc/locale/wcstombs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wcstombs.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: wcstombs.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/locale/wcsxfrm.c b/lib/libc/locale/wcsxfrm.c
index d2e9ff3fdfd..98db4a98fab 100644
--- a/lib/libc/locale/wcsxfrm.c
+++ b/lib/libc/locale/wcsxfrm.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: wcsxfrm.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
-/*	$OpenBSD: wcsxfrm.c,v 1.1 2010/07/27 16:59:04 stsp Exp $	*/
+/*	$OpenBSD: wcsxfrm.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: wcsxfrm.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $	*/
 /*	$NetBSD: multibyte_sb.c,v 1.4 2003/08/07 16:43:04 agc Exp $	*/
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <wchar.h>
 
 size_t 
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index cc5a07c1484..ea1f40c58aa 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wctob.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: wctob.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
  * All rights reserved.
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
index 9cd1ee4d362..39f7a7c769c 100644
--- a/lib/libc/locale/wctomb.c
+++ b/lib/libc/locale/wctomb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wctomb.c,v 1.1 2010/07/27 16:59:04 stsp Exp $ */
+/*	$OpenBSD: wctomb.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
diff --git a/lib/libc/nls/_catclose.c b/lib/libc/nls/_catclose.c
index 239f5304386..4fdf78781d6 100644
--- a/lib/libc/nls/_catclose.c
+++ b/lib/libc/nls/_catclose.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _catclose.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
+/*	$OpenBSD: _catclose.c,v 1.6 2012/12/05 23:20:00 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_catclose,catclose);
diff --git a/lib/libc/nls/_catgets.c b/lib/libc/nls/_catgets.c
index 36402bd0ef6..532faeec6cf 100644
--- a/lib/libc/nls/_catgets.c
+++ b/lib/libc/nls/_catgets.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _catgets.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */
+/*	$OpenBSD: _catgets.c,v 1.6 2012/12/05 23:20:00 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_catgets,catgets);
diff --git a/lib/libc/nls/_catopen.c b/lib/libc/nls/_catopen.c
index d07c2a85cc9..5107826ecfc 100644
--- a/lib/libc/nls/_catopen.c
+++ b/lib/libc/nls/_catopen.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _catopen.c,v 1.6 2005/08/05 13:03:00 espie Exp $ */
+/*	$OpenBSD: _catopen.c,v 1.7 2012/12/05 23:20:00 deraadt Exp $ */
 /*
  * Written by J.T. Conklin, 10/05/94
  * Public domain.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 #ifdef __indr_reference
 __indr_reference(_catopen,catopen);
diff --git a/lib/libc/softfloat/eqdf2.c b/lib/libc/softfloat/eqdf2.c
index c331c037809..142133547a5 100644
--- a/lib/libc/softfloat/eqdf2.c
+++ b/lib/libc/softfloat/eqdf2.c
@@ -1,12 +1,10 @@
-/*	$OpenBSD: eqdf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: eqdf2.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $	*/
 /* $NetBSD: eqdf2.c,v 1.1 2000/06/06 08:15:02 bjh21 Exp $ */
 
 /*
  * Written by Ben Harris, 2000.  This file is in the Public Domain.
  */
 
-#include <sys/cdefs.h>
-
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
 #include "softfloat.h"
diff --git a/lib/libc/softfloat/eqsf2.c b/lib/libc/softfloat/eqsf2.c
index 416034abe6e..0c11cf2b4da 100644
--- a/lib/libc/softfloat/eqsf2.c
+++ b/lib/libc/softfloat/eqsf2.c
@@ -1,12 +1,10 @@
-/*	$OpenBSD: eqsf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: eqsf2.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $	*/
 /* $NetBSD: eqsf2.c,v 1.1 2000/06/06 08:15:03 bjh21 Exp $ */
 
 /*
  * Written by Ben Harris, 2000.  This file is in the Public Domain.
  */
 
-#include <sys/cdefs.h>
-
 #include "softfloat-for-gcc.h"
 #include "milieu.h"
 #include "softfloat.h"
diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c
index 579de0836ca..f977c841e94 100644
--- a/lib/libc/softfloat/fpgetmask.c
+++ b/lib/libc/softfloat/fpgetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetmask.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetmask.c,v 1.3 2012/12/05 23:20:00 deraadt Exp $	*/
 /* $NetBSD: fpgetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c
index 3fda3007cc5..bf6ad2d4d3f 100644
--- a/lib/libc/softfloat/fpgetround.c
+++ b/lib/libc/softfloat/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetround.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetround.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: fpgetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c
index b40a469a84a..c8b7c114f5b 100644
--- a/lib/libc/softfloat/fpgetsticky.c
+++ b/lib/libc/softfloat/fpgetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpgetsticky.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpgetsticky.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: fpgetsticky.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c
index fd729ec2842..50d694cd393 100644
--- a/lib/libc/softfloat/fpsetmask.c
+++ b/lib/libc/softfloat/fpsetmask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetmask.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpsetmask.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: fpsetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c
index 9f39648ed3d..ece434367e8 100644
--- a/lib/libc/softfloat/fpsetround.c
+++ b/lib/libc/softfloat/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetround.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpsetround.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: fpsetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c
index 6d55819da85..ba2fc2adec9 100644
--- a/lib/libc/softfloat/fpsetsticky.c
+++ b/lib/libc/softfloat/fpsetsticky.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpsetsticky.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
+/*	$OpenBSD: fpsetsticky.c,v 1.3 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: fpsetsticky.c,v 1.2 2002/01/13 21:45:54 thorpej Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include "namespace.h"
 
 #include <ieeefp.h>
diff --git a/lib/libc/softfloat/gedf2.c b/lib/libc/softfloat/gedf2.c
index 747fc779570..b6db9291951 100644
--- a/lib/libc/softfloat/gedf2.c
+++ b/lib/libc/softfloat/gedf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gedf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: gedf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: gedf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __gedf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/gesf2.c b/lib/libc/softfloat/gesf2.c
index e6b79c23634..5488f63e8c5 100644
--- a/lib/libc/softfloat/gesf2.c
+++ b/lib/libc/softfloat/gesf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gesf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: gesf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: gesf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __gesf2(float32, float32);
 
 flag
diff --git a/lib/libc/softfloat/gtdf2.c b/lib/libc/softfloat/gtdf2.c
index 9573064fb44..9c83284dfe2 100644
--- a/lib/libc/softfloat/gtdf2.c
+++ b/lib/libc/softfloat/gtdf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gtdf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: gtdf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: gtdf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __gtdf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/gtsf2.c b/lib/libc/softfloat/gtsf2.c
index 7310cff58e4..b13fa29493b 100644
--- a/lib/libc/softfloat/gtsf2.c
+++ b/lib/libc/softfloat/gtsf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gtsf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: gtsf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: gtsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __gtsf2(float32, float32);
 
 flag
diff --git a/lib/libc/softfloat/ledf2.c b/lib/libc/softfloat/ledf2.c
index 7a9e89eda00..1120c12e2bc 100644
--- a/lib/libc/softfloat/ledf2.c
+++ b/lib/libc/softfloat/ledf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ledf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: ledf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: ledf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __ledf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/lesf2.c b/lib/libc/softfloat/lesf2.c
index c03d521e4e5..b96c0a00176 100644
--- a/lib/libc/softfloat/lesf2.c
+++ b/lib/libc/softfloat/lesf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lesf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: lesf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: lesf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __lesf2(float32, float32);
 
 flag
diff --git a/lib/libc/softfloat/ltdf2.c b/lib/libc/softfloat/ltdf2.c
index 07b860d5064..c9f9308d648 100644
--- a/lib/libc/softfloat/ltdf2.c
+++ b/lib/libc/softfloat/ltdf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ltdf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: ltdf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: ltdf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __ltdf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/ltsf2.c b/lib/libc/softfloat/ltsf2.c
index 040bf0adfdd..823bea0a0dd 100644
--- a/lib/libc/softfloat/ltsf2.c
+++ b/lib/libc/softfloat/ltsf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ltsf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: ltsf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: ltsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __ltsf2(float32, float32);
 
 flag
diff --git a/lib/libc/softfloat/nedf2.c b/lib/libc/softfloat/nedf2.c
index a42305dbe4c..c2b70f836cd 100644
--- a/lib/libc/softfloat/nedf2.c
+++ b/lib/libc/softfloat/nedf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nedf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: nedf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: nedf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __nedf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/negdf2.c b/lib/libc/softfloat/negdf2.c
index 643ff30fd6f..5ac6b250776 100644
--- a/lib/libc/softfloat/negdf2.c
+++ b/lib/libc/softfloat/negdf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: negdf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: negdf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: negdf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 float64 __negdf2(float64);
 
 float64
diff --git a/lib/libc/softfloat/negsf2.c b/lib/libc/softfloat/negsf2.c
index 944af66b7c7..8a7ae6973b9 100644
--- a/lib/libc/softfloat/negsf2.c
+++ b/lib/libc/softfloat/negsf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: negsf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: negsf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: negsf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 float32 __negsf2(float32);
 
 float32
diff --git a/lib/libc/softfloat/nesf2.c b/lib/libc/softfloat/nesf2.c
index 87fa705e80e..89270a2ed3a 100644
--- a/lib/libc/softfloat/nesf2.c
+++ b/lib/libc/softfloat/nesf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nesf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: nesf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: nesf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __nesf2(float32, float32);
 
 flag
diff --git a/lib/libc/softfloat/softfloat.c b/lib/libc/softfloat/softfloat.c
index 546dad91648..b565d6f2e0a 100644
--- a/lib/libc/softfloat/softfloat.c
+++ b/lib/libc/softfloat/softfloat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softfloat.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: softfloat.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: softfloat.c,v 1.1 2002/05/21 23:51:07 bjh21 Exp $ */
 
 /*
@@ -52,8 +52,6 @@ this code that are retained.
 ===============================================================================
 */
 
-#include <sys/cdefs.h>
-
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
 #endif
diff --git a/lib/libc/softfloat/timesoftfloat.c b/lib/libc/softfloat/timesoftfloat.c
index b9a22c7cdec..5e1751e0f2e 100644
--- a/lib/libc/softfloat/timesoftfloat.c
+++ b/lib/libc/softfloat/timesoftfloat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timesoftfloat.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: timesoftfloat.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: timesoftfloat.c,v 1.1 2000/06/06 08:15:11 bjh21 Exp $ */
 
 /*
@@ -31,8 +31,6 @@ this code that are retained.
 ===============================================================================
 */
 
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/lib/libc/softfloat/unorddf2.c b/lib/libc/softfloat/unorddf2.c
index 3502a2bd031..8fe8750deac 100644
--- a/lib/libc/softfloat/unorddf2.c
+++ b/lib/libc/softfloat/unorddf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unorddf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: unorddf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: unorddf2.c,v 1.1 2003/05/06 08:58:19 rearnsha Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __unorddf2(float64, float64);
 
 flag
diff --git a/lib/libc/softfloat/unordsf2.c b/lib/libc/softfloat/unordsf2.c
index 21d81236a32..5d5c330f75f 100644
--- a/lib/libc/softfloat/unordsf2.c
+++ b/lib/libc/softfloat/unordsf2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unordsf2.c,v 1.1 2006/11/06 15:11:37 drahn Exp $	*/
+/*	$OpenBSD: unordsf2.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $	*/
 /* $NetBSD: unordsf2.c,v 1.1 2003/05/06 08:58:20 rearnsha Exp $ */
 
 /*
@@ -9,8 +9,6 @@
 #include "milieu.h"
 #include "softfloat.h"
 
-#include <sys/cdefs.h>
-
 flag __unordsf2(float32, float32);
 
 flag
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
index dd8da0a8023..b716cbff3d3 100644
--- a/lib/libc/stdio/fwscanf.c
+++ b/lib/libc/stdio/fwscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fwscanf.c,v 1.1 2011/10/16 13:20:51 stsp Exp $ */
+/* $OpenBSD: fwscanf.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002 Tim J. Robbins
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
index 4b7baf732ff..8928aeabb86 100644
--- a/lib/libc/stdio/swprintf.c
+++ b/lib/libc/stdio/swprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swprintf.c,v 1.4 2011/07/29 09:19:22 sthen Exp $ */
+/*	$OpenBSD: swprintf.c,v 1.5 2012/12/05 23:20:01 deraadt Exp $ */
 /*	$NetBSD: swprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp $	*/
 
 /*-
@@ -27,8 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
index fc7e21b06cf..a85e9ee2ba8 100644
--- a/lib/libc/stdio/swscanf.c
+++ b/lib/libc/stdio/swscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swscanf.c,v 1.1 2011/10/16 13:20:51 stsp Exp $ */
+/* $OpenBSD: swscanf.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002 Tim J. Robbins
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
index 813698b9230..da7c4deaee0 100644
--- a/lib/libc/stdio/vswprintf.c
+++ b/lib/libc/stdio/vswprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vswprintf.c,v 1.3 2011/04/28 17:38:46 stsp Exp $	*/
+/*	$OpenBSD: vswprintf.c,v 1.4 2012/12/05 23:20:01 deraadt Exp $	*/
 /*	$NetBSD: vswprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp $	*/
 
 /*
@@ -28,7 +28,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
index 0057ab17eb2..cbaa25091ba 100644
--- a/lib/libc/stdio/vswscanf.c
+++ b/lib/libc/stdio/vswscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vswscanf.c,v 1.1 2011/10/16 13:20:51 stsp Exp $ */
+/* $OpenBSD: vswscanf.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
index c05c5d90587..7039f02d7fe 100644
--- a/lib/libc/stdio/vwscanf.c
+++ b/lib/libc/stdio/vwscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vwscanf.c,v 1.1 2011/10/16 13:20:51 stsp Exp $ */
+/* $OpenBSD: vwscanf.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002 Tim J. Robbins
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
index d5e7c261a03..06c0829ab34 100644
--- a/lib/libc/stdio/wscanf.c
+++ b/lib/libc/stdio/wscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscanf.c,v 1.1 2011/10/16 13:20:51 stsp Exp $ */
+/* $OpenBSD: wscanf.c,v 1.2 2012/12/05 23:20:01 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2002 Tim J. Robbins
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
diff --git a/lib/libc/stdlib/cfree.c b/lib/libc/stdlib/cfree.c
index 373c7ff75d3..acf6d1c8ac4 100644
--- a/lib/libc/stdlib/cfree.c
+++ b/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/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index c6c6b77ddf2..934d85e1d54 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_amd64.c,v 1.8 2012/07/09 08:43:10 deraadt Exp $	*/
+/*	$OpenBSD: kvm_amd64.c,v 1.9 2012/12/05 23:20:02 deraadt Exp $	*/
 /*	$NetBSD: kvm_x86_64.c,v 1.3 2002/06/05 22:01:55 fvdl Exp $	*/
 
 /*-
@@ -34,8 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * x86-64 machine dependent routines for kvm.
  */
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index d8a313a9024..86a556a875c 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sparc64.c,v 1.7 2008/03/30 14:49:45 kettenis Exp $	*/
+/*	$OpenBSD: kvm_sparc64.c,v 1.8 2012/12/05 23:20:02 deraadt Exp $	*/
 /*	$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $	*/
 
 /*-
@@ -34,8 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * Sparc machine dependent routines for kvm.  Hopefully, the forthcoming
  * vm code will one day obsolete this module.
diff --git a/lib/libm/arch/amd64/fenv.c b/lib/libm/arch/amd64/fenv.c
index 245ca0af695..7ad3be7828e 100644
--- a/lib/libm/arch/amd64/fenv.c
+++ b/lib/libm/arch/amd64/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:02 deraadt Exp $	*/
 /*	$NetBSD: fenv.c,v 1.1 2010/07/31 21:47:53 joerg Exp $	*/
 
 /*-
@@ -27,10 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#include <machine/fpu.h>
-
 #include <fenv.h>
+#include <machine/fpu.h>
 
 /*
  * The following constant represents the default floating-point environment
diff --git a/lib/libm/arch/arm/fenv.c b/lib/libm/arch/arm/fenv.c
index 66bc3bc2b75..9700af4b36d 100644
--- a/lib/libm/arch/arm/fenv.c
+++ b/lib/libm/arch/arm/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,10 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-#include <machine/ieeefp.h>
-
 #include <fenv.h>
+#include <machine/ieeefp.h>
 
 extern	fp_except	_softfloat_float_exception_flags;
 extern	fp_except	_softfloat_float_exception_mask;
diff --git a/lib/libm/arch/hppa/e_remainder.c b/lib/libm/arch/hppa/e_remainder.c
index e7b02d4dde4..1036e410ae4 100644
--- a/lib/libm/arch/hppa/e_remainder.c
+++ b/lib/libm/arch/hppa/e_remainder.c
@@ -2,7 +2,6 @@
  * Written by Michael Shalayeff. Public Domain
  */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 double
diff --git a/lib/libm/arch/hppa/e_sqrt.c b/lib/libm/arch/hppa/e_sqrt.c
index bd9e61e9ffa..0646682c099 100644
--- a/lib/libm/arch/hppa/e_sqrt.c
+++ b/lib/libm/arch/hppa/e_sqrt.c
@@ -4,7 +4,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/arch/hppa/fenv.c b/lib/libm/arch/hppa/fenv.c
index 74deb254db7..931c62218fa 100644
--- a/lib/libm/arch/hppa/fenv.c
+++ b/lib/libm/arch/hppa/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 union u {
diff --git a/lib/libm/arch/hppa/s_rint.c b/lib/libm/arch/hppa/s_rint.c
index bca46032b56..e87de8df0f3 100644
--- a/lib/libm/arch/hppa/s_rint.c
+++ b/lib/libm/arch/hppa/s_rint.c
@@ -4,7 +4,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/arch/hppa64/fenv.c b/lib/libm/arch/hppa64/fenv.c
index 1452f51f1c7..62590cce4ca 100644
--- a/lib/libm/arch/hppa64/fenv.c
+++ b/lib/libm/arch/hppa64/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.1 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.2 2012/12/05 23:20:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 union u {
diff --git a/lib/libm/arch/i387/fenv.c b/lib/libm/arch/i387/fenv.c
index 9f79a807e8b..c0827c1173b 100644
--- a/lib/libm/arch/i387/fenv.c
+++ b/lib/libm/arch/i387/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:02 deraadt Exp $	*/
 /*	$NetBSD: fenv.c,v 1.3 2010/08/01 06:34:38 taca Exp $	*/
 
 /*-
@@ -27,11 +27,10 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#include <machine/cpu.h>
-#include <machine/npx.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
+#include <machine/cpu.h>
+#include <machine/npx.h>
 
 #include <fenv.h>
 
diff --git a/lib/libm/arch/m88k/fenv.c b/lib/libm/arch/m88k/fenv.c
index e2aa8f989b2..771c6b9c968 100644
--- a/lib/libm/arch/m88k/fenv.c
+++ b/lib/libm/arch/m88k/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.3 2011/04/29 21:37:40 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.4 2012/12/05 23:20:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 /*
diff --git a/lib/libm/arch/mc68881/fenv.c b/lib/libm/arch/mc68881/fenv.c
index 4d65045df0c..1fb626741e3 100644
--- a/lib/libm/arch/mc68881/fenv.c
+++ b/lib/libm/arch/mc68881/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 /*
diff --git a/lib/libm/arch/mips64/fenv.c b/lib/libm/arch/mips64/fenv.c
index 72f9bd6dc54..bfc485490db 100644
--- a/lib/libm/arch/mips64/fenv.c
+++ b/lib/libm/arch/mips64/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 /*
diff --git a/lib/libm/arch/powerpc/fenv.c b/lib/libm/arch/powerpc/fenv.c
index 7f31179f177..31ff7a4f560 100644
--- a/lib/libm/arch/powerpc/fenv.c
+++ b/lib/libm/arch/powerpc/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 union u {
diff --git a/lib/libm/arch/sh/e_sqrt.c b/lib/libm/arch/sh/e_sqrt.c
index 5b4ef8dcc81..ca61513734e 100644
--- a/lib/libm/arch/sh/e_sqrt.c
+++ b/lib/libm/arch/sh/e_sqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: e_sqrt.c,v 1.2 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: e_sqrt.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 
 /*
  * Written by Martynas Venckus.  Public domain
@@ -7,7 +7,6 @@
 /* LINTLIBRARY */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <math.h>
 
 #define	FPSCR_PR	(1 << 19)
diff --git a/lib/libm/arch/sh/fenv.c b/lib/libm/arch/sh/fenv.c
index 32de203a0dc..078ec424e4c 100644
--- a/lib/libm/arch/sh/fenv.c
+++ b/lib/libm/arch/sh/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2011 Martynas Venckus <martynas@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include <fenv.h>
 
 extern	unsigned int	__fpscr_values[2];
diff --git a/lib/libm/arch/sparc/fenv.c b/lib/libm/arch/sparc/fenv.c
index 722973f6f92..ee4254400de 100644
--- a/lib/libm/arch/sparc/fenv.c
+++ b/lib/libm/arch/sparc/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.2 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.3 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $	*/
 
 /*-
@@ -24,7 +24,6 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
-#include <sys/cdefs.h>
 
 #include <fenv.h>
 
diff --git a/lib/libm/arch/sparc64/fenv.c b/lib/libm/arch/sparc64/fenv.c
index b865c7ec388..390324e8eda 100644
--- a/lib/libm/arch/sparc64/fenv.c
+++ b/lib/libm/arch/sparc64/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.3 2011/04/28 17:34:23 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.4 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: fenv.c,v 1.1 2011/01/31 00:19:33 christos Exp $	*/
 
 /*-
@@ -24,7 +24,6 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
-#include <sys/cdefs.h>
 
 #include <fenv.h>
 
diff --git a/lib/libm/noieee_src/n_asincos.c b/lib/libm/noieee_src/n_asincos.c
index ee5c19dc162..b468841e9c9 100644
--- a/lib/libm/noieee_src/n_asincos.c
+++ b/lib/libm/noieee_src/n_asincos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_asincos.c,v 1.11 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_asincos.c,v 1.12 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_asincos.c,v 1.1 1995/10/10 23:36:34 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -83,7 +83,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_atan.c b/lib/libm/noieee_src/n_atan.c
index 782945ac002..e0cb8491337 100644
--- a/lib/libm/noieee_src/n_atan.c
+++ b/lib/libm/noieee_src/n_atan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_atan.c,v 1.9 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_atan.c,v 1.10 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_atan.c,v 1.1 1995/10/10 23:36:36 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -75,7 +75,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 double
diff --git a/lib/libm/noieee_src/n_atan2.c b/lib/libm/noieee_src/n_atan2.c
index 763d7f6cbb1..510d08e11fc 100644
--- a/lib/libm/noieee_src/n_atan2.c
+++ b/lib/libm/noieee_src/n_atan2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_atan2.c,v 1.14 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_atan2.c,v 1.15 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_atan2.c,v 1.1 1995/10/10 23:36:37 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -105,7 +105,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_cbrt.c b/lib/libm/noieee_src/n_cbrt.c
index 94dba84c850..1d471079c0e 100644
--- a/lib/libm/noieee_src/n_cbrt.c
+++ b/lib/libm/noieee_src/n_cbrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_cbrt.c,v 1.6 2009/10/27 23:59:29 deraadt Exp $	*/
+/*	$OpenBSD: n_cbrt.c,v 1.7 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_cbrt.c,v 1.1 1995/10/10 23:36:40 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 /* kahan's cube root (53 bits IEEE double precision)
  * for IEEE machines only
diff --git a/lib/libm/noieee_src/n_fdim.c b/lib/libm/noieee_src/n_fdim.c
index ee251bc41ca..683f5e73a66 100644
--- a/lib/libm/noieee_src/n_fdim.c
+++ b/lib/libm/noieee_src/n_fdim.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_fdim.c,v 1.4 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_fdim.c,v 1.5 2012/12/05 23:20:03 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #define	DECL(type, fn)			\
diff --git a/lib/libm/noieee_src/n_floor.c b/lib/libm/noieee_src/n_floor.c
index 268662a7ca5..b591843618c 100644
--- a/lib/libm/noieee_src/n_floor.c
+++ b/lib/libm/noieee_src/n_floor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_floor.c,v 1.14 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_floor.c,v 1.15 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_floor.c,v 1.1 1995/10/10 23:36:48 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -31,7 +31,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_fmax.c b/lib/libm/noieee_src/n_fmax.c
index 5ef76e52143..ba6101c0afa 100644
--- a/lib/libm/noieee_src/n_fmax.c
+++ b/lib/libm/noieee_src/n_fmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_fmax.c,v 1.4 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_fmax.c,v 1.5 2012/12/05 23:20:03 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 double
diff --git a/lib/libm/noieee_src/n_fmin.c b/lib/libm/noieee_src/n_fmin.c
index ae7f2698115..251a40e6d22 100644
--- a/lib/libm/noieee_src/n_fmin.c
+++ b/lib/libm/noieee_src/n_fmin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_fmin.c,v 1.4 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_fmin.c,v 1.5 2012/12/05 23:20:03 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 double
diff --git a/lib/libm/noieee_src/n_sincos.c b/lib/libm/noieee_src/n_sincos.c
index 8c41228795e..f2977c8c945 100644
--- a/lib/libm/noieee_src/n_sincos.c
+++ b/lib/libm/noieee_src/n_sincos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_sincos.c,v 1.10 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_sincos.c,v 1.11 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_sincos.c,v 1.1 1995/10/10 23:37:04 ragge Exp $	*/
 /*
  * Copyright (c) 1987, 1993
@@ -31,7 +31,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_support.c b/lib/libm/noieee_src/n_support.c
index afd273f2d1f..5feaee90949 100644
--- a/lib/libm/noieee_src/n_support.c
+++ b/lib/libm/noieee_src/n_support.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_support.c,v 1.19 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_support.c,v 1.20 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_support.c,v 1.1 1995/10/10 23:37:06 ragge Exp $	*/
 /*
  * Copyright (c) 1985, 1993
@@ -66,7 +66,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/noieee_src/n_tan.c b/lib/libm/noieee_src/n_tan.c
index 83e16f8cdda..88ffb3cfc19 100644
--- a/lib/libm/noieee_src/n_tan.c
+++ b/lib/libm/noieee_src/n_tan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: n_tan.c,v 1.10 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: n_tan.c,v 1.11 2012/12/05 23:20:03 deraadt Exp $	*/
 /*	$NetBSD: n_tan.c,v 1.1 1995/10/10 23:37:07 ragge Exp $	*/
 /*
  * Copyright (c) 1987, 1993
@@ -31,7 +31,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "mathimpl.h"
diff --git a/lib/libm/src/b_tgamma.c b/lib/libm/src/b_tgamma.c
index 14a1e8f54ee..725e0257492 100644
--- a/lib/libm/src/b_tgamma.c
+++ b/lib/libm/src/b_tgamma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: b_tgamma.c,v 1.4 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: b_tgamma.c,v 1.5 2012/12/05 23:20:03 deraadt Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,6 @@
  * acknowledged.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_acos.c b/lib/libm/src/e_acos.c
index 55bef8e7ee0..5f86741365a 100644
--- a/lib/libm/src/e_acos.c
+++ b/lib/libm/src/e_acos.c
@@ -36,7 +36,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_acosh.c b/lib/libm/src/e_acosh.c
index 290e6bef9ec..159c6379f46 100644
--- a/lib/libm/src/e_acosh.c
+++ b/lib/libm/src/e_acosh.c
@@ -26,7 +26,6 @@
  *	acosh(NaN) is NaN without signal.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_asin.c b/lib/libm/src/e_asin.c
index f2a3cac06ad..d6134c49a30 100644
--- a/lib/libm/src/e_asin.c
+++ b/lib/libm/src/e_asin.c
@@ -42,7 +42,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_atan2.c b/lib/libm/src/e_atan2.c
index a2a8f383d2a..f1f0ad1d22c 100644
--- a/lib/libm/src/e_atan2.c
+++ b/lib/libm/src/e_atan2.c
@@ -39,7 +39,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_atanh.c b/lib/libm/src/e_atanh.c
index a8d114291f2..24b097f33e1 100644
--- a/lib/libm/src/e_atanh.c
+++ b/lib/libm/src/e_atanh.c
@@ -30,7 +30,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_cosh.c b/lib/libm/src/e_cosh.c
index 030b6b4d9a1..d316b73cad2 100644
--- a/lib/libm/src/e_cosh.c
+++ b/lib/libm/src/e_cosh.c
@@ -33,7 +33,6 @@
  *	only cosh(0)=1 is exact for finite x.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_exp.c b/lib/libm/src/e_exp.c
index a9a4fcb40b8..432855fbaf6 100644
--- a/lib/libm/src/e_exp.c
+++ b/lib/libm/src/e_exp.c
@@ -75,7 +75,6 @@
  * to produce the hexadecimal values shown.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_fmod.c b/lib/libm/src/e_fmod.c
index 36cc8e81cd8..ebda40a9fa3 100644
--- a/lib/libm/src/e_fmod.c
+++ b/lib/libm/src/e_fmod.c
@@ -18,7 +18,6 @@
  * Method: shift and subtract
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_hypot.c b/lib/libm/src/e_hypot.c
index 011cd47aa57..3f15b8a54e5 100644
--- a/lib/libm/src/e_hypot.c
+++ b/lib/libm/src/e_hypot.c
@@ -44,7 +44,6 @@
  * 	than 1 ulps (units in the last place) 
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_log.c b/lib/libm/src/e_log.c
index 94b3a2aead9..8a7049e2aa0 100644
--- a/lib/libm/src/e_log.c
+++ b/lib/libm/src/e_log.c
@@ -63,7 +63,6 @@
  * to produce the hexadecimal values shown.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_log10.c b/lib/libm/src/e_log10.c
index a4178648a1d..291c34e2141 100644
--- a/lib/libm/src/e_log10.c
+++ b/lib/libm/src/e_log10.c
@@ -45,7 +45,6 @@
  * shown.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_log2.c b/lib/libm/src/e_log2.c
index 89ed4a774ea..9692e61edb9 100644
--- a/lib/libm/src/e_log2.c
+++ b/lib/libm/src/e_log2.c
@@ -12,7 +12,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_pow.c b/lib/libm/src/e_pow.c
index e342119e9a4..59a885ce2d5 100644
--- a/lib/libm/src/e_pow.c
+++ b/lib/libm/src/e_pow.c
@@ -57,7 +57,6 @@
  * to produce the hexadecimal values shown.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_remainder.c b/lib/libm/src/e_remainder.c
index 2a9fbc8eb8a..e25590afa0b 100644
--- a/lib/libm/src/e_remainder.c
+++ b/lib/libm/src/e_remainder.c
@@ -21,7 +21,6 @@
  *	Based on fmod() return x-[x/p]chopped*p exactlp.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_sinh.c b/lib/libm/src/e_sinh.c
index 3c7d1da237e..91bd7c383ca 100644
--- a/lib/libm/src/e_sinh.c
+++ b/lib/libm/src/e_sinh.c
@@ -30,7 +30,6 @@
  *	only sinh(0)=0 is exact for finite x.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/e_sqrt.c b/lib/libm/src/e_sqrt.c
index d758e0ff4ca..22361dcf2bb 100644
--- a/lib/libm/src/e_sqrt.c
+++ b/lib/libm/src/e_sqrt.c
@@ -82,7 +82,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/ld128/s_cbrtl.c b/lib/libm/src/ld128/s_cbrtl.c
index ad3f273e1f6..9292984dbef 100644
--- a/lib/libm/src/ld128/s_cbrtl.c
+++ b/lib/libm/src/ld128/s_cbrtl.c
@@ -14,11 +14,6 @@
  * and David A. Schultz.
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtl.c,v 1.1 2011/03/12 19:37:35 kargl Exp $");
-#endif
-
 #include <float.h>
 #include <ieeefp.h>
 #include <math.h>
diff --git a/lib/libm/src/ld128/s_nextafterl.c b/lib/libm/src/ld128/s_nextafterl.c
index 2ef84bcc9c0..c1a703c80b3 100644
--- a/lib/libm/src/ld128/s_nextafterl.c
+++ b/lib/libm/src/ld128/s_nextafterl.c
@@ -17,7 +17,6 @@
  *   Special cases:
  */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "math_private.h"
diff --git a/lib/libm/src/ld128/s_remquol.c b/lib/libm/src/ld128/s_remquol.c
index 3a5087b46b2..ee7a7131137 100644
--- a/lib/libm/src/ld128/s_remquol.c
+++ b/lib/libm/src/ld128/s_remquol.c
@@ -10,11 +10,6 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_remquol.c,v 1.2 2008/07/31 20:09:47 das Exp $");
-#endif
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 
diff --git a/lib/libm/src/ld128/s_truncl.c b/lib/libm/src/ld128/s_truncl.c
index 435d527a480..fce5b6ced11 100644
--- a/lib/libm/src/ld128/s_truncl.c
+++ b/lib/libm/src/ld128/s_truncl.c
@@ -11,11 +11,6 @@
  * From: @(#)s_floor.c 5.1 93/09/24
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.9 2008/02/14 15:10:34 bde Exp $");
-#endif
-
 /*
  * truncl(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/libm/src/ld80/e_fmodl.c b/lib/libm/src/ld80/e_fmodl.c
index 68034cb771e..a7cf3472a9f 100644
--- a/lib/libm/src/ld80/e_fmodl.c
+++ b/lib/libm/src/ld80/e_fmodl.c
@@ -10,11 +10,6 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/e_fmodl.c,v 1.2 2008/07/31 20:09:47 das Exp $");
-#endif
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 
diff --git a/lib/libm/src/ld80/s_cbrtl.c b/lib/libm/src/ld80/s_cbrtl.c
index ae06387a94b..41a50f329f5 100644
--- a/lib/libm/src/ld80/s_cbrtl.c
+++ b/lib/libm/src/ld80/s_cbrtl.c
@@ -14,11 +14,6 @@
  * and David A. Schultz.
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_cbrtl.c,v 1.1 2011/03/12 19:37:35 kargl Exp $");
-#endif
-
 #include <float.h>
 #include <ieeefp.h>
 #include <math.h>
diff --git a/lib/libm/src/ld80/s_nextafterl.c b/lib/libm/src/ld80/s_nextafterl.c
index 80f0118c178..c1b984bb5bf 100644
--- a/lib/libm/src/ld80/s_nextafterl.c
+++ b/lib/libm/src/ld80/s_nextafterl.c
@@ -17,7 +17,6 @@
  *   Special cases:
  */
 
-#include <sys/cdefs.h>
 #include <math.h>
 
 #include "math_private.h"
diff --git a/lib/libm/src/ld80/s_remquol.c b/lib/libm/src/ld80/s_remquol.c
index 8b2ddd362ae..244c1053f17 100644
--- a/lib/libm/src/ld80/s_remquol.c
+++ b/lib/libm/src/ld80/s_remquol.c
@@ -10,11 +10,6 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_remquol.c,v 1.2 2008/07/31 20:09:47 das Exp $");
-#endif
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 
diff --git a/lib/libm/src/ld80/s_truncl.c b/lib/libm/src/ld80/s_truncl.c
index 63cccf260ec..3d8a1a5e243 100644
--- a/lib/libm/src/ld80/s_truncl.c
+++ b/lib/libm/src/ld80/s_truncl.c
@@ -11,11 +11,6 @@
  * From: @(#)s_floor.c 5.1 93/09/24
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.9 2008/02/14 15:10:34 bde Exp $");
-#endif
-
 /*
  * truncl(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/libm/src/s_asinh.c b/lib/libm/src/s_asinh.c
index 2899d4c2cd6..068aebeba63 100644
--- a/lib/libm/src/s_asinh.c
+++ b/lib/libm/src/s_asinh.c
@@ -23,7 +23,6 @@
  *		 := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))  
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_atan.c b/lib/libm/src/s_atan.c
index 36f64bdee0d..fe55bd5b4c7 100644
--- a/lib/libm/src/s_atan.c
+++ b/lib/libm/src/s_atan.c
@@ -32,7 +32,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_cabs.c b/lib/libm/src/s_cabs.c
index 3d28fd4de64..ab3ea9c76c3 100644
--- a/lib/libm/src/s_cabs.c
+++ b/lib/libm/src/s_cabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cabs.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cabs.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_cacos.c b/lib/libm/src/s_cacos.c
index 1ff40d4f858..b1cc86c439d 100644
--- a/lib/libm/src/s_cacos.c
+++ b/lib/libm/src/s_cacos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cacos.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cacos.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -48,7 +48,6 @@
  *    IEEE      -10,+10     30000      1.8e-14      2.2e-15
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_cacosh.c b/lib/libm/src/s_cacosh.c
index 8db79ddc0b2..2adaa7bbbdf 100644
--- a/lib/libm/src/s_cacosh.c
+++ b/lib/libm/src/s_cacosh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cacosh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cacosh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -44,7 +44,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_carg.c b/lib/libm/src/s_carg.c
index 08f321c36ab..4134faf042c 100644
--- a/lib/libm/src/s_carg.c
+++ b/lib/libm/src/s_carg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_carg.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_carg.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_casin.c b/lib/libm/src/s_casin.c
index 64ebe6bb7a8..9ca3008f863 100644
--- a/lib/libm/src/s_casin.c
+++ b/lib/libm/src/s_casin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_casin.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_casin.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -51,7 +51,6 @@
  * Also tested by csin(casin(z)) = z.
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_casinh.c b/lib/libm/src/s_casinh.c
index 8f1f02fa54a..974d49ad06d 100644
--- a/lib/libm/src/s_casinh.c
+++ b/lib/libm/src/s_casinh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_casinh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_casinh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -44,7 +44,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_catan.c b/lib/libm/src/s_catan.c
index 78861b2f929..fc7099b7259 100644
--- a/lib/libm/src/s_catan.c
+++ b/lib/libm/src/s_catan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_catan.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_catan.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -64,7 +64,6 @@
  * 2.9e-17.  See also clog().
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_catanh.c b/lib/libm/src/s_catanh.c
index 7b23934b0fe..726137ebea4 100644
--- a/lib/libm/src/s_catanh.c
+++ b/lib/libm/src/s_catanh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_catanh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_catanh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -44,7 +44,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_cbrt.c b/lib/libm/src/s_cbrt.c
index 2ec4378d096..f16d6c7da9c 100644
--- a/lib/libm/src/s_cbrt.c
+++ b/lib/libm/src/s_cbrt.c
@@ -12,7 +12,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_ccos.c b/lib/libm/src/s_ccos.c
index 7152bc14253..da2cc009002 100644
--- a/lib/libm/src/s_ccos.c
+++ b/lib/libm/src/s_ccos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_ccos.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_ccos.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -51,7 +51,6 @@
  *    IEEE      -10,+10     30000       3.8e-16     1.0e-16
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_ccosh.c b/lib/libm/src/s_ccosh.c
index 3e780e976f0..1b3216caa6d 100644
--- a/lib/libm/src/s_ccosh.c
+++ b/lib/libm/src/s_ccosh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_ccosh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_ccosh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -44,7 +44,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_ceil.c b/lib/libm/src/s_ceil.c
index 3825377c4d7..b927f35ce27 100644
--- a/lib/libm/src/s_ceil.c
+++ b/lib/libm/src/s_ceil.c
@@ -21,7 +21,6 @@
  *	Inexact flag raised if x not equal to ceil(x).
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_cexp.c b/lib/libm/src/s_cexp.c
index 14a43270f52..3febe08049f 100644
--- a/lib/libm/src/s_cexp.c
+++ b/lib/libm/src/s_cexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cexp.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cexp.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -55,7 +55,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_cimag.c b/lib/libm/src/s_cimag.c
index d03a6186e76..f5b2f774e44 100644
--- a/lib/libm/src/s_cimag.c
+++ b/lib/libm/src/s_cimag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cimag.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cimag.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_clog.c b/lib/libm/src/s_clog.c
index ce806269bfb..576c92fbf3b 100644
--- a/lib/libm/src/s_clog.c
+++ b/lib/libm/src/s_clog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_clog.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_clog.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -56,7 +56,6 @@
  * absolute error 1.0e-16.
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_conj.c b/lib/libm/src/s_conj.c
index 0ffb990a831..92841550003 100644
--- a/lib/libm/src/s_conj.c
+++ b/lib/libm/src/s_conj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_conj.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_conj.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_copysign.c b/lib/libm/src/s_copysign.c
index 73b3234cfc0..4cb7b519440 100644
--- a/lib/libm/src/s_copysign.c
+++ b/lib/libm/src/s_copysign.c
@@ -18,7 +18,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_cos.c b/lib/libm/src/s_cos.c
index 50475de7fa4..dcabc7ae0e2 100644
--- a/lib/libm/src/s_cos.c
+++ b/lib/libm/src/s_cos.c
@@ -43,7 +43,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_cpow.c b/lib/libm/src/s_cpow.c
index a0327118e35..d0dfca83e81 100644
--- a/lib/libm/src/s_cpow.c
+++ b/lib/libm/src/s_cpow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cpow.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cpow.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -46,7 +46,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_cproj.c b/lib/libm/src/s_cproj.c
index 543290a08c2..7fa2dbc2e3f 100644
--- a/lib/libm/src/s_cproj.c
+++ b/lib/libm/src/s_cproj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_cproj.c,v 1.3 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_cproj.c,v 1.4 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_creal.c b/lib/libm/src/s_creal.c
index a45941534cc..60f73901053 100644
--- a/lib/libm/src/s_creal.c
+++ b/lib/libm/src/s_creal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_creal.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_creal.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -17,7 +17,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_csin.c b/lib/libm/src/s_csin.c
index 44f7d925148..be10087327d 100644
--- a/lib/libm/src/s_csin.c
+++ b/lib/libm/src/s_csin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_csin.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_csin.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -53,7 +53,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_csinh.c b/lib/libm/src/s_csinh.c
index 83ee14be7b8..0aa4d5cb7e4 100644
--- a/lib/libm/src/s_csinh.c
+++ b/lib/libm/src/s_csinh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_csinh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_csinh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -43,7 +43,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_csqrt.c b/lib/libm/src/s_csqrt.c
index 700c17dd533..c1cbcfe38e5 100644
--- a/lib/libm/src/s_csqrt.c
+++ b/lib/libm/src/s_csqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_csqrt.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_csqrt.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -60,7 +60,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_ctan.c b/lib/libm/src/s_ctan.c
index c98dd50b38c..0b635235336 100644
--- a/lib/libm/src/s_ctan.c
+++ b/lib/libm/src/s_ctan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_ctan.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_ctan.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -58,7 +58,6 @@
  * Also tested by ctan * ccot = 1 and catan(ctan(z))  =  z.
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_ctanh.c b/lib/libm/src/s_ctanh.c
index 0b0bcb2ac02..a0d508b1087 100644
--- a/lib/libm/src/s_ctanh.c
+++ b/lib/libm/src/s_ctanh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_ctanh.c,v 1.2 2011/07/08 19:25:31 martynas Exp $	*/
+/*	$OpenBSD: s_ctanh.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 Stephen L. Moshier <steve@moshier.net>
  *
@@ -44,7 +44,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_erf.c b/lib/libm/src/s_erf.c
index 619e3ea0e33..9caca5cf697 100644
--- a/lib/libm/src/s_erf.c
+++ b/lib/libm/src/s_erf.c
@@ -106,7 +106,6 @@
  *	   	erfc/erf(NaN) is NaN
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_exp2.c b/lib/libm/src/s_exp2.c
index 95d0408c6d8..807eb2a72d0 100644
--- a/lib/libm/src/s_exp2.c
+++ b/lib/libm/src/s_exp2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_exp2.c,v 1.3 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: s_exp2.c,v 1.4 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_exp2f.c b/lib/libm/src/s_exp2f.c
index 3ed3e6c209d..6319b11c1a3 100644
--- a/lib/libm/src/s_exp2f.c
+++ b/lib/libm/src/s_exp2f.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_exp2f.c,v 1.1 2008/07/24 09:40:16 martynas Exp $	*/
+/*	$OpenBSD: s_exp2f.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/libm/src/s_expm1.c b/lib/libm/src/s_expm1.c
index 8d391c2dd8f..a201550032a 100644
--- a/lib/libm/src/s_expm1.c
+++ b/lib/libm/src/s_expm1.c
@@ -107,7 +107,6 @@
  * to produce the hexadecimal values shown.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_fdim.c b/lib/libm/src/s_fdim.c
index 12fb1382462..58d54366de5 100644
--- a/lib/libm/src/s_fdim.c
+++ b/lib/libm/src/s_fdim.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fdim.c,v 1.4 2009/10/26 21:06:19 kettenis Exp $	*/
+/*	$OpenBSD: s_fdim.c,v 1.5 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_floor.c b/lib/libm/src/s_floor.c
index 3717861b914..439cac80782 100644
--- a/lib/libm/src/s_floor.c
+++ b/lib/libm/src/s_floor.c
@@ -21,7 +21,6 @@
  *	Inexact flag raised if x not equal to floor(x).
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_fma.c b/lib/libm/src/s_fma.c
index 7f22094e268..ffdd36bf6b3 100644
--- a/lib/libm/src/s_fma.c
+++ b/lib/libm/src/s_fma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fma.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_fma.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -28,11 +28,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fma.c,v 1.5 2008/04/03 06:14:51 das Exp $");
-#endif
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_fmaf.c b/lib/libm/src/s_fmaf.c
index 172f270b058..5bd4022148f 100644
--- a/lib/libm/src/s_fmaf.c
+++ b/lib/libm/src/s_fmaf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmaf.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_fmaf.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmaf.c,v 1.2 2008/03/29 16:38:29 das Exp $");
-#endif
-
 #include <math.h>
 
 /*
diff --git a/lib/libm/src/s_fmal.c b/lib/libm/src/s_fmal.c
index e8bb1c2848c..6bac0df8a35 100644
--- a/lib/libm/src/s_fmal.c
+++ b/lib/libm/src/s_fmal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmal.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_fmal.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -26,11 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.4 2008/04/03 06:14:51 das Exp $");
-#endif
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/libm/src/s_fmax.c b/lib/libm/src/s_fmax.c
index fb94abe12e7..8af710d70ae 100644
--- a/lib/libm/src/s_fmax.c
+++ b/lib/libm/src/s_fmax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmax.c,v 1.5 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: s_fmax.c,v 1.6 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_fmin.c b/lib/libm/src/s_fmin.c
index d735aa7da7e..af2ec3f73ef 100644
--- a/lib/libm/src/s_fmin.c
+++ b/lib/libm/src/s_fmin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_fmin.c,v 1.5 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: s_fmin.c,v 1.6 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
@@ -27,7 +27,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_ilogb.c b/lib/libm/src/s_ilogb.c
index a700a3dce99..8e263b6dc64 100644
--- a/lib/libm/src/s_ilogb.c
+++ b/lib/libm/src/s_ilogb.c
@@ -18,7 +18,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_log1p.c b/lib/libm/src/s_log1p.c
index 2fbe0a9bed5..9e387df9c72 100644
--- a/lib/libm/src/s_log1p.c
+++ b/lib/libm/src/s_log1p.c
@@ -77,7 +77,6 @@
  *	 See HP-15C Advanced Functions Handbook, p.193.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_lrintl.c b/lib/libm/src/s_lrintl.c
index 66f699c8116..6c8fd6b31af 100644
--- a/lib/libm/src/s_lrintl.c
+++ b/lib/libm/src/s_lrintl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_lrintl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_lrintl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <fenv.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_lroundl.c b/lib/libm/src/s_lroundl.c
index ca24910866b..a82c7d3e900 100644
--- a/lib/libm/src/s_lroundl.c
+++ b/lib/libm/src/s_lroundl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_lroundl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_lroundl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/limits.h>
 #include <fenv.h>
 #include <math.h>
diff --git a/lib/libm/src/s_nan.c b/lib/libm/src/s_nan.c
index b3b4b523afc..4f2fadd3419 100644
--- a/lib/libm/src/s_nan.c
+++ b/lib/libm/src/s_nan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_nan.c,v 1.7 2011/05/30 18:34:38 martynas Exp $	*/
+/*	$OpenBSD: s_nan.c,v 1.8 2012/12/05 23:20:04 deraadt Exp $	*/
 /*-
  * Copyright (c) 2007 David Schultz
  * All rights reserved.
@@ -29,7 +29,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/endian.h>
 #include <ctype.h>
diff --git a/lib/libm/src/s_nextafter.c b/lib/libm/src/s_nextafter.c
index ead67afd86c..a3fb9797a0c 100644
--- a/lib/libm/src/s_nextafter.c
+++ b/lib/libm/src/s_nextafter.c
@@ -19,7 +19,6 @@
  *   Special cases:
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_remquo.c b/lib/libm/src/s_remquo.c
index 1c00f104b3e..42285213033 100644
--- a/lib/libm/src/s_remquo.c
+++ b/lib/libm/src/s_remquo.c
@@ -12,7 +12,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_remquof.c b/lib/libm/src/s_remquof.c
index 9e85ad7fedc..cf9fdfbe2c2 100644
--- a/lib/libm/src/s_remquof.c
+++ b/lib/libm/src/s_remquof.c
@@ -10,8 +10,6 @@
  * ====================================================
  */
 
-#include <sys/cdefs.h>
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/libm/src/s_rint.c b/lib/libm/src/s_rint.c
index c509714c02f..2bb3acba96c 100644
--- a/lib/libm/src/s_rint.c
+++ b/lib/libm/src/s_rint.c
@@ -22,7 +22,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_round.c b/lib/libm/src/s_round.c
index 356447a72fc..97bed04a6d9 100644
--- a/lib/libm/src/s_round.c
+++ b/lib/libm/src/s_round.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_round.c,v 1.2 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_round.c,v 1.3 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2003, Steven G. Kargl
@@ -28,7 +28,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_roundl.c b/lib/libm/src/s_roundl.c
index 05cdaed3304..b893f3193cc 100644
--- a/lib/libm/src/s_roundl.c
+++ b/lib/libm/src/s_roundl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_roundl.c,v 1.1 2011/07/06 00:02:42 martynas Exp $	*/
+/*	$OpenBSD: s_roundl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2003, Steven G. Kargl
@@ -26,11 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_roundl.c,v 1.2 2005/12/02 13:45:06 bde Exp $");
-#endif
-
 #include <math.h>
 
 long double
diff --git a/lib/libm/src/s_scalbn.c b/lib/libm/src/s_scalbn.c
index f336f945971..b4a24ec560a 100644
--- a/lib/libm/src/s_scalbn.c
+++ b/lib/libm/src/s_scalbn.c
@@ -19,7 +19,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_scalbnl.c b/lib/libm/src/s_scalbnl.c
index eda7a5e2333..6c6759e1a1b 100644
--- a/lib/libm/src/s_scalbnl.c
+++ b/lib/libm/src/s_scalbnl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s_scalbnl.c,v 1.1 2008/12/09 20:00:35 martynas Exp $	*/
+/*	$OpenBSD: s_scalbnl.c,v 1.2 2012/12/05 23:20:04 deraadt Exp $	*/
 /* @(#)s_scalbn.c 5.1 93/09/24 */
 /*
  * ====================================================
@@ -24,7 +24,6 @@
  * for scalbn(), so we don't use this routine.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
diff --git a/lib/libm/src/s_sin.c b/lib/libm/src/s_sin.c
index 6ffe6efaab8..37cb2d9592a 100644
--- a/lib/libm/src/s_sin.c
+++ b/lib/libm/src/s_sin.c
@@ -43,7 +43,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_tan.c b/lib/libm/src/s_tan.c
index dda041b5183..6b275d3e2a3 100644
--- a/lib/libm/src/s_tan.c
+++ b/lib/libm/src/s_tan.c
@@ -42,7 +42,6 @@
 
 /* LINTLIBRARY */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_tanh.c b/lib/libm/src/s_tanh.c
index f7d63dd69e0..d89f24436d1 100644
--- a/lib/libm/src/s_tanh.c
+++ b/lib/libm/src/s_tanh.c
@@ -36,7 +36,6 @@
  *	only tanh(0)=0 is exact for finite argument.
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_trunc.c b/lib/libm/src/s_trunc.c
index 8c2b165ddb6..9aa8d24ba68 100644
--- a/lib/libm/src/s_trunc.c
+++ b/lib/libm/src/s_trunc.c
@@ -12,11 +12,6 @@
 
 /* LINTLIBRARY */
 
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $");
-#endif
-
 /*
  * trunc(x)
  * Return x rounded toward 0 to integral value
@@ -26,7 +21,6 @@ __FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp
  *	Inexact flag raised if x not equal to trunc(x).
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libm/src/s_truncf.c b/lib/libm/src/s_truncf.c
index 7842ea7b2ce..40cdcd93bdf 100644
--- a/lib/libm/src/s_truncf.c
+++ b/lib/libm/src/s_truncf.c
@@ -10,11 +10,6 @@
  * ====================================================
  */
 
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_truncf.c,v 1.1 2004/06/20 09:25:43 das Exp $");
-#endif
-
 /*
  * truncf(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/libm/src/w_lgamma.c b/lib/libm/src/w_lgamma.c
index bf69e9a734f..ec7e5aa42c1 100644
--- a/lib/libm/src/w_lgamma.c
+++ b/lib/libm/src/w_lgamma.c
@@ -18,7 +18,6 @@
  * Method: call lgamma_r
  */
 
-#include <sys/cdefs.h>
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h
index 4146c35bb5d..9ef42ce8002 100644
--- a/lib/libocurses/curses.h
+++ b/lib/libocurses/curses.h
@@ -33,7 +33,6 @@
 #define	_OCURSES_H_
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
 #include <stdio.h>
 
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index 514b8eb10c5..de6a8096483 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.38 2012/11/05 08:58:39 landry Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.39 2012/12/05 23:20:05 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -40,7 +40,6 @@
 /*
  * Header files.
  */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/signal.h>
diff --git a/lib/libpthread/include/sched.h b/lib/libpthread/include/sched.h
index a959d0f70de..d8aef46f111 100644
--- a/lib/libpthread/include/sched.h
+++ b/lib/libpthread/include/sched.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sched.h,v 1.8 2012/03/22 04:26:31 guenther Exp $	*/
+/*	$OpenBSD: sched.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $	*/
 
 /* sched.h: POSIX 1003.1b Process Scheduling header */
 
@@ -53,8 +53,6 @@ struct sched_param
 	int sched_priority;
 };
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 #if 0	/* not yet */
 int sched_setparam(pid_t, const struct sched_param *);
diff --git a/lib/libpthread/include/semaphore.h b/lib/libpthread/include/semaphore.h
index f5256d936cb..6e00bf320ee 100644
--- a/lib/libpthread/include/semaphore.h
+++ b/lib/libpthread/include/semaphore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: semaphore.h,v 1.5 2012/07/11 09:08:50 guenther Exp $	*/
+/*	$OpenBSD: semaphore.h,v 1.6 2012/12/05 23:20:05 deraadt Exp $	*/
 
 /* semaphore.h: POSIX 1003.1b semaphores */
 
@@ -50,7 +50,6 @@ struct timespec;
 #define SEM_VALUE_MAX   UINT_MAX
 
 #ifndef _KERNEL
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 int	sem_init(sem_t *, int, unsigned int);
diff --git a/lib/libpthread/include/spinlock.h b/lib/libpthread/include/spinlock.h
index 717072115b0..1e836d41605 100644
--- a/lib/libpthread/include/spinlock.h
+++ b/lib/libpthread/include/spinlock.h
@@ -29,8 +29,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: spinlock.h,v 1.8 2003/01/31 04:46:17 marc Exp $
- * $OpenBSD: spinlock.h,v 1.8 2003/01/31 04:46:17 marc Exp $
+ * $Id: spinlock.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $
+ * $OpenBSD: spinlock.h,v 1.9 2012/12/05 23:20:05 deraadt Exp $
  *
  * Lock definitions used in both libc and libpthread.
  *
@@ -38,7 +38,6 @@
 
 #ifndef _SPINLOCK_H_
 #define _SPINLOCK_H_
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/spinlock.h>
 
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index a8c57e80778..b386e306697 100644
--- a/lib/libutil/fparseln.c
+++ b/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/lib/libutil/opendisk.c b/lib/libutil/opendisk.c
index 62178b4201f..3840f70500a 100644
--- a/lib/libutil/opendisk.c
+++ b/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/lib/libutil/pty.c b/lib/libutil/pty.c
index 86fddb1f331..2fb20880da3 100644
--- a/lib/libutil/pty.c
+++ b/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/lib/libutil/util.h b/lib/libutil/util.h
index 6fe0b016e3e..92e3c45ed20 100644
--- a/lib/libutil/util.h
+++ b/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>
 
 /*
diff --git a/lib/libwrap/tcpd.h b/lib/libwrap/tcpd.h
index ab8105e97a0..97e7405d892 100644
--- a/lib/libwrap/tcpd.h
+++ b/lib/libwrap/tcpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpd.h,v 1.15 2003/06/03 21:09:00 deraadt Exp $	*/
+/*	$OpenBSD: tcpd.h,v 1.16 2012/12/05 23:20:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -33,8 +33,6 @@
 #ifndef _TCPD_H_
 #define _TCPD_H_
 
-#include <sys/cdefs.h>
-
 /* Structure to describe one communications endpoint. */
 
 #define STRING_LENGTH	256		/* hosts, users, processes */
diff --git a/libexec/ld.so/alpha/rtld_machine.c b/libexec/ld.so/alpha/rtld_machine.c
index 6a4c0d1ffa2..394bf99507a 100644
--- a/libexec/ld.so/alpha/rtld_machine.c
+++ b/libexec/ld.so/alpha/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.46 2011/04/08 02:43:28 deraadt Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.47 2012/12/05 23:20:06 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -31,7 +31,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 #include <sys/exec.h>
 
diff --git a/libexec/ld.so/amd64/rtld_machine.c b/libexec/ld.so/amd64/rtld_machine.c
index 13af6d3b235..30e9d263fcf 100644
--- a/libexec/ld.so/amd64/rtld_machine.c
+++ b/libexec/ld.so/amd64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.16 2011/04/06 11:36:25 miod Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.17 2012/12/05 23:20:06 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002,2004 Dale Rahn
@@ -66,7 +66,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 
 #include <nlist.h>
diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c
index 18f2c3496b6..6f14abd2277 100644
--- a/libexec/ld.so/dl_printf.c
+++ b/libexec/ld.so/dl_printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl_printf.c,v 1.16 2010/01/02 00:59:01 deraadt Exp $	*/
+/*	$OpenBSD: dl_printf.c,v 1.17 2012/12/05 23:20:06 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -54,7 +54,6 @@
  *	reg=3<BITTWO,BITONE>
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdarg.h>
 #include "syscall.h"
diff --git a/libexec/ld.so/hppa/rtld_machine.c b/libexec/ld.so/hppa/rtld_machine.c
index 15bcaaa5114..2bb4a0e2b63 100644
--- a/libexec/ld.so/hppa/rtld_machine.c
+++ b/libexec/ld.so/hppa/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.24 2012/06/20 13:47:20 deraadt Exp $	*/
+/*	$OpenBSD: rtld_machine.c,v 1.25 2012/12/05 23:20:06 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -32,7 +32,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 #include <sys/tree.h>
 
diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c
index bf258fe2203..06b6002dca0 100644
--- a/libexec/ld.so/i386/rtld_machine.c
+++ b/libexec/ld.so/i386/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.25 2011/04/06 11:36:25 miod Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.26 2012/12/05 23:20:06 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -66,7 +66,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 
 #include <nlist.h>
diff --git a/libexec/ld.so/sparc/rtld_machine.c b/libexec/ld.so/sparc/rtld_machine.c
index 61102529906..a38e5f34fb4 100644
--- a/libexec/ld.so/sparc/rtld_machine.c
+++ b/libexec/ld.so/sparc/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.33 2011/04/06 11:36:25 miod Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.34 2012/12/05 23:20:07 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -30,7 +30,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
diff --git a/libexec/ld.so/sparc64/rtld_machine.c b/libexec/ld.so/sparc64/rtld_machine.c
index 1d0ae9af8e4..7e30c85f6e8 100644
--- a/libexec/ld.so/sparc64/rtld_machine.c
+++ b/libexec/ld.so/sparc64/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.46 2011/04/06 11:36:25 miod Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.47 2012/12/05 23:20:07 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -66,7 +66,6 @@
 #define _DYN_LOADER
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mman.h>
 
 #include <nlist.h>
diff --git a/libexec/tcpd/tcpdchk/inetcf.h b/libexec/tcpd/tcpdchk/inetcf.h
index 05716c3509e..b852efc7b2d 100644
--- a/libexec/tcpd/tcpdchk/inetcf.h
+++ b/libexec/tcpd/tcpdchk/inetcf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetcf.h,v 1.2 2002/02/16 21:27:31 millert Exp $	*/
+/*	$OpenBSD: inetcf.h,v 1.3 2012/12/05 23:20:07 deraadt Exp $	*/
 
  /*
   * @(#) inetcf.h 1.1 94/12/28 17:42:30
@@ -6,8 +6,6 @@
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
-#include <sys/cdefs.h>
-
 extern char *inet_cfg(char *);
 extern void inet_set(char *, int);
 extern int inet_get(char *);
diff --git a/regress/lib/libc/regex/t_exhaust.c b/regress/lib/libc/regex/t_exhaust.c
index e4d4e4f5d7c..58ac8007f2c 100644
--- a/regress/lib/libc/regex/t_exhaust.c
+++ b/regress/lib/libc/regex/t_exhaust.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_exhaust.c,v 1.2 2011/11/06 15:47:07 otto Exp $	*/
+/*	$OpenBSD: t_exhaust.c,v 1.3 2012/12/05 23:20:07 deraadt Exp $	*/
 /*	$NetBSD: t_exhaust.c,v 1.2 2011/10/21 00:41:34 christos Exp $	*/
 
 /*-
@@ -37,8 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <stdio.h>
 #include <regex.h>
 #include <string.h>
diff --git a/regress/lib/libm/fenv/fenv.c b/regress/lib/libm/fenv/fenv.c
index 14d34402256..d821c1babe7 100644
--- a/regress/lib/libm/fenv/fenv.c
+++ b/regress/lib/libm/fenv/fenv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fenv.c,v 1.1 2011/03/21 21:51:28 martynas Exp $	*/
+/*	$OpenBSD: fenv.c,v 1.2 2012/12/05 23:20:07 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.org>
@@ -30,7 +30,6 @@
  * Test the correctness and C99-compliance of various fenv.h features.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
diff --git a/regress/libexec/ld.so/weak/libweak/weak.c b/regress/libexec/ld.so/weak/libweak/weak.c
index 39736cd96c5..b641553488a 100644
--- a/regress/libexec/ld.so/weak/libweak/weak.c
+++ b/regress/libexec/ld.so/weak/libweak/weak.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: weak.c,v 1.2 2002/11/13 21:51:04 fgsch Exp $	*/
+/*	$OpenBSD: weak.c,v 1.3 2012/12/05 23:20:08 deraadt Exp $	*/
 
 /*
  * Public domain. 2002, Federico Schwindt <fgsch@openbsd.org>.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "defs.h"
 
 int
diff --git a/regress/sys/arch/m68k/emuspeed/speed.h b/regress/sys/arch/m68k/emuspeed/speed.h
index f2f7bbcccff..6a25794c843 100644
--- a/regress/sys/arch/m68k/emuspeed/speed.h
+++ b/regress/sys/arch/m68k/emuspeed/speed.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: speed.h,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
+/*	$OpenBSD: speed.h,v 1.4 2012/12/05 23:20:08 deraadt Exp $	*/
 /*	$NetBSD: speed.h,v 1.2 1998/01/09 08:03:57 perry Exp $	*/
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 void illegal(int);
 void mul32smem(int);
diff --git a/sys/arch/alpha/alpha/dec_kn300.c b/sys/arch/alpha/alpha/dec_kn300.c
index 2c4f3b8c811..edb0a1031bf 100644
--- a/sys/arch/alpha/alpha/dec_kn300.c
+++ b/sys/arch/alpha/alpha/dec_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_kn300.c,v 1.6 2010/11/23 04:07:55 shadchin Exp $ */
+/* $OpenBSD: dec_kn300.c,v 1.7 2012/12/05 23:20:09 deraadt Exp $ */
 /* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/alpha/include/sysarch.h b/sys/arch/alpha/include/sysarch.h
index 73a098ea64c..b118a1c2dc9 100644
--- a/sys/arch/alpha/include/sysarch.h
+++ b/sys/arch/alpha/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.8 2012/10/10 11:23:47 sthen Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.9 2012/12/05 23:20:09 deraadt Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.8 2001/04/26 03:10:46 ross Exp $	*/
 
 /*-
@@ -33,7 +33,6 @@
 #ifndef _MACHINE_SYSARCH_H_
 #define _MACHINE_SYSARCH_H_
 
-#include <sys/cdefs.h>
 #include <machine/ieeefp.h>
 
 /*
@@ -56,6 +55,9 @@ struct alpha_fp_c_args {
 };
 
 #ifndef _KERNEL
+
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int	sysarch(int, void *);
 __END_DECLS
diff --git a/sys/arch/alpha/mcbus/mcbus.c b/sys/arch/alpha/mcbus/mcbus.c
index 30e050bd5ac..3fbf2d70870 100644
--- a/sys/arch/alpha/mcbus/mcbus.c
+++ b/sys/arch/alpha/mcbus/mcbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcbus.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */
+/* $OpenBSD: mcbus.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcbus.c,v 1.19 2007/03/04 05:59:11 christos Exp $ */
 
 /*
@@ -36,7 +36,6 @@
  * bus found on AlphaServer 4100 systems.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/alpha/mcbus/mcmem.c b/sys/arch/alpha/mcbus/mcmem.c
index 48f2aaea474..e736d3d0549 100644
--- a/sys/arch/alpha/mcbus/mcmem.c
+++ b/sys/arch/alpha/mcbus/mcmem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcmem.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */
+/* $OpenBSD: mcmem.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcmem.c,v 1.4 2002/10/02 04:06:38 thorpej Exp $ */
 
 /*
@@ -37,7 +37,6 @@
  * the MCBUS main system bus found on AlphaServer 4100 systems.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/alpha/pci/mcpcia.c b/sys/arch/alpha/pci/mcpcia.c
index 9d519c67437..d0326ae347d 100644
--- a/sys/arch/alpha/pci/mcpcia.c
+++ b/sys/arch/alpha/pci/mcpcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcpcia.c,v 1.5 2010/02/18 20:48:15 sobrado Exp $ */
+/* $OpenBSD: mcpcia.c,v 1.6 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcpcia.c,v 1.20 2007/03/04 05:59:11 christos Exp $ */
 
 /*-
@@ -66,7 +66,6 @@
  * found on AlphaServer 4100 systems.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/alpha/pci/mcpcia_bus_io.c b/sys/arch/alpha/pci/mcpcia_bus_io.c
index aa39c1bbada..86f087e414a 100644
--- a/sys/arch/alpha/pci/mcpcia_bus_io.c
+++ b/sys/arch/alpha/pci/mcpcia_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcpcia_bus_io.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */
+/* $OpenBSD: mcpcia_bus_io.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcpcia_bus_io.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/alpha/pci/mcpcia_bus_mem.c b/sys/arch/alpha/pci/mcpcia_bus_mem.c
index b684e4241a4..f1cef61c997 100644
--- a/sys/arch/alpha/pci/mcpcia_bus_mem.c
+++ b/sys/arch/alpha/pci/mcpcia_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcpcia_bus_mem.c,v 1.1 2007/03/16 21:22:27 robert Exp $ */
+/* $OpenBSD: mcpcia_bus_mem.c,v 1.2 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcpcia_bus_mem.c,v 1.3 2000/06/29 08:58:47 mrg Exp $ */
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/alpha/pci/mcpcia_dma.c b/sys/arch/alpha/pci/mcpcia_dma.c
index 14bdc5c83f2..7dba6aa8823 100644
--- a/sys/arch/alpha/pci/mcpcia_dma.c
+++ b/sys/arch/alpha/pci/mcpcia_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcpcia_dma.c,v 1.3 2009/02/01 14:34:00 miod Exp $ */
+/* $OpenBSD: mcpcia_dma.c,v 1.4 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcpcia_dma.c,v 1.15 2001/07/19 18:55:40 thorpej Exp $ */
 
 /*-
@@ -33,7 +33,6 @@
 
 #define _ALPHA_BUS_DMA_PRIVATE
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/alpha/pci/mcpcia_pci.c b/sys/arch/alpha/pci/mcpcia_pci.c
index ddc9e00b76c..43e16b417c7 100644
--- a/sys/arch/alpha/pci/mcpcia_pci.c
+++ b/sys/arch/alpha/pci/mcpcia_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcpcia_pci.c,v 1.2 2010/12/04 17:06:31 miod Exp $ */
+/* $OpenBSD: mcpcia_pci.c,v 1.3 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: mcpcia_pci.c,v 1.5 2007/03/04 05:59:11 christos Exp $ */
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 76f8b844482..2af6cceeb4e 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn300.c,v 1.4 2009/09/30 20:18:06 miod Exp $ */
+/* $OpenBSD: pci_kn300.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */
 
 /*
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c
index 9ab736eea7d..a4be37bf168 100644
--- a/sys/arch/alpha/pci/pciide_machdep.c
+++ b/sys/arch/alpha/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide_machdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: pciide_machdep.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $ */
 
 /*
@@ -41,8 +41,6 @@
  * PCI SIG.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c
index d6f073eeecd..5c7fc241b49 100644
--- a/sys/arch/amd64/amd64/bus_dma.c
+++ b/sys/arch/amd64/amd64/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.38 2011/07/03 18:31:02 oga Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.39 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $	*/
 
 /*-
@@ -31,8 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * The following is included because _bus_dma_uiomove is derived from
  * uiomove() in kern_subr.c.
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
index 41f334d0c79..a49d7828b58 100644
--- a/sys/arch/amd64/amd64/intr.c
+++ b/sys/arch/amd64/amd64/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.31 2011/10/29 19:17:30 kettenis Exp $	*/
+/*	$OpenBSD: intr.c,v 1.32 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $	*/
 
 /*
@@ -38,7 +38,6 @@
 
 /* #define	INTRDEBUG */
 
-#include <sys/cdefs.h>
 #include <sys/param.h> 
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/amd64/amd64/ipi.c b/sys/arch/amd64/amd64/ipi.c
index f6ca47c87f6..6f568411e08 100644
--- a/sys/arch/amd64/amd64/ipi.c
+++ b/sys/arch/amd64/amd64/ipi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipi.c,v 1.10 2010/12/27 20:22:23 guenther Exp $	*/
+/*	$OpenBSD: ipi.c,v 1.11 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: ipi.c,v 1.2 2003/03/01 13:05:37 fvdl Exp $	*/
 
 /*-
@@ -32,8 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>                  /* RCS ID & Copyright macro defns */
-
 #include <sys/param.h> 
 #include <sys/device.h>
 #include <sys/systm.h>
diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c
index caec5b0b428..ffeb7c71e3f 100644
--- a/sys/arch/amd64/amd64/ipifuncs.c
+++ b/sys/arch/amd64/amd64/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.16 2011/03/18 03:10:47 guenther Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.17 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */
 
 /*-
@@ -32,8 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 /*
  * Interprocessor interrupt handlers.
  */
diff --git a/sys/arch/amd64/include/cpufunc.h b/sys/arch/amd64/include/cpufunc.h
index 1373e1712df..22a801393a0 100644
--- a/sys/arch/amd64/include/cpufunc.h
+++ b/sys/arch/amd64/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.8 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.3 2003/05/08 10:27:43 fvdl Exp $	*/
 
 /*-
@@ -37,7 +37,6 @@
  * Functions to provide access to i386-specific instructions.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/specialreg.h>
diff --git a/sys/arch/amd64/include/sysarch.h b/sys/arch/amd64/include/sysarch.h
index bebba9b3579..185a0837af9 100644
--- a/sys/arch/amd64/include/sysarch.h
+++ b/sys/arch/amd64/include/sysarch.h
@@ -1,11 +1,9 @@
-/*	$OpenBSD: sysarch.h,v 1.11 2012/10/10 11:23:47 sthen Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.12 2012/12/05 23:20:10 deraadt Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
 
 #ifndef _MACHINE_SYSARCH_H_
 #define _MACHINE_SYSARCH_H_
 
-#include <sys/cdefs.h>
-
 /*
  * Architecture specific syscalls (amd64)
  */
@@ -70,6 +68,9 @@ int amd64_iopl(struct proc *, void *, register_t *);
 int amd64_set_fsbase(struct proc *, void *);
 int amd64_get_fsbase(struct proc *, void *);
 #else
+
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int amd64_iopl(int);
 int amd64_get_ioperm(u_long *);
diff --git a/sys/arch/amd64/pci/vga_post.c b/sys/arch/amd64/pci/vga_post.c
index 36c4d82d1dd..e4ab05158ba 100644
--- a/sys/arch/amd64/pci/vga_post.c
+++ b/sys/arch/amd64/pci/vga_post.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_post.c,v 1.4 2009/06/14 20:27:24 miod Exp $ */
+/* $OpenBSD: vga_post.c,v 1.5 2012/12/05 23:20:10 deraadt Exp $ */
 /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/arm/arm/fiq.c b/sys/arch/arm/arm/fiq.c
index 6bf734c501f..60bb686d35d 100644
--- a/sys/arch/arm/arm/fiq.c
+++ b/sys/arch/arm/arm/fiq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fiq.c,v 1.2 2011/09/20 22:02:11 miod Exp $	*/
+/*	$OpenBSD: fiq.c,v 1.3 2012/12/05 23:20:11 deraadt Exp $	*/
 /*	$NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index 690f89b3391..7478196a017 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.37 2012/04/19 14:21:01 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.38 2012/12/05 23:20:11 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -190,7 +190,6 @@
 #include <sys/malloc.h>
 #include <sys/user.h>
 #include <sys/pool.h>
-#include <sys/cdefs.h>
 #include <sys/sched.h>
  
 #include <uvm/uvm.h>
diff --git a/sys/arch/arm/armv7/armv7_a4x_space.c b/sys/arch/arm/armv7/armv7_a4x_space.c
index 3fea5a3129e..845f7704d8d 100644
--- a/sys/arch/arm/armv7/armv7_a4x_space.c
+++ b/sys/arch/arm/armv7/armv7_a4x_space.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_a4x_space.c,v 1.1 2009/05/08 02:57:32 drahn Exp $ */
+/*	$OpenBSD: armv7_a4x_space.c,v 1.2 2012/12/05 23:20:11 deraadt Exp $ */
 /*	$NetBSD: armv7_a4x_space.c,v 1.2 2003/07/15 00:24:54 lukem Exp $ */
 
 /*
@@ -39,8 +39,6 @@
  * all registers are located at the address of multiple of 4.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/arm/armv7/armv7_space.c b/sys/arch/arm/armv7/armv7_space.c
index 97fb452e7c0..df0aede80e1 100644
--- a/sys/arch/arm/armv7/armv7_space.c
+++ b/sys/arch/arm/armv7/armv7_space.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armv7_space.c,v 1.1 2009/05/08 02:57:32 drahn Exp $ */
+/*	$OpenBSD: armv7_space.c,v 1.2 2012/12/05 23:20:11 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -75,11 +75,6 @@
  * Derived from i80321_space.c.
  */
 
-#include <sys/cdefs.h>
-/*
-__KERNEL_RCSID(0, "$NetBSD: armv7_space.c,v 1.5 2004/06/07 19:45:22 nathanw Exp $");
-*/
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h
index 155006b6333..946db39ab29 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.3 2012/12/05 23:20:11 deraadt Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.4 2002/03/30 06:23:39 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,6 @@
 #ifndef _ARM_SYSARCH_H_
 #define _ARM_SYSARCH_H_
 
-#include <sys/cdefs.h>
-
 /*
  * Architecture specific syscalls (arm)
  */
@@ -51,6 +49,9 @@ struct arm_sync_icache_args {
 };
 
 #ifndef _KERNEL
+
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int	arm_sync_icache (u_int addr, int len);
 int	arm_drain_writebuf (void);
diff --git a/sys/arch/arm/xscale/pxa2x0_dmac.c b/sys/arch/arm/xscale/pxa2x0_dmac.c
index 2235d01b407..60bce8ac1ae 100644
--- a/sys/arch/arm/xscale/pxa2x0_dmac.c
+++ b/sys/arch/arm/xscale/pxa2x0_dmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_dmac.c,v 1.3 2006/04/04 11:37:05 pascoe Exp $	*/
+/*	$OpenBSD: pxa2x0_dmac.c,v 1.4 2012/12/05 23:20:11 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Christopher Pascoe <pascoe@openbsd.org>
@@ -19,7 +19,6 @@
 /*
  * DMA Controller Handler for the Intel PXA2X0 processor.
  */
-#include <sys/cdefs.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c
index 70d3d436d2b..e438498515c 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.c
+++ b/sys/arch/arm/xscale/pxa2x0_intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_intr.c,v 1.22 2011/09/20 22:02:13 miod Exp $ */
+/*	$OpenBSD: pxa2x0_intr.c,v 1.23 2012/12/05 23:20:11 deraadt Exp $ */
 /*	$NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $	*/
 
 /*
@@ -39,8 +39,6 @@
  * It has integrated interrupt controller.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/beagle/dev/omap_com.c b/sys/arch/beagle/dev/omap_com.c
index 0d1e4f8196c..b7524b9ea80 100644
--- a/sys/arch/beagle/dev/omap_com.c
+++ b/sys/arch/beagle/dev/omap_com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap_com.c,v 1.9 2011/11/10 19:37:01 uwe Exp $ */
+/* $OpenBSD: omap_com.c,v 1.10 2012/12/05 23:20:11 deraadt Exp $ */
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
@@ -34,8 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c
index e7c99f9d591..a0d366477a3 100644
--- a/sys/arch/i386/i386/gdt.c
+++ b/sys/arch/i386/i386/gdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.c,v 1.30 2010/06/26 23:24:43 guenther Exp $	*/
+/*	$OpenBSD: gdt.c,v 1.31 2012/12/05 23:20:12 deraadt Exp $	*/
 /*	$NetBSD: gdt.c,v 1.28 2002/12/14 09:38:50 junyoung Exp $	*/
 
 /*-
@@ -47,8 +47,6 @@
  * copy of the GDT as pointed to by the gdt variable.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index e778070b83d..80ba35153cd 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.19 2010/10/02 23:14:33 deraadt Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.20 2012/12/05 23:20:12 deraadt Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -32,8 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 /*
  * Interprocessor interrupt handlers.
  */
diff --git a/sys/arch/i386/i386/kvm86.c b/sys/arch/i386/i386/kvm86.c
index c279e14e6c9..00c2330c02d 100644
--- a/sys/arch/i386/i386/kvm86.c
+++ b/sys/arch/i386/i386/kvm86.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm86.c,v 1.5 2010/06/27 13:28:46 miod Exp $ */
+/* $OpenBSD: kvm86.c,v 1.6 2012/12/05 23:20:12 deraadt Exp $ */
 /* $NetBSD: kvm86.c,v 1.10 2005/12/26 19:23:59 perry Exp $ */
 /*
  * Copyright (c) 2002
@@ -25,7 +25,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <sys/cdefs.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/i386/i386/lock_machdep.c b/sys/arch/i386/i386/lock_machdep.c
index c41675821f9..40b994b1d56 100644
--- a/sys/arch/i386/i386/lock_machdep.c
+++ b/sys/arch/i386/i386/lock_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lock_machdep.c,v 1.10 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: lock_machdep.c,v 1.11 2012/12/05 23:20:12 deraadt Exp $	*/
 /* $NetBSD: lock_machdep.c,v 1.1.2.3 2000/05/03 14:40:30 sommerfeld Exp $ */
 
 /*-
@@ -31,8 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 /*
  * Machine-dependent spin lock operations.
  */
diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h
index fde5f80e289..7767fb4a9d9 100644
--- a/sys/arch/i386/include/cpufunc.h
+++ b/sys/arch/i386/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.19 2012/12/05 23:20:12 deraadt Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
  * Functions to provide access to i386-specific instructions.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <machine/specialreg.h>
diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h
index 763f27413b1..0cf97b86694 100644
--- a/sys/arch/i386/include/sysarch.h
+++ b/sys/arch/i386/include/sysarch.h
@@ -1,11 +1,9 @@
-/*	$OpenBSD: sysarch.h,v 1.11 2012/10/10 11:23:47 sthen Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.12 2012/12/05 23:20:12 deraadt Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $	*/
 
 #ifndef _MACHINE_SYSARCH_H_
 #define _MACHINE_SYSARCH_H_
 
-#include <sys/cdefs.h>
-
 /*
  * Architecture specific syscalls (i386)
  */
@@ -44,7 +42,13 @@ struct i386_set_ioperm_args {
 	u_long *iomap;
 };
 
-#ifndef _KERNEL
+#ifdef _KERNEL
+uint32_t i386_get_threadbase(struct proc *, int);
+int i386_set_threadbase(struct proc *, uint32_t, int);
+#else
+
+#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int i386_get_ldt(int, union descriptor *, int);
 int i386_set_ldt(int, union descriptor *, int);
@@ -57,9 +61,6 @@ int i386_get_gsbase(void **);
 int i386_set_gsbase(void *);
 int sysarch(int, void *);
 __END_DECLS
-#else
-uint32_t i386_get_threadbase(struct proc *, int);
-int i386_set_threadbase(struct proc *, uint32_t, int);
 #endif
 
 #endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c
index 3594aa313a6..b903ece0fc5 100644
--- a/sys/arch/i386/pci/geodesc.c
+++ b/sys/arch/i386/pci/geodesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: geodesc.c,v 1.11 2012/10/17 22:32:01 deraadt Exp $	*/
+/*	$OpenBSD: geodesc.c,v 1.12 2012/12/05 23:20:12 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -21,7 +21,6 @@
  * http://www.national.com/ds.cgi/SC/SC1100.pdf
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c
index 241053e8a71..acb9b2af7e1 100644
--- a/sys/arch/i386/pci/glxsb.c
+++ b/sys/arch/i386/pci/glxsb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glxsb.c,v 1.24 2012/01/13 09:53:24 mikeb Exp $	*/
+/*	$OpenBSD: glxsb.c,v 1.25 2012/12/05 23:20:12 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org>
@@ -23,7 +23,6 @@
  * http://www.amd.com/files/connectivitysolutions/geode/geode_lx/33234d_lx_ds.pdf
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/i386/pci/vga_post.c b/sys/arch/i386/pci/vga_post.c
index be1b7c1deb9..fc3356c2f07 100644
--- a/sys/arch/i386/pci/vga_post.c
+++ b/sys/arch/i386/pci/vga_post.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_post.c,v 1.4 2009/06/14 20:27:25 miod Exp $ */
+/* $OpenBSD: vga_post.c,v 1.5 2012/12/05 23:20:12 deraadt Exp $ */
 /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */
 
 /*-
@@ -30,8 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/ia64/include/setjmp.h b/sys/arch/ia64/include/setjmp.h
index b05ba5dcfdf..80b7be56479 100644
--- a/sys/arch/ia64/include/setjmp.h
+++ b/sys/arch/ia64/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: setjmp.h,v 1.1 2011/07/04 23:29:08 pirofti Exp $ */
+/* $OpenBSD: setjmp.h,v 1.2 2012/12/05 23:20:13 deraadt Exp $ */
 /*	$NetBSD: setjmp.h,v 1.2 2006/09/10 21:16:56 cherry Exp $	*/
 
 /*-
@@ -45,8 +45,6 @@
 #ifndef _MACHINE_SETJMP_H_
 #define	_MACHINE_SETJMP_H_
 
-#include <sys/cdefs.h>
-
 #define	JMPBUF_ADDR_OF(buf, item)	((unsigned long)((char *)buf + item))
 
 #define	J_UNAT		0
diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index e7941452123..7ce1699c3b2 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.7 2010/06/28 18:31:01 krw Exp $ */
+/* $OpenBSD: esp.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -69,8 +69,6 @@
  * Charles Hannum (mycroft@duality.gnu.ai.mit.edu).  Thanks a million!
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c
index 1004f88673a..2093e3babeb 100644
--- a/sys/arch/macppc/dev/mediabay.c
+++ b/sys/arch/macppc/dev/mediabay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mediabay.c,v 1.4 2010/04/09 17:01:30 jasper Exp $	*/
+/*	$OpenBSD: mediabay.c,v 1.5 2012/12/05 23:20:13 deraadt Exp $	*/
 /*	$NetBSD: mediabay.c,v 1.9 2003/07/15 02:43:29 lukem Exp $	*/
 
 /*-
@@ -27,8 +27,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index aecca24b0fc..4242bf40df4 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.23 2011/05/14 12:01:16 mpi Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.24 2012/12/05 23:20:13 deraadt Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 /* #define	PM_GRAB_SI	1 */
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/macppc/stand/openfirm.h b/sys/arch/macppc/stand/openfirm.h
index b374e8df782..bef8005210d 100644
--- a/sys/arch/macppc/stand/openfirm.h
+++ b/sys/arch/macppc/stand/openfirm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.h,v 1.3 2002/03/14 03:15:56 millert Exp $	*/
+/*	$OpenBSD: openfirm.h,v 1.4 2012/12/05 23:20:13 deraadt Exp $	*/
 /*	$NetBSD: openfirm.h,v 1.1 1997/04/16 20:29:23 thorpej Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
  * Prototypes for Openfirmware Interface Routines
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 int OF_finddevice(char *name);
diff --git a/sys/arch/mips64/include/sysarch.h b/sys/arch/mips64/include/sysarch.h
index 623d7191fca..5090c975c2f 100644
--- a/sys/arch/mips64/include/sysarch.h
+++ b/sys/arch/mips64/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.1 2009/09/27 18:20:13 miod Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.2 2012/12/05 23:20:13 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -39,7 +39,9 @@ struct	mips64_cacheflush_args {
 };
 
 #ifndef _KERNEL
+
 #include <sys/cdefs.h>
+
 __BEGIN_DECLS
 int	cacheflush(void *, int, int);
 int	_flush_cache(char *, int, int);
diff --git a/sys/arch/mvme68k/stand/sboot/clock.c b/sys/arch/mvme68k/stand/sboot/clock.c
index 779c80843a1..3ce004677d0 100644
--- a/sys/arch/mvme68k/stand/sboot/clock.c
+++ b/sys/arch/mvme68k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.7 2003/08/19 10:22:30 deraadt Exp $ */
+/*	$OpenBSD: clock.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,6 @@
  * Clock driver.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include "sboot.h"
 #include "clockreg.h"
diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.c b/sys/arch/mvme68k/stand/sboot/etherfun.c
index 3621b5e3071..1857f1e245d 100644
--- a/sys/arch/mvme68k/stand/sboot/etherfun.c
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etherfun.c,v 1.7 2012/11/04 13:36:47 miod Exp $ */
+/*	$OpenBSD: etherfun.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */
 
 /*
  *
@@ -33,7 +33,7 @@
  */
 /* etherfun.c */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <stand.h>
 #include "sboot.h"
 #include "etherfun.h"
diff --git a/sys/arch/mvme68k/stand/sboot/if_le.c b/sys/arch/mvme68k/stand/sboot/if_le.c
index 690cff92715..6ec1e04063a 100644
--- a/sys/arch/mvme68k/stand/sboot/if_le.c
+++ b/sys/arch/mvme68k/stand/sboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.7 2003/08/19 10:22:30 deraadt Exp $ */
+/*	$OpenBSD: if_le.c,v 1.8 2012/12/05 23:20:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -54,7 +54,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include <stand.h>
 #include "sboot.h"
 #include "if_lereg.h"
diff --git a/sys/arch/mvme68k/stand/sboot/sboot.c b/sys/arch/mvme68k/stand/sboot/sboot.c
index 8817b69e8ff..7ee1d6e7bc6 100644
--- a/sys/arch/mvme68k/stand/sboot/sboot.c
+++ b/sys/arch/mvme68k/stand/sboot/sboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sboot.c,v 1.10 2012/11/04 13:36:47 miod Exp $ */
+/*	$OpenBSD: sboot.c,v 1.11 2012/12/05 23:20:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -54,7 +54,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include "sboot.h"
 
diff --git a/sys/arch/mvme88k/stand/sboot/clock.c b/sys/arch/mvme88k/stand/sboot/clock.c
index 5ba228de2da..180a7c746db 100644
--- a/sys/arch/mvme88k/stand/sboot/clock.c
+++ b/sys/arch/mvme88k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
  * Clock driver.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "sboot.h"
 #include "clockreg.h"
 
diff --git a/sys/arch/mvme88k/stand/sboot/etherfun.c b/sys/arch/mvme88k/stand/sboot/etherfun.c
index 543e7df47a9..f19bb5918f5 100644
--- a/sys/arch/mvme88k/stand/sboot/etherfun.c
+++ b/sys/arch/mvme88k/stand/sboot/etherfun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etherfun.c,v 1.3 2001/09/20 17:02:31 mpech Exp $	*/
+/*	$OpenBSD: etherfun.c,v 1.4 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  *
@@ -33,7 +33,7 @@
  */
 /* etherfun.c */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "sboot.h"
 #include "etherfun.h"
 
diff --git a/sys/arch/mvme88k/stand/sboot/if_le.c b/sys/arch/mvme88k/stand/sboot/if_le.c
index 10307d944ea..4a883e8b186 100644
--- a/sys/arch/mvme88k/stand/sboot/if_le.c
+++ b/sys/arch/mvme88k/stand/sboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */
+/*	$OpenBSD: if_le.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -54,7 +54,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "sboot.h"
 #include "if_lereg.h"
 
diff --git a/sys/arch/mvme88k/stand/sboot/sboot.c b/sys/arch/mvme88k/stand/sboot/sboot.c
index 4135a122c42..5ee58e6afd0 100644
--- a/sys/arch/mvme88k/stand/sboot/sboot.c
+++ b/sys/arch/mvme88k/stand/sboot/sboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sboot.c,v 1.4 2006/05/16 22:52:26 miod Exp $	*/
+/*	$OpenBSD: sboot.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -54,7 +54,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 #include "sboot.h"
 
 void
diff --git a/sys/arch/octeon/dev/cn30xxasx.c b/sys/arch/octeon/dev/cn30xxasx.c
index 9d75b1069d9..ff0d1427b7d 100644
--- a/sys/arch/octeon/dev/cn30xxasx.c
+++ b/sys/arch/octeon/dev/cn30xxasx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxasx.c,v 1.2 2011/06/24 02:13:23 yasuoka Exp $	*/
+/*	$OpenBSD: cn30xxasx.c,v 1.3 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/octeon/dev/cn30xxfau.c b/sys/arch/octeon/dev/cn30xxfau.c
index 913de29026d..70f9d44dde6 100644
--- a/sys/arch/octeon/dev/cn30xxfau.c
+++ b/sys/arch/octeon/dev/cn30xxfau.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxfau.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxfau.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/octeon/dev/cn30xxfpa.c b/sys/arch/octeon/dev/cn30xxfpa.c
index 1595b79807c..f0f7c799fbe 100644
--- a/sys/arch/octeon/dev/cn30xxfpa.c
+++ b/sys/arch/octeon/dev/cn30xxfpa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxfpa.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxfpa.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -28,8 +28,6 @@
 
 #undef	FPADEBUG
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index b647f5c19dc..8ace5384dd3 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.4 2012/11/28 01:15:33 brad Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.5 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -31,14 +31,11 @@
  *  take no thought for other GMX interface
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/lock.h>
-#include <sys/cdefs.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 
diff --git a/sys/arch/octeon/dev/cn30xxipd.c b/sys/arch/octeon/dev/cn30xxipd.c
index c3897c29856..671a5eefe26 100644
--- a/sys/arch/octeon/dev/cn30xxipd.c
+++ b/sys/arch/octeon/dev/cn30xxipd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxipd.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxipd.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/octeon/dev/cn30xxpko.c b/sys/arch/octeon/dev/cn30xxpko.c
index 0afdd9200fb..509ffa79abf 100644
--- a/sys/arch/octeon/dev/cn30xxpko.c
+++ b/sys/arch/octeon/dev/cn30xxpko.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxpko.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxpko.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/octeon/dev/cn30xxpow.c b/sys/arch/octeon/dev/cn30xxpow.c
index e28f2753362..35577ed11fa 100644
--- a/sys/arch/octeon/dev/cn30xxpow.c
+++ b/sys/arch/octeon/dev/cn30xxpow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxpow.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxpow.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
diff --git a/sys/arch/octeon/dev/cn30xxsmi.c b/sys/arch/octeon/dev/cn30xxsmi.c
index f5807a9326a..37b9ad9d4df 100644
--- a/sys/arch/octeon/dev/cn30xxsmi.c
+++ b/sys/arch/octeon/dev/cn30xxsmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxsmi.c,v 1.1 2011/06/16 11:22:30 syuu Exp $	*/
+/*	$OpenBSD: cn30xxsmi.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/powerpc/powerpc/bcopy.c b/sys/arch/powerpc/powerpc/bcopy.c
index b21ccba2fe4..8a2211aa1e4 100644
--- a/sys/arch/powerpc/powerpc/bcopy.c
+++ b/sys/arch/powerpc/powerpc/bcopy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcopy.c,v 1.6 2012/10/25 04:07:50 deraadt Exp $	*/
+/*	$OpenBSD: bcopy.c,v 1.7 2012/12/05 23:20:14 deraadt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -32,10 +32,6 @@
  */
 
 
-#include <sys/cdefs.h>
-/*
-#include <string.h>
-*/
 #include <sys/types.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/sparc64/stand/ofwboot/openfirm.h b/sys/arch/sparc64/stand/ofwboot/openfirm.h
index 47e41197470..874201d09ff 100644
--- a/sys/arch/sparc64/stand/ofwboot/openfirm.h
+++ b/sys/arch/sparc64/stand/ofwboot/openfirm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.h,v 1.4 2002/03/14 03:16:01 millert Exp $	*/
+/*	$OpenBSD: openfirm.h,v 1.5 2012/12/05 23:20:14 deraadt Exp $	*/
 /*	$NetBSD: openfirm.h,v 1.1 2000/08/20 14:58:42 mrg Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
  * Prototypes for Openfirmware Interface Routines
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <machine/openfirm.h>
 
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index aa30873fdd4..a9e076ab2ea 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.41 2012/12/02 07:03:31 guenther Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.42 2012/12/05 23:20:15 deraadt Exp $	*/
 /*	$NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 #define _MACHINE_CPU_H_
 #ifdef _KERNEL
 
-#include <sys/cdefs.h>
 #include <sys/device.h>
 #include <sys/evcount.h>
 
diff --git a/sys/arch/vax/mscp/mscp.c b/sys/arch/vax/mscp/mscp.c
index d4034fdde5a..01fd2cd044e 100644
--- a/sys/arch/vax/mscp/mscp.c
+++ b/sys/arch/vax/mscp/mscp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp.c,v 1.10 2007/10/08 17:48:06 krw Exp $	*/
+/*	$OpenBSD: mscp.c,v 1.11 2012/12/05 23:20:15 deraadt Exp $	*/
 /*	$NetBSD: mscp.c,v 1.16 2001/11/13 07:38:28 lukem Exp $	*/
 
 /*
@@ -40,8 +40,6 @@
  * MSCP generic driver routines
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
diff --git a/sys/arch/vax/mscp/mscp_subr.c b/sys/arch/vax/mscp/mscp_subr.c
index 37376f67bf0..ffd0dff42d4 100644
--- a/sys/arch/vax/mscp/mscp_subr.c
+++ b/sys/arch/vax/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_subr.c,v 1.11 2011/07/06 18:32:59 miod Exp $	*/
+/*	$OpenBSD: mscp_subr.c,v 1.12 2012/12/05 23:20:15 deraadt Exp $	*/
 /*	$NetBSD: mscp_subr.c,v 1.18 2001/11/13 07:38:28 lukem Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -39,8 +39,6 @@
  * MSCP generic driver routines
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/buf.h>
diff --git a/sys/arch/vax/mscp/mscp_tape.c b/sys/arch/vax/mscp/mscp_tape.c
index d2f2f093bc8..a249dae0e9a 100644
--- a/sys/arch/vax/mscp/mscp_tape.c
+++ b/sys/arch/vax/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_tape.c,v 1.13 2012/11/25 22:13:46 jsg Exp $ */
+/*	$OpenBSD: mscp_tape.c,v 1.14 2012/12/05 23:20:15 deraadt Exp $ */
 /*	$NetBSD: mscp_tape.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -41,8 +41,6 @@
  *	Write status handling code.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c
index c8951a70102..4a9a32dbadc 100644
--- a/sys/arch/vax/vsa/asc_vsbus.c
+++ b/sys/arch/vax/vsa/asc_vsbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc_vsbus.c,v 1.14 2011/09/11 19:29:01 miod Exp $	*/
+/*	$OpenBSD: asc_vsbus.c,v 1.15 2012/12/05 23:20:15 deraadt Exp $	*/
 /*	$NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/crypto/cmac.h b/sys/crypto/cmac.h
index d90ff1cabe2..de0ec840d42 100644
--- a/sys/crypto/cmac.h
+++ b/sys/crypto/cmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmac.h,v 1.1 2008/08/12 15:43:00 damien Exp $	*/
+/*	$OpenBSD: cmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -29,8 +29,6 @@ typedef struct _AES_CMAC_CTX {
 	u_int		M_n;
 } AES_CMAC_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 AES_CMAC_Init(AES_CMAC_CTX *);
 void	 AES_CMAC_SetKey(AES_CMAC_CTX *, const u_int8_t [AES_CMAC_KEY_LENGTH]);
diff --git a/sys/crypto/des_locl.h b/sys/crypto/des_locl.h
index 44c9289973f..e65658037a1 100644
--- a/sys/crypto/des_locl.h
+++ b/sys/crypto/des_locl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: des_locl.h,v 1.3 2005/06/13 10:56:44 hshoexer Exp $	*/
+/*	$OpenBSD: des_locl.h,v 1.4 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /* lib/des/des_locl.h */
 /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
@@ -50,7 +50,6 @@
 #ifndef HEADER_DES_LOCL_H
 #define HEADER_DES_LOCL_H
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 
diff --git a/sys/crypto/gmac.h b/sys/crypto/gmac.h
index ce26faf2863..94c1247bbd7 100644
--- a/sys/crypto/gmac.h
+++ b/sys/crypto/gmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gmac.h,v 1.1 2010/09/22 11:54:23 mikeb Exp $	*/
+/*	$OpenBSD: gmac.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2010 Mike Belopuhov <mike@vantronix.net>
@@ -37,8 +37,6 @@ typedef struct _AES_GMAC_CTX {
 	int		rounds;
 } AES_GMAC_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	AES_GMAC_Init(AES_GMAC_CTX *);
 void	AES_GMAC_Setkey(AES_GMAC_CTX *, const uint8_t *, uint16_t);
diff --git a/sys/crypto/hmac.h b/sys/crypto/hmac.h
index 99b1dd63b99..886bb49d0f0 100644
--- a/sys/crypto/hmac.h
+++ b/sys/crypto/hmac.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hmac.h,v 1.2 2008/09/06 22:23:20 djm Exp $	*/
+/*	$OpenBSD: hmac.h,v 1.3 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -37,8 +37,6 @@ typedef struct _HMAC_SHA256_CTX {
 	u_int		key_len;
 } HMAC_SHA256_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 
 void	 HMAC_MD5_Init(HMAC_MD5_CTX *, const u_int8_t *, u_int)
diff --git a/sys/crypto/key_wrap.h b/sys/crypto/key_wrap.h
index 4c984e13d9d..f91ce5f4c06 100644
--- a/sys/crypto/key_wrap.h
+++ b/sys/crypto/key_wrap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key_wrap.h,v 1.1 2008/08/12 15:43:00 damien Exp $	*/
+/*	$OpenBSD: key_wrap.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -23,8 +23,6 @@ typedef struct _aes_key_wrap_ctx {
 	rijndael_ctx	ctx;
 } aes_key_wrap_ctx;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 
 void	aes_key_wrap_set_key(aes_key_wrap_ctx *, const u_int8_t *, size_t);
diff --git a/sys/crypto/md5.h b/sys/crypto/md5.h
index b629c3e81bd..99d60316ea5 100644
--- a/sys/crypto/md5.h
+++ b/sys/crypto/md5.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.h,v 1.1 2004/05/07 14:42:26 millert Exp $	*/
+/*	$OpenBSD: md5.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -24,8 +24,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/sys/crypto/michael.h b/sys/crypto/michael.h
index 3b7c435842e..79018d89784 100644
--- a/sys/crypto/michael.h
+++ b/sys/crypto/michael.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: michael.h,v 1.1 2006/03/21 18:40:54 reyk Exp $	*/
+/*	$OpenBSD: michael.h,v 1.2 2012/12/05 23:20:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -30,8 +30,6 @@ typedef struct michael_context {
 	u_int		michael_count;
 } MICHAEL_CTX;
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	 michael_init(MICHAEL_CTX *);
 void	 michael_update(MICHAEL_CTX *, const u_int8_t *, u_int)
diff --git a/sys/crypto/sha2.h b/sys/crypto/sha2.h
index c9e7500821f..6bbdb80b79e 100644
--- a/sys/crypto/sha2.h
+++ b/sys/crypto/sha2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sha2.h,v 1.3 2008/09/06 22:23:20 djm Exp $	*/
+/*	$OpenBSD: sha2.h,v 1.4 2012/12/05 23:20:15 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 SHA256Update(SHA2_CTX *, const u_int8_t *, size_t)
diff --git a/sys/ddb/db_structinfo.c b/sys/ddb/db_structinfo.c
index 84a4e35a6e0..e32d484a367 100644
--- a/sys/ddb/db_structinfo.c
+++ b/sys/ddb/db_structinfo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_structinfo.c,v 1.4 2010/11/18 21:13:19 miod Exp $ */
+/* $OpenBSD: db_structinfo.c,v 1.5 2012/12/05 23:20:15 deraadt Exp $ */
 /* public domain */
 /*
  * This file is intended to be compiled with debug information,
@@ -8,7 +8,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/cdefs.h>
 
 #include <sys/device.h>
 #include <sys/proc.h>
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 77a46a094b3..2a8537f821b 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.20 2011/04/02 17:47:04 jasper Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.21 2012/12/05 23:20:16 deraadt Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -67,8 +67,6 @@
  * TBD factor with atw, tlp Cardbus front-ends?
  */
 
-#include <sys/cdefs.h>
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 900e44696bd..be26e6fa4a7 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.98 2012/10/27 16:13:28 claudio Exp $ */
+/*	$OpenBSD: acx.c,v 1.99 2012/12/05 23:20:16 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -86,7 +86,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index d0aa0b0e21d..6fed99b0324 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.c,v 1.49 2012/02/24 06:19:00 guenther Exp $	*/
+/*	$OpenBSD: aic79xx.c,v 1.50 2012/12/05 23:20:16 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -71,8 +71,6 @@
  * FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.33 2004/11/18 20:22:30 gibbs Exp
  */
 
-#include <sys/cdefs.h>
-
 #include <dev/ic/aic79xx_openbsd.h>
 #include <dev/ic/aic79xx_inline.h>
 #include <dev/ic/aic79xx.h>
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index 8638f0c5c25..a2184e4c593 100644
--- a/sys/dev/ic/aic79xx_openbsd.c
+++ b/sys/dev/ic/aic79xx_openbsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx_openbsd.c,v 1.38 2012/02/24 06:19:00 guenther Exp $	*/
+/*	$OpenBSD: aic79xx_openbsd.c,v 1.39 2012/12/05 23:20:16 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -60,11 +60,6 @@
  *
  */
 
-#include <sys/cdefs.h>
-/*
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $");
-*/
-
 #include <dev/ic/aic79xx_openbsd.h>
 #include <dev/ic/aic79xx_inline.h>
 #include <dev/ic/aic79xx.h>
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 16ae5dcbb11..871ce82378b 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $	*/
 /*	$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -40,15 +40,12 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $
+ * $Id: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
  */
 
-#include <sys/cdefs.h>
-/* __FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.100 2004/05/11 20:39:46 gibbs Exp $"); */
-
 #include <dev/ic/aic7xxx_openbsd.h>
 #ifdef SMALL_KERNEL
 #define	IO_EXPAND
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 244a2f5c809..0c5879b685a 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.58 2010/08/27 17:08:00 jsg Exp $	*/
+/*	$OpenBSD: an.c,v 1.59 2012/12/05 23:20:16 deraadt Exp $	*/
 /*	$NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -77,8 +77,6 @@
  * IETF meeting.
  */
 
-#include <sys/cdefs.h>
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 89be52d8cdd..75ae03f29b4 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.95 2010/08/27 17:08:00 jsg Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.96 2012/12/05 23:20:16 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -38,7 +38,6 @@
 
 #include "bpfilter.h"
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index b86af946cae..d0536987a47 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.94 2012/09/04 19:01:33 claudio Exp $ */
+/*	$OpenBSD: malo.c,v 1.95 2012/12/05 23:20:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -19,7 +19,6 @@
 
 #include "bpfilter.h"
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
 
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 719a945364c..692b72c9bec 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.68 2011/12/01 23:34:08 miod Exp $  */
+/*	$OpenBSD: pgt.c,v 1.69 2012/12/05 23:20:18 deraadt Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -44,7 +44,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 9c5abba8312..f79999753b8 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.81 2010/09/07 16:21:43 deraadt Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.82 2012/12/05 23:20:19 deraadt Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -35,7 +35,6 @@
  * Device driver for the Realtek RTL8180 802.11 MAC/BBP.
  */
 
-#include <sys/cdefs.h>
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index aa6fb679c69..a9d90a1061f 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $ */
+/* $OpenBSD: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $ */
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
  *
@@ -38,11 +38,10 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $
+ * $Id: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37 2004/03/12 21:45:25 trhodes Exp $
  */
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
index dd9d4945c26..7b3c2a8f3a0 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm_symbol.c,v 1.10 2009/10/28 23:22:45 schwarze Exp $ */
+/* $OpenBSD: aicasm_symbol.c,v 1.11 2012/12/05 23:20:19 deraadt Exp $ */
 /*	$NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.23 2003/01/20 18:01:37 gibbs Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #ifdef __linux__
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 343b951265f..6c89c339181 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahd_pci.c,v 1.20 2012/09/30 21:46:09 brad Exp $	*/
+/*	$OpenBSD: ahd_pci.c,v 1.21 2012/12/05 23:20:19 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -69,11 +69,6 @@
  *
  */
 
-#include <sys/cdefs.h>
-/*
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.18 2004/02/04 16:38:38 gibbs Exp $");
-*/
-
 #include <dev/ic/aic79xx_openbsd.h>
 #include <dev/ic/aic79xx_inline.h>
 #include <dev/ic/aic79xx.h>
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 2b64fb1eaa6..0807d013996 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnx.c,v 1.97 2012/07/05 13:50:15 phessler Exp $	*/
+/*	$OpenBSD: if_bnx.c,v 1.98 2012/12/05 23:20:20 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -30,11 +30,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
-#endif
-
 /*
  * The following controllers are supported by this driver:
  *   BCM5706C A2, A3
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 120729cdec3..a63d2dca9d7 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,16 +31,11 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.70 2012/11/26 01:17:41 jsg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.71 2012/12/05 23:20:20 deraadt Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
 
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: if_em_hw.c,v 1.16 2005/05/26 23:32:02 tackerman Exp $");
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index 230cce32364..aafad4db5b2 100644
--- a/sys/dev/pci/if_rtw_pci.c
+++ b/sys/dev/pci/if_rtw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_pci.c,v 1.16 2012/10/18 21:44:21 deraadt Exp $	*/
+/*	$OpenBSD: if_rtw_pci.c,v 1.17 2012/12/05 23:20:20 deraadt Exp $	*/
 /*	$NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $	*/
 
 /*-
@@ -39,7 +39,6 @@
  * Derived from the ``Tulip'' PCI bus front-end.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/mbuf.h>   
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c
index f4444871f23..706f99dcd74 100644
--- a/sys/dev/pci/if_vio.c
+++ b/sys/dev/pci/if_vio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vio.c,v 1.8 2012/12/03 21:04:49 sf Exp $	*/
+/*	$OpenBSD: if_vio.c,v 1.9 2012/12/05 23:20:20 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c
index f467c305197..f1a31cc6834 100644
--- a/sys/dev/pci/mmuagp.c
+++ b/sys/dev/pci/mmuagp.c
@@ -24,8 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index 4b3441b2b17..451648e2e89 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safe.c,v 1.34 2012/01/13 09:53:24 mikeb Exp $	*/
+/*	$OpenBSD: safe.c,v 1.35 2012/12/05 23:20:20 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -29,8 +29,6 @@
  * $FreeBSD: /repoman/r/ncvs/src/sys/dev/safe/safe.c,v 1.1 2003/07/21 21:46:07 sam Exp $
  */
 
-#include <sys/cdefs.h>
-
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
  */
diff --git a/sys/dev/pci/vioblk.c b/sys/dev/pci/vioblk.c
index de549fe1965..6fdbf797ba8 100644
--- a/sys/dev/pci/vioblk.c
+++ b/sys/dev/pci/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.2 2012/10/12 21:12:19 reyk Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch.
@@ -46,7 +46,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c
index ad25f3e5120..8256a0e3f54 100644
--- a/sys/dev/pci/virtio.c
+++ b/sys/dev/pci/virtio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.c,v 1.2 2012/10/12 21:12:19 reyk Exp $	*/
+/*	$OpenBSD: virtio.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -27,8 +27,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c
index 0662b46b9c9..d10e8a01b06 100644
--- a/sys/dev/pci/virtio_pci.c
+++ b/sys/dev/pci/virtio_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio_pci.c,v 1.3 2012/10/12 21:12:19 reyk Exp $	*/
+/*	$OpenBSD: virtio_pci.c,v 1.4 2012/12/05 23:20:21 deraadt Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -27,8 +27,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index ace45a2d80b..0d5b06a377f 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $	*/
+/*	$OpenBSD: if_le_lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $	*/
 /*	$NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $	*/
 
 /*-
@@ -33,7 +33,6 @@
 
 #include "bpfilter.h"
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 8581fb91de5..18bf59ef48b 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $	*/
+/*	$OpenBSD: lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $	*/
 /*	$NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 82f2537effd..a9e3bb6d21e 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.114 2012/11/28 01:15:33 brad Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.115 2012/12/05 23:20:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -48,8 +48,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
  * LinkSys USB200M and various other adapters.
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index cecf66beca2..0dafb22225b 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mos.c,v 1.17 2012/10/22 03:23:19 brad Exp $	*/
+/*	$OpenBSD: if_mos.c,v 1.18 2012/12/05 23:20:21 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -64,8 +64,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller 
  * The datasheet is available at the following URL: 
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 63c0cacb8e0..c32edcd2b6b 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.58 2011/09/04 18:34:02 jsg Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.59 2012/12/05 23:20:21 deraadt Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -43,8 +43,6 @@
  *	External PHYs
  */
 
-#include <sys/cdefs.h>
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index 4c9432eaf06..b7fd12db56f 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urndis.c,v 1.34 2012/06/20 10:51:27 fgsch Exp $ */
+/*	$OpenBSD: if_urndis.c,v 1.35 2012/12/05 23:20:21 deraadt Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -19,8 +19,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
-
 #include "bpfilter.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 91d38404171..d59eefaff4a 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.54 2012/12/05 23:20:21 deraadt Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -54,8 +54,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/vesa/vesabios.c b/sys/dev/vesa/vesabios.c
index 8e5a974c5d8..1e1fe69203b 100644
--- a/sys/dev/vesa/vesabios.c
+++ b/sys/dev/vesa/vesabios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vesabios.c,v 1.5 2011/04/05 19:54:35 jasper Exp $ */
+/* $OpenBSD: vesabios.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002, 2004
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c
index 89f833a5ca9..6b92b5a9cd1 100644
--- a/sys/dev/videomode/edid.c
+++ b/sys/dev/videomode/edid.c
@@ -31,9 +31,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */ 
 
-#include <sys/cdefs.h>
-/* __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.5 2007/03/07 19:56:40 macallan Exp $"); */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/dev/videomode/modelines2c.awk b/sys/dev/videomode/modelines2c.awk
index 74973a2f9d6..424610ceaf6 100644
--- a/sys/dev/videomode/modelines2c.awk
+++ b/sys/dev/videomode/modelines2c.awk
@@ -1,6 +1,6 @@
 #! /usr/bin/awk -f
 #	$NetBSD: modelines2c.awk,v 1.4 2006/10/26 23:19:50 bjh21 Exp $
-#	$OpenBSD: modelines2c.awk,v 1.1 2009/10/08 20:35:44 matthieu Exp $
+#	$OpenBSD: modelines2c.awk,v 1.2 2012/12/05 23:20:22 deraadt Exp $
 #
 # Copyright (c) 2006 Itronix Inc.
 # All rights reserved.
@@ -49,7 +49,7 @@ NR == 1 {
 	printf(" *\t%s\n", VERSION);
 	printf(" */\n\n");
 
-	printf("#include <sys/cdefs.h>\n");
+	printf("#include <sys/types.h>\n");
 
 	printf("#include <dev/videomode/videomode.h>\n\n");
 
diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c
index 4e1f7a8c4ff..d60de2c0e58 100644
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -151,8 +151,6 @@
 
 
 #ifdef	_KERNEL
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/videomode/videomode.c b/sys/dev/videomode/videomode.c
index ba5a559a836..2de6364ed77 100644
--- a/sys/dev/videomode/videomode.c
+++ b/sys/dev/videomode/videomode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: videomode.c,v 1.1 2009/10/08 20:35:44 matthieu Exp $	*/
+/*	$OpenBSD: videomode.c,v 1.2 2012/12/05 23:20:22 deraadt Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -7,7 +7,6 @@
  *	NetBSD: modelines,v 1.7 2009/01/21 14:40:25 jnemeth Exp 
  */
 
-#include <sys/cdefs.h>
 #include <dev/videomode/videomode.h>
 
 /*
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 6766332b7f9..55a167db95a 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.7 2007/09/11 13:39:34 gilles Exp $ */
+/* $OpenBSD: wsevent.c,v 1.8 2012/12/05 23:20:22 deraadt Exp $ */
 /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
 
 /*
@@ -31,8 +31,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index da902602df8..b5377990c61 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wskbdutil.c,v 1.9 2010/08/28 12:48:14 miod Exp $	*/
+/*	$OpenBSD: wskbdutil.c,v 1.10 2012/12/05 23:20:22 deraadt Exp $	*/
 /*	$NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $	*/
 
 /*-
@@ -32,7 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/lib/libkern/arch/powerpc/__eabi.c b/sys/lib/libkern/arch/powerpc/__eabi.c
index 813c700053b..dac0138e6fa 100644
--- a/sys/lib/libkern/arch/powerpc/__eabi.c
+++ b/sys/lib/libkern/arch/powerpc/__eabi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: __eabi.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
+/*	$OpenBSD: __eabi.c,v 1.5 2012/12/05 23:20:22 deraadt Exp $	*/
 /*	$NetBSD: __main.c,v 1.3 1994/10/26 06:42:13 cgd Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <sys/types.h>
 
 void __eabi(void);
 
diff --git a/sys/lib/libkern/getsn.c b/sys/lib/libkern/getsn.c
index ed4ce8adfc8..3bb3f218ad7 100644
--- a/sys/lib/libkern/getsn.c
+++ b/sys/lib/libkern/getsn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getsn.c,v 1.5 2007/05/03 01:21:32 deraadt Exp $	*/
+/*	$OpenBSD: getsn.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Theo de Raadt
@@ -25,7 +25,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <dev/cons.h>
diff --git a/sys/lib/libkern/softfloat.c b/sys/lib/libkern/softfloat.c
index 6b0d4b493d5..45b93bd4282 100644
--- a/sys/lib/libkern/softfloat.c
+++ b/sys/lib/libkern/softfloat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softfloat.c,v 1.4 2009/10/27 23:59:35 deraadt Exp $	*/
+/*	$OpenBSD: softfloat.c,v 1.5 2012/12/05 23:20:22 deraadt Exp $	*/
 /*	$NetBSD: softfloat.c,v 1.1 2001/04/26 03:10:47 ross Exp $	*/
 
 /*
@@ -49,8 +49,6 @@ this code that are retained.
 ===============================================================================
 */
 
-#include <sys/cdefs.h>
-
 #ifdef SOFTFLOAT_FOR_GCC
 #include "softfloat-for-gcc.h"
 #endif
diff --git a/sys/lib/libsa/netif.c b/sys/lib/libsa/netif.c
index 9ca5ffa77be..15c0785c20f 100644
--- a/sys/lib/libsa/netif.c
+++ b/sys/lib/libsa/netif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif.c,v 1.8 2003/08/11 06:23:09 deraadt Exp $	*/
+/*	$OpenBSD: netif.c,v 1.9 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: netif.c,v 1.7 1996/10/13 02:29:03 christos Exp $	*/
 
 /*
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mount.h>
 
 #include <netinet/in.h>
diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c
index a820fcbde5a..dfb9ac9e662 100644
--- a/sys/lib/libsa/printf.c
+++ b/sys/lib/libsa/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.24 2006/09/18 21:11:50 mpf Exp $	*/
+/*	$OpenBSD: printf.c,v 1.25 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
  *	reg=3<BITTWO,BITONE>
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stdarg.h>
 
diff --git a/sys/lib/libsa/snprintf.c b/sys/lib/libsa/snprintf.c
index 4a075d0b11a..948c9be4332 100644
--- a/sys/lib/libsa/snprintf.c
+++ b/sys/lib/libsa/snprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snprintf.c,v 1.4 2004/01/03 14:08:53 espie Exp $	*/
+/*	$OpenBSD: snprintf.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
 
 /*-
@@ -32,7 +32,6 @@
  *	@(#)printf.c	8.1 (Berkeley) 6/11/93
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stdarg.h>
 
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index a732cbc6633..4a4f9a39f38 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.53 2012/10/09 12:03:51 jsing Exp $	*/
+/*	$OpenBSD: stand.h,v 1.54 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -33,7 +33,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <sys/stdarg.h>
 #include "saerrno.h"
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 11b979ec3e4..2b60f34c1b4 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dl.h,v 1.7 2011/07/08 01:09:52 claudio Exp $	*/
+/*	$OpenBSD: if_dl.h,v 1.8 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $	*/
 
 /*
@@ -73,8 +73,6 @@ struct sockaddr_dl {
 
 #ifndef _KERNEL
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 void	link_addr(const char *, struct sockaddr_dl *);
 char	*link_ntoa(const struct sockaddr_dl *);
diff --git a/sys/net/pipex.h b/sys/net/pipex.h
index 239f721b9e2..197a34bfe7a 100644
--- a/sys/net/pipex.h
+++ b/sys/net/pipex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.h,v 1.15 2012/09/19 22:37:23 jsg Exp $	*/
+/*	$OpenBSD: pipex.h,v 1.16 2012/12/05 23:20:23 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -192,7 +192,7 @@ struct pipex_iface_context {
 	/* virtual pipex_session entry for multicast routing */
 	struct pipex_session *multicast_session;
 };
-#include <sys/cdefs.h>
+
 __BEGIN_DECLS
 void                  pipex_init (void);
 void                  pipex_iface_init (struct pipex_iface_context *, struct ifnet *);
diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c
index 3b742972a29..b960d1fc207 100644
--- a/sys/net/trunklacp.c
+++ b/sys/net/trunklacp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trunklacp.c,v 1.13 2011/07/09 04:38:03 henning Exp $ */
+/*	$OpenBSD: trunklacp.c,v 1.14 2012/12/05 23:20:23 deraadt Exp $ */
 /*	$NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */
 /*	$FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */
 
@@ -29,8 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c
index 11f3f818398..5a584f59598 100644
--- a/sys/netbt/l2cap_socket.c
+++ b/sys/netbt/l2cap_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2cap_socket.c,v 1.4 2009/11/21 13:05:32 guenther Exp $	*/
+/*	$OpenBSD: l2cap_socket.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: l2cap_socket.c,v 1.9 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
@@ -31,8 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
 #define PRUREQUESTS
diff --git a/sys/netbt/l2cap_upper.c b/sys/netbt/l2cap_upper.c
index 773c8e0d58c..987373c38a4 100644
--- a/sys/netbt/l2cap_upper.c
+++ b/sys/netbt/l2cap_upper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2cap_upper.c,v 1.4 2009/11/21 13:05:32 guenther Exp $	*/
+/*	$OpenBSD: l2cap_upper.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: l2cap_upper.c,v 1.9 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
@@ -31,8 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c
index 766f5e384e5..94a674041a8 100644
--- a/sys/netbt/sco_socket.c
+++ b/sys/netbt/sco_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sco_socket.c,v 1.4 2009/11/21 13:05:32 guenther Exp $	*/
+/*	$OpenBSD: sco_socket.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: sco_socket.c,v 1.11 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
 #define PRUREQUESTS
diff --git a/sys/netbt/sco_upper.c b/sys/netbt/sco_upper.c
index a4c16b40fe9..d30e4bbc63d 100644
--- a/sys/netbt/sco_upper.c
+++ b/sys/netbt/sco_upper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sco_upper.c,v 1.4 2009/11/21 13:05:32 guenther Exp $	*/
+/*	$OpenBSD: sco_upper.c,v 1.5 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: sco_upper.c,v 1.8 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
@@ -32,8 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 39a40292e00..f7646997424 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,8 +1,6 @@
-/*	$OpenBSD: krpc.h,v 1.6 2008/05/17 17:27:24 thib Exp $	*/
+/*	$OpenBSD: krpc.h,v 1.7 2012/12/05 23:20:23 deraadt Exp $	*/
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
 
-#include <sys/cdefs.h>
-
 int krpc_call(struct sockaddr_in *, u_int, u_int, u_int, struct mbuf **,
     struct mbuf **, int);
 int krpc_portmap(struct sockaddr_in *, u_int, u_int, u_int16_t *);
diff --git a/sys/nfs/nfs_kq.c b/sys/nfs/nfs_kq.c
index 09326898c77..55e91de88ff 100644
--- a/sys/nfs/nfs_kq.c
+++ b/sys/nfs/nfs_kq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_kq.c,v 1.15 2009/01/19 23:40:36 thib Exp $ */
+/*	$OpenBSD: nfs_kq.c,v 1.16 2012/12/05 23:20:23 deraadt Exp $ */
 /*	$NetBSD: nfs_kq.c,v 1.7 2003/10/30 01:43:10 simonb Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/sys/midiio.h b/sys/sys/midiio.h
index 18e9d8caed8..647a090fc59 100644
--- a/sys/sys/midiio.h
+++ b/sys/sys/midiio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midiio.h,v 1.4 2008/06/26 05:42:20 ray Exp $	*/
+/*	$OpenBSD: midiio.h,v 1.5 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: midiio.h,v 1.7 1998/11/25 22:17:07 augustss Exp $	*/
 
 /*-
@@ -38,7 +38,6 @@
  * for naming.
  */
 
-#include <sys/cdefs.h>
 #include <machine/endian.h>	/* for _QUAD_LOWWORD */
 
 /*
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 31ec9615d35..e637827cc95 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.96 2012/06/20 21:40:55 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.97 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -78,7 +78,6 @@
 
 /* More types and definitions used throughout the kernel. */
 #ifdef _KERNEL
-#include <sys/cdefs.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/sys/sys/select.h b/sys/sys/select.h
index fdabfd9de46..6dc0416a0c2 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: select.h,v 1.9 2006/03/21 08:17:33 otto Exp $	*/
+/*	$OpenBSD: select.h,v 1.10 2012/12/05 23:20:24 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -34,7 +34,6 @@
 #ifndef _SYS_SELECT_H_
 #define	_SYS_SELECT_H_
 
-#include <sys/cdefs.h>
 #include <sys/time.h>		/* for types and struct timeval */
 
 /*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 8f8e032f8d8..7a444769d48 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.23 2011/11/22 21:13:30 guenther Exp $	*/
+/*	$OpenBSD: signal.h,v 1.24 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: signal.h,v 1.21 1996/02/09 18:25:32 christos Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #ifndef	_SYS_SIGNAL_H_
 #define	_SYS_SIGNAL_H_
 
-#include <sys/cdefs.h>
 #include <machine/signal.h>	/* sigcontext; codes for SIGILL, SIGFPE */
 
 #define _NSIG	33		/* counting 0 (mask is 1-32) */
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 3f56097ecef..640e33ef893 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stat.h,v 1.20 2011/07/18 17:29:49 matthew Exp $	*/
+/*	$OpenBSD: stat.h,v 1.21 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: stat.h,v 1.20 1996/05/16 22:17:49 cgd Exp $	*/
 
 /*-
@@ -40,7 +40,6 @@
 #ifndef _SYS_STAT_H_
 #define	_SYS_STAT_H_
 
-#include <sys/cdefs.h>
 #include <sys/time.h>
 
 struct stat {
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 3ad7ddb292f..4843bb85237 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysctl.h,v 1.125 2012/04/17 23:17:53 pirofti Exp $	*/
+/*	$OpenBSD: sysctl.h,v 1.126 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $	*/
 
 /*
@@ -975,7 +975,6 @@ int pflow_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 int pipex_sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
 #else	/* !_KERNEL */
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 int	sysctl(int *, u_int, void *, size_t *, void *, size_t);
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 1ac7013d8ca..b120fbf09a8 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: time.h,v 1.28 2012/05/10 19:13:12 kettenis Exp $	*/
+/*	$OpenBSD: time.h,v 1.29 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 #ifndef _SYS_TIME_H_
 #define _SYS_TIME_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #if __XPG_VISIBLE >= 420 && __XPG_VISIBLE < 600
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index b23a2b6c427..1dfb1daa9bf 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quota.h,v 1.9 2008/01/05 19:49:26 otto Exp $	*/
+/*	$OpenBSD: quota.h,v 1.10 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: quota.h,v 1.6 1995/03/26 20:38:17 jtc Exp $	*/
 
 /*
@@ -116,8 +116,6 @@ enum ufs_quota_flags {
 	UFS_QUOTA_FORCE = 0x1000	/* don't check limits - just change it */
 };     /* Change GID */
 
-#include <sys/cdefs.h>
-
 struct dquot;
 struct inode;
 struct mount;
diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h
index bd9e74d59f1..b2f7b331896 100644
--- a/usr.bin/ar/archive.h
+++ b/usr.bin/ar/archive.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archive.h,v 1.5 2003/06/03 02:56:05 millert Exp $	*/
+/*	$OpenBSD: archive.h,v 1.6 2012/12/05 23:20:24 deraadt Exp $	*/
 /*	$NetBSD: archive.h,v 1.6 1995/03/25 06:39:43 glass Exp $	*/
 
 /*-
@@ -93,8 +93,6 @@ typedef struct {
 #define	HDR3	"%-16.15s%-12ld%-6u%-6u%-8o%-10qd%2s"
 
 
-#include <sys/cdefs.h>
-
 struct stat;
 
 void	close_archive(int);
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index 476ea0fecc4..85efd1cb0e5 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,4 +1,4 @@
-/* *      $OpenBSD: extern.h,v 1.17 2012/01/02 23:19:45 pascal Exp $*/
+/* *      $OpenBSD: extern.h,v 1.18 2012/12/05 23:20:25 deraadt Exp $*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,8 +30,6 @@
  *	from: @(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 
-#include <sys/cdefs.h>
-
 void	 brace_subst(char *, char **, char *, int);
 void	*emalloc(unsigned int);
 PLAN	*find_create(char ***);
diff --git a/usr.bin/ftp/stringlist.h b/usr.bin/ftp/stringlist.h
index 00def0b132a..b0f1fae8c33 100644
--- a/usr.bin/ftp/stringlist.h
+++ b/usr.bin/ftp/stringlist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stringlist.h,v 1.3 2009/05/05 19:35:30 martynas Exp $	*/
+/*	$OpenBSD: stringlist.h,v 1.4 2012/12/05 23:20:25 deraadt Exp $	*/
 /*	$NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $	*/
 
 /*
@@ -37,7 +37,6 @@
 #ifndef _STRINGLIST_H
 #define _STRINGLIST_H 
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index da43b71bf1a..9cb08fc6262 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencat.c,v 1.15 2012/03/04 04:05:15 fgsch Exp $	*/
+/*	$OpenBSD: gencat.c,v 1.16 2012/12/05 23:20:25 deraadt Exp $	*/
 /*	$NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/usr.bin/lex/libmain.c b/usr.bin/lex/libmain.c
index 2a1d53fdb74..417155f2b0d 100644
--- a/usr.bin/lex/libmain.c
+++ b/usr.bin/lex/libmain.c
@@ -1,10 +1,9 @@
-/*	$OpenBSD: libmain.c,v 1.6 2003/07/28 20:38:31 deraadt Exp $	*/
+/*	$OpenBSD: libmain.c,v 1.7 2012/12/05 23:20:25 deraadt Exp $	*/
 
 /* libmain - flex run-time support library "main" function */
 
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.6 2003/07/28 20:38:31 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.7 2012/12/05 23:20:25 deraadt Exp $ */
 
-#include <sys/cdefs.h>
 
 int yylex(void);
 int main(int, char **);
diff --git a/usr.bin/lex/libyywrap.c b/usr.bin/lex/libyywrap.c
index 64682b58bac..3c42a6d6c3a 100644
--- a/usr.bin/lex/libyywrap.c
+++ b/usr.bin/lex/libyywrap.c
@@ -1,10 +1,8 @@
-/*	$OpenBSD: libyywrap.c,v 1.6 2003/07/28 20:38:31 deraadt Exp $	*/
+/*	$OpenBSD: libyywrap.c,v 1.7 2012/12/05 23:20:25 deraadt Exp $	*/
 
 /* libyywrap - flex run-time support library "yywrap" function */
 
-/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.6 2003/07/28 20:38:31 deraadt Exp $ */
-
-#include <sys/cdefs.h>
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.7 2012/12/05 23:20:25 deraadt Exp $ */
 
 int yywrap(void);
 
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 77245bc2069..f698e1b96f5 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.l,v 1.2 2009/08/08 19:37:14 sobrado Exp $	*/
+/*	$OpenBSD: lex.l,v 1.3 2012/12/05 23:20:25 deraadt Exp $	*/
 /*	$NetBSD: lex.l,v 1.13 2003/10/27 00:12:43 lukem Exp $	*/
 
 %{
@@ -34,12 +34,10 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#include "locale/runetype.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "locale/runetype.h"
 #include "ldef.h"
 #include "yacc.h"
 
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 9884213ac72..e3bc5c47f34 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yacc.y,v 1.4 2011/01/14 23:15:40 nicm Exp $	*/
+/*	$OpenBSD: yacc.y,v 1.5 2012/12/05 23:20:25 deraadt Exp $	*/
 /*	$NetBSD: yacc.y,v 1.24 2004/01/05 23:23:36 jmmv Exp $	*/
 
 %{
@@ -34,8 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <netinet/in.h>	/* Needed by <arpa/inet.h> on NetBSD 1.5. */
 #include <arpa/inet.h>	/* Needed for htonl on POSIX systems. */
diff --git a/usr.bin/netstat/net80211.c b/usr.bin/netstat/net80211.c
index 5ef0c521af9..8f34d06bc81 100644
--- a/usr.bin/netstat/net80211.c
+++ b/usr.bin/netstat/net80211.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net80211.c,v 1.8 2012/07/13 20:20:49 stsp Exp $	*/
+/*	$OpenBSD: net80211.c,v 1.9 2012/12/05 23:20:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org>
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 06bb0cafbc9..131d61b8e83 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.h,v 1.63 2012/08/22 00:11:57 tedu Exp $	*/
+/*	$OpenBSD: netstat.h,v 1.64 2012/12/05 23:20:25 deraadt Exp $	*/
 /*	$NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $	*/
 
 /*
@@ -32,8 +32,6 @@
  *	from: @(#)netstat.h	8.2 (Berkeley) 1/4/94
  */
 
-#include <sys/cdefs.h>
-
 /* What is the max length of a pointer printed with %p (including 0x)? */
 #define PLEN	(LONG_BIT / 4 + 2)
 
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index a758b0504b8..df17e29b3ab 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_cout.c,v 1.21 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_cout.c,v 1.22 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_cout.c,v 1.6 1996/10/01 04:13:53 cgd Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 2a2c0b5e674..a5e2839dbb9 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_hout.c,v 1.20 2011/04/06 11:36:26 miod Exp $	*/
+/*	$OpenBSD: rpc_hout.c,v 1.21 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 1252670d75c..830fd1abd6c 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_sample.c,v 1.17 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_sample.c,v 1.18 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_sample.c,v 1.2 1995/06/11 21:50:01 pk Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
  * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
  */
 
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <string.h>
 #include "rpc_parse.h"
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 2678d31e15c..ca8977f7253 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_scan.c,v 1.15 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_scan.c,v 1.16 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_scan.c, Scanner for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 6e300dff8c6..bcaadc8e88f 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_svcout.c,v 1.26 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_svcout.c,v 1.27 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <string.h>
 #include "rpc_parse.h"
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index b9c00735f28..8a93c573e3c 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_tblout.c,v 1.13 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_tblout.c,v 1.14 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_tblout.c,v 1.3 1995/06/24 15:00:15 pk Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 4fda9a1141f..4e10292a03a 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc_util.c,v 1.15 2010/09/01 14:43:34 millert Exp $	*/
+/*	$OpenBSD: rpc_util.c,v 1.16 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $	*/
 
 /*
@@ -35,7 +35,6 @@
 /*
  * rpc_util.c, Utility routines for the RPC protocol compiler
  */
-#include <sys/cdefs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 1cf44365b70..081a83eb3b6 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swap.c,v 1.23 2011/03/02 06:48:17 jasper Exp $	*/
+/*	$OpenBSD: swap.c,v 1.24 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: swap.c,v 1.9 1998/12/26 07:05:08 marc Exp $	*/
 
 /*-
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 0ab1e28898f..c9de08920e2 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systat.h,v 1.17 2011/03/31 06:12:34 lum Exp $	*/
+/*	$OpenBSD: systat.h,v 1.18 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: systat.h,v 1.2 1995/01/20 08:52:14 jtc Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #define _SYSTAT_H_
 
 #include <netinet/in.h>
-#include <sys/cdefs.h>
 #include <fcntl.h>
 #include <kvm.h>
 #include "engine.h"
diff --git a/usr.bin/telnet/auth-proto.h b/usr.bin/telnet/auth-proto.h
index 7ed4afbf080..7693fe39cb9 100644
--- a/usr.bin/telnet/auth-proto.h
+++ b/usr.bin/telnet/auth-proto.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)auth-proto.h  8.1 (Berkeley) 6/4/93
- *     $OpenBSD: auth-proto.h,v 1.1 2005/05/24 03:41:58 deraadt Exp $
+ *     $OpenBSD: auth-proto.h,v 1.2 2012/12/05 23:20:26 deraadt Exp $
  *     $NetBSD: auth-proto.h,v 1.5 1996/02/24 01:15:16 jtk Exp $
  */
 
@@ -63,7 +63,6 @@
  * or implied warranty.
  */
 
-#include <sys/cdefs.h>
 /* $KTH: auth-proto.h,v 1.10 2000/01/18 03:08:55 assar Exp $ */
 
 #if	defined(AUTHENTICATION)
diff --git a/usr.bin/top/top.h b/usr.bin/top/top.h
index aafd239461c..eec03d7480f 100644
--- a/usr.bin/top/top.h
+++ b/usr.bin/top/top.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: top.h,v 1.13 2010/03/23 16:16:09 lum Exp $	*/
+/*	$OpenBSD: top.h,v 1.14 2012/12/05 23:20:26 deraadt Exp $	*/
 
 /*
  *  Top users/processes display for Unix
@@ -34,8 +34,6 @@
  *  General (global) definitions
  */
 
-#include <sys/cdefs.h>
-
 /* Current major version number */
 #define VERSION		3
 
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 2cee34548ef..6b5f1f02d37 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: str.c,v 1.11 2009/10/27 23:59:46 deraadt Exp $	*/
+/*	$OpenBSD: str.c,v 1.12 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 8ed35eafe29..9c3ac277322 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.24 2012/09/17 17:36:13 espie Exp $	*/
+/*	$OpenBSD: config.h,v 1.25 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,6 @@
 #include <sys/param.h>
 
 #if !defined(MAKE_BOOTSTRAP) && defined(BSD)
-#include <sys/cdefs.h>
 #include <paths.h>
 #endif /* ...BSD */
 
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 0ba45de74eb..bb70128e5bb 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.h,v 1.16 2012/11/29 02:15:44 guenther Exp $	*/
+/*	$OpenBSD: lp.h,v 1.17 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: lp.h,v 1.14 2000/04/16 14:43:58 mrg Exp $	*/
 
 /*
@@ -118,7 +118,6 @@ struct queue {
 	errno = save_errno;			\
 } while (0)
 
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 struct dirent;
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index b9420b7f530..200504531d2 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.6 2009/10/27 23:59:52 deraadt Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.7 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.4 1995/11/15 22:27:34 pk Exp $	*/
 
 /*
@@ -30,8 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
+#include <sys/types.h>
 #include "lpc.h"
 #include "extern.h"
 
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 82c4e7bc552..45cd090ccdd 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$NetBSD: extern.h,v 1.2 1995/11/15 22:27:36 pk Exp $	*/
 
 /*
@@ -34,9 +34,6 @@
  */
 
 
-#include <sys/cdefs.h>
-
-
 __BEGIN_DECLS
 void	clean(int, char **);
 void	disable(int, char **);
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index b2efdf89d20..b2d0d64bebf 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.6 2003/06/02 23:36:53 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.7 2012/12/05 23:20:26 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -31,7 +31,6 @@
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
  */
 
-#include <sys/cdefs.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 
diff --git a/usr.sbin/netgroup_mkdb/str.h b/usr.sbin/netgroup_mkdb/str.h
index 6906ac5ed51..e20a5e50351 100644
--- a/usr.sbin/netgroup_mkdb/str.h
+++ b/usr.sbin/netgroup_mkdb/str.h
@@ -28,11 +28,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: str.h,v 1.2 2002/02/16 21:28:06 millert Exp $
+ * $Id: str.h,v 1.3 2012/12/05 23:20:26 deraadt Exp $
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
 struct string {
 	char  *s_str;
diff --git a/usr.sbin/netgroup_mkdb/util.h b/usr.sbin/netgroup_mkdb/util.h
index 08ca7d7dfad..c040255cc39 100644
--- a/usr.sbin/netgroup_mkdb/util.h
+++ b/usr.sbin/netgroup_mkdb/util.h
@@ -31,7 +31,6 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 void *emalloc(size_t);
diff --git a/usr.sbin/npppd/common/radish.c b/usr.sbin/npppd/common/radish.c
index 502be17d30f..ac092355511 100644
--- a/usr.sbin/npppd/common/radish.c
+++ b/usr.sbin/npppd/common/radish.c
@@ -30,13 +30,6 @@
  * SUCH DAMAGE.
  *
  */
-#include <sys/cdefs.h>
-#ifndef LINT
-__COPYRIGHT(
-"@(#) Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.\n"
-"@(#) All rights reserved.\n"
-);
-#endif
 
 /*
  * radish.c
diff --git a/usr.sbin/npppd/npppd/chap_ms.c b/usr.sbin/npppd/npppd/chap_ms.c
index 101dd3e325c..1d672787176 100644
--- a/usr.sbin/npppd/npppd/chap_ms.c
+++ b/usr.sbin/npppd/npppd/chap_ms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap_ms.c,v 1.4 2010/09/22 11:48:38 yasuoka Exp $	*/
+/*	$OpenBSD: chap_ms.c,v 1.5 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$vantronix: chap_ms.c,v 1.7 2010/06/02 12:22:58 reyk Exp $	*/
 
 /*
@@ -32,7 +32,6 @@
   */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 
 #include <ctype.h>
 #include <string.h>
diff --git a/usr.sbin/npppd/npppd/fsm.c b/usr.sbin/npppd/npppd/fsm.c
index 3a1d59474b3..d555213c70d 100644
--- a/usr.sbin/npppd/npppd/fsm.c
+++ b/usr.sbin/npppd/npppd/fsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsm.c,v 1.4 2012/05/08 13:15:11 yasuoka Exp $ */
+/*	$OpenBSD: fsm.c,v 1.5 2012/12/05 23:20:26 deraadt Exp $ */
 
 /**@file
  * This file was adapted from NetBSD:/usr/src/usr.sbin/pppd/pppd/fsm.c
@@ -31,19 +31,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1989 Carnegie Mellon University.\n"
-"@(#) All rights reserved.\n"
-);
-#if 0
-#define RCSID	"Id: fsm.c,v 1.17 1999/08/13 06:46:12 paulus Exp "
-#else
-__RCSID("$NetBSD: fsm.c,v 1.13 2000/09/23 22:39:35 christos Exp $");
-#endif
-#endif
-
 /*
  * TODO:
  * Randomize fsm id on link/init.
diff --git a/usr.sbin/npppd/npppd/npppd.c b/usr.sbin/npppd/npppd/npppd.c
index 076efb07f5c..aa64f9ea0b1 100644
--- a/usr.sbin/npppd/npppd/npppd.c
+++ b/usr.sbin/npppd/npppd/npppd.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: npppd.c,v 1.25 2012/11/13 17:10:40 yasuoka Exp $ */
+/*	$OpenBSD: npppd.c,v 1.26 2012/12/05 23:20:26 deraadt Exp $ */
 
 /*-
- * Copyright (c) 2009 Internet Initiative Japan Inc.
+ * Copyright (c) 2005-2008,2009 Internet Initiative Japan Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,22 +29,9 @@
  * Next pppd(nppd). This file provides a npppd daemon process and operations
  * for npppd instance.
  * @author	Yasuoka Masahiko
- * $Id: npppd.c,v 1.25 2012/11/13 17:10:40 yasuoka Exp $
+ * $Id: npppd.c,v 1.26 2012/12/05 23:20:26 deraadt Exp $
  */
-#include <sys/cdefs.h>
 #include "version.h"
-#ifndef LINT
-__COPYRIGHT(
-"@(#) npppd - PPP daemon for PPP Access Concentrators\n"
-"@(#) Version " VERSION "\n"
-"@(#) \n"
-"@(#) Copyright 2005-2008\n"
-"@(#) 	Internet Initiative Japan Inc.  All rights reserved.\n"
-"@(#) \n"
-"@(#) \n"
-"@(#) \n"
-);
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
diff --git a/usr.sbin/npppd/npppd/npppd.h b/usr.sbin/npppd/npppd/npppd.h
index 5c0daf2d51d..453f8027539 100644
--- a/usr.sbin/npppd/npppd/npppd.h
+++ b/usr.sbin/npppd/npppd/npppd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npppd.h,v 1.12 2012/11/13 17:10:40 yasuoka Exp $ */
+/*	$OpenBSD: npppd.h,v 1.13 2012/12/05 23:20:26 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -224,8 +224,6 @@ typedef struct _npppd		npppd;
 
 #include "ppp.h"
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 npppd           *npppd_get_npppd (void);
 int              npppd_init (npppd *, const char *);
diff --git a/usr.sbin/npppd/npppd/npppd_subr.c b/usr.sbin/npppd/npppd/npppd_subr.c
index e7766179cbc..4007a4e9c3f 100644
--- a/usr.sbin/npppd/npppd/npppd_subr.c
+++ b/usr.sbin/npppd/npppd/npppd_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npppd_subr.c,v 1.8 2012/05/08 13:18:37 yasuoka Exp $ */
+/*	$OpenBSD: npppd_subr.c,v 1.9 2012/12/05 23:20:26 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -28,14 +28,6 @@
 /**@file
  * This file provides helper functions for npppd.
  */
-/* $Id: npppd_subr.c,v 1.8 2012/05/08 13:18:37 yasuoka Exp $ */
-#include <sys/cdefs.h>
-#ifndef LINT
-__COPYRIGHT(
-"@(#) Copyright (c) 2000 Ruslan Ermilov and Brian Somers <brian@Awfulhak.org>\n"
-"@(#) All rights reserved.\n"
-);
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h
index 50d3156fb11..db45c200e30 100644
--- a/usr.sbin/rtadvd/advcap.h
+++ b/usr.sbin/rtadvd/advcap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advcap.h,v 1.6 2002/05/29 14:34:05 itojun Exp $	*/
+/*	$OpenBSD: advcap.h,v 1.7 2012/12/05 23:20:26 deraadt Exp $	*/
 /*	$KAME: advcap.h,v 1.4 2001/06/08 04:46:19 jinmei Exp $	*/
 
 /*
@@ -32,8 +32,6 @@
 #ifndef _ADVCAP_H_
 #define _ADVCAP_H_
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 
 extern int agetent(char *, const char *);