Moved common defines to new file