fixes to includes changes #1