Replaces forward declarations of Track with explicit include statements.
Track
Includes changes in !466 (merged) .