--- lib/gssapi.c	2002-12-05 17:12:36.000000000 -0500
+++ lib/gssapi.c	2007-11-15 21:59:58.000000000 -0500
@@ -34,29 +34,8 @@
 #include "syshdr.h"
 #include "ftp.h"
 #include "base64.h"
-
-#if defined(HAVE_GSSAPI_H)
-# include <gssapi.h>
- /* if we have gssapi.h (not gssapi/gssapi.h) we assume we link
-  * against Heimdal, which needs krb5_err.h to define *
-  * KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN
-  */
-# include <krb5_err.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_H)
-# include <gssapi/gssapi.h>
- /* if we have gssapi/gssapi.h it might be safe to assume we have the
-  * other two that are part of MIT's krb5 as well, but this will work
-  * even if they one day do away with one of those two header files.
-  */
-# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#   include <gssapi/gssapi_krb5.h>
-# endif
-#else
-# error "Need gssapi.h from either Heimdal or MIT krb5"
-#endif
-
-
-
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_krb5.h>
 
 /*
  * The implementation must reserve static storage for a
@@ -72,7 +51,6 @@
 static gss_OID_desc gss_c_nt_hostbased_service_oid_desc =
 {10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"};
 
-static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc;
 
 
 
