Refactor private headers