Merge "Stop the kernel header scrubber from duplicating includes." into main