Broke out header file list reading into separate function. Moved options to front.  Removed some trailing spaces.

llvm-svn: 178182