am 51bfedd8: Merge "Add missing includes."

* commit '51bfedd821c79ae34ee1caffd9ae958faa71ecec':
  Add missing includes.