A bit of cleanup:
- removed useless included headers
- removed using namespace std from headers