am 166776fb: Merge "Add missing includes."

* commit '166776fbbeb74e28a736681a5edd355013b976ad':
  Add missing includes.