Improve header includes in common.h.