am 8814bd1d: Merge "include: cleanup for -Wsystem-header"

* commit '8814bd1d24e3ce9476e64ba641d592521fcf80ed':
  include: cleanup for -Wsystem-header