Removing unused header.
Project now compiles somewhat painlessly under MSVC as C++.
Merge remote-tracking branch 'upstream/master'
Several consistencies fixes.