Rename constant and move definitions to common header.