Begin consolidating macros if possible, created 'common.h'