am a3608184: am 081203e0: Merge "Reduce header files including header files."

* commit 'a360818468306fc1cbb10a5d2f84a3ff201ad584':
  Reduce header files including header files.