Move common definitions to common include file