Merge "Break apart header files."