Header refactoring: unify and de-catchall rtree module.
19 files changed