[tcc-2013] Header fix attempt take one