42 files changed, 35 insertions, 82 deletions

diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index ba56bcee7714..6ef313641296 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -39,7 +39,7 @@
  */
 
 #include <sys/syscall.h>
-#include "DEFS.h"
+#include <machine/asm.h>
 
 #define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(__sys_,x));			\
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 2dde8d66afee..03a594c9c1fa 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -49,7 +49,7 @@
  * The previous signal state is NOT restored.
  */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(_setjmp)
 	movl	4(%esp),%eax
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index aec3d26356d0..ed8503629b2b 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -49,7 +49,6 @@
  * The previous signal state is restored.
  */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 ENTRY(setjmp)
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 2c71cb0d215f..6fd13056d8a9 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -39,7 +39,6 @@
 	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 /*-
diff --git a/lib/libc/amd64/net/htonl.S b/lib/libc/amd64/net/htonl.S
index 551a26239e86..af3354f54795 100644
--- a/lib/libc/amd64/net/htonl.S
+++ b/lib/libc/amd64/net/htonl.S
@@ -41,7 +41,7 @@
 
 /* netorder = htonl(hostorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(htonl)
 	movl	4(%esp),%eax
diff --git a/lib/libc/amd64/net/htons.S b/lib/libc/amd64/net/htons.S
index 8f21d4225ac6..c78b1088b42a 100644
--- a/lib/libc/amd64/net/htons.S
+++ b/lib/libc/amd64/net/htons.S
@@ -41,7 +41,7 @@
 
 /* netorder = htons(hostorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(htons)
 	movzwl	4(%esp),%eax
diff --git a/lib/libc/amd64/net/ntohl.S b/lib/libc/amd64/net/ntohl.S
index 13328a9e7311..3a2c2025c84d 100644
--- a/lib/libc/amd64/net/ntohl.S
+++ b/lib/libc/amd64/net/ntohl.S
@@ -41,7 +41,7 @@
 
 /* hostorder = ntohl(netorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(ntohl)
 	movl	4(%esp),%eax
diff --git a/lib/libc/amd64/net/ntohs.S b/lib/libc/amd64/net/ntohs.S
index 70a42d706156..110faf7b6d77 100644
--- a/lib/libc/amd64/net/ntohs.S
+++ b/lib/libc/amd64/net/ntohs.S
@@ -41,7 +41,7 @@
 
 /* hostorder = ntohs(netorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(ntohs)
 	movzwl	4(%esp),%eax
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index ed2f1522c896..c69ef0f74281 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -39,7 +39,6 @@
 	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 /*
diff --git a/lib/libc/i386/DEFS.h b/lib/libc/i386/DEFS.h
deleted file mode 100644
index edf08ea12379..000000000000
--- a/lib/libc/i386/DEFS.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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.
- *
- *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- *
- * $FreeBSD$
- */
-
-#include <machine/asm.h>
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index ba56bcee7714..6ef313641296 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -39,7 +39,7 @@
  */
 
 #include <sys/syscall.h>
-#include "DEFS.h"
+#include <machine/asm.h>
 
 #define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
 			ENTRY(__CONCAT(__sys_,x));			\
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 2dde8d66afee..03a594c9c1fa 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -49,7 +49,7 @@
  * The previous signal state is NOT restored.
  */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(_setjmp)
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
index 2913c1cdbb7c..279f159917b8 100644
--- a/lib/libc/i386/gen/alloca.S
+++ b/lib/libc/i386/gen/alloca.S
@@ -41,7 +41,7 @@
 
 /* like alloc, but automatic automatic free in return */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(alloca)
 	popl	%edx		/*  pop return addr */
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
index 28800cb4fbe3..85fff0085bab 100644
--- a/lib/libc/i386/gen/fabs.S
+++ b/lib/libc/i386/gen/fabs.S
@@ -39,7 +39,7 @@
 	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(fabs)
 	fldl	4(%esp)
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
index 8b48783a3791..41bdc45c019e 100644
--- a/lib/libc/i386/gen/modf.S
+++ b/lib/libc/i386/gen/modf.S
@@ -49,7 +49,7 @@
 
 /* With CHOP mode on, frndint behaves as TRUNC does.  Useful. */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(modf)
 	pushl %ebp
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index aec3d26356d0..ed8503629b2b 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -49,7 +49,6 @@
  * The previous signal state is restored.
  */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 ENTRY(setjmp)
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 2c71cb0d215f..6fd13056d8a9 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -39,7 +39,6 @@
 	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 /*-
diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S
index 551a26239e86..af3354f54795 100644
--- a/lib/libc/i386/net/htonl.S
+++ b/lib/libc/i386/net/htonl.S
@@ -41,7 +41,7 @@
 
 /* netorder = htonl(hostorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(htonl)
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
index 8f21d4225ac6..c78b1088b42a 100644
--- a/lib/libc/i386/net/htons.S
+++ b/lib/libc/i386/net/htons.S
@@ -41,7 +41,7 @@
 
 /* netorder = htons(hostorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(htons)
 	movzwl	4(%esp),%eax
diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S
index 13328a9e7311..3a2c2025c84d 100644
--- a/lib/libc/i386/net/ntohl.S
+++ b/lib/libc/i386/net/ntohl.S
@@ -41,7 +41,7 @@
 
 /* hostorder = ntohl(netorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(ntohl)
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
index 70a42d706156..110faf7b6d77 100644
--- a/lib/libc/i386/net/ntohs.S
+++ b/lib/libc/i386/net/ntohs.S
@@ -41,7 +41,7 @@
 
 /* hostorder = ntohs(netorder) */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(ntohs)
 	movzwl	4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S
