===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/hostfile.c,v
retrieving revision 1.37.2.1
retrieving revision 1.38
diff -u -r1.37.2.1 -r1.38
--- src/usr.bin/ssh/hostfile.c	2006/09/30 04:06:50	1.37.2.1
+++ src/usr.bin/ssh/hostfile.c	2006/03/19 02:23:26	1.38
@@ -1,4 +1,3 @@
-/* $OpenBSD: hostfile.c,v 1.37.2.1 2006/09/30 04:06:50 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,23 +35,19 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
+#include "includes.h"
+RCSID("$OpenBSD: hostfile.c,v 1.38 2006/03/19 02:23:26 djm Exp $");
 
-#include <netinet/in.h>
+#include <resolv.h>
 
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "xmalloc.h"
 #include "match.h"
 #include "key.h"
 #include "hostfile.h"
 #include "log.h"
+#include "xmalloc.h"
 
 static int
 extract_salt(const char *s, u_int l, char *salt, size_t salt_len)