diff --git a/ChangeLog b/ChangeLog
index 4f75fe5b1..16c419c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
       - new sentence, new line
       - s/The the/The/
       - kill a bad comma
+   - stevesk@cvs.openbsd.org 2006/07/12 22:28:52
+     [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@
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4923,4 +4926,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.4408 2006/07/24 03:46:50 djm Exp $
+$Id: ChangeLog,v 1.4409 2006/07/24 03:51:51 djm Exp $
diff --git a/auth-options.c b/auth-options.c
index 473fb8bf7..0b11151cf 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.36 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: auth-options.c,v 1.37 2006/07/12 22:28:51 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,9 @@
 
 #include <sys/types.h>
 
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #include <pwd.h>
 
 #include "xmalloc.h"
diff --git a/canohost.c b/canohost.c
index 4566e2ab1..da5131de3 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.56 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: canohost.c,v 1.57 2006/07/12 22:28:51 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -21,6 +21,9 @@
 
 #include <ctype.h>
 #include <errno.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 
 #include "packet.h"
 #include "xmalloc.h"
diff --git a/channels.c b/channels.c
index 555067255..2021bad53 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.254 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: channels.c,v 1.255 2006/07/12 22:28:51 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -50,6 +50,9 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #include <termios.h>
 
 #include "ssh.h"
diff --git a/dns.c b/dns.c
index 504b5d72e..16954a6a1 100644
--- a/dns.c
+++ b/dns.c
@@ -30,7 +30,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netdb.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 
 #include "xmalloc.h"
 #include "key.h"
diff --git a/includes.h b/includes.h
index 08d34486b..7a3396c16 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.49 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.50 2006/07/12 22:28:51 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -123,9 +123,6 @@
 #endif
 
 #include <netinet/in_systm.h> /* For typedefs */
-#if defined(HAVE_NETDB_H)
-# include <netdb.h>
-#endif
 #ifdef HAVE_RPC_TYPES_H
 # include <rpc/types.h> /* For INADDR_LOOPBACK */
 #endif
diff --git a/logintest.c b/logintest.c
index 7e9fbbfbb..0de928bec 100644
--- a/logintest.c
+++ b/logintest.c
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <pwd.h>
-#include <netdb.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index cbcf7f727..5c2ce5b1b 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,4 +1,4 @@
-/* $Id: fake-rfc2553.h,v 1.12 2005/08/03 05:36:21 dtucker Exp $ */
+/* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */
 
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
@@ -41,7 +41,10 @@
 #define _FAKE_RFC2553_H
 
 #include "includes.h"
-#include "sys/types.h"
+#include <sys/types.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 
 /*
  * First, socket and INET6 related definitions 
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 33be00c2b..6fd593aad 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -34,6 +34,9 @@
 #ifdef _AIX
 
 #include <errno.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #include <uinfo.h>
 #include <sys/socket.h>
 #include "port-aix.h"
diff --git a/readconf.c b/readconf.c
index d2e172303..4f790e246 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.154 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: readconf.c,v 1.155 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -22,6 +22,9 @@
 
 #include <ctype.h>
 #include <errno.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/servconf.c b/servconf.c
index 42ec340f3..20e3f1a86 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.153 2006/07/12 11:34:58 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.154 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -15,6 +15,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
+
 #include "ssh.h"
 #include "log.h"
 #include "servconf.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1c506059c..b217c55e8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -23,6 +23,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index a612dd1b9..38c37e579 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.66 2006/07/10 16:37:36 stevesk Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.67 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -11,12 +11,15 @@
  
 #include "openbsd-compat/sys-queue.h"
 #include <sys/resource.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #include <errno.h>
 #include <stdarg.h>
+#include <setjmp.h>
 
 #include <openssl/bn.h>
 
-#include <setjmp.h>
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/ssh.c b/ssh.c
index 9961baf6e..701c40543 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.285 2006/07/11 20:27:56 stevesk Exp $ */
+/* $OpenBSD: ssh.c,v 1.286 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,6 +54,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
diff --git a/sshconnect.c b/sshconnect.c
index c9d6221d8..fe9b4842c 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.190 2006/07/11 20:07:25 stevesk Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.191 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -24,6 +24,9 @@
 
 #include <ctype.h>
 #include <errno.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
diff --git a/sshd.c b/sshd.c
index 497525df8..3da176da1 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.337 2006/07/12 11:34:58 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.338 2006/07/12 22:28:52 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -54,6 +54,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#if defined(HAVE_NETDB_H)
+# include <netdb.h>
+#endif
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif