am 05e3dc51: Merge "Add missing includes."

* commit '05e3dc512a01d81b4295c972460cf59941dc645b':
  Add missing includes.