diff --git a/ChangeLog b/ChangeLog
index ad47d1996..b4dbb2b28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
      [auth-options.c canohost.c channels.c includes.h readconf.c]
      [servconf.c ssh-keyscan.c ssh.c sshconnect.c sshd.c]
      move #include <netdb.h> out of includes.h; ok djm@
+   - stevesk@cvs.openbsd.org 2006/07/12 22:42:32
+     [includes.h ssh.c ssh-rand-helper.c]
+     move #include <stddef.h> out of includes.h
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4927,4 +4930,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.4410 2006/07/24 03:52:06 djm Exp $
+$Id: ChangeLog,v 1.4411 2006/07/24 03:53:19 djm Exp $
diff --git a/includes.h b/includes.h
index 7a3396c16..fbd22e9a1 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.50 2006/07/12 22:28:51 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.51 2006/07/12 22:42:32 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <stddef.h>
 
 #ifdef HAVE_LIMITS_H
 # include <limits.h> /* For PATH_MAX */
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 3a2903669..fb6fc2814 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <stddef.h>
 
 #include <netinet/in.h>
 
diff --git a/ssh.c b/ssh.c
index 701c40543..461b39817 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.286 2006/07/12 22:28:52 stevesk Exp $ */
+/* $OpenBSD: ssh.c,v 1.287 2006/07/12 22:42:32 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -62,6 +62,7 @@
 #endif
 #include <pwd.h>
 #include <signal.h>
+#include <stddef.h>
 
 #include <openssl/evp.h>
 #include <openssl/err.h>