Add missing EXPORT macro.

Hopefully fix Windows build.
Merge topic 'include-dirs-convenience' into next

b14ba08 Add missing EXPORT macro.