Refactor #5580: Fix Win32 compile issue