Another take at making Windows build easier