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

* commit '1370854cc0a4aa652213e44d4a8b268fe614c11f':
  Fix header file dependencies.