Move some include files to be present always, so build always includes them even if patches not applied (eg. for distributions).
18 files changed