[patch, 4.9] backport parallel header changes to the 4.9 branch

[Jonathan Wakely]

On 02/12/14 16:24 +0000, Jonathan Wakely wrote:
>On 02/12/14 17:20 +0100, Matthias Klose wrote:
>>Backport these header changes to the 4.9 branch. No regression, but 
>>reported to the Debian BTS.  Safe to backport according to Jonathan 
>>Wakely. No regressions in the testsuite on x86_64-linux-gnu. Ok for 
>>the branch?
>
>You might as well include the additional fixes in r217069 which fix
>more instances of the same problem.

Which you already did! Sorry.

OK for the 4.9 branch, thanks for doing this.