===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-pubkey.c,v
retrieving revision 1.9.4.1
retrieving revision 1.10
diff -u -r1.9.4.1 -r1.10
--- src/usr.bin/ssh/auth2-pubkey.c	2006/10/06 03:19:32	1.9.4.1
+++ src/usr.bin/ssh/auth2-pubkey.c	2006/02/20 17:19:54	1.10
@@ -1,4 +1,3 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.9.4.1 2006/10/06 03:19:32 brad Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -23,32 +22,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
+RCSID("$OpenBSD: auth2-pubkey.c,v 1.10 2006/02/20 17:19:54 stevesk Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <pwd.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"
+#include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
 #include "log.h"
 #include "servconf.h"
 #include "compat.h"
-#include "key.h"
-#include "hostfile.h"
+#include "bufaux.h"
 #include "auth.h"
+#include "key.h"
 #include "pathnames.h"
 #include "uidswap.h"
 #include "auth-options.h"
 #include "canohost.h"
-#ifdef GSSAPI
-#include "ssh-gss.h"
-#endif
 #include "monitor_wrap.h"
 #include "misc.h"