Fix additional cases where krb5.h is included before k5-int.h. In most cases,