Oops, sorry, somehow I missed that thread when I searched for this.
The main difference seems to be that I added this as part of the test
suite and not the build, and I didn't had to modify headerscheck
itself - at least it works on my test setups without modification.