Switch to common.mk