OK, you convinced me... I will not wrap the headers.
Updating the PR...