added macro redefs to common.h to get some places I missed