Include global headers, when saving xml file.
Merge branch 'save-global-headers'