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

* commit '21157abcd932e899032689dba120d4f7cb08aa23':
  include: cleanup for -Wsystem-header