8022177: Windows/MSYS builds broken

Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Reviewed-by: tbell, erikj, simonis
8 files changed