WIP Reorder headers to attempt to fix ranges::v3 compilation error

Marco Cattaneorequested to merge
fix-ranges-v3-compilation into master

Temporary hack, will be superseded by !1685 (merged)

Edited by Marco Cattaneo

Merge request reports