Added a couple of headers that were included only transitively