Remove unused include.
Merge topic 'minor_cleanup' into next

7cca50c Remove unused include.