Make generalized-offsets includable