update includes, add "common.h"