3 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a7e9b020..6eaa78879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    - jmc@cvs.openbsd.org 2006/02/06 21:44:47
      [ssh.1]
      make this a little less ambiguous...
+   - stevesk@cvs.openbsd.org 2006/02/07 01:08:04
+     [auth-rhosts.c includes.h]
+     move #include <netgroup.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3908,4 +3911,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.4141 2006/03/15 00:05:59 djm Exp $
+$Id: ChangeLog,v 1.4142 2006/03/15 00:08:02 djm Exp $
diff --git a/auth-rhosts.c b/auth-rhosts.c
index aaba8557e..9748a9457 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rhosts.c,v 1.33 2005/07/17 07:17:54 djm Exp $");
+RCSID("$OpenBSD: auth-rhosts.c,v 1.34 2006/02/07 01:08:04 stevesk Exp $");
+
+#ifdef HAVE_NETGROUP_H
+# include <netgroup.h>
+#endif
 
 #include "packet.h"
 #include "uidswap.h"
diff --git a/includes.h b/includes.h
index 520817400..c23f94ce4 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $   */
+/*      $OpenBSD: includes.h,v 1.23 2006/02/07 01:08:04 stevesk Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -51,9 +51,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
     defined(GLOB_HAS_GL_MATCHC)
 # include <glob.h>
 #endif
-#ifdef HAVE_NETGROUP_H
-# include <netgroup.h>
-#endif
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif