Moved common definitions into their own file.