[Issue 10553] New: Fix types to allow compilation on windows