diff --git a/ChangeLog b/ChangeLog
index d26a81071..29ee4407d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,6 +132,9 @@
    - jmc@cvs.openbsd.org 2006/02/19 20:12:25
      [ssh_config.5]
      add some vertical space;
+   - stevesk@cvs.openbsd.org 2006/02/20 16:36:15
+     [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c]
+     move #include <sys/un.h> out of includes.h; ok djm@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4033,4 +4036,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.4177 2006/03/15 00:37:02 djm Exp $
+$Id: ChangeLog,v 1.4178 2006/03/15 00:40:10 djm Exp $
diff --git a/authfd.c b/authfd.c
index 8976616b4..06e6d4a4c 100644
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.66 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.67 2006/02/20 16:36:14 stevesk Exp $");
+
+#include <sys/types.h>
+#include <sys/un.h>
 
 #include <openssl/evp.h>
 
diff --git a/channels.c b/channels.c
index 3955b6158..7161b9413 100644
--- a/channels.c
+++ b/channels.c
@@ -39,9 +39,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.234 2006/02/10 00:27:13 stevesk Exp $");
+RCSID("$OpenBSD: channels.c,v 1.235 2006/02/20 16:36:14 stevesk Exp $");
 
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/un.h>
 
 #include <termios.h>
 
diff --git a/includes.h b/includes.h
index 1dbe16b78..ef4a269cc 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: includes.h,v 1.33 2006/02/10 01:44:26 stevesk Exp $	*/
+/*	$OpenBSD: includes.h,v 1.34 2006/02/20 16:36:14 stevesk Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -102,9 +102,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 # include <sys/bsdtty.h>
 #endif
 #include <sys/param.h> /* For MAXPATHLEN and roundup() */
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h> /* For sockaddr_un */
-#endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
diff --git a/session.c b/session.c
index ecd6cf216..969a7792a 100644
--- a/session.c
+++ b/session.c
@@ -33,10 +33,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.193 2006/02/10 01:44:27 stevesk Exp $");
+RCSID("$OpenBSD: session.c,v 1.194 2006/02/20 16:36:14 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/un.h>
 
 #include <paths.h>
 
diff --git a/ssh-agent.c b/ssh-agent.c
index 8821e0006..0ab232191 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -34,8 +34,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.127 2006/02/08 14:31:30 stevesk Exp $");
- 
+RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
 #include "openbsd-compat/sys-queue.h"
 #include <sys/resource.h>
 #ifdef HAVE_PATHS_H
diff --git a/ssh.c b/ssh.c
index 4a373356f..84246b5c4 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,10 +40,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.261 2006/02/12 06:45:34 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $");
 
 #include <sys/resource.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/un.h>
 
 #include <paths.h>