i2t() and t2i() definitions moved from header file to source file
Type fix