Tracked down with an ugly, brittle and probably buggy Perl script. Also move includes converted to <...> up so they get included before ours where that's obviously okay. Backports commit a9c94277f07d19d3eb14f199c3e93491aa3eae0e from qemu