Check header files and get rid of the g{t,T} shortcuts