add system type includes, fix machine/ path
generalize machine link generation