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

* commit '1df45a68f395d213887947536e4e1fa5916d50d6':
  Break apart header files.