More header file optimizations.

Removed Track.hpp where possible.