some fixes to includes