I did have to change some includes for this file, though I'm not sure what changed here.