am 175b2732: Merge "Header file clean up."

* commit '175b2732f7e55a07094c30aa08d946189b4af97e':
  Header file clean up.