diff --git a/lib/gssapi/gssapi.h b/lib/gssapi/gssapi.h
index e5df90fa4..bb459b53f 100644
--- a/lib/gssapi/gssapi.h
+++ b/lib/gssapi/gssapi.h
@@ -50,22 +50,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
 #include <bits.h>
 
 /*
@@ -94,8 +78,6 @@ typedef struct gss_ctx_id_t_desc_struct {
 } gss_ctx_id_t_desc;
 
 typedef gss_ctx_id_t_desc *gss_ctx_id_t;
-typedef int gss_cred_id_t;	/* XXX */
-
 
 typedef struct gss_OID_desc_struct {
       OM_uint32 length;
@@ -107,6 +89,20 @@ typedef struct gss_OID_set_desc_struct  {
       gss_OID    elements;
 } gss_OID_set_desc, *gss_OID_set;
 
+struct krb5_keytab_data;
+
+typedef int gss_cred_usage_t;
+
+typedef struct gss_cred_id_t_desc_struct {
+  gss_name_t principal;
+  struct krb5_keytab_data *keytab;
+  OM_uint32 lifetime;
+  gss_cred_usage_t usage;
+  gss_OID_set mechanisms;
+} gss_cred_id_t_desc;
+
+typedef gss_cred_id_t_desc *gss_cred_id_t;
+
 typedef struct gss_buffer_desc_struct {
       size_t length;
       void *value;
@@ -125,8 +121,6 @@ typedef struct gss_channel_bindings_struct {
  */
 typedef OM_uint32 gss_qop_t;
 
-typedef int gss_cred_usage_t;
-
 /*
  * Flag bits for context-level services.
  */
diff --git a/lib/gssapi/krb5/gssapi.h b/lib/gssapi/krb5/gssapi.h
index e5df90fa4..bb459b53f 100644
--- a/lib/gssapi/krb5/gssapi.h
+++ b/lib/gssapi/krb5/gssapi.h
@@ -50,22 +50,6 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
-#ifdef HAVE_NETINET_IN6_MACHTYPES_H
-#include <netinet/in6_machtypes.h>
-#endif
-
 #include <bits.h>
 
 /*
@@ -94,8 +78,6 @@ typedef struct gss_ctx_id_t_desc_struct {
 } gss_ctx_id_t_desc;
 
 typedef gss_ctx_id_t_desc *gss_ctx_id_t;
-typedef int gss_cred_id_t;	/* XXX */
-
 
 typedef struct gss_OID_desc_struct {
       OM_uint32 length;
@@ -107,6 +89,20 @@ typedef struct gss_OID_set_desc_struct  {
       gss_OID    elements;
 } gss_OID_set_desc, *gss_OID_set;
 
+struct krb5_keytab_data;
+
+typedef int gss_cred_usage_t;
+
+typedef struct gss_cred_id_t_desc_struct {
+  gss_name_t principal;
+  struct krb5_keytab_data *keytab;
+  OM_uint32 lifetime;
+  gss_cred_usage_t usage;
+  gss_OID_set mechanisms;
+} gss_cred_id_t_desc;
+
+typedef gss_cred_id_t_desc *gss_cred_id_t;
+
 typedef struct gss_buffer_desc_struct {
       size_t length;
       void *value;
@@ -125,8 +121,6 @@ typedef struct gss_channel_bindings_struct {
  */
 typedef OM_uint32 gss_qop_t;
 
-typedef int gss_cred_usage_t;
-
 /*
  * Flag bits for context-level services.
  */