From 0b1ae8097d5753cc86391fd33f970ea49db54c03 Mon Sep 17 00:00:00 2001
From: Julian Elischer <julian@FreeBSD.org>
Date: Sun, 8 Jul 2001 04:56:07 +0000
Subject: [PATCH] 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 | 2 +-
 sys/alpha/alpha/db_interface.c  | 2 +-
 sys/amd64/amd64/amd64-gdbstub.c | 2 +-
 sys/amd64/amd64/db_interface.c  | 2 +-
 sys/ddb/db_command.c            | 2 +-
 sys/ddb/db_trap.c               | 3 ++-
 sys/i386/i386/db_interface.c    | 2 +-
 sys/i386/i386/i386-gdbstub.c    | 2 +-
 sys/ia64/ia64/db_interface.c    | 2 +-
 sys/ia64/ia64/ia64-gdbstub.c    | 2 +-
 sys/libkern/bsearch.c           | 5 +++--
 sys/libkern/quad.h              | 3 ++-
 sys/sys/systm.h                 | 3 +++
 13 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/sys/alpha/alpha/alpha-gdbstub.c b/sys/alpha/alpha/alpha-gdbstub.c
index 02efd280701..f011ed7d36a 100644
--- a/sys/alpha/alpha/alpha-gdbstub.c
+++ b/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"
 
diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index d37c6b89d08..6a566e3129b 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/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;
diff --git a/sys/amd64/amd64/amd64-gdbstub.c b/sys/amd64/amd64/amd64-gdbstub.c
index d045adc880c..2e6464d2cee 100644
--- a/sys/amd64/amd64/amd64-gdbstub.c
+++ b/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"
 
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 51fc8354cc3..a2e5018f6f2 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/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;
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 39378e9c7d0..64cad7eef26 100644
--- a/sys/ddb/db_command.c
+++ b/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
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 2111957ec45..4409007de68 100644
--- a/sys/ddb/db_trap.c
+++ b/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;
 
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 51fc8354cc3..a2e5018f6f2 100644
--- a/sys/i386/i386/db_interface.c
+++ b/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;
diff --git a/sys/i386/i386/i386-gdbstub.c b/sys/i386/i386/i386-gdbstub.c
index d045adc880c..2e6464d2cee 100644
--- a/sys/i386/i386/i386-gdbstub.c
+++ b/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"
 
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c
index 7069f606ea4..ead35f82e29 100644
--- a/sys/ia64/ia64/db_interface.c
+++ b/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;
diff --git a/sys/ia64/ia64/ia64-gdbstub.c b/sys/ia64/ia64/ia64-gdbstub.c
index ec4eb2983ef..11b9e9ba779 100644
--- a/sys/ia64/ia64/ia64-gdbstub.c
+++ b/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"
 
diff --git a/sys/libkern/bsearch.c b/sys/libkern/bsearch.c
index 5b34500ed88..6aceaa77395 100644
--- a/sys/libkern/bsearch.c
+++ b/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.
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 730f08f3091..82cf052533e 100644
--- a/sys/libkern/quad.h
+++ b/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
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index aa95807856f..1616776e769 100644
--- a/sys/sys/systm.h
+++ b/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));