am aeecac54: Merge "Add missing includes."

* commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e':
  Add missing includes.