Removed more redundant includes

Sorry this took so long, I've been busy with school. I should hopefully be able to work on the instances of using namespace tomorrow.