Use explicit macro args
Merge topic 'generate_export_header-fixes' into next

916219f Use explicit macro args