Some C++ files had been checked in with CRLF line endings. This fixes those and also fixes future commits.