Fixed up includes after merge with upstream.