diff --git a/ChangeLog b/ChangeLog
index a1c6df163..eaeab4897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,8 @@
    - stevesk@cvs.openbsd.org 2006/04/22 18:29:33
      [crc32.c]
      remove extra spaces
+ - (djm) [auth.h dispatch.h kex.h] sprinkle in signal.h to get
+   sig_atomic_t
 
 20060421
  - (djm) [Makefile.in configure.ac session.c sshpty.c]
@@ -4580,4 +4582,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.4316 2006/04/23 02:12:24 djm Exp $
+$Id: ChangeLog,v 1.4317 2006/04/23 02:28:53 djm Exp $
diff --git a/auth.h b/auth.h
index adbfdd2e5..5f9fb6f10 100644
--- a/auth.h
+++ b/auth.h
@@ -28,6 +28,8 @@
 #ifndef AUTH_H
 #define AUTH_H
 
+#include <signal.h>
+
 #include "key.h"
 #include "hostfile.h"
 #include "buffer.h"
diff --git a/dispatch.h b/dispatch.h
index 4bca8a5a0..3e3d1a1ad 100644
--- a/dispatch.h
+++ b/dispatch.h
@@ -23,6 +23,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <signal.h>
+
 enum {
 	DISPATCH_BLOCK,
 	DISPATCH_NONBLOCK
diff --git a/kex.h b/kex.h
index 137c3d8eb..a4a8af33e 100644
--- a/kex.h
+++ b/kex.h
@@ -26,6 +26,7 @@
 #ifndef KEX_H
 #define KEX_H
 
+#include <signal.h>
 #include <openssl/evp.h>
 #include "buffer.h"
 #include "cipher.h"