regressions: Windows header and define fixes.