Add more missing includes after removing the implicit common.h