am cef3508b: Merge "Add missing includes."

* commit 'cef3508bb69ec644f35de9d165dc91b127820d77':
  Add missing includes.