Also obsessively reorder the headers to be in something closer to alphabetical order. llvm-svn: 188928