Clean up #include statements
Remove "using namespace std" and instead use std::