PROTON-???: Rearrange the header files a bit to reduce transitive header inclusions
(Fixes windows breakage from PROTON-676)