Matching build fixes for cross built Windows

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>