diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
index 28e1a34ae..e97984b0f 100644
--- a/lib/gssapi/spnego/accept_sec_context.c
+++ b/lib/gssapi/spnego/accept_sec_context.c
@@ -760,32 +760,32 @@ gss_spnego_accept_sec_context
 
 	mic = initialToken ? ni.mechListMIC : na.mechListMIC;
 	if (mic != NULL)
-	    require_mic = TRUE;
+	    require_mic = 1;
 
 	if (ctx->open && require_mic) {
 	    if (mech_input_token == GSS_C_NO_BUFFER) { /* Even/One */
-		verify_mic = TRUE;
-		get_mic = FALSE;
+		verify_mic = 1;
+		get_mic = 0;
 	    } else if (mech_output_token != GSS_C_NO_BUFFER &&
 		       mech_output_token->length == 0) { /* Odd */
-		get_mic = verify_mic = TRUE;
+		get_mic = verify_mic = 1;
 	    } else { /* Even/One */
-		verify_mic = FALSE;
-		get_mic = TRUE;
+		verify_mic = 0;
+		get_mic = 1;
 	    }
 
 	    if (verify_mic || get_mic) {
-		krb5_error_code kret;
+		int eret;
 		size_t buf_len;
 
-    		ASN1_MALLOC_ENCODE(MechTypeList, mech_buf.value, mech_buf.length,
-				   &ctx->initiator_mech_types, &buf_len, kret);
-		if (kret) {
+    		ASN1_MALLOC_ENCODE(MechTypeList, 
+				   mech_buf.value, mech_buf.length,
+				   &ctx->initiator_mech_types, &buf_len, eret);
+		if (eret) {
 		    ret2 = GSS_S_FAILURE;
-		    *minor_status = kret;
+		    *minor_status = eret;
 		    goto out;
 		}
-
 		if (mech_buf.length != buf_len)
 		    abort();
 	    }
@@ -801,7 +801,7 @@ gss_spnego_accept_sec_context
 		ctx->verified_mic = 1;
 	    }
 	} else
-	    verify_mic = get_mic = FALSE;
+	    verify_mic = get_mic = 0;
 
 	if (ctx->mech_flags & GSS_C_DCE_STYLE)
 	    require_response = (negResult != accept_completed);
diff --git a/lib/gssapi/spnego/init_sec_context.c b/lib/gssapi/spnego/init_sec_context.c
index 6f5b8c98a..4e7206d10 100644
--- a/lib/gssapi/spnego/init_sec_context.c
+++ b/lib/gssapi/spnego/init_sec_context.c
@@ -451,7 +451,7 @@ spnego_reply
 	 * used and a non-preferred mechanism was selected
 	 */
 	if (resp.mechListMIC != NULL) {
-	    require_mic = TRUE;
+	    require_mic = 1;
 	} else {
 	    ret = _gss_spnego_require_mechlist_mic(minor_status, ctx,
 						   &require_mic);
@@ -463,7 +463,7 @@ spnego_reply
 	    }
 	}
     } else {
-	require_mic = FALSE;
+	require_mic = 0;
     }
 
     if (require_mic) {
diff --git a/lib/gssapi/spnego/spnego_locl.h b/lib/gssapi/spnego/spnego_locl.h
index 3ced74c4c..96ca24056 100644
--- a/lib/gssapi/spnego/spnego_locl.h
+++ b/lib/gssapi/spnego/spnego_locl.h
@@ -43,15 +43,22 @@
 #include <pthread.h>
 #endif
 
-#include <krb5_locl.h>
 #include <gssapi_spnego.h>
 #include <gssapi.h>
 #include <assert.h>
-#include <der.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <heim_threads.h>
 #include "spnego_asn1.h"
+#include <der.h>
+#include <asn1_err.h>
 
 #include <gssapi_mech.h>
 
+#define ALLOC(X, N) (X) = calloc((N), sizeof(*(X)))
+
 typedef struct {
 	gss_cred_id_t		negotiated_cred_id;
 } *gssspnego_cred;