AAI: use "default" header guards
AAI: get rid of all headers included everywhere:
only included required headers,
still everything seems to depend on everything :-(