Entire solution now builds with MSVC