Fixes to includes