Cleaned header inclusion in the CGT.