Compiling with gcc 4.7.3. A few C++ things seemed to have changed.

Some of the files have whitespace only edits.