Removes unnecessary direct dependencies in some headers and also gets
rid of indirect dependencies that were being relied on to be included.