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

* commit '081203e06534e4aa27a942e47084289eecab29ed':
  Reduce header files including header files.