5 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 27cf354aa..4639f4e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
    - stevesk@cvs.openbsd.org 2006/02/08 14:16:59
      [sshconnect.c]
      <openssl/bn.h> not needed
+   - stevesk@cvs.openbsd.org 2006/02/08 14:31:30
+     [includes.h ssh-agent.c ssh-keyscan.c ssh.c]
+     move #include <sys/resource.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3941,4 +3944,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.4151 2006/03/15 00:20:46 djm Exp $
+$Id: ChangeLog,v 1.4152 2006/03/15 00:22:47 djm Exp $
diff --git a/includes.h b/includes.h
index bcc3b41f2..27792e10a 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: includes.h,v 1.27 2006/02/08 12:32:49 stevesk Exp $   */
+/*      $OpenBSD: includes.h,v 1.28 2006/02/08 14:31:30 stevesk Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -98,7 +98,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h> /* For timersub */
 #endif
-#include <sys/resource.h>
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
diff --git a/ssh-agent.c b/ssh-agent.c
index 0b10f9194..8821e0006 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -34,9 +34,10 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: ssh-agent.c,v 1.127 2006/02/08 14:31:30 stevesk Exp $");
+ 
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.126 2006/02/08 12:15:27 stevesk Exp $");
-
+#include <sys/resource.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 1282a62e0..13e7c721c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,9 +7,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.58 2006/02/07 01:18:09 stevesk Exp $");
-
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.59 2006/02/08 14:31:30 stevesk Exp $");
+ 
 #include "openbsd-compat/sys-queue.h"
+#include <sys/resource.h>
 
 #include <openssl/bn.h>
 
diff --git a/ssh.c b/ssh.c
index b248c0280..3384de012 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.258 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.259 2006/02/08 14:31:30 stevesk Exp $");
+
+#include <sys/resource.h>
 
 #include <paths.h>