diff --git a/lib/gssapi/decapsulate.c b/lib/gssapi/decapsulate.c
index 8cc5b1fca..078b4b072 100644
--- a/lib/gssapi/decapsulate.c
+++ b/lib/gssapi/decapsulate.c
@@ -94,7 +94,7 @@ _gssapi_verify_mech_header(u_char **str,
 OM_uint32
 gssapi_krb5_verify_header(u_char **str,
 			  size_t total_len,
-			  u_char *type,
+			  const void *type,
 			  gss_OID oid)
 {
     OM_uint32 ret;
@@ -157,7 +157,7 @@ OM_uint32
 gssapi_krb5_decapsulate(OM_uint32 *minor_status,    
 			gss_buffer_t input_token_buffer,
 			krb5_data *out_data,
-			char *type,
+			const void *type,
 			gss_OID oid)
 {
     u_char *p;
@@ -166,7 +166,7 @@ gssapi_krb5_decapsulate(OM_uint32 *minor_status,
     p = input_token_buffer->value;
     ret = gssapi_krb5_verify_header(&p,
 				    input_token_buffer->length,
-				    (u_char *)type,
+				    type,
 				    oid);
     if (ret) {
 	*minor_status = 0;
diff --git a/lib/gssapi/encapsulate.c b/lib/gssapi/encapsulate.c
index ec3337900..4b348e7a5 100644
--- a/lib/gssapi/encapsulate.c
+++ b/lib/gssapi/encapsulate.c
@@ -59,23 +59,25 @@ gssapi_krb5_encap_length (size_t data_len,
     _gssapi_encap_length(data_len + 2, len, total_len, mech);
 }
 
-u_char *
-gssapi_krb5_make_header (u_char *p,
+void *
+gssapi_krb5_make_header (void *ptr,
 			 size_t len,
-			 const u_char *type,
+			 const void *type,
 			 const gss_OID mech)
 {
+    u_char *p = ptr;
     p = _gssapi_make_mech_header(p, len, mech);
     memcpy (p, type, 2);
     p += 2;
     return p;
 }
 
-u_char *
-_gssapi_make_mech_header(u_char *p,
+void *
+_gssapi_make_mech_header(void *ptr,
 			 size_t len,
 			 const gss_OID mech)
 {
+    u_char *p = ptr;
     int e;
     size_t len_len, foo;
 
@@ -105,7 +107,7 @@ _gssapi_encapsulate(
 )
 {
     size_t len, outer_len;
-    u_char *p;
+    void *p;
 
     _gssapi_encap_length (in_data->length, &len, &outer_len, mech);
     
@@ -131,7 +133,7 @@ gssapi_krb5_encapsulate(
 			OM_uint32 *minor_status,    
 			const krb5_data *in_data,
 			gss_buffer_t output_token,
-			const u_char *type,
+			const void *type,
 			const gss_OID mech
 )
 {
diff --git a/lib/gssapi/gssapi_locl.h b/lib/gssapi/gssapi_locl.h
index c33aea37d..478b4f663 100644
--- a/lib/gssapi/gssapi_locl.h
+++ b/lib/gssapi/gssapi_locl.h
@@ -157,24 +157,24 @@ OM_uint32
 gssapi_krb5_encapsulate(OM_uint32 *minor_status,    
 			const krb5_data *in_data,
 			gss_buffer_t output_token,
-			const u_char *type,
+			const void *type,
 			const gss_OID mech);
 
 OM_uint32
 gssapi_krb5_decapsulate(OM_uint32 *minor_status,
 			gss_buffer_t input_token_buffer,
 			krb5_data *out_data,
-			char *type,
+			const void *type,
 			gss_OID oid);
 
-u_char *
-gssapi_krb5_make_header (u_char *p,
+void *
+gssapi_krb5_make_header (void *ptr,
 			 size_t len,
-			 const u_char *type,
+			 const void *type,
 			 const gss_OID mech);
 
-u_char *
-_gssapi_make_mech_header(u_char *p,
+void *
+_gssapi_make_mech_header(void *ptr,
 			 size_t len,
 			 const gss_OID mech);
 
@@ -186,7 +186,7 @@ _gssapi_verify_mech_header(u_char **str,
 OM_uint32
 gssapi_krb5_verify_header(u_char **str,
 			  size_t total_len,
-			  u_char *type,
+			  const void *type,
 			  gss_OID oid);
 
 OM_uint32
diff --git a/lib/gssapi/krb5/decapsulate.c b/lib/gssapi/krb5/decapsulate.c
index 8cc5b1fca..078b4b072 100644
--- a/lib/gssapi/krb5/decapsulate.c
+++ b/lib/gssapi/krb5/decapsulate.c
@@ -94,7 +94,7 @@ _gssapi_verify_mech_header(u_char **str,
 OM_uint32
 gssapi_krb5_verify_header(u_char **str,
 			  size_t total_len,
-			  u_char *type,
+			  const void *type,
 			  gss_OID oid)
 {
     OM_uint32 ret;
@@ -157,7 +157,7 @@ OM_uint32
 gssapi_krb5_decapsulate(OM_uint32 *minor_status,    
 			gss_buffer_t input_token_buffer,
 			krb5_data *out_data,
-			char *type,
+			const void *type,
 			gss_OID oid)
 {
     u_char *p;
@@ -166,7 +166,7 @@ gssapi_krb5_decapsulate(OM_uint32 *minor_status,
     p = input_token_buffer->value;
     ret = gssapi_krb5_verify_header(&p,
 				    input_token_buffer->length,
-				    (u_char *)type,
+				    type,
 				    oid);
     if (ret) {
 	*minor_status = 0;
diff --git a/lib/gssapi/krb5/encapsulate.c b/lib/gssapi/krb5/encapsulate.c
index ec3337900..4b348e7a5 100644
--- a/lib/gssapi/krb5/encapsulate.c
+++ b/lib/gssapi/krb5/encapsulate.c
@@ -59,23 +59,25 @@ gssapi_krb5_encap_length (size_t data_len,
     _gssapi_encap_length(data_len + 2, len, total_len, mech);
 }
 
-u_char *
-gssapi_krb5_make_header (u_char *p,
+void *
+gssapi_krb5_make_header (void *ptr,
 			 size_t len,
-			 const u_char *type,
+			 const void *type,
 			 const gss_OID mech)
 {
+    u_char *p = ptr;
     p = _gssapi_make_mech_header(p, len, mech);
     memcpy (p, type, 2);
     p += 2;
     return p;
 }
 
-u_char *
-_gssapi_make_mech_header(u_char *p,
+void *
+_gssapi_make_mech_header(void *ptr,
 			 size_t len,
 			 const gss_OID mech)
 {
+    u_char *p = ptr;
     int e;
     size_t len_len, foo;
 
@@ -105,7 +107,7 @@ _gssapi_encapsulate(
 )
 {
     size_t len, outer_len;
-    u_char *p;
+    void *p;
 
     _gssapi_encap_length (in_data->length, &len, &outer_len, mech);
     
@@ -131,7 +133,7 @@ gssapi_krb5_encapsulate(
 			OM_uint32 *minor_status,    
 			const krb5_data *in_data,
 			gss_buffer_t output_token,
-			const u_char *type,
+			const void *type,
 			const gss_OID mech
 )
 {
diff --git a/lib/gssapi/krb5/gssapi_locl.h b/lib/gssapi/krb5/gssapi_locl.h
index c33aea37d..478b4f663 100644
--- a/lib/gssapi/krb5/gssapi_locl.h
+++ b/lib/gssapi/krb5/gssapi_locl.h
@@ -157,24 +157,24 @@ OM_uint32
 gssapi_krb5_encapsulate(OM_uint32 *minor_status,    
 			const krb5_data *in_data,
 			gss_buffer_t output_token,
-			const u_char *type,
+			const void *type,
 			const gss_OID mech);
 
 OM_uint32
 gssapi_krb5_decapsulate(OM_uint32 *minor_status,
 			gss_buffer_t input_token_buffer,
 			krb5_data *out_data,
-			char *type,
+			const void *type,
 			gss_OID oid);
 
-u_char *
-gssapi_krb5_make_header (u_char *p,
+void *
+gssapi_krb5_make_header (void *ptr,
 			 size_t len,
-			 const u_char *type,
+			 const void *type,
 			 const gss_OID mech);
 
-u_char *
-_gssapi_make_mech_header(u_char *p,
+void *
+_gssapi_make_mech_header(void *ptr,
 			 size_t len,
 			 const gss_OID mech);
 
@@ -186,7 +186,7 @@ _gssapi_verify_mech_header(u_char **str,
 OM_uint32
 gssapi_krb5_verify_header(u_char **str,
 			  size_t total_len,
-			  u_char *type,
+			  const void *type,
 			  gss_OID oid);
 
 OM_uint32