index 2cdb64cb3da3..fb2181906af7 100644
--- a/lib/libc/i386/stdlib/abs.S
+++ b/lib/libc/i386/stdlib/abs.S
@@ -39,7 +39,7 @@
 	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(abs)
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
index 8958ec0b47db..efe973b036ca 100644
--- a/lib/libc/i386/stdlib/div.S
+++ b/lib/libc/i386/stdlib/div.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(div)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
index dfbad4db6459..ffcb22a1b01d 100644
--- a/lib/libc/i386/stdlib/labs.S
+++ b/lib/libc/i386/stdlib/labs.S
@@ -39,7 +39,7 @@
 	.asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(labs)
 	movl	4(%esp),%eax
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
index ffbb547bcca0..70b1b3e525af 100644
--- a/lib/libc/i386/stdlib/ldiv.S
+++ b/lib/libc/i386/stdlib/ldiv.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 ENTRY(ldiv)
         movl    4(%esp),%eax
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
index 44af489382f0..1334ff1edd37 100644
--- a/lib/libc/i386/string/bcmp.S
+++ b/lib/libc/i386/string/bcmp.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * bcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
index 17bbbc85e596..823ed1a69efc 100644
--- a/lib/libc/i386/string/bzero.S
+++ b/lib/libc/i386/string/bzero.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * bzero (void *b, size_t len)
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
index f73539e4ca39..e2e6cba1fd86 100644
--- a/lib/libc/i386/string/ffs.S
+++ b/lib/libc/i386/string/ffs.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * ffs(value)
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
index b279a7fd10a2..c36e55a0a8e4 100644
--- a/lib/libc/i386/string/index.S
+++ b/lib/libc/i386/string/index.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * index(s, c)
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 9c7ce14c1b1b..bbd03d1e40d6 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * memchr (b, c, len)
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
index 9598750c0ba7..3a7d0f8e290f 100644
--- a/lib/libc/i386/string/memcmp.S
+++ b/lib/libc/i386/string/memcmp.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * memcmp (void *b1, void *b2, size_t len)
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
index fd6cfbe4df25..2dcba4302a69 100644
--- a/lib/libc/i386/string/memset.S
+++ b/lib/libc/i386/string/memset.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * memset(void *b, int c, size_t len)
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
index ef65de1a7658..c364ee2d471e 100644
--- a/lib/libc/i386/string/rindex.S
+++ b/lib/libc/i386/string/rindex.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * rindex(s, c)
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
index 093fe4cb8efc..d05a308fa0e4 100644
--- a/lib/libc/i386/string/strcat.S
+++ b/lib/libc/i386/string/strcat.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strcat(s, append)
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index ab899c97cf63..682866b7a5b0 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strchr(s, c)
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
index 31d2dc22eb2e..7631e4103839 100644
--- a/lib/libc/i386/string/strcmp.S
+++ b/lib/libc/i386/string/strcmp.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strcmp(s1, s2)
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
index c71de9bf659a..c1dd0925d775 100644
--- a/lib/libc/i386/string/strcpy.S
+++ b/lib/libc/i386/string/strcpy.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strcpy (dst, src)
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
index 5081db5239cc..44fbdadcd833 100644
--- a/lib/libc/i386/string/strlen.S
+++ b/lib/libc/i386/string/strlen.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strlen (s)
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
index 76dd272c076e..da075b9a762f 100644
--- a/lib/libc/i386/string/strncmp.S
+++ b/lib/libc/i386/string/strncmp.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strncmp(s1, s2, n)
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 39576e928030..bef84d0d7a96 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -33,7 +33,7 @@
         .asciz "$FreeBSD$"
 #endif /* LIBC_RCS and not lint */
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * strrchr(s, c)
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
index dee53fed0de0..ce2aff158586 100644
--- a/lib/libc/i386/string/swab.S
+++ b/lib/libc/i386/string/swab.S
@@ -33,7 +33,7 @@
 	.asciz "$FreeBSD$"
 #endif
 
-#include "DEFS.h"
+#include <machine/asm.h>
 
 /*
  * void
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index ed2f1522c896..c69ef0f74281 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -39,7 +39,6 @@
 	.asciz "$FreeBSD$"
 #endif /* SYSLIBC_RCS and not lint */
 
-#include "DEFS.h"
 #include "SYS.h"
 
 /*