Remove more unused headers.