Move typedef to header file