common.h include removed