AIEscort Cleanup

Just removed a few unnecessary includes and a few other tid-bits of cleanups. Requesting 0.24 merge because I'm pretty sure it relates to the aiescort feature, feel free to merge in master though.