Style fix.
Merge topic 'interface-includes-defines' into next

258a948 Style fix.