diff -uNr imap-2007e.orig/src/osdep/unix/kerb_mit.c imap-2007e/src/osdep/unix/kerb_mit.c
--- imap-2007e.orig/src/osdep/unix/kerb_mit.c	2013-04-19 07:57:41.779870534 +0200
+++ imap-2007e/src/osdep/unix/kerb_mit.c	2013-04-19 07:59:14.202715090 +0200
@@ -27,8 +27,8 @@
  */
 
 #define PROTOTYPE(x) x
-#include <gssapi/gssapi_generic.h>
-#include <gssapi/gssapi_krb5.h>
+#include <gssapi/gssapi.h>
+#include <krb5.h>
 
 
 long kerberos_server_valid (void);
diff -uNr imap-2007e.orig/src/osdep/unix/Makefile.gss imap-2007e/src/osdep/unix/Makefile.gss
--- imap-2007e.orig/src/osdep/unix/Makefile.gss	2013-04-19 07:57:41.777870559 +0200
+++ imap-2007e/src/osdep/unix/Makefile.gss	2013-04-19 07:58:42.335113489 +0200
@@ -29,7 +29,7 @@
 GSSDIR=/usr/local
 GSSINCLUDE=$(GSSDIR)/include
 GSSLIB=$(GSSDIR)/lib
-GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1
+GSSCFLAGS= -I$(GSSINCLUDE) -DKRB5_DEPRECATED=1
 GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
 GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err