Move definitions to a header file