Clean up #include ordering and add missing ones.

Make sure any header that has a corresponding .cc file includes that header
first, to validate that it can stand by itself (as per the style guide). Also
do some simple reformatting (mainly sorting "using" statements, or moving
them to the location prescribed by the style guide).
Move the makefile aside for now.
Initial cut at an alternate makefile.