include: Revert a couple of include changes that are no longer needed since the last upstream merge.