am 30291f21: Merge "Add missing headers"

* commit '30291f2119be5a8ce3491a715e07f28062532f4d':
  Add missing headers