This will be needed in range subclasses to position their own subnodes.
This commit adds a few missing private headers, and cleans up some irregularities in the existing ones