fix headers common, tests pass: closes #5742