[C++]: make Windows build slightly cleaner