am 588f7259: am f4530d6e: Merge "Add missing includes."

* commit '588f725985ef0757dcf3e1257471b9c91dd4f106':
  Add missing includes.