make progress on include rejigging (issue 2752)