Fix crash.
Merge topic 'fix-export-includes-crash' into next

fdc4d2a Fix crash.