Remove excessive sys/cdefs.h inclusion

ok guenther millert kettenis

103 files changed, 113 insertions, 243 deletions

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