5 files changed, 11 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index bcc19e5b0..d1625d2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010718
+ - OpenBSD CVS Sync
+    - stevesk@cvs.openbsd.org 2001/07/14 15:10:17
+      [readpass.c sftp-client.c sftp-common.c sftp-glob.c]
+      delete spurious #includes; ok deraadt@ markus@
+
 20010715
  - (bal) Set "BROKEN_GETADDRINFO" for darwin platform.  Reported by
    Josh Larios <jdlarios@cac.washington.edu>
@@ -6036,4 +6042,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1403 2001/07/16 02:07:49 tim Exp $
+$Id: ChangeLog,v 1.1404 2001/07/18 15:45:44 mouring Exp $
diff --git a/readpass.c b/readpass.c
index 3724eeab1..577a407f3 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,13 +32,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.21 2001/07/10 21:49:12 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.22 2001/07/14 15:10:16 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "readpass.h"
 #include "pathnames.h"
 #include "log.h"
-#include "atomicio.h"
 #include "ssh.h"
 
 static char *
diff --git a/sftp-client.c b/sftp-client.c
index 9670a7660..4f2a1e280 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -29,16 +29,14 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.17 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.18 2001/07/14 15:10:16 stevesk Exp $");
 
-#include "ssh.h"
 #include "buffer.h"
 #include "bufaux.h"
 #include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "atomicio.h"
-#include "pathnames.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
diff --git a/sftp-common.c b/sftp-common.c
index aed95f2f0..923504811 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -24,11 +24,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-common.c,v 1.3 2001/06/26 17:27:24 markus Exp $");
+RCSID("$OpenBSD: sftp-common.c,v 1.4 2001/07/14 15:10:17 stevesk Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
-#include "getput.h"
 #include "log.h"
 #include "xmalloc.h"
 
diff --git a/sftp-glob.c b/sftp-glob.c
index b5be7dede..a432bdfc2 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -23,16 +23,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-glob.c,v 1.7 2001/07/05 11:43:33 espie Exp $");
+RCSID("$OpenBSD: sftp-glob.c,v 1.8 2001/07/14 15:10:17 stevesk Exp $");
 
-#include "ssh.h"
 #include "buffer.h"
 #include "bufaux.h"
-#include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
-#include "atomicio.h"
-#include "pathnames.h"
 
 #include "sftp.h"
 #include "sftp-common.h"