fixes to includes