Re #8642. Forgot windoze export macro.
Merge branch 'feature/8642_header_work' into develop