remove unnecessary headers
fixup some includes
fixup some ai headers