Revert the changes in the generate_export_header-fixes topic.

It is not ready to be merged to master.
Merge topic 'generate_export_header-fixes' into next

d0c7596 Revert the changes in the generate_export_header-fixes topic.