===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2.c,v
retrieving revision 1.107.8.1
retrieving revision 1.108
diff -u -r1.107.8.1 -r1.108
--- src/usr.bin/ssh/auth2.c	2006/09/30 04:06:50	1.107.8.1
+++ src/usr.bin/ssh/auth2.c	2006/03/19 18:51:18	1.108
@@ -1,4 +1,3 @@
-/* $OpenBSD: auth2.c,v 1.107.8.1 2006/09/30 04:06:50 brad Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -23,29 +22,22 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
 
-#include <sys/types.h>
-
-#include <pwd.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "xmalloc.h"
 #include "ssh2.h"
+#include "xmalloc.h"
 #include "packet.h"
 #include "log.h"
-#include "buffer.h"
 #include "servconf.h"
 #include "compat.h"
-#include "key.h"
-#include "hostfile.h"
 #include "auth.h"
 #include "dispatch.h"
 #include "pathnames.h"
+#include "monitor_wrap.h"
+
 #ifdef GSSAPI
 #include "ssh-gss.h"
 #endif
-#include "monitor_wrap.h"
 
 /* import */
 extern ServerOptions options;
@@ -101,7 +93,6 @@
 	dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt);
 }
 
-/*ARGSUSED*/
 static void
 input_service_request(int type, u_int32_t seq, void *ctxt)
 {
@@ -135,7 +126,6 @@
 	xfree(service);
 }
 
-/*ARGSUSED*/
 static void
 input_userauth_request(int type, u_int32_t seq, void *ctxt)
 {