dxcpp/UA: More updates to make compilation on Windows work