move #include <signal.h> out of includes.h; ok markus@

11 files changed, 22 insertions, 12 deletions

diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 52f3bd5b55c..61b49f6cd8b 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -59,11 +59,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.152 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.153 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/ioctl.h>
 
 #include <paths.h>
+#include <signal.h>
 #include <termios.h>
 
 #include "ssh.h"
diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h
index 606e6c7c8fe..1c6605426d6 100644
--- a/usr.bin/ssh/includes.h
+++ b/usr.bin/ssh/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.34 2006/02/20 16:36:14 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.35 2006/02/20 17:02:44 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -34,7 +34,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c
index af8e71835f5..9aaacb783f7 100644
--- a/usr.bin/ssh/monitor.c
+++ b/usr.bin/ssh/monitor.c
@@ -25,12 +25,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.67 2006/02/10 01:44:26 stevesk Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.68 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/usr.bin/ssh/progressmeter.c b/usr.bin/ssh/progressmeter.c
index 8f891e0ec79..cf0a9c0c109 100644
--- a/usr.bin/ssh/progressmeter.c
+++ b/usr.bin/ssh/progressmeter.c
@@ -23,10 +23,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.25 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.26 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/ioctl.h>
 
+#include <signal.h>
+
 #include "progressmeter.h"
 #include "atomicio.h"
 
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 1a816dabcb9..48c721faa6f 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -71,12 +71,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.132 2006/02/10 01:44:26 stevesk Exp $");
+RCSID("$OpenBSD: scp.c,v 1.133 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <dirent.h>
+#include <signal.h>
 
 #include "xmalloc.h"
 #include "atomicio.h"
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 30a1896748a..8aa447fac1c 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -35,11 +35,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.126 2006/02/10 01:44:26 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.127 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include <signal.h>
 #include <termios.h>
 
 #include "xmalloc.h"
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index 5960ade56f3..da5d40f5e80 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -33,13 +33,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.194 2006/02/20 16:36:14 stevesk Exp $");
+RCSID("$OpenBSD: session.c,v 1.195 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index 05bb5e23608..1bd4866548c 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.74 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -24,6 +24,7 @@ RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $");
 #include <glob.h>
 #include <histedit.h>
 #include <paths.h>
+#include <signal.h>
 
 #include "buffer.h"
 #include "xmalloc.h"
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 9812894b331..375e237a716 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -34,7 +34,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.129 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/queue.h>
 #include <sys/resource.h>
@@ -42,6 +42,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
 #include <sys/un.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index bb1be477310..57616e43acb 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.263 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/resource.h>
 #include <sys/ioctl.h>
@@ -48,6 +48,7 @@ RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $");
 #include <sys/un.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 78fe3a3c833..bbb2c5edee0 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -42,13 +42,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.321 2006/02/10 01:44:27 stevesk Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.322 2006/02/20 17:02:44 stevesk Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <paths.h>
+#include <signal.h>
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>