diff --git a/ChangeLog b/ChangeLog
index 9c923a6..70f96ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,11 @@
      [channels.c includes.h]
      move #include <arpa/inet.h> out of includes.h; old ok djm@
      (portable needed session.c too)
+   - stevesk@cvs.openbsd.org 2006/07/05 02:42:09
+     [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
+     [serverloop.c sshconnect.c uuencode.c]
+     move #include <netinet/in.h> out of includes.h; ok deraadt@
+     (also ssh-rand-helper.c logintest.c loginrec.c)
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4763,4 +4768,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.4367 2006/07/10 10:26:27 djm Exp $
+$Id: ChangeLog,v 1.4368 2006/07/10 10:35:38 djm Exp $
diff --git a/canohost.c b/canohost.c
index 34b751a..787d338 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.53 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.54 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,10 @@
 
 #include "includes.h"
 
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <ctype.h>
 
 #include "packet.h"
diff --git a/hostfile.c b/hostfile.c
index 39ff197..a6714b6 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.40 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.41 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,6 +38,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#include <netinet/in.h>
+
 #include <resolv.h>
 
 #include <openssl/hmac.h>
diff --git a/includes.h b/includes.h
index c3f0671..51b6a0b 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.43 2006/07/03 17:59:32 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.44 2006/07/05 02:42:09 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -129,7 +129,6 @@
 #include <sys/ptms.h>	/* for grantpt() and friends */
 #endif
 
-#include <netinet/in.h>
 #include <netinet/in_systm.h> /* For typedefs */
 #if defined(HAVE_NETDB_H)
 # include <netdb.h>
diff --git a/loginrec.c b/loginrec.c
index c2498e1..76ddc20 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -149,6 +149,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/logintest.c b/logintest.c
index 1159274..7e9fbbf 100644
--- a/logintest.c
+++ b/logintest.c
@@ -31,6 +31,10 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/misc.c b/misc.c
index 158d487..63c7ddf 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.52 2006/03/30 09:58:15 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.53 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -27,7 +27,11 @@
 #include "includes.h"
 
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 #include <netinet/tcp.h>
+
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
diff --git a/packet.c b/packet.c
index bc0baf3..ba28437 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.131 2006/03/30 09:58:16 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.132 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -40,6 +40,10 @@
 #include "includes.h"
  
 #include "openbsd-compat/sys-queue.h"
+#include <sys/socket.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 #include "xmalloc.h"
diff --git a/readconf.c b/readconf.c
index 87e41e0..df5e566 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.151 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.152 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,6 +16,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <ctype.h>
 
diff --git a/serverloop.c b/serverloop.c
index 18f1a10..a083267 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.135 2006/03/25 18:30:55 deraadt Exp $ */
+/* $OpenBSD: serverloop.c,v 1.136 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,6 +39,9 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <signal.h>
 #include <termios.h>
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 605de72..d8da7d3 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -28,6 +28,9 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #ifdef HAVE_SYS_UN_H
 # include <sys/un.h>
diff --git a/sshconnect.c b/sshconnect.c
index 776460f..7f9c09b 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.186 2006/07/03 08:54:20 stevesk Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.187 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,9 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <ctype.h>
 #ifdef HAVE_PATHS_H
diff --git a/uuencode.c b/uuencode.c
index 398aeef..b8dcaea 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.21 2006/03/26 01:31:48 deraadt Exp $ */
+/* $OpenBSD: uuencode.c,v 1.22 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,6 +25,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#include <netinet/in.h>
+
 #include "xmalloc.h"
 #include "uuencode.h"