change some #includes to reflect the recent changes