another round of missing system includes

ok tedu@

15 files changed, 50 insertions, 32 deletions

diff --git a/usr.bin/less/screen.c b/usr.bin/less/screen.c
index 784c1f44dcd..33851e506fd 100644
--- a/usr.bin/less/screen.c
+++ b/usr.bin/less/screen.c
@@ -40,7 +40,7 @@ extern int fd0;
 
 #if HAVE_TERMIOS_H && HAVE_TERMIOS_FUNCS
 #include <termios.h>
-#if HAVE_SYS_IOCTL_H && !defined(TIOCGWINSZ)
+#if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 #else
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index ba3f52de454..4ef6c483473 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcmd2.c,v 1.8 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: lcmd2.c,v 1.9 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)lcmd2.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.9 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,6 +49,7 @@ static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.8 2003/06/03 02:56:23 millert Exp $
 #include "alias.h"
 #include <sys/types.h>
 #include <sys/resource.h>
+#include <stdio.h>
 #include <string.h>
 
 /*ARGSUSED*/
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index dada6b02a41..40d89149822 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scanner.c,v 1.5 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: scanner.c,v 1.6 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: scanner.c,v 1.3 1995/09/28 10:34:36 tls Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)scanner.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: scanner.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: scanner.c,v 1.6 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
@@ -45,6 +45,7 @@ static char rcsid[] = "$OpenBSD: scanner.c,v 1.5 2003/06/03 02:56:23 millert Exp
 #include "token.h"
 #include "context.h"
 #include "string.h"
+#include <stdlib.h>
 
 s_getc()
 {
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index bf30b4e1f0d..7f08a95a0b9 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: string.c,v 1.7 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: string.c,v 1.8 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: string.c,v 1.5 1995/09/29 00:44:06 cgd Exp $	*/
 
 /*
@@ -37,11 +37,12 @@
 #if 0
 static char sccsid[] = "@(#)string.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: string.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: string.c,v 1.8 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "string.h"
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index addf62810a1..8e9edc8dc69 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tttermcap.c,v 1.5 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: tttermcap.c,v 1.6 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: tttermcap.c,v 1.3 1995/09/28 10:34:52 tls Exp $	*/
 
 /*
@@ -37,11 +37,14 @@
 #if 0
 static char sccsid[] = "@(#)tttermcap.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.6 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "tt.h"
+#include <curses.h>
+#include <term.h>
+#include <string.h>
 
 char *tgetstr();
 char *tgoto();
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 8a36c56de05..16e49ad1e4f 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwdump.c,v 1.6 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwdump.c,v 1.7 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwdump.c,v 1.5 1995/09/29 00:44:09 cgd Exp $	*/
 
 /*
@@ -37,12 +37,13 @@
 #if 0
 static char sccsid[] = "@(#)wwdump.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwdump.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwdump.c,v 1.7 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include "tt.h"
+#include <stdio.h>
 #include <string.h>
 
 static char cmap[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index 491a5077a9a..9dfad295dfa 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwend.c,v 1.5 2003/07/10 00:06:52 david Exp $	*/
+/*	$OpenBSD: wwend.c,v 1.6 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwend.c,v 1.3 1995/09/28 10:35:26 tls Exp $	*/
 
 /*
@@ -37,11 +37,12 @@
 #if 0
 static char sccsid[] = "@(#)wwend.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwend.c,v 1.5 2003/07/10 00:06:52 david Exp $";
+static char rcsid[] = "$OpenBSD: wwend.c,v 1.6 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "ww.h"
 #include "tt.h"
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 978b25072d4..495db60acd3 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwenviron.c,v 1.9 2003/07/10 00:06:52 david Exp $	*/
+/*	$OpenBSD: wwenviron.c,v 1.10 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwenviron.c,v 1.4 1995/12/21 08:39:50 mycroft Exp $	*/
 
 /*
@@ -37,17 +37,20 @@
 #if 0
 static char sccsid[] = "@(#)wwenviron.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.9 2003/07/10 00:06:52 david Exp $";
+static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.10 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
-#if !defined(OLD_TTY) && !defined(TIOCSCTTY) && !defined(TIOCNOTTY)
+#if !defined(OLD_TTY)
 #include <sys/ioctl.h>
 #endif
 #include <sys/signal.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 /*
  * Set up the environment of this process to run in window 'wp'.
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index db4a040ad6a..2501b0ef5e7 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwflush.c,v 1.7 2003/07/10 00:06:52 david Exp $	*/
+/*	$OpenBSD: wwflush.c,v 1.8 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwflush.c,v 1.5 1995/12/21 10:46:08 mycroft Exp $	*/
 
 /*
@@ -37,13 +37,14 @@
 #if 0
 static char sccsid[] = "@(#)wwflush.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwflush.c,v 1.7 2003/07/10 00:06:52 david Exp $";
+static char rcsid[] = "$OpenBSD: wwflush.c,v 1.8 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include "tt.h"
 #include <sys/signal.h>
+#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index a35a7a9fe84..4ab5ab6f987 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwinit.c,v 1.15 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwinit.c,v 1.16 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)wwinit.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: wwinit.c,v 1.15 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwinit.c,v 1.16 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
@@ -46,6 +46,7 @@ static char rcsid[] = "$OpenBSD: wwinit.c,v 1.15 2003/06/03 02:56:23 millert Exp
 #include "tt.h"
 #include <sys/signal.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <string.h>
 #include "char.h"
 
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 88c509b8275..7b05e5e9378 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwprintf.c,v 1.6 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwprintf.c,v 1.7 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwprintf.c,v 1.3 1995/09/28 10:35:44 tls Exp $	*/
 
 /*
@@ -37,12 +37,13 @@
 #if 0
 static char sccsid[] = "@(#)wwprintf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.7 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include <stdarg.h>
+#include <stdio.h>
 
 wwprintf(struct ww *w, char *fmt, ...)
 {
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index 0fe64177d61..1e97ac94244 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwpty.c,v 1.7 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwpty.c,v 1.8 2003/08/01 22:01:37 david Exp $	*/
 /*	$NetBSD: wwpty.c,v 1.3 1995/09/28 10:35:45 tls Exp $	*/
 
 /*
@@ -37,14 +37,15 @@
 #if 0
 static char sccsid[] = "@(#)wwpty.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwpty.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwpty.c,v 1.8 2003/08/01 22:01:37 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include <string.h>
+#include <unistd.h>
 #include <fcntl.h>
-#if !defined(OLD_TTY) && !defined(TIOCPKT)
+#if !defined(OLD_TTY)
 #include <sys/ioctl.h>
 #endif
 
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index f63fff071d1..c5600347c2d 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwrint.c,v 1.6 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwrint.c,v 1.7 2003/08/01 22:01:38 david Exp $	*/
 /*	$NetBSD: wwrint.c,v 1.4 1995/12/21 10:46:24 mycroft Exp $	*/
 
 /*
@@ -37,12 +37,14 @@
 #if 0
 static char sccsid[] = "@(#)wwrint.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwrint.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwrint.c,v 1.7 2003/08/01 22:01:38 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include "tt.h"
+#include <sys/types.h>
+#include <unistd.h>
 
 /*
  * Tty input interrupt handler.
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index a57da5ee0cd..afdc6f73bfc 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwspawn.c,v 1.9 2003/07/10 00:06:52 david Exp $	*/
+/*	$OpenBSD: wwspawn.c,v 1.10 2003/08/01 22:01:38 david Exp $	*/
 /*	$NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $	*/
 
 /*
@@ -37,12 +37,13 @@
 #if 0
 static char sccsid[] = "@(#)wwspawn.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.9 2003/07/10 00:06:52 david Exp $";
+static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.10 2003/08/01 22:01:38 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include <sys/signal.h>
+#include <signal.h>
 #include <unistd.h>
 
 /*
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index 9b64cfae592..0ad3b6722c2 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wwtty.c,v 1.6 2003/06/03 02:56:23 millert Exp $	*/
+/*	$OpenBSD: wwtty.c,v 1.7 2003/08/01 22:01:38 david Exp $	*/
 /*	$NetBSD: wwtty.c,v 1.4 1995/12/21 11:06:50 mycroft Exp $	*/
 
 /*
@@ -37,14 +37,14 @@
 #if 0
 static char sccsid[] = "@(#)wwtty.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: wwtty.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: wwtty.c,v 1.7 2003/08/01 22:01:38 david Exp $";
 #endif
 #endif /* not lint */
 
 #include "ww.h"
 #include <sys/types.h>
 #include <fcntl.h>
-#if !defined(OLD_TTY) && !defined(TIOCGWINSZ)
+#if !defined(OLD_TTY)
 #include <sys/ioctl.h>
 #endif