A set of changes to reduce the number of include files the kernel

takes from /usr/include. I cannot check them on alpha.. (will try beast)

Briefly looked at by: Warner Losh <imp@harmony.village.org>

sys/alpha/alpha/alpha-gdbstub.c

@@ -104,7 +104,7 @@
 
 #include <ddb/ddb.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 #include "opt_ddb.h"
 

sys/alpha/alpha/db_interface.c

@@ -76,7 +76,7 @@
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_variables.h>
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;

sys/amd64/amd64/amd64-gdbstub.c

@@ -100,7 +100,7 @@
 
 #include <ddb/ddb.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 #include "opt_ddb.h"
 

sys/amd64/amd64/db_interface.c

@@ -53,7 +53,7 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_variables.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;

sys/ddb/db_command.c

@@ -45,7 +45,7 @@
 #include <ddb/db_lex.h>
 #include <ddb/db_output.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 /*
  * Exported global variables

sys/ddb/db_trap.c

@@ -35,11 +35,12 @@
  * Trap entry point to kernel debugger.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_command.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 extern jmp_buf	db_jmpbuf;
 

sys/i386/i386/db_interface.c

@@ -53,7 +53,7 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_variables.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;

sys/i386/i386/i386-gdbstub.c

@@ -100,7 +100,7 @@
 
 #include <ddb/ddb.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 #include "opt_ddb.h"
 

sys/ia64/ia64/db_interface.c

@@ -60,7 +60,7 @@
 #include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_variables.h>
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 static jmp_buf *db_nofault = 0;
 extern jmp_buf	db_jmpbuf;

sys/ia64/ia64/ia64-gdbstub.c

@@ -103,7 +103,7 @@
 
 #include <ddb/ddb.h>
 
-#include <setjmp.h>
+#include <machine/setjmp.h>
 
 #include "opt_ddb.h"
 

sys/libkern/bsearch.c

@@ -37,8 +37,9 @@
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <sys/param.h>
+#include <machine/ansi.h>
+#include <sys/libkern.h>
 
 /*
  * Perform a binary search.

sys/libkern/quad.h

@@ -56,7 +56,8 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <limits.h>
+#include <sys/syslimits.h>
+#include <machine/limits.h>
 
 /*
  * Depending on the desired operation, we view a `long long' (aka quad_t) in

sys/sys/systm.h

@@ -89,7 +89,10 @@ struct timeval;
 struct tty;
 struct ucred;
 struct uio;
+struct _jmp_buf;
 
+int     setjmp __P((struct _jmp_buf *));
+void    longjmp __P((struct _jmp_buf *, int)) __dead2;
 void	Debugger __P((const char *msg));
 int	dumpstatus __P((vm_offset_t addr, long count));
 int	nullop __P((void));