Move contents of make.defs where they belong