am 0e359ef6: Merge "Break apart header files."

* commit '0e359ef64546e472ed7e2292c8a48354f9907a37':
  Break apart header files.