Cleaned up includes
Google C++ style guide, no "../", etc.