SONAR-5209 Rework headers