diff --git a/appl/test/gss_common.c b/appl/test/gss_common.c
index b36f946eb..3eeb16524 100644
--- a/appl/test/gss_common.c
+++ b/appl/test/gss_common.c
@@ -38,6 +38,7 @@
 
 #include "test_locl.h"
 #include <gssapi.h>
+#include "gss_common.h"
 RCSID("$Id$");
 
 void
diff --git a/appl/test/gss_common.h b/appl/test/gss_common.h
index ef66f5132..a51caff88 100644
--- a/appl/test/gss_common.h
+++ b/appl/test/gss_common.h
@@ -38,9 +38,5 @@
 
 /* $Id$ */
 
-#include "test_locl.h"
-#include <gssapi.h>
-RCSID("$Id$");
-
 void write_token (int sock, gss_buffer_t buf);
 void read_token (int sock, gss_buffer_t buf);
diff --git a/appl/test/gssapi_client.c b/appl/test/gssapi_client.c
index a444476c1..c8a0d371b 100644
--- a/appl/test/gssapi_client.c
+++ b/appl/test/gssapi_client.c
@@ -38,6 +38,7 @@
 
 #include "test_locl.h"
 #include <gssapi.h>
+#include "gss_common.h"
 RCSID("$Id$");
 
 static int
diff --git a/appl/test/gssapi_server.c b/appl/test/gssapi_server.c
index ebce0ea85..285c807ec 100644
--- a/appl/test/gssapi_server.c
+++ b/appl/test/gssapi_server.c
@@ -38,6 +38,7 @@
 
 #include "test_locl.h"
 #include <gssapi.h>
+#include "gss_common.h"
 RCSID("$Id$");
 
 static int
@@ -100,7 +101,8 @@ proto (int sock, const char *service)
     if (GSS_ERROR(maj_stat))
 	abort ();
 
-    printf ("User is `%.*s'\n", name_token.length, name_token.value);
+    printf ("User is `%.*s'\n", (int)name_token.length,
+	    (char *)name_token.value);
 
     /* gss_verify_mic */
 
@@ -115,7 +117,8 @@ proto (int sock, const char *service)
     if (GSS_ERROR(maj_stat))
 	abort ();
 
-    printf ("gss_verify_mic: %.*s\n", input_token->length, input_token->value);
+    printf ("gss_verify_mic: %.*s\n", (int)input_token->length,
+	    (char *)input_token->value);
 
     /* gss_unwrap */
 
@@ -130,7 +133,8 @@ proto (int sock, const char *service)
     if(GSS_ERROR(maj_stat))
 	abort ();
 
-    printf ("gss_unwrap: %.*s\n", output_token->length, output_token->value);
+    printf ("gss_unwrap: %.*s\n", (int)output_token->length,
+	    (char *)output_token->value);
 
     return 0;
 }