consolidate more in common1.mak.