Drop unused include

- And add includes that are exposed as missing due to this removal.