5 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 707411e33..d87509fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
      [includes.h packet.c]
      move #include <netinet/in_systm.h> and <netinet/ip.h> out of
      includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/08 23:51:24
+     [includes.h scp.c sftp-glob.c sftp-server.c]
+     move #include <dirent.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3948,4 +3951,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.4153 2006/03/15 00:24:12 djm Exp $
+$Id: ChangeLog,v 1.4154 2006/03/15 00:25:13 djm Exp $
diff --git a/includes.h b/includes.h
index 60053b8d3..6452d2fc5 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: includes.h,v 1.29 2006/02/08 14:38:18 stevesk Exp $   */
+/*      $OpenBSD: includes.h,v 1.30 2006/02/08 23:51:24 stevesk Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,7 +35,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
-#include <dirent.h>
 #include <stddef.h>
 
 #ifdef HAVE_LIMITS_H
diff --git a/scp.c b/scp.c
index 620024ea7..0b65ff081 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.130 2006/01/31 10:35:43 djm Exp $");
+RCSID("$OpenBSD: scp.c,v 1.131 2006/02/08 23:51:24 stevesk Exp $");
+
+#include <dirent.h>
 
 #include "xmalloc.h"
 #include "atomicio.h"
diff --git a/sftp-glob.c b/sftp-glob.c
index 16c5e206a..9dfbf9538 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -15,7 +15,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-glob.c,v 1.15 2004/02/17 07:17:29 djm Exp $");
+RCSID("$OpenBSD: sftp-glob.c,v 1.16 2006/02/08 23:51:24 stevesk Exp $");
+ 
+#include <dirent.h>
 
 #include "buffer.h"
 #include "bufaux.h"
diff --git a/sftp-server.c b/sftp-server.c
index 7060c44ad..96fe1a7bb 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -14,7 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.50 2006/01/02 01:20:31 djm Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.51 2006/02/08 23:51:24 stevesk Exp $");
+
+#include <dirent.h>
 
 #include "buffer.h"
 #include "bufaux.h"