diff --git a/lib/gssapi/test_acquire_cred.c b/lib/gssapi/test_acquire_cred.c
index 7e7eeb89f..f40de8f6e 100644
--- a/lib/gssapi/test_acquire_cred.c
+++ b/lib/gssapi/test_acquire_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 2003-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -31,8 +31,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gssapi_locl.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <gssapi.h>
 #include <err.h>
+#include <roken.h>
+#include <getarg.h>
 
 RCSID("$Id$");
 
diff --git a/lib/gssapi/test_cred.c b/lib/gssapi/test_cred.c
index 06c84c000..8ae16e95e 100644
--- a/lib/gssapi/test_cred.c
+++ b/lib/gssapi/test_cred.c
@@ -31,8 +31,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gssapi_locl.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <gssapi.h>
 #include <err.h>
+#include <roken.h>
 #include <getarg.h>
 
 RCSID("$Id$");
diff --git a/lib/gssapi/test_kcred.c b/lib/gssapi/test_kcred.c
index b8bb3e4a3..fa4114082 100644
--- a/lib/gssapi/test_kcred.c
+++ b/lib/gssapi/test_kcred.c
@@ -31,8 +31,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gssapi_locl.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <gssapi.h>
+#include <krb5.h>
 #include <err.h>
+#include <roken.h>
 #include <getarg.h>
 
 RCSID("$Id$");
diff --git a/lib/gssapi/test_oid.c b/lib/gssapi/test_oid.c
index 5cbb455f8..bb01ed51b 100644
--- a/lib/gssapi/test_oid.c
+++ b/lib/gssapi/test_oid.c
@@ -31,7 +31,14 @@
  * SUCH DAMAGE. 
  */
 
-#include "gssapi_locl.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <gssapi.h>
+#include <err.h>
+#include <roken.h>
 
 RCSID("$Id$");