Fix windows compile class vs. struct confusion in e300c8c32d73