Fix compilation blockers in my headers
Fix compile blockers in AA headers
Fix mistakes blocking compilation, part 1