am 0e1faa2e: am 1370854c: Merge "Fix header file dependencies."

* commit '0e1faa2e00a4f1d4508b26a6411ac1daa1ce8b6d':
  Fix header file dependencies.