[SUITEDEV-2114] Order of headers