Rarrange the distclean list; part of #7941