Move more to Makefile.common