Move definitions to cpp file. No functionality change.