updating common.h and defs.h