diff --git a/ChangeLog b/ChangeLog
index 000c578..7f76794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,10 @@
      [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]
      [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]
      move #include <string.h> out of includes.h
+   - stevesk@cvs.openbsd.org 2006/07/23 01:11:05
+     [auth.h dispatch.c kex.h sftp-client.c]
+     #include <signal.h> for sig_atomic_t; need this prior to <sys/param.h>
+     move
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -5013,4 +5017,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.4428 2006/07/24 04:13:33 djm Exp $
+$Id: ChangeLog,v 1.4429 2006/07/24 04:14:19 djm Exp $
diff --git a/auth.h b/auth.h
index 6688c3d..6525013 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: auth.h,v 1.55 2006/07/23 01:11:05 stevesk Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -32,6 +32,7 @@
 
 #include <signal.h>
 #include <pwd.h>
+#include <signal.h>
 
 #include "buffer.h"
 #include <openssl/rsa.h>
diff --git a/dispatch.c b/dispatch.c
index 4f965a6..c1d98a7 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.19 2006/04/20 09:27:09 djm Exp $ */
+/* $OpenBSD: dispatch.c,v 1.20 2006/07/23 01:11:05 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,6 +24,8 @@
  */
 #include "includes.h"
 
+#include <signal.h>
+
 #include "ssh1.h"
 #include "ssh2.h"
 #include "log.h"
diff --git a/kex.h b/kex.h
index a4a8af3..a48c5c8 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.42 2006/04/20 09:27:09 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.43 2006/07/23 01:11:05 stevesk Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -28,6 +28,9 @@
 
 #include <signal.h>
 #include <openssl/evp.h>
+
+#include <signal.h>
+
 #include "buffer.h"
 #include "cipher.h"
 #include "key.h"
diff --git a/sftp-client.c b/sftp-client.c
index 84dae58..9e7011f 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.70 2006/07/23 01:11:05 stevesk Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *