Cleanup makefiles such that diffs to them are smaller