more Make.inc cleanup