Removed a few unnecessary includes

I also accidentally committed a few of the changes to master. See a3f940f47c8981146feed66225c1dd8066bac0e2.