am f4530d6e: Merge "Add missing includes."

* commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6':
  Add missing includes.