From 9cf6d077fb87b4364e70c9fd889bf26744718301 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 15 Mar 2006 11:29:24 +1100
Subject: [PATCH]    - stevesk@cvs.openbsd.org 2006/02/10 01:44:27     
 [includes.h monitor.c readpass.c scp.c serverloop.c session.c^?]      [sftp.c
 sshconnect.c sshconnect2.c sshd.c]      move #include <sys/wait.h> out of
 includes.h; ok markus@

---
 ChangeLog     | 6 +++++-
 includes.h    | 3 +--
 monitor.c     | 5 ++++-
 readpass.c    | 5 ++++-
 scp.c         | 5 ++++-
 serverloop.c  | 5 ++++-
 session.c     | 5 ++++-
 sftp.c        | 4 +++-
 sshconnect.c  | 5 ++++-
 sshconnect2.c | 4 +++-
 sshd.c        | 4 +++-
 11 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1582d97c7..b6ddb879d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,10 @@
      [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
      [ssh.c sshd.c sshpty.c]
      move #include <sys/ioctl.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/10 01:44:27
+     [includes.h monitor.c readpass.c scp.c serverloop.c session.c]
+     [sftp.c sshconnect.c sshconnect2.c sshd.c]
+     move #include <sys/wait.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3963,4 +3967,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4157 2006/03/15 00:28:34 djm Exp $
+$Id: ChangeLog,v 1.4158 2006/03/15 00:29:24 djm Exp $
diff --git a/includes.h b/includes.h
index 9cf7d30a2..1dbe16b78 100644
--- a/includes.h
+++ b/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>
@@ -92,7 +92,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/wait.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h> /* For timersub */
 #endif
diff --git a/monitor.c b/monitor.c
index 4ba78db9c..c21c0fab8 100644
--- a/monitor.c
+++ b/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/readpass.c b/readpass.c
index 9f74bec19..811cfa231 100644
--- a/readpass.c
+++ b/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>
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>
diff --git a/scp.c b/scp.c
index 0b65ff081..4521f6343 100644
--- a/scp.c
+++ b/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/serverloop.c b/serverloop.c
index 23f8831ef..11dcaf703 100644
--- a/serverloop.c
+++ b/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/session.c b/session.c
index 88e0a04d2..ecd6cf216 100644
--- a/session.c
+++ b/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/sftp.c b/sftp.c
index 0599e587a..4e170ee60 100644
--- a/sftp.c
+++ b/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>
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>
diff --git a/sshconnect.c b/sshconnect.c
index a71251ea0..dc74d75c4 100644
--- a/sshconnect.c
+++ b/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/sshconnect2.c b/sshconnect2.c
index ce64586d8..eb9a4d870 100644
--- a/sshconnect2.c
+++ b/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 "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 3bf489723..8a68a537b 100644
--- a/sshd.c
+++ b/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>