- (dtucker) [acconfig.h configure.ac includes.h servconf.c session.c]
   Change AFS symbol to USE_AFS to prevent namespace collisions, do not
   include kafs.h unless necessary.  From deengert at anl.gov.

For consistency, all of the libkafs bits are now inside "#if defined(KRB5)
&& defined(USE_AFS)".
diff --git a/includes.h b/includes.h
index 02364bb..764bd57 100644
--- a/includes.h
+++ b/includes.h
@@ -169,7 +169,7 @@
 # include <libutil.h> /* Openpty on FreeBSD at least */
 #endif
 
-#if defined(HEIMDAL) && defined(AFS)
+#if defined(KRB5) && defined(USE_AFS)
 # include <krb5.h>
 # include <kafs.h>
 #endif