move #include <sys/wait.h> out of includes.h; ok markus@

10 files changed, 34 insertions, 11 deletions

diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h
index bbbb4d596f0..17fc9f9f9e9 100644
--- a/usr.bin/ssh/includes.h
+++ b/usr.bin/ssh/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.32 2006/02/10 00:27:13 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.33 2006/02/10 01:44:26 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,7 +23,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/un.h>
 
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index 7dfda3e2370..af8e71835f5 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -25,7 +25,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.66 2006/02/08 13:15:44 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.67 2006/02/10 01:44:26 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <paths.h>
 
diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c
index 60f22c07856..8d4c571557e 100644
--- a/usr.bin/ssh/readpass.c
+++ b/usr.bin/ssh/readpass.c
@@ -23,7 +23,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.34 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.35 2006/02/10 01:44:26 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <paths.h>
 #include <readpassphrase.h>
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 43244780a1f..1a816dabcb9 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -71,7 +71,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.131 2006/02/08 23:51:24 stevesk Exp $");
+RCSID("$OpenBSD: scp.c,v 1.132 2006/02/10 01:44:26 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <dirent.h>
 
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 0fe92b56160..30a1896748a 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -35,7 +35,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.125 2006/02/07 01:42:00 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.126 2006/02/10 01:44:26 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <termios.h>
 
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index 081a23d1e6a..21518a77c63 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -33,7 +33,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.192 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: session.c,v 1.193 2006/02/10 01:44:27 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <paths.h>
 
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index 38e170fbf65..05bb5e23608 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -15,9 +15,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.72 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $");
 
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <glob.h>
 #include <histedit.h>
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 4421ced3693..8df68948e20 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -13,7 +13,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.173 2006/02/08 14:16:59 stevesk Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.174 2006/02/10 01:44:27 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <paths.h>
 
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index 938b9bd5695..85f33e4db2a 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -23,8 +23,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.144 2006/02/07 01:18:09 stevesk Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.145 2006/02/10 01:44:27 stevesk Exp $");
 
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/queue.h>
 
 #include "ssh.h"
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index d1cc5387093..78fe3a3c833 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -42,9 +42,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.320 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.321 2006/02/10 01:44:27 stevesk Exp $");
 
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <paths.h>