Fixes for "make test_headers"