[PATCH] Better way to fix non-MULE Windows build