Some whitespace fixes and #include reordering.