Minor style changes.

Removed redundant gt::, cleaned up code, and fixed circular inclusion, that prevented the build.