[wip] core: Patch up includes.