diff --git a/gss-serv.c b/gss-serv.c
index b5c5538..296f63a 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv.c,v 1.19 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: gss-serv.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -28,15 +28,19 @@
 
 #ifdef GSSAPI
 
+#include <sys/types.h>
+
 #include <string.h>
 #include <unistd.h>
 
-#include "bufaux.h"
+#include "xmalloc.h"
+#include "buffer.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
 #include "log.h"
 #include "channels.h"
 #include "session.h"
-#include "xmalloc.h"
 #include "misc.h"
 
 #include "ssh-gss.h"