Move record definition back to header file