summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/include/_float.h (renamed from sys/arch/mips64/include/float.h)82
-rw-r--r--sys/arch/alpha/include/internal_types.h6
-rw-r--r--sys/arch/amd64/include/_float.h (renamed from sys/arch/sh/include/float.h)82
-rw-r--r--sys/arch/amd64/include/float.h84
-rw-r--r--sys/arch/amd64/include/internal_types.h6
-rw-r--r--sys/arch/arm/include/_float.h (renamed from sys/arch/arm/include/float.h)83
-rw-r--r--sys/arch/arm/include/internal_types.h10
-rw-r--r--sys/arch/armish/include/_float.h3
-rw-r--r--sys/arch/armish/include/float.h4
-rw-r--r--sys/arch/armish/include/internal_types.h7
-rw-r--r--sys/arch/aviion/include/_float.h3
-rw-r--r--sys/arch/aviion/include/float.h3
-rw-r--r--sys/arch/aviion/include/internal_types.h3
-rw-r--r--sys/arch/beagle/include/_float.h3
-rw-r--r--sys/arch/beagle/include/float.h4
-rw-r--r--sys/arch/beagle/include/internal_types.h7
-rw-r--r--sys/arch/gumstix/include/_float.h3
-rw-r--r--sys/arch/gumstix/include/float.h4
-rw-r--r--sys/arch/gumstix/include/internal_types.h7
-rw-r--r--sys/arch/hp300/include/_float.h3
-rw-r--r--sys/arch/hp300/include/float.h9
-rw-r--r--sys/arch/hp300/include/internal_types.h3
-rw-r--r--sys/arch/hppa/include/_float.h (renamed from sys/arch/hppa64/include/float.h)82
-rw-r--r--sys/arch/hppa/include/internal_types.h6
-rw-r--r--sys/arch/hppa64/include/_float.h (renamed from sys/arch/hppa/include/float.h)82
-rw-r--r--sys/arch/hppa64/include/internal_types.h7
-rw-r--r--sys/arch/i386/include/_float.h (renamed from sys/arch/powerpc/include/float.h)82
-rw-r--r--sys/arch/i386/include/float.h84
-rw-r--r--sys/arch/i386/include/internal_types.h6
-rw-r--r--sys/arch/ia64/include/_float.h71
-rw-r--r--sys/arch/ia64/include/float.h84
-rw-r--r--sys/arch/ia64/include/internal_types.h6
-rw-r--r--sys/arch/landisk/include/_float.h3
-rw-r--r--sys/arch/landisk/include/float.h3
-rw-r--r--sys/arch/landisk/include/internal_types.h3
-rw-r--r--sys/arch/loongson/include/_float.h3
-rw-r--r--sys/arch/loongson/include/float.h3
-rw-r--r--sys/arch/loongson/include/internal_types.h3
-rw-r--r--sys/arch/luna88k/include/_float.h3
-rw-r--r--sys/arch/luna88k/include/float.h3
-rw-r--r--sys/arch/luna88k/include/internal_types.h3
-rw-r--r--sys/arch/m68k/include/_float.h71
-rw-r--r--sys/arch/m68k/include/float.h84
-rw-r--r--sys/arch/m68k/include/internal_types.h6
-rw-r--r--sys/arch/m88k/include/_float.h71
-rw-r--r--sys/arch/m88k/include/float.h83
-rw-r--r--sys/arch/m88k/include/internal_types.h6
-rw-r--r--sys/arch/macppc/include/_float.h3
-rw-r--r--sys/arch/macppc/include/float.h3
-rw-r--r--sys/arch/macppc/include/internal_types.h3
-rw-r--r--sys/arch/mips64/include/_float.h (renamed from sys/arch/alpha/include/float.h)81
-rw-r--r--sys/arch/mips64/include/internal_types.h8
-rw-r--r--sys/arch/mvme68k/include/_float.h3
-rw-r--r--sys/arch/mvme68k/include/float.h3
-rw-r--r--sys/arch/mvme68k/include/internal_types.h3
-rw-r--r--sys/arch/mvme88k/include/_float.h3
-rw-r--r--sys/arch/mvme88k/include/float.h3
-rw-r--r--sys/arch/mvme88k/include/internal_types.h3
-rw-r--r--sys/arch/octeon/include/_float.h3
-rw-r--r--sys/arch/octeon/include/float.h3
-rw-r--r--sys/arch/octeon/include/internal_types.h3
-rw-r--r--sys/arch/palm/include/_float.h3
-rw-r--r--sys/arch/palm/include/float.h4
-rw-r--r--sys/arch/palm/include/internal_types.h7
-rw-r--r--sys/arch/powerpc/include/_float.h71
-rw-r--r--sys/arch/powerpc/include/internal_types.h10
-rw-r--r--sys/arch/sgi/include/_float.h3
-rw-r--r--sys/arch/sgi/include/float.h5
-rw-r--r--sys/arch/sgi/include/internal_types.h3
-rw-r--r--sys/arch/sh/include/_float.h71
-rw-r--r--sys/arch/sh/include/internal_types.h6
-rw-r--r--sys/arch/socppc/include/_float.h3
-rw-r--r--sys/arch/socppc/include/float.h3
-rw-r--r--sys/arch/socppc/include/internal_types.h3
-rw-r--r--sys/arch/solbourne/include/_float.h3
-rw-r--r--sys/arch/solbourne/include/float.h3
-rw-r--r--sys/arch/solbourne/include/internal_types.h3
-rw-r--r--sys/arch/sparc/include/_float.h (renamed from sys/arch/sparc/include/float.h)83
-rw-r--r--sys/arch/sparc/include/internal_types.h6
-rw-r--r--sys/arch/sparc64/include/_float.h (renamed from sys/arch/sparc64/include/float.h)83
-rw-r--r--sys/arch/sparc64/include/internal_types.h6
-rw-r--r--sys/arch/vax/include/_float.h71
-rw-r--r--sys/arch/vax/include/float.h84
-rw-r--r--sys/arch/vax/include/internal_types.h14
-rw-r--r--sys/arch/zaurus/include/_float.h3
-rw-r--r--sys/arch/zaurus/include/float.h4
-rw-r--r--sys/arch/zaurus/include/internal_types.h7
-rw-r--r--sys/sys/limits.h51
88 files changed, 812 insertions, 1203 deletions
diff --git a/sys/arch/mips64/include/float.h b/sys/arch/alpha/include/_float.h
index ce9198bd9e5..d80389da71c 100644
--- a/sys/arch/mips64/include/float.h
+++ b/sys/arch/alpha/include/_float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.8 2011/08/29 13:13:21 kettenis Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -27,57 +27,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS64_FLOAT_H_
-#define _MIPS64_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP -125 /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP -1021
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP -307
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG 113
-#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
-#define LDBL_DIG 33
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
-#define LDBL_MAX_10_EXP 4932
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 36
-#endif
+#define __DECIMAL_DIG 17
-#endif /* !_MIPS64_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/alpha/include/internal_types.h b/sys/arch/alpha/include/internal_types.h
deleted file mode 100644
index 0d47276b9bb..00000000000
--- a/sys/arch/alpha/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2004/09/16 13:10:56 miod Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/sh/include/float.h b/sys/arch/amd64/include/_float.h
index bdcbdbc0958..5978a547c7e 100644
--- a/sys/arch/sh/include/float.h
+++ b/sys/arch/amd64/include/_float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.3 2011/08/29 13:13:21 kettenis Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -27,57 +27,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
*/
-#ifndef _SH_FLOAT_H_
-#define _SH_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG 64
+#define __LDBL_EPSILON 1.08420217248550443401e-19L
+#define __LDBL_DIG 18
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP 4932
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 21
-#endif /* _SH_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/amd64/include/float.h b/sys/arch/amd64/include/float.h
deleted file mode 100644
index c80b7a1e413..00000000000
--- a/sys/arch/amd64/include/float.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $OpenBSD: float.h,v 1.5 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
- */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
-
-#define LDBL_MANT_DIG 64
-#define LDBL_EPSILON 1.08420217248550443401e-19L
-#define LDBL_DIG 18
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP 4932
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 21
-#endif
-
-#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/amd64/include/internal_types.h b/sys/arch/amd64/include/internal_types.h
deleted file mode 100644
index debdc9cfc32..00000000000
--- a/sys/arch/amd64/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2004/09/16 13:10:57 miod Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/arm/include/float.h b/sys/arch/arm/include/_float.h
index e3e09fd183f..1375bb63b38 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/_float.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: float.h,v 1.5 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,57 +40,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _ARM_FLOAT_H_
-#define _ARM_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int __flt_rounds (void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-7F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-7F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 17
-#endif /* _ARM_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/arm/include/internal_types.h b/sys/arch/arm/include/internal_types.h
deleted file mode 100644
index 7e610b0ec4b..00000000000
--- a/sys/arch/arm/include/internal_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2004/05/06 15:53:39 drahn Exp $ */
-/* Public domain */
-#ifndef _ARM_INTERNAL_TYPES_H_
-#define _ARM_INTERNAL_TYPES_H_
-
-#ifdef __CHAR_UNSIGNED__
-#define __machine_has_unsigned_chars
-#endif
-
-#endif
diff --git a/sys/arch/armish/include/_float.h b/sys/arch/armish/include/_float.h
new file mode 100644
index 00000000000..cb8e5c8109f
--- /dev/null
+++ b/sys/arch/armish/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
+
+#include <arm/_float.h>
diff --git a/sys/arch/armish/include/float.h b/sys/arch/armish/include/float.h
deleted file mode 100644
index fa1d820e389..00000000000
--- a/sys/arch/armish/include/float.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2006/05/29 17:13:19 drahn Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */
-
-#include <arm/float.h>
diff --git a/sys/arch/armish/include/internal_types.h b/sys/arch/armish/include/internal_types.h
deleted file mode 100644
index aab63dc574f..00000000000
--- a/sys/arch/armish/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/11/14 14:30:38 deraadt Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#include <arm/internal_types.h>
-#endif
diff --git a/sys/arch/aviion/include/_float.h b/sys/arch/aviion/include/_float.h
new file mode 100644
index 00000000000..f372beaa892
--- /dev/null
+++ b/sys/arch/aviion/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
+
+#include <m88k/_float.h>
diff --git a/sys/arch/aviion/include/float.h b/sys/arch/aviion/include/float.h
deleted file mode 100644
index d9514d72948..00000000000
--- a/sys/arch/aviion/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2006/04/18 10:56:58 miod Exp $ */
-/* public domain */
-#include <m88k/float.h>
diff --git a/sys/arch/aviion/include/internal_types.h b/sys/arch/aviion/include/internal_types.h
deleted file mode 100644
index 272ab8141f1..00000000000
--- a/sys/arch/aviion/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2006/04/18 10:56:58 miod Exp $ */
-/* public domain */
-#include <m88k/internal_types.h>
diff --git a/sys/arch/beagle/include/_float.h b/sys/arch/beagle/include/_float.h
new file mode 100644
index 00000000000..cb8e5c8109f
--- /dev/null
+++ b/sys/arch/beagle/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
+
+#include <arm/_float.h>
diff --git a/sys/arch/beagle/include/float.h b/sys/arch/beagle/include/float.h
deleted file mode 100644
index 939d01cfada..00000000000
--- a/sys/arch/beagle/include/float.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2009/05/08 03:13:26 drahn Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */
-
-#include <arm/float.h>
diff --git a/sys/arch/beagle/include/internal_types.h b/sys/arch/beagle/include/internal_types.h
deleted file mode 100644
index aab63dc574f..00000000000
--- a/sys/arch/beagle/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/11/14 14:30:38 deraadt Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#include <arm/internal_types.h>
-#endif
diff --git a/sys/arch/gumstix/include/_float.h b/sys/arch/gumstix/include/_float.h
new file mode 100644
index 00000000000..cb8e5c8109f
--- /dev/null
+++ b/sys/arch/gumstix/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 deraadt Exp $ */
+
+#include <arm/_float.h>
diff --git a/sys/arch/gumstix/include/float.h b/sys/arch/gumstix/include/float.h
deleted file mode 100644
index bbbd959e515..00000000000
--- a/sys/arch/gumstix/include/float.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2008/11/26 14:18:11 drahn Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */
-
-#include <arm/float.h>
diff --git a/sys/arch/gumstix/include/internal_types.h b/sys/arch/gumstix/include/internal_types.h
deleted file mode 100644
index aab63dc574f..00000000000
--- a/sys/arch/gumstix/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/11/14 14:30:38 deraadt Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#include <arm/internal_types.h>
-#endif
diff --git a/sys/arch/hp300/include/_float.h b/sys/arch/hp300/include/_float.h
new file mode 100644
index 00000000000..32bc0d2538c
--- /dev/null
+++ b/sys/arch/hp300/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <m68k/_float.h>
diff --git a/sys/arch/hp300/include/float.h b/sys/arch/hp300/include/float.h
deleted file mode 100644
index da6f2a6b166..00000000000
--- a/sys/arch/hp300/include/float.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */
-/* $NetBSD: float.h,v 1.7 1995/06/20 20:45:34 jtc Exp $ */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <m68k/float.h>
-
-#endif
diff --git a/sys/arch/hp300/include/internal_types.h b/sys/arch/hp300/include/internal_types.h
deleted file mode 100644
index 61dd1740f08..00000000000
--- a/sys/arch/hp300/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
-/* Public domain */
-#include <m68k/internal_types.h>
diff --git a/sys/arch/hppa64/include/float.h b/sys/arch/hppa/include/_float.h
index 2ce00a4fd9a..11a907c15b7 100644
--- a/sys/arch/hppa64/include/float.h
+++ b/sys/arch/hppa/include/_float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.5 2011/08/29 13:13:21 kettenis Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -27,57 +27,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
*/
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24
-#define FLT_EPSILON 1.19209290E-07F
-#define FLT_DIG 6
-#define FLT_MIN_EXP (-125)
-#define FLT_MIN 1.17549435E-38F
-#define FLT_MIN_10_EXP (-37)
-#define FLT_MAX_EXP 128
-#define FLT_MAX 3.40282347E+38F
-#define FLT_MAX_10_EXP 38
+#define __FLT_MANT_DIG 24
+#define __FLT_EPSILON 1.19209290E-07F
+#define __FLT_DIG 6
+#define __FLT_MIN_EXP (-125)
+#define __FLT_MIN 1.17549435E-38F
+#define __FLT_MIN_10_EXP (-37)
+#define __FLT_MAX_EXP 128
+#define __FLT_MAX 3.40282347E+38F
+#define __FLT_MAX_10_EXP 38
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 17
-#endif /* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/hppa/include/internal_types.h b/sys/arch/hppa/include/internal_types.h
deleted file mode 100644
index 4d1833cf8a0..00000000000
--- a/sys/arch/hppa/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/hppa/include/float.h b/sys/arch/hppa64/include/_float.h
index f5df96d5736..11a907c15b7 100644
--- a/sys/arch/hppa/include/float.h
+++ b/sys/arch/hppa64/include/_float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.11 2011/08/29 13:13:21 kettenis Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -27,57 +27,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
*/
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24
-#define FLT_EPSILON 1.19209290E-07F
-#define FLT_DIG 6
-#define FLT_MIN_EXP (-125)
-#define FLT_MIN 1.17549435E-38F
-#define FLT_MIN_10_EXP (-37)
-#define FLT_MAX_EXP 128
-#define FLT_MAX 3.40282347E+38F
-#define FLT_MAX_10_EXP 38
+#define __FLT_MANT_DIG 24
+#define __FLT_EPSILON 1.19209290E-07F
+#define __FLT_DIG 6
+#define __FLT_MIN_EXP (-125)
+#define __FLT_MIN 1.17549435E-38F
+#define __FLT_MIN_10_EXP (-37)
+#define __FLT_MAX_EXP 128
+#define __FLT_MAX 3.40282347E+38F
+#define __FLT_MAX_10_EXP 38
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 17
-#endif /* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/hppa64/include/internal_types.h b/sys/arch/hppa64/include/internal_types.h
deleted file mode 100644
index 2ceb6165937..00000000000
--- a/sys/arch/hppa64/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2005/04/01 10:40:48 mickey Exp $ */
-/* Public domain */
-
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/powerpc/include/float.h b/sys/arch/i386/include/_float.h
index b56343a51de..bd7da098613 100644
--- a/sys/arch/powerpc/include/float.h
+++ b/sys/arch/i386/include/_float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.9 2011/08/29 13:13:21 kettenis Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -27,57 +27,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
*/
-#ifndef _POWERPC_FLOAT_H_
-#define _POWERPC_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 2 /* long double */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG 64
+#define __LDBL_EPSILON 1.08420217248550443401e-19L
+#define __LDBL_DIG 18
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP 4932
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 21
-#endif /* _POWERPC_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h
deleted file mode 100644
index 8db2f8ffa9d..00000000000
--- a/sys/arch/i386/include/float.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $OpenBSD: float.h,v 1.9 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
- */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 2 /* long double */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
-
-#define LDBL_MANT_DIG 64
-#define LDBL_EPSILON 1.08420217248550443401e-19L
-#define LDBL_DIG 18
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP 4932
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 21
-#endif
-
-#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/i386/include/internal_types.h b/sys/arch/i386/include/internal_types.h
deleted file mode 100644
index 4d1833cf8a0..00000000000
--- a/sys/arch/i386/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/ia64/include/_float.h b/sys/arch/ia64/include/_float.h
new file mode 100644
index 00000000000..8ac13e756d2
--- /dev/null
+++ b/sys/arch/ia64/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
+
+#define __LDBL_MANT_DIG 64
+#define __LDBL_EPSILON 1.08420217248550443401e-19L
+#define __LDBL_DIG 18
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP 4932
+
+#define __DECIMAL_DIG 21
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/ia64/include/float.h b/sys/arch/ia64/include/float.h
deleted file mode 100644
index 39ca4ba2a8e..00000000000
--- a/sys/arch/ia64/include/float.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $OpenBSD: float.h,v 1.2 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
- */
-
-#ifndef _IA64_FLOAT_H_
-#define _IA64_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
-
-#define LDBL_MANT_DIG 64
-#define LDBL_EPSILON 1.08420217248550443401e-19L
-#define LDBL_DIG 18
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP 4932
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 21
-#endif
-
-#endif /* _IA64_FLOAT_H_ */
diff --git a/sys/arch/ia64/include/internal_types.h b/sys/arch/ia64/include/internal_types.h
deleted file mode 100644
index c305ca38de6..00000000000
--- a/sys/arch/ia64/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2011/07/04 23:29:08 pirofti Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/landisk/include/_float.h b/sys/arch/landisk/include/_float.h
new file mode 100644
index 00000000000..0d3518348ea
--- /dev/null
+++ b/sys/arch/landisk/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <sh/_float.h>
diff --git a/sys/arch/landisk/include/float.h b/sys/arch/landisk/include/float.h
deleted file mode 100644
index 3b369109f6f..00000000000
--- a/sys/arch/landisk/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.2 2009/11/24 11:59:59 jasper Exp $ */
-
-#include <sh/float.h>
diff --git a/sys/arch/landisk/include/internal_types.h b/sys/arch/landisk/include/internal_types.h
deleted file mode 100644
index dabb6042ec1..00000000000
--- a/sys/arch/landisk/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2009/11/24 11:59:59 jasper Exp $ */
-
-#include <sh/internal_types.h>
diff --git a/sys/arch/loongson/include/_float.h b/sys/arch/loongson/include/_float.h
new file mode 100644
index 00000000000..e7b4a14c95b
--- /dev/null
+++ b/sys/arch/loongson/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <mips64/_float.h>
diff --git a/sys/arch/loongson/include/float.h b/sys/arch/loongson/include/float.h
deleted file mode 100644
index 4c419500b7d..00000000000
--- a/sys/arch/loongson/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2009/07/31 09:26:25 miod Exp $ */
-/* public domain */
-#include <mips64/float.h>
diff --git a/sys/arch/loongson/include/internal_types.h b/sys/arch/loongson/include/internal_types.h
deleted file mode 100644
index 46c7dbb9781..00000000000
--- a/sys/arch/loongson/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2009/07/31 09:26:25 miod Exp $ */
-/* public domain */
-#include <mips64/internal_types.h>
diff --git a/sys/arch/luna88k/include/_float.h b/sys/arch/luna88k/include/_float.h
new file mode 100644
index 00000000000..795b116b305
--- /dev/null
+++ b/sys/arch/luna88k/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <m88k/_float.h>
diff --git a/sys/arch/luna88k/include/float.h b/sys/arch/luna88k/include/float.h
deleted file mode 100644
index 943eb389227..00000000000
--- a/sys/arch/luna88k/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.3 2004/04/26 14:31:08 miod Exp $ */
-/* public domain */
-#include <m88k/float.h>
diff --git a/sys/arch/luna88k/include/internal_types.h b/sys/arch/luna88k/include/internal_types.h
deleted file mode 100644
index 0fb181f107d..00000000000
--- a/sys/arch/luna88k/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.3 2004/04/26 14:31:08 miod Exp $ */
-/* public domain */
-#include <m88k/internal_types.h>
diff --git a/sys/arch/m68k/include/_float.h b/sys/arch/m68k/include/_float.h
new file mode 100644
index 00000000000..bd7da098613
--- /dev/null
+++ b/sys/arch/m68k/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 2 /* long double */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
+
+#define __LDBL_MANT_DIG 64
+#define __LDBL_EPSILON 1.08420217248550443401e-19L
+#define __LDBL_DIG 18
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP 4932
+
+#define __DECIMAL_DIG 21
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/m68k/include/float.h b/sys/arch/m68k/include/float.h
deleted file mode 100644
index 0923677c27f..00000000000
--- a/sys/arch/m68k/include/float.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $OpenBSD: float.h,v 1.8 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.10 1995/06/20 20:45:41 jtc Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
- */
-
-#ifndef _M68K_FLOAT_H_
-#define _M68K_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 2 /* long double */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
-
-#define LDBL_MANT_DIG 64
-#define LDBL_EPSILON 1.08420217248550443401e-19L
-#define LDBL_DIG 18
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP 4932
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 21
-#endif
-
-#endif /* !_M68K_FLOAT_H_ */
diff --git a/sys/arch/m68k/include/internal_types.h b/sys/arch/m68k/include/internal_types.h
deleted file mode 100644
index 4e56c8c7c4f..00000000000
--- a/sys/arch/m68k/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
-/* Public domain */
-#ifndef _M68K_INTERNAL_TYPES_H_
-#define _M68K_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/m88k/include/_float.h b/sys/arch/m88k/include/_float.h
new file mode 100644
index 00000000000..bd7da098613
--- /dev/null
+++ b/sys/arch/m88k/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 2 /* long double */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
+
+#define __LDBL_MANT_DIG 64
+#define __LDBL_EPSILON 1.08420217248550443401e-19L
+#define __LDBL_DIG 18
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP 4932
+
+#define __DECIMAL_DIG 21
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/m88k/include/float.h b/sys/arch/m88k/include/float.h
deleted file mode 100644
index bd18f8e80e3..00000000000
--- a/sys/arch/m88k/include/float.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $OpenBSD: float.h,v 1.5 2011/08/29 13:13:21 kettenis Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.1 (Berkeley) 5/8/90
- */
-
-#ifndef _M88K_FLOAT_H_
-#define _M88K_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 2 /* long double */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP (-125) /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP (-1021)
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP (-307)
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
-
-#define LDBL_MANT_DIG 64
-#define LDBL_EPSILON 1.08420217248550443401e-19L
-#define LDBL_DIG 18
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP 16384
-#define LDBL_MAX 1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP 4932
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 21
-#endif
-
-#endif /* _M88K_FLOAT_H_ */
diff --git a/sys/arch/m88k/include/internal_types.h b/sys/arch/m88k/include/internal_types.h
deleted file mode 100644
index bc3cf703766..00000000000
--- a/sys/arch/m88k/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
-/* Public domain */
-#ifndef _M88K_INTERNAL_TYPES_H_
-#define _M88K_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/macppc/include/_float.h b/sys/arch/macppc/include/_float.h
new file mode 100644
index 00000000000..738251a5922
--- /dev/null
+++ b/sys/arch/macppc/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <powerpc/_float.h>
diff --git a/sys/arch/macppc/include/float.h b/sys/arch/macppc/include/float.h
deleted file mode 100644
index fd859b43d83..00000000000
--- a/sys/arch/macppc/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2001/09/01 15:49:06 drahn Exp $ */
-
-#include <powerpc/float.h>
diff --git a/sys/arch/macppc/include/internal_types.h b/sys/arch/macppc/include/internal_types.h
deleted file mode 100644
index 9622f58539c..00000000000
--- a/sys/arch/macppc/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
-/* Public domain */
-#include <powerpc/internal_types.h>
diff --git a/sys/arch/alpha/include/float.h b/sys/arch/mips64/include/_float.h
index 8f58b49acef..c0df0b82c4e 100644
--- a/sys/arch/alpha/include/float.h
+++ b/sys/arch/mips64/include/_float.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: float.h,v 1.9 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -30,53 +29,43 @@
* SUCH DAMAGE.
*/
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#include <sys/cdefs.h>
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP -125 /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __LDBL_MANT_DIG 113
+#define __LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+#define __LDBL_DIG 33
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP 16384
+#define __LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define __LDBL_MAX_10_EXP 4932
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP -1021
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP -307
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DECIMAL_DIG 36
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
-
-#endif /* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/mips64/include/internal_types.h b/sys/arch/mips64/include/internal_types.h
deleted file mode 100644
index 529079fc997..00000000000
--- a/sys/arch/mips64/include/internal_types.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */
-/* Public domain */
-#ifndef _MIPS64_INTERNAL_TYPES_H_
-#define _MIPS64_INTERNAL_TYPES_H_
-
-/* Machine special type definitions */
-
-#endif
diff --git a/sys/arch/mvme68k/include/_float.h b/sys/arch/mvme68k/include/_float.h
new file mode 100644
index 00000000000..9a011ad04c6
--- /dev/null
+++ b/sys/arch/mvme68k/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <m68k/_float.h>
diff --git a/sys/arch/mvme68k/include/float.h b/sys/arch/mvme68k/include/float.h
deleted file mode 100644
index 6c9b3c0a9ac..00000000000
--- a/sys/arch/mvme68k/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.4 1997/03/31 00:24:01 downsj Exp $ */
-
-#include <m68k/float.h>
diff --git a/sys/arch/mvme68k/include/internal_types.h b/sys/arch/mvme68k/include/internal_types.h
deleted file mode 100644
index 61dd1740f08..00000000000
--- a/sys/arch/mvme68k/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
-/* Public domain */
-#include <m68k/internal_types.h>
diff --git a/sys/arch/mvme88k/include/_float.h b/sys/arch/mvme88k/include/_float.h
new file mode 100644
index 00000000000..795b116b305
--- /dev/null
+++ b/sys/arch/mvme88k/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <m88k/_float.h>
diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h
deleted file mode 100644
index 5b38c3e1220..00000000000
--- a/sys/arch/mvme88k/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.9 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/float.h>
diff --git a/sys/arch/mvme88k/include/internal_types.h b/sys/arch/mvme88k/include/internal_types.h
deleted file mode 100644
index 9e1b2276984..00000000000
--- a/sys/arch/mvme88k/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.3 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/internal_types.h>
diff --git a/sys/arch/octeon/include/_float.h b/sys/arch/octeon/include/_float.h
new file mode 100644
index 00000000000..e7b4a14c95b
--- /dev/null
+++ b/sys/arch/octeon/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <mips64/_float.h>
diff --git a/sys/arch/octeon/include/float.h b/sys/arch/octeon/include/float.h
deleted file mode 100644
index bbeb5a5b33f..00000000000
--- a/sys/arch/octeon/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2010/09/20 06:32:30 syuu Exp $ */
-/* public domain */
-#include <mips64/float.h>
diff --git a/sys/arch/octeon/include/internal_types.h b/sys/arch/octeon/include/internal_types.h
deleted file mode 100644
index 6b79b75cd9d..00000000000
--- a/sys/arch/octeon/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2010/09/20 06:32:30 syuu Exp $ */
-/* public domain */
-#include <mips64/internal_types.h>
diff --git a/sys/arch/palm/include/_float.h b/sys/arch/palm/include/_float.h
new file mode 100644
index 00000000000..2e6e64a98cf
--- /dev/null
+++ b/sys/arch/palm/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <arm/_float.h>
diff --git a/sys/arch/palm/include/float.h b/sys/arch/palm/include/float.h
deleted file mode 100644
index 12cc5598874..00000000000
--- a/sys/arch/palm/include/float.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2009/09/05 01:22:11 marex Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */
-
-#include <arm/float.h>
diff --git a/sys/arch/palm/include/internal_types.h b/sys/arch/palm/include/internal_types.h
deleted file mode 100644
index 16469d57dfd..00000000000
--- a/sys/arch/palm/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2010/11/28 20:46:55 miod Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#include <arm/internal_types.h>
-#endif
diff --git a/sys/arch/powerpc/include/_float.h b/sys/arch/powerpc/include/_float.h
new file mode 100644
index 00000000000..23df139756d
--- /dev/null
+++ b/sys/arch/powerpc/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
+
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
+
+#define __DECIMAL_DIG 17
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/powerpc/include/internal_types.h b/sys/arch/powerpc/include/internal_types.h
deleted file mode 100644
index 75e5d9f9b8f..00000000000
--- a/sys/arch/powerpc/include/internal_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
-/* Public domain */
-#ifndef _POWERPC_INTERNAL_TYPES_H_
-#define _POWERPC_INTERNAL_TYPES_H_
-
-#ifdef __CHAR_UNSIGNED__
-#define __machine_has_unsigned_chars
-#endif
-
-#endif
diff --git a/sys/arch/sgi/include/_float.h b/sys/arch/sgi/include/_float.h
new file mode 100644
index 00000000000..e7b4a14c95b
--- /dev/null
+++ b/sys/arch/sgi/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <mips64/_float.h>
diff --git a/sys/arch/sgi/include/float.h b/sys/arch/sgi/include/float.h
deleted file mode 100644
index 6d6aefba17c..00000000000
--- a/sys/arch/sgi/include/float.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2004/08/06 21:12:19 pefo Exp $ */
-
-/* Use Mips generic include file */
-
-#include <mips64/float.h>
diff --git a/sys/arch/sgi/include/internal_types.h b/sys/arch/sgi/include/internal_types.h
deleted file mode 100644
index ecfa665964e..00000000000
--- a/sys/arch/sgi/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2004/08/06 21:12:19 pefo Exp $ */
-
-#include <mips64/internal_types.h>
diff --git a/sys/arch/sh/include/_float.h b/sys/arch/sh/include/_float.h
new file mode 100644
index 00000000000..23df139756d
--- /dev/null
+++ b/sys/arch/sh/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-125) /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-37) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP (-1021)
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP (-307)
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
+
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
+
+#define __DECIMAL_DIG 17
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/sh/include/internal_types.h b/sys/arch/sh/include/internal_types.h
deleted file mode 100644
index 1c6d5a40911..00000000000
--- a/sys/arch/sh/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2006/10/06 21:02:55 miod Exp $ */
-/* Public domain */
-#ifndef _SH_INTERNAL_TYPES_H_
-#define _SH_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/socppc/include/_float.h b/sys/arch/socppc/include/_float.h
new file mode 100644
index 00000000000..738251a5922
--- /dev/null
+++ b/sys/arch/socppc/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:44 deraadt Exp $ */
+
+#include <powerpc/_float.h>
diff --git a/sys/arch/socppc/include/float.h b/sys/arch/socppc/include/float.h
deleted file mode 100644
index 939a9e8784e..00000000000
--- a/sys/arch/socppc/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2008/05/10 22:07:00 kettenis Exp $ */
-
-#include <powerpc/float.h>
diff --git a/sys/arch/socppc/include/internal_types.h b/sys/arch/socppc/include/internal_types.h
deleted file mode 100644
index 4eb1ac1cfe1..00000000000
--- a/sys/arch/socppc/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2008/05/10 12:02:21 kettenis Exp $ */
-
-#include <powerpc/internal_types.h>
diff --git a/sys/arch/solbourne/include/_float.h b/sys/arch/solbourne/include/_float.h
new file mode 100644
index 00000000000..fc0d5fae677
--- /dev/null
+++ b/sys/arch/solbourne/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $ */
+
+#include <sparc/_float.h>
diff --git a/sys/arch/solbourne/include/float.h b/sys/arch/solbourne/include/float.h
deleted file mode 100644
index ba0bb6f316e..00000000000
--- a/sys/arch/solbourne/include/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2005/04/19 21:30:17 miod Exp $ */
-/* public domain */
-#include <sparc/float.h> \ No newline at end of file
diff --git a/sys/arch/solbourne/include/internal_types.h b/sys/arch/solbourne/include/internal_types.h
deleted file mode 100644
index abaf26591d0..00000000000
--- a/sys/arch/solbourne/include/internal_types.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2005/04/19 21:30:18 miod Exp $ */
-/* public domain */
-#include <sparc/internal_types.h> \ No newline at end of file
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/_float.h
index 436853821ae..e4a9012c98c 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/_float.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: float.h,v 1.8 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -37,57 +36,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP -125 /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP -125 /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP -1021
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP -307
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP -1021
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP -307
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 17
-#endif
+#define __DECIMAL_DIG 17
-#endif /* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/sparc/include/internal_types.h b/sys/arch/sparc/include/internal_types.h
deleted file mode 100644
index 9280b667b82..00000000000
--- a/sys/arch/sparc/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:12 espie Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/_float.h
index 16939fd7cd1..27663f3eb40 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/_float.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: float.h,v 1.7 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993, 2001
@@ -37,57 +36,45 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)float.h 8.1 (Berkeley) 6/11/93
*/
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS __flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS __flt_rounds()
+#define __FLT_EVAL_METHOD 0 /* no promotions */
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
-#define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP -125 /* emin */
-#define FLT_MIN 1.17549435E-38F /* b**(emin-1) */
-#define FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 128 /* emax */
-#define FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-07F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP -125 /* emin */
+#define __FLT_MIN 1.17549435E-38F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP -37 /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 128 /* emax */
+#define __FLT_MAX 3.40282347E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-#define DBL_MANT_DIG 53
-#define DBL_EPSILON 2.2204460492503131E-16
-#define DBL_DIG 15
-#define DBL_MIN_EXP -1021
-#define DBL_MIN 2.2250738585072014E-308
-#define DBL_MIN_10_EXP -307
-#define DBL_MAX_EXP 1024
-#define DBL_MAX 1.7976931348623157E+308
-#define DBL_MAX_10_EXP 308
+#define __DBL_MANT_DIG 53
+#define __DBL_EPSILON 2.2204460492503131E-16
+#define __DBL_DIG 15
+#define __DBL_MIN_EXP -1021
+#define __DBL_MIN 2.2250738585072014E-308
+#define __DBL_MIN_10_EXP -307
+#define __DBL_MAX_EXP 1024
+#define __DBL_MAX 1.7976931348623157E+308
+#define __DBL_MAX_10_EXP 308
-#define LDBL_MANT_DIG 113
-#define LDBL_EPSILON 1.925929944387235853055977942584927319E-34L
-#define LDBL_DIG 33
-#define LDBL_MIN_EXP (-16381)
-#define LDBL_MIN 3.362103143112093506262677817321752603E-4932L
-#define LDBL_MIN_10_EXP (-4931)
-#define LDBL_MAX_EXP (+16384)
-#define LDBL_MAX 1.189731495357231765085759326628007016E+4932L
-#define LDBL_MAX_10_EXP (+4932)
+#define __LDBL_MANT_DIG 113
+#define __LDBL_EPSILON 1.925929944387235853055977942584927319E-34L
+#define __LDBL_DIG 33
+#define __LDBL_MIN_EXP (-16381)
+#define __LDBL_MIN 3.362103143112093506262677817321752603E-4932L
+#define __LDBL_MIN_10_EXP (-4931)
+#define __LDBL_MAX_EXP (+16384)
+#define __LDBL_MAX 1.189731495357231765085759326628007016E+4932L
+#define __LDBL_MAX_10_EXP (+4932)
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 36
-#endif
+#define __DECIMAL_DIG 36
-#endif /* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/sparc64/include/internal_types.h b/sys/arch/sparc64/include/internal_types.h
deleted file mode 100644
index 01471cf27d5..00000000000
--- a/sys/arch/sparc64/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2004/09/16 13:10:57 miod Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif
diff --git a/sys/arch/vax/include/_float.h b/sys/arch/vax/include/_float.h
new file mode 100644
index 00000000000..5c45065e54a
--- /dev/null
+++ b/sys/arch/vax/include/_float.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $ */
+
+/*
+ * Copyright (c) 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
+
+#define __FLT_RADIX 2 /* b */
+#define __FLT_ROUNDS 1 /* FP addition rounds to nearest */
+#define __FLT_EVAL_METHOD 0 /* no promotions */
+
+#define __FLT_MANT_DIG 24 /* p */
+#define __FLT_EPSILON 1.19209290E-7F /* b**(1-p) */
+#define __FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP (-127) /* emin */
+#define __FLT_MIN 2.93873588E-39F /* b**(emin-1) */
+#define __FLT_MIN_10_EXP (-38) /* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP 127 /* emax */
+#define __FLT_MAX 1.70141173E+38F /* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
+
+#define __DBL_MANT_DIG 56
+#define __DBL_EPSILON 2.77555756156289135E-17
+#define __DBL_DIG 16
+#define __DBL_MIN_EXP (-127)
+#define __DBL_MIN 2.938735877055718770E-39
+#define __DBL_MIN_10_EXP (-38)
+#define __DBL_MAX_EXP 127
+#define __DBL_MAX 1.701411834604692294E+38
+#define __DBL_MAX_10_EXP 38
+
+#define __LDBL_MANT_DIG DBL_MANT_DIG
+#define __LDBL_EPSILON DBL_EPSILON
+#define __LDBL_DIG DBL_DIG
+#define __LDBL_MIN_EXP DBL_MIN_EXP
+#define __LDBL_MIN DBL_MIN
+#define __LDBL_MIN_10_EXP DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP DBL_MAX_EXP
+#define __LDBL_MAX DBL_MAX
+#define __LDBL_MAX_10_EXP DBL_MAX_10_EXP
+
+#define __DECIMAL_DIG 18
+
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
deleted file mode 100644
index eec2c68c6c0..00000000000
--- a/sys/arch/vax/include/float.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $OpenBSD: float.h,v 1.9 2011/08/29 13:13:21 kettenis Exp $ */
-/* $NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $ */
-
-/*
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)float.h 7.2 (Berkeley) 6/28/90
- */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-#define FLT_RADIX 2 /* b */
-#define FLT_ROUNDS 1 /* FP addition rounds to nearest */
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD 0 /* no promotions */
-#endif
-
-#define FLT_MANT_DIG 24 /* p */
-#define FLT_EPSILON 1.19209290E-7F /* b**(1-p) */
-#define FLT_MIN_EXP (-127) /* emin */
-#define FLT_MIN_10_EXP (-38) /* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP 127 /* emax */
-#define FLT_MAX_10_EXP 38 /* floor(log10((1-b**(-p))*b**emax)) */
-
-#define DBL_MANT_DIG 56
-#define DBL_EPSILON 2.77555756156289135E-17
-#define DBL_MIN_EXP (-127)
-#define DBL_MIN_10_EXP (-38)
-#define DBL_MAX_EXP 127
-#define DBL_MAX_10_EXP 38
-
-/* limits.h also defines this */
-#if !defined(FLT_DIG)
-# define FLT_DIG 6 /* floor((p-1)*log10(b))+(b == 10) */
-# define FLT_MIN 2.93873588E-39F /* b**(emin-1) */
-# define FLT_MAX 1.70141173E+38F /* (1-b**(-p))*b**emax */
-# define DBL_DIG 16
-# define DBL_MIN 2.938735877055718770E-39
-# define DBL_MAX 1.701411834604692294E+38
-#endif
-
-#define LDBL_MANT_DIG DBL_MANT_DIG
-#define LDBL_EPSILON DBL_EPSILON
-#define LDBL_DIG DBL_DIG
-#define LDBL_MIN_EXP DBL_MIN_EXP
-#define LDBL_MIN DBL_MIN
-#define LDBL_MIN_10_EXP DBL_MIN_10_EXP
-#define LDBL_MAX_EXP DBL_MAX_EXP
-#define LDBL_MAX DBL_MAX
-#define LDBL_MAX_10_EXP DBL_MAX_10_EXP
-
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG 18
-#endif
-
-#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/vax/include/internal_types.h b/sys/arch/vax/include/internal_types.h
deleted file mode 100644
index 3cf344f2df9..00000000000
--- a/sys/arch/vax/include/internal_types.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:12 espie Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#define __DBL_DIG 16
-#define __DBL_MAX 1.701411834604692294E+38
-#define __DBL_MIN 2.938735877055718770E-39
-
-#define __FLT_DIG 6
-#define __FLT_MAX 1.70141173E+38F
-#define __FLT_MIN 2.93873588E-39F
-
-#endif
diff --git a/sys/arch/zaurus/include/_float.h b/sys/arch/zaurus/include/_float.h
new file mode 100644
index 00000000000..38fb9c08646
--- /dev/null
+++ b/sys/arch/zaurus/include/_float.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $ */
+
+#include <arm/_float.h>
diff --git a/sys/arch/zaurus/include/float.h b/sys/arch/zaurus/include/float.h
deleted file mode 100644
index 1b6ce4f7b2b..00000000000
--- a/sys/arch/zaurus/include/float.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: float.h,v 1.1 2004/12/31 00:04:35 drahn Exp $ */
-/* $NetBSD: float.h,v 1.3 2001/11/25 15:55:56 thorpej Exp $ */
-
-#include <arm/float.h>
diff --git a/sys/arch/zaurus/include/internal_types.h b/sys/arch/zaurus/include/internal_types.h
deleted file mode 100644
index 94d53be38e1..00000000000
--- a/sys/arch/zaurus/include/internal_types.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.2 2011/11/14 14:30:38 deraadt Exp $ */
-
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#include <arm/internal_types.h>
-#endif
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
index c390c4fd6d1..9a2140fa042 100644
--- a/sys/sys/limits.h
+++ b/sys/sys/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.8 2009/11/27 19:54:35 guenther Exp $ */
+/* $OpenBSD: limits.h,v 1.9 2012/06/26 16:12:42 deraadt Exp $ */
/*
* Copyright (c) 2002 Marc Espie.
*
@@ -30,18 +30,6 @@
/* Common definitions for limits.h. */
-/*
- * <machine/internal_types.h> is meant to describe a specific architecture,
- * but to be a safe include, that doesn't ever define anything that is
- * user-visible (only typedefs and #define names that stays in the __xxx
- * namespace).
- *
- * __machine_has_unsigned_chars (default is signed chars)
- * __FLT_xxx/__DBL_xxx non standard values for floating
- * points limits.
- */
-#include <machine/internal_types.h>
-
/* Legacy */
#include <machine/limits.h>
@@ -51,7 +39,7 @@
#define SCHAR_MIN (-0x7f-1) /* min value for a signed char */
#define UCHAR_MAX 0xff /* max value for an unsigned char */
-#ifdef __machine_has_unsigned_chars
+#ifdef __CHAR_UNSIGNED__
# define CHAR_MIN 0 /* min value for a char */
# define CHAR_MAX 0xff /* max value for a char */
#else
@@ -96,7 +84,6 @@
# define GID_MAX UINT_MAX /* max value for a gid_t */
#endif
-
#if __XPG_VISIBLE
# ifdef __LP64__
# define LONG_BIT 64
@@ -105,26 +92,28 @@
# endif
# define WORD_BIT 32
-/* float.h defines these as well */
-# if !defined(DBL_DIG)
-# if defined(__DBL_DIG)
-# define DBL_DIG __DBL_DIG
-# define DBL_MAX __DBL_MAX
-# define DBL_MIN __DBL_MIN
+# include <machine/_float.h>
+# ifndef FLT_DIG
# define FLT_DIG __FLT_DIG
+# endif
+# ifndef FLT_MAX
# define FLT_MAX __FLT_MAX
+# endif
+# ifndef DBL_DIG
+# define DBL_DIG __DBL_DIG
+# endif
+# ifndef DBL_MAX
+# define DBL_MAX __DBL_MAX
+# endif
+
+# ifndef FLT_MIN
# define FLT_MIN __FLT_MIN
-# else
-# define DBL_DIG 15
-# define DBL_MAX 1.7976931348623157E+308
-# define DBL_MIN 2.2250738585072014E-308
-
-# define FLT_DIG 6
-# define FLT_MAX 3.40282347E+38F
-# define FLT_MIN 1.17549435E-38F
-# endif
# endif
-#endif
+# ifndef DBL_MIN
+# define DBL_MIN __DBL_MIN
+# endif
+
+#endif /* __XPG_VISIBLE */
#endif