Refactor code that obtain headers from the state file

Working on legacy/trac#30196 (moved) there was a commit to do what the title says. It was suggested to do it in a different PR.