am ac41815a: Merge "Add missing includes."

* commit 'ac41815a99763b3e59d0f2f9ef2bb3e5a2011336':
  Add missing includes.