Remove some more unused headers